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

Fix type constraints of empty lambda (KT-28654 fix)

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2019-02-20 10:09:32 +03:00
parent 2ba33c3b8a
commit d58ee133a2
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/PostponedArgumentsAnalyzer.kt
+3 -1
View File
@@ -98,7 +98,9 @@ class PostponedArgumentsAnalyzer(
if (returnArguments.isEmpty()) { if (returnArguments.isEmpty()) {
val unitType = lambda.returnType.builtIns.unitType val unitType = lambda.returnType.builtIns.unitType
c.getBuilder().addSubtypeConstraint(lambda.returnType.let(::substitute), unitType, LambdaArgumentConstraintPosition(lambda)) val lambdaReturnType = lambda.returnType.let(::substitute)
c.getBuilder().addSubtypeConstraint(lambdaReturnType, unitType, LambdaArgumentConstraintPosition(lambda))
c.getBuilder().addSubtypeConstraint(unitType, lambdaReturnType, LambdaArgumentConstraintPosition(lambda))
} }
lambda.setAnalyzedResults(returnArguments, subResolvedKtPrimitives) lambda.setAnalyzedResults(returnArguments, subResolvedKtPrimitives)
compiler/testData/diagnostics/tests/inference/kt28654.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
// !DIAGNOSTICS: -UNUSED_VARIABLE // !DIAGNOSTICS: -UNUSED_VARIABLE
// Related issue: KT-28654 // Related issue: KT-28654
fun <K> select(): K = <!OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>run { <!OI;TYPE_MISMATCH!><!>}<!> fun <K> select(): K = <!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>run { <!OI;TYPE_MISMATCH!><!>}<!>
fun test() { fun test() {
val x: Int = select() val x: Int = select()