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

JVM_IR fix override equivalence check for collection stub generation

Browse Source 
KT-42043 KT-42033
This commit is contained in:
Dmitry Petrov
2020-09-21 19:59:14 +03:00
parent fdc134ff66
commit c03573fc18
38 changed files with 1545 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
Generated
+5
View File
@@ -5058,6 +5058,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/collections/removeClashKotlin.kt");
}
@TestMetadata("removeClashWithGenerics.kt")
public void testRemoveClashWithGenerics() throws Exception {
runTest("compiler/testData/codegen/box/collections/removeClashWithGenerics.kt");
}
@TestMetadata("removeOverriddenInJava.kt")
public void testRemoveOverriddenInJava() throws Exception {
runTest("compiler/testData/codegen/box/collections/removeOverriddenInJava.kt");
compiler/tests/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java
Generated
+60
View File
@@ -229,11 +229,56 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/collectionStubs"), Pattern.compile("^(.+)\\.kt$"), null, true);
}
@TestMetadata("customListIterator.kt")
public void testCustomListIterator() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/customListIterator.kt");
}
@TestMetadata("customMutableListIterator.kt")
public void testCustomMutableListIterator() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/customMutableListIterator.kt");
}
@TestMetadata("noStubsForCollection.kt")
public void testNoStubsForCollection() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsForCollection.kt");
}
@TestMetadata("noStubsForMapImplementations.kt")
public void testNoStubsForMapImplementations() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsForMapImplementations.kt");
}
@TestMetadata("noStubsForMutableSetIterators.kt")
public void testNoStubsForMutableSetIterators() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsForMutableSetIterators.kt");
}
@TestMetadata("noStubsForSetIterators.kt")
public void testNoStubsForSetIterators() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsForSetIterators.kt");
}
@TestMetadata("noStubsInIterable.kt")
public void testNoStubsInIterable() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsInIterable.kt");
}
@TestMetadata("noStubsInJavaSuperClass.kt")
public void testNoStubsInJavaSuperClass() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsInJavaSuperClass.kt");
}
@TestMetadata("noStubsInMutableIterable.kt")
public void testNoStubsInMutableIterable() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsInMutableIterable.kt");
}
@TestMetadata("observableMutableMap.kt")
public void testObservableMutableMap() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/observableMutableMap.kt");
}
@TestMetadata("stubsFromSuperclass.kt")
public void testStubsFromSuperclass() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/stubsFromSuperclass.kt");
@@ -794,6 +839,16 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
@TestMetadata("abstractCollections.kt")
public void testAbstractCollections() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/specialBridges/abstractCollections.kt");
}
@TestMetadata("abstractIterables.kt")
public void testAbstractIterables() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/specialBridges/abstractIterables.kt");
}
@TestMetadata("abstractLists.kt")
public void testAbstractLists() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/specialBridges/abstractLists.kt");
@@ -809,6 +864,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
runTest("compiler/testData/codegen/bytecodeListing/specialBridges/abstractMutableLists.kt");
}
@TestMetadata("abstractSets.kt")
public void testAbstractSets() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/specialBridges/abstractSets.kt");
}
public void testAllFilesPresentInSpecialBridges() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/specialBridges"), Pattern.compile("^(.+)\\.kt$"), null, true);
}
compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -5058,6 +5058,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/collections/removeClashKotlin.kt");
}
@TestMetadata("removeClashWithGenerics.kt")
public void testRemoveClashWithGenerics() throws Exception {
runTest("compiler/testData/codegen/box/collections/removeClashWithGenerics.kt");
}
@TestMetadata("removeOverriddenInJava.kt")
public void testRemoveOverriddenInJava() throws Exception {
runTest("compiler/testData/codegen/box/collections/removeOverriddenInJava.kt");
compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
Generated
+5
View File
@@ -5028,6 +5028,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/collections/removeClashKotlin.kt");
}
@TestMetadata("removeClashWithGenerics.kt")
public void testRemoveClashWithGenerics() throws Exception {
runTest("compiler/testData/codegen/box/collections/removeClashWithGenerics.kt");
}
@TestMetadata("removeOverriddenInJava.kt")
public void testRemoveOverriddenInJava() throws Exception {
runTest("compiler/testData/codegen/box/collections/removeOverriddenInJava.kt");
compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBytecodeListingTestGenerated.java
Generated
+60
View File
@@ -229,11 +229,56 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/collectionStubs"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
}
@TestMetadata("customListIterator.kt")
public void testCustomListIterator() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/customListIterator.kt");
}
@TestMetadata("customMutableListIterator.kt")
public void testCustomMutableListIterator() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/customMutableListIterator.kt");
}
@TestMetadata("noStubsForCollection.kt")
public void testNoStubsForCollection() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsForCollection.kt");
}
@TestMetadata("noStubsForMapImplementations.kt")
public void testNoStubsForMapImplementations() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsForMapImplementations.kt");
}
@TestMetadata("noStubsForMutableSetIterators.kt")
public void testNoStubsForMutableSetIterators() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsForMutableSetIterators.kt");
}
@TestMetadata("noStubsForSetIterators.kt")
public void testNoStubsForSetIterators() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsForSetIterators.kt");
}
@TestMetadata("noStubsInIterable.kt")
public void testNoStubsInIterable() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsInIterable.kt");
}
@TestMetadata("noStubsInJavaSuperClass.kt")
public void testNoStubsInJavaSuperClass() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsInJavaSuperClass.kt");
}
@TestMetadata("noStubsInMutableIterable.kt")
public void testNoStubsInMutableIterable() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsInMutableIterable.kt");
}
@TestMetadata("observableMutableMap.kt")
public void testObservableMutableMap() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/observableMutableMap.kt");
}
@TestMetadata("stubsFromSuperclass.kt")
public void testStubsFromSuperclass() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/stubsFromSuperclass.kt");
@@ -764,6 +809,16 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
}
@TestMetadata("abstractCollections.kt")
public void testAbstractCollections() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/specialBridges/abstractCollections.kt");
}
@TestMetadata("abstractIterables.kt")
public void testAbstractIterables() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/specialBridges/abstractIterables.kt");
}
@TestMetadata("abstractLists.kt")
public void testAbstractLists() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/specialBridges/abstractLists.kt");
@@ -779,6 +834,11 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
runTest("compiler/testData/codegen/bytecodeListing/specialBridges/abstractMutableLists.kt");
}
@TestMetadata("abstractSets.kt")
public void testAbstractSets() throws Exception {
runTest("compiler/testData/codegen/bytecodeListing/specialBridges/abstractSets.kt");
}
public void testAllFilesPresentInSpecialBridges() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/specialBridges"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
}