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

Put fix in 9123c4f73baf77f8a50dede6c890c46f5ffafd6c under the inference compatibility flag

Browse Source
This commit is contained in:
Victor Petukhov
2020-09-23 13:21:38 +03:00
parent bfb46befa5
commit 25ea3df5ca
14 changed files with 209 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/inference/capturedTypes/nullableCaptruredTypeAgainstNullableVariable.fir.kt
Vendored
+39
View File
@@ -0,0 +1,39 @@
// !DIAGNOSTICS: -CAST_NEVER_SUCCEEDS -REDUNDANT_PROJECTION
// !LANGUAGE: +InferenceCompatibility
// FILE: Foo.java
public class Foo<L> extends Bar<L> {
public Foo(L x) {
super(x);
}
}
// FILE: main.kt
fun <T : Any> Bar<T>.foo(): T = null as T
fun <T : Any> Bar<T?>.bar(): T = null as T
fun <T : Any> Foo<T>.boo1(): T = null as T
fun <T : Any> Foo<T?>.boo2(): T = null as T
open class Bar<out K>(val x: K)
fun main(x: Foo<out Number?>, y: Bar<out Number?>, z1: Foo<out Number>, z2: Bar<out Number>) {
x.foo()
x.bar()
x.boo1()
x.<!INAPPLICABLE_CANDIDATE!>boo2<!>()
y.<!INAPPLICABLE_CANDIDATE!>foo<!>()
y.bar()
y.<!INAPPLICABLE_CANDIDATE!>boo1<!>()
y.<!INAPPLICABLE_CANDIDATE!>boo2<!>()
z1.foo()
z1.bar()
z1.boo1()
z1.<!INAPPLICABLE_CANDIDATE!>boo2<!>()
z2.foo()
z2.bar()
z2.<!INAPPLICABLE_CANDIDATE!>boo1<!>()
z2.<!INAPPLICABLE_CANDIDATE!>boo2<!>()
}
compiler/testData/diagnostics/tests/inference/capturedTypes/nullableCaptruredTypeAgainstNullableVariable.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// !DIAGNOSTICS: -CAST_NEVER_SUCCEEDS -REDUNDANT_PROJECTION
// !LANGUAGE: +InferenceCompatibility
// FILE: Foo.java
public class Foo<L> extends Bar<L> {
compiler/testData/diagnostics/tests/inference/capturedTypes/nullableCaptruredTypeAgainstNullableVariableWithDisabledComplatibilityFlag.fir.kt
Vendored
+39
View File
@@ -0,0 +1,39 @@
// !DIAGNOSTICS: -CAST_NEVER_SUCCEEDS -REDUNDANT_PROJECTION
// !LANGUAGE: -InferenceCompatibility
// FILE: Foo.java
public class Foo<L> extends Bar<L> {
public Foo(L x) {
super(x);
}
}
// FILE: main.kt
fun <T : Any> Bar<T>.foo(): T = null as T
fun <T : Any> Bar<T?>.bar(): T = null as T
fun <T : Any> Foo<T>.boo1(): T = null as T
fun <T : Any> Foo<T?>.boo2(): T = null as T
open class Bar<out K>(val x: K)
fun main(x: Foo<out Number?>, y: Bar<out Number?>, z1: Foo<out Number>, z2: Bar<out Number>) {
x.foo()
x.bar()
x.boo1()
x.<!INAPPLICABLE_CANDIDATE!>boo2<!>()
y.<!INAPPLICABLE_CANDIDATE!>foo<!>()
y.bar()
y.<!INAPPLICABLE_CANDIDATE!>boo1<!>()
y.<!INAPPLICABLE_CANDIDATE!>boo2<!>()
z1.foo()
z1.bar()
z1.boo1()
z1.<!INAPPLICABLE_CANDIDATE!>boo2<!>()
z2.foo()
z2.bar()
z2.<!INAPPLICABLE_CANDIDATE!>boo1<!>()
z2.<!INAPPLICABLE_CANDIDATE!>boo2<!>()
}
compiler/testData/diagnostics/tests/inference/capturedTypes/nullableCaptruredTypeAgainstNullableVariableWithDisabledComplatibilityFlag.kt
Vendored
+39
View File
@@ -0,0 +1,39 @@
// !DIAGNOSTICS: -CAST_NEVER_SUCCEEDS -REDUNDANT_PROJECTION
// !LANGUAGE: -InferenceCompatibility
// FILE: Foo.java
public class Foo<L> extends Bar<L> {
public Foo(L x) {
super(x);
}
}
// FILE: main.kt
fun <T : Any> Bar<T>.foo(): T = null as T
fun <T : Any> Bar<T?>.bar(): T = null as T
fun <T : Any> Foo<T>.boo1(): T = null as T
fun <T : Any> Foo<T?>.boo2(): T = null as T
open class Bar<out K>(val x: K)
fun main(x: Foo<out Number?>, y: Bar<out Number?>, z1: Foo<out Number>, z2: Bar<out Number>) {
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>x.foo()<!>
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>x.bar()<!>
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Number?")!>x.boo1()<!>
<!DEBUG_INFO_EXPRESSION_TYPE("Type is unknown")!>x.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>boo2<!>()<!>
<!DEBUG_INFO_EXPRESSION_TYPE("Type is unknown")!>y.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>foo<!>()<!>
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Number")!>y.bar()<!>
<!DEBUG_INFO_EXPRESSION_TYPE("Type is unknown")!>y.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>boo1<!>()<!>
<!DEBUG_INFO_EXPRESSION_TYPE("Type is unknown")!>y.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>boo2<!>()<!>
<!DEBUG_INFO_EXPRESSION_TYPE("(kotlin.Number..kotlin.Number?)")!>z1.foo()<!>
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Number")!>z1.bar()<!>
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Number")!>z1.boo1()<!>
<!DEBUG_INFO_EXPRESSION_TYPE("Type is unknown")!>z1.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>boo2<!>()<!>
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Number")!>z2.foo()<!>
<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Number")!>z2.bar()<!>
<!DEBUG_INFO_EXPRESSION_TYPE("Type is unknown")!>z2.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>boo1<!>()<!>
<!DEBUG_INFO_EXPRESSION_TYPE("Type is unknown")!>z2.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>boo2<!>()<!>
}
compiler/testData/diagnostics/tests/inference/capturedTypes/nullableCaptruredTypeAgainstNullableVariableWithDisabledComplatibilityFlag.txt
Vendored
+23
View File
@@ -0,0 +1,23 @@
package
public fun main(/*0*/ x: Foo<out kotlin.Number?>, /*1*/ y: Bar<out kotlin.Number?>, /*2*/ z1: Foo<out kotlin.Number>, /*3*/ z2: Bar<out kotlin.Number>): kotlin.Unit
public fun </*0*/ T : kotlin.Any> Bar<T?>.bar(): T
public fun </*0*/ T : kotlin.Any> Foo<T>.boo1(): T
public fun </*0*/ T : kotlin.Any> Foo<T?>.boo2(): T
public fun </*0*/ T : kotlin.Any> Bar<T>.foo(): T
public open class Bar</*0*/ out K> {
public constructor Bar</*0*/ out K>(/*0*/ x: K)
public final val x: K
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public open class Foo</*0*/ L : kotlin.Any!> : Bar<L!> {
public constructor Foo</*0*/ L : kotlin.Any!>(/*0*/ x: L!)
public final override /*1*/ /*fake_override*/ val x: L!
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}