From 1241565cced1cc790154658a7234fd95f9e5453e Mon Sep 17 00:00:00 2001 From: Sergej Jaskiewicz Date: Wed, 8 Jun 2022 20:22:09 +0300 Subject: [PATCH] [JS IR] Adapt stepping tests for Kotlin/JS --- .../debug/stepping/IfTrueThenFalse.kt | 7 +- .../debug/stepping/anonymousFunction.kt | 9 +- .../debug/stepping/anonymousFunctionDirect.kt | 9 +- compiler/testData/debug/stepping/assertion.kt | 4 +- .../debug/stepping/beforeGotoToWhileStart.kt | 14 ++- .../debug/stepping/callWithCallInArguments.kt | 14 ++- .../debug/stepping/callWithReceiver.kt | 9 +- .../debug/stepping/callableReference.kt | 9 +- compiler/testData/debug/stepping/chainCall.kt | 16 +++- compiler/testData/debug/stepping/class.kt | 9 +- .../testData/debug/stepping/classObject.kt | 12 ++- .../debug/stepping/compileTimeConstant.kt | 5 +- .../testData/debug/stepping/conjunction.kt | 5 +- .../debug/stepping/constantConditions.kt | 9 +- .../debug/stepping/constructorCall.kt | 14 ++- .../testData/debug/stepping/constructors.kt | 67 ++++++++++---- compiler/testData/debug/stepping/dataClass.kt | 72 ++++++++++++++- .../debug/stepping/defaultParameter.kt | 12 ++- compiler/testData/debug/stepping/enum.kt | 20 ++++- compiler/testData/debug/stepping/for.kt | 14 ++- .../debug/stepping/functionCallWithDefault.kt | 9 +- .../functionCallWithInlinedLambdaParam.kt | 20 +++-- .../stepping/functionCallWithLambdaParam.kt | 10 ++- .../debug/stepping/functionInAnotherFile.kt | 15 +++- compiler/testData/debug/stepping/if.kt | 4 +- compiler/testData/debug/stepping/if2.kt | 12 ++- compiler/testData/debug/stepping/ifThen.kt | 11 ++- .../testData/debug/stepping/ifThenElse.kt | 15 +++- .../debug/stepping/ifThenElseFalse.kt | 16 +++- .../debug/stepping/ifWithInlineInCondition.kt | 18 +++- .../testData/debug/stepping/iincStepping.kt | 13 ++- .../inTheEndOfLambdaArgumentOfInlineCall.kt | 24 ++--- .../testData/debug/stepping/initBlocks.kt | 30 +++++-- .../debug/stepping/initBlocksCompanion.kt | 13 ++- .../debug/stepping/inlineCallableReference.kt | 10 ++- .../stepping/inlineNamedCallableReference.kt | 6 +- .../debug/stepping/inlineSimpleCall.kt | 30 ++++--- compiler/testData/debug/stepping/kt15259.kt | 9 +- compiler/testData/debug/stepping/kt29179.kt | 9 +- compiler/testData/debug/stepping/kt42208.kt | 9 +- compiler/testData/debug/stepping/kt42208b.kt | 8 +- compiler/testData/debug/stepping/kt42208c.kt | 18 +++- .../debug/stepping/lambdaStepInline.kt | 10 ++- .../stepping/lambdaStepInlineWithDefaults.kt | 4 +- .../debug/stepping/lineNumberAfterInline.kt | 9 +- .../linenumberForOneParametersArgumentCall.kt | 4 +- .../testData/debug/stepping/localFunction.kt | 26 +++--- .../localFunctionWIthOnelineExpressionBody.kt | 8 +- .../testData/debug/stepping/localProperty.kt | 10 ++- .../testData/debug/stepping/multiModule.kt | 10 ++- .../debug/stepping/multilineExpression.kt | 9 +- .../debug/stepping/multilineFunctionCall.kt | 5 +- .../debug/stepping/multilineInfixCall.kt | 5 +- .../debug/stepping/namedCallableReference.kt | 13 ++- .../testData/debug/stepping/nestedInline.kt | 7 +- .../noParametersArgumentCallInExpression.kt | 12 +-- compiler/testData/debug/stepping/nullcheck.kt | 17 +++- .../debug/stepping/primitiveNullChecks.kt | 11 ++- .../debug/stepping/propertyAccessor.kt | 8 +- compiler/testData/debug/stepping/psvm.kt | 6 +- compiler/testData/debug/stepping/recursion.kt | 17 +++- .../debug/stepping/simpleDefaultArg.kt | 14 ++- .../stepping/simpleDefaultArgWithInline.kt | 4 +- .../debug/stepping/simpleInlineDefaultArg.kt | 9 +- .../testData/debug/stepping/simpleSmap.kt | 4 +- .../debug/stepping/smapInlineAsArgument.kt | 15 +++- .../stepping/smapInlineAsInfixArgument.kt | 17 +++- .../stepping/smapInlineAsInlineArgument.kt | 15 +++- .../stepping/smapInlineInIntrinsicArgument.kt | 12 ++- .../testData/debug/stepping/stringSwitches.kt | 44 +++++++-- .../debug/stepping/stringSwitchesSmall.kt | 34 +++++-- .../stepping/suspendFunWithLambdaParameter.kt | 11 ++- .../suspendFunWithSuspendLambdaParameter.kt | 12 +-- .../testData/debug/stepping/throwException.kt | 16 +++- compiler/testData/debug/stepping/topLevel.kt | 7 +- compiler/testData/debug/stepping/trait.kt | 18 +++- compiler/testData/debug/stepping/tryCatch.kt | 9 +- .../debug/stepping/tryCatchExpression.kt | 45 +++++++++- .../debug/stepping/tryCatchFinally.kt | 90 ++++++++++--------- .../testData/debug/stepping/tryFinally.kt | 19 +++- .../stepping/variablesWithoutInitializer.kt | 11 ++- .../debug/stepping/voidLambdaStepInline.kt | 8 +- compiler/testData/debug/stepping/when.kt | 48 +++++++--- .../debug/stepping/whenComplicatedSubject.kt | 21 ++++- .../testData/debug/stepping/whenConstant.kt | 9 +- .../testData/debug/stepping/whenIsChecks.kt | 15 +++- .../testData/debug/stepping/whenMultiLine.kt | 30 +++++-- .../debug/stepping/whenMultiLineSubject.kt | 24 ++++- .../debug/stepping/whenNullalbeSubject.kt | 8 +- .../testData/debug/stepping/whenSubject.kt | 38 +++++++- .../testData/debug/stepping/whenSubject2.kt | 64 +++++++++---- .../stepping/whenWithInlineInCondition.kt | 34 ++++++- compiler/testData/debug/stepping/while.kt | 14 ++- 93 files changed, 1250 insertions(+), 299 deletions(-) diff --git a/compiler/testData/debug/stepping/IfTrueThenFalse.kt b/compiler/testData/debug/stepping/IfTrueThenFalse.kt index 53a01e5c1bc..ff1076672cc 100644 --- a/compiler/testData/debug/stepping/IfTrueThenFalse.kt +++ b/compiler/testData/debug/stepping/IfTrueThenFalse.kt @@ -8,9 +8,14 @@ fun box() { false } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:5 box // test.kt:2 cond // test.kt:5 box // test.kt:8 box // test.kt:9 box + +// EXPECTATIONS JS_IR +// test.kt:5 box +// test.kt:2 cond +// test.kt:2 cond diff --git a/compiler/testData/debug/stepping/anonymousFunction.kt b/compiler/testData/debug/stepping/anonymousFunction.kt index 5ae9f3da427..6ff64d2796b 100644 --- a/compiler/testData/debug/stepping/anonymousFunction.kt +++ b/compiler/testData/debug/stepping/anonymousFunction.kt @@ -8,10 +8,17 @@ fun box() { } } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:6 box // test.kt:3 eval // test.kt:7 invoke // test.kt:3 eval // test.kt:6 box // test.kt:9 box + +// EXPECTATIONS JS_IR +// test.kt:6 box +// test.kt:3 eval_0 +// test.kt:7 box$lambda +// test.kt:7 box$lambda +// test.kt:3 eval_0 diff --git a/compiler/testData/debug/stepping/anonymousFunctionDirect.kt b/compiler/testData/debug/stepping/anonymousFunctionDirect.kt index 7763d63451e..153600a3242 100644 --- a/compiler/testData/debug/stepping/anonymousFunctionDirect.kt +++ b/compiler/testData/debug/stepping/anonymousFunctionDirect.kt @@ -6,12 +6,17 @@ fun box() { }() } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:4 box // EXPECTATIONS JVM // test.kt:5 invoke // EXPECTATIONS JVM_IR // test.kt:5 box$lambda$0 -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:4 box // test.kt:7 box + +// EXPECTATIONS JS_IR +// test.kt:4 box +// test.kt:5 box$lambda +// test.kt:5 box$lambda diff --git a/compiler/testData/debug/stepping/assertion.kt b/compiler/testData/debug/stepping/assertion.kt index ed6e2b5914d..533d66e4f0d 100644 --- a/compiler/testData/debug/stepping/assertion.kt +++ b/compiler/testData/debug/stepping/assertion.kt @@ -30,7 +30,7 @@ fun box(): String { return "OK" } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:25 box // test.kt:16 box // test.kt:17 box @@ -45,3 +45,5 @@ fun box(): String { // test.kt:8 box // test.kt:13 box // test.kt:30 box + +// EXPECTATIONS JS_IR diff --git a/compiler/testData/debug/stepping/beforeGotoToWhileStart.kt b/compiler/testData/debug/stepping/beforeGotoToWhileStart.kt index f76f6a26e32..6f1197a9502 100644 --- a/compiler/testData/debug/stepping/beforeGotoToWhileStart.kt +++ b/compiler/testData/debug/stepping/beforeGotoToWhileStart.kt @@ -19,7 +19,7 @@ fun box() { foo() } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:19 box // test.kt:11 foo // test.kt:12 foo @@ -34,3 +34,15 @@ fun box() { // test.kt:13 foo // test.kt:16 foo // test.kt:20 box + +// EXPECTATIONS JS_IR +// test.kt:19 box +// test.kt:12 foo +// test.kt:6 alternate +// test.kt:7 alternate +// test.kt:7 alternate +// test.kt:12 foo +// test.kt:6 alternate +// test.kt:7 alternate +// test.kt:7 alternate +// test.kt:13 foo diff --git a/compiler/testData/debug/stepping/callWithCallInArguments.kt b/compiler/testData/debug/stepping/callWithCallInArguments.kt index 6c7f3b5875a..94753d427d2 100644 --- a/compiler/testData/debug/stepping/callWithCallInArguments.kt +++ b/compiler/testData/debug/stepping/callWithCallInArguments.kt @@ -13,7 +13,7 @@ fun box() { ) } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:8 box // test.kt:3 // test.kt:8 box @@ -31,3 +31,15 @@ fun box() { // test.kt:5 bar // test.kt:9 box // test.kt:14 box + +// EXPECTATIONS JS_IR +// test.kt:8 box +// test.kt:9 box +// test.kt:5 bar +// test.kt:5 bar +// test.kt:9 box +// test.kt:5 bar +// test.kt:5 bar +// test.kt:9 box +// test.kt:5 bar +// test.kt:5 bar diff --git a/compiler/testData/debug/stepping/callWithReceiver.kt b/compiler/testData/debug/stepping/callWithReceiver.kt index aaed4f84f63..ff3f64e1acb 100644 --- a/compiler/testData/debug/stepping/callWithReceiver.kt +++ b/compiler/testData/debug/stepping/callWithReceiver.kt @@ -14,7 +14,7 @@ fun box() { .bar() } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:9 box // test.kt:3 // test.kt:9 box @@ -26,3 +26,10 @@ fun box() { // test.kt:14 box // test.kt:5 box // test.kt:15 box + +// EXPECTATIONS JS_IR +// test.kt:9 box +// test.kt:10 box +// test.kt:4 A.foo_26di_k$ +// test.kt:4 A.foo_26di_k$ +// test.kt:5 box diff --git a/compiler/testData/debug/stepping/callableReference.kt b/compiler/testData/debug/stepping/callableReference.kt index 51041275ebb..f98f9d2bb66 100644 --- a/compiler/testData/debug/stepping/callableReference.kt +++ b/compiler/testData/debug/stepping/callableReference.kt @@ -10,7 +10,7 @@ fun f(block: () -> Unit) { block() } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:3 box // test.kt:4 box // test.kt:10 f @@ -19,3 +19,10 @@ fun f(block: () -> Unit) { // test.kt:10 f // test.kt:11 f // test.kt:7 box + +// EXPECTATIONS JS_IR +// test.kt:3 box +// test.kt:4 box +// test.kt:4 box +// test.kt:10 f +// test.kt:5 diff --git a/compiler/testData/debug/stepping/chainCall.kt b/compiler/testData/debug/stepping/chainCall.kt index c5ce3601413..d564c4ddbc8 100644 --- a/compiler/testData/debug/stepping/chainCall.kt +++ b/compiler/testData/debug/stepping/chainCall.kt @@ -14,7 +14,7 @@ fun box() { .bar() } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:9 box // test.kt:3 // test.kt:9 box @@ -27,4 +27,16 @@ fun box() { // test.kt:5 box // test.kt:14 box // test.kt:5 box -// test.kt:15 box \ No newline at end of file +// test.kt:15 box + +// EXPECTATIONS JS_IR +// test.kt:9 box +// test.kt:10 box +// test.kt:4 A.foo_26di_k$ +// test.kt:4 A.foo_26di_k$ +// test.kt:10 box +// test.kt:4 A.foo_26di_k$ +// test.kt:4 A.foo_26di_k$ +// test.kt:5 box +// test.kt:13 box +// test.kt:5 box diff --git a/compiler/testData/debug/stepping/class.kt b/compiler/testData/debug/stepping/class.kt index 0ab89169e54..0a234d36b9f 100644 --- a/compiler/testData/debug/stepping/class.kt +++ b/compiler/testData/debug/stepping/class.kt @@ -18,13 +18,13 @@ fun box() { // three to be hit both on entry to the constructor and on exit after storing the // value of prop. -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:12 box // test.kt:3 // test.kt:4 // EXPECTATIONS JVM_IR // test.kt:3 -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:12 box // test.kt:13 box // test.kt:4 getProp @@ -33,3 +33,8 @@ fun box() { // test.kt:7 foo // test.kt:8 foo // test.kt:15 box + +// EXPECTATIONS JS_IR +// test.kt:12 box +// test.kt:4 A +// test.kt:14 box diff --git a/compiler/testData/debug/stepping/classObject.kt b/compiler/testData/debug/stepping/classObject.kt index 349a2cc8794..3832c8b746d 100644 --- a/compiler/testData/debug/stepping/classObject.kt +++ b/compiler/testData/debug/stepping/classObject.kt @@ -16,7 +16,7 @@ fun box() { A.foo() } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:14 box // test.kt:5 // test.kt:6 @@ -37,3 +37,13 @@ fun box() { // test.kt:8 foo // test.kt:16 box // test.kt:17 box + +// EXPECTATIONS JS_IR +// test.kt:14 box +// test.kt:5 Companion_19 +// test.kt:6 Companion_19 +// test.kt:15 box +// test.kt:16 box +// test.kt:16 box +// test.kt:8 Companion_19.foo_26di_k$ +// test.kt:8 Companion_19.foo_26di_k$ diff --git a/compiler/testData/debug/stepping/compileTimeConstant.kt b/compiler/testData/debug/stepping/compileTimeConstant.kt index bea6e8e0820..a94e2864fe3 100644 --- a/compiler/testData/debug/stepping/compileTimeConstant.kt +++ b/compiler/testData/debug/stepping/compileTimeConstant.kt @@ -5,7 +5,10 @@ fun box() { 42 } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:5 box // test.kt:4 box // test.kt:6 box + +// EXPECTATIONS JS_IR +// test.kt:4 box diff --git a/compiler/testData/debug/stepping/conjunction.kt b/compiler/testData/debug/stepping/conjunction.kt index 81e821fe330..d3d12e0a087 100644 --- a/compiler/testData/debug/stepping/conjunction.kt +++ b/compiler/testData/debug/stepping/conjunction.kt @@ -18,7 +18,7 @@ fun getC() = false fun getD() = true -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:3 box // test.kt:13 getA // test.kt:3 box @@ -31,3 +31,6 @@ fun getD() = true // test.kt:9 box // test.kt:3 box // test.kt:11 box + +// EXPECTATIONS JS_IR +// test.kt:3 box diff --git a/compiler/testData/debug/stepping/constantConditions.kt b/compiler/testData/debug/stepping/constantConditions.kt index 1b489eb50c7..86edcbdd925 100644 --- a/compiler/testData/debug/stepping/constantConditions.kt +++ b/compiler/testData/debug/stepping/constantConditions.kt @@ -14,12 +14,17 @@ fun test(): Long { return 1 } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:5 box // EXPECTATIONS JVM_IR // test.kt:9 test -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:10 test // test.kt:11 test // test.kt:5 box // test.kt:6 box + +// EXPECTATIONS JS_IR +// test.kt:5 box +// test.kt:11 test +// test.kt:11 test diff --git a/compiler/testData/debug/stepping/constructorCall.kt b/compiler/testData/debug/stepping/constructorCall.kt index 62272cc86aa..ccc9580ca42 100644 --- a/compiler/testData/debug/stepping/constructorCall.kt +++ b/compiler/testData/debug/stepping/constructorCall.kt @@ -13,7 +13,7 @@ fun box() { 4) } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:6 box // test.kt:3 // test.kt:6 box @@ -30,4 +30,14 @@ fun box() { // test.kt:12 box // test.kt:3 // test.kt:12 box -// test.kt:14 box \ No newline at end of file +// test.kt:14 box + +// EXPECTATIONS JS_IR +// test.kt:6 box +// test.kt:3 A +// test.kt:7 box +// test.kt:3 A +// test.kt:10 box +// test.kt:3 A +// test.kt:12 box +// test.kt:3 A diff --git a/compiler/testData/debug/stepping/constructors.kt b/compiler/testData/debug/stepping/constructors.kt index 9d4a1ae36d8..a8fc3ac02a7 100644 --- a/compiler/testData/debug/stepping/constructors.kt +++ b/compiler/testData/debug/stepping/constructors.kt @@ -84,7 +84,7 @@ class O(i: T) { // are there in the class file fro JVM, but there is no guarantee that there is an instruction to // step on and sometimes there is no step on the end brace. -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:4 box // test.kt:19 // test.kt:4 box @@ -100,20 +100,20 @@ class O(i: T) { // test.kt:8 box // EXPECTATIONS JVM_IR // test.kt:28 -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:29 // EXPECTATIONS JVM_IR // test.kt:30 -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:8 box // test.kt:9 box // EXPECTATIONS JVM_IR // test.kt:33 -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:34 // EXPECTATIONS JVM_IR // test.kt:35 -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:9 box // test.kt:10 box // test.kt:37 @@ -122,7 +122,7 @@ class O(i: T) { // test.kt:40 // EXPECTATIONS JVM_IR // test.kt:37 -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:10 box // test.kt:11 box // test.kt:42 @@ -131,45 +131,45 @@ class O(i: T) { // test.kt:45 // EXPECTATIONS JVM_IR // test.kt:42 -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:11 box // test.kt:12 box // EXPECTATIONS JVM // test.kt:49 // EXPECTATIONS JVM_IR // test.kt:48 -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:52 // test.kt:53 // EXPECTATIONS JVM_IR // test.kt:54 -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:49 // EXPECTATIONS JVM_IR // test.kt:50 -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:12 box // test.kt:13 box // test.kt:57 // test.kt:61 // EXPECTATIONS JVM_IR // test.kt:62 -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:58 // EXPECTATIONS JVM_IR // test.kt:59 -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:13 box // test.kt:14 box // test.kt:65 // test.kt:69 // EXPECTATIONS JVM_IR // test.kt:70 -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:66 // EXPECTATIONS JVM_IR // test.kt:67 -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:14 box // test.kt:15 box // test.kt:72 @@ -181,6 +181,41 @@ class O(i: T) { // test.kt:73 // EXPECTATIONS JVM_IR // test.kt:74 -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:16 box -// test.kt:17 box \ No newline at end of file +// test.kt:17 box + +// EXPECTATIONS JS_IR +// test.kt:4 box +// test.kt:5 box +// test.kt:20 C +// test.kt:6 box +// test.kt:22 D_init_$Init$ +// test.kt:7 box +// test.kt:25 E_init_$Init$ +// test.kt:8 box +// test.kt:28 F_init_$Init$ +// test.kt:29 F_init_$Init$ +// test.kt:9 box +// test.kt:33 G_init_$Init$ +// test.kt:34 G_init_$Init$ +// test.kt:10 box +// test.kt:39 J +// test.kt:11 box +// test.kt:42 K +// test.kt:44 K +// test.kt:12 box +// test.kt:48 L_init_$Init$ +// test.kt:53 L +// test.kt:49 L_init_$Init$ +// test.kt:13 box +// test.kt:57 M_init_$Init$ +// test.kt:61 M_init_$Init$_0 +// test.kt:58 M_init_$Init$ +// test.kt:14 box +// test.kt:65 N_init_$Init$ +// test.kt:69 N_init_$Init$_0 +// test.kt:66 N_init_$Init$ +// test.kt:15 box +// test.kt:16 box +// test.kt:73 O_init_$Init$ diff --git a/compiler/testData/debug/stepping/dataClass.kt b/compiler/testData/debug/stepping/dataClass.kt index fb0f0517300..b71e4a80be8 100644 --- a/compiler/testData/debug/stepping/dataClass.kt +++ b/compiler/testData/debug/stepping/dataClass.kt @@ -24,7 +24,7 @@ fun box() { e.copy() } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:13 box // test.kt:3 // test.kt:13 box @@ -58,4 +58,72 @@ fun box() { // test.kt:5 // test.kt:9 copy // test.kt:24 box -// test.kt:25 box \ No newline at end of file +// test.kt:25 box + +// EXPECTATIONS JS_IR +// test.kt:13 box +// test.kt:3 D +// test.kt:3 D +// test.kt:14 box +// test.kt:3 D +// test.kt:3 D +// test.kt:14 box +// test.kt:1 D.equals +// test.kt:1 D.equals +// test.kt:1 D.equals +// test.kt:1 D.equals +// test.kt:1 D.equals +// test.kt:1 D.equals +// test.kt:1 D.equals +// test.kt:15 box +// test.kt:1 D.hashCode +// test.kt:1 D.hashCode +// test.kt:1 D.hashCode +// test.kt:16 box +// test.kt:1 D.toString +// test.kt:1 D.toString +// test.kt:17 box +// test.kt:17 box +// test.kt:1 D.component1_7eebsc_k$ +// test.kt:1 D.component1_7eebsc_k$ +// test.kt:17 box +// test.kt:1 D.component2_7eebsb_k$ +// test.kt:1 D.component2_7eebsb_k$ +// test.kt:18 box +// test.kt:1 D.copy$default_cbhffz_k$ +// test.kt:1 D.copy$default_cbhffz_k$ +// test.kt:1 D.copy$default_cbhffz_k$ +// test.kt:1 D.copy$default_cbhffz_k$ +// test.kt:1 D.copy$default_cbhffz_k$ +// test.kt:1 D.copy_t8q04r_k$ +// test.kt:3 D +// test.kt:3 D +// test.kt:1 D.copy_t8q04r_k$ +// test.kt:1 D.copy$default_cbhffz_k$ +// test.kt:19 box +// test.kt:5 E +// test.kt:5 E +// test.kt:20 box +// test.kt:5 E +// test.kt:5 E +// test.kt:20 box +// test.kt:7 E.equals +// test.kt:7 E.equals +// test.kt:21 box +// test.kt:8 E.hashCode +// test.kt:8 E.hashCode +// test.kt:22 box +// test.kt:6 E.toString +// test.kt:6 E.toString +// test.kt:23 box +// test.kt:23 box +// test.kt:1 E.component1_7eebsc_k$ +// test.kt:1 E.component1_7eebsc_k$ +// test.kt:23 box +// test.kt:1 E.component2_7eebsb_k$ +// test.kt:1 E.component2_7eebsb_k$ +// test.kt:24 box +// test.kt:9 E.copy_1tks5_k$ +// test.kt:5 E +// test.kt:5 E +// test.kt:9 E.copy_1tks5_k$ diff --git a/compiler/testData/debug/stepping/defaultParameter.kt b/compiler/testData/debug/stepping/defaultParameter.kt index b40551cc59e..f888fff7f92 100644 --- a/compiler/testData/debug/stepping/defaultParameter.kt +++ b/compiler/testData/debug/stepping/defaultParameter.kt @@ -12,7 +12,7 @@ fun box() { } // FORCE_STEP_INTO -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:11 box // test.kt:3 // test.kt:11 box @@ -22,3 +22,13 @@ fun box() { // test.kt:7 foo // test.kt:6 foo$default (synthetic) // test.kt:12 box + +// EXPECTATIONS JS_IR +// test.kt:11 box +// test.kt:11 box +// test.kt:6 A.foo$default_dec9f7_k$ +// test.kt:6 A.foo$default_dec9f7_k$ +// test.kt:4 A.computeParam_vubdyi_k$ +// test.kt:4 A.computeParam_vubdyi_k$ +// test.kt:6 A.foo$default_dec9f7_k$ +// test.kt:6 A.foo$default_dec9f7_k$ diff --git a/compiler/testData/debug/stepping/enum.kt b/compiler/testData/debug/stepping/enum.kt index 27be3cab8b3..cf3cb3b409a 100644 --- a/compiler/testData/debug/stepping/enum.kt +++ b/compiler/testData/debug/stepping/enum.kt @@ -34,12 +34,12 @@ fun box() { // for the evaluation of the arguments constructor and for the constructor call, // but not for the allocation of the object. -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:22 box // EXPECTATIONS JVM_IR // test.kt:4 // test.kt:5 -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:7 foo // test.kt:9 foo // test.kt:22 box @@ -47,7 +47,19 @@ fun box() { // test.kt:15 // EXPECTATIONS JVM_IR // test.kt:16 -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:17 // test.kt:16 -// test.kt:24 box \ No newline at end of file +// test.kt:24 box + +// EXPECTATIONS JS_IR +// test.kt:22 box +// test.kt:11 E +// test.kt:11 E +// test.kt:22 box +// test.kt:9 E.foo_26di_k$ +// test.kt:9 E.foo_26di_k$ +// test.kt:15 E2_initEntries +// test.kt:14 E2 +// test.kt:17 E2_initEntries +// test.kt:14 E2 diff --git a/compiler/testData/debug/stepping/for.kt b/compiler/testData/debug/stepping/for.kt index 33f7bfc5439..8313a8885ee 100644 --- a/compiler/testData/debug/stepping/for.kt +++ b/compiler/testData/debug/stepping/for.kt @@ -7,7 +7,7 @@ fun box() { inline fun foo(n: Int) {} -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:3 box // test.kt:4 box // test.kt:8 box @@ -19,3 +19,15 @@ inline fun foo(n: Int) {} // test.kt:8 box // test.kt:3 box // test.kt:6 box + +// EXPECTATIONS JS_IR +// test.kt:3 box +// test.kt:3 box +// test.kt:3 box +// test.kt:3 box +// test.kt:3 box +// test.kt:3 box +// test.kt:3 box +// test.kt:3 box +// test.kt:3 box +// test.kt:3 box diff --git a/compiler/testData/debug/stepping/functionCallWithDefault.kt b/compiler/testData/debug/stepping/functionCallWithDefault.kt index 42e38cec6e4..af6fc9ac84e 100644 --- a/compiler/testData/debug/stepping/functionCallWithDefault.kt +++ b/compiler/testData/debug/stepping/functionCallWithDefault.kt @@ -12,7 +12,7 @@ inline fun bar(i: Int = 1) { } // FORCE_STEP_INTO -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:4 box // test.kt:8 foo$default (synthetic) // test.kt:9 foo @@ -21,3 +21,10 @@ inline fun bar(i: Int = 1) { // test.kt:11 box // test.kt:12 box // test.kt:6 box + +// EXPECTATIONS JS_IR +// test.kt:4 box +// test.kt:8 foo$default +// test.kt:8 foo$default +// test.kt:8 foo$default +// test.kt:8 foo$default diff --git a/compiler/testData/debug/stepping/functionCallWithInlinedLambdaParam.kt b/compiler/testData/debug/stepping/functionCallWithInlinedLambdaParam.kt index 7093040ccc9..65b060151dd 100644 --- a/compiler/testData/debug/stepping/functionCallWithInlinedLambdaParam.kt +++ b/compiler/testData/debug/stepping/functionCallWithInlinedLambdaParam.kt @@ -16,19 +16,21 @@ inline fun foo(f: () -> Unit) { f() } -// EXPECTATIONS -// test.kt:4 box -// test.kt:14 box -// test.kt:15 box +// EXPECTATIONS JVM JVM_IR // test.kt:5 box +// test.kt:15 box +// test.kt:16 box // test.kt:6 box -// test.kt:15 box +// test.kt:7 box // test.kt:16 box -// test.kt:8 box -// test.kt:14 box -// test.kt:15 box +// test.kt:17 box // test.kt:9 box -// test.kt:10 box // test.kt:15 box // test.kt:16 box +// test.kt:10 box // test.kt:11 box +// test.kt:16 box +// test.kt:17 box +// test.kt:12 box + +// EXPECTATIONS JS_IR diff --git a/compiler/testData/debug/stepping/functionCallWithLambdaParam.kt b/compiler/testData/debug/stepping/functionCallWithLambdaParam.kt index 2f10a235143..e28048c8d5d 100644 --- a/compiler/testData/debug/stepping/functionCallWithLambdaParam.kt +++ b/compiler/testData/debug/stepping/functionCallWithLambdaParam.kt @@ -14,7 +14,7 @@ fun foo(f: () -> Unit) { f() } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:4 box // test.kt:14 foo // test.kt:5 invoke @@ -28,3 +28,11 @@ fun foo(f: () -> Unit) { // test.kt:14 foo // test.kt:15 foo // test.kt:11 box + +// EXPECTATIONS JS_IR +// test.kt:4 box +// test.kt:14 foo +// test.kt:5 box$lambda +// test.kt:8 box +// test.kt:14 foo +// test.kt:9 box$lambda_0 diff --git a/compiler/testData/debug/stepping/functionInAnotherFile.kt b/compiler/testData/debug/stepping/functionInAnotherFile.kt index f47d43fc2fc..1a2b63fcaf3 100644 --- a/compiler/testData/debug/stepping/functionInAnotherFile.kt +++ b/compiler/testData/debug/stepping/functionInAnotherFile.kt @@ -20,7 +20,7 @@ fun bar(x: Int) = foo(x) } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:13 box // foo.kt:4 foo // foo.kt:7 foo @@ -33,3 +33,16 @@ fun bar(x: Int) = // foo.kt:7 foo // test.kt:13 box // test.kt:14 box + +// EXPECTATIONS JS_IR +// test.kt:13 box +// foo.kt:4 foo +// foo.kt:7 foo +// test.kt:17 bar +// test.kt:18 bar +// foo.kt:4 foo +// foo.kt:5 foo +// foo.kt:5 foo +// test.kt:21 bar +// test.kt:21 bar +// foo.kt:7 foo diff --git a/compiler/testData/debug/stepping/if.kt b/compiler/testData/debug/stepping/if.kt index b8d2362b9fd..53f63a950f7 100644 --- a/compiler/testData/debug/stepping/if.kt +++ b/compiler/testData/debug/stepping/if.kt @@ -14,7 +14,7 @@ inline fun getB(): Int { return 1 } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:5 box // test.kt:14 box // test.kt:6 box @@ -23,3 +23,5 @@ inline fun getB(): Int { // test.kt:8 box // test.kt:14 box // test.kt:8 box + +// EXPECTATIONS JS_IR diff --git a/compiler/testData/debug/stepping/if2.kt b/compiler/testData/debug/stepping/if2.kt index 47d785f5fa8..787744dfdbe 100644 --- a/compiler/testData/debug/stepping/if2.kt +++ b/compiler/testData/debug/stepping/if2.kt @@ -21,7 +21,7 @@ fun box() { foo(0) } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:20 box // test.kt:4 foo // test.kt:5 foo @@ -37,3 +37,13 @@ fun box() { // test.kt:15 foo // test.kt:17 foo // test.kt:22 box + +// EXPECTATIONS JS_IR +// test.kt:20 box +// test.kt:4 foo +// test.kt:8 foo +// test.kt:12 foo +// test.kt:21 box +// test.kt:4 foo +// test.kt:8 foo +// test.kt:12 foo diff --git a/compiler/testData/debug/stepping/ifThen.kt b/compiler/testData/debug/stepping/ifThen.kt index 7afa88d1d55..f271d142989 100644 --- a/compiler/testData/debug/stepping/ifThen.kt +++ b/compiler/testData/debug/stepping/ifThen.kt @@ -14,7 +14,7 @@ fun box() { foo() } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:12 box // test.kt:4 foo // test.kt:5 foo @@ -23,3 +23,12 @@ fun box() { // test.kt:4 foo // test.kt:7 foo // test.kt:15 box + +// EXPECTATIONS JS_IR +// test.kt:12 box +// test.kt:4 foo +// test.kt:5 foo +// test.kt:5 foo +// test.kt:13 box +// test.kt:14 box +// test.kt:4 foo diff --git a/compiler/testData/debug/stepping/ifThenElse.kt b/compiler/testData/debug/stepping/ifThenElse.kt index 368a2e786f1..9e7ded73eca 100644 --- a/compiler/testData/debug/stepping/ifThenElse.kt +++ b/compiler/testData/debug/stepping/ifThenElse.kt @@ -22,7 +22,7 @@ fun box() { foo() } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:20 box // test.kt:4 foo // test.kt:5 foo @@ -39,3 +39,16 @@ fun box() { // test.kt:10 foo // test.kt:15 foo // test.kt:23 box + +// EXPECTATIONS JS_IR +// test.kt:20 box +// test.kt:4 foo +// test.kt:10 foo +// test.kt:11 foo +// test.kt:10 foo +// test.kt:21 box +// test.kt:22 box +// test.kt:4 foo +// test.kt:10 foo +// test.kt:13 foo +// test.kt:10 foo diff --git a/compiler/testData/debug/stepping/ifThenElseFalse.kt b/compiler/testData/debug/stepping/ifThenElseFalse.kt index e2248be8935..90622e89c89 100644 --- a/compiler/testData/debug/stepping/ifThenElseFalse.kt +++ b/compiler/testData/debug/stepping/ifThenElseFalse.kt @@ -17,7 +17,7 @@ fun box() { foo() } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:15 box // test.kt:8 foo // test.kt:5 cond @@ -34,3 +34,17 @@ fun box() { // test.kt:9 foo // test.kt:12 foo // test.kt:18 box + +// EXPECTATIONS JS_IR +// test.kt:15 box +// test.kt:8 foo +// test.kt:5 cond +// test.kt:5 cond +// test.kt:16 box +// test.kt:17 box +// test.kt:8 foo +// test.kt:5 cond +// test.kt:5 cond +// test.kt:9 foo +// test.kt:5 cond +// test.kt:5 cond diff --git a/compiler/testData/debug/stepping/ifWithInlineInCondition.kt b/compiler/testData/debug/stepping/ifWithInlineInCondition.kt index f4b57d10d86..8936c182542 100644 --- a/compiler/testData/debug/stepping/ifWithInlineInCondition.kt +++ b/compiler/testData/debug/stepping/ifWithInlineInCondition.kt @@ -29,7 +29,7 @@ inline fun Boolean.rid(): Boolean = this fun nop() {} -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:3 box // test.kt:24 box // test.kt:3 box @@ -54,3 +54,19 @@ fun nop() {} // test.kt:19 box // test.kt:30 nop // test.kt:21 box + +// EXPECTATIONS JS_IR +// test.kt:3 box +// test.kt:4 box +// test.kt:24 box +// test.kt:8 box +// test.kt:28 box +// test.kt:8 box +// test.kt:24 box +// test.kt:9 box +// test.kt:11 box +// test.kt:24 box +// test.kt:16 box +// test.kt:27 box +// test.kt:15 box +// test.kt:19 box diff --git a/compiler/testData/debug/stepping/iincStepping.kt b/compiler/testData/debug/stepping/iincStepping.kt index 8a94c806ae3..8719b30f9e0 100644 --- a/compiler/testData/debug/stepping/iincStepping.kt +++ b/compiler/testData/debug/stepping/iincStepping.kt @@ -26,7 +26,7 @@ fun box() { // the line number for the actual assignment makes more sense as // that is the actual evaluation order. -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:4 box // test.kt:5 box // test.kt:6 box @@ -45,3 +45,14 @@ fun box() { // test.kt:16 box // test.kt:15 box // test.kt:18 box + +// EXPECTATIONS JS_IR +// test.kt:4 box +// test.kt:5 box +// test.kt:6 box +// test.kt:7 box +// test.kt:9 box +// test.kt:10 box +// test.kt:12 box +// test.kt:13 box +// test.kt:15 box diff --git a/compiler/testData/debug/stepping/inTheEndOfLambdaArgumentOfInlineCall.kt b/compiler/testData/debug/stepping/inTheEndOfLambdaArgumentOfInlineCall.kt index de3c7af48f1..f58e1d668f4 100644 --- a/compiler/testData/debug/stepping/inTheEndOfLambdaArgumentOfInlineCall.kt +++ b/compiler/testData/debug/stepping/inTheEndOfLambdaArgumentOfInlineCall.kt @@ -19,18 +19,20 @@ inline fun baz() { fun nop() {} -// EXPECTATIONS -// test.kt:4 box -// test.kt:11 box -// test.kt:19 nop -// test.kt:12 box +// EXPECTATIONS JVM JVM_IR // test.kt:5 box -// test.kt:19 nop -// test.kt:6 box -// test.kt:16 box -// test.kt:19 nop -// test.kt:17 box -// test.kt:7 box // test.kt:12 box +// test.kt:20 nop // test.kt:13 box +// test.kt:6 box +// test.kt:20 nop +// test.kt:7 box +// test.kt:17 box +// test.kt:20 nop +// test.kt:18 box // test.kt:8 box +// test.kt:13 box +// test.kt:14 box +// test.kt:9 box + +// EXPECTATIONS JS_IR diff --git a/compiler/testData/debug/stepping/initBlocks.kt b/compiler/testData/debug/stepping/initBlocks.kt index 62e580be229..d8b2f76c26a 100644 --- a/compiler/testData/debug/stepping/initBlocks.kt +++ b/compiler/testData/debug/stepping/initBlocks.kt @@ -54,7 +54,7 @@ fun box() { // JVM_IR has an extra step back to the line of the class // declaration for the return in the constructor. -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:48 box // test.kt:3 // test.kt:6 @@ -64,7 +64,7 @@ fun box() { // test.kt:8 // EXPECTATIONS JVM_IR // test.kt:3 -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:48 box // test.kt:49 box // test.kt:11 @@ -76,7 +76,7 @@ fun box() { // test.kt:18 // EXPECTATIONS JVM_IR // test.kt:11 -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:49 box // test.kt:50 box // test.kt:21 @@ -91,7 +91,7 @@ fun box() { // test.kt:30 // EXPECTATIONS JVM_IR // test.kt:21 -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:50 box // test.kt:51 box // test.kt:33 @@ -103,6 +103,26 @@ fun box() { // test.kt:42 // EXPECTATIONS JVM_IR // test.kt:33 -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:51 box // test.kt:52 box + +// EXPECTATIONS JS_IR +// test.kt:48 box +// test.kt:7 Foo +// test.kt:45 x +// test.kt:45 x +// test.kt:49 box +// test.kt:13 Bar +// test.kt:17 Bar +// test.kt:50 box +// test.kt:23 Boo +// test.kt:26 Boo +// test.kt:45 x +// test.kt:45 x +// test.kt:29 Boo +// test.kt:51 box +// test.kt:34 Zoo +// test.kt:36 Zoo +// test.kt:39 Zoo +// test.kt:42 Zoo diff --git a/compiler/testData/debug/stepping/initBlocksCompanion.kt b/compiler/testData/debug/stepping/initBlocksCompanion.kt index 3e0928194c5..d63810d55bb 100644 --- a/compiler/testData/debug/stepping/initBlocksCompanion.kt +++ b/compiler/testData/debug/stepping/initBlocksCompanion.kt @@ -30,7 +30,7 @@ fun box() { A.s } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:29 box // test.kt:7 // test.kt:8 @@ -51,3 +51,14 @@ fun box() { // test.kt:5 getS // test.kt:30 box // test.kt:31 box + +// EXPECTATIONS JS_IR +// test.kt:29 box +// test.kt:8 Companion_19 +// test.kt:11 Companion_19 +// test.kt:26 x +// test.kt:26 x +// test.kt:13 Companion_19 +// test.kt:16 Companion_19 +// test.kt:21 Companion_19 +// test.kt:30 box diff --git a/compiler/testData/debug/stepping/inlineCallableReference.kt b/compiler/testData/debug/stepping/inlineCallableReference.kt index 264b61fac0c..9eaab230df4 100644 --- a/compiler/testData/debug/stepping/inlineCallableReference.kt +++ b/compiler/testData/debug/stepping/inlineCallableReference.kt @@ -15,7 +15,7 @@ inline fun f(block: () -> Unit) { block() } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:3 box // test.kt:4 box // test.kt:15 box @@ -32,4 +32,10 @@ inline fun f(block: () -> Unit) { // test.kt:11 box // test.kt:15 box // test.kt:16 box -// test.kt:12 box \ No newline at end of file +// test.kt:12 box + +// EXPECTATIONS JS_IR +// test.kt:3 box +// test.kt:5 box +// test.kt:7 box +// test.kt:10 box diff --git a/compiler/testData/debug/stepping/inlineNamedCallableReference.kt b/compiler/testData/debug/stepping/inlineNamedCallableReference.kt index 3f5fe4e196d..d0fe223ba2f 100644 --- a/compiler/testData/debug/stepping/inlineNamedCallableReference.kt +++ b/compiler/testData/debug/stepping/inlineNamedCallableReference.kt @@ -10,7 +10,7 @@ inline fun f(block: () -> Unit) { fun g() {} -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:3 box // test.kt:4 box // test.kt:8 box @@ -19,3 +19,7 @@ fun g() {} // test.kt:8 box // test.kt:9 box // test.kt:5 box + +// EXPECTATIONS JS_IR +// test.kt:3 box +// test.kt:8 box diff --git a/compiler/testData/debug/stepping/inlineSimpleCall.kt b/compiler/testData/debug/stepping/inlineSimpleCall.kt index fe3edd0c15b..ddd627e128e 100644 --- a/compiler/testData/debug/stepping/inlineSimpleCall.kt +++ b/compiler/testData/debug/stepping/inlineSimpleCall.kt @@ -23,29 +23,31 @@ fun box() { } } -// EXPECTATIONS -// test.kt:8 box -// test.kt:4 box +// EXPECTATIONS JVM JVM_IR // test.kt:9 box +// test.kt:5 box // test.kt:10 box -// test.kt:4 box +// test.kt:11 box // test.kt:5 box -// test.kt:12 box -// test.kt:4 box +// test.kt:6 box // test.kt:13 box +// test.kt:5 box // test.kt:14 box -// test.kt:4 box +// test.kt:15 box // test.kt:5 box -// test.kt:16 box -// test.kt:4 box +// test.kt:6 box // test.kt:17 box -// test.kt:19 box -// test.kt:4 box +// test.kt:5 box +// test.kt:18 box // test.kt:20 box +// test.kt:5 box // test.kt:21 box -// test.kt:4 box -// test.kt:5 box // test.kt:22 box -// test.kt:4 box // test.kt:5 box +// test.kt:6 box // test.kt:23 box +// test.kt:5 box +// test.kt:6 box +// test.kt:24 box + +// EXPECTATIONS JS_IR diff --git a/compiler/testData/debug/stepping/kt15259.kt b/compiler/testData/debug/stepping/kt15259.kt index f3e8c80902c..53a13b31a6f 100644 --- a/compiler/testData/debug/stepping/kt15259.kt +++ b/compiler/testData/debug/stepping/kt15259.kt @@ -14,11 +14,16 @@ fun box() { // IR backend has additional steps on the way _out_ of the init block. -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:12 box // test.kt:6 makeFace // test.kt:6 // test.kt:8 // test.kt:9 makeFace // test.kt:12 box -// test.kt:13 box \ No newline at end of file +// test.kt:13 box + +// EXPECTATIONS JS_IR +// test.kt:12 box +// test.kt:9 makeFace +// test.kt:9 makeFace diff --git a/compiler/testData/debug/stepping/kt29179.kt b/compiler/testData/debug/stepping/kt29179.kt index c64397ad816..379a5b092e6 100644 --- a/compiler/testData/debug/stepping/kt29179.kt +++ b/compiler/testData/debug/stepping/kt29179.kt @@ -15,7 +15,7 @@ fun box() { A().foo() } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:15 box // test.kt:4 // test.kt:5 @@ -23,4 +23,9 @@ fun box() { // test.kt:8 foo // test.kt:10 foo // test.kt:11 foo -// test.kt:16 box \ No newline at end of file +// test.kt:16 box + +// EXPECTATIONS JS_IR +// test.kt:15 box +// test.kt:5 A +// test.kt:15 box diff --git a/compiler/testData/debug/stepping/kt42208.kt b/compiler/testData/debug/stepping/kt42208.kt index 12735bd4948..38b7c1afed0 100644 --- a/compiler/testData/debug/stepping/kt42208.kt +++ b/compiler/testData/debug/stepping/kt42208.kt @@ -7,7 +7,7 @@ fun box() { // aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa inline fun foo() = { } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:4 box // test1.kt:8 box // test1.kt:9 box @@ -15,5 +15,10 @@ inline fun foo() = { // test.kt:4 box // test1.kt:9 invoke // test.kt:4 box -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:5 box + +// EXPECTATIONS JS_IR +// test.kt:4 box +// test1.kt:6 box$lambda +// test1.kt:6 box$lambda diff --git a/compiler/testData/debug/stepping/kt42208b.kt b/compiler/testData/debug/stepping/kt42208b.kt index 9a872890279..597f11a2ce6 100644 --- a/compiler/testData/debug/stepping/kt42208b.kt +++ b/compiler/testData/debug/stepping/kt42208b.kt @@ -8,7 +8,7 @@ fun box() { // aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa inline fun foo() = { } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:4 box // test1.kt:9 box // test1.kt:10 box @@ -23,3 +23,9 @@ inline fun foo() = { // test.kt:4 box // test.kt:5 box // test.kt:6 box + +// EXPECTATIONS JS_IR +// test.kt:4 box +// test.kt:5 box +// test1.kt:7 box$lambda +// test1.kt:7 box$lambda diff --git a/compiler/testData/debug/stepping/kt42208c.kt b/compiler/testData/debug/stepping/kt42208c.kt index 95536abecd6..da8fe0f26c9 100644 --- a/compiler/testData/debug/stepping/kt42208c.kt +++ b/compiler/testData/debug/stepping/kt42208c.kt @@ -13,7 +13,7 @@ inline fun foo() = { fun baz(v:(() -> Unit)) { v() } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:4 box // test1.kt:10 box // test1.kt:11 box @@ -22,7 +22,7 @@ fun baz(v:(() -> Unit)) { // EXPECTATIONS JVM_IR // test1.kt:11 invoke // test3.kt:14 baz -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test3.kt:15 baz // test.kt:5 box // test1.kt:10 box @@ -32,7 +32,19 @@ fun baz(v:(() -> Unit)) { // EXPECTATIONS JVM_IR // test3.kt:14 baz // test1.kt:11 invoke -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test3.kt:14 baz // test3.kt:15 baz // test.kt:7 box + +// EXPECTATIONS JS_IR +// test.kt:4 box +// test3.kt:14 baz +// test1.kt:8 box$lambda +// test1.kt:8 box$lambda +// test1.kt:11 box +// test.kt:5 box +// test.kt:6 box +// test3.kt:14 baz +// test1.kt:8 box$lambda_0 +// test1.kt:8 box$lambda_0 diff --git a/compiler/testData/debug/stepping/lambdaStepInline.kt b/compiler/testData/debug/stepping/lambdaStepInline.kt index c2121dbfdca..a5617f9ab53 100644 --- a/compiler/testData/debug/stepping/lambdaStepInline.kt +++ b/compiler/testData/debug/stepping/lambdaStepInline.kt @@ -13,7 +13,7 @@ fun box(): String { return "OK" } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:8 box // test.kt:4 box // test.kt:8 box @@ -23,3 +23,11 @@ fun box(): String { // test.kt:10 box // test.kt:4 box // test.kt:13 box + +// EXPECTATIONS JS_IR +// test.kt:8 box +// test.kt:4 box +// test.kt:10 box +// test.kt:4 box +// test.kt:13 box +// test.kt:13 box diff --git a/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt b/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt index 2ca8ccb0cce..dab7c258c3f 100644 --- a/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt +++ b/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt @@ -17,7 +17,7 @@ fun box(): String { return "OK" } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:15 box // test.kt:3 box // test.kt:4 box @@ -29,3 +29,5 @@ fun box(): String { // test.kt:8 box // test.kt:11 box // test.kt:17 box + +// EXPECTATIONS JS_IR diff --git a/compiler/testData/debug/stepping/lineNumberAfterInline.kt b/compiler/testData/debug/stepping/lineNumberAfterInline.kt index e2a546623f7..df5da65cc63 100644 --- a/compiler/testData/debug/stepping/lineNumberAfterInline.kt +++ b/compiler/testData/debug/stepping/lineNumberAfterInline.kt @@ -23,7 +23,7 @@ fun box() { test2() } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:22 box // test.kt:12 test1 // test.kt:8 test1 @@ -36,4 +36,9 @@ fun box() { // test.kt:5 normalFunction // test.kt:18 test2 // test.kt:19 test2 -// test.kt:24 box \ No newline at end of file +// test.kt:24 box + +// EXPECTATIONS JS_IR +// test.kt:22 box +// test.kt:23 box +// test.kt:17 test2 diff --git a/compiler/testData/debug/stepping/linenumberForOneParametersArgumentCall.kt b/compiler/testData/debug/stepping/linenumberForOneParametersArgumentCall.kt index 18db2f7f68f..32b2c2a9f28 100644 --- a/compiler/testData/debug/stepping/linenumberForOneParametersArgumentCall.kt +++ b/compiler/testData/debug/stepping/linenumberForOneParametersArgumentCall.kt @@ -12,7 +12,7 @@ inline fun lookAtMe(f: (String) -> Unit) { f(a) } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:5 box // test.kt:11 box // test.kt:12 box @@ -21,3 +21,5 @@ inline fun lookAtMe(f: (String) -> Unit) { // test.kt:12 box // test.kt:13 box // test.kt:8 box + +// EXPECTATIONS JS_IR diff --git a/compiler/testData/debug/stepping/localFunction.kt b/compiler/testData/debug/stepping/localFunction.kt index 2bd1bb937a8..b615f643e74 100644 --- a/compiler/testData/debug/stepping/localFunction.kt +++ b/compiler/testData/debug/stepping/localFunction.kt @@ -11,19 +11,21 @@ fun box() { "OK" } -// EXPECTATIONS -// test.kt:4 box -// EXPECTATIONS JVM +// EXPECTATIONS JVM JVM_IR // test.kt:5 box -// EXPECTATIONS -// test.kt:8 box -// test.kt:9 box // EXPECTATIONS JVM -// test.kt:6 invoke -// test.kt:7 invoke -// EXPECTATIONS JVM_IR -// test.kt:6 box$bar -// test.kt:7 box$bar -// EXPECTATIONS +// test.kt:6 box +// EXPECTATIONS JVM JVM_IR +// test.kt:9 box // test.kt:10 box +// EXPECTATIONS JVM +// test.kt:7 invoke +// test.kt:8 invoke +// EXPECTATIONS JVM_IR +// test.kt:7 box$bar +// test.kt:8 box$bar +// EXPECTATIONS JVM JVM_IR // test.kt:11 box +// test.kt:12 box + +// EXPECTATIONS JS_IR diff --git a/compiler/testData/debug/stepping/localFunctionWIthOnelineExpressionBody.kt b/compiler/testData/debug/stepping/localFunctionWIthOnelineExpressionBody.kt index b934f39cc06..648b2544970 100644 --- a/compiler/testData/debug/stepping/localFunctionWIthOnelineExpressionBody.kt +++ b/compiler/testData/debug/stepping/localFunctionWIthOnelineExpressionBody.kt @@ -9,18 +9,20 @@ fun box() { "OK" } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:5 box // EXPECTATIONS JVM // test.kt:6 box -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:7 box // test.kt:8 box // EXPECTATIONS JVM // test.kt:6 invoke // EXPECTATIONS JVM_IR // test.kt:6 box$bar -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:8 box // test.kt:9 box // test.kt:10 box + +// EXPECTATIONS JS_IR diff --git a/compiler/testData/debug/stepping/localProperty.kt b/compiler/testData/debug/stepping/localProperty.kt index 30edad2bf81..419ad2467bc 100644 --- a/compiler/testData/debug/stepping/localProperty.kt +++ b/compiler/testData/debug/stepping/localProperty.kt @@ -13,9 +13,15 @@ fun box(): String { return o + k } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:8 box // test.kt:6 box // test.kt:11 box -// test.kt:13 box \ No newline at end of file +// test.kt:13 box + +// EXPECTATIONS JS_IR +// test.kt:5 box +// test.kt:11 box +// test.kt:13 box +// test.kt:13 box diff --git a/compiler/testData/debug/stepping/multiModule.kt b/compiler/testData/debug/stepping/multiModule.kt index cd8d6ad14b5..21b5269a767 100644 --- a/compiler/testData/debug/stepping/multiModule.kt +++ b/compiler/testData/debug/stepping/multiModule.kt @@ -15,7 +15,7 @@ fun box() { b() } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:14 box // a.kt:4 a // test.kt:14 box @@ -23,3 +23,11 @@ fun box() { // b.kt:8 b // test.kt:15 box // test.kt:16 box + +// EXPECTATIONS JS_IR +// test.kt:14 box +// a.kt:4 a +// a.kt:4 a +// test.kt:15 box +// b.kt:8 b +// b.kt:8 b diff --git a/compiler/testData/debug/stepping/multilineExpression.kt b/compiler/testData/debug/stepping/multilineExpression.kt index bd28d738478..8700a95d50b 100644 --- a/compiler/testData/debug/stepping/multilineExpression.kt +++ b/compiler/testData/debug/stepping/multilineExpression.kt @@ -11,13 +11,18 @@ fun test(a: Boolean, b: Boolean, c: Boolean): Boolean { && c } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:5 box // EXPECTATIONS JVM_IR // test.kt:9 test // test.kt:10 test -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:11 test // test.kt:9 test // test.kt:5 box // test.kt:6 box + +// EXPECTATIONS JS_IR +// test.kt:5 box +// test.kt:9 test +// test.kt:9 test diff --git a/compiler/testData/debug/stepping/multilineFunctionCall.kt b/compiler/testData/debug/stepping/multilineFunctionCall.kt index 119974ffc0f..657180b3249 100644 --- a/compiler/testData/debug/stepping/multilineFunctionCall.kt +++ b/compiler/testData/debug/stepping/multilineFunctionCall.kt @@ -9,8 +9,11 @@ fun box() { fun foo(i: Int) { } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:5 box // test.kt:4 box // test.kt:10 foo // test.kt:7 box + +// EXPECTATIONS JS_IR +// test.kt:4 box diff --git a/compiler/testData/debug/stepping/multilineInfixCall.kt b/compiler/testData/debug/stepping/multilineInfixCall.kt index e0c731e1bf9..cceb164c404 100644 --- a/compiler/testData/debug/stepping/multilineInfixCall.kt +++ b/compiler/testData/debug/stepping/multilineInfixCall.kt @@ -8,9 +8,12 @@ fun box() { infix fun Int.foo(i: Int) { } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:4 box // test.kt:5 box // test.kt:4 box // test.kt:9 foo // test.kt:6 box + +// EXPECTATIONS JS_IR +// test.kt:4 box diff --git a/compiler/testData/debug/stepping/namedCallableReference.kt b/compiler/testData/debug/stepping/namedCallableReference.kt index 7662ec0cbbe..6af7817daaa 100644 --- a/compiler/testData/debug/stepping/namedCallableReference.kt +++ b/compiler/testData/debug/stepping/namedCallableReference.kt @@ -16,15 +16,24 @@ fun g() {} // for the invoke method bridged to. Therefore, the entry line number for invoke only shows // up for JVM_IR. -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:3 box // test.kt:4 box // test.kt:8 f // EXPECTATIONS JVM_IR // test.kt:4 invoke -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:11 g // test.kt:4 invoke // test.kt:8 f // test.kt:9 f // test.kt:5 box + +// EXPECTATIONS JS_IR +// test.kt:3 box +// test.kt:4 box +// test.kt:4 box +// test.kt:8 f +// test.kt:4 l +// test.kt:4 l +// test.kt:4 l diff --git a/compiler/testData/debug/stepping/nestedInline.kt b/compiler/testData/debug/stepping/nestedInline.kt index 7bad04b3d40..8818c0d981b 100644 --- a/compiler/testData/debug/stepping/nestedInline.kt +++ b/compiler/testData/debug/stepping/nestedInline.kt @@ -41,7 +41,7 @@ inline fun html(init: () -> Unit) { return init(init) } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:19 box // test.kt:7 box // test.kt:9 box @@ -63,3 +63,8 @@ inline fun html(init: () -> Unit) { // test.kt:15 box // test.kt:19 box // test.kt:21 box + +// EXPECTATIONS JS_IR +// test.kt:19 box +// test.kt:21 box +// test.kt:21 box diff --git a/compiler/testData/debug/stepping/noParametersArgumentCallInExpression.kt b/compiler/testData/debug/stepping/noParametersArgumentCallInExpression.kt index 13d2d9939ef..cd40cf4057d 100644 --- a/compiler/testData/debug/stepping/noParametersArgumentCallInExpression.kt +++ b/compiler/testData/debug/stepping/noParametersArgumentCallInExpression.kt @@ -12,11 +12,13 @@ inline fun lookAtMe(f: () -> Int) { a + f() } -// EXPECTATIONS -// test.kt:4 box -// test.kt:10 box -// test.kt:11 box +// EXPECTATIONS JVM JVM_IR // test.kt:5 box // test.kt:11 box // test.kt:12 box -// test.kt:7 box +// test.kt:6 box +// test.kt:12 box +// test.kt:13 box +// test.kt:8 box + +// EXPECTATIONS JS_IR diff --git a/compiler/testData/debug/stepping/nullcheck.kt b/compiler/testData/debug/stepping/nullcheck.kt index 80dc20e47e2..f0d3aeb3384 100644 --- a/compiler/testData/debug/stepping/nullcheck.kt +++ b/compiler/testData/debug/stepping/nullcheck.kt @@ -20,7 +20,6 @@ fun testExpressionBody(nullable: String?) = // Some comment nullable.length == 2 -// EXPECTATIONS // EXPECTATIONS JVM // test.kt:6 box // test.kt:15 test @@ -65,4 +64,18 @@ fun testExpressionBody(nullable: String?) = // test.kt:21 testExpressionBody // test.kt:9 box -// test.kt:10 box \ No newline at end of file +// test.kt:10 box + +// EXPECTATIONS JS_IR +// test.kt:6 box +// test.kt:13 test +// test.kt:13 test +// test.kt:7 box +// test.kt:13 test +// test.kt:13 test +// test.kt:8 box +// test.kt:21 testExpressionBody +// test.kt:21 testExpressionBody +// test.kt:9 box +// test.kt:21 testExpressionBody +// test.kt:21 testExpressionBody diff --git a/compiler/testData/debug/stepping/primitiveNullChecks.kt b/compiler/testData/debug/stepping/primitiveNullChecks.kt index f8852d1b18f..d7ff1ba144f 100644 --- a/compiler/testData/debug/stepping/primitiveNullChecks.kt +++ b/compiler/testData/debug/stepping/primitiveNullChecks.kt @@ -6,7 +6,14 @@ fun box(): String { return "OK"!! } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:4 box // test.kt:5 box -// test.kt:6 box \ No newline at end of file +// test.kt:6 box + +// EXPECTATIONS JS_IR +// test.kt:4 box +// test.kt:5 box +// test.kt:5 box +// test.kt:6 box +// test.kt:6 box diff --git a/compiler/testData/debug/stepping/propertyAccessor.kt b/compiler/testData/debug/stepping/propertyAccessor.kt index 8b286241dde..02fd413e345 100644 --- a/compiler/testData/debug/stepping/propertyAccessor.kt +++ b/compiler/testData/debug/stepping/propertyAccessor.kt @@ -11,10 +11,16 @@ fun box() { A().prop } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:11 box // test.kt:3 // test.kt:11 box // test.kt:6 getProp // test.kt:11 box // test.kt:12 box + +// EXPECTATIONS JS_IR +// test.kt:11 box +// test.kt:11 box +// test.kt:6 A.get_prop_wosl9o_k$ +// test.kt:6 A.get_prop_wosl9o_k$ diff --git a/compiler/testData/debug/stepping/psvm.kt b/compiler/testData/debug/stepping/psvm.kt index 0a6101f264e..0de0f179931 100644 --- a/compiler/testData/debug/stepping/psvm.kt +++ b/compiler/testData/debug/stepping/psvm.kt @@ -8,8 +8,12 @@ fun box() { main(arrayOf("OK")) } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:8 box // test.kt:4 main // test.kt:5 main // test.kt:9 box + +// EXPECTATIONS JS_IR +// test.kt:8 box +// test.kt:4 main diff --git a/compiler/testData/debug/stepping/recursion.kt b/compiler/testData/debug/stepping/recursion.kt index 8a5ad7a9842..7f1d8de019f 100644 --- a/compiler/testData/debug/stepping/recursion.kt +++ b/compiler/testData/debug/stepping/recursion.kt @@ -11,7 +11,7 @@ fun foo(n :Int ) : Int { return foo(n-1) * n } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:3 box // test.kt:4 box // test.kt:8 foo @@ -24,3 +24,18 @@ fun foo(n :Int ) : Int { // test.kt:11 foo // test.kt:4 box // test.kt:5 box + +// EXPECTATIONS JS_IR +// test.kt:3 box +// test.kt:4 box +// test.kt:8 foo +// test.kt:11 foo +// test.kt:8 foo +// test.kt:11 foo +// test.kt:8 foo +// test.kt:9 foo +// test.kt:9 foo +// test.kt:11 foo +// test.kt:11 foo +// test.kt:11 foo +// test.kt:11 foo diff --git a/compiler/testData/debug/stepping/simpleDefaultArg.kt b/compiler/testData/debug/stepping/simpleDefaultArg.kt index 712b80f2811..7b9565c8cca 100644 --- a/compiler/testData/debug/stepping/simpleDefaultArg.kt +++ b/compiler/testData/debug/stepping/simpleDefaultArg.kt @@ -9,9 +9,19 @@ fun box(): String { } // FORCE_STEP_INTO -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:8 box // test.kt:3 ifoo$default (synthetic) // test.kt:4 ifoo // test.kt:3 ifoo$default (synthetic) -// test.kt:8 box \ No newline at end of file +// test.kt:8 box + +// EXPECTATIONS JS_IR +// test.kt:8 box +// test.kt:3 ifoo$default +// test.kt:3 ifoo$default +// test.kt:3 ifoo$default +// test.kt:4 ifoo +// test.kt:4 ifoo +// test.kt:3 ifoo$default +// test.kt:8 box diff --git a/compiler/testData/debug/stepping/simpleDefaultArgWithInline.kt b/compiler/testData/debug/stepping/simpleDefaultArgWithInline.kt index 07cf74c1522..69c3ceb152e 100644 --- a/compiler/testData/debug/stepping/simpleDefaultArgWithInline.kt +++ b/compiler/testData/debug/stepping/simpleDefaultArgWithInline.kt @@ -15,7 +15,7 @@ fun box(): String { } // FORCE_STEP_INTO -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:13 box // test.kt:4 box // test.kt:5 box @@ -24,3 +24,5 @@ fun box(): String { // test.kt:9 ifoo2 // test.kt:8 ifoo2$default (synthetic) // test.kt:14 box + +// EXPECTATIONS JS_IR diff --git a/compiler/testData/debug/stepping/simpleInlineDefaultArg.kt b/compiler/testData/debug/stepping/simpleInlineDefaultArg.kt index e2205e314b3..ef264b020aa 100644 --- a/compiler/testData/debug/stepping/simpleInlineDefaultArg.kt +++ b/compiler/testData/debug/stepping/simpleInlineDefaultArg.kt @@ -27,12 +27,15 @@ fun box(): String { // for the inline function are only used for instructions covered by // the `$i$f$alsoInline` variable life time. -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:10 box // test.kt:5 box // test.kt:3 box // EXPECTATIONS JVM_IR // test.kt:5 box -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:6 box -// test.kt:10 box \ No newline at end of file +// test.kt:10 box + +// EXPECTATIONS JS_IR +// test.kt:10 box diff --git a/compiler/testData/debug/stepping/simpleSmap.kt b/compiler/testData/debug/stepping/simpleSmap.kt index c28d890bc24..d38ebf41d51 100644 --- a/compiler/testData/debug/stepping/simpleSmap.kt +++ b/compiler/testData/debug/stepping/simpleSmap.kt @@ -12,7 +12,7 @@ fun box() { } } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:10 box // test.kt:6 box // test.kt:11 box @@ -20,3 +20,5 @@ fun box() { // test.kt:6 box // test.kt:7 box // test.kt:13 box + +// EXPECTATIONS JS_IR diff --git a/compiler/testData/debug/stepping/smapInlineAsArgument.kt b/compiler/testData/debug/stepping/smapInlineAsArgument.kt index fe27def88be..fdcabd284f4 100644 --- a/compiler/testData/debug/stepping/smapInlineAsArgument.kt +++ b/compiler/testData/debug/stepping/smapInlineAsArgument.kt @@ -20,7 +20,7 @@ fun fail() : String { return "fail" } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:4 box // test.kt:16 box // test.kt:5 box @@ -35,4 +35,15 @@ fun fail() : String { // test.kt:7 box // test.kt:12 checkEquals // test.kt:13 checkEquals -// test.kt:9 box \ No newline at end of file +// test.kt:9 box + +// EXPECTATIONS JS_IR +// test.kt:4 box +// test.kt:20 fail +// test.kt:20 fail +// test.kt:4 box +// test.kt:7 box +// test.kt:20 fail +// test.kt:20 fail +// test.kt:16 box +// test.kt:7 box diff --git a/compiler/testData/debug/stepping/smapInlineAsInfixArgument.kt b/compiler/testData/debug/stepping/smapInlineAsInfixArgument.kt index d4deb7efeba..4cda3afc5c7 100644 --- a/compiler/testData/debug/stepping/smapInlineAsInfixArgument.kt +++ b/compiler/testData/debug/stepping/smapInlineAsInfixArgument.kt @@ -18,7 +18,7 @@ fun fail() : String { return "fail" } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:6 box // test.kt:14 box // test.kt:7 box @@ -34,3 +34,18 @@ fun fail() : String { // test.kt:3 execute // test.kt:9 box // test.kt:11 box + +// EXPECTATIONS JS_IR +// test.kt:6 box +// test.kt:18 fail +// test.kt:18 fail +// test.kt:6 box +// test.kt:3 execute +// test.kt:3 execute +// test.kt:9 box +// test.kt:18 fail +// test.kt:18 fail +// test.kt:14 box +// test.kt:9 box +// test.kt:3 execute +// test.kt:3 execute diff --git a/compiler/testData/debug/stepping/smapInlineAsInlineArgument.kt b/compiler/testData/debug/stepping/smapInlineAsInlineArgument.kt index 3eb13c7841a..3cdfa9ab7bc 100644 --- a/compiler/testData/debug/stepping/smapInlineAsInlineArgument.kt +++ b/compiler/testData/debug/stepping/smapInlineAsInlineArgument.kt @@ -20,7 +20,7 @@ fun fail() : String { return "fail" } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:4 box // test.kt:16 box // test.kt:5 box @@ -36,3 +36,16 @@ fun fail() : String { // test.kt:7 box // test.kt:16 box // test.kt:9 box + +// EXPECTATIONS JS_IR +// test.kt:4 box +// test.kt:5 box +// test.kt:20 fail +// test.kt:20 fail +// test.kt:16 box +// test.kt:7 box +// test.kt:20 fail +// test.kt:20 fail +// test.kt:16 box +// test.kt:8 box +// test.kt:16 box diff --git a/compiler/testData/debug/stepping/smapInlineInIntrinsicArgument.kt b/compiler/testData/debug/stepping/smapInlineInIntrinsicArgument.kt index b0ee8b5f18f..f95440cccfc 100644 --- a/compiler/testData/debug/stepping/smapInlineInIntrinsicArgument.kt +++ b/compiler/testData/debug/stepping/smapInlineInIntrinsicArgument.kt @@ -21,7 +21,7 @@ fun fail() : String { // arguments as being on line 5 and 8. That seems incorrect // and the JVM_IR stepping is more correct. -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:4 box // test.kt:12 box // test.kt:4 box @@ -35,3 +35,13 @@ fun fail() : String { // test.kt:12 box // test.kt:7 box // test.kt:9 box + +// EXPECTATIONS JS_IR +// test.kt:4 box +// test.kt:16 fail +// test.kt:16 fail +// test.kt:7 box +// test.kt:16 fail +// test.kt:16 fail +// test.kt:12 box +// test.kt:7 box diff --git a/compiler/testData/debug/stepping/stringSwitches.kt b/compiler/testData/debug/stepping/stringSwitches.kt index 4a0d35760a3..ac72419a998 100644 --- a/compiler/testData/debug/stepping/stringSwitches.kt +++ b/compiler/testData/debug/stepping/stringSwitches.kt @@ -41,7 +41,7 @@ fun box() { // does not. So on JVM there are steps on each condition evaluation for // the first `when`. -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:29 box // test.kt:4 stringSwitch // test.kt:5 stringSwitch @@ -52,7 +52,7 @@ fun box() { // test.kt:19 stringSwitch // EXPECTATIONS JVM_IR // test.kt:18 stringSwitch -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:21 stringSwitch // test.kt:18 stringSwitch // test.kt:26 stringSwitch @@ -60,7 +60,7 @@ fun box() { // test.kt:4 stringSwitch // EXPECTATIONS JVM // test.kt:5 stringSwitch -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:6 stringSwitch // test.kt:4 stringSwitch // test.kt:11 stringSwitch @@ -69,7 +69,7 @@ fun box() { // test.kt:19 stringSwitch // EXPECTATIONS JVM_IR // test.kt:18 stringSwitch -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:22 stringSwitch // test.kt:18 stringSwitch // test.kt:26 stringSwitch @@ -78,7 +78,7 @@ fun box() { // EXPECTATIONS JVM // test.kt:5 stringSwitch // test.kt:6 stringSwitch -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:7 stringSwitch // test.kt:4 stringSwitch // test.kt:11 stringSwitch @@ -87,7 +87,7 @@ fun box() { // test.kt:19 stringSwitch // EXPECTATIONS JVM_IR // test.kt:18 stringSwitch -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:23 stringSwitch // test.kt:18 stringSwitch // test.kt:26 stringSwitch @@ -97,7 +97,7 @@ fun box() { // test.kt:5 stringSwitch // test.kt:6 stringSwitch // test.kt:7 stringSwitch -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:8 stringSwitch // test.kt:4 stringSwitch // test.kt:11 stringSwitch @@ -106,8 +106,34 @@ fun box() { // test.kt:19 stringSwitch // EXPECTATIONS JVM_IR // test.kt:18 stringSwitch -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:24 stringSwitch // test.kt:18 stringSwitch // test.kt:26 stringSwitch -// test.kt:33 box \ No newline at end of file +// test.kt:33 box + +// EXPECTATIONS JS_IR +// test.kt:29 box +// test.kt:5 stringSwitch +// test.kt:11 stringSwitch +// test.kt:12 stringSwitch +// test.kt:19 stringSwitch +// test.kt:21 stringSwitch +// test.kt:30 box +// test.kt:6 stringSwitch +// test.kt:11 stringSwitch +// test.kt:13 stringSwitch +// test.kt:19 stringSwitch +// test.kt:22 stringSwitch +// test.kt:31 box +// test.kt:7 stringSwitch +// test.kt:11 stringSwitch +// test.kt:14 stringSwitch +// test.kt:19 stringSwitch +// test.kt:23 stringSwitch +// test.kt:32 box +// test.kt:8 stringSwitch +// test.kt:11 stringSwitch +// test.kt:15 stringSwitch +// test.kt:19 stringSwitch +// test.kt:24 stringSwitch diff --git a/compiler/testData/debug/stepping/stringSwitchesSmall.kt b/compiler/testData/debug/stepping/stringSwitchesSmall.kt index 826a2427591..779a759e88b 100644 --- a/compiler/testData/debug/stepping/stringSwitchesSmall.kt +++ b/compiler/testData/debug/stepping/stringSwitchesSmall.kt @@ -37,7 +37,7 @@ fun box() { // does not. So on JVM there are direct jumps to the right branch for the // last two whens. -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:26 box // test.kt:4 stringSwitch // test.kt:5 stringSwitch @@ -48,7 +48,7 @@ fun box() { // test.kt:17 stringSwitch // EXPECTATIONS JVM_IR // test.kt:16 stringSwitch -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:19 stringSwitch // test.kt:16 stringSwitch // test.kt:23 stringSwitch @@ -60,14 +60,14 @@ fun box() { // test.kt:10 stringSwitch // EXPECTATIONS JVM_IR // test.kt:11 stringSwitch -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:12 stringSwitch // test.kt:10 stringSwitch // test.kt:17 stringSwitch // EXPECTATIONS JVM_IR // test.kt:16 stringSwitch // test.kt:19 stringSwitch -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:20 stringSwitch // test.kt:16 stringSwitch // test.kt:23 stringSwitch @@ -81,7 +81,7 @@ fun box() { // EXPECTATIONS JVM_IR // test.kt:11 stringSwitch // test.kt:12 stringSwitch -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:13 stringSwitch // test.kt:10 stringSwitch // test.kt:17 stringSwitch @@ -89,8 +89,28 @@ fun box() { // test.kt:16 stringSwitch // test.kt:19 stringSwitch // test.kt:20 stringSwitch -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:21 stringSwitch // test.kt:16 stringSwitch // test.kt:23 stringSwitch -// test.kt:29 box \ No newline at end of file +// test.kt:29 box + +// EXPECTATIONS JS_IR +// test.kt:26 box +// test.kt:5 stringSwitch +// test.kt:10 stringSwitch +// test.kt:11 stringSwitch +// test.kt:17 stringSwitch +// test.kt:19 stringSwitch +// test.kt:27 box +// test.kt:6 stringSwitch +// test.kt:10 stringSwitch +// test.kt:12 stringSwitch +// test.kt:17 stringSwitch +// test.kt:20 stringSwitch +// test.kt:28 box +// test.kt:7 stringSwitch +// test.kt:10 stringSwitch +// test.kt:13 stringSwitch +// test.kt:17 stringSwitch +// test.kt:21 stringSwitch diff --git a/compiler/testData/debug/stepping/suspendFunWithLambdaParameter.kt b/compiler/testData/debug/stepping/suspendFunWithLambdaParameter.kt index efa678172a5..1c859ae723b 100644 --- a/compiler/testData/debug/stepping/suspendFunWithLambdaParameter.kt +++ b/compiler/testData/debug/stepping/suspendFunWithLambdaParameter.kt @@ -10,10 +10,19 @@ suspend fun box() { } } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:8 box // test.kt:4 foo // test.kt:9 invoke // test.kt:4 foo // test.kt:8 box // test.kt:11 box + +// EXPECTATIONS JS_IR +// test.kt:8 $boxCOROUTINE$0.doResume_5yljmg_k$ +// test.kt:4 foo +// test.kt:4 foo +// test.kt:9 box$lambda +// test.kt:9 box$lambda +// test.kt:4 foo +// test.kt:7 box diff --git a/compiler/testData/debug/stepping/suspendFunWithSuspendLambdaParameter.kt b/compiler/testData/debug/stepping/suspendFunWithSuspendLambdaParameter.kt index 2c176c557d8..1494531a678 100644 --- a/compiler/testData/debug/stepping/suspendFunWithSuspendLambdaParameter.kt +++ b/compiler/testData/debug/stepping/suspendFunWithSuspendLambdaParameter.kt @@ -16,8 +16,10 @@ suspend fun box() { // That means that we never step into the lambda as that is only // called via code in the kotlin package. -// EXPECTATIONS -// test.kt:8 box -// test.kt:4 foo -// test.kt:8 box -// test.kt:11 box +// EXPECTATIONS JVM JVM_IR +// test.kt:9 box +// test.kt:5 foo +// test.kt:9 box +// test.kt:12 box + +// EXPECTATIONS JS_IR diff --git a/compiler/testData/debug/stepping/throwException.kt b/compiler/testData/debug/stepping/throwException.kt index 674488201d5..bce1e77a5d4 100644 --- a/compiler/testData/debug/stepping/throwException.kt +++ b/compiler/testData/debug/stepping/throwException.kt @@ -4,7 +4,7 @@ fun box() { val b = 2 try { throwIfLess(a, b) - } catch (e: java.lang.Exception) { + } catch (e: Exception) { throwIfLess(a, b) } throwIfLess(b,a) @@ -12,9 +12,9 @@ fun box() { fun throwIfLess(a: Int, b: Int) { if (a // test.kt:14 box @@ -42,4 +42,18 @@ fun box() { // test.kt:7 bar // test.kt:11 bar // test.kt:15 box -// test.kt:16 box \ No newline at end of file +// test.kt:16 box + +// EXPECTATIONS JS_IR +// test.kt:14 box +// test.kt:14 box +// test.kt:7 bar +// test.kt:4 foo +// test.kt:4 foo +// test.kt:7 bar +// test.kt:15 box +// test.kt:15 box +// test.kt:7 bar +// test.kt:4 foo +// test.kt:4 foo +// test.kt:7 bar diff --git a/compiler/testData/debug/stepping/tryCatch.kt b/compiler/testData/debug/stepping/tryCatch.kt index 95eef1ffe50..d65dac5aff5 100644 --- a/compiler/testData/debug/stepping/tryCatch.kt +++ b/compiler/testData/debug/stepping/tryCatch.kt @@ -14,7 +14,7 @@ fun box() { foo(true) } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:13 box // test.kt:4 foo // test.kt:5 foo @@ -28,3 +28,10 @@ fun box() { // test.kt:9 foo // test.kt:10 foo // test.kt:15 box + +// EXPECTATIONS JS_IR +// test.kt:13 box +// test.kt:5 foo +// test.kt:14 box +// test.kt:5 foo +// test.kt:5 foo diff --git a/compiler/testData/debug/stepping/tryCatchExpression.kt b/compiler/testData/debug/stepping/tryCatchExpression.kt index 36cc43f76dc..23f0dc70374 100644 --- a/compiler/testData/debug/stepping/tryCatchExpression.kt +++ b/compiler/testData/debug/stepping/tryCatchExpression.kt @@ -47,7 +47,7 @@ fun box() { foo() } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:41 box // test.kt:4 foo // test.kt:5 foo @@ -104,4 +104,45 @@ fun box() { // test.kt:28 mightThrow // test.kt:6 foo // test.kt:7 foo -// test.kt:48 box \ No newline at end of file +// test.kt:48 box + +// EXPECTATIONS JS_IR +// test.kt:41 box +// test.kt:5 foo +// test.kt:28 mightThrow +// test.kt:11 foo +// test.kt:32 mightThrow2 +// test.kt:10 foo +// test.kt:17 foo +// test.kt:36 mightThrow3 +// test.kt:37 mightThrow3 +// test.kt:37 mightThrow3 +// test.kt:16 foo +// test.kt:42 box +// test.kt:43 box +// test.kt:5 foo +// test.kt:28 mightThrow +// test.kt:11 foo +// test.kt:32 mightThrow2 +// test.kt:10 foo +// test.kt:17 foo +// test.kt:36 mightThrow3 +// test.kt:36 mightThrow3 +// test.kt:19 foo +// test.kt:19 foo +// test.kt:44 box +// test.kt:45 box +// test.kt:5 foo +// test.kt:28 mightThrow +// test.kt:11 foo +// test.kt:32 mightThrow2 +// test.kt:32 mightThrow2 +// test.kt:13 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:7 foo +// test.kt:7 foo diff --git a/compiler/testData/debug/stepping/tryCatchFinally.kt b/compiler/testData/debug/stepping/tryCatchFinally.kt index 5fd8bcf8fad..cfab0cb70cf 100644 --- a/compiler/testData/debug/stepping/tryCatchFinally.kt +++ b/compiler/testData/debug/stepping/tryCatchFinally.kt @@ -38,56 +38,58 @@ fun box() { foo() } -// EXPECTATIONS -// test.kt:33 box -// test.kt:4 foo -// test.kt:5 foo -// test.kt:25 mightThrow -// test.kt:26 mightThrow -// test.kt:9 foo -// test.kt:10 foo -// test.kt:12 foo -// test.kt:13 foo -// test.kt:29 mightThrow2 -// test.kt:30 mightThrow2 -// test.kt:13 foo -// test.kt:17 foo -// test.kt:18 foo -// test.kt:12 foo -// test.kt:19 foo +// EXPECTATIONS JVM JVM_IR // test.kt:34 box -// test.kt:35 box -// test.kt:4 foo // test.kt:5 foo -// test.kt:25 mightThrow -// test.kt:26 mightThrow -// test.kt:9 foo -// test.kt:10 foo -// test.kt:12 foo -// test.kt:13 foo -// test.kt:29 mightThrow2 -// test.kt:14 foo -// test.kt:15 foo -// test.kt:17 foo -// test.kt:18 foo -// test.kt:12 foo -// test.kt:19 foo -// test.kt:36 box -// test.kt:37 box -// test.kt:4 foo -// test.kt:5 foo -// test.kt:25 mightThrow // test.kt:6 foo -// test.kt:7 foo -// test.kt:9 foo +// test.kt:26 mightThrow +// test.kt:27 mightThrow // test.kt:10 foo -// test.kt:12 foo +// test.kt:11 foo // test.kt:13 foo -// test.kt:29 mightThrow2 // test.kt:14 foo -// test.kt:15 foo -// test.kt:17 foo +// test.kt:30 mightThrow2 +// test.kt:31 mightThrow2 +// test.kt:14 foo // test.kt:18 foo -// test.kt:12 foo // test.kt:19 foo +// test.kt:13 foo +// test.kt:20 foo +// test.kt:35 box +// test.kt:36 box +// test.kt:5 foo +// test.kt:6 foo +// test.kt:26 mightThrow +// test.kt:27 mightThrow +// test.kt:10 foo +// test.kt:11 foo +// test.kt:13 foo +// test.kt:14 foo +// test.kt:30 mightThrow2 +// test.kt:15 foo +// test.kt:16 foo +// test.kt:18 foo +// test.kt:19 foo +// test.kt:13 foo +// test.kt:20 foo +// test.kt:37 box // test.kt:38 box +// test.kt:5 foo +// test.kt:6 foo +// test.kt:26 mightThrow +// test.kt:7 foo +// test.kt:8 foo +// test.kt:10 foo +// test.kt:11 foo +// test.kt:13 foo +// test.kt:14 foo +// test.kt:30 mightThrow2 +// test.kt:15 foo +// test.kt:16 foo +// test.kt:18 foo +// test.kt:19 foo +// test.kt:13 foo +// test.kt:20 foo +// test.kt:39 box + +// EXPECTATIONS JS_IR diff --git a/compiler/testData/debug/stepping/tryFinally.kt b/compiler/testData/debug/stepping/tryFinally.kt index d1a502764d8..a7601bc8def 100644 --- a/compiler/testData/debug/stepping/tryFinally.kt +++ b/compiler/testData/debug/stepping/tryFinally.kt @@ -39,7 +39,7 @@ fun box() { // JVM_IR behavior is consistent with what happens for the // try-finally where the value is discarded which seems good. -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:29 box // test.kt:4 foo // test.kt:5 foo @@ -53,7 +53,7 @@ fun box() { // test.kt:26 mightThrow2 // EXPECTATIONS JVM // test.kt:11 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:13 foo // test.kt:14 foo // test.kt:10 foo @@ -74,3 +74,18 @@ fun box() { // test.kt:10 foo // EXPECTATIONS JVM_IR // test.kt:13 foo + +// EXPECTATIONS JS_IR +// test.kt:29 box +// test.kt:5 foo +// test.kt:21 mightThrow +// test.kt:11 foo +// test.kt:25 mightThrow2 +// test.kt:10 foo +// test.kt:30 box +// test.kt:31 box +// test.kt:5 foo +// test.kt:21 mightThrow +// test.kt:11 foo +// test.kt:25 mightThrow2 +// test.kt:25 mightThrow2 diff --git a/compiler/testData/debug/stepping/variablesWithoutInitializer.kt b/compiler/testData/debug/stepping/variablesWithoutInitializer.kt index ee9c636ff79..aebae78b6a9 100644 --- a/compiler/testData/debug/stepping/variablesWithoutInitializer.kt +++ b/compiler/testData/debug/stepping/variablesWithoutInitializer.kt @@ -16,14 +16,19 @@ fun box() { // those does not seem useful. This is consistent with javac behavior // as well. The JVM backend does generate these line numbers. -// EXPECTATIONS // EXPECTATIONS JVM // test.kt:4 box // test.kt:5 box // test.kt:6 box -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR +// test.kt:7 box +// test.kt:8 box +// test.kt:9 box +// test.kt:10 box +// test.kt:12 box + +// EXPECTATIONS JS_IR // test.kt:7 box // test.kt:8 box // test.kt:9 box // test.kt:10 box -// test.kt:12 box \ No newline at end of file diff --git a/compiler/testData/debug/stepping/voidLambdaStepInline.kt b/compiler/testData/debug/stepping/voidLambdaStepInline.kt index 7fb8b487415..0f74a52d199 100644 --- a/compiler/testData/debug/stepping/voidLambdaStepInline.kt +++ b/compiler/testData/debug/stepping/voidLambdaStepInline.kt @@ -8,7 +8,7 @@ fun box(): String { return "OK" } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:4 box // fake.kt:1 box // test.kt:4 box @@ -16,3 +16,9 @@ fun box(): String { // test.kt:6 box // test.kt:5 box // test.kt:8 box + +// EXPECTATIONS JS_IR +// test.kt:4 box +// test.kt:6 box +// test.kt:8 box +// test.kt:8 box diff --git a/compiler/testData/debug/stepping/when.kt b/compiler/testData/debug/stepping/when.kt index 2ebec71b595..0e956010f5a 100644 --- a/compiler/testData/debug/stepping/when.kt +++ b/compiler/testData/debug/stepping/when.kt @@ -23,26 +23,26 @@ fun box() { // of each of the conditions, but goes directly to the right body. The // JVM_IR stepping behavior here is the same as for `whenSubject.kt`. -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:18 box // test.kt:4 foo // test.kt:5 foo // test.kt:4 foo // EXPECTATIONS JVM // test.kt:5 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:6 foo // test.kt:4 foo // EXPECTATIONS JVM // test.kt:5 foo // test.kt:6 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:7 foo // test.kt:10 foo // EXPECTATIONS JVM // test.kt:11 foo // test.kt:12 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:13 foo // test.kt:10 foo // test.kt:15 foo @@ -50,19 +50,19 @@ fun box() { // test.kt:10 foo // EXPECTATIONS JVM // test.kt:11 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:12 foo // test.kt:4 foo // EXPECTATIONS JVM // test.kt:5 foo // test.kt:6 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:7 foo // test.kt:10 foo // EXPECTATIONS JVM // test.kt:11 foo // test.kt:12 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:13 foo // test.kt:10 foo // test.kt:15 foo @@ -75,19 +75,19 @@ fun box() { // test.kt:4 foo // EXPECTATIONS JVM // test.kt:5 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:6 foo // test.kt:4 foo // EXPECTATIONS JVM // test.kt:5 foo // test.kt:6 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:7 foo // test.kt:10 foo // EXPECTATIONS JVM // test.kt:11 foo // test.kt:12 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:13 foo // test.kt:10 foo // test.kt:15 foo @@ -95,19 +95,19 @@ fun box() { // test.kt:10 foo // EXPECTATIONS JVM // test.kt:11 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:12 foo // test.kt:4 foo // EXPECTATIONS JVM // test.kt:5 foo // test.kt:6 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:7 foo // test.kt:10 foo // EXPECTATIONS JVM // test.kt:11 foo // test.kt:12 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:13 foo // test.kt:10 foo // test.kt:15 foo @@ -117,4 +117,24 @@ fun box() { // test.kt:11 foo // test.kt:10 foo // test.kt:15 foo -// test.kt:19 box \ No newline at end of file +// test.kt:19 box + +// EXPECTATIONS JS_IR +// test.kt:18 box +// test.kt:5 foo +// test.kt:6 foo +// test.kt:13 foo +// test.kt:10 foo +// test.kt:12 foo +// test.kt:13 foo +// test.kt:10 foo +// test.kt:10 foo +// test.kt:11 foo +// test.kt:6 foo +// test.kt:13 foo +// test.kt:10 foo +// test.kt:12 foo +// test.kt:13 foo +// test.kt:10 foo +// test.kt:10 foo +// test.kt:10 foo diff --git a/compiler/testData/debug/stepping/whenComplicatedSubject.kt b/compiler/testData/debug/stepping/whenComplicatedSubject.kt index 4944aafae95..6b9d65427c6 100644 --- a/compiler/testData/debug/stepping/whenComplicatedSubject.kt +++ b/compiler/testData/debug/stepping/whenComplicatedSubject.kt @@ -21,7 +21,7 @@ fun box() { // The JVM_IR backend optimizes the inner when to a switch and therefore goes directly to the // right case without stepping through evaluation of each condition. -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:16 box // test.kt:5 foo // test.kt:6 foo @@ -32,7 +32,7 @@ fun box() { // test.kt:5 foo // EXPECTATIONS JVM // test.kt:6 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:7 foo // test.kt:4 foo // test.kt:13 foo @@ -41,9 +41,22 @@ fun box() { // EXPECTATIONS JVM // test.kt:6 foo // test.kt:7 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:8 foo // test.kt:4 foo // test.kt:10 foo // test.kt:13 foo -// test.kt:19 box \ No newline at end of file +// test.kt:19 box + +// EXPECTATIONS JS_IR +// test.kt:16 box +// test.kt:6 foo +// test.kt:10 foo +// test.kt:11 foo +// test.kt:17 box +// test.kt:7 foo +// test.kt:10 foo +// test.kt:11 foo +// test.kt:18 box +// test.kt:8 foo +// test.kt:10 foo diff --git a/compiler/testData/debug/stepping/whenConstant.kt b/compiler/testData/debug/stepping/whenConstant.kt index 36f0d05d8a7..523cf7960d1 100644 --- a/compiler/testData/debug/stepping/whenConstant.kt +++ b/compiler/testData/debug/stepping/whenConstant.kt @@ -13,11 +13,14 @@ fun box() { // JVM_IR and JVM backends have different heuristics for when to use a switch. -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:4 box // EXPECTATIONS JVM_IR // test.kt:5 box // test.kt:7 box -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:10 box -// test.kt:12 box \ No newline at end of file +// test.kt:12 box + +// EXPECTATIONS JS_IR +// test.kt:4 box diff --git a/compiler/testData/debug/stepping/whenIsChecks.kt b/compiler/testData/debug/stepping/whenIsChecks.kt index ade04c1122c..cec210c1346 100644 --- a/compiler/testData/debug/stepping/whenIsChecks.kt +++ b/compiler/testData/debug/stepping/whenIsChecks.kt @@ -17,7 +17,7 @@ fun box() { foo(1) } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:15 box // test.kt:4 foo // test.kt:5 foo @@ -35,4 +35,15 @@ fun box() { // test.kt:7 foo // test.kt:10 foo // test.kt:12 foo -// test.kt:18 box \ No newline at end of file +// test.kt:18 box + +// EXPECTATIONS JS_IR +// test.kt:15 box +// test.kt:4 foo +// test.kt:5 foo +// test.kt:16 box +// test.kt:4 foo +// test.kt:5 foo +// test.kt:17 box +// test.kt:4 foo +// test.kt:5 foo diff --git a/compiler/testData/debug/stepping/whenMultiLine.kt b/compiler/testData/debug/stepping/whenMultiLine.kt index 8bb0fccb64e..6a6efb5dadf 100644 --- a/compiler/testData/debug/stepping/whenMultiLine.kt +++ b/compiler/testData/debug/stepping/whenMultiLine.kt @@ -33,17 +33,17 @@ fun box() { // of each of the conditions, but goes directly to the right body. // JVM_IR stepping behavior here is the same as for `whenMultiLineSubject.kt`. -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:26 box // test.kt:4 foo // EXPECTATIONS JVM // test.kt:5 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:6 foo // test.kt:13 foo // EXPECTATIONS JVM // test.kt:14 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:15 foo // test.kt:13 foo // test.kt:22 foo @@ -53,13 +53,13 @@ fun box() { // EXPECTATIONS JVM // test.kt:5 foo // test.kt:7 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:8 foo // test.kt:13 foo // EXPECTATIONS JVM // test.kt:14 foo // test.kt:16 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:17 foo // test.kt:13 foo // test.kt:22 foo @@ -69,15 +69,29 @@ fun box() { // EXPECTATIONS JVM // test.kt:5 foo // test.kt:7 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:10 foo // test.kt:13 foo // EXPECTATIONS JVM // test.kt:14 foo // test.kt:16 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:19 foo // test.kt:13 foo // test.kt:22 foo // test.kt:28 box -// test.kt:29 box \ No newline at end of file +// test.kt:29 box + +// EXPECTATIONS JS_IR +// test.kt:26 box +// test.kt:15 foo +// test.kt:22 foo +// test.kt:22 foo +// test.kt:27 box +// test.kt:17 foo +// test.kt:22 foo +// test.kt:22 foo +// test.kt:28 box +// test.kt:19 foo +// test.kt:22 foo +// test.kt:22 foo diff --git a/compiler/testData/debug/stepping/whenMultiLineSubject.kt b/compiler/testData/debug/stepping/whenMultiLineSubject.kt index 81a9dd65491..242da062a43 100644 --- a/compiler/testData/debug/stepping/whenMultiLineSubject.kt +++ b/compiler/testData/debug/stepping/whenMultiLineSubject.kt @@ -28,7 +28,7 @@ fun box() { foo(63) } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:26 box // test.kt:4 foo // test.kt:6 foo @@ -53,4 +53,24 @@ fun box() { // test.kt:13 foo // test.kt:22 foo // test.kt:28 box -// test.kt:29 box \ No newline at end of file +// test.kt:29 box + +// EXPECTATIONS JS_IR +// test.kt:26 box +// test.kt:4 foo +// test.kt:13 foo +// test.kt:15 foo +// test.kt:22 foo +// test.kt:22 foo +// test.kt:27 box +// test.kt:4 foo +// test.kt:13 foo +// test.kt:17 foo +// test.kt:22 foo +// test.kt:22 foo +// test.kt:28 box +// test.kt:4 foo +// test.kt:13 foo +// test.kt:19 foo +// test.kt:22 foo +// test.kt:22 foo diff --git a/compiler/testData/debug/stepping/whenNullalbeSubject.kt b/compiler/testData/debug/stepping/whenNullalbeSubject.kt index 2d8813ed8f6..993fbf25426 100644 --- a/compiler/testData/debug/stepping/whenNullalbeSubject.kt +++ b/compiler/testData/debug/stepping/whenNullalbeSubject.kt @@ -15,10 +15,14 @@ fun box() { } } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:4 box // test.kt:5 box // test.kt:6 box // test.kt:9 box // test.kt:13 box -// test.kt:16 box \ No newline at end of file +// test.kt:16 box + +// EXPECTATIONS JS_IR +// test.kt:4 box +// test.kt:5 box diff --git a/compiler/testData/debug/stepping/whenSubject.kt b/compiler/testData/debug/stepping/whenSubject.kt index 2eb73e34025..781d0028a2f 100644 --- a/compiler/testData/debug/stepping/whenSubject.kt +++ b/compiler/testData/debug/stepping/whenSubject.kt @@ -18,7 +18,7 @@ fun box() { foo(21) } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:18 box // test.kt:4 foo // test.kt:5 foo @@ -68,4 +68,38 @@ fun box() { // test.kt:11 foo // test.kt:10 foo // test.kt:15 foo -// test.kt:19 box \ No newline at end of file +// test.kt:19 box + +// EXPECTATIONS JS_IR +// test.kt:18 box +// test.kt:4 foo +// test.kt:5 foo +// test.kt:4 foo +// test.kt:6 foo +// test.kt:4 foo +// test.kt:10 foo +// test.kt:13 foo +// test.kt:10 foo +// test.kt:10 foo +// test.kt:12 foo +// test.kt:4 foo +// test.kt:10 foo +// test.kt:13 foo +// test.kt:10 foo +// test.kt:10 foo +// test.kt:10 foo +// test.kt:11 foo +// test.kt:4 foo +// test.kt:6 foo +// test.kt:4 foo +// test.kt:10 foo +// test.kt:13 foo +// test.kt:10 foo +// test.kt:10 foo +// test.kt:12 foo +// test.kt:4 foo +// test.kt:10 foo +// test.kt:13 foo +// test.kt:10 foo +// test.kt:10 foo +// test.kt:10 foo diff --git a/compiler/testData/debug/stepping/whenSubject2.kt b/compiler/testData/debug/stepping/whenSubject2.kt index c9bb8d1dfc8..dcf64a50c96 100644 --- a/compiler/testData/debug/stepping/whenSubject2.kt +++ b/compiler/testData/debug/stepping/whenSubject2.kt @@ -26,27 +26,27 @@ fun box() { // it stops on the subject line first, then on the when line (line 4 and 12), and // then goes to the right branch. -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:22 box // test.kt:5 foo // EXPECTATIONS JVM_IR // test.kt:4 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:7 foo // test.kt:5 foo // EXPECTATIONS JVM_IR // test.kt:4 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:8 foo // test.kt:5 foo // EXPECTATIONS JVM_IR // test.kt:4 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:9 foo // test.kt:13 foo // EXPECTATIONS JVM_IR // test.kt:12 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:17 foo // test.kt:12 foo // test.kt:19 foo @@ -54,17 +54,17 @@ fun box() { // test.kt:13 foo // EXPECTATIONS JVM_IR // test.kt:12 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:16 foo // test.kt:5 foo // EXPECTATIONS JVM_IR // test.kt:4 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:9 foo // test.kt:13 foo // EXPECTATIONS JVM_IR // test.kt:12 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:17 foo // test.kt:12 foo // test.kt:19 foo @@ -75,22 +75,22 @@ fun box() { // test.kt:13 foo // EXPECTATIONS JVM_IR // test.kt:12 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:15 foo // test.kt:5 foo // EXPECTATIONS JVM_IR // test.kt:4 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:8 foo // test.kt:5 foo // EXPECTATIONS JVM_IR // test.kt:4 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:9 foo // test.kt:13 foo // EXPECTATIONS JVM_IR // test.kt:12 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:17 foo // test.kt:12 foo // test.kt:19 foo @@ -98,17 +98,17 @@ fun box() { // test.kt:13 foo // EXPECTATIONS JVM_IR // test.kt:12 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:16 foo // test.kt:5 foo // EXPECTATIONS JVM_IR // test.kt:4 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:9 foo // test.kt:13 foo // EXPECTATIONS JVM_IR // test.kt:12 foo -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:17 foo // test.kt:12 foo // test.kt:19 foo @@ -119,3 +119,37 @@ fun box() { // test.kt:12 foo // test.kt:19 foo // test.kt:23 box + +// EXPECTATIONS JS_IR +// test.kt:22 box +// test.kt:5 foo +// test.kt:7 foo +// test.kt:5 foo +// test.kt:8 foo +// test.kt:5 foo +// test.kt:13 foo +// test.kt:17 foo +// test.kt:12 foo +// test.kt:13 foo +// test.kt:16 foo +// test.kt:5 foo +// test.kt:13 foo +// test.kt:17 foo +// test.kt:12 foo +// test.kt:12 foo +// test.kt:13 foo +// test.kt:15 foo +// test.kt:5 foo +// test.kt:8 foo +// test.kt:5 foo +// test.kt:13 foo +// test.kt:17 foo +// test.kt:12 foo +// test.kt:13 foo +// test.kt:16 foo +// test.kt:5 foo +// test.kt:13 foo +// test.kt:17 foo +// test.kt:12 foo +// test.kt:12 foo +// test.kt:12 foo diff --git a/compiler/testData/debug/stepping/whenWithInlineInCondition.kt b/compiler/testData/debug/stepping/whenWithInlineInCondition.kt index aa3c32a0eb2..456a8fc92fd 100644 --- a/compiler/testData/debug/stepping/whenWithInlineInCondition.kt +++ b/compiler/testData/debug/stepping/whenWithInlineInCondition.kt @@ -29,7 +29,7 @@ fun nop() {} // JVM_IR generates an additional line number for the end of the condition, which is necessary for the correct "step over" behavior. -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:3 box // test.kt:19 value // test.kt:3 box @@ -38,12 +38,12 @@ fun nop() {} // test.kt:20 box // EXPECTATIONS JVM_IR // test.kt:5 box -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:6 box // test.kt:21 box // EXPECTATIONS JVM_IR // test.kt:6 box -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:7 box // test.kt:22 box // test.kt:7 box @@ -60,7 +60,7 @@ fun nop() {} // test.kt:26 box // EXPECTATIONS JVM_IR // test.kt:13 box -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:14 box // test.kt:21 box // test.kt:14 box @@ -69,3 +69,29 @@ fun nop() {} // test.kt:28 nop // test.kt:14 box // test.kt:17 box + +// EXPECTATIONS JS_IR +// test.kt:3 box +// test.kt:19 value +// test.kt:19 value +// test.kt:4 box +// test.kt:20 box +// test.kt:5 box +// test.kt:21 box +// test.kt:6 box +// test.kt:22 box +// test.kt:7 box +// test.kt:7 box +// test.kt:20 box +// test.kt:12 box +// test.kt:21 box +// test.kt:12 box +// test.kt:20 box +// test.kt:13 box +// test.kt:26 box +// test.kt:13 box +// test.kt:21 box +// test.kt:14 box +// test.kt:25 box +// test.kt:14 box +// test.kt:14 box diff --git a/compiler/testData/debug/stepping/while.kt b/compiler/testData/debug/stepping/while.kt index 4171f95e731..ae30b3e69e7 100644 --- a/compiler/testData/debug/stepping/while.kt +++ b/compiler/testData/debug/stepping/while.kt @@ -12,7 +12,7 @@ fun box() { } while (--x > 0) } -// EXPECTATIONS +// EXPECTATIONS JVM JVM_IR // test.kt:4 box // test.kt:5 box // test.kt:6 box @@ -23,3 +23,15 @@ fun box() { // test.kt:11 box // test.kt:12 box // test.kt:13 box + +// EXPECTATIONS JS_IR +// test.kt:4 box +// test.kt:5 box +// test.kt:5 box +// test.kt:5 box +// test.kt:5 box +// test.kt:9 box +// test.kt:12 box +// test.kt:12 box +// test.kt:12 box +// test.kt:12 box