From 445b2d6eb1b65c3ab474e1d1f7c7c62df6c63a65 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 28 Sep 2020 19:00:03 +0200 Subject: [PATCH] JVM IR: minor, unmute bytecode text test Also fix typo in the name --- .../ir/FirBytecodeTextTestGenerated.java | 6 ++--- .../inline/deleteClassOnTransformation.kt | 26 +++++++++++++++++++ .../inline/deleteClassOnTransfromation.kt | 21 --------------- .../codegen/BytecodeTextTestGenerated.java | 6 ++--- .../ir/IrBytecodeTextTestGenerated.java | 6 ++--- 5 files changed, 35 insertions(+), 30 deletions(-) create mode 100644 compiler/testData/codegen/bytecodeText/inline/deleteClassOnTransformation.kt delete mode 100644 compiler/testData/codegen/bytecodeText/inline/deleteClassOnTransfromation.kt diff --git a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBytecodeTextTestGenerated.java b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBytecodeTextTestGenerated.java index 14951d644db..48dbf02fed2 100644 --- a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBytecodeTextTestGenerated.java +++ b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBytecodeTextTestGenerated.java @@ -2876,9 +2876,9 @@ public class FirBytecodeTextTestGenerated extends AbstractFirBytecodeTextTest { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText/inline"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } - @TestMetadata("deleteClassOnTransfromation.kt") - public void testDeleteClassOnTransfromation() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/inline/deleteClassOnTransfromation.kt"); + @TestMetadata("deleteClassOnTransformation.kt") + public void testDeleteClassOnTransformation() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/inline/deleteClassOnTransformation.kt"); } @TestMetadata("finallyMarkers.kt") diff --git a/compiler/testData/codegen/bytecodeText/inline/deleteClassOnTransformation.kt b/compiler/testData/codegen/bytecodeText/inline/deleteClassOnTransformation.kt new file mode 100644 index 00000000000..ab29ce72152 --- /dev/null +++ b/compiler/testData/codegen/bytecodeText/inline/deleteClassOnTransformation.kt @@ -0,0 +1,26 @@ +fun test() { + { + {}() + }() +} + +inline fun ifun(s: () -> Unit) { + s() +} + +fun test2() { + var z = 1; + ifun { + { z = 2 }() + } +} + +// 1 class DeleteClassOnTransformationKt\$test\$1\$1 + +// JVM_TEMPLATES: +// 0 class DeleteClassOnTransformationKt\$test2\$1\$1 +// 1 class DeleteClassOnTransformationKt\$test2\$\$inlined\$ifun\$lambda\$1 + +// JVM_IR_TEMPLATES: +// 1 class DeleteClassOnTransformationKt\$test2\$1\$1 +// 0 class DeleteClassOnTransformationKt\$test2\$\$inlined diff --git a/compiler/testData/codegen/bytecodeText/inline/deleteClassOnTransfromation.kt b/compiler/testData/codegen/bytecodeText/inline/deleteClassOnTransfromation.kt deleted file mode 100644 index 0f94cb3f32c..00000000000 --- a/compiler/testData/codegen/bytecodeText/inline/deleteClassOnTransfromation.kt +++ /dev/null @@ -1,21 +0,0 @@ -// IGNORE_BACKEND_FIR: JVM_IR -// IGNORE_BACKEND: JVM_IR -fun test() { - { - {}() - }() -} - -inline fun ifun(s: () -> Unit) { - s() -} - -fun test2() { - var z = 1; - ifun { - { z = 2 }() - } -} - -// 1 class DeleteClassOnTransfromationKt\$test\$1\$1 -// 0 class DeleteClassOnTransfromationKt\$test2\$1\$1 \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java index 76b6f1d1834..5634bcbce89 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java @@ -2781,9 +2781,9 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText/inline"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); } - @TestMetadata("deleteClassOnTransfromation.kt") - public void testDeleteClassOnTransfromation() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/inline/deleteClassOnTransfromation.kt"); + @TestMetadata("deleteClassOnTransformation.kt") + public void testDeleteClassOnTransformation() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/inline/deleteClassOnTransformation.kt"); } @TestMetadata("finallyMarkers.kt") diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBytecodeTextTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBytecodeTextTestGenerated.java index b404de80e7f..66f7387048a 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBytecodeTextTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBytecodeTextTestGenerated.java @@ -2876,9 +2876,9 @@ public class IrBytecodeTextTestGenerated extends AbstractIrBytecodeTextTest { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText/inline"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } - @TestMetadata("deleteClassOnTransfromation.kt") - public void testDeleteClassOnTransfromation() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/inline/deleteClassOnTransfromation.kt"); + @TestMetadata("deleteClassOnTransformation.kt") + public void testDeleteClassOnTransformation() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/inline/deleteClassOnTransformation.kt"); } @TestMetadata("finallyMarkers.kt")