From 0cccc61654dcb6ea95f68d256a328472bfd557bf Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 14 Sep 2020 21:16:53 +0200 Subject: [PATCH] JVM IR: unmute stepping test smartStepIntoInterfaceImpl.kt The only difference seems to be that step into IImpl.fooOverride is actually supported in JVM_IR. Also fix slightly incorrect line numbers in the comments. --- .../custom/smartStepIntoInterfaceImpl.ir.out | 40 +++++++++++++++++++ .../custom/smartStepIntoInterfaceImpl.kt | 10 ++--- .../custom/smartStepIntoInterfaceImpl.out | 1 - 3 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 idea/jvm-debugger/jvm-debugger-test/testData/stepping/custom/smartStepIntoInterfaceImpl.ir.out diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/custom/smartStepIntoInterfaceImpl.ir.out b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/custom/smartStepIntoInterfaceImpl.ir.out new file mode 100644 index 00000000000..b5a9e9a9d72 --- /dev/null +++ b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/custom/smartStepIntoInterfaceImpl.ir.out @@ -0,0 +1,40 @@ +LineBreakpoint created at smartStepIntoInterfaceImpl.kt:91 +LineBreakpoint created at smartStepIntoInterfaceImpl.kt:96 +LineBreakpoint created at smartStepIntoInterfaceImpl.kt:101 +LineBreakpoint created at smartStepIntoInterfaceImpl.kt:106 +LineBreakpoint created at smartStepIntoInterfaceImpl.kt:111 +LineBreakpoint created at smartStepIntoInterfaceImpl.kt:121 +LineBreakpoint created at smartStepIntoInterfaceImpl.kt:126 +LineBreakpoint created at smartStepIntoInterfaceImpl.kt:131 +LineBreakpoint created at smartStepIntoInterfaceImpl.kt:139 +LineBreakpoint created at smartStepIntoInterfaceImpl.kt:144 +LineBreakpoint created at smartStepIntoInterfaceImpl.kt:149 +LineBreakpoint created at smartStepIntoInterfaceImpl.kt:155 +Run Java +Connected to the target VM +smartStepIntoInterfaceImpl.kt:91 +smartStepIntoInterfaceImpl.kt:96 +smartStepIntoInterfaceImpl.kt:9 +smartStepIntoInterfaceImpl.kt:101 +smartStepIntoInterfaceImpl.kt:13 +smartStepIntoInterfaceImpl.kt:106 +smartStepIntoInterfaceImpl.kt:14 +smartStepIntoInterfaceImpl.kt:111 +smartStepIntoInterfaceImpl.kt:19 +smartStepIntoInterfaceImpl.kt:121 +smartStepIntoInterfaceImpl.kt:32 +smartStepIntoInterfaceImpl.kt:126 +smartStepIntoInterfaceImpl.kt:37 +smartStepIntoInterfaceImpl.kt:131 +smartStepIntoInterfaceImpl.kt:42 +smartStepIntoInterfaceImpl.kt:139 +MyJavaClass.java:10 +smartStepIntoInterfaceImpl.kt:144 +smartStepIntoInterfaceImpl.kt:60 +smartStepIntoInterfaceImpl.kt:149 +smartStepIntoInterfaceImpl.kt:65 +smartStepIntoInterfaceImpl.kt:155 +smartStepIntoInterfaceImpl.kt:71 +Disconnected from the target VM + +Process finished with exit code 0 diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/custom/smartStepIntoInterfaceImpl.kt b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/custom/smartStepIntoInterfaceImpl.kt index ccffea883ce..e51e0620745 100644 --- a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/custom/smartStepIntoInterfaceImpl.kt +++ b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/custom/smartStepIntoInterfaceImpl.kt @@ -27,7 +27,7 @@ interface I { } class IImpl: I { - // super call in override (step into doesn't work) + // super call in override (step into works in JVM_IR, doesn't work in the old backend) override fun fooOverride() { return super.fooOverride() } @@ -85,7 +85,7 @@ fun main(args: Array) { } fun testSmartStepInto() { - // TODO First time - doesn't work: should be smartStepIntoInterfaceImpl.kt:8 between smartStepIntoInterfaceImpl.kt:90 and 95 + // TODO First time - doesn't work: should be smartStepIntoInterfaceImpl.kt:9 between smartStepIntoInterfaceImpl.kt:91 and 96 // SMART_STEP_INTO_BY_INDEX: 2 //Breakpoint! barI().foo() @@ -114,7 +114,7 @@ fun testSmartStepInto() { fun testStepInto() { val ii = IImpl() - // TODO: should be smartStepIntoInterfaceImpl.kt:31 instead of smartStepIntoInterfaceImpl.kt:22 + // (Fixed in JVM_IR) TODO: should be smartStepIntoInterfaceImpl.kt:32 instead of smartStepIntoInterfaceImpl.kt:23 // STEP_INTO: 1 // RESUME: 1 //Breakpoint! @@ -132,7 +132,7 @@ fun testStepInto() { val ii2 = IImpl2() - // TODO: should be smartStepIntoInterfaceImpl.kt:48 instead of MyJavaClass.java:16 + // TODO: should be smartStepIntoInterfaceImpl.kt:49 instead of MyJavaClass.java:10 // STEP_INTO: 1 // RESUME: 1 //Breakpoint! @@ -148,7 +148,7 @@ fun testStepInto() { //Breakpoint! Obj.staticCallInOverride("a") - // TODO: should be smartStepIntoInterfaceImpl.kt:75 instead of smartStepIntoInterfaceImpl.kt:70 + // TODO: should be smartStepIntoInterfaceImpl.kt:76 instead of smartStepIntoInterfaceImpl.kt:71 // STEP_INTO: 1 // RESUME: 1 //Breakpoint! diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/custom/smartStepIntoInterfaceImpl.out b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/custom/smartStepIntoInterfaceImpl.out index d319d1d2fa7..63058728e6e 100644 --- a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/custom/smartStepIntoInterfaceImpl.out +++ b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/custom/smartStepIntoInterfaceImpl.out @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR LineBreakpoint created at smartStepIntoInterfaceImpl.kt:91 LineBreakpoint created at smartStepIntoInterfaceImpl.kt:96 LineBreakpoint created at smartStepIntoInterfaceImpl.kt:101