Fix irrelevant additional stops on breakpoint on line with inlines (KT-21945)

#KT-21945 Fixed
This commit is contained in:
Nikolay Krasko
2017-12-22 14:20:32 +03:00
parent f38a4f509d
commit f39250c9a2
15 changed files with 193 additions and 36 deletions
@@ -29,9 +29,6 @@ fun main(args: Array<String>) {
//Breakpoint!
a.foo(1) { 1 }.foo(2) { 1 }
// EXPRESSION: it + 7
// RESULT: Unresolved reference: it
// EXPRESSION: it + 8
// RESULT: Unresolved reference: it
//Breakpoint! (lambdaOrdinal = -1)
@@ -53,9 +50,6 @@ fun main(args: Array<String>) {
// EXPRESSION: it + 12
// RESULT: 13: I
// EXPRESSION: it + 13
// RESULT: Unresolved reference: it
// EXPRESSION: it + 14
// RESULT: 16: I
//Breakpoint!
@@ -2,11 +2,11 @@ LineBreakpoint created at multipleBreakpointsAtLine.kt:9 lambdaOrdinal = -1
LineBreakpoint created at multipleBreakpointsAtLine.kt:14 lambdaOrdinal = 1
LineBreakpoint created at multipleBreakpointsAtLine.kt:19 lambdaOrdinal = 2
LineBreakpoint created at multipleBreakpointsAtLine.kt:30
LineBreakpoint created at multipleBreakpointsAtLine.kt:38 lambdaOrdinal = -1
LineBreakpoint created at multipleBreakpointsAtLine.kt:43 lambdaOrdinal = 1
LineBreakpoint created at multipleBreakpointsAtLine.kt:48 lambdaOrdinal = 2
LineBreakpoint created at multipleBreakpointsAtLine.kt:62
LineBreakpoint created at multipleBreakpointsAtLine.kt:67 lambdaOrdinal = 2
LineBreakpoint created at multipleBreakpointsAtLine.kt:35 lambdaOrdinal = -1
LineBreakpoint created at multipleBreakpointsAtLine.kt:40 lambdaOrdinal = 1
LineBreakpoint created at multipleBreakpointsAtLine.kt:45 lambdaOrdinal = 2
LineBreakpoint created at multipleBreakpointsAtLine.kt:56
LineBreakpoint created at multipleBreakpointsAtLine.kt:61 lambdaOrdinal = 2
Run Java
Connected to the target VM
multipleBreakpointsAtLine.kt:9
@@ -19,19 +19,17 @@ multipleBreakpointsAtLine.kt:30
Compile bytecode for it + 5
multipleBreakpointsAtLine.kt:30
Compile bytecode for it + 6
multipleBreakpointsAtLine.kt:38
multipleBreakpointsAtLine.kt:38
multipleBreakpointsAtLine.kt:43
multipleBreakpointsAtLine.kt:35
multipleBreakpointsAtLine.kt:40
Compile bytecode for it + 9
multipleBreakpointsAtLine.kt:48
multipleBreakpointsAtLine.kt:45
Compile bytecode for it + 10
multipleBreakpointsAtLine.kt:62
multipleBreakpointsAtLine.kt:62
multipleBreakpointsAtLine.kt:56
multipleBreakpointsAtLine.kt:56
Compile bytecode for it + 12
multipleBreakpointsAtLine.kt:62
multipleBreakpointsAtLine.kt:62
multipleBreakpointsAtLine.kt:56
Compile bytecode for it + 14
multipleBreakpointsAtLine.kt:67
multipleBreakpointsAtLine.kt:61
Compile bytecode for it + 15
Disconnected from the target VM
@@ -3,7 +3,6 @@ package inlineFunctionBreakpointVariants
import inlineFunctionOtherPackage.*
fun main(args: Array<String>) {
// Breakpoint is outside of function literal, but we stop at it twice: before and after foo1 invocation
//Breakpoint! (lambdaOrdinal = -1)
foo1 { foo2() }
}
@@ -1,8 +1,7 @@
LineBreakpoint created at inlineFunctionBreakpointVariants.kt:8 lambdaOrdinal = -1
LineBreakpoint created at inlineFunctionBreakpointVariants.kt:7 lambdaOrdinal = -1
Run Java
Connected to the target VM
inlineFunctionBreakpointVariants.kt:8
inlineFunctionBreakpointVariants.kt:8
inlineFunctionBreakpointVariants.kt:7
Disconnected from the target VM
Process finished with exit code 0
@@ -4,8 +4,6 @@ Connected to the target VM
parametersOfInlineFunSeveralOnLine.kt:8
parametersOfInlineFunSeveralOnLine.kt:8
parametersOfInlineFunSeveralOnLine.kt:8
parametersOfInlineFunSeveralOnLine.kt:8
Compile bytecode for it
Disconnected from the target VM
Process finished with exit code 0