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

JVM_IR fix special bridges in mixed Java/Kotlin hierarchies

Browse Source 
KT-50257 KT-50476
This commit is contained in:
Dmitry Petrov
2021-12-22 15:30:09 +03:00
committed by Space
parent 3f056bc086
commit 5946242d75
34 changed files with 1632 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+65 -11
View File
@@ -2652,54 +2652,108 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
}
@Nested
@TestMetadata("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections")
@TestMetadata("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses")
@TestDataPath("$PROJECT_ROOT")
public class ExtendJavaCollections {
public class ExtendJavaClasses {
@Test
@TestMetadata("abstractList.kt")
public void testAbstractList() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractList.kt");
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/abstractList.kt");
}
@Test
@TestMetadata("abstractMap.kt")
public void testAbstractMap() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractMap.kt");
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/abstractMap.kt");
}
@Test
@TestMetadata("abstractSet.kt")
public void testAbstractSet() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractSet.kt");
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/abstractSet.kt");
}
@Test
public void testAllFilesPresentInExtendJavaCollections() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
public void testAllFilesPresentInExtendJavaClasses() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
}
@Test
@TestMetadata("arrayList.kt")
public void testArrayList() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/arrayList.kt");
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/arrayList.kt");
}
@Test
@TestMetadata("charSequenceGetOverriddenInJavaSuperClass.kt")
public void testCharSequenceGetOverriddenInJavaSuperClass() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/charSequenceGetOverriddenInJavaSuperClass.kt");
}
@Test
@TestMetadata("extendArrayListThroughKotlin.kt")
public void testExtendArrayListThroughKotlin() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/extendArrayListThroughKotlin.kt");
}
@Test
@TestMetadata("hashMap.kt")
public void testHashMap() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/hashMap.kt");
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/hashMap.kt");
}
@Test
@TestMetadata("hashSet.kt")
public void testHashSet() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/hashSet.kt");
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/hashSet.kt");
}
@Test
@TestMetadata("mapEntry.kt")
public void testMapEntry() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/mapEntry.kt");
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/mapEntry.kt");
}
@Test
@TestMetadata("numberMixedHierarchy.kt")
public void testNumberMixedHierarchy() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/numberMixedHierarchy.kt");
}
@Test
@TestMetadata("removeAtBridgeToJavaClass.kt")
public void testRemoveAtBridgeToJavaClass() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/removeAtBridgeToJavaClass.kt");
}
@Test
@TestMetadata("removeAtBridgeToJavaDefault.kt")
public void testRemoveAtBridgeToJavaDefault() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/removeAtBridgeToJavaDefault.kt");
}
@Test
@TestMetadata("removeAtBridgeToJavaSuperClass.kt")
public void testRemoveAtBridgeToJavaSuperClass() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/removeAtBridgeToJavaSuperClass.kt");
}
@Test
@TestMetadata("superCallToFakeRemoveAt.kt")
public void testSuperCallToFakeRemoveAt() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/superCallToFakeRemoveAt.kt");
}
@Test
@TestMetadata("superCallToRemoveAt.kt")
public void testSuperCallToRemoveAt() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/superCallToRemoveAt.kt");
}
@Test
@TestMetadata("superCallToRemoveAtInJavaDefault.kt")
public void testSuperCallToRemoveAtInJavaDefault() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/superCallToRemoveAtInJavaDefault.kt");
}
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeListingTestGenerated.java
Generated
+6
View File
@@ -538,6 +538,12 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMutableList.kt");
}
@Test
@TestMetadata("intArrayList.kt")
public void testIntArrayList() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/intArrayList.kt");
}
@Test
@TestMetadata("kt44233.kt")
public void testKt44233() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+65 -11
View File
@@ -2736,54 +2736,108 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
}
@Nested
@TestMetadata("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections")
@TestMetadata("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses")
@TestDataPath("$PROJECT_ROOT")
public class ExtendJavaCollections {
public class ExtendJavaClasses {
@Test
@TestMetadata("abstractList.kt")
public void testAbstractList() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractList.kt");
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/abstractList.kt");
}
@Test
@TestMetadata("abstractMap.kt")
public void testAbstractMap() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractMap.kt");
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/abstractMap.kt");
}
@Test
@TestMetadata("abstractSet.kt")
public void testAbstractSet() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractSet.kt");
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/abstractSet.kt");
}
@Test
public void testAllFilesPresentInExtendJavaCollections() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
public void testAllFilesPresentInExtendJavaClasses() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
}
@Test
@TestMetadata("arrayList.kt")
public void testArrayList() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/arrayList.kt");
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/arrayList.kt");
}
@Test
@TestMetadata("charSequenceGetOverriddenInJavaSuperClass.kt")
public void testCharSequenceGetOverriddenInJavaSuperClass() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/charSequenceGetOverriddenInJavaSuperClass.kt");
}
@Test
@TestMetadata("extendArrayListThroughKotlin.kt")
public void testExtendArrayListThroughKotlin() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/extendArrayListThroughKotlin.kt");
}
@Test
@TestMetadata("hashMap.kt")
public void testHashMap() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/hashMap.kt");
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/hashMap.kt");
}
@Test
@TestMetadata("hashSet.kt")
public void testHashSet() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/hashSet.kt");
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/hashSet.kt");
}
@Test
@TestMetadata("mapEntry.kt")
public void testMapEntry() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/mapEntry.kt");
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/mapEntry.kt");
}
@Test
@TestMetadata("numberMixedHierarchy.kt")
public void testNumberMixedHierarchy() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/numberMixedHierarchy.kt");
}
@Test
@TestMetadata("removeAtBridgeToJavaClass.kt")
public void testRemoveAtBridgeToJavaClass() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/removeAtBridgeToJavaClass.kt");
}
@Test
@TestMetadata("removeAtBridgeToJavaDefault.kt")
public void testRemoveAtBridgeToJavaDefault() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/removeAtBridgeToJavaDefault.kt");
}
@Test
@TestMetadata("removeAtBridgeToJavaSuperClass.kt")
public void testRemoveAtBridgeToJavaSuperClass() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/removeAtBridgeToJavaSuperClass.kt");
}
@Test
@TestMetadata("superCallToFakeRemoveAt.kt")
public void testSuperCallToFakeRemoveAt() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/superCallToFakeRemoveAt.kt");
}
@Test
@TestMetadata("superCallToRemoveAt.kt")
public void testSuperCallToRemoveAt() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/superCallToRemoveAt.kt");
}
@Test
@TestMetadata("superCallToRemoveAtInJavaDefault.kt")
public void testSuperCallToRemoveAtInJavaDefault() throws Exception {
runTest("compiler/testData/codegen/box/builtinStubMethods/extendJavaClasses/superCallToRemoveAtInJavaDefault.kt");
}
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeListingTestGenerated.java
Generated
+6
View File
@@ -586,6 +586,12 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/inheritingFromAbstractMutableList.kt");
}
@Test
@TestMetadata("intArrayList.kt")
public void testIntArrayList() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/intArrayList.kt");
}
@Test
@TestMetadata("kt44233.kt")
public void testKt44233() throws Exception {