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

Fix multiple registration of same type variable in builder inference

Browse Source
This commit is contained in:
Simon Ogorodnik
2021-11-19 04:19:18 +03:00
committed by Space
parent 7fa13f758f
commit 9f6a812786
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/BuilderInferenceSession.kt
+3 -5
View File
@@ -325,14 +325,12 @@ class BuilderInferenceSession(
shouldIntegrateAllConstraints: Boolean
) {
storage.notFixedTypeVariables.values.forEach {
if (it.typeVariable.freshTypeConstructor(commonSystem.typeSystemContext) !in commonSystem.allTypeVariables) {
commonSystem.registerVariable(it.typeVariable)
}
commonSystem.registerTypeVariableIfNotPresent(it.typeVariable)
}
for (parentSession in findAllParentBuildInferenceSessions()) {
for ((variable, stubType) in parentSession.stubsForPostponedVariables) {
commonSystem.registerVariable(variable)
commonSystem.registerTypeVariableIfNotPresent(variable)
commonSystem.addSubtypeConstraint(
variable.defaultType,
stubType,
@@ -378,7 +376,7 @@ class BuilderInferenceSession(
if (shouldIntegrateAllConstraints) {
for ((variableConstructor, type) in storage.fixedTypeVariables) {
val typeVariable = storage.allTypeVariables.getValue(variableConstructor)
commonSystem.registerVariable(typeVariable)
commonSystem.registerTypeVariableIfNotPresent(typeVariable)
commonSystem.addEqualityConstraint((typeVariable as NewTypeVariable).defaultType, type, BuilderInferencePosition)
}
}
compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeContravariant.kt
Vendored
+12 -12
View File
@@ -47,24 +47,24 @@ fun test() {
build2 {
emit(1)
select1(this@build.get(), <!TYPE_MISMATCH("In<String>; In<Int?>")!>getIn()<!>)
select1(get(), <!TYPE_MISMATCH("In<Int?>; In<String>!")!>Test.foo(this@build.getIn())<!>)
select1(Test.foo(this@build.get()), <!TYPE_MISMATCH("In<String!>; In<Int?>!")!>Test.foo(getIn())<!>)
select1(Test.foo(get()), <!TYPE_MISMATCH("In<Int?>; In<String>")!>this@build.getIn()<!>)
select2(this@build.get(), <!TYPE_MISMATCH("In<String?>; In<Int?>")!>getIn()<!>)
select1(this@build.get(), <!TYPE_MISMATCH("In<String>; In<Int!>")!>getIn()<!>)
select1(get(), <!TYPE_MISMATCH("In<Int!>; In<String>!")!>Test.foo(this@build.getIn())<!>)
select1(Test.foo(this@build.get()), <!TYPE_MISMATCH("In<String!>; In<Int!>!")!>Test.foo(getIn())<!>)
select1(Test.foo(get()), <!TYPE_MISMATCH("In<Int!>; In<String>")!>this@build.getIn()<!>)
select2(this@build.get(), <!TYPE_MISMATCH("In<String?>; In<Int!>")!>getIn()<!>)
select2(get(), <!TYPE_MISMATCH("In<Int?>; In<String>!")!>Test.foo(this@build.getIn())<!>)
select2(Test.foo(this@build.get()), <!TYPE_MISMATCH("In<String?>; In<Int?>!")!>Test.foo(getIn())<!>)
select2(Test.foo(this@build.get()), <!TYPE_MISMATCH("In<String?>; In<Int!>!")!>Test.foo(getIn())<!>)
select2(Test.foo(get()), <!TYPE_MISMATCH("In<Int?>; In<String>")!>this@build.getIn()<!>)
select3(this@build.get(), <!TYPE_MISMATCH("In<String?>; In<Int?>")!>getIn()<!>)
select3(this@build.get(), <!TYPE_MISMATCH("In<String?>; In<Int!>")!>getIn()<!>)
select3(get(), <!TYPE_MISMATCH("In<Int?>; In<String>!")!>Test.foo(this@build.getIn())<!>)
select3(Test.foo(this@build.get()), <!TYPE_MISMATCH("In<String?>; In<Int?>!")!>Test.foo(getIn())<!>)
select3(Test.foo(this@build.get()), <!TYPE_MISMATCH("In<String?>; In<Int!>!")!>Test.foo(getIn())<!>)
select3(Test.foo(get()), <!TYPE_MISMATCH("In<Int?>; In<String>")!>this@build.getIn()<!>)
select4(this@build.get(), <!TYPE_MISMATCH("In<String>; In<Int?>")!>getIn()<!>)
select4(this@build.get(), <!TYPE_MISMATCH("In<String>; In<Int!>")!>getIn()<!>)
select4(get(), <!TYPE_MISMATCH("In<Int>; In<String>!")!>Test.foo(this@build.getIn())<!>)
select4(Test.foo(this@build.get()), <!TYPE_MISMATCH("In<String>; In<Int?>!")!>Test.foo(getIn())<!>)
select4(Test.foo(get()), <!TYPE_MISMATCH("In<Int?>; In<String>")!>this@build.getIn()<!>)
select4(Test.foo(this@build.get()), <!TYPE_MISMATCH("In<String>; In<Int!>!")!>Test.foo(getIn())<!>)
select4(Test.foo(get()), <!TYPE_MISMATCH("In<Int!>; In<String>")!>this@build.getIn()<!>)
select4(id(Test.foo(this@build.get())), <!TYPE_MISMATCH("In<String>; In<Int?>")!>getIn()<!>)
select4(id(Test.foo(this@build.get())), <!TYPE_MISMATCH("In<String>; In<Int!>")!>getIn()<!>)
""
}
""