From 86cc5840ed3f487a6a1669bc5cd969b2f5eca932 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 14 Sep 2020 22:19:27 +0200 Subject: [PATCH] JVM IR: unmute stepping test noParameterExtensionLambdaArgumentCallInInline3.kt Bytecode generated by JVM IR ensures that on multiline expressions, every call is stepped over, which seems better than in the old backend. Also remove kt34905.kt since it duplicates this test case. --- .../test/IrKotlinSteppingTestGenerated.java | 5 ----- .../testData/stepping/stepOver/kt34905.kt | 18 ------------------ .../testData/stepping/stepOver/kt34905.out | 11 ----------- ...ExtensionLambdaArgumentCallInInline3.ir.out | 11 +++++++++++ ...eterExtensionLambdaArgumentCallInInline3.kt | 4 +++- ...terExtensionLambdaArgumentCallInInline3.out | 3 ++- 6 files changed, 16 insertions(+), 36 deletions(-) delete mode 100644 idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/kt34905.kt delete mode 100644 idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/kt34905.out create mode 100644 idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/noParameterExtensionLambdaArgumentCallInInline3.ir.out diff --git a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/IrKotlinSteppingTestGenerated.java b/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/IrKotlinSteppingTestGenerated.java index af4b9e3b882..59d83d7e7e4 100644 --- a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/IrKotlinSteppingTestGenerated.java +++ b/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/IrKotlinSteppingTestGenerated.java @@ -482,11 +482,6 @@ public class IrKotlinSteppingTestGenerated extends AbstractIrKotlinSteppingTest runTest("idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/kt24343.kt"); } - @TestMetadata("kt34905.kt") - public void testKt34905() throws Exception { - runTest("idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/kt34905.kt"); - } - @TestMetadata("lambdaToInlineFold.kt") public void testLambdaToInlineFold() throws Exception { runTest("idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/lambdaToInlineFold.kt"); diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/kt34905.kt b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/kt34905.kt deleted file mode 100644 index 2eadd07467b..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/kt34905.kt +++ /dev/null @@ -1,18 +0,0 @@ -package test - -fun main(args: Array) { - lookAtMe { - val c = "c" - } -} - -inline fun lookAtMe(f: String.() -> Unit) { - val a = "a" - - //Breakpoint! - "123". - f() - val b = "b" -} - -// STEP_OVER: 3 \ No newline at end of file diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/kt34905.out b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/kt34905.out deleted file mode 100644 index 8659b028eb5..00000000000 --- a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/kt34905.out +++ /dev/null @@ -1,11 +0,0 @@ -// IGNORE_BACKEND: JVM_IR -LineBreakpoint created at kt34905.kt:13 -Run Java -Connected to the target VM -kt34905.kt:13 -kt34905.kt:15 -kt34905.kt:16 -kt34905.kt:7 -Disconnected from the target VM - -Process finished with exit code 0 diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/noParameterExtensionLambdaArgumentCallInInline3.ir.out b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/noParameterExtensionLambdaArgumentCallInInline3.ir.out new file mode 100644 index 00000000000..1e3d16e4ef1 --- /dev/null +++ b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/noParameterExtensionLambdaArgumentCallInInline3.ir.out @@ -0,0 +1,11 @@ +LineBreakpoint created at noParameterExtensionLambdaArgumentCallInInline3.kt:12 +Run Java +Connected to the target VM +noParameterExtensionLambdaArgumentCallInInline3.kt:12 +noParameterExtensionLambdaArgumentCallInInline3.kt:13 +noParameterExtensionLambdaArgumentCallInInline3.kt:14 +noParameterExtensionLambdaArgumentCallInInline3.kt:15 +noParameterExtensionLambdaArgumentCallInInline3.kt:7 +Disconnected from the target VM + +Process finished with exit code 0 diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/noParameterExtensionLambdaArgumentCallInInline3.kt b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/noParameterExtensionLambdaArgumentCallInInline3.kt index a27a3a0c657..161bdcd8b8b 100644 --- a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/noParameterExtensionLambdaArgumentCallInInline3.kt +++ b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/noParameterExtensionLambdaArgumentCallInInline3.kt @@ -12,4 +12,6 @@ inline fun lookAtMe(f: String.() -> Unit) { "123". f() val b = "b" -} \ No newline at end of file +} + +// STEP_OVER: 4 diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/noParameterExtensionLambdaArgumentCallInInline3.out b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/noParameterExtensionLambdaArgumentCallInInline3.out index 4ef865ce3a3..1848ea736b2 100644 --- a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/noParameterExtensionLambdaArgumentCallInInline3.out +++ b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/stepOver/noParameterExtensionLambdaArgumentCallInInline3.out @@ -1,9 +1,10 @@ -// IGNORE_BACKEND: JVM_IR LineBreakpoint created at noParameterExtensionLambdaArgumentCallInInline3.kt:12 Run Java Connected to the target VM noParameterExtensionLambdaArgumentCallInInline3.kt:12 noParameterExtensionLambdaArgumentCallInInline3.kt:14 +noParameterExtensionLambdaArgumentCallInInline3.kt:15 +noParameterExtensionLambdaArgumentCallInInline3.kt:7 Disconnected from the target VM Process finished with exit code 0