From 70095712eb2ed2763812ce26585c3fd800329980 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Fri, 25 Sep 2020 13:49:38 +0300 Subject: [PATCH] Minor: drop new bytecode listing test that passes only in JVM_IR Unfortunately, there's no way to mute it in JVM right now. Corresponding case is tracked as KT-42179, anyway. --- .../noStubsInJavaSuperClass2.kt | 18 --------- .../noStubsInJavaSuperClass2.txt | 39 ------------------- .../codegen/BytecodeListingTestGenerated.java | 5 --- .../ir/IrBytecodeListingTestGenerated.java | 5 --- 4 files changed, 67 deletions(-) delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsInJavaSuperClass2.kt delete mode 100644 compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsInJavaSuperClass2.txt diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsInJavaSuperClass2.kt b/compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsInJavaSuperClass2.kt deleted file mode 100644 index 139d1119902..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsInJavaSuperClass2.kt +++ /dev/null @@ -1,18 +0,0 @@ -// WITH_RUNTIME -// IGNORE_BACKEND: JVM -// ^ see KT-42179 - -// FILE: test/JC.java -package test; - -import java.util.Collection; - -public abstract class JC implements Collection { -} - -// FILE: noStubsInJavaSuperClass2.kt -package test - -abstract class KSet : JC(), Set - -abstract class KList : JC(), List \ No newline at end of file diff --git a/compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsInJavaSuperClass2.txt b/compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsInJavaSuperClass2.txt deleted file mode 100644 index a1fabfb0f62..00000000000 --- a/compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsInJavaSuperClass2.txt +++ /dev/null @@ -1,39 +0,0 @@ -@kotlin.Metadata -public abstract class test/KList { - // source: 'noStubsInJavaSuperClass2.kt' - public method (): void - public method add(p0: int, p1: java.lang.Object): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: int, p1: java.util.Collection): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public abstract method getSize(): int - public method listIterator(): java.util.ListIterator - public method listIterator(p0: int): java.util.ListIterator - public method remove(p0: int): java.lang.Object - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public method set(p0: int, p1: java.lang.Object): java.lang.Object - public bridge final method size(): int - public method subList(p0: int, p1: int): java.util.List - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} - -@kotlin.Metadata -public abstract class test/KSet { - // source: 'noStubsInJavaSuperClass2.kt' - public method (): void - public method add(p0: java.lang.Object): boolean - public method addAll(p0: java.util.Collection): boolean - public method clear(): void - public abstract method getSize(): int - public method iterator(): java.util.Iterator - public method remove(p0: java.lang.Object): boolean - public method removeAll(p0: java.util.Collection): boolean - public method retainAll(p0: java.util.Collection): boolean - public bridge final method size(): int - public method toArray(): java.lang.Object[] - public method toArray(p0: java.lang.Object[]): java.lang.Object[] -} diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java index c9c370fa920..49da3d76f79 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java @@ -289,11 +289,6 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest { runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsInJavaSuperClass.kt"); } - @TestMetadata("noStubsInJavaSuperClass2.kt") - public void testNoStubsInJavaSuperClass2() throws Exception { - runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsInJavaSuperClass2.kt"); - } - @TestMetadata("noStubsInMutableIterable.kt") public void testNoStubsInMutableIterable() throws Exception { runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsInMutableIterable.kt"); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBytecodeListingTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBytecodeListingTestGenerated.java index 6c23cef812d..10bad3b9124 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBytecodeListingTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBytecodeListingTestGenerated.java @@ -289,11 +289,6 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsInJavaSuperClass.kt"); } - @TestMetadata("noStubsInJavaSuperClass2.kt") - public void testNoStubsInJavaSuperClass2() throws Exception { - runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsInJavaSuperClass2.kt"); - } - @TestMetadata("noStubsInMutableIterable.kt") public void testNoStubsInMutableIterable() throws Exception { runTest("compiler/testData/codegen/bytecodeListing/collectionStubs/noStubsInMutableIterable.kt");