Merge KT-MR-3224 from rrn/minamoto/kt-33364

kotlin-native/backend.native/tests/build.gradle

@@ -2413,7 +2413,7 @@ standaloneTest("check_stacktrace_format") {
 standaloneTest("stack_trace_inline") {
     // TODO: Enable after the test has been fixed.
     disabled = !isAppleTarget(project) || project.globalTestArgs.contains('-opt') || (project.testTarget == 'ios_arm64')
-    flags = ['-g', '-Xg-generate-inline-function-body-marker=enable']
+    flags = ['-g', '-Xg-generate-debug-trampoline=enable']
     source = "runtime/exceptions/stack_trace_inline.kt"
 }
 

kotlin-native/backend.native/tests/debugger/src/test/kotlin/org/jetbrains/kotlin/native/test/debugger/LldbTests.kt

@@ -146,6 +146,7 @@ class LldbTests {
 
             > b kfun:#a(){}kotlin.String
             Breakpoint 2: where = [..]`kfun:#a(){}kotlin.String [..] at a.kt:1:1, [..]
+            > q
         """.trimIndent().lldb(application)
     }
 
@@ -163,13 +164,44 @@ class LldbTests {
             |fun main(args: Array<String>) {
             |    println(question("Subject", args))
             |}
-        """.trimMargin().binary("kt33055", "-g", "-Xg-generate-inline-function-body-marker=enable")
+        """.trimMargin().binary("kt33055", "-g", "-Xg-generate-debug-trampoline=enable")
         """
             > b 2
             Breakpoint 1: where = [..]`kfun:#question(kotlin.String;kotlin.Array<kotlin.String>){}kotlin.String [..] at kt33055.kt:2:12, [..]
+            > q
         """.trimIndent().lldb(kt33055)
     }
 
+    @Test
+    fun `kt33364`() = lldbComplexTest {
+        val kt33364 = """
+            |fun main() {
+            |    val param = 3
+            |
+            |    //breakpoint here (line: 4, breakpoint is set to 5th line)
+            |    when(param) {
+            |        1 -> print("A")
+            |        2 -> print("B")
+            |        else -> print("C")
+            |    }
+            |
+            |    // breakpoint here (line: 11, breakpoint is set to 12th line)
+            |    when {
+            |        param == 1 -> print("A")
+            |        param == 2 -> print("B")
+            |        else -> print("C")
+            |    }
+            |}
+        """.trimMargin().binary("kt33364", "-g", "-Xg-generate-debug-trampoline=enable")
+        """
+            > b 5
+            Breakpoint 1: where = [..]kfun:#main(){} [..] at kt33364.kt:5:[..]
+            > b 11
+            Breakpoint 2: where = [..]kfun:#main(){} [..] at kt33364.kt:12:[..]
+            > q
+        """.trimIndent().lldb(kt33364)
+    }
+
     @Test
     fun `kt42208`() = lldbComplexTest {
         val kt42208One = """