Better search for inlined strings in strata: there might me several file mappings to the same file (KT-12896)

#KT-12896 In Progress
2016-08-01 15:51:59 +03:00
parent ace58e8aa2
commit 2dd7470cdc
12 changed files with 128 additions and 2 deletions
@@ -0,0 +1,8 @@
+LineBreakpoint created at dexInlineInClass.Other.kt:6
+!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! dexInlineInClass.DexInlineInClassKt
+Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+dexInlineInClass.Other.kt:6
+dexInlineInClass.Other.kt:7
+Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+
+Process finished with exit code 0
@@ -0,0 +1,8 @@
+LineBreakpoint created at dexInlineInObject.Other.kt:6
+!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! dexInlineInObject.DexInlineInObjectKt
+Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+dexInlineInObject.Other.kt:6
+dexInlineInObject.Other.kt:7
+Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+
+Process finished with exit code 0
@@ -0,0 +1,10 @@
+LineBreakpoint created at dexInlineInObjectSameFile.kt:5
+LineBreakpoint created at dexInlineInObjectSameFile.kt:11
+!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! dexInlineInObjectSameFile.DexInlineInObjectSameFileKt
+Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+dexInlineInObjectSameFile.kt:5
+dexInlineInObjectSameFile.kt:11
+Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+
+Process finished with exit code 0
+
@@ -0,0 +1,10 @@
+LineBreakpoint created at inlineInObject.kt:5
+LineBreakpoint created at inlineInObject.kt:11
+!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! inlineInObject.InlineInObjectKt
+Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+inlineInObject.kt:5
+inlineInObject.kt:11
+Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+
+Process finished with exit code 0
+
@@ -0,0 +1,15 @@
+package dexInlineInObjectSameFile
+
+fun main(args: Array<String>) {
+    //Breakpoint!
+    OtherWithInline.one()
+}
+
+object OtherWithInline {
+    inline fun one() {
+        //Breakpoint!
+        println()
+    }
+}
+
+// RESUME: 1
@@ -0,0 +1,15 @@
+package inlineInObject
+
+fun main(args: Array<String>) {
+    //Breakpoint!
+    OtherWithInline.one()
+}
+
+object OtherWithInline {
+    inline fun one() {
+        //Breakpoint!
+        println()
+    }
+}
+
+// RESUME: 1
@@ -0,0 +1,11 @@
+package dexInlineInClass.other
+
+class TestDexInlineInClass {
+    inline fun inlineFun() {
+        // Breakpoint 1
+        some()
+        some()
+    }
+
+    fun some() {}
+}
@@ -0,0 +1,7 @@
+package dexInlineInClass
+
+fun main(args: Array<String>) {
+    dexInlineInClass.other.TestDexInlineInClass().inlineFun()
+}
+
+// ADDITIONAL_BREAKPOINT: dexInlineInClass.Other.kt: Breakpoint 1
@@ -0,0 +1,11 @@
+package dexInlineInObject.other
+
+object TestDexInlineInObject {
+    inline fun inlineFun() {
+        // Breakpoint 1
+        some()
+        some()
+    }
+
+    fun some() {}
+}
@@ -0,0 +1,7 @@
+package dexInlineInObject
+
+fun main(args: Array<String>) {
+    dexInlineInObject.other.TestDexInlineInObject.inlineFun()
+}
+
+// ADDITIONAL_BREAKPOINT: dexInlineInObject.Other.kt: Breakpoint 1