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

Prevent recursion on captured recursive type parameters of inner classes during computing bound for them

Browse Source 
^KT-47459 Fixed
This commit is contained in:
Victor Petukhov
2021-06-28 16:15:02 +03:00
committed by TeamCityServer
parent e071281b20
commit ad89d43186
8 changed files with 90 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -21442,6 +21442,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
runTest("compiler/testData/diagnostics/tests/platformTypes/rawTypes/intermediateRecursion.kt");
}
@Test
@TestMetadata("kt47459.kt")
public void testKt47459() throws Exception {
runTest("compiler/testData/diagnostics/tests/platformTypes/rawTypes/kt47459.kt");
}
@Test
@TestMetadata("nonGenericRawMember.kt")
public void testNonGenericRawMember() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
Generated
+6
View File
@@ -21442,6 +21442,12 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
runTest("compiler/testData/diagnostics/tests/platformTypes/rawTypes/intermediateRecursion.kt");
}
@Test
@TestMetadata("kt47459.kt")
public void testKt47459() throws Exception {
runTest("compiler/testData/diagnostics/tests/platformTypes/rawTypes/kt47459.kt");
}
@Test
@TestMetadata("nonGenericRawMember.kt")
public void testNonGenericRawMember() throws Exception {
compiler/testData/diagnostics/tests/platformTypes/rawTypes/kt47459.kt
Vendored
+24
View File
@@ -0,0 +1,24 @@
// FIR_IDENTICAL
// FILE: MapObjectManager.java
abstract class MapObjectManager<C extends MapObjectManager.Collection> {
public class Collection {
}
public C getCollection(String id) {
return null;
}
}
// FILE: MarkerManager.java
public class MarkerManager extends MapObjectManager<MarkerManager.Collection> {
public class Collection extends MapObjectManager.Collection {
public void setOnMarkerClickListener() {
}
}
}
// FILE: main.kt
fun foo(markerManager: MarkerManager) {
val test: MarkerManager.Collection = markerManager.getCollection("FOO")!!
test.setOnMarkerClickListener()
}
compiler/testData/diagnostics/tests/platformTypes/rawTypes/kt47459.txt
Vendored
+34
View File
@@ -0,0 +1,34 @@
package
public fun foo(/*0*/ markerManager: MarkerManager): kotlin.Unit
public/*package*/ abstract class MapObjectManager</*0*/ C : MapObjectManager<(raw) MapObjectManager<*>.Collection>.Collection!> {
public/*package*/ constructor MapObjectManager</*0*/ C : MapObjectManager<(raw) MapObjectManager<*>.Collection>.Collection!>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getCollection(/*0*/ id: kotlin.String!): C!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public open inner class Collection /*captured type parameters: /*0*/ C : MapObjectManager<(raw) MapObjectManager<*>.Collection>.Collection!*/ {
public constructor Collection()
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 MarkerManager : MapObjectManager<MarkerManager.Collection!> {
public constructor MarkerManager()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun getCollection(/*0*/ id: kotlin.String!): MarkerManager.Collection!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public open inner class Collection : MapObjectManager<(raw) MapObjectManager<*>.Collection!>.Collection {
public constructor Collection()
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 fun setOnMarkerClickListener(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+6
View File
@@ -21448,6 +21448,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/platformTypes/rawTypes/intermediateRecursion.kt");
}
@Test
@TestMetadata("kt47459.kt")
public void testKt47459() throws Exception {
runTest("compiler/testData/diagnostics/tests/platformTypes/rawTypes/kt47459.kt");
}
@Test
@TestMetadata("nonGenericRawMember.kt")
public void testNonGenericRawMember() throws Exception {