azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't perform unnecessary SAM conversions

Browse Source 
#KT-41149 In Progress
This commit is contained in:
Mikhail Zarechenskiy
2020-08-25 10:03:52 +03:00
parent 6a7ed96be5
commit e91b378b7d
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/SamTypeConversions.kt
+3
View File
@@ -30,6 +30,7 @@ object SamTypeConversions : ParameterTypeConversion {
if (generatingAdditionalSamCandidateIsEnabled) return true if (generatingAdditionalSamCandidateIsEnabled) return true
if (expectedParameterType.isNothing()) return true if (expectedParameterType.isNothing()) return true
if (expectedParameterType.isFunctionType) return true
val samConversionOracle = callComponents.samConversionOracle val samConversionOracle = callComponents.samConversionOracle
if (!callComponents.languageVersionSettings.supportsFeature(LanguageFeature.SamConversionForKotlinFunctions)) { if (!callComponents.languageVersionSettings.supportsFeature(LanguageFeature.SamConversionForKotlinFunctions)) {
@@ -46,6 +47,8 @@ object SamTypeConversions : ParameterTypeConversion {
return when (argument) { return when (argument) {
is SubKotlinCallArgument -> { is SubKotlinCallArgument -> {
val stableType = argument.receiver.stableType val stableType = argument.receiver.stableType
if (stableType.isFunctionType) return true
hasNonAnalyzedLambdaAsReturnType(argument.callResult.subResolvedAtoms, stableType) hasNonAnalyzedLambdaAsReturnType(argument.callResult.subResolvedAtoms, stableType)
} }
is SimpleKotlinCallArgument -> argument.receiver.stableType.isFunctionType is SimpleKotlinCallArgument -> argument.receiver.stableType.isFunctionType