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

[FE 1.0] Check callable reference return type safety during resolution

Browse Source 
^KT-51844
^KT-52503 Fixed
This commit is contained in:
Victor Petukhov
2022-05-25 11:00:51 +02:00
committed by teamcity
parent 51551998c7
commit 0199c76c06
20 changed files with 140 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/CallableReferencesCandidateFactory.kt
+9 -1
View File
@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.types.*
import org.jetbrains.kotlin.types.error.ErrorScopeKind
import org.jetbrains.kotlin.types.error.ErrorUtils
import org.jetbrains.kotlin.types.error.ErrorTypeKind
import org.jetbrains.kotlin.types.error.LazyWrappedTypeComputationException
import org.jetbrains.kotlin.types.expressions.CoercionStrategy
import org.jetbrains.kotlin.types.typeUtil.isUnit
import org.jetbrains.kotlin.utils.SmartList
@@ -239,8 +240,15 @@ class CallableReferencesCandidateFactory(
// lower(Unit!) = Unit
val returnExpectedType = inputOutputTypes.outputType
fun isReturnTypeNonUnitSafe(): Boolean =
try {
descriptor.returnType?.isUnit() == false
} catch (e: LazyWrappedTypeComputationException) {
false
}
val coercion =
if (returnExpectedType.isUnit() && descriptor.returnType?.isUnit() == false)
if (returnExpectedType.isUnit() && isReturnTypeNonUnitSafe())
CoercionStrategy.COERCION_TO_UNIT
else
CoercionStrategy.NO_COERCION