Debugger: Fix missing NOP in empty 'when' header (KT-29189)

This commit is contained in:
Yan Zhulanow
2019-03-05 19:43:46 +03:00
parent ba0989801a
commit 77c2a5c87c
7 changed files with 47 additions and 3 deletions
@@ -86,4 +86,4 @@ inline fun foo(f: () -> Int): Int {
fun test(i: Int) = i
// STEP_OVER: 30
// STEP_OVER: 32
@@ -2,13 +2,16 @@ LineBreakpoint created at stepOverWhenWithInline.kt:5
Run Java
Connected to the target VM
stepOverWhenWithInline.kt:5
stepOverWhenWithInline.kt:7
stepOverWhenWithInline.kt:8
stepOverWhenWithInline.kt:9
stepOverWhenWithInline.kt:7
stepOverWhenWithInline.kt:13
stepOverWhenWithInline.kt:14
stepOverWhenWithInline.kt:17
stepOverWhenWithInline.kt:18
stepOverWhenWithInline.kt:13
stepOverWhenWithInline.kt:25
stepOverWhenWithInline.kt:26
stepOverWhenWithInline.kt:27
stepOverWhenWithInline.kt:25
@@ -21,14 +24,16 @@ stepOverWhenWithInline.kt:38
stepOverWhenWithInline.kt:51
stepOverWhenWithInline.kt:52
stepOverWhenWithInline.kt:51
stepOverWhenWithInline.kt:57
stepOverWhenWithInline.kt:58
stepOverWhenWithInline.kt:57
stepOverWhenWithInline.kt:63
stepOverWhenWithInline.kt:64
stepOverWhenWithInline.kt:65
stepOverWhenWithInline.kt:63
stepOverWhenWithInline.kt:75
stepOverWhenWithInline.kt:76
stepOverWhenWithInline.kt:75
stepOverWhenWithInline.kt:80
Disconnected from the target VM
Process finished with exit code 0
@@ -0,0 +1,19 @@
package whenWithoutExpression
fun test(a: String): String {
val b = a.toLowerCase()
//Breakpoint!
return when {
b.startsWith("a") -> "A"
b.startsWith("b") -> "B"
b.startsWith("c") -> "C"
else -> "other"
}
}
fun main() {
test("abcd")
}
// STEP_OVER: 4
// PRINT_FRAME
@@ -0,0 +1,11 @@
LineBreakpoint created at whenWithoutExpression.kt:6
Run Java
Connected to the target VM
whenWithoutExpression.kt:6
whenWithoutExpression.kt:7
whenWithoutExpression.kt:6
whenWithoutExpression.kt:15
whenWithoutExpression.kt:16
Disconnected from the target VM
Process finished with exit code 0