Debugger: fix EE for localvariables inside inline function call

#KT-10674 Fixed
2016-01-15 17:33:34 +03:00
parent 203cab8d1b
commit ba323098ea
4 changed files with 106 additions and 3 deletions
@@ -56,9 +56,11 @@ class FrameVisitor(context: EvaluationContextImpl) {
                else -> {
                    if (isInsideInlineFunctionBody(frame.visibleVariables())) {
                        val number = numberOfInlinedFunctions(frame.visibleVariables())
-                        val inlineFunVar = findLocalVariableForInlineArgument(name, number, asmType, true)
-                        if (inlineFunVar != null) {
-                            return inlineFunVar
+                        for (inlineFunctionIndex in number downTo 1) {
+                            val inlineFunVar = findLocalVariableForInlineArgument(name, inlineFunctionIndex, asmType, true)
+                            if (inlineFunVar != null) {
+                                return inlineFunVar
+                            }
                        }
                    }

@@ -0,0 +1,57 @@
+LineBreakpoint created at frameInlineArgumentInsideInlineFun.kt:16
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameInlineArgumentInsideInlineFun.FrameInlineArgumentInsideInlineFunKt
+Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+frameInlineArgumentInsideInlineFun.kt:16
+Compile bytecode for element
+// KT-10674: Debugger: Evaluate Expression / Watches fail for variable/parameter captured from one inline function to another
+package frameInlineArgumentInsideInlineFun
+
+class A {
+    inline fun inlineFun(s: (Int) -> Unit) {
+        val element = 1.0
+        s(1)
+    }
+}
+
+class B {
+    inline fun foo(s: (Int) -> Unit) {
+        val element = 1
+        A().inlineFun {
+            //Breakpoint!
+            val e = element
+        }
+        s(1)
+    }
+}
+
+class C {
+    fun bar() {
+        val element = 1f
+        B().foo {
+            val e = element
+        }
+    }
+}
+
+fun main(args: Array<String>) {
+    C().bar()
+}
+
+// PRINT_FRAME
+
+// EXPRESSION: element
+// RESULT: 1: I
+ frame    = bar():16, C {frameInlineArgumentInsideInlineFun}
+   this     = this = {frameInlineArgumentInsideInlineFun.C@uniqueID}
+              - Class has no fields
+   local    = element: float = 1.0 (sp = frameInlineArgumentInsideInlineFun.kt, 13)
+   local    = this_$iv: frameInlineArgumentInsideInlineFun.B = {frameInlineArgumentInsideInlineFun.B@uniqueID} (sp = null)
+              - Class has no fields
+   local    = element$iv: int = 1 (sp = frameInlineArgumentInsideInlineFun.kt, 13)
+   local    = this_$iv$iv: frameInlineArgumentInsideInlineFun.A = {frameInlineArgumentInsideInlineFun.A@uniqueID} (sp = null)
+              - Class has no fields
+   local    = element$iv$iv: double = 1.0 (sp = frameInlineArgumentInsideInlineFun.kt, 13)
+   local    = it$iv: int = 1 (sp = null)
+Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+
+Process finished with exit code 0
@@ -0,0 +1,38 @@
+// KT-10674: Debugger: Evaluate Expression / Watches fail for variable/parameter captured from one inline function to another
+package frameInlineArgumentInsideInlineFun
+
+class A {
+    inline fun inlineFun(s: (Int) -> Unit) {
+        val element = 1.0
+        s(1)
+    }
+}
+
+class B {
+    inline fun foo(s: (Int) -> Unit) {
+        val element = 1
+        A().inlineFun {
+            //Breakpoint!
+            val e = element
+        }
+        s(1)
+    }
+}
+
+class C {
+    fun bar() {
+        val element = 1f
+        B().foo {
+            val e = element
+        }
+    }
+}
+
+fun main(args: Array<String>) {
+    C().bar()
+}
+
+// PRINT_FRAME
+
+// EXPRESSION: element
+// RESULT: 1: I
@@ -513,6 +513,12 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat
                doSingleBreakpointTest(fileName);
            }

+            @TestMetadata("frameInlineArgumentInsideInlineFun.kt")
+            public void testFrameInlineArgumentInsideInlineFun() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInlineArgumentInsideInlineFun.kt");
+                doSingleBreakpointTest(fileName);
+            }
+
            @TestMetadata("frameInlineFun.kt")
            public void testFrameInlineFun() throws Exception {
                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInlineFun.kt");