diff --git a/compiler/testData/debug/stepping/assertion.kt b/compiler/testData/debug/stepping/assertion.kt index 533d66e4f0d..35330571d9d 100644 --- a/compiler/testData/debug/stepping/assertion.kt +++ b/compiler/testData/debug/stepping/assertion.kt @@ -1,4 +1,4 @@ -// IGNORE_BACKEND: JS_IR + // FILE: test.kt public val MASSERTIONS_ENABLED: Boolean = true @@ -47,3 +47,6 @@ fun box(): String { // test.kt:30 box // EXPECTATIONS JS_IR +// test.kt:17 box +// test.kt:7 box +// test.kt:30 box diff --git a/compiler/testData/debug/stepping/functionCallWithInlinedLambdaParam.kt b/compiler/testData/debug/stepping/functionCallWithInlinedLambdaParam.kt index 65b060151dd..fef91c9bbc4 100644 --- a/compiler/testData/debug/stepping/functionCallWithInlinedLambdaParam.kt +++ b/compiler/testData/debug/stepping/functionCallWithInlinedLambdaParam.kt @@ -1,4 +1,4 @@ -// IGNORE_BACKEND: JS_IR + // FILE: test.kt fun box() { @@ -34,3 +34,8 @@ inline fun foo(f: () -> Unit) { // test.kt:12 box // EXPECTATIONS JS_IR +// test.kt:15 box +// test.kt:6 box +// test.kt:15 box +// test.kt:10 box +// test.kt:12 box diff --git a/compiler/testData/debug/stepping/inTheEndOfLambdaArgumentOfInlineCall.kt b/compiler/testData/debug/stepping/inTheEndOfLambdaArgumentOfInlineCall.kt index f58e1d668f4..5de95c10bc7 100644 --- a/compiler/testData/debug/stepping/inTheEndOfLambdaArgumentOfInlineCall.kt +++ b/compiler/testData/debug/stepping/inTheEndOfLambdaArgumentOfInlineCall.kt @@ -1,4 +1,4 @@ -// IGNORE_BACKEND: JS_IR + // FILE: test.kt fun box() { @@ -36,3 +36,10 @@ fun nop() {} // test.kt:9 box // EXPECTATIONS JS_IR +// test.kt:12 box +// test.kt:20 nop +// test.kt:6 box +// test.kt:20 nop +// test.kt:17 box +// test.kt:20 nop +// test.kt:9 box diff --git a/compiler/testData/debug/stepping/inlineSimpleCall.kt b/compiler/testData/debug/stepping/inlineSimpleCall.kt index ddd627e128e..401d3cd1f7f 100644 --- a/compiler/testData/debug/stepping/inlineSimpleCall.kt +++ b/compiler/testData/debug/stepping/inlineSimpleCall.kt @@ -1,4 +1,4 @@ -// IGNORE_BACKEND: JS_IR + // FILE: test.kt inline fun inlineFun(s: () -> Unit) { @@ -51,3 +51,4 @@ fun box() { // test.kt:24 box // EXPECTATIONS JS_IR +// test.kt:24 box diff --git a/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt b/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt index dab7c258c3f..8037c7228eb 100644 --- a/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt +++ b/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt @@ -1,4 +1,4 @@ -// IGNORE_BACKEND: JS_IR + // FILE: test.kt inline fun foo(stringMaker: () -> String = { "OK" }): String { return stringMaker() @@ -31,3 +31,8 @@ fun box(): String { // test.kt:17 box // EXPECTATIONS JS_IR +// test.kt:3 box +// test.kt:4 box +// test.kt:8 box +// test.kt:11 box +// test.kt:17 box diff --git a/compiler/testData/debug/stepping/linenumberForOneParametersArgumentCall.kt b/compiler/testData/debug/stepping/linenumberForOneParametersArgumentCall.kt index 32b2c2a9f28..75f5b54518f 100644 --- a/compiler/testData/debug/stepping/linenumberForOneParametersArgumentCall.kt +++ b/compiler/testData/debug/stepping/linenumberForOneParametersArgumentCall.kt @@ -1,4 +1,4 @@ -// IGNORE_BACKEND: JS_IR + // FILE: test.kt fun box() { @@ -23,3 +23,6 @@ inline fun lookAtMe(f: (String) -> Unit) { // test.kt:8 box // EXPECTATIONS JS_IR +// test.kt:11 box +// test.kt:6 box +// test.kt:8 box diff --git a/compiler/testData/debug/stepping/localFunction.kt b/compiler/testData/debug/stepping/localFunction.kt index b615f643e74..276be25c057 100644 --- a/compiler/testData/debug/stepping/localFunction.kt +++ b/compiler/testData/debug/stepping/localFunction.kt @@ -1,4 +1,4 @@ -// IGNORE_BACKEND: JS_IR + // FILE: test.kt fun box() { @@ -29,3 +29,6 @@ fun box() { // test.kt:12 box // EXPECTATIONS JS_IR +// test.kt:10 box +// test.kt:8 box$bar +// test.kt:12 box diff --git a/compiler/testData/debug/stepping/localFunctionWIthOnelineExpressionBody.kt b/compiler/testData/debug/stepping/localFunctionWIthOnelineExpressionBody.kt index 648b2544970..5df10e8f9b3 100644 --- a/compiler/testData/debug/stepping/localFunctionWIthOnelineExpressionBody.kt +++ b/compiler/testData/debug/stepping/localFunctionWIthOnelineExpressionBody.kt @@ -1,4 +1,4 @@ -// IGNORE_BACKEND: JS_IR + // FILE: test.kt fun box() { @@ -26,3 +26,6 @@ fun box() { // test.kt:10 box // EXPECTATIONS JS_IR +// test.kt:8 box +// test.kt:6 box$bar +// test.kt:10 box diff --git a/compiler/testData/debug/stepping/noParametersArgumentCallInExpression.kt b/compiler/testData/debug/stepping/noParametersArgumentCallInExpression.kt index cd40cf4057d..02069d11671 100644 --- a/compiler/testData/debug/stepping/noParametersArgumentCallInExpression.kt +++ b/compiler/testData/debug/stepping/noParametersArgumentCallInExpression.kt @@ -1,4 +1,4 @@ -// IGNORE_BACKEND: JS_IR + // FILE: test.kt fun box() { @@ -22,3 +22,7 @@ inline fun lookAtMe(f: () -> Int) { // test.kt:8 box // EXPECTATIONS JS_IR +// test.kt:11 box +// test.kt:6 box +// test.kt:12 box +// test.kt:8 box diff --git a/compiler/testData/debug/stepping/simpleDefaultArgWithInline.kt b/compiler/testData/debug/stepping/simpleDefaultArgWithInline.kt index 69c3ceb152e..6c467dbef78 100644 --- a/compiler/testData/debug/stepping/simpleDefaultArgWithInline.kt +++ b/compiler/testData/debug/stepping/simpleDefaultArgWithInline.kt @@ -1,4 +1,4 @@ -// IGNORE_BACKEND: JS_IR + // FILE: test.kt inline fun ifoo(ok: String = "OK"): String { @@ -26,3 +26,6 @@ fun box(): String { // test.kt:14 box // EXPECTATIONS JS_IR +// test.kt:5 box +// test.kt:14 box +// test.kt:8 ifoo2 diff --git a/compiler/testData/debug/stepping/simpleSmap.kt b/compiler/testData/debug/stepping/simpleSmap.kt index d38ebf41d51..d2ddb099ad3 100644 --- a/compiler/testData/debug/stepping/simpleSmap.kt +++ b/compiler/testData/debug/stepping/simpleSmap.kt @@ -1,4 +1,4 @@ -// IGNORE_BACKEND: JS_IR + // FILE: test.kt @@ -22,3 +22,4 @@ fun box() { // test.kt:13 box // EXPECTATIONS JS_IR +// test.kt:13 box diff --git a/compiler/testData/debug/stepping/suspendFunWithSuspendLambdaParameter.kt b/compiler/testData/debug/stepping/suspendFunWithSuspendLambdaParameter.kt index 1494531a678..777f5ec332f 100644 --- a/compiler/testData/debug/stepping/suspendFunWithSuspendLambdaParameter.kt +++ b/compiler/testData/debug/stepping/suspendFunWithSuspendLambdaParameter.kt @@ -1,4 +1,4 @@ -// IGNORE_BACKEND: JS_IR + // WITH_STDLIB // FILE: test.kt suspend fun foo(block: suspend Long.() -> String): String { @@ -23,3 +23,10 @@ suspend fun box() { // test.kt:12 box // EXPECTATIONS JS_IR +// test.kt:9 doResume +// test.kt:9 box$slambda +// test.kt:9 doResume +// test.kt:5 foo +// test.kt:5 foo +// test.kt:10 doResume +// test.kt:12 doResume diff --git a/compiler/testData/debug/stepping/tryCatchExpression.kt b/compiler/testData/debug/stepping/tryCatchExpression.kt index 1fd7254b34c..55f9ee7ce5b 100644 --- a/compiler/testData/debug/stepping/tryCatchExpression.kt +++ b/compiler/testData/debug/stepping/tryCatchExpression.kt @@ -1,5 +1,5 @@ // FILE: test.kt -// DONT_TARGET_EXACT_BACKEND: JS_IR (KT-54283) + fun foo() { try { mightThrow() @@ -110,35 +110,46 @@ fun box() { // test.kt:41 box // test.kt:5 foo // test.kt:28 mightThrow +// test.kt:29 mightThrow // test.kt:11 foo // test.kt:32 mightThrow2 +// test.kt:33 mightThrow2 // test.kt:10 foo // test.kt:17 foo // test.kt:36 mightThrow3 // test.kt:37 mightThrow3 // test.kt:16 foo +// test.kt:21 foo // test.kt:42 box // test.kt:43 box // test.kt:5 foo // test.kt:28 mightThrow +// test.kt:29 mightThrow // test.kt:11 foo // test.kt:32 mightThrow2 +// test.kt:33 mightThrow2 // test.kt:10 foo // test.kt:17 foo // test.kt:36 mightThrow3 // test.kt:36 mightThrow3 +// test.kt:18 foo // test.kt:19 foo // test.kt:44 box // test.kt:45 box // test.kt:5 foo // test.kt:28 mightThrow +// test.kt:29 mightThrow // test.kt:11 foo // test.kt:32 mightThrow2 // test.kt:32 mightThrow2 +// test.kt:12 foo // test.kt:13 foo // test.kt:46 box // test.kt:47 box // test.kt:5 foo // test.kt:28 mightThrow // test.kt:28 mightThrow +// test.kt:6 foo +// test.kt:6 foo // test.kt:7 foo +// test.kt:48 box diff --git a/compiler/testData/debug/stepping/tryCatchFinally.kt b/compiler/testData/debug/stepping/tryCatchFinally.kt index 1a42269b54f..0689446f673 100644 --- a/compiler/testData/debug/stepping/tryCatchFinally.kt +++ b/compiler/testData/debug/stepping/tryCatchFinally.kt @@ -1,4 +1,4 @@ -// DONT_TARGET_EXACT_BACKEND: JS_IR (KT-54283) + // FILE: test.kt fun foo() { @@ -96,25 +96,36 @@ fun box() { // test.kt:34 box // test.kt:6 foo // test.kt:26 mightThrow +// test.kt:27 mightThrow // test.kt:14 foo // test.kt:30 mightThrow2 +// test.kt:31 mightThrow2 // test.kt:13 foo +// test.kt:20 foo // test.kt:35 box // test.kt:36 box // test.kt:6 foo // test.kt:26 mightThrow +// test.kt:27 mightThrow // test.kt:14 foo // test.kt:30 mightThrow2 // test.kt:30 mightThrow2 +// test.kt:15 foo // test.kt:16 foo // test.kt:13 foo +// test.kt:20 foo // test.kt:37 box // test.kt:38 box // test.kt:6 foo // test.kt:26 mightThrow // test.kt:26 mightThrow +// test.kt:7 foo +// test.kt:7 foo // test.kt:14 foo // test.kt:30 mightThrow2 // test.kt:30 mightThrow2 +// test.kt:15 foo // test.kt:16 foo // test.kt:13 foo +// test.kt:20 foo +// test.kt:39 box diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsSteppingTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsSteppingTestGenerated.java index 1ec89e3807f..9a0cc565cde 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsSteppingTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsSteppingTestGenerated.java @@ -487,6 +487,18 @@ public class IrJsSteppingTestGenerated extends AbstractIrJsSteppingTest { runTest("compiler/testData/debug/stepping/tryCatch.kt"); } + @Test + @TestMetadata("tryCatchExpression.kt") + public void testTryCatchExpression() throws Exception { + runTest("compiler/testData/debug/stepping/tryCatchExpression.kt"); + } + + @Test + @TestMetadata("tryCatchFinally.kt") + public void testTryCatchFinally() throws Exception { + runTest("compiler/testData/debug/stepping/tryCatchFinally.kt"); + } + @Test @TestMetadata("tryFinally.kt") public void testTryFinally() throws Exception {