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

Fix chained conversions for subtypes of functional types

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2020-06-02 15:48:29 +03:00
parent 71cbe97688
commit 6b58be377e
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/typeConversions.kt
+12 -5
View File
@@ -69,13 +69,20 @@ object TypeConversions {
val samConvertedType = performConversionAfterSubtyping( val samConvertedType = performConversionAfterSubtyping(
candidate, argument, candidateParameter, candidateExpectedType, SamTypeConversions candidate, argument, candidateParameter, candidateExpectedType, SamTypeConversions
) )
if (samConvertedType != null) return samConvertedType
val suspendConvertedType = val suspendConvertedType = performConversionAfterSubtyping(
performConversionAfterSubtyping(candidate, argument, candidateParameter, candidateExpectedType, SuspendTypeConversions) candidate, argument, candidateParameter,
if (suspendConvertedType != null) return suspendConvertedType candidateExpectedType = samConvertedType ?: candidateExpectedType,
SuspendTypeConversions
)
return performConversionAfterSubtyping(candidate, argument, candidateParameter, candidateExpectedType, UnitTypeConversions) val unitConvertedType = performConversionAfterSubtyping(
candidate, argument, candidateParameter,
candidateExpectedType = suspendConvertedType ?: samConvertedType ?: candidateExpectedType,
UnitTypeConversions
)
return unitConvertedType ?: suspendConvertedType ?: samConvertedType
} }
private fun performConversionAfterSubtyping( private fun performConversionAfterSubtyping(