From 19283048a885629fcfab45be4c474a5f8d758dd9 Mon Sep 17 00:00:00 2001 From: Ilmir Usmanov Date: Thu, 18 Jan 2024 00:32:33 +0100 Subject: [PATCH] Replace bytecode text test with a stepping test #KT-62965 --- .../FirLightTreeBytecodeTextTestGenerated.java | 6 ------ .../codegen/FirLightTreeSteppingTestGenerated.java | 6 ++++++ .../codegen/FirPsiBytecodeTextTestGenerated.java | 6 ------ .../codegen/FirPsiSteppingTestGenerated.java | 6 ++++++ .../backend/jvm/lower/FunctionReferenceLowering.kt | 2 +- .../codegen/bytecodeText/lineNumbers/kt62965.kt | 8 -------- compiler/testData/debug/stepping/javaSam.kt | 13 +++++++++++++ .../runners/JvmAbiConsistencyTestRestGenerated.java | 6 ------ .../codegen/IrBytecodeTextTestGenerated.java | 6 ------ .../IrSteppingWithBytecodeInlinerTestGenerated.java | 6 ++++++ .../IrSteppingWithIrInlinerTestGenerated.java | 6 ++++++ 11 files changed, 38 insertions(+), 33 deletions(-) delete mode 100644 compiler/testData/codegen/bytecodeText/lineNumbers/kt62965.kt create mode 100644 compiler/testData/debug/stepping/javaSam.kt diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBytecodeTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBytecodeTextTestGenerated.java index ce59c3ec18d..ab654954251 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBytecodeTextTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBytecodeTextTestGenerated.java @@ -4612,12 +4612,6 @@ public class FirLightTreeBytecodeTextTestGenerated extends AbstractFirLightTreeB runTest("compiler/testData/codegen/bytecodeText/lineNumbers/kt61768.kt"); } - @Test - @TestMetadata("kt62965.kt") - public void testKt62965() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/lineNumbers/kt62965.kt"); - } - @Test @TestMetadata("singleThen.kt") public void testSingleThen() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeSteppingTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeSteppingTestGenerated.java index 5250d0662fe..6ffdb5dd70f 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeSteppingTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeSteppingTestGenerated.java @@ -295,6 +295,12 @@ public class FirLightTreeSteppingTestGenerated extends AbstractFirLightTreeStepp runTest("compiler/testData/debug/stepping/inlineSimpleCall.kt"); } + @Test + @TestMetadata("javaSam.kt") + public void testJavaSam() throws Exception { + runTest("compiler/testData/debug/stepping/javaSam.kt"); + } + @Test @TestMetadata("kt15259.kt") public void testKt15259() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBytecodeTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBytecodeTextTestGenerated.java index f8d1a951b75..5ea922fb622 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBytecodeTextTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBytecodeTextTestGenerated.java @@ -4612,12 +4612,6 @@ public class FirPsiBytecodeTextTestGenerated extends AbstractFirPsiBytecodeTextT runTest("compiler/testData/codegen/bytecodeText/lineNumbers/kt61768.kt"); } - @Test - @TestMetadata("kt62965.kt") - public void testKt62965() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/lineNumbers/kt62965.kt"); - } - @Test @TestMetadata("singleThen.kt") public void testSingleThen() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiSteppingTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiSteppingTestGenerated.java index a58eacb21ca..b1c8d603b58 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiSteppingTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiSteppingTestGenerated.java @@ -295,6 +295,12 @@ public class FirPsiSteppingTestGenerated extends AbstractFirPsiSteppingTest { runTest("compiler/testData/debug/stepping/inlineSimpleCall.kt"); } + @Test + @TestMetadata("javaSam.kt") + public void testJavaSam() throws Exception { + runTest("compiler/testData/debug/stepping/javaSam.kt"); + } + @Test @TestMetadata("kt15259.kt") public void testKt15259() throws Exception { diff --git a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/FunctionReferenceLowering.kt b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/FunctionReferenceLowering.kt index 662387013ae..1a2c22ff822 100644 --- a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/FunctionReferenceLowering.kt +++ b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/FunctionReferenceLowering.kt @@ -401,7 +401,7 @@ internal class FunctionReferenceLowering(private val context: JvmBackendContext) samType: IrType, lambdaMetafactoryArguments: LambdaMetafactoryArguments, startOffset: Int = UNDEFINED_OFFSET, - endOffset:Int = UNDEFINED_OFFSET + endOffset: Int = UNDEFINED_OFFSET, ): IrCall { val notNullSamType = samType.makeNotNull() .removeAnnotations { it.type.classFqName in specialNullabilityAnnotationsFqNames } diff --git a/compiler/testData/codegen/bytecodeText/lineNumbers/kt62965.kt b/compiler/testData/codegen/bytecodeText/lineNumbers/kt62965.kt deleted file mode 100644 index 329bb0729a7..00000000000 --- a/compiler/testData/codegen/bytecodeText/lineNumbers/kt62965.kt +++ /dev/null @@ -1,8 +0,0 @@ -// TARGET_BACKEND: JVM_IR - -fun foo() { - Runnable { - }.run() -} - -// 1 LINENUMBER 4 L0\n +INVOKEDYNAMIC run\(\)Ljava/lang/Runnable \ No newline at end of file diff --git a/compiler/testData/debug/stepping/javaSam.kt b/compiler/testData/debug/stepping/javaSam.kt new file mode 100644 index 00000000000..0b62658dc0a --- /dev/null +++ b/compiler/testData/debug/stepping/javaSam.kt @@ -0,0 +1,13 @@ +// TARGET_BACKEND: JVM_IR + +// FILE: test.kt + +fun box() { + Runnable { + }.run() +} + +// EXPECTATIONS JVM_IR +// test.kt:6 box +// test.kt:7 box +// test.kt:8 box diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestRestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestRestGenerated.java index 4c709011936..666e393e23c 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestRestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestRestGenerated.java @@ -11381,12 +11381,6 @@ public class JvmAbiConsistencyTestRestGenerated extends AbstractJvmAbiConsistenc runTest("compiler/testData/codegen/bytecodeText/lineNumbers/kt61768.kt"); } - @Test - @TestMetadata("kt62965.kt") - public void testKt62965() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/lineNumbers/kt62965.kt"); - } - @Test @TestMetadata("singleThen.kt") public void testSingleThen() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java index 487d1927d95..49d33da856c 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java @@ -4612,12 +4612,6 @@ public class IrBytecodeTextTestGenerated extends AbstractIrBytecodeTextTest { runTest("compiler/testData/codegen/bytecodeText/lineNumbers/kt61768.kt"); } - @Test - @TestMetadata("kt62965.kt") - public void testKt62965() throws Exception { - runTest("compiler/testData/codegen/bytecodeText/lineNumbers/kt62965.kt"); - } - @Test @TestMetadata("singleThen.kt") public void testSingleThen() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrSteppingWithBytecodeInlinerTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrSteppingWithBytecodeInlinerTestGenerated.java index 136f3dab980..0a6871c0007 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrSteppingWithBytecodeInlinerTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrSteppingWithBytecodeInlinerTestGenerated.java @@ -295,6 +295,12 @@ public class IrSteppingWithBytecodeInlinerTestGenerated extends AbstractIrSteppi runTest("compiler/testData/debug/stepping/inlineSimpleCall.kt"); } + @Test + @TestMetadata("javaSam.kt") + public void testJavaSam() throws Exception { + runTest("compiler/testData/debug/stepping/javaSam.kt"); + } + @Test @TestMetadata("kt15259.kt") public void testKt15259() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrSteppingWithIrInlinerTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrSteppingWithIrInlinerTestGenerated.java index 2aec6a63344..b8861787999 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrSteppingWithIrInlinerTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrSteppingWithIrInlinerTestGenerated.java @@ -295,6 +295,12 @@ public class IrSteppingWithIrInlinerTestGenerated extends AbstractIrSteppingWith runTest("compiler/testData/debug/stepping/inlineSimpleCall.kt"); } + @Test + @TestMetadata("javaSam.kt") + public void testJavaSam() throws Exception { + runTest("compiler/testData/debug/stepping/javaSam.kt"); + } + @Test @TestMetadata("kt15259.kt") public void testKt15259() throws Exception {