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

[FIR] Unwrap definitely not-null types in type parameter cycle checks

Browse Source 
#KT-58944 Fixed
This commit is contained in:
Brian Norman
2023-06-09 07:19:47 -05:00
committed by Space Team
parent 2bbf57c15e
commit a71437335b
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt
+7 -1
View File
@@ -289,8 +289,14 @@ open class FirTypeResolveTransformer(
if (visited.isNotEmpty() && currentTypeParameter == typeParameter) return true
if (!visited.add(currentTypeParameter)) return false
fun ConeKotlinType.toNextTypeParameter(): FirTypeParameter? = when (this) {
is ConeTypeParameterType -> lookupTag.typeParameterSymbol.fir
is ConeDefinitelyNotNullType -> original.toNextTypeParameter()
else -> null
}
return currentTypeParameter.bounds.any {
val nextTypeParameter = it.coneTypeSafe<ConeTypeParameterType>()?.lookupTag?.typeParameterSymbol?.fir ?: return@any false
val nextTypeParameter = it.coneTypeOrNull?.toNextTypeParameter() ?: return@any false
hasSupertypePathToParameter(nextTypeParameter, typeParameter, visited)
}
compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/recursiveBounds.fir.kt
Vendored
+2 -1
View File
@@ -8,4 +8,5 @@ class A2<K : Comparable<K & Any>?>
fun <R : T & Any, T> bar() {}
fun <<!CYCLIC_GENERIC_UPPER_BOUND!>E : <!INCORRECT_LEFT_COMPONENT_OF_INTERSECTION!>E<!> & Any<!>> baz() {}
fun <<!CYCLIC_GENERIC_UPPER_BOUND!>E : E & Any<!>> baz1() {}
fun <<!CYCLIC_GENERIC_UPPER_BOUND!>E : E & Any<!>> E?.baz2() {}
compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/recursiveBounds.kt
Vendored
+2 -1
View File
@@ -8,4 +8,5 @@ class A2<K : Comparable<<!INCORRECT_LEFT_COMPONENT_OF_INTERSECTION!>K<!> & Any>?
fun <R : T & Any, T> bar() {}
fun <<!CYCLIC_GENERIC_UPPER_BOUND!>E : <!INCORRECT_LEFT_COMPONENT_OF_INTERSECTION!>E & Any<!><!>> baz() {}
fun <<!CYCLIC_GENERIC_UPPER_BOUND!>E : <!INCORRECT_LEFT_COMPONENT_OF_INTERSECTION!>E & Any<!><!>> baz1() {}
fun <<!CYCLIC_GENERIC_UPPER_BOUND!>E : <!INCORRECT_LEFT_COMPONENT_OF_INTERSECTION!>E & Any<!><!>> E?.baz2() {}
compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/recursiveBounds.txt
Vendored
+2 -1
View File
@@ -1,9 +1,10 @@
package
public fun </*0*/ R : T & Any, /*1*/ T> bar(): kotlin.Unit
public fun </*0*/ E : [Error type: Cyclic upper bounds]> baz(): kotlin.Unit
public fun </*0*/ E : [Error type: Cyclic upper bounds]> baz1(): kotlin.Unit
public fun </*0*/ T : kotlin.Comparable<T & Any>> sort1(): kotlin.Unit
public fun </*0*/ T : kotlin.Comparable<T & Any>?> sort2(): kotlin.Unit
public fun </*0*/ E : [Error type: Cyclic upper bounds]> [Error type: Error type parameter]?.baz2(): kotlin.Unit
public final class A1</*0*/ K : kotlin.Comparable<K>> {
public constructor A1</*0*/ K : kotlin.Comparable<K>>()