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

Add constraints between two different stub variables instead of creating constraint error due to T1 isn't subtype of T2

Browse Source 
^KT-44241 Fixed
This commit is contained in:
Victor Petukhov
2021-06-03 12:23:15 +03:00
parent 071ae301b4
commit 1e5998e0ba
18 changed files with 209 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeContravariant.fir.kt
Vendored
+17 -17
View File
@@ -47,24 +47,24 @@ fun test() {
build2 {
emit(1)
select1(this@build.get(), <!ARGUMENT_TYPE_MISMATCH!>getIn()<!>)
select1(get(), <!ARGUMENT_TYPE_MISMATCH!>Test.foo(this@build.getIn())<!>)
select1(Test.foo(this@build.get()), <!ARGUMENT_TYPE_MISMATCH!>Test.foo(getIn())<!>)
select1(Test.foo(get()), <!ARGUMENT_TYPE_MISMATCH!>this@build.getIn()<!>)
select2(this@build.get(), <!ARGUMENT_TYPE_MISMATCH!>getIn()<!>)
select2(get(), <!ARGUMENT_TYPE_MISMATCH!>Test.foo(this@build.getIn())<!>)
select2(Test.foo(this@build.get()), <!ARGUMENT_TYPE_MISMATCH!>Test.foo(getIn())<!>)
select2(Test.foo(get()), <!ARGUMENT_TYPE_MISMATCH!>this@build.getIn()<!>)
select3(this@build.get(), <!ARGUMENT_TYPE_MISMATCH!>getIn()<!>)
select3(get(), <!ARGUMENT_TYPE_MISMATCH!>Test.foo(this@build.getIn())<!>)
select3(Test.foo(this@build.get()), <!ARGUMENT_TYPE_MISMATCH!>Test.foo(getIn())<!>)
select3(Test.foo(get()), <!ARGUMENT_TYPE_MISMATCH!>this@build.getIn()<!>)
select4(this@build.get(), <!ARGUMENT_TYPE_MISMATCH!>getIn()<!>)
select4(get(), <!ARGUMENT_TYPE_MISMATCH!>Test.foo(this@build.getIn())<!>)
select4(Test.foo(this@build.get()), <!ARGUMENT_TYPE_MISMATCH!>Test.foo(getIn())<!>)
select4(Test.foo(get()), <!ARGUMENT_TYPE_MISMATCH!>this@build.getIn()<!>)
select1(this@build.get(), getIn())
select1(get(), Test.foo(this@build.getIn()))
select1(Test.foo(this@build.get()), Test.foo(getIn()))
select1(Test.foo(get()), this@build.getIn())
select2(this@build.get(), getIn())
select2(get(), Test.foo(this@build.getIn()))
select2(Test.foo(this@build.get()), Test.foo(getIn()))
select2(Test.foo(get()), this@build.getIn())
select3(this@build.get(), getIn())
select3(get(), Test.foo(this@build.getIn()))
select3(Test.foo(this@build.get()), Test.foo(getIn()))
select3(Test.foo(get()), this@build.getIn())
select4(this@build.get(), getIn())
select4(get(), Test.foo(this@build.getIn()))
select4(Test.foo(this@build.get()), Test.foo(getIn()))
select4(Test.foo(get()), this@build.getIn())
select4(id(Test.foo(this@build.get())), <!ARGUMENT_TYPE_MISMATCH!>getIn()<!>)
select4(id(Test.foo(this@build.get())), getIn())
""
}
""
compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeContravariant.kt
Vendored
+17 -17
View File
@@ -47,24 +47,24 @@ fun test() {
build2 {
emit(1)
select1(this@build.get(), <!TYPE_MISMATCH("TypeVariable(R2); TypeVariable(R1)")!>getIn()<!>)
select1(get(), <!TYPE_MISMATCH("TypeVariable(R1); TypeVariable(R2)")!>Test.foo(this@build.getIn())<!>)
select1(Test.foo(this@build.get()), <!TYPE_MISMATCH("TypeVariable(R2); TypeVariable(R1)!")!>Test.foo(getIn())<!>)
select1(Test.foo(get()), <!TYPE_MISMATCH("TypeVariable(R1); TypeVariable(R2)!")!>this@build.getIn()<!>)
select2(this@build.get(), <!TYPE_MISMATCH("TypeVariable(R2); TypeVariable(R1)")!>getIn()<!>)
select2(get(), <!TYPE_MISMATCH("TypeVariable(R1); TypeVariable(R2)")!>Test.foo(this@build.getIn())<!>)
select2(Test.foo(this@build.get()), <!TYPE_MISMATCH("TypeVariable(R2); TypeVariable(R1)!")!>Test.foo(getIn())<!>)
select2(Test.foo(get()), <!TYPE_MISMATCH("TypeVariable(R1); TypeVariable(R2)!")!>this@build.getIn()<!>)
select3(this@build.get(), <!TYPE_MISMATCH("TypeVariable(R2); TypeVariable(R1)!!")!>getIn()<!>)
select3(get(), <!TYPE_MISMATCH("TypeVariable(R1); TypeVariable(R2)!!")!>Test.foo(this@build.getIn())<!>)
select3(Test.foo(this@build.get()), <!TYPE_MISMATCH("TypeVariable(R2); TypeVariable(R1)")!>Test.foo(getIn())<!>)
select3(Test.foo(get()), <!TYPE_MISMATCH("TypeVariable(R1); TypeVariable(R2)")!>this@build.getIn()<!>)
select4(this@build.get(), <!TYPE_MISMATCH("TypeVariable(R2); TypeVariable(R1)!!")!>getIn()<!>)
select4(get(), <!TYPE_MISMATCH("TypeVariable(R1); TypeVariable(R2)!!")!>Test.foo(this@build.getIn())<!>)
select4(Test.foo(this@build.get()), <!TYPE_MISMATCH("TypeVariable(R2); TypeVariable(R1)")!>Test.foo(getIn())<!>)
select4(Test.foo(get()), <!TYPE_MISMATCH("TypeVariable(R1); TypeVariable(R2)")!>this@build.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(get()), <!TYPE_MISMATCH("In<Int?>; In<String>")!>this@build.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(get()), <!TYPE_MISMATCH("In<Int?>; In<String>")!>this@build.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(id(Test.foo(this@build.get())), <!TYPE_MISMATCH("TypeVariable(R2); TypeVariable(R1)!!")!>getIn()<!>)
select4(id(Test.foo(this@build.get())), <!TYPE_MISMATCH("In<String>; In<Int?>")!>getIn()<!>)
""
}
""
compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeInvariant.fir.kt
Vendored
+17 -17
View File
@@ -47,16 +47,16 @@ fun test() {
build2 {
emit(1)
select1(this@build.get(), <!ARGUMENT_TYPE_MISMATCH!>getInv()<!>)
select1(get(), <!ARGUMENT_TYPE_MISMATCH!>Test.foo(this@build.getInv())<!>)
select1(Test.foo(this@build.get()), <!ARGUMENT_TYPE_MISMATCH!>Test.foo(getInv())<!>)
select1(Test.foo(get()), <!ARGUMENT_TYPE_MISMATCH!>this@build.getInv()<!>)
select4(this@build.get(), <!ARGUMENT_TYPE_MISMATCH!>getInv()<!>)
select4(get(), <!ARGUMENT_TYPE_MISMATCH!>Test.foo(this@build.getInv())<!>)
select4(Test.foo(this@build.get()), <!ARGUMENT_TYPE_MISMATCH!>Test.foo(getInv())<!>)
select4(Test.foo(get()), <!ARGUMENT_TYPE_MISMATCH!>this@build.getInv()<!>)
select1(this@build.get(), getInv())
select1(get(), Test.foo(this@build.getInv()))
select1(Test.foo(this@build.get()), Test.foo(getInv()))
select1(Test.foo(get()), this@build.getInv())
select4(this@build.get(), getInv())
select4(get(), Test.foo(this@build.getInv()))
select4(Test.foo(this@build.get()), Test.foo(getInv()))
select4(Test.foo(get()), this@build.getInv())
select4(id(Test.foo(this@build.get())), <!ARGUMENT_TYPE_MISMATCH!>getInv()<!>)
select4(id(Test.foo(this@build.get())), getInv())
""
}
""
@@ -78,14 +78,14 @@ fun test() {
build2 {
emit(1)
select2(this@build.get(), <!ARGUMENT_TYPE_MISMATCH!>getInv()<!>)
select2(get(), <!ARGUMENT_TYPE_MISMATCH!>Test.foo(this@build.getInv())<!>)
select2(Test.foo(this@build.get()), <!ARGUMENT_TYPE_MISMATCH!>Test.foo(getInv())<!>)
select2(Test.foo(get()), <!ARGUMENT_TYPE_MISMATCH!>this@build.getInv()<!>)
select3(this@build.get(), <!ARGUMENT_TYPE_MISMATCH!>getInv()<!>)
select3(get(), <!ARGUMENT_TYPE_MISMATCH!>Test.foo(this@build.getInv())<!>)
select3(Test.foo(this@build.get()), <!ARGUMENT_TYPE_MISMATCH!>Test.foo(getInv())<!>)
select3(Test.foo(get()), <!ARGUMENT_TYPE_MISMATCH!>this@build.getInv()<!>)
select2(this@build.get(), getInv()) // TODO
select2(get(), Test.foo(this@build.getInv()))
select2(Test.foo(this@build.get()), Test.foo(getInv())) // TODO
select2(Test.foo(get()), this@build.getInv())
select3(this@build.get(), getInv()) // TODO
select3(get(), Test.foo(this@build.getInv()))
select3(Test.foo(this@build.get()), Test.foo(getInv())) // TODO
select3(Test.foo(get()), this@build.getInv())
""
}
""
compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeInvariant.kt
Vendored
+16 -16
View File
@@ -47,16 +47,16 @@ fun test() {
build2 {
emit(1)
select1(this@build.get(), <!TYPE_MISMATCH!>getInv()<!>)
select1(get(), <!TYPE_MISMATCH!>Test.foo(this@build.getInv())<!>)
select1(Test.foo(this@build.get()), <!TYPE_MISMATCH!>Test.foo(getInv())<!>)
select1(Test.foo(get()), <!TYPE_MISMATCH!>this@build.getInv()<!>)
<!DEBUG_INFO_EXPRESSION_TYPE("(kotlin.Int..kotlin.Int?)")!>select4(this@build.get(), <!TYPE_MISMATCH!>getInv()<!>)<!>
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String")!>select4(get(), <!TYPE_MISMATCH!>Test.foo(this@build.getInv())<!>)<!>
select4(Test.foo(this@build.get()), <!TYPE_MISMATCH!>Test.foo(getInv())<!>)
select4(Test.foo(get()), <!TYPE_MISMATCH!>this@build.getInv()<!>)
select1(<!TYPE_MISMATCH!>this@build.get()<!>, getInv())
select1(<!TYPE_MISMATCH!>get()<!>, Test.foo(this@build.getInv()))
select1(<!TYPE_MISMATCH!>Test.foo(this@build.get())<!>, Test.foo(getInv()))
select1(<!TYPE_MISMATCH!>Test.foo(get())<!>, this@build.getInv())
<!DEBUG_INFO_EXPRESSION_TYPE("(kotlin.Int..kotlin.Int?)")!>select4(<!TYPE_MISMATCH!>this@build.get()<!>, getInv())<!>
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String")!>select4(<!TYPE_MISMATCH!>get()<!>, Test.foo(this@build.getInv()))<!>
select4(<!TYPE_MISMATCH!>Test.foo(this@build.get())<!>, Test.foo(getInv()))
select4(<!TYPE_MISMATCH!>Test.foo(get())<!>, this@build.getInv())
<!DEBUG_INFO_EXPRESSION_TYPE("(kotlin.Int..kotlin.Int?)")!>select4(id(Test.foo(this@build.get())), <!TYPE_MISMATCH!>getInv()<!>)<!>
<!DEBUG_INFO_EXPRESSION_TYPE("(kotlin.Int..kotlin.Int?)")!>select4(<!TYPE_MISMATCH!>id(Test.foo(this@build.get()))<!>, getInv())<!>
""
}
""
@@ -78,14 +78,14 @@ fun test() {
build2 {
emit(1)
select2(this@build.get(), <!TYPE_MISMATCH("TypeVariable(R2); TypeVariable(R1)")!>getInv()<!>)
select2(get(), <!TYPE_MISMATCH("TypeVariable(R1); TypeVariable(R2)")!>Test.foo(this@build.getInv())<!>)
select2(Test.foo(this@build.get()), <!TYPE_MISMATCH("TypeVariable(R2); TypeVariable(R1)!")!>Test.foo(getInv())<!>)
select2(Test.foo(get()), <!TYPE_MISMATCH("TypeVariable(R1); TypeVariable(R2)!")!>this@build.getInv()<!>)
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>select3(this@build.get(), <!TYPE_MISMATCH!>getInv()<!>)<!>
select2(this@build.get(), getInv()) // TODO
select2(get(), <!TYPE_MISMATCH("Inv<Any?>; Inv<String?>!")!>Test.foo(this@build.getInv())<!>)
select2(Test.foo(this@build.get()), Test.foo(getInv())) // TODO
select2(Test.foo(get()), <!TYPE_MISMATCH("Inv<Any?>; Inv<String?>")!>this@build.getInv()<!>)
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>select3(this@build.get(), getInv())<!> // TODO
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>select3(get(), <!TYPE_MISMATCH!>Test.foo(this@build.getInv())<!>)<!>
select3(Test.foo(this@build.get()), <!TYPE_MISMATCH("TypeVariable(R2); TypeVariable(R1)")!>Test.foo(getInv())<!>)
select3(Test.foo(get()), <!TYPE_MISMATCH("TypeVariable(R1); TypeVariable(R2)")!>this@build.getInv()<!>)
select3(Test.foo(this@build.get()), Test.foo(getInv())) // TODO
select3(Test.foo(get()), <!TYPE_MISMATCH("Inv<Any?>; Inv<String?>")!>this@build.getInv()<!>)
""
}
""
compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/intersect.kt
Vendored
+4 -4
View File
@@ -38,10 +38,10 @@ fun test() {
build2 {
emit(1)
<!DEBUG_INFO_EXPRESSION_TYPE("{Int & String}")!>intersect(this@build.getIn(), getIn())<!>
<!DEBUG_INFO_EXPRESSION_TYPE("{Int & String}")!>intersect(getIn(), Test.foo(this@build.getIn()))<!>
<!DEBUG_INFO_EXPRESSION_TYPE("{Int & String}")!>intersect(Test.foo(this@build.getIn()), Test.foo(getIn()))<!>
<!DEBUG_INFO_EXPRESSION_TYPE("{Int & String}")!>intersect(Test.foo(getIn()), this@build.getIn())<!>
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int")!>intersect(<!TYPE_MISMATCH!>this@build.getIn()<!>, getIn())<!>
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String")!>intersect(<!TYPE_MISMATCH!>getIn()<!>, Test.foo(this@build.getIn()))<!>
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int")!>intersect(<!TYPE_MISMATCH!>Test.foo(this@build.getIn())<!>, Test.foo(getIn()))<!>
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String")!>intersect(<!TYPE_MISMATCH!>Test.foo(getIn())<!>, this@build.getIn())<!>
""
}
""