From 5910b87c929f4603284a142e17e729a78434aed1 Mon Sep 17 00:00:00 2001 From: Artem Kobzar Date: Wed, 18 Dec 2024 13:08:06 +0000 Subject: [PATCH] [K/Wasm] Change format of the stepping tests output Merge-request: KT-MR-19425 Merged-by: Artem Kobzar --- .../debug/stepping/IfTrueThenFalse.kt | 6 +- .../debug/stepping/anonymousFunction.kt | 9 +- .../debug/stepping/anonymousFunctionDirect.kt | 6 +- compiler/testData/debug/stepping/assertion.kt | 8 +- .../debug/stepping/beforeGotoToWhileStart.kt | 20 ++-- .../debug/stepping/callWithCallInArguments.kt | 21 ++-- .../debug/stepping/callWithReceiver.kt | 14 +-- .../debug/stepping/callableReference.kt | 10 +- compiler/testData/debug/stepping/chainCall.kt | 16 +-- compiler/testData/debug/stepping/class.kt | 14 +-- .../testData/debug/stepping/classObject.kt | 10 +- ...singBracketOfLambdaOfInlineOnlyFunction.kt | 23 ++-- ...closingBracketOfObjectInsideCrossinline.kt | 20 ++-- .../debug/stepping/commentBeforeClass.kt | 6 +- .../commentBeforeCompanionProperty.kt | 4 +- .../commentBeforeFunctionWithDefault.kt | 6 +- compiler/testData/debug/stepping/comments.kt | 15 +-- .../debug/stepping/compileTimeConstant.kt | 6 +- .../testData/debug/stepping/conjunction.kt | 11 +- .../debug/stepping/constantConditions.kt | 6 +- .../debug/stepping/constructorCall.kt | 24 +++-- .../testData/debug/stepping/constructors.kt | 100 ++++++++++-------- compiler/testData/debug/stepping/continue.kt | 26 +++-- compiler/testData/debug/stepping/dataClass.kt | 37 ++++--- .../debug/stepping/defaultParameter.kt | 12 ++- .../testData/debug/stepping/delegation.kt | 6 +- compiler/testData/debug/stepping/enum.kt | 21 ++-- compiler/testData/debug/stepping/for.kt | 11 +- .../debug/stepping/functionCallWithDefault.kt | 12 +-- .../functionCallWithInlinedLambdaParam.kt | 12 ++- .../stepping/functionCallWithLambdaParam.kt | 12 ++- .../debug/stepping/functionInAnotherFile.kt | 10 +- compiler/testData/debug/stepping/if.kt | 13 ++- compiler/testData/debug/stepping/if2.kt | 22 ++-- compiler/testData/debug/stepping/ifThen.kt | 13 +-- .../testData/debug/stepping/ifThenElse.kt | 25 +++-- .../debug/stepping/ifThenElseFalse.kt | 21 ++-- .../debug/stepping/ifWithInlineInCondition.kt | 28 +++-- .../testData/debug/stepping/iincStepping.kt | 23 ++-- .../testData/debug/stepping/implicitThis.kt | 17 +-- .../debug/stepping/implicitThisOnInvoke.kt | 16 +-- .../inTheEndOfLambdaArgumentOfInlineCall.kt | 18 ++-- .../testData/debug/stepping/initBlocks.kt | 30 +++--- .../debug/stepping/initBlocksCompanion.kt | 13 +-- .../debug/stepping/inlineCallableReference.kt | 13 +-- .../stepping/inlineNamedCallableReference.kt | 9 +- .../debug/stepping/inlineOnlyFunction.kt | 11 +- .../debug/stepping/inlineSimpleCall.kt | 23 ++-- compiler/testData/debug/stepping/kt15259.kt | 12 +-- compiler/testData/debug/stepping/kt29179.kt | 13 +-- compiler/testData/debug/stepping/kt42208.kt | 16 ++- compiler/testData/debug/stepping/kt42208b.kt | 17 ++- compiler/testData/debug/stepping/kt42208c.kt | 25 +++-- .../debug/stepping/lambdaStepInline.kt | 14 ++- .../stepping/lambdaStepInlineWithDefaults.kt | 16 +-- .../debug/stepping/lineNumberAfterInline.kt | 24 ++--- .../linenumberForOneParametersArgumentCall.kt | 8 +- .../testData/debug/stepping/localFunction.kt | 14 +-- .../localFunctionWIthOnelineExpressionBody.kt | 13 +-- .../testData/debug/stepping/localProperty.kt | 6 +- .../testData/debug/stepping/multiModule.kt | 11 +- .../debug/stepping/multilineExpression.kt | 9 +- .../debug/stepping/multilineFunctionCall.kt | 8 +- .../debug/stepping/multilineInfixCall.kt | 9 +- .../debug/stepping/namedCallableReference.kt | 10 +- .../testData/debug/stepping/nestedInline.kt | 18 ++-- .../noParametersArgumentCallInExpression.kt | 9 +- compiler/testData/debug/stepping/nullcheck.kt | 20 ++-- .../debug/stepping/overridenGetterSetter.kt | 32 +++--- .../debug/stepping/primitiveNullChecks.kt | 6 +- .../debug/stepping/propertyAccessor.kt | 7 +- .../propertyInvokeInsidePCLALambda.kt | 26 +++-- compiler/testData/debug/stepping/recursion.kt | 15 ++- .../debug/stepping/simpleDefaultArg.kt | 5 +- .../stepping/simpleDefaultArgWithInline.kt | 9 +- .../debug/stepping/simpleInlineDefaultArg.kt | 7 +- .../testData/debug/stepping/simpleSmap.kt | 8 +- .../debug/stepping/smapInlineAsArgument.kt | 24 +++-- .../stepping/smapInlineAsInfixArgument.kt | 21 ++-- .../stepping/smapInlineAsInlineArgument.kt | 20 ++-- .../stepping/smapInlineInIntrinsicArgument.kt | 18 ++-- .../testData/debug/stepping/stringSwitches.kt | 64 +++++++---- .../debug/stepping/stringSwitchesSmall.kt | 51 ++++++--- .../testData/debug/stepping/throwException.kt | 8 +- compiler/testData/debug/stepping/topLevel.kt | 4 +- compiler/testData/debug/stepping/trait.kt | 20 ++-- compiler/testData/debug/stepping/tryCatch.kt | 17 +-- .../debug/stepping/tryCatchExpression.kt | 60 +++++++---- .../debug/stepping/tryCatchFinally.kt | 79 ++++++++++---- .../testData/debug/stepping/tryFinally.kt | 36 ++++--- .../stepping/variablesWithoutInitializer.kt | 2 +- .../debug/stepping/voidLambdaStepInline.kt | 8 +- compiler/testData/debug/stepping/when.kt | 49 +++++++-- .../debug/stepping/whenComplicatedSubject.kt | 21 ++-- .../testData/debug/stepping/whenConstant.kt | 8 +- compiler/testData/debug/stepping/whenExpr.kt | 12 +-- .../debug/stepping/whenInConjunction.kt | 16 +-- .../debug/stepping/whenInDisjunction.kt | 16 +-- .../stepping/whenInGeneralObjectComparison.kt | 32 +++--- .../testData/debug/stepping/whenInNegation.kt | 11 +- .../debug/stepping/whenInNullComparison.kt | 11 +- .../whenInPrimitiveToObjectComparison.kt | 16 +-- .../debug/stepping/whenInZeroComparison.kt | 13 +-- .../testData/debug/stepping/whenIsChecks.kt | 29 +++-- .../testData/debug/stepping/whenMultiLine.kt | 32 +++--- .../debug/stepping/whenMultiLineSubject.kt | 40 ++++--- .../debug/stepping/whenNullalbeSubject.kt | 12 +-- .../testData/debug/stepping/whenSubject.kt | 65 ++++++++++-- .../testData/debug/stepping/whenSubject2.kt | 66 ++++++++++-- .../stepping/whenWithInlineInCondition.kt | 38 ++++--- compiler/testData/debug/stepping/while.kt | 13 ++- .../wasm/test/handlers/WasmDebugRunner.kt | 49 +++++---- 112 files changed, 1349 insertions(+), 828 deletions(-) diff --git a/compiler/testData/debug/stepping/IfTrueThenFalse.kt b/compiler/testData/debug/stepping/IfTrueThenFalse.kt index 9f4d362c46189..ffcf5f5c35758 100644 --- a/compiler/testData/debug/stepping/IfTrueThenFalse.kt +++ b/compiler/testData/debug/stepping/IfTrueThenFalse.kt @@ -25,7 +25,7 @@ fun box() { // test.kt:10 box // EXPECTATIONS WASM -// test.kt:6 $box +// test.kt:6 $box (8) // test.kt:3 $cond (13, 18) -// test.kt:9 $box -// test.kt:10 $box +// test.kt:9 $box (9) +// test.kt:10 $box (1) diff --git a/compiler/testData/debug/stepping/anonymousFunction.kt b/compiler/testData/debug/stepping/anonymousFunction.kt index 7bec943c345d5..d8a3a2db79954 100644 --- a/compiler/testData/debug/stepping/anonymousFunction.kt +++ b/compiler/testData/debug/stepping/anonymousFunction.kt @@ -28,7 +28,8 @@ fun box() { // test.kt:10 box // EXPECTATIONS WASM -// test.kt:7 $box -// test.kt:4 $eval (27, 27, 27, 30) -// test.kt:8 $box$lambda.invoke (8, 8, 8, 8, 12) -// test.kt:10 $box +// test.kt:7 $box (4) +// test.kt:4 $eval (27) +// test.kt:8 $box$lambda.invoke (8, 12) +// test.kt:4 $eval (30) +// test.kt:10 $box (1) diff --git a/compiler/testData/debug/stepping/anonymousFunctionDirect.kt b/compiler/testData/debug/stepping/anonymousFunctionDirect.kt index f752c8c179ea0..d7ae7b99ed010 100644 --- a/compiler/testData/debug/stepping/anonymousFunctionDirect.kt +++ b/compiler/testData/debug/stepping/anonymousFunctionDirect.kt @@ -17,6 +17,6 @@ fun box() { // test.kt:8 box // EXPECTATIONS WASM -// test.kt:5 $box (4, 4, 4) -// test.kt:6 $box$lambda.invoke (8, 8, 8, 8, 12) -// test.kt:8 $box +// test.kt:5 $box (4) +// test.kt:6 $box$lambda.invoke (8, 12) +// test.kt:8 $box (1) diff --git a/compiler/testData/debug/stepping/assertion.kt b/compiler/testData/debug/stepping/assertion.kt index b7f7b35df5563..f7bcea2604a35 100644 --- a/compiler/testData/debug/stepping/assertion.kt +++ b/compiler/testData/debug/stepping/assertion.kt @@ -55,10 +55,10 @@ fun box(): String { // EXPECTATIONS WASM // test.kt:26 $box (12, 4) -// test.kt:17 $box (57, 57) -// test.kt:18 $box +// test.kt:17 $box (57) +// test.kt:18 $box (8) // test.kt:19 $box (13, 12) // test.kt:27 $box (12, 4) -// test.kt:8 $box +// test.kt:8 $box (8) // test.kt:9 $box (13, 12) -// test.kt:31 $box (11, 11, 11, 11, 4) +// test.kt:31 $box (11, 4) diff --git a/compiler/testData/debug/stepping/beforeGotoToWhileStart.kt b/compiler/testData/debug/stepping/beforeGotoToWhileStart.kt index 43f5e445d551c..b1ccdcf9fdee3 100644 --- a/compiler/testData/debug/stepping/beforeGotoToWhileStart.kt +++ b/compiler/testData/debug/stepping/beforeGotoToWhileStart.kt @@ -46,11 +46,15 @@ fun box() { // test.kt:21 box // EXPECTATIONS WASM -// test.kt:20 $box -// test.kt:12 $foo (11, 11, 11, 11, 11, 11) -// test.kt:13 $foo (12, 12) -// test.kt:7 $alternate (15, 14, 4, 15, 14, 4) -// test.kt:8 $alternate (11, 4, 11, 4) -// test.kt:14 $foo -// test.kt:17 $foo -// test.kt:21 $box +// test.kt:20 $box (4) +// test.kt:12 $foo (11) +// test.kt:13 $foo (12) +// test.kt:7 $alternate (15, 14, 4) +// test.kt:8 $alternate (11, 4) +// test.kt:12 $foo (11) +// test.kt:13 $foo (12) +// test.kt:7 $alternate (15, 14, 4) +// test.kt:8 $alternate (11, 4) +// test.kt:14 $foo (12) +// test.kt:17 $foo (1) +// test.kt:21 $box (1) diff --git a/compiler/testData/debug/stepping/callWithCallInArguments.kt b/compiler/testData/debug/stepping/callWithCallInArguments.kt index 009b819536021..5286848578d41 100644 --- a/compiler/testData/debug/stepping/callWithCallInArguments.kt +++ b/compiler/testData/debug/stepping/callWithCallInArguments.kt @@ -48,11 +48,18 @@ fun box() { // test.kt:15 box // EXPECTATIONS WASM -// test.kt:9 $box (12, 12) -// test.kt:4 $A. (7, 7, 7, 7) +// test.kt:9 $box (12) +// test.kt:4 $A. (7) // test.kt:12 $box (24, 20) -// test.kt:6 $bar (16, 16, 19, 16, 16, 19, 16, 16, 19) -// test.kt:11 $box -// test.kt:10 $box - -// test.kt:15 $box +// test.kt:6 $bar (16) +// test.kt:4 $A. (7) +// test.kt:6 $bar (19) +// test.kt:11 $box (12) +// test.kt:6 $bar (16) +// test.kt:4 $A. (7) +// test.kt:6 $bar (19) +// test.kt:10 $box (4) +// test.kt:6 $bar (16) +// test.kt:4 $A. (7) +// test.kt:6 $bar (19) +// test.kt:15 $box (1) diff --git a/compiler/testData/debug/stepping/callWithReceiver.kt b/compiler/testData/debug/stepping/callWithReceiver.kt index ae5b892cecfc9..354d33cf50457 100644 --- a/compiler/testData/debug/stepping/callWithReceiver.kt +++ b/compiler/testData/debug/stepping/callWithReceiver.kt @@ -36,12 +36,12 @@ fun box() { // test.kt:16 box // EXPECTATIONS WASM -// test.kt:10 $box (12, 12) -// test.kt:7 $A. -// test.kt:11 $box -// test.kt:12 $box +// test.kt:10 $box (12) +// test.kt:7 $A. (1) +// test.kt:11 $box (4) +// test.kt:12 $box (6) // test.kt:5 $A.foo (16, 20) -// test.kt:14 $box -// test.kt:15 $box +// test.kt:14 $box (4) +// test.kt:15 $box (6) // test.kt:6 $box (23, 27) -// test.kt:16 $box +// test.kt:16 $box (1) diff --git a/compiler/testData/debug/stepping/callableReference.kt b/compiler/testData/debug/stepping/callableReference.kt index 97424fda43e77..eb6ec91c3e6e6 100644 --- a/compiler/testData/debug/stepping/callableReference.kt +++ b/compiler/testData/debug/stepping/callableReference.kt @@ -38,9 +38,9 @@ fun f(block: () -> Unit) { // test.kt:8 box // EXPECTATIONS WASM -// test.kt:4 $box (12, 12, 4) -// test.kt:5 $box (6, 6, 4) -// test.kt:11 $f (4, 4, 4) +// test.kt:4 $box (12, 4) +// test.kt:5 $box (6, 4) +// test.kt:11 $f (4) // test.kt:6 $box$lambda.invoke (8, 12, 8, 16) -// test.kt:12 $f -// test.kt:8 $box +// test.kt:12 $f (1) +// test.kt:8 $box (1) diff --git a/compiler/testData/debug/stepping/chainCall.kt b/compiler/testData/debug/stepping/chainCall.kt index 58a8f5de444e2..2147d98b8a4b6 100644 --- a/compiler/testData/debug/stepping/chainCall.kt +++ b/compiler/testData/debug/stepping/chainCall.kt @@ -40,12 +40,14 @@ fun box() { // test.kt:16 box // EXPECTATIONS WASM -// test.kt:10 $box (12, 12) -// test.kt:7 $A. +// test.kt:10 $box (12) +// test.kt:7 $A. (1) // test.kt:11 $box (4, 6) -// test.kt:5 $A.foo (16, 20, 16, 20) -// test.kt:12 $box +// test.kt:5 $A.foo (16, 20) +// test.kt:12 $box (9) +// test.kt:5 $A.foo (16, 20) // test.kt:14 $box (4, 6) -// test.kt:6 $box (23, 27, 23, 27) -// test.kt:15 $box -// test.kt:16 $box +// test.kt:6 $box (23, 27) +// test.kt:15 $box (9) +// test.kt:6 $box (23, 27) +// test.kt:16 $box (1) diff --git a/compiler/testData/debug/stepping/class.kt b/compiler/testData/debug/stepping/class.kt index 4fc761eab1fa5..0bf54eff586e6 100644 --- a/compiler/testData/debug/stepping/class.kt +++ b/compiler/testData/debug/stepping/class.kt @@ -38,11 +38,11 @@ fun box() { // test.kt:16 box // EXPECTATIONS WASM -// test.kt:13 $box -// test.kt:5 $A. (15, 15, 15) -// test.kt:10 $A. -// test.kt:14 $box (4, 6, 6) +// test.kt:13 $box (12) +// test.kt:5 $A. (15) +// test.kt:10 $A. (1) +// test.kt:14 $box (4, 6) // test.kt:15 $box (4, 6) -// test.kt:8 $A.foo (8, 8, 8) -// test.kt:9 $A.foo -// test.kt:16 $box +// test.kt:8 $A.foo (8) +// test.kt:9 $A.foo (5) +// test.kt:16 $box (1) diff --git a/compiler/testData/debug/stepping/classObject.kt b/compiler/testData/debug/stepping/classObject.kt index df425bcde5839..619056d53510d 100644 --- a/compiler/testData/debug/stepping/classObject.kt +++ b/compiler/testData/debug/stepping/classObject.kt @@ -51,8 +51,8 @@ fun box() { // test.kt:18 box // EXPECTATIONS WASM -// test.kt:15 $box (6, 6) -// test.kt:16 $box (6, 6) -// test.kt:17 $box -// test.kt:9 $Companion.foo (19, 19, 27, 27, 19, 12) -// test.kt:18 $box +// test.kt:15 $box (6) +// test.kt:16 $box (6) +// test.kt:17 $box (6) +// test.kt:9 $Companion.foo (19, 27, 19, 12) +// test.kt:18 $box (1) diff --git a/compiler/testData/debug/stepping/closingBracketOfLambdaOfInlineOnlyFunction.kt b/compiler/testData/debug/stepping/closingBracketOfLambdaOfInlineOnlyFunction.kt index 1fc807729ac68..59f1119f7f3fd 100644 --- a/compiler/testData/debug/stepping/closingBracketOfLambdaOfInlineOnlyFunction.kt +++ b/compiler/testData/debug/stepping/closingBracketOfLambdaOfInlineOnlyFunction.kt @@ -43,13 +43,16 @@ fun box() { // test.kt:19 box // EXPECTATIONS WASM -// test.kt:18 $box -// test.kt:10 $flaf -// test.kt:7 $flaf (46, 57) -// test.kt:6 $foo (39, 39, 39, 46) -// test.kt:7 $flaf$lambda.invoke (52, 55) -// test.kt:11 $flaf$lambda.invoke -// test.kt:12 $flaf$lambda.invoke (12, 12, 15) -// test.kt:13 $flaf$lambda.invoke -// test.kt:15 $flaf -// test.kt:19 $box +// test.kt:18 $box (4) +// test.kt:10 $flaf (4) +// test.kt:7 $flaf (46) +// test.kt:6 $foo (39) +// test.kt:7 $flaf$lambda.invoke (52) +// test.kt:11 $flaf$lambda.invoke (8) +// test.kt:12 $flaf$lambda.invoke (12, 15) +// test.kt:13 $flaf$lambda.invoke (9) +// test.kt:7 $flaf$lambda.invoke (55) +// test.kt:6 $foo (46) +// test.kt:7 $flaf (57) +// test.kt:15 $flaf (1) +// test.kt:19 $box (1) diff --git a/compiler/testData/debug/stepping/closingBracketOfObjectInsideCrossinline.kt b/compiler/testData/debug/stepping/closingBracketOfObjectInsideCrossinline.kt index cb9c35fb788ab..f6d9964185465 100644 --- a/compiler/testData/debug/stepping/closingBracketOfObjectInsideCrossinline.kt +++ b/compiler/testData/debug/stepping/closingBracketOfObjectInsideCrossinline.kt @@ -64,14 +64,14 @@ fun box() { // EXPECTATIONS WASM // test.kt:21 $box (17, 4) -// test.kt:22 $box -// test.kt:9 $box (4, 4) -// test.kt:15 $. (12, 12) -// test.kt:11 $.bar -// test.kt:23 $.bar (8, 8, 8) +// test.kt:22 $box (4) +// test.kt:9 $box (4) +// test.kt:15 $. (12) +// test.kt:11 $.bar (12) +// test.kt:23 $.bar (8) // test.kt:25 $. (16, 25, 16) -// test.kt:27 $. -// test.kt:27 $.bar -// test.kt:12 $.bar -// test.kt:17 $. -// test.kt:29 $box +// test.kt:27 $. (9) +// test.kt:27 $.bar (9) +// test.kt:12 $.bar (9) +// test.kt:17 $. (5) +// test.kt:29 $box (1) diff --git a/compiler/testData/debug/stepping/commentBeforeClass.kt b/compiler/testData/debug/stepping/commentBeforeClass.kt index b5374c5b998aa..e913b0094ccf2 100644 --- a/compiler/testData/debug/stepping/commentBeforeClass.kt +++ b/compiler/testData/debug/stepping/commentBeforeClass.kt @@ -22,6 +22,6 @@ class A { // test.kt:6 box // EXPECTATIONS WASM -// test.kt:5 $box (4, 4) -// test.kt:11 $A. -// test.kt:6 $box +// test.kt:5 $box (4) +// test.kt:11 $A. (1) +// test.kt:6 $box (1) diff --git a/compiler/testData/debug/stepping/commentBeforeCompanionProperty.kt b/compiler/testData/debug/stepping/commentBeforeCompanionProperty.kt index 25db10053b189..525dde1249cf1 100644 --- a/compiler/testData/debug/stepping/commentBeforeCompanionProperty.kt +++ b/compiler/testData/debug/stepping/commentBeforeCompanionProperty.kt @@ -27,5 +27,5 @@ fun box() { // test.kt:13 box // EXPECTATIONS WASM -// test.kt:12 $box -// test.kt:13 $box +// test.kt:12 $box (19) +// test.kt:13 $box (1) diff --git a/compiler/testData/debug/stepping/commentBeforeFunctionWithDefault.kt b/compiler/testData/debug/stepping/commentBeforeFunctionWithDefault.kt index 2393b2ba661d1..3f7a4f3a62685 100644 --- a/compiler/testData/debug/stepping/commentBeforeFunctionWithDefault.kt +++ b/compiler/testData/debug/stepping/commentBeforeFunctionWithDefault.kt @@ -21,7 +21,7 @@ fun box() { // test.kt:11 box // EXPECTATIONS WASM -// test.kt:10 $box (4, 4, 4, 4) -// test.kt:5 $foo$default (0, 0, 0, 17, 17, 0) +// test.kt:10 $box (4) +// test.kt:5 $foo$default (0, 17, 0) // test.kt:6 $foo (11, 4) -// test.kt:11 $box +// test.kt:11 $box (1) diff --git a/compiler/testData/debug/stepping/comments.kt b/compiler/testData/debug/stepping/comments.kt index e880eb4dc4461..0c9abc67e40b5 100644 --- a/compiler/testData/debug/stepping/comments.kt +++ b/compiler/testData/debug/stepping/comments.kt @@ -55,9 +55,12 @@ class A { // test.kt:8 box // EXPECTATIONS WASM -// test.kt:6 $box (4, 4, 8) -// test.kt:33 $A. (1, 1) -// test.kt:25 $A.foo -// test.kt:7 $box (4, 8) -// test.kt:32 $A.bar -// test.kt:8 $box +// test.kt:6 $box (4) +// test.kt:33 $A. (1) +// test.kt:6 $box (8) +// test.kt:25 $A.foo (5) +// test.kt:7 $box (4) +// test.kt:33 $A. (1) +// test.kt:7 $box (8) +// test.kt:32 $A.bar (5) +// test.kt:8 $box (1) diff --git a/compiler/testData/debug/stepping/compileTimeConstant.kt b/compiler/testData/debug/stepping/compileTimeConstant.kt index ceed6b2273ca1..5ef6964dfa31c 100644 --- a/compiler/testData/debug/stepping/compileTimeConstant.kt +++ b/compiler/testData/debug/stepping/compileTimeConstant.kt @@ -16,6 +16,6 @@ fun box() { // test.kt:7 box // EXPECTATIONS WASM -// test.kt:6 $box -// test.kt:5 $box -// test.kt:7 $box +// test.kt:6 $box (12) +// test.kt:5 $box (4) +// test.kt:7 $box (1) diff --git a/compiler/testData/debug/stepping/conjunction.kt b/compiler/testData/debug/stepping/conjunction.kt index d08c6537d2845..edc8f1022309c 100644 --- a/compiler/testData/debug/stepping/conjunction.kt +++ b/compiler/testData/debug/stepping/conjunction.kt @@ -45,11 +45,12 @@ fun getD() = true // test.kt:12 box // EXPECTATIONS WASM -// test.kt:4 $box (16, 4) +// test.kt:4 $box (16) // test.kt:14 $getA (13, 17) -// test.kt:5 $box +// test.kt:5 $box (11) // test.kt:16 $getB (13, 17) -// test.kt:6 $box +// test.kt:6 $box (11) // test.kt:18 $getC (13, 18) -// test.kt:10 $box -// test.kt:12 $box +// test.kt:10 $box (8) +// test.kt:4 $box (4) +// test.kt:12 $box (1) diff --git a/compiler/testData/debug/stepping/constantConditions.kt b/compiler/testData/debug/stepping/constantConditions.kt index dd59a05c1111f..4c04d0d36e354 100644 --- a/compiler/testData/debug/stepping/constantConditions.kt +++ b/compiler/testData/debug/stepping/constantConditions.kt @@ -30,7 +30,7 @@ fun test(): Long { // test.kt:7 box // EXPECTATIONS WASM -// test.kt:6 $box -// test.kt:11 $test +// test.kt:6 $box (4) +// test.kt:11 $test (8) // test.kt:12 $test (15, 8) -// test.kt:7 $box +// test.kt:7 $box (1) diff --git a/compiler/testData/debug/stepping/constructorCall.kt b/compiler/testData/debug/stepping/constructorCall.kt index ed5d0f6e0498d..f83cadb799f72 100644 --- a/compiler/testData/debug/stepping/constructorCall.kt +++ b/compiler/testData/debug/stepping/constructorCall.kt @@ -49,11 +49,19 @@ fun box() { // test.kt:15 box // EXPECTATIONS WASM -// test.kt:7 $box (4, 6, 4, 4) -// test.kt:4 $A. (8, 8, 8, 19, 8, 8, 8, 19, 8, 8, 8, 19, 8, 8, 8, 19) -// test.kt:8 $box (4, 4, 4) -// test.kt:9 $box -// test.kt:11 $box (4, 6, 4, 4) -// test.kt:13 $box (4, 4) -// test.kt:14 $box -// test.kt:15 $box +// test.kt:7 $box (4, 6, 4) +// test.kt:4 $A. (8, 19) +// test.kt:7 $box (4) +// test.kt:8 $box (4) +// test.kt:9 $box (8) +// test.kt:8 $box (4) +// test.kt:4 $A. (8, 19) +// test.kt:8 $box (4) +// test.kt:11 $box (4, 6, 4) +// test.kt:4 $A. (8, 19) +// test.kt:11 $box (4) +// test.kt:13 $box (4) +// test.kt:14 $box (8) +// test.kt:13 $box (4) +// test.kt:4 $A. (8, 19) +// test.kt:15 $box (1) diff --git a/compiler/testData/debug/stepping/constructors.kt b/compiler/testData/debug/stepping/constructors.kt index b3a2977bf30c4..5c635779332b9 100644 --- a/compiler/testData/debug/stepping/constructors.kt +++ b/compiler/testData/debug/stepping/constructors.kt @@ -194,55 +194,71 @@ class O(i: T) { // test.kt:18 box // EXPECTATIONS WASM -// test.kt:5 $box (4, 4, 4) -// test.kt:20 $B. -// test.kt:6 $box (4, 6, 4, 4) -// test.kt:21 $C. (8, 8, 8, 19) -// test.kt:7 $box (4, 4, 4) -// test.kt:23 $D. (4, 17) -// test.kt:24 $D. -// test.kt:8 $box (4, 6, 4, 4) -// test.kt:26 $E. (4, 23) -// test.kt:27 $E. -// test.kt:9 $box (4, 4, 4) -// test.kt:29 $F. -// test.kt:32 $F. +// test.kt:5 $box (4) +// test.kt:20 $B. (9) +// test.kt:5 $box (4) +// test.kt:6 $box (4, 6, 4) +// test.kt:21 $C. (8, 19) +// test.kt:6 $box (4) +// test.kt:7 $box (4) +// test.kt:23 $D. (4) +// test.kt:24 $D. (1) +// test.kt:23 $D. (17) +// test.kt:7 $box (4) +// test.kt:8 $box (4, 6, 4) +// test.kt:26 $E. (4) +// test.kt:27 $E. (1) +// test.kt:26 $E. (23) +// test.kt:8 $box (4) +// test.kt:9 $box (4) +// test.kt:29 $F. (4) +// test.kt:32 $F. (1) // test.kt:30 $F. (16, 8) -// test.kt:31 $F. -// test.kt:10 $box (4, 6, 4, 4) -// test.kt:34 $G. -// test.kt:37 $G. +// test.kt:31 $F. (5) +// test.kt:9 $box (4) +// test.kt:10 $box (4, 6, 4) +// test.kt:34 $G. (4) +// test.kt:37 $G. (1) // test.kt:35 $G. (16, 8) -// test.kt:36 $G. -// test.kt:11 $box (4, 4, 4) +// test.kt:36 $G. (5) +// test.kt:10 $box (4) +// test.kt:11 $box (4) // test.kt:40 $J. (16, 8) -// test.kt:42 $J. -// test.kt:12 $box (4, 6, 4, 4) -// test.kt:43 $K. (8, 8, 8, 19) +// test.kt:42 $J. (1) +// test.kt:11 $box (4) +// test.kt:12 $box (4, 6, 4) +// test.kt:43 $K. (8) // test.kt:45 $K. (16, 8) -// test.kt:13 $box (4, 4, 4) -// test.kt:49 $L. +// test.kt:43 $K. (19) +// test.kt:12 $box (4) +// test.kt:13 $box (4) +// test.kt:49 $L. (4) // test.kt:54 $L. (16, 8) -// test.kt:56 $L. +// test.kt:56 $L. (1) // test.kt:50 $L. (16, 8) -// test.kt:51 $L. -// test.kt:14 $box (4, 4, 4) +// test.kt:51 $L. (5) +// test.kt:13 $box (4) +// test.kt:14 $box (4) // test.kt:58 $M. (24, 19) -// test.kt:62 $M. -// test.kt:64 $M. -// test.kt:63 $M. +// test.kt:62 $M. (4) +// test.kt:64 $M. (1) +// test.kt:63 $M. (5) // test.kt:59 $M. (16, 8) -// test.kt:60 $M. -// test.kt:15 $box (4, 6, 4, 4) -// test.kt:66 $N. -// test.kt:70 $N. -// test.kt:72 $N. -// test.kt:71 $N. +// test.kt:60 $M. (5) +// test.kt:14 $box (4) +// test.kt:15 $box (4, 6, 4) +// test.kt:66 $N. (25) +// test.kt:70 $N. (4) +// test.kt:72 $N. (1) +// test.kt:71 $N. (5) // test.kt:67 $N. (16, 8) -// test.kt:68 $N. -// test.kt:16 $box (4, 6, 6, 4, 4) -// test.kt:73 $O. (16, 16) -// test.kt:17 $box (4, 6, 9, 9, 9, 9, 4) +// test.kt:68 $N. (5) +// test.kt:15 $box (4) +// test.kt:16 $box (4, 6, 4) +// test.kt:73 $O. (16) +// test.kt:16 $box (4) +// test.kt:17 $box (4, 6, 9, 4) // test.kt:74 $O. (36, 31) -// test.kt:75 $O. -// test.kt:18 $box +// test.kt:73 $O. (16) +// test.kt:75 $O. (5) +// test.kt:18 $box (1) diff --git a/compiler/testData/debug/stepping/continue.kt b/compiler/testData/debug/stepping/continue.kt index ca481a71f7e4f..1ee16adcb8099 100644 --- a/compiler/testData/debug/stepping/continue.kt +++ b/compiler/testData/debug/stepping/continue.kt @@ -66,12 +66,22 @@ fun box() { // test.kt:17 box // EXPECTATIONS WASM -// test.kt:5 $ (22, 22, 22, 22, 28, 28, 28, 28, 34, 34, 34, 34, 39, 39, 39, 39, 22, 22, 14) -// test.kt:8 $box (14, 4, 14, 4, 14, 14, 9, 14, 14, 4, 14, 4, 14, 14, 9, 14, 14, 4, 14, 4, 14, 14, 9, 14, 14, 4, 14, 4, 14, 14, 9, 14, 14, 4, 14, 4) -// test.kt:5 $ (0, 0) -// test.kt:9 $box (12, 17, 17, 17, 17, 12, 12, 17, 17, 17, 17, 12, 25, 30, 30, 30, 30, 25, 12, 17, 17, 17, 17, 12, 25, 30, 30, 30, 30, 25, 12, 17, 17, 17, 17, 12, 25, 30, 30, 30, 30, 25) -// test.kt:10 $box (12, 12) -// test.kt:12 $box (12, 17, 17, 17, 17, 12, 12, 17, 17, 17, 17, 12) -// test.kt:13 $box +// test.kt:5 $ (22, 28, 34, 39, 22, 14) +// test.kt:8 $box (14) +// test.kt:5 $ (0) +// test.kt:8 $box (4, 14, 4, 14, 9, 14) +// test.kt:9 $box (12, 17, 12) +// test.kt:10 $box (12) +// test.kt:8 $box (4, 14, 4, 14, 9, 14) +// test.kt:9 $box (12, 17, 12, 25, 30, 25) +// test.kt:10 $box (12) +// test.kt:8 $box (4, 14, 4, 14, 9, 14) +// test.kt:9 $box (12, 17, 12, 25, 30, 25) +// test.kt:12 $box (12, 17, 12) +// test.kt:13 $box (12) +// test.kt:8 $box (4, 14, 4, 14, 9, 14) +// test.kt:9 $box (12, 17, 12, 25, 30, 25) +// test.kt:12 $box (12, 17, 12) // test.kt:15 $box (16, 8) -// test.kt:17 $box +// test.kt:8 $box (4, 14, 4) +// test.kt:17 $box (1) diff --git a/compiler/testData/debug/stepping/dataClass.kt b/compiler/testData/debug/stepping/dataClass.kt index 04ff7072d8314..12705016b9f16 100644 --- a/compiler/testData/debug/stepping/dataClass.kt +++ b/compiler/testData/debug/stepping/dataClass.kt @@ -176,22 +176,31 @@ fun box() { // test.kt:26 box // EXPECTATIONS WASM -// test.kt:14 $box (12, 14, 17, 17, 17, 12) -// test.kt:4 $D. (13, 25, 25, 25, 39, 13, 25, 25, 25, 39, 13, 25, 25, 25, 39) -// test.kt:15 $box (4, 13, 15, 18, 18, 18, 18, 13, 6, 6) -// test.kt:16 $box (4, 6, 6) +// test.kt:14 $box (12, 14, 17, 12) +// test.kt:4 $D. (13, 25, 39) +// test.kt:15 $box (4, 13, 15, 18, 13) +// test.kt:4 $D. (13, 25, 39) +// test.kt:15 $box (6) +// test.kt:16 $box (4, 6) // test.kt:17 $box (4, 6) -// test.kt:18 $box (17, 9, 9, 17, 12, 12) -// test.kt:19 $box (4, 6, 6, 6, 6) -// test.kt:20 $box (12, 14, 17, 17, 17, 12) -// test.kt:6 $E. (13, 25, 25, 25, 39, 13, 25, 25, 25, 39, 13, 25, 25, 25, 39) -// test.kt:21 $box (4, 13, 15, 18, 18, 18, 18, 13, 6, 6) +// test.kt:18 $box (17, 9, 17, 12) +// test.kt:19 $box (4, 6) +// test.kt:4 $D. (13, 25, 39) +// test.kt:20 $box (12, 14, 17, 12) +// test.kt:6 $E. (13, 25, 39) +// test.kt:21 $box (4, 13, 15, 18, 13) +// test.kt:6 $E. (13, 25, 39) +// test.kt:21 $box (6) // test.kt:8 $E.equals (39, 44) -// test.kt:22 $box (4, 6, 6) +// test.kt:21 $box (6) +// test.kt:22 $box (4, 6) // test.kt:9 $E.hashCode (30, 32) +// test.kt:22 $box (6) // test.kt:23 $box (4, 6) -// test.kt:7 $E.toString (30, 30, 30, 30, 34) -// test.kt:24 $box (19, 9, 9, 19, 13, 13) +// test.kt:7 $E.toString (30, 34) +// test.kt:24 $box (19, 9, 19, 13) // test.kt:25 $box (4, 6) -// test.kt:10 $E.copy (17, 19, 19, 22, 22, 17, 24) -// test.kt:26 $box +// test.kt:10 $E.copy (17, 19, 22, 17) +// test.kt:6 $E. (13, 25, 39) +// test.kt:10 $E.copy (24) +// test.kt:26 $box (1) diff --git a/compiler/testData/debug/stepping/defaultParameter.kt b/compiler/testData/debug/stepping/defaultParameter.kt index abb003d5e0227..1bb0fa34e16e2 100644 --- a/compiler/testData/debug/stepping/defaultParameter.kt +++ b/compiler/testData/debug/stepping/defaultParameter.kt @@ -34,9 +34,11 @@ fun box() { // test.kt:13 box // EXPECTATIONS WASM -// test.kt:12 $box (4, 4, 8, 8) -// test.kt:9 $A. -// test.kt:7 $A.foo$default (4, 4, 4, 25, 4) +// test.kt:12 $box (4) +// test.kt:9 $A. (1) +// test.kt:12 $box (8) +// test.kt:7 $A.foo$default (4, 25) // test.kt:5 $A.computeParam (25, 27) -// test.kt:8 $A.foo -// test.kt:13 $box +// test.kt:7 $A.foo$default (4) +// test.kt:8 $A.foo (5) +// test.kt:13 $box (1) diff --git a/compiler/testData/debug/stepping/delegation.kt b/compiler/testData/debug/stepping/delegation.kt index 566984d2f015e..425c9f62046f5 100644 --- a/compiler/testData/debug/stepping/delegation.kt +++ b/compiler/testData/debug/stepping/delegation.kt @@ -39,8 +39,8 @@ fun box() { // test.kt:19 box // EXPECTATIONS WASM -// test.kt:17 $box (12, 12) +// test.kt:17 $box (12) // test.kt:14 $C. (15, 16) // test.kt:18 $box (4, 6) -// test.kt:11 $O.f -// test.kt:19 $box +// test.kt:11 $O.f (5) +// test.kt:19 $box (1) diff --git a/compiler/testData/debug/stepping/enum.kt b/compiler/testData/debug/stepping/enum.kt index af9d768325931..d7dc50851183a 100644 --- a/compiler/testData/debug/stepping/enum.kt +++ b/compiler/testData/debug/stepping/enum.kt @@ -56,12 +56,15 @@ fun box() { // test.kt:25 box // EXPECTATIONS WASM -// test.kt:12 $E. (15, 15, 15, 15, 15, 15) -// test.kt:4 $E. (14, 14) -// test.kt:23 $box -// test.kt:8 $E.foo (16, 16, 16) -// test.kt:10 $E.foo -// test.kt:16 $E2_initEntries -// test.kt:15 $E2. (14, 26, 14, 26) -// test.kt:18 $E2_initEntries -// test.kt:25 $box +// test.kt:12 $E. (15) +// test.kt:4 $E. (14) +// test.kt:12 $E. (15) +// test.kt:4 $E. (14) +// test.kt:23 $box (8) +// test.kt:8 $E.foo (16) +// test.kt:10 $E.foo (5) +// test.kt:16 $E2_initEntries (6) +// test.kt:15 $E2. (14, 26) +// test.kt:18 $E2_initEntries (8) +// test.kt:15 $E2. (14, 26) +// test.kt:25 $box (1) diff --git a/compiler/testData/debug/stepping/for.kt b/compiler/testData/debug/stepping/for.kt index 1f56596b096fd..b0b01fe9ce752 100644 --- a/compiler/testData/debug/stepping/for.kt +++ b/compiler/testData/debug/stepping/for.kt @@ -36,6 +36,11 @@ inline fun foo(n: Int) {} // test.kt:7 box // EXPECTATIONS WASM -// test.kt:4 $box (14, 4, 17, 4, 14, 9, 14, 14, 4, 17, 4, 4, 14, 9, 14, 14, 4, 17, 4, 4, 14, 9, 14, 14, 4, 17, 4, 4) -// test.kt:5 $box (12, 8, 12, 8, 12, 8) -// test.kt:7 $box +// test.kt:4 $box (14, 4, 17, 4, 14, 9, 14) +// test.kt:5 $box (12, 8) +// test.kt:4 $box (4, 17, 4, 14, 9, 14) +// test.kt:5 $box (12, 8) +// test.kt:4 $box (4, 17, 4, 14, 9, 14) +// test.kt:5 $box (12, 8) +// test.kt:4 $box (4, 17, 4) +// test.kt:7 $box (1) diff --git a/compiler/testData/debug/stepping/functionCallWithDefault.kt b/compiler/testData/debug/stepping/functionCallWithDefault.kt index 6e61d95cf724d..5dbce6e6b99c4 100644 --- a/compiler/testData/debug/stepping/functionCallWithDefault.kt +++ b/compiler/testData/debug/stepping/functionCallWithDefault.kt @@ -29,9 +29,9 @@ inline fun bar(i: Int = 1) { // test.kt:7 box // EXPECTATIONS WASM -// test.kt:5 $box (4, 4) -// test.kt:9 $foo$default (0, 0, 0, 17, 17, 0) -// test.kt:10 $foo -// test.kt:6 $box -// test.kt:12 $box (24, 24) -// test.kt:7 $box +// test.kt:5 $box (4) +// test.kt:9 $foo$default (0, 17, 0) +// test.kt:10 $foo (1) +// test.kt:6 $box (4) +// test.kt:12 $box (24) +// test.kt:7 $box (1) diff --git a/compiler/testData/debug/stepping/functionCallWithInlinedLambdaParam.kt b/compiler/testData/debug/stepping/functionCallWithInlinedLambdaParam.kt index a33aac6ffc2af..ac0972f4fc09a 100644 --- a/compiler/testData/debug/stepping/functionCallWithInlinedLambdaParam.kt +++ b/compiler/testData/debug/stepping/functionCallWithInlinedLambdaParam.kt @@ -42,10 +42,12 @@ inline fun foo(f: () -> Unit) { // test.kt:13 box // EXPECTATIONS WASM -// test.kt:6 $box -// test.kt:16 $box (12, 4, 12, 4) -// test.kt:17 $box (4, 4) +// test.kt:6 $box (4) +// test.kt:16 $box (12, 4) +// test.kt:17 $box (4) // test.kt:7 $box (20, 12) -// test.kt:10 $box +// test.kt:10 $box (4) +// test.kt:16 $box (12, 4) +// test.kt:17 $box (4) // test.kt:11 $box (16, 8) -// test.kt:13 $box +// test.kt:13 $box (1) diff --git a/compiler/testData/debug/stepping/functionCallWithLambdaParam.kt b/compiler/testData/debug/stepping/functionCallWithLambdaParam.kt index 222c654401cff..ecbfdaa4fafaf 100644 --- a/compiler/testData/debug/stepping/functionCallWithLambdaParam.kt +++ b/compiler/testData/debug/stepping/functionCallWithLambdaParam.kt @@ -60,10 +60,12 @@ fun foo(f: () -> Unit) { // test.kt:12 box // EXPECTATIONS WASM -// test.kt:5 $box -// test.kt:15 $foo (4, 4, 4, 4, 4, 4) +// test.kt:5 $box (4) +// test.kt:15 $foo (4) // test.kt:6 $box$lambda.invoke (20, 12, 21) -// test.kt:16 $foo (1, 1) -// test.kt:9 $box +// test.kt:16 $foo (1) +// test.kt:9 $box (4) +// test.kt:15 $foo (4) // test.kt:10 $box$lambda.invoke (16, 8, 17) -// test.kt:12 $box +// test.kt:16 $foo (1) +// test.kt:12 $box (1) diff --git a/compiler/testData/debug/stepping/functionInAnotherFile.kt b/compiler/testData/debug/stepping/functionInAnotherFile.kt index b38b5152af1d1..1cae32e7f344d 100644 --- a/compiler/testData/debug/stepping/functionInAnotherFile.kt +++ b/compiler/testData/debug/stepping/functionInAnotherFile.kt @@ -48,10 +48,12 @@ fun bar(x: Int) = // EXPECTATIONS WASM // test.kt:14 $box (8, 4) -// foo.kt:5 $foo (8, 13, 8, 8, 13, 8) -// foo.kt:8 $foo (15, 11, 4) +// foo.kt:5 $foo (8, 13, 8) +// foo.kt:8 $foo (15, 11) // test.kt:18 $bar (8, 12, 8) // test.kt:19 $bar (12, 8) +// foo.kt:5 $foo (8, 13, 8) // foo.kt:6 $foo (15, 8) -// test.kt:22 $bar -// test.kt:15 $box +// test.kt:22 $bar (5) +// foo.kt:8 $foo (4) +// test.kt:15 $box (1) diff --git a/compiler/testData/debug/stepping/if.kt b/compiler/testData/debug/stepping/if.kt index 896e2d135b973..06e0771c3a0f0 100644 --- a/compiler/testData/debug/stepping/if.kt +++ b/compiler/testData/debug/stepping/if.kt @@ -34,9 +34,12 @@ inline fun getB(): Int { // test.kt:9 box // EXPECTATIONS WASM -// test.kt:6 $box (8, 8) -// test.kt:15 $box (11, 4, 11, 4) -// test.kt:7 $box +// test.kt:6 $box (8) +// test.kt:15 $box (11, 4) +// test.kt:7 $box (8) // test.kt:12 $getA (13, 14) -// test.kt:9 $box (11, 4) -// test.kt:8 $box +// test.kt:6 $box (8) +// test.kt:9 $box (11) +// test.kt:15 $box (11, 4) +// test.kt:9 $box (4) +// test.kt:8 $box (8) diff --git a/compiler/testData/debug/stepping/if2.kt b/compiler/testData/debug/stepping/if2.kt index 0250b0ffae22f..bfdaa71dce923 100644 --- a/compiler/testData/debug/stepping/if2.kt +++ b/compiler/testData/debug/stepping/if2.kt @@ -48,13 +48,17 @@ fun box() { // EXPECTATIONS WASM // test.kt:21 $box (8, 4) -// test.kt:5 $foo (8, 12, 8, 8, 12, 8) -// test.kt:6 $foo (8, 8, 8, 8) -// test.kt:9 $foo (8, 12, 8, 8, 12, 8) -// test.kt:13 $foo (8, 12, 8, 8, 12, 8) -// test.kt:14 $foo (8, 8) -// test.kt:18 $foo (1, 1) +// test.kt:5 $foo (8, 12, 8) +// test.kt:6 $foo (8) +// test.kt:9 $foo (8, 12, 8) +// test.kt:13 $foo (8, 12, 8) +// test.kt:14 $foo (8) +// test.kt:18 $foo (1) // test.kt:22 $box (8, 4) -// test.kt:10 $foo (8, 8, 8) -// test.kt:16 $foo (8, 8, 8, 8, 8) -// test.kt:23 $box +// test.kt:5 $foo (8, 12, 8) +// test.kt:9 $foo (8, 12, 8) +// test.kt:10 $foo (8) +// test.kt:13 $foo (8, 12, 8) +// test.kt:16 $foo (8) +// test.kt:18 $foo (1) +// test.kt:23 $box (1) diff --git a/compiler/testData/debug/stepping/ifThen.kt b/compiler/testData/debug/stepping/ifThen.kt index 7c649cb42fc80..fd0d462da6e9d 100644 --- a/compiler/testData/debug/stepping/ifThen.kt +++ b/compiler/testData/debug/stepping/ifThen.kt @@ -36,10 +36,11 @@ fun box() { // test.kt:16 box // EXPECTATIONS WASM -// test.kt:13 $box -// test.kt:5 $foo (8, 8) -// test.kt:6 $foo +// test.kt:13 $box (4) +// test.kt:5 $foo (8) +// test.kt:6 $foo (8) // test.kt:14 $box (11, 4) -// test.kt:15 $box -// test.kt:8 $foo -// test.kt:16 $box +// test.kt:15 $box (4) +// test.kt:5 $foo (8) +// test.kt:8 $foo (1) +// test.kt:16 $box (1) diff --git a/compiler/testData/debug/stepping/ifThenElse.kt b/compiler/testData/debug/stepping/ifThenElse.kt index 4f4ae5bbe18d0..883fb379a561e 100644 --- a/compiler/testData/debug/stepping/ifThenElse.kt +++ b/compiler/testData/debug/stepping/ifThenElse.kt @@ -58,14 +58,19 @@ fun box() { // test.kt:24 box // EXPECTATIONS WASM -// test.kt:21 $box -// test.kt:5 $foo (8, 8) -// test.kt:6 $foo (8, 8) -// test.kt:11 $foo (16, 4, 16, 4) -// test.kt:12 $foo -// test.kt:16 $foo (1, 1) +// test.kt:21 $box (4) +// test.kt:5 $foo (8) +// test.kt:6 $foo (8) +// test.kt:11 $foo (16) +// test.kt:12 $foo (8) +// test.kt:11 $foo (4) +// test.kt:16 $foo (1) // test.kt:22 $box (11, 4) -// test.kt:23 $box -// test.kt:8 $foo (8, 8, 8) -// test.kt:14 $foo (8, 8, 8, 8) -// test.kt:24 $box +// test.kt:23 $box (4) +// test.kt:5 $foo (8) +// test.kt:8 $foo (8) +// test.kt:11 $foo (16) +// test.kt:14 $foo (8) +// test.kt:11 $foo (4) +// test.kt:16 $foo (1) +// test.kt:24 $box (1) diff --git a/compiler/testData/debug/stepping/ifThenElseFalse.kt b/compiler/testData/debug/stepping/ifThenElseFalse.kt index e91d3a0bcf126..208f88f5f9d6d 100644 --- a/compiler/testData/debug/stepping/ifThenElseFalse.kt +++ b/compiler/testData/debug/stepping/ifThenElseFalse.kt @@ -57,12 +57,17 @@ fun box() { // test.kt:19 box // EXPECTATIONS WASM -// test.kt:16 $box -// test.kt:9 $foo (8, 8) -// test.kt:6 $cond (13, 18, 13, 18, 13, 18) -// test.kt:12 $foo -// test.kt:13 $foo (1, 1) +// test.kt:16 $box (4) +// test.kt:9 $foo (8) +// test.kt:6 $cond (13, 18) +// test.kt:12 $foo (9) +// test.kt:13 $foo (1) // test.kt:17 $box (12, 4) -// test.kt:18 $box -// test.kt:10 $foo (8, 8) -// test.kt:19 $box +// test.kt:18 $box (4) +// test.kt:9 $foo (8) +// test.kt:6 $cond (13, 18) +// test.kt:10 $foo (8) +// test.kt:6 $cond (13, 18) +// test.kt:10 $foo (8) +// test.kt:13 $foo (1) +// test.kt:19 $box (1) diff --git a/compiler/testData/debug/stepping/ifWithInlineInCondition.kt b/compiler/testData/debug/stepping/ifWithInlineInCondition.kt index 678711f1243b4..4535c96234011 100644 --- a/compiler/testData/debug/stepping/ifWithInlineInCondition.kt +++ b/compiler/testData/debug/stepping/ifWithInlineInCondition.kt @@ -72,16 +72,22 @@ fun nop() {} // test.kt:22 box // EXPECTATIONS WASM -// test.kt:4 $box -// test.kt:25 $box (11, 4, 11, 4, 11, 4, 11, 4) -// test.kt:5 $box -// test.kt:31 $nop (12, 12, 12) -// test.kt:9 $box (8, 20) +// test.kt:4 $box (8) +// test.kt:25 $box (11, 4) +// test.kt:5 $box (8) +// test.kt:31 $nop (12) +// test.kt:9 $box (8) +// test.kt:25 $box (11, 4) +// test.kt:9 $box (20) // test.kt:29 $box (36, 40) -// test.kt:10 $box -// test.kt:12 $box -// test.kt:17 $box -// test.kt:16 $box +// test.kt:10 $box (8) +// test.kt:25 $box (11, 4) +// test.kt:12 $box (8) +// test.kt:31 $nop (12) +// test.kt:17 $box (12) +// test.kt:25 $box (11, 4) +// test.kt:16 $box (8) // test.kt:28 $box (37, 38) -// test.kt:20 $box -// test.kt:22 $box +// test.kt:20 $box (8) +// test.kt:31 $nop (12) +// test.kt:22 $box (1) diff --git a/compiler/testData/debug/stepping/iincStepping.kt b/compiler/testData/debug/stepping/iincStepping.kt index 5b85f106bf669..6e73c6f241211 100644 --- a/compiler/testData/debug/stepping/iincStepping.kt +++ b/compiler/testData/debug/stepping/iincStepping.kt @@ -51,17 +51,20 @@ fun box() { // test.kt:19 box // EXPECTATIONS WASM -// test.kt:5 $box -// test.kt:6 $box (6, 4, 6, 6) +// test.kt:5 $box (12) +// test.kt:6 $box (6, 4, 6) // test.kt:7 $box (4, 9, 4) -// test.kt:8 $box (4, 4) -// test.kt:9 $box +// test.kt:8 $box (4) +// test.kt:9 $box (8) +// test.kt:8 $box (4) // test.kt:10 $box (4, 9, 4) -// test.kt:11 $box (4, 4) -// test.kt:12 $box +// test.kt:11 $box (4) +// test.kt:12 $box (8) +// test.kt:11 $box (4) // test.kt:13 $box (8, 12, 8) // test.kt:15 $box (8, 12, 8) -// test.kt:17 $box (8, 8) -// test.kt:18 $box -// test.kt:16 $box -// test.kt:19 $box +// test.kt:17 $box (8) +// test.kt:18 $box (12) +// test.kt:17 $box (8) +// test.kt:16 $box (4) +// test.kt:19 $box (1) diff --git a/compiler/testData/debug/stepping/implicitThis.kt b/compiler/testData/debug/stepping/implicitThis.kt index ad86bef7f08bc..ed30e20ecb7ed 100644 --- a/compiler/testData/debug/stepping/implicitThis.kt +++ b/compiler/testData/debug/stepping/implicitThis.kt @@ -68,14 +68,15 @@ class A { // test.kt:6 box // EXPECTATIONS WASM -// test.kt:5 $box (4, 8) -// test.kt:8 $A. -// test.kt:29 $A. -// test.kt:11 $A.test +// test.kt:5 $box (4) +// test.kt:8 $A. (0) +// test.kt:29 $A. (1) +// test.kt:5 $box (8) +// test.kt:11 $A.test (8) // test.kt:18 $Companion.foo (20, 12) -// test.kt:19 $Companion.foo -// test.kt:12 $A.test +// test.kt:19 $Companion.foo (9) +// test.kt:12 $A.test (8) // test.kt:23 $Companion. (23, 16) // test.kt:13 $A.test (15, 8) -// test.kt:14 $A.test -// test.kt:6 $box +// test.kt:14 $A.test (5) +// test.kt:6 $box (1) diff --git a/compiler/testData/debug/stepping/implicitThisOnInvoke.kt b/compiler/testData/debug/stepping/implicitThisOnInvoke.kt index d707a07e08bb8..6752a4790f967 100644 --- a/compiler/testData/debug/stepping/implicitThisOnInvoke.kt +++ b/compiler/testData/debug/stepping/implicitThisOnInvoke.kt @@ -46,11 +46,13 @@ fun test(b: B) { // test.kt:6 box // EXPECTATIONS WASM -// test.kt:5 $box (9, 11, 11, 9, 4) -// test.kt:8 $A. -// test.kt:10 $B. (8, 8, 8, 17) +// test.kt:5 $box (9, 11) +// test.kt:8 $A. (7) +// test.kt:5 $box (9) +// test.kt:10 $B. (8, 17) +// test.kt:5 $box (4) // test.kt:15 $test (9, 4) -// test.kt:16 $test (8, 8) -// test.kt:11 $B.invoke -// test.kt:18 $test -// test.kt:6 $box +// test.kt:16 $test (8) +// test.kt:11 $B.invoke (30) +// test.kt:18 $test (1) +// test.kt:6 $box (1) diff --git a/compiler/testData/debug/stepping/inTheEndOfLambdaArgumentOfInlineCall.kt b/compiler/testData/debug/stepping/inTheEndOfLambdaArgumentOfInlineCall.kt index 02d08cb49138e..5add690d81fb8 100644 --- a/compiler/testData/debug/stepping/inTheEndOfLambdaArgumentOfInlineCall.kt +++ b/compiler/testData/debug/stepping/inTheEndOfLambdaArgumentOfInlineCall.kt @@ -46,11 +46,13 @@ fun nop() {} // test.kt:10 box // EXPECTATIONS WASM -// test.kt:6 $box -// test.kt:13 $box -// test.kt:21 $nop (12, 12, 12) -// test.kt:14 $box -// test.kt:7 $box -// test.kt:8 $box -// test.kt:18 $box -// test.kt:10 $box +// test.kt:6 $box (4) +// test.kt:13 $box (4) +// test.kt:21 $nop (12) +// test.kt:14 $box (4) +// test.kt:7 $box (8) +// test.kt:21 $nop (12) +// test.kt:8 $box (8) +// test.kt:18 $box (4) +// test.kt:21 $nop (12) +// test.kt:10 $box (1) diff --git a/compiler/testData/debug/stepping/initBlocks.kt b/compiler/testData/debug/stepping/initBlocks.kt index b23cd7eab663d..f6d49784b51e2 100644 --- a/compiler/testData/debug/stepping/initBlocks.kt +++ b/compiler/testData/debug/stepping/initBlocks.kt @@ -121,23 +121,29 @@ fun box() { // test.kt:53 box // EXPECTATIONS WASM -// test.kt:49 $box (4, 4, 4) -// test.kt:8 $Foo. (8, 12, 8) -// test.kt:46 $x (10, 10, 10, 10, 12, 10, 10, 10, 10, 12) -// test.kt:10 $Foo. -// test.kt:50 $box (4, 4, 4) +// test.kt:49 $box (4) +// test.kt:8 $Foo. (8, 12) +// test.kt:46 $x (10, 12) +// test.kt:8 $Foo. (8) +// test.kt:10 $Foo. (1) +// test.kt:49 $box (4) +// test.kt:50 $box (4) // test.kt:14 $Bar. (16, 8) // test.kt:18 $Bar. (16, 8) -// test.kt:20 $Bar. -// test.kt:51 $box (4, 4, 4) +// test.kt:20 $Bar. (1) +// test.kt:50 $box (4) +// test.kt:51 $box (4) // test.kt:24 $Boo. (16, 8) -// test.kt:27 $Boo. (12, 12, 12) +// test.kt:27 $Boo. (12) +// test.kt:46 $x (10, 12) +// test.kt:27 $Boo. (12) // test.kt:30 $Boo. (16, 8) -// test.kt:32 $Boo. -// test.kt:52 $box (4, 4) +// test.kt:32 $Boo. (1) +// test.kt:51 $box (4) +// test.kt:52 $box (4) // test.kt:35 $Zoo. (19, 11) // test.kt:37 $Zoo. (19, 11) // test.kt:40 $Zoo. (16, 8) // test.kt:43 $Zoo. (19, 11) -// test.kt:44 $Zoo. -// test.kt:53 $box +// test.kt:44 $Zoo. (1) +// test.kt:53 $box (1) diff --git a/compiler/testData/debug/stepping/initBlocksCompanion.kt b/compiler/testData/debug/stepping/initBlocksCompanion.kt index e4a264a2b9853..be33efae66f64 100644 --- a/compiler/testData/debug/stepping/initBlocksCompanion.kt +++ b/compiler/testData/debug/stepping/initBlocksCompanion.kt @@ -67,12 +67,13 @@ fun box() { // EXPECTATIONS WASM // test.kt:9 $Companion. (12, 16, 12) -// test.kt:12 $Companion. (16, 16, 16) -// test.kt:27 $x (10, 10, 10, 10, 12) +// test.kt:12 $Companion. (16) +// test.kt:27 $x (10, 12) +// test.kt:12 $Companion. (16) // test.kt:14 $Companion. (23, 15) // test.kt:17 $Companion. (20, 12) // test.kt:22 $Companion. (20, 12) -// test.kt:24 $Companion. -// test.kt:30 $box (6, 6) -// test.kt:31 $box -// test.kt:32 $box +// test.kt:24 $Companion. (5) +// test.kt:30 $box (6) +// test.kt:31 $box (6) +// test.kt:32 $box (1) diff --git a/compiler/testData/debug/stepping/inlineCallableReference.kt b/compiler/testData/debug/stepping/inlineCallableReference.kt index 158dab0bde10c..a2e567140a009 100644 --- a/compiler/testData/debug/stepping/inlineCallableReference.kt +++ b/compiler/testData/debug/stepping/inlineCallableReference.kt @@ -44,11 +44,12 @@ inline fun f(block: () -> Unit) { // EXPECTATIONS WASM // test.kt:4 $box (12, 4) -// test.kt:5 $box -// test.kt:16 $box (4, 4) +// test.kt:5 $box (4) +// test.kt:16 $box (4) // test.kt:6 $box (12, 8) -// test.kt:9 $box -// test.kt:8 $box -// test.kt:10 $box +// test.kt:9 $box (8) +// test.kt:8 $box (4) +// test.kt:10 $box (4) +// test.kt:16 $box (4) // test.kt:11 $box (12, 8) -// test.kt:13 $box +// test.kt:13 $box (1) diff --git a/compiler/testData/debug/stepping/inlineNamedCallableReference.kt b/compiler/testData/debug/stepping/inlineNamedCallableReference.kt index f07b6aa43c28d..120b0fc667cc6 100644 --- a/compiler/testData/debug/stepping/inlineNamedCallableReference.kt +++ b/compiler/testData/debug/stepping/inlineNamedCallableReference.kt @@ -29,7 +29,8 @@ fun g() {} // EXPECTATIONS WASM // test.kt:4 $box (12, 4) -// test.kt:5 $box (4, 6) -// test.kt:9 $box -// test.kt:12 $g -// test.kt:6 $box +// test.kt:5 $box (4) +// test.kt:9 $box (4) +// test.kt:5 $box (6) +// test.kt:12 $g (10) +// test.kt:6 $box (1) diff --git a/compiler/testData/debug/stepping/inlineOnlyFunction.kt b/compiler/testData/debug/stepping/inlineOnlyFunction.kt index 6da230a220b47..59ae3c7ae1899 100644 --- a/compiler/testData/debug/stepping/inlineOnlyFunction.kt +++ b/compiler/testData/debug/stepping/inlineOnlyFunction.kt @@ -32,9 +32,10 @@ fun box() { // test.kt:12 box // EXPECTATIONS WASM -// test.kt:6 $box (4, 4, 6) -// test.kt:7 $box -// test.kt:3 $foo (12, 12) +// test.kt:6 $box (4, 6) +// test.kt:7 $box (8) +// test.kt:3 $foo (12) // test.kt:8 $box (8, 13) -// test.kt:9 $box -// test.kt:12 $box +// test.kt:9 $box (12) +// test.kt:3 $foo (12) +// test.kt:12 $box (1) diff --git a/compiler/testData/debug/stepping/inlineSimpleCall.kt b/compiler/testData/debug/stepping/inlineSimpleCall.kt index b0b9985d72434..546072db1f3ac 100644 --- a/compiler/testData/debug/stepping/inlineSimpleCall.kt +++ b/compiler/testData/debug/stepping/inlineSimpleCall.kt @@ -55,13 +55,16 @@ fun box() { // test.kt:25 box // EXPECTATIONS WASM -// test.kt:10 $box -// test.kt:6 $box (4, 4, 4, 4) -// test.kt:11 $box -// test.kt:14 $box -// test.kt:15 $box -// test.kt:18 $box -// test.kt:19 $box -// test.kt:21 $box -// test.kt:22 $box -// test.kt:25 $box +// test.kt:10 $box (4) +// test.kt:6 $box (4) +// test.kt:11 $box (8) +// test.kt:14 $box (4) +// test.kt:6 $box (4) +// test.kt:15 $box (8) +// test.kt:18 $box (4) +// test.kt:6 $box (4) +// test.kt:19 $box (8) +// test.kt:21 $box (8) +// test.kt:6 $box (4) +// test.kt:22 $box (12) +// test.kt:25 $box (1) diff --git a/compiler/testData/debug/stepping/kt15259.kt b/compiler/testData/debug/stepping/kt15259.kt index f1c890b8f1997..bfa8cfa14624b 100644 --- a/compiler/testData/debug/stepping/kt15259.kt +++ b/compiler/testData/debug/stepping/kt15259.kt @@ -29,9 +29,9 @@ fun box() { // test.kt:13 box // EXPECTATIONS WASM -// test.kt:12 $box -// test.kt:6 $makeFace (25, 25) -// test.kt:8 $. -// test.kt:9 $. -// test.kt:9 $makeFace -// test.kt:13 $box +// test.kt:12 $box (4) +// test.kt:6 $makeFace (25) +// test.kt:8 $. (11) +// test.kt:9 $. (1) +// test.kt:9 $makeFace (1) +// test.kt:13 $box (1) diff --git a/compiler/testData/debug/stepping/kt29179.kt b/compiler/testData/debug/stepping/kt29179.kt index bdd61bfce2844..c991b0c0cb283 100644 --- a/compiler/testData/debug/stepping/kt29179.kt +++ b/compiler/testData/debug/stepping/kt29179.kt @@ -34,9 +34,10 @@ fun box() { // test.kt:16 box // EXPECTATIONS WASM -// test.kt:15 $box (4, 8) -// test.kt:5 $A. (12, 12, 12) -// test.kt:12 $A. -// test.kt:10 $A.foo (13, 13, 13, 13, 13) -// test.kt:11 $A.foo -// test.kt:16 $box +// test.kt:15 $box (4) +// test.kt:5 $A. (12) +// test.kt:12 $A. (1) +// test.kt:15 $box (8) +// test.kt:10 $A.foo (13) +// test.kt:11 $A.foo (5) +// test.kt:16 $box (1) diff --git a/compiler/testData/debug/stepping/kt42208.kt b/compiler/testData/debug/stepping/kt42208.kt index 34041d84598a9..d24d7de0ab7be 100644 --- a/compiler/testData/debug/stepping/kt42208.kt +++ b/compiler/testData/debug/stepping/kt42208.kt @@ -25,7 +25,15 @@ inline fun foo() = { // test.kt:7 box // EXPECTATIONS WASM -// test.kt:6 $box (4, 4, 4, 4) -// test1.kt:11 $box -// test.kt:8 $box$lambda.invoke -// test.kt:7 $box +// test.kt:6 $box (4) +// test1.kt:11 $box (1) +// test.kt:6 $box (4) + +// EXPECTATIONS ClassicFrontend WASM +// test.kt:8 $box$lambda.invoke (42) + +// EXPECTATIONS FIR WASM +// test.kt:8 $box$lambda.invoke (43) + +// EXPECTATIONS WASM +// test.kt:7 $box (1) diff --git a/compiler/testData/debug/stepping/kt42208b.kt b/compiler/testData/debug/stepping/kt42208b.kt index 79727d4920afe..32ce5dee6653b 100644 --- a/compiler/testData/debug/stepping/kt42208b.kt +++ b/compiler/testData/debug/stepping/kt42208b.kt @@ -28,8 +28,15 @@ inline fun foo() = { // test.kt:8 box // EXPECTATIONS WASM -// test.kt:6 $box -// test1.kt:12 $box -// test.kt:7 $box (4, 4, 4) -// test.kt:9 $box$lambda.invoke -// test.kt:8 $box +// test.kt:6 $box (12) +// test1.kt:12 $box (1) +// test.kt:7 $box (4) + +// EXPECTATIONS ClassicFrontend WASM +// test.kt:9 $box$lambda.invoke (29) + +// EXPECTATIONS FIR WASM +// test.kt:9 $box$lambda.invoke (30) + +// EXPECTATIONS WASM +// test.kt:8 $box (1) diff --git a/compiler/testData/debug/stepping/kt42208c.kt b/compiler/testData/debug/stepping/kt42208c.kt index 28ad46a24eab5..39f11457805c0 100644 --- a/compiler/testData/debug/stepping/kt42208c.kt +++ b/compiler/testData/debug/stepping/kt42208c.kt @@ -50,11 +50,22 @@ fun baz(v:(() -> Unit)) { // test.kt:9 box // EXPECTATIONS WASM -// test.kt:6 $box (8, 4) -// test1.kt:13 $box (1, 1) -// test3.kt:16 $baz (4, 4, 4, 4, 4, 4) -// test.kt:10 $box$lambda.invoke -// test3.kt:17 $baz (1, 1) -// test.kt:7 $box +// test.kt:6 $box (8) +// test1.kt:13 $box (1) +// test.kt:6 $box (4) +// test3.kt:16 $baz (4) + +// EXPECTATIONS ClassicFrontend WASM +// test.kt:10 $box$lambda.invoke (12) + +// EXPECTATIONS FIR WASM +// test.kt:10 $box$lambda.invoke (13) + +// EXPECTATIONS WASM +// test3.kt:17 $baz (1) +// test.kt:7 $box (12) +// test1.kt:13 $box (1) // test.kt:8 $box (8, 4) -// test.kt:9 $box +// test3.kt:16 $baz (4) +// test3.kt:17 $baz (1) +// test.kt:9 $box (1) diff --git a/compiler/testData/debug/stepping/lambdaStepInline.kt b/compiler/testData/debug/stepping/lambdaStepInline.kt index 0d003a558eff0..eac6de5c6abed 100644 --- a/compiler/testData/debug/stepping/lambdaStepInline.kt +++ b/compiler/testData/debug/stepping/lambdaStepInline.kt @@ -29,8 +29,12 @@ fun box(): String { // test.kt:14 box // EXPECTATIONS WASM -// test.kt:9 $box (4, 10, 10, 15) -// test.kt:5 $box (11, 4, 11, 4) -// test.kt:10 $box -// test.kt:11 $box (8, 8, 12) -// test.kt:14 $box (11, 11, 11, 11, 4) +// test.kt:9 $box (4) +// test.kt:5 $box (11) +// test.kt:9 $box (10, 15) +// test.kt:5 $box (4) +// test.kt:10 $box (4) +// test.kt:5 $box (11) +// test.kt:11 $box (8, 12) +// test.kt:5 $box (4) +// test.kt:14 $box (11, 4) diff --git a/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt b/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt index 2da6c8327bc1b..4868f72c007b2 100644 --- a/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt +++ b/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt @@ -34,10 +34,12 @@ fun box(): String { // test.kt:17 box // EXPECTATIONS WASM -// test.kt:15 $box -// test.kt:4 $box (11, 4) -// test.kt:3 $box (45, 45, 49) -// test.kt:16 $box -// test.kt:11 $box (11, 4) -// test.kt:8 $box (4, 4, 8) -// test.kt:17 $box (11, 11, 11, 11, 4) +// test.kt:15 $box (4) +// test.kt:4 $box (11) +// test.kt:3 $box (45, 49) +// test.kt:4 $box (4) +// test.kt:16 $box (4) +// test.kt:11 $box (11) +// test.kt:8 $box (4, 8) +// test.kt:11 $box (4) +// test.kt:17 $box (11, 4) diff --git a/compiler/testData/debug/stepping/lineNumberAfterInline.kt b/compiler/testData/debug/stepping/lineNumberAfterInline.kt index ec356d8412443..6ff466556414a 100644 --- a/compiler/testData/debug/stepping/lineNumberAfterInline.kt +++ b/compiler/testData/debug/stepping/lineNumberAfterInline.kt @@ -49,15 +49,15 @@ fun box() { // test.kt:25 box // EXPECTATIONS WASM -// test.kt:23 $box -// test.kt:13 $test1 -// test.kt:9 $test1 (4, 4, 4) -// test.kt:14 $test1 (4, 4, 4, 4, 4) -// test.kt:15 $test1 -// test.kt:24 $box -// test.kt:18 $test2 -// test.kt:5 $normalFunction (4, 4, 4, 4, 4) -// test.kt:6 $normalFunction -// test.kt:19 $test2 (4, 4, 4, 4, 4) -// test.kt:20 $test2 -// test.kt:25 $box +// test.kt:23 $box (4) +// test.kt:13 $test1 (4) +// test.kt:9 $test1 (4) +// test.kt:14 $test1 (4) +// test.kt:15 $test1 (1) +// test.kt:24 $box (4) +// test.kt:18 $test2 (4) +// test.kt:5 $normalFunction (4) +// test.kt:6 $normalFunction (1) +// test.kt:19 $test2 (4) +// test.kt:20 $test2 (1) +// test.kt:25 $box (1) diff --git a/compiler/testData/debug/stepping/linenumberForOneParametersArgumentCall.kt b/compiler/testData/debug/stepping/linenumberForOneParametersArgumentCall.kt index 986873608e0a4..1b87c14c20884 100644 --- a/compiler/testData/debug/stepping/linenumberForOneParametersArgumentCall.kt +++ b/compiler/testData/debug/stepping/linenumberForOneParametersArgumentCall.kt @@ -29,8 +29,8 @@ inline fun lookAtMe(f: (String) -> Unit) { // test.kt:9 box // EXPECTATIONS WASM -// test.kt:6 $box -// test.kt:12 $box (12, 12) +// test.kt:6 $box (4) +// test.kt:12 $box (12) // test.kt:13 $box (6, 4) -// test.kt:7 $box (16, 16, 16, 8) -// test.kt:9 $box +// test.kt:7 $box (16, 8) +// test.kt:9 $box (1) diff --git a/compiler/testData/debug/stepping/localFunction.kt b/compiler/testData/debug/stepping/localFunction.kt index ad8b8176010da..9ec67caa4155e 100644 --- a/compiler/testData/debug/stepping/localFunction.kt +++ b/compiler/testData/debug/stepping/localFunction.kt @@ -27,10 +27,10 @@ fun box() { // test.kt:13 box // EXPECTATIONS WASM -// test.kt:6 $box (4, 4, 4) -// test.kt:10 $box (4, 4, 4, 4) -// test.kt:11 $box -// test.kt:8 $box$bar (8, 8, 8, 8, 8) -// test.kt:9 $box$bar -// test.kt:12 $box (4, 4, 4, 4) -// test.kt:13 $box +// test.kt:6 $box (4) +// test.kt:10 $box (4) +// test.kt:11 $box (4) +// test.kt:8 $box$bar (8) +// test.kt:9 $box$bar (5) +// test.kt:12 $box (4) +// test.kt:13 $box (1) diff --git a/compiler/testData/debug/stepping/localFunctionWIthOnelineExpressionBody.kt b/compiler/testData/debug/stepping/localFunctionWIthOnelineExpressionBody.kt index 4e274d839637c..f0a7c042998b1 100644 --- a/compiler/testData/debug/stepping/localFunctionWIthOnelineExpressionBody.kt +++ b/compiler/testData/debug/stepping/localFunctionWIthOnelineExpressionBody.kt @@ -25,9 +25,10 @@ fun box() { // test.kt:11 box // EXPECTATIONS WASM -// test.kt:6 $box (4, 4, 4) -// test.kt:8 $box (4, 4, 4) -// test.kt:9 $box (4, 4) -// test.kt:7 $box$bar (16, 16, 16, 16, 20) -// test.kt:10 $box (4, 4, 4, 4) -// test.kt:11 $box +// test.kt:6 $box (4) +// test.kt:8 $box (4) +// test.kt:9 $box (4) +// test.kt:7 $box$bar (16, 20) +// test.kt:9 $box (4) +// test.kt:10 $box (4) +// test.kt:11 $box (1) diff --git a/compiler/testData/debug/stepping/localProperty.kt b/compiler/testData/debug/stepping/localProperty.kt index 879b3f01784d1..19a080bbda26e 100644 --- a/compiler/testData/debug/stepping/localProperty.kt +++ b/compiler/testData/debug/stepping/localProperty.kt @@ -30,7 +30,7 @@ fun box(): String { // test.kt:14 box // EXPECTATIONS WASM -// test.kt:9 $box -// test.kt:6 $box -// test.kt:12 $box (12, 12, 4) +// test.kt:9 $box (8) +// test.kt:6 $box (4) +// test.kt:12 $box (12, 4) // test.kt:14 $box (11, 15, 11, 4) diff --git a/compiler/testData/debug/stepping/multiModule.kt b/compiler/testData/debug/stepping/multiModule.kt index 2fcdc108569d0..b5a96f13a4da0 100644 --- a/compiler/testData/debug/stepping/multiModule.kt +++ b/compiler/testData/debug/stepping/multiModule.kt @@ -33,8 +33,9 @@ fun box() { // test.kt:17 box // EXPECTATIONS WASM -// test.kt:15 $box (4, 4) -// a.kt:5 $a (10, 10, 10, 10, 13) -// test.kt:16 $box -// b.kt:9 $b (10, 10, 10, 10, 13) -// test.kt:17 $box +// test.kt:15 $box (4) +// a.kt:5 $a (10, 13) +// test.kt:15 $box (4) +// test.kt:16 $box (4) +// b.kt:9 $b (10, 13) +// test.kt:17 $box (1) diff --git a/compiler/testData/debug/stepping/multilineExpression.kt b/compiler/testData/debug/stepping/multilineExpression.kt index 67eb0f0315e95..87077a8e322d8 100644 --- a/compiler/testData/debug/stepping/multilineExpression.kt +++ b/compiler/testData/debug/stepping/multilineExpression.kt @@ -28,7 +28,8 @@ fun test(a: Boolean, b: Boolean, c: Boolean): Boolean { // EXPECTATIONS WASM // test.kt:6 $box (9, 15, 21, 4) -// test.kt:10 $test (11, 4) -// test.kt:11 $test -// test.kt:12 $test -// test.kt:7 $box +// test.kt:10 $test (11) +// test.kt:11 $test (15) +// test.kt:12 $test (15) +// test.kt:10 $test (4) +// test.kt:7 $box (1) diff --git a/compiler/testData/debug/stepping/multilineFunctionCall.kt b/compiler/testData/debug/stepping/multilineFunctionCall.kt index ad7e1263ce599..205615d32720b 100644 --- a/compiler/testData/debug/stepping/multilineFunctionCall.kt +++ b/compiler/testData/debug/stepping/multilineFunctionCall.kt @@ -22,7 +22,7 @@ fun foo(i: Int) { // test.kt:8 box // EXPECTATIONS WASM -// test.kt:6 $box -// test.kt:5 $box -// test.kt:11 $foo -// test.kt:8 $box +// test.kt:6 $box (12) +// test.kt:5 $box (4) +// test.kt:11 $foo (1) +// test.kt:8 $box (1) diff --git a/compiler/testData/debug/stepping/multilineInfixCall.kt b/compiler/testData/debug/stepping/multilineInfixCall.kt index 95d1c4eb4af52..6eb7fe5249cab 100644 --- a/compiler/testData/debug/stepping/multilineInfixCall.kt +++ b/compiler/testData/debug/stepping/multilineInfixCall.kt @@ -22,7 +22,8 @@ infix fun Int.foo(i: Int) { // test.kt:7 box // EXPECTATIONS WASM -// test.kt:5 $box (4, 4) -// test.kt:6 $box -// test.kt:10 $foo -// test.kt:7 $box +// test.kt:5 $box (4) +// test.kt:6 $box (9) +// test.kt:5 $box (4) +// test.kt:10 $foo (1) +// test.kt:7 $box (1) diff --git a/compiler/testData/debug/stepping/namedCallableReference.kt b/compiler/testData/debug/stepping/namedCallableReference.kt index 1044dc964644b..f753dc94e3ba8 100644 --- a/compiler/testData/debug/stepping/namedCallableReference.kt +++ b/compiler/testData/debug/stepping/namedCallableReference.kt @@ -34,8 +34,8 @@ fun g() {} // EXPECTATIONS WASM // test.kt:4 $box (12, 4) -// test.kt:5 $box -// test.kt:9 $f (4, 4, 4) -// test.kt:12 $g -// test.kt:10 $f -// test.kt:6 $box +// test.kt:5 $box (4) +// test.kt:9 $f (4) +// test.kt:12 $g (10) +// test.kt:10 $f (1) +// test.kt:6 $box (1) diff --git a/compiler/testData/debug/stepping/nestedInline.kt b/compiler/testData/debug/stepping/nestedInline.kt index 2ac7966993039..072743e00e707 100644 --- a/compiler/testData/debug/stepping/nestedInline.kt +++ b/compiler/testData/debug/stepping/nestedInline.kt @@ -74,15 +74,17 @@ inline fun html(init: () -> Unit) { // test.kt:22 box // EXPECTATIONS WASM -// test.kt:20 $box -// test.kt:8 $box (14, 14, 4) -// test.kt:10 $box -// 1.kt:42 $box (11, 4) -// 1.kt:30 $box -// test.kt:11 $box -// 1.kt:38 $box (44, 67, 60) +// test.kt:20 $box (19) +// test.kt:8 $box (14, 4) +// test.kt:10 $box (4) +// 1.kt:42 $box (11) +// 1.kt:30 $box (4) +// test.kt:11 $box (8) +// 1.kt:38 $box (44) // 1.kt:34 $box (12, 4) -// 1.kt:35 $box +// 1.kt:35 $box (4) // test.kt:12 $box (18, 12) +// 1.kt:38 $box (67, 60) +// 1.kt:42 $box (4) // test.kt:16 $box (11, 4) // test.kt:22 $box (11, 4) diff --git a/compiler/testData/debug/stepping/noParametersArgumentCallInExpression.kt b/compiler/testData/debug/stepping/noParametersArgumentCallInExpression.kt index 1d0ae2d23fefc..09dc1af5e5009 100644 --- a/compiler/testData/debug/stepping/noParametersArgumentCallInExpression.kt +++ b/compiler/testData/debug/stepping/noParametersArgumentCallInExpression.kt @@ -28,8 +28,9 @@ inline fun lookAtMe(f: () -> Int) { // test.kt:9 box // EXPECTATIONS WASM -// test.kt:6 $box -// test.kt:12 $box -// test.kt:13 $box (4, 8, 4) +// test.kt:6 $box (4) +// test.kt:12 $box (12) +// test.kt:13 $box (4, 8) // test.kt:7 $box (8, 10) -// test.kt:9 $box +// test.kt:13 $box (4) +// test.kt:9 $box (1) diff --git a/compiler/testData/debug/stepping/nullcheck.kt b/compiler/testData/debug/stepping/nullcheck.kt index 663fd29eab02c..1d49221a7ec63 100644 --- a/compiler/testData/debug/stepping/nullcheck.kt +++ b/compiler/testData/debug/stepping/nullcheck.kt @@ -58,12 +58,18 @@ fun testExpressionBody(nullable: String?) = // test.kt:11 box // EXPECTATIONS WASM -// test.kt:7 $box (9, 9, 9, 9, 4) -// test.kt:14 $test (11, 4, 11, 4) +// test.kt:7 $box (9, 4) +// test.kt:14 $test (11) // test.kt:16 $test (12, 21, 31, 12) -// test.kt:8 $box (9, 4, 4) -// test.kt:9 $box (23, 23, 23, 23, 4, 4) -// test.kt:20 $testExpressionBody (4, 4) -// test.kt:22 $testExpressionBody (12, 21, 31, 12, 32, 32) +// test.kt:14 $test (4) +// test.kt:8 $box (9, 4) +// test.kt:14 $test (11, 4) +// test.kt:8 $box (4) +// test.kt:9 $box (23, 4) +// test.kt:20 $testExpressionBody (4) +// test.kt:22 $testExpressionBody (12, 21, 31, 12, 32) +// test.kt:9 $box (4) // test.kt:10 $box (23, 4) -// test.kt:11 $box +// test.kt:20 $testExpressionBody (4) +// test.kt:22 $testExpressionBody (32) +// test.kt:11 $box (1) diff --git a/compiler/testData/debug/stepping/overridenGetterSetter.kt b/compiler/testData/debug/stepping/overridenGetterSetter.kt index 8c30ea2838f79..abfc2374421f6 100644 --- a/compiler/testData/debug/stepping/overridenGetterSetter.kt +++ b/compiler/testData/debug/stepping/overridenGetterSetter.kt @@ -85,21 +85,21 @@ fun box() { // test.kt:34 box // EXPECTATIONS WASM -// test.kt:31 $box -// test.kt:18 $MyInterfaceImplWithBreakpoints. -// test.kt:21 $MyInterfaceImplWithBreakpoints. (28, 28, 28) -// test.kt:28 $MyInterfaceImplWithBreakpoints. -// test.kt:32 $box (4, 4, 11) -// test.kt:9 $MyInterfaceWithoutBreakpoints.testPropertyInInterface (8, 8, 8) -// test.kt:18 $MyInterfaceImplWithBreakpoints. (13, 13) -// test.kt:10 $MyInterfaceWithoutBreakpoints.testPropertyInInterface (8, 8, 8) -// test.kt:21 $MyInterfaceImplWithBreakpoints. (13, 13) -// test.kt:11 $MyInterfaceWithoutBreakpoints.testPropertyInInterface (8, 19, 8, 8) -// test.kt:21 $MyInterfaceImplWithBreakpoints. (13, 13, 29) -// test.kt:12 $MyInterfaceWithoutBreakpoints.testPropertyInInterface +// test.kt:31 $box (17) +// test.kt:18 $MyInterfaceImplWithBreakpoints. (28) +// test.kt:21 $MyInterfaceImplWithBreakpoints. (28) +// test.kt:28 $MyInterfaceImplWithBreakpoints. (1) +// test.kt:32 $box (4, 11) +// test.kt:9 $MyInterfaceWithoutBreakpoints.testPropertyInInterface (8) +// test.kt:18 $MyInterfaceImplWithBreakpoints. (13) +// test.kt:10 $MyInterfaceWithoutBreakpoints.testPropertyInInterface (8) +// test.kt:21 $MyInterfaceImplWithBreakpoints. (13) +// test.kt:11 $MyInterfaceWithoutBreakpoints.testPropertyInInterface (8, 19, 8) +// test.kt:21 $MyInterfaceImplWithBreakpoints. (13, 29) +// test.kt:12 $MyInterfaceWithoutBreakpoints.testPropertyInInterface (5) // test.kt:33 $box (4, 11) -// test.kt:24 $MyInterfaceImplWithBreakpoints.testPropertyInInterfaceImpl -// test.kt:25 $MyInterfaceImplWithBreakpoints.testPropertyInInterfaceImpl (8, 8) +// test.kt:24 $MyInterfaceImplWithBreakpoints.testPropertyInInterfaceImpl (8) +// test.kt:25 $MyInterfaceImplWithBreakpoints.testPropertyInInterfaceImpl (8) // test.kt:26 $MyInterfaceImplWithBreakpoints.testPropertyInInterfaceImpl (8, 19, 8) -// test.kt:27 $MyInterfaceImplWithBreakpoints.testPropertyInInterfaceImpl -// test.kt:34 $box +// test.kt:27 $MyInterfaceImplWithBreakpoints.testPropertyInInterfaceImpl (5) +// test.kt:34 $box (1) diff --git a/compiler/testData/debug/stepping/primitiveNullChecks.kt b/compiler/testData/debug/stepping/primitiveNullChecks.kt index 3146d53717d3a..4e2e8c3515612 100644 --- a/compiler/testData/debug/stepping/primitiveNullChecks.kt +++ b/compiler/testData/debug/stepping/primitiveNullChecks.kt @@ -19,6 +19,6 @@ fun box(): String { // test.kt:7 box // EXPECTATIONS WASM -// test.kt:5 $box -// test.kt:6 $box -// test.kt:7 $box (11, 11, 4) +// test.kt:5 $box (4) +// test.kt:6 $box (7) +// test.kt:7 $box (11, 4) diff --git a/compiler/testData/debug/stepping/propertyAccessor.kt b/compiler/testData/debug/stepping/propertyAccessor.kt index 42e414331be86..b1fce3a66b9b2 100644 --- a/compiler/testData/debug/stepping/propertyAccessor.kt +++ b/compiler/testData/debug/stepping/propertyAccessor.kt @@ -28,7 +28,8 @@ fun box() { // test.kt:13 box // EXPECTATIONS WASM -// test.kt:12 $box (4, 4, 8) -// test.kt:9 $A. +// test.kt:12 $box (4) +// test.kt:9 $A. (1) +// test.kt:12 $box (8) // test.kt:7 $A. (19, 12) -// test.kt:13 $box +// test.kt:13 $box (1) diff --git a/compiler/testData/debug/stepping/propertyInvokeInsidePCLALambda.kt b/compiler/testData/debug/stepping/propertyInvokeInsidePCLALambda.kt index c4aa4fcdefa7f..d60524379defc 100644 --- a/compiler/testData/debug/stepping/propertyInvokeInsidePCLALambda.kt +++ b/compiler/testData/debug/stepping/propertyInvokeInsidePCLALambda.kt @@ -91,14 +91,18 @@ fun box(): String { // EXPECTATIONS WASM // test.kt:22 $box (17, 4) -// test.kt:23 $box (8, 8, 4) -// test.kt:16 $bar (13, 13, 13, 4) -// test.kt:6 $generate (4, 10, 10, 4, 4) -// test.kt:3 $Controller. -// test.kt:17 $bar$lambda.invoke (18, 12, 8, 18, 18, 37) -// test.kt:11 $foo (36, 38, 38, 38, 38, 36, 43) -// test.kt:9 $A. (8, 8, 8, 22) -// test.kt:24 $box$lambda.invoke (8, 17, 17, 8, 18) -// test.kt:7 $generate -// test.kt:19 $bar -// test.kt:27 $box (11, 11, 11, 4) +// test.kt:23 $box (8, 4) +// test.kt:16 $bar (13, 4) +// test.kt:6 $generate (4, 10) +// test.kt:3 $Controller. (19) +// test.kt:6 $generate (4) +// test.kt:17 $bar$lambda.invoke (18, 12, 8) +// test.kt:11 $foo (36, 38, 36) +// test.kt:9 $A. (8, 22) +// test.kt:11 $foo (43) +// test.kt:17 $bar$lambda.invoke (18) +// test.kt:24 $box$lambda.invoke (8, 17, 8, 18) +// test.kt:17 $bar$lambda.invoke (37) +// test.kt:7 $generate (1) +// test.kt:19 $bar (1) +// test.kt:27 $box (11, 4) diff --git a/compiler/testData/debug/stepping/recursion.kt b/compiler/testData/debug/stepping/recursion.kt index 2c7b0a0b9b634..48a2dc3fab407 100644 --- a/compiler/testData/debug/stepping/recursion.kt +++ b/compiler/testData/debug/stepping/recursion.kt @@ -40,9 +40,14 @@ fun foo(n :Int ) : Int { // test.kt:6 box // EXPECTATIONS WASM -// test.kt:4 $box -// test.kt:5 $box (16, 12, 4) -// test.kt:9 $foo (8, 13, 8, 18, 23, 18, 8, 13, 8, 18, 23, 18, 8, 13, 8) -// test.kt:12 $foo (15, 17, 15, 11, 15, 17, 15, 11, 22, 11, 4, 22, 11, 4) +// test.kt:4 $box (12) +// test.kt:5 $box (16, 12) +// test.kt:9 $foo (8, 13, 8, 18, 23, 18) +// test.kt:12 $foo (15, 17, 15, 11) +// test.kt:9 $foo (8, 13, 8, 18, 23, 18) +// test.kt:12 $foo (15, 17, 15, 11) +// test.kt:9 $foo (8, 13, 8) // test.kt:10 $foo (15, 8) -// test.kt:6 $box +// test.kt:12 $foo (22, 11, 4, 22, 11, 4) +// test.kt:5 $box (4) +// test.kt:6 $box (1) diff --git a/compiler/testData/debug/stepping/simpleDefaultArg.kt b/compiler/testData/debug/stepping/simpleDefaultArg.kt index fa8fb9107b2da..ebea3475ab526 100644 --- a/compiler/testData/debug/stepping/simpleDefaultArg.kt +++ b/compiler/testData/debug/stepping/simpleDefaultArg.kt @@ -21,6 +21,7 @@ fun box(): String { // test.kt:9 box // EXPECTATIONS WASM -// test.kt:9 $box (11, 11, 11, 11, 4) -// test.kt:4 $ifoo$default (0, 0, 0, 22, 0) +// test.kt:9 $box (11) +// test.kt:4 $ifoo$default (0, 22, 0) // test.kt:5 $ifoo (11, 4) +// test.kt:9 $box (4) diff --git a/compiler/testData/debug/stepping/simpleDefaultArgWithInline.kt b/compiler/testData/debug/stepping/simpleDefaultArgWithInline.kt index 7d47badbed17b..245c3c5acf91d 100644 --- a/compiler/testData/debug/stepping/simpleDefaultArgWithInline.kt +++ b/compiler/testData/debug/stepping/simpleDefaultArgWithInline.kt @@ -30,9 +30,10 @@ fun box(): String { // test.kt:15 box // EXPECTATIONS WASM -// test.kt:14 $box -// test.kt:5 $box (29, 29) +// test.kt:14 $box (4) +// test.kt:5 $box (29) // test.kt:6 $box (11, 4) -// test.kt:15 $box (11, 11, 11, 11, 4) -// test.kt:9 $ifoo2$default (0, 0, 0, 23, 0) +// test.kt:15 $box (11) +// test.kt:9 $ifoo2$default (0, 23, 0) // test.kt:10 $ifoo2 (11, 4) +// test.kt:15 $box (4) diff --git a/compiler/testData/debug/stepping/simpleInlineDefaultArg.kt b/compiler/testData/debug/stepping/simpleInlineDefaultArg.kt index cc9c8acd97757..08f71bc85b785 100644 --- a/compiler/testData/debug/stepping/simpleInlineDefaultArg.kt +++ b/compiler/testData/debug/stepping/simpleInlineDefaultArg.kt @@ -23,7 +23,8 @@ fun box(): String { // test.kt:11 box // EXPECTATIONS WASM -// test.kt:11 $box (11, 4) -// test.kt:6 $box -// test.kt:4 $box (26, 26, 30) +// test.kt:11 $box (11) +// test.kt:6 $box (28) +// test.kt:4 $box (26, 30) // test.kt:7 $box (11, 4) +// test.kt:11 $box (4) diff --git a/compiler/testData/debug/stepping/simpleSmap.kt b/compiler/testData/debug/stepping/simpleSmap.kt index 8af01b186b230..2fadb0f1d9bfe 100644 --- a/compiler/testData/debug/stepping/simpleSmap.kt +++ b/compiler/testData/debug/stepping/simpleSmap.kt @@ -26,7 +26,7 @@ fun box() { // test.kt:14 box // EXPECTATIONS WASM -// test.kt:11 $box -// test.kt:7 $box -// test.kt:12 $box (8, 8, 8) -// test.kt:14 $box +// test.kt:11 $box (4) +// test.kt:7 $box (4) +// test.kt:12 $box (8) +// test.kt:14 $box (1) diff --git a/compiler/testData/debug/stepping/smapInlineAsArgument.kt b/compiler/testData/debug/stepping/smapInlineAsArgument.kt index 89dfb5d6e4616..f8789a4c80075 100644 --- a/compiler/testData/debug/stepping/smapInlineAsArgument.kt +++ b/compiler/testData/debug/stepping/smapInlineAsArgument.kt @@ -50,12 +50,18 @@ fun fail() : String { // test.kt:10 box // EXPECTATIONS WASM -// test.kt:5 $box (16, 4) -// test.kt:17 $box (11, 11, 4, 11, 11, 4) -// test.kt:6 $box -// test.kt:21 $fail (11, 11, 11, 11, 4, 11, 11, 11, 11, 4) -// test.kt:13 $checkEquals (4, 4, 4, 4, 4, 4, 4, 4, 4, 4) -// test.kt:14 $checkEquals (1, 1) -// test.kt:8 $box (16, 4) -// test.kt:9 $box -// test.kt:10 $box +// test.kt:5 $box (16) +// test.kt:17 $box (11, 4) +// test.kt:6 $box (16) +// test.kt:21 $fail (11, 4) +// test.kt:5 $box (4) +// test.kt:13 $checkEquals (4) +// test.kt:14 $checkEquals (1) +// test.kt:8 $box (16) +// test.kt:21 $fail (11, 4) +// test.kt:9 $box (16) +// test.kt:17 $box (11, 4) +// test.kt:8 $box (4) +// test.kt:13 $checkEquals (4) +// test.kt:14 $checkEquals (1) +// test.kt:10 $box (1) diff --git a/compiler/testData/debug/stepping/smapInlineAsInfixArgument.kt b/compiler/testData/debug/stepping/smapInlineAsInfixArgument.kt index a6320f0a44f88..0e72fd7a9b8bc 100644 --- a/compiler/testData/debug/stepping/smapInlineAsInfixArgument.kt +++ b/compiler/testData/debug/stepping/smapInlineAsInfixArgument.kt @@ -48,11 +48,16 @@ fun fail() : String { // test.kt:12 box // EXPECTATIONS WASM -// test.kt:7 $box (4, 4) -// test.kt:15 $box (11, 11, 4, 11, 11, 4) -// test.kt:8 $box -// test.kt:19 $fail (11, 11, 11, 11, 4, 11, 11, 11, 11, 4) -// test.kt:4 $execute (38, 45, 38, 46, 38, 45, 38, 46) -// test.kt:10 $box (4, 4) -// test.kt:11 $box -// test.kt:12 $box +// test.kt:7 $box (4) +// test.kt:15 $box (11, 4) +// test.kt:8 $box (12) +// test.kt:19 $fail (11, 4) +// test.kt:7 $box (4) +// test.kt:4 $execute (38, 45, 38, 46) +// test.kt:10 $box (4) +// test.kt:19 $fail (11, 4) +// test.kt:11 $box (12) +// test.kt:15 $box (11, 4) +// test.kt:10 $box (4) +// test.kt:4 $execute (38, 45, 38, 46) +// test.kt:12 $box (1) diff --git a/compiler/testData/debug/stepping/smapInlineAsInlineArgument.kt b/compiler/testData/debug/stepping/smapInlineAsInlineArgument.kt index f298a977ccf44..7fad6fba3b884 100644 --- a/compiler/testData/debug/stepping/smapInlineAsInlineArgument.kt +++ b/compiler/testData/debug/stepping/smapInlineAsInlineArgument.kt @@ -46,10 +46,16 @@ fun fail() : String { // test.kt:10 box // EXPECTATIONS WASM -// test.kt:5 $box (14, 19, 19, 9, 4) -// test.kt:17 $box (11, 11, 4, 11, 11, 11, 4, 11, 11, 4, 11, 11, 4) -// test.kt:6 $box -// test.kt:21 $fail (11, 11, 11, 11, 4, 11, 11, 11, 11, 4) -// test.kt:8 $box (9, 4) -// test.kt:9 $box (21, 26, 26, 16) -// test.kt:10 $box +// test.kt:5 $box (14, 19, 9) +// test.kt:17 $box (11, 4) +// test.kt:6 $box (16) +// test.kt:21 $fail (11, 4) +// test.kt:5 $box (4) +// test.kt:17 $box (11, 4) +// test.kt:8 $box (9) +// test.kt:21 $fail (11, 4) +// test.kt:9 $box (21, 26, 16) +// test.kt:17 $box (11, 4) +// test.kt:8 $box (4) +// test.kt:17 $box (11, 4) +// test.kt:10 $box (1) diff --git a/compiler/testData/debug/stepping/smapInlineInIntrinsicArgument.kt b/compiler/testData/debug/stepping/smapInlineInIntrinsicArgument.kt index 7a6aef712fca8..253c89f43175d 100644 --- a/compiler/testData/debug/stepping/smapInlineInIntrinsicArgument.kt +++ b/compiler/testData/debug/stepping/smapInlineInIntrinsicArgument.kt @@ -41,10 +41,14 @@ fun fail() : String { // test.kt:10 box // EXPECTATIONS WASM -// test.kt:5 $box (4, 4) -// test.kt:13 $box (11, 11, 4, 11, 11, 4) -// test.kt:6 $box -// test.kt:17 $fail (11, 11, 11, 11, 4, 11, 11, 11, 11, 4) -// test.kt:8 $box (4, 4) -// test.kt:9 $box -// test.kt:10 $box +// test.kt:5 $box (4) +// test.kt:13 $box (11, 4) +// test.kt:6 $box (12) +// test.kt:17 $fail (11, 4) +// test.kt:5 $box (4) +// test.kt:8 $box (4) +// test.kt:17 $fail (11, 4) +// test.kt:9 $box (16) +// test.kt:13 $box (11, 4) +// test.kt:8 $box (4) +// test.kt:10 $box (1) diff --git a/compiler/testData/debug/stepping/stringSwitches.kt b/compiler/testData/debug/stepping/stringSwitches.kt index 662b23d5d18a3..4954c22f3f3db 100644 --- a/compiler/testData/debug/stepping/stringSwitches.kt +++ b/compiler/testData/debug/stepping/stringSwitches.kt @@ -120,25 +120,53 @@ fun box() { // test.kt:34 box // EXPECTATIONS WASM -// test.kt:30 $box (17, 17, 17, 4) -// test.kt:6 $stringSwitch (8, 13, 13, 13, 13, 8, 20, 8, 8, 8) -// test.kt:5 $stringSwitch (4, 4, 4, 4) -// test.kt:12 $stringSwitch (19, 4, 19, 4, 19, 4, 19, 4) -// test.kt:13 $stringSwitch (8, 15, 8, 8, 8) -// test.kt:20 $stringSwitch (9, 9, 9, 9) -// test.kt:22 $stringSwitch (8, 15, 8, 8, 8) -// test.kt:19 $stringSwitch (4, 4, 4, 4) -// test.kt:27 $stringSwitch (1, 1, 1, 1) -// test.kt:31 $box (17, 17, 17, 4) -// test.kt:7 $stringSwitch (8, 13, 13, 13, 13, 8, 21) +// test.kt:30 $box (17, 4) +// test.kt:6 $stringSwitch (8, 13, 8, 20) +// test.kt:5 $stringSwitch (4) +// test.kt:12 $stringSwitch (19) +// test.kt:13 $stringSwitch (8, 15) +// test.kt:12 $stringSwitch (4) +// test.kt:20 $stringSwitch (9) +// test.kt:22 $stringSwitch (8, 15) +// test.kt:19 $stringSwitch (4) +// test.kt:27 $stringSwitch (1) +// test.kt:31 $box (17, 4) +// test.kt:6 $stringSwitch (8) +// test.kt:7 $stringSwitch (8, 13, 8, 21) +// test.kt:5 $stringSwitch (4) +// test.kt:12 $stringSwitch (19) +// test.kt:13 $stringSwitch (8) // test.kt:14 $stringSwitch (8, 16) +// test.kt:12 $stringSwitch (4) +// test.kt:20 $stringSwitch (9) +// test.kt:22 $stringSwitch (8) // test.kt:23 $stringSwitch (8, 16) -// test.kt:32 $box (17, 17, 17, 4) -// test.kt:8 $stringSwitch (8, 13, 13, 13, 13, 8, 22) +// test.kt:19 $stringSwitch (4) +// test.kt:27 $stringSwitch (1) +// test.kt:32 $box (17, 4) +// test.kt:6 $stringSwitch (8) +// test.kt:8 $stringSwitch (8, 13, 8, 22) +// test.kt:5 $stringSwitch (4) +// test.kt:12 $stringSwitch (19) +// test.kt:13 $stringSwitch (8) // test.kt:15 $stringSwitch (8, 17) +// test.kt:12 $stringSwitch (4) +// test.kt:20 $stringSwitch (9) +// test.kt:22 $stringSwitch (8) // test.kt:24 $stringSwitch (8, 17) -// test.kt:33 $box (17, 17, 17, 4) -// test.kt:9 $stringSwitch -// test.kt:16 $stringSwitch -// test.kt:25 $stringSwitch -// test.kt:34 $box +// test.kt:19 $stringSwitch (4) +// test.kt:27 $stringSwitch (1) +// test.kt:33 $box (17, 4) +// test.kt:6 $stringSwitch (8) +// test.kt:9 $stringSwitch (16) +// test.kt:5 $stringSwitch (4) +// test.kt:12 $stringSwitch (19) +// test.kt:13 $stringSwitch (8) +// test.kt:16 $stringSwitch (16) +// test.kt:12 $stringSwitch (4) +// test.kt:20 $stringSwitch (9) +// test.kt:22 $stringSwitch (8) +// test.kt:25 $stringSwitch (16) +// test.kt:19 $stringSwitch (4) +// test.kt:27 $stringSwitch (1) +// test.kt:34 $box (1) diff --git a/compiler/testData/debug/stepping/stringSwitchesSmall.kt b/compiler/testData/debug/stepping/stringSwitchesSmall.kt index d57fed47327c4..1fb1c271ffe2e 100644 --- a/compiler/testData/debug/stepping/stringSwitchesSmall.kt +++ b/compiler/testData/debug/stepping/stringSwitchesSmall.kt @@ -105,21 +105,40 @@ fun box() { // test.kt:30 box // EXPECTATIONS WASM -// test.kt:27 $box (17, 17, 17, 4) -// test.kt:6 $stringSwitch (8, 13, 13, 13, 13, 8, 20, 8, 8) -// test.kt:5 $stringSwitch (4, 4, 4) -// test.kt:11 $stringSwitch (19, 4, 19, 4, 19, 4) -// test.kt:12 $stringSwitch (8, 15, 8, 8) -// test.kt:18 $stringSwitch (9, 9, 9) -// test.kt:20 $stringSwitch (8, 15, 8, 8) -// test.kt:17 $stringSwitch (4, 4, 4) -// test.kt:24 $stringSwitch (1, 1, 1) -// test.kt:28 $box (17, 17, 17, 4) -// test.kt:7 $stringSwitch (8, 13, 13, 13, 13, 8, 21) +// test.kt:27 $box (17, 4) +// test.kt:6 $stringSwitch (8, 13, 8, 20) +// test.kt:5 $stringSwitch (4) +// test.kt:11 $stringSwitch (19) +// test.kt:12 $stringSwitch (8, 15) +// test.kt:11 $stringSwitch (4) +// test.kt:18 $stringSwitch (9) +// test.kt:20 $stringSwitch (8, 15) +// test.kt:17 $stringSwitch (4) +// test.kt:24 $stringSwitch (1) +// test.kt:28 $box (17, 4) +// test.kt:6 $stringSwitch (8) +// test.kt:7 $stringSwitch (8, 13, 8, 21) +// test.kt:5 $stringSwitch (4) +// test.kt:11 $stringSwitch (19) +// test.kt:12 $stringSwitch (8) // test.kt:13 $stringSwitch (8, 16) +// test.kt:11 $stringSwitch (4) +// test.kt:18 $stringSwitch (9) +// test.kt:20 $stringSwitch (8) // test.kt:21 $stringSwitch (8, 16) -// test.kt:29 $box (17, 17, 17, 4) -// test.kt:8 $stringSwitch -// test.kt:14 $stringSwitch -// test.kt:22 $stringSwitch -// test.kt:30 $box +// test.kt:17 $stringSwitch (4) +// test.kt:24 $stringSwitch (1) +// test.kt:29 $box (17, 4) +// test.kt:6 $stringSwitch (8) +// test.kt:8 $stringSwitch (16) +// test.kt:5 $stringSwitch (4) +// test.kt:11 $stringSwitch (19) +// test.kt:12 $stringSwitch (8) +// test.kt:14 $stringSwitch (16) +// test.kt:11 $stringSwitch (4) +// test.kt:18 $stringSwitch (9) +// test.kt:20 $stringSwitch (8) +// test.kt:22 $stringSwitch (16) +// test.kt:17 $stringSwitch (4) +// test.kt:24 $stringSwitch (1) +// test.kt:30 $box (1) diff --git a/compiler/testData/debug/stepping/throwException.kt b/compiler/testData/debug/stepping/throwException.kt index 95c07412465b8..dc9bbb3bdd189 100644 --- a/compiler/testData/debug/stepping/throwException.kt +++ b/compiler/testData/debug/stepping/throwException.kt @@ -44,8 +44,10 @@ fun throwIfLess(a: Int, b: Int) { // test.kt:4 $box (12, 4) // test.kt:5 $box (12, 4) // test.kt:7 $box (20, 23, 8) -// test.kt:15 $throwIfLess (8, 10, 8, 8, 10, 8) -// test.kt:16 $throwIfLess (14, 14, 8, 14, 14, 8) -// test.kt:6 $box (4, 4) +// test.kt:15 $throwIfLess (8, 10, 8) +// test.kt:16 $throwIfLess (14, 8) +// test.kt:6 $box (4) // test.kt:8 $box (27, 13) // test.kt:9 $box (20, 23, 8) +// test.kt:15 $throwIfLess (8, 10, 8) +// test.kt:16 $throwIfLess (14, 8) diff --git a/compiler/testData/debug/stepping/topLevel.kt b/compiler/testData/debug/stepping/topLevel.kt index b4e790475de3b..df5a323a628e9 100644 --- a/compiler/testData/debug/stepping/topLevel.kt +++ b/compiler/testData/debug/stepping/topLevel.kt @@ -21,6 +21,6 @@ fun box() { // test.kt:10 box // EXPECTATIONS WASM -// test.kt:9 $box +// test.kt:9 $box (4) // test.kt:4 $foo (12, 16) -// test.kt:10 $box +// test.kt:10 $box (1) diff --git a/compiler/testData/debug/stepping/trait.kt b/compiler/testData/debug/stepping/trait.kt index f91bde2fe5bad..bbad3c471a5aa 100644 --- a/compiler/testData/debug/stepping/trait.kt +++ b/compiler/testData/debug/stepping/trait.kt @@ -59,10 +59,16 @@ fun box() { // test.kt:17 box // EXPECTATIONS WASM -// test.kt:15 $box (5, 20, 20, 20) -// test.kt:15 $. -// test.kt:8 $A.bar (15, 15, 15, 8, 15, 15, 15, 8) -// test.kt:5 $A.foo (16, 18, 16, 18) -// test.kt:16 $box (4, 8, 8, 8) -// test.kt:12 $B. -// test.kt:17 $box +// test.kt:15 $box (5) +// test.kt:15 $. (18) +// test.kt:15 $box (20) +// test.kt:8 $A.bar (15) +// test.kt:5 $A.foo (16, 18) +// test.kt:8 $A.bar (8) +// test.kt:16 $box (4) +// test.kt:12 $B. (11) +// test.kt:16 $box (8) +// test.kt:8 $A.bar (15) +// test.kt:5 $A.foo (16, 18) +// test.kt:8 $A.bar (8) +// test.kt:17 $box (1) diff --git a/compiler/testData/debug/stepping/tryCatch.kt b/compiler/testData/debug/stepping/tryCatch.kt index b445e7b8c330d..71f5bd7f6843c 100644 --- a/compiler/testData/debug/stepping/tryCatch.kt +++ b/compiler/testData/debug/stepping/tryCatch.kt @@ -44,11 +44,14 @@ fun box() { // EXPECTATIONS WASM // test.kt:14 $box (8, 4) -// test.kt:6 $foo (12, 12, 31, 31, 25) -// test.kt:10 $foo (4, 4, 4, 4, 4, 4, 4, 4, 4, 4) -// test.kt:11 $foo (1, 1) +// test.kt:6 $foo (12) +// test.kt:10 $foo (4) +// test.kt:11 $foo (1) // test.kt:15 $box (8, 4) -// test.kt:5 $foo (4, 4) -// test.kt:7 $foo (27, 27, 13) -// test.kt:8 $foo (8, 8, 8) -// test.kt:16 $box +// test.kt:6 $foo (12, 31, 25) +// test.kt:5 $foo (4) +// test.kt:7 $foo (27, 13) +// test.kt:8 $foo (8) +// test.kt:10 $foo (4) +// test.kt:11 $foo (1) +// test.kt:16 $box (1) diff --git a/compiler/testData/debug/stepping/tryCatchExpression.kt b/compiler/testData/debug/stepping/tryCatchExpression.kt index d2a48a132c607..7195ed7bd92ad 100644 --- a/compiler/testData/debug/stepping/tryCatchExpression.kt +++ b/compiler/testData/debug/stepping/tryCatchExpression.kt @@ -156,29 +156,45 @@ fun box() { // test.kt:49 box // EXPECTATIONS WASM -// test.kt:42 $box -// test.kt:6 $foo (8, 8, 8, 8) -// test.kt:29 $mightThrow (8, 8, 8, 8, 22, 22, 16) -// test.kt:30 $mightThrow (1, 1, 1) -// test.kt:12 $foo (8, 8, 8) -// test.kt:33 $mightThrow2 (8, 8, 8, 22, 22, 16) -// test.kt:34 $mightThrow2 (1, 1) -// test.kt:11 $foo (4, 4) -// test.kt:18 $foo (8, 8) -// test.kt:37 $mightThrow3 (8, 8, 22, 22, 16) +// test.kt:42 $box (4) +// test.kt:6 $foo (8) +// test.kt:29 $mightThrow (8) +// test.kt:30 $mightThrow (1) +// test.kt:12 $foo (8) +// test.kt:33 $mightThrow2 (8) +// test.kt:34 $mightThrow2 (1) +// test.kt:11 $foo (4) +// test.kt:18 $foo (8) +// test.kt:37 $mightThrow3 (8) // test.kt:38 $mightThrow3 (11, 4) -// test.kt:17 $foo -// test.kt:22 $foo +// test.kt:17 $foo (4) +// test.kt:22 $foo (1) // test.kt:43 $box (13, 4) -// test.kt:44 $box -// test.kt:19 $foo -// test.kt:20 $foo +// test.kt:44 $box (4) +// test.kt:6 $foo (8) +// test.kt:29 $mightThrow (8) +// test.kt:30 $mightThrow (1) +// test.kt:12 $foo (8) +// test.kt:33 $mightThrow2 (8) +// test.kt:34 $mightThrow2 (1) +// test.kt:11 $foo (4) +// test.kt:18 $foo (8) +// test.kt:37 $mightThrow3 (8, 22, 16) +// test.kt:19 $foo (13) +// test.kt:20 $foo (8) // test.kt:45 $box (13, 4) -// test.kt:46 $box -// test.kt:13 $foo -// test.kt:14 $foo +// test.kt:46 $box (4) +// test.kt:6 $foo (8) +// test.kt:29 $mightThrow (8) +// test.kt:30 $mightThrow (1) +// test.kt:12 $foo (8) +// test.kt:33 $mightThrow2 (8, 22, 16) +// test.kt:13 $foo (13) +// test.kt:14 $foo (8) // test.kt:47 $box (13, 4) -// test.kt:48 $box -// test.kt:7 $foo -// test.kt:8 $foo -// test.kt:49 $box +// test.kt:48 $box (4) +// test.kt:6 $foo (8) +// test.kt:29 $mightThrow (8, 22, 16) +// test.kt:7 $foo (13) +// test.kt:8 $foo (8) +// test.kt:49 $box (1) diff --git a/compiler/testData/debug/stepping/tryCatchFinally.kt b/compiler/testData/debug/stepping/tryCatchFinally.kt index 343ec9b8bab0c..da8095bb552d6 100644 --- a/compiler/testData/debug/stepping/tryCatchFinally.kt +++ b/compiler/testData/debug/stepping/tryCatchFinally.kt @@ -131,32 +131,69 @@ fun box() { // test.kt:39 box // EXPECTATIONS WASM -// test.kt:34 $box -// test.kt:6 $foo (8, 8, 8) -// test.kt:26 $mightThrow (8, 8, 8, 22, 22, 16) -// test.kt:27 $mightThrow (1, 1) +// test.kt:34 $box (4) +// test.kt:6 $foo (8) +// test.kt:26 $mightThrow (8) +// test.kt:27 $mightThrow (1) // EXPECTATIONS FIR WASM -// test.kt:5 $foo (4, 4, 4, 4, 4, 4) -// test.kt:10 $foo (8, 8, 8, 8, 8, 8) +// test.kt:5 $foo (4) +// test.kt:10 $foo (8) // EXPECTATIONS ClassicFrontend WASM -// test.kt:5 $foo (4, 4, 4) -// test.kt:10 $foo (8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8) +// test.kt:5 $foo (4) +// test.kt:10 $foo (8) + +// EXPECTATIONS FIR WASM +// test.kt:5 $foo (4) // EXPECTATIONS WASM -// test.kt:14 $foo (8, 8, 8) -// test.kt:30 $mightThrow2 (8, 8, 22, 22, 16, 8, 22, 22, 16) -// test.kt:31 $mightThrow2 -// test.kt:13 $foo (12, 12, 4, 12, 12, 4, 12, 12, 4) -// test.kt:18 $foo (8, 8, 8, 8, 8, 8) -// test.kt:20 $foo (1, 1, 1) +// test.kt:14 $foo (8) +// test.kt:30 $mightThrow2 (8) +// test.kt:31 $mightThrow2 (1) +// test.kt:13 $foo (12) +// test.kt:18 $foo (8) +// test.kt:13 $foo (12, 4) +// test.kt:20 $foo (1) // test.kt:35 $box (13, 4) -// test.kt:36 $box -// test.kt:15 $foo (13, 13) -// test.kt:16 $foo (8, 8, 8, 8, 8, 8, 8, 8) +// test.kt:36 $box (4) +// test.kt:6 $foo (8) +// test.kt:26 $mightThrow (8) +// test.kt:27 $mightThrow (1) +// test.kt:5 $foo (4) +// test.kt:10 $foo (8) + +// EXPECTATIONS FIR WASM +// test.kt:5 $foo (4) + +// EXPECTATIONS WASM +// test.kt:14 $foo (8) +// test.kt:30 $mightThrow2 (8, 22, 16) +// test.kt:15 $foo (13) +// test.kt:16 $foo (8) +// test.kt:13 $foo (12) +// test.kt:18 $foo (8) +// test.kt:13 $foo (12, 4) +// test.kt:20 $foo (1) // test.kt:37 $box (13, 4) -// test.kt:38 $box -// test.kt:7 $foo -// test.kt:8 $foo (8, 8, 8, 8) -// test.kt:39 $box +// test.kt:38 $box (4) +// test.kt:6 $foo (8) +// test.kt:26 $mightThrow (8, 22, 16) +// test.kt:7 $foo (13) +// test.kt:8 $foo (8) +// test.kt:5 $foo (4) +// test.kt:10 $foo (8) + +// EXPECTATIONS FIR WASM +// test.kt:5 $foo (4) + +// EXPECTATIONS WASM +// test.kt:14 $foo (8) +// test.kt:30 $mightThrow2 (8, 22, 16) +// test.kt:15 $foo (13) +// test.kt:16 $foo (8) +// test.kt:13 $foo (12) +// test.kt:18 $foo (8) +// test.kt:13 $foo (12, 4) +// test.kt:20 $foo (1) +// test.kt:39 $box (1) diff --git a/compiler/testData/debug/stepping/tryFinally.kt b/compiler/testData/debug/stepping/tryFinally.kt index e64337e540d35..b703f4ca078dd 100644 --- a/compiler/testData/debug/stepping/tryFinally.kt +++ b/compiler/testData/debug/stepping/tryFinally.kt @@ -84,17 +84,27 @@ fun box() { // test.kt:26 mightThrow2 // EXPECTATIONS WASM -// test.kt:30 $box -// test.kt:6 $foo (8, 8) -// test.kt:22 $mightThrow (8, 8) -// test.kt:23 $mightThrow (1, 1) -// test.kt:5 $foo (4, 4) -// test.kt:8 $foo (8, 8, 8, 8, 8, 8, 8, 8, 8, 8) -// test.kt:12 $foo (8, 8) -// test.kt:26 $mightThrow2 (8, 8, 22, 22, 16) -// test.kt:27 $mightThrow2 -// test.kt:11 $foo (12, 4, 12) -// test.kt:14 $foo (8, 8, 8, 8, 8, 8) -// test.kt:16 $foo +// test.kt:30 $box (4) +// test.kt:6 $foo (8) +// test.kt:22 $mightThrow (8) +// test.kt:23 $mightThrow (1) +// test.kt:5 $foo (4) +// test.kt:8 $foo (8) +// test.kt:12 $foo (8) +// test.kt:26 $mightThrow2 (8) +// test.kt:27 $mightThrow2 (1) +// test.kt:11 $foo (12) +// test.kt:14 $foo (8) +// test.kt:11 $foo (4) +// test.kt:16 $foo (1) // test.kt:31 $box (13, 4) -// test.kt:32 $box +// test.kt:32 $box (4) +// test.kt:6 $foo (8) +// test.kt:22 $mightThrow (8) +// test.kt:23 $mightThrow (1) +// test.kt:5 $foo (4) +// test.kt:8 $foo (8) +// test.kt:12 $foo (8) +// test.kt:26 $mightThrow2 (8, 22, 16) +// test.kt:14 $foo (8) +// test.kt:11 $foo (12) diff --git a/compiler/testData/debug/stepping/variablesWithoutInitializer.kt b/compiler/testData/debug/stepping/variablesWithoutInitializer.kt index cc888b4cd2295..3025e9a2c3bc8 100644 --- a/compiler/testData/debug/stepping/variablesWithoutInitializer.kt +++ b/compiler/testData/debug/stepping/variablesWithoutInitializer.kt @@ -34,4 +34,4 @@ fun box() { // test.kt:9 $box (8, 4) // test.kt:10 $box (9, 8) // test.kt:11 $box (12, 14, 8) -// test.kt:13 $box +// test.kt:13 $box (1) diff --git a/compiler/testData/debug/stepping/voidLambdaStepInline.kt b/compiler/testData/debug/stepping/voidLambdaStepInline.kt index 6d808e3adea1e..7d07a2a1e0f12 100644 --- a/compiler/testData/debug/stepping/voidLambdaStepInline.kt +++ b/compiler/testData/debug/stepping/voidLambdaStepInline.kt @@ -22,7 +22,7 @@ fun box(): String { // test.kt:9 box // EXPECTATIONS WASM -// test.kt:5 $box (4, 10, 10, 19) -// test.kt:6 $box -// test.kt:7 $box (8, 8, 17) -// test.kt:9 $box (11, 11, 11, 11, 4) +// test.kt:5 $box (4, 10, 19) +// test.kt:6 $box (4) +// test.kt:7 $box (8, 17) +// test.kt:9 $box (11, 4) diff --git a/compiler/testData/debug/stepping/when.kt b/compiler/testData/debug/stepping/when.kt index 04c91816196fc..9ee04f50e1b1b 100644 --- a/compiler/testData/debug/stepping/when.kt +++ b/compiler/testData/debug/stepping/when.kt @@ -115,12 +115,43 @@ fun box() { // EXPECTATIONS WASM // test.kt:19 $box (8, 4) -// test.kt:6 $foo (8, 23, 19, 8, 8, 8, 8, 8, 8) -// test.kt:7 $foo (23, 19, 23, 19) -// test.kt:8 $foo (16, 16, 16, 16) -// test.kt:12 $foo (8, 8, 8, 8, 23, 19, 8, 8, 8) -// test.kt:14 $foo (16, 16, 16, 16, 16, 16, 16, 16) -// test.kt:11 $foo (4, 4, 4, 4, 4, 4, 4) -// test.kt:16 $foo (1, 1, 1, 1, 1, 1, 1) -// test.kt:13 $foo (23, 19, 23, 19) -// test.kt:20 $box +// test.kt:6 $foo (8, 23, 19, 8) +// test.kt:7 $foo (23, 19) +// test.kt:6 $foo (8) +// test.kt:8 $foo (16) +// test.kt:12 $foo (8) +// test.kt:14 $foo (16) +// test.kt:11 $foo (4) +// test.kt:16 $foo (1) +// test.kt:12 $foo (8) +// test.kt:13 $foo (23, 19) +// test.kt:6 $foo (8) +// test.kt:8 $foo (16) +// test.kt:12 $foo (8) +// test.kt:14 $foo (16) +// test.kt:11 $foo (4) +// test.kt:16 $foo (1) +// test.kt:11 $foo (4) +// test.kt:16 $foo (1) +// test.kt:12 $foo (8, 23, 19) +// test.kt:6 $foo (8) +// test.kt:7 $foo (23, 19) +// test.kt:6 $foo (8) +// test.kt:8 $foo (16) +// test.kt:12 $foo (8) +// test.kt:14 $foo (16) +// test.kt:11 $foo (4) +// test.kt:16 $foo (1) +// test.kt:12 $foo (8) +// test.kt:13 $foo (23, 19) +// test.kt:6 $foo (8) +// test.kt:8 $foo (16) +// test.kt:12 $foo (8) +// test.kt:14 $foo (16) +// test.kt:11 $foo (4) +// test.kt:16 $foo (1) +// test.kt:11 $foo (4) +// test.kt:16 $foo (1) +// test.kt:11 $foo (4) +// test.kt:16 $foo (1) +// test.kt:20 $box (1) diff --git a/compiler/testData/debug/stepping/whenComplicatedSubject.kt b/compiler/testData/debug/stepping/whenComplicatedSubject.kt index ab3fa62bc008a..3055285892d7e 100644 --- a/compiler/testData/debug/stepping/whenComplicatedSubject.kt +++ b/compiler/testData/debug/stepping/whenComplicatedSubject.kt @@ -56,12 +56,19 @@ fun box() { // EXPECTATIONS WASM // test.kt:17 $box (8, 4) -// test.kt:7 $foo (13, 23, 13, 13) -// test.kt:11 $foo (7, 7, 7, 7, 7, 7, 7, 7, 7, 12) -// test.kt:12 $foo (7, 7, 7, 12, 7, 7, 7) -// test.kt:14 $foo (1, 1, 1) +// test.kt:7 $foo (13, 23) +// test.kt:11 $foo (7) +// test.kt:12 $foo (7, 12) +// test.kt:14 $foo (1) // test.kt:18 $box (8, 4) -// test.kt:8 $foo +// test.kt:7 $foo (13) +// test.kt:8 $foo (23) +// test.kt:11 $foo (7) +// test.kt:12 $foo (7) +// test.kt:14 $foo (1) // test.kt:19 $box (8, 4) -// test.kt:9 $foo -// test.kt:20 $box +// test.kt:7 $foo (13) +// test.kt:9 $foo (21) +// test.kt:11 $foo (7, 12) +// test.kt:14 $foo (1) +// test.kt:20 $box (1) diff --git a/compiler/testData/debug/stepping/whenConstant.kt b/compiler/testData/debug/stepping/whenConstant.kt index c2b1254b636aa..662ff4777303f 100644 --- a/compiler/testData/debug/stepping/whenConstant.kt +++ b/compiler/testData/debug/stepping/whenConstant.kt @@ -24,7 +24,7 @@ fun box() { // test.kt:13 box // EXPECTATIONS WASM -// test.kt:5 $box -// test.kt:6 $box -// test.kt:11 $box (12, 12, 12, 12) -// test.kt:13 $box +// test.kt:5 $box (10) +// test.kt:6 $box (8) +// test.kt:11 $box (12) +// test.kt:13 $box (1) diff --git a/compiler/testData/debug/stepping/whenExpr.kt b/compiler/testData/debug/stepping/whenExpr.kt index 9e42c621a28a9..d6ec66ef60b48 100644 --- a/compiler/testData/debug/stepping/whenExpr.kt +++ b/compiler/testData/debug/stepping/whenExpr.kt @@ -30,9 +30,9 @@ fun box() { // test.kt:17 box // EXPECTATIONS WASM -// test.kt:5 $box (18, 18) -// test.kt:6 $box -// test.kt:7 $box -// test.kt:10 $box -// test.kt:14 $box -// test.kt:17 $box +// test.kt:5 $box (18) +// test.kt:6 $box (10) +// test.kt:7 $box (8) +// test.kt:10 $box (8) +// test.kt:14 $box (12) +// test.kt:17 $box (1) diff --git a/compiler/testData/debug/stepping/whenInConjunction.kt b/compiler/testData/debug/stepping/whenInConjunction.kt index 97dbb322452e7..88f6056590053 100644 --- a/compiler/testData/debug/stepping/whenInConjunction.kt +++ b/compiler/testData/debug/stepping/whenInConjunction.kt @@ -43,11 +43,11 @@ fun box() { // test.kt:19 box // EXPECTATIONS WASM -// test.kt:18 $box (8, 8, 4) -// test.kt:5 $foo (8, 10, 10, 10, 20, 8, 31) -// test.kt:6 $foo (12, 12, 24) -// test.kt:10 $foo -// test.kt:11 $foo (12, 12, 24) -// test.kt:13 $foo (13, 15, 15, 15, 25, 13) -// test.kt:15 $foo -// test.kt:19 $box +// test.kt:18 $box (8, 4) +// test.kt:5 $foo (8, 10, 20, 8, 31) +// test.kt:6 $foo (12, 24) +// test.kt:10 $foo (14) +// test.kt:11 $foo (12, 24) +// test.kt:13 $foo (13, 15, 25, 13) +// test.kt:15 $foo (1) +// test.kt:19 $box (1) diff --git a/compiler/testData/debug/stepping/whenInDisjunction.kt b/compiler/testData/debug/stepping/whenInDisjunction.kt index 4b5a0f3cbc500..08680bcaf9a66 100644 --- a/compiler/testData/debug/stepping/whenInDisjunction.kt +++ b/compiler/testData/debug/stepping/whenInDisjunction.kt @@ -43,11 +43,11 @@ fun box() { // test.kt:19 box // EXPECTATIONS WASM -// test.kt:18 $box (8, 8, 4) -// test.kt:5 $foo (8, 10, 10, 10, 20, 8, 31) -// test.kt:6 $foo (12, 12, 24) -// test.kt:10 $foo -// test.kt:11 $foo (12, 12, 24) -// test.kt:13 $foo (13, 15, 15, 15, 25, 13) -// test.kt:15 $foo -// test.kt:19 $box +// test.kt:18 $box (8, 4) +// test.kt:5 $foo (8, 10, 20, 8, 31) +// test.kt:6 $foo (12, 24) +// test.kt:10 $foo (14) +// test.kt:11 $foo (12, 24) +// test.kt:13 $foo (13, 15, 25, 13) +// test.kt:15 $foo (1) +// test.kt:19 $box (1) diff --git a/compiler/testData/debug/stepping/whenInGeneralObjectComparison.kt b/compiler/testData/debug/stepping/whenInGeneralObjectComparison.kt index 539cd2156316b..caf1ba8aab225 100644 --- a/compiler/testData/debug/stepping/whenInGeneralObjectComparison.kt +++ b/compiler/testData/debug/stepping/whenInGeneralObjectComparison.kt @@ -65,16 +65,22 @@ fun box() { // test.kt:29 box // EXPECTATIONS WASM -// test.kt:28 $box (8, 8, 11, 4) -// test.kt:5 $foo (8, 23, 8, 8, 8, 8) -// test.kt:6 $foo (12, 12, 22) -// test.kt:10 $foo (14, 8, 8, 8, 8, 8) -// test.kt:11 $foo (12, 12, 22) -// test.kt:13 $foo -// test.kt:15 $foo (8, 23, 8, 8, 8, 8, 8) -// test.kt:16 $foo (12, 12, 22) -// test.kt:20 $foo (14, 8, 8, 8, 8, 8, 8) -// test.kt:21 $foo (12, 12, 22) -// test.kt:23 $foo -// test.kt:25 $foo -// test.kt:29 $box +// test.kt:28 $box (8, 11, 4) +// test.kt:5 $foo (8, 23) +// test.kt:6 $foo (12, 22) +// test.kt:5 $foo (8) +// test.kt:10 $foo (14) +// test.kt:11 $foo (12, 22) +// test.kt:10 $foo (8) +// test.kt:13 $foo (13) +// test.kt:10 $foo (8) +// test.kt:15 $foo (8, 23) +// test.kt:16 $foo (12, 22) +// test.kt:15 $foo (8) +// test.kt:20 $foo (14) +// test.kt:21 $foo (12, 22) +// test.kt:20 $foo (8) +// test.kt:23 $foo (13) +// test.kt:20 $foo (8) +// test.kt:25 $foo (1) +// test.kt:29 $box (1) diff --git a/compiler/testData/debug/stepping/whenInNegation.kt b/compiler/testData/debug/stepping/whenInNegation.kt index eead6b4cb0972..1af943213a736 100644 --- a/compiler/testData/debug/stepping/whenInNegation.kt +++ b/compiler/testData/debug/stepping/whenInNegation.kt @@ -29,8 +29,9 @@ fun box() { // test.kt:14 box // EXPECTATIONS WASM -// test.kt:13 $box (8, 8, 4) -// test.kt:5 $foo (15, 8) -// test.kt:6 $foo (12, 12, 24) -// test.kt:10 $foo -// test.kt:14 $box +// test.kt:13 $box (8, 4) +// test.kt:5 $foo (15) +// test.kt:6 $foo (12, 24) +// test.kt:5 $foo (8) +// test.kt:10 $foo (1) +// test.kt:14 $box (1) diff --git a/compiler/testData/debug/stepping/whenInNullComparison.kt b/compiler/testData/debug/stepping/whenInNullComparison.kt index aca12e121d144..6470d794fe32e 100644 --- a/compiler/testData/debug/stepping/whenInNullComparison.kt +++ b/compiler/testData/debug/stepping/whenInNullComparison.kt @@ -39,10 +39,11 @@ fun box() { // test.kt:19 box // EXPECTATIONS WASM -// test.kt:18 $box (8, 8, 4) -// test.kt:5 $foo +// test.kt:18 $box (8, 4) +// test.kt:5 $foo (14) // test.kt:6 $foo (12, 24) -// test.kt:10 $foo (14, 8) +// test.kt:10 $foo (14) // test.kt:11 $foo (12, 24) -// test.kt:15 $foo -// test.kt:19 $box +// test.kt:10 $foo (8) +// test.kt:15 $foo (1) +// test.kt:19 $box (1) diff --git a/compiler/testData/debug/stepping/whenInPrimitiveToObjectComparison.kt b/compiler/testData/debug/stepping/whenInPrimitiveToObjectComparison.kt index ba002bd1e8759..ef45ce1039aea 100644 --- a/compiler/testData/debug/stepping/whenInPrimitiveToObjectComparison.kt +++ b/compiler/testData/debug/stepping/whenInPrimitiveToObjectComparison.kt @@ -41,10 +41,12 @@ fun box() { // test.kt:19 box // EXPECTATIONS WASM -// test.kt:18 $box (8, 8, 4) -// test.kt:5 $foo (8, 8, 19, 8) -// test.kt:6 $foo (12, 12, 22) -// test.kt:10 $foo (8, 8, 19, 8, 8) -// test.kt:11 $foo (12, 12, 22) -// test.kt:15 $foo -// test.kt:19 $box +// test.kt:18 $box (8, 4) +// test.kt:5 $foo (8, 19) +// test.kt:6 $foo (12, 22) +// test.kt:5 $foo (8) +// test.kt:10 $foo (8, 19) +// test.kt:11 $foo (12, 22) +// test.kt:10 $foo (8) +// test.kt:15 $foo (1) +// test.kt:19 $box (1) diff --git a/compiler/testData/debug/stepping/whenInZeroComparison.kt b/compiler/testData/debug/stepping/whenInZeroComparison.kt index 8256d9ceea67d..c9c30c28226e0 100644 --- a/compiler/testData/debug/stepping/whenInZeroComparison.kt +++ b/compiler/testData/debug/stepping/whenInZeroComparison.kt @@ -29,9 +29,10 @@ fun box() { // test.kt:14 box // EXPECTATIONS WASM -// test.kt:13 $box (8, 8, 4) -// test.kt:5 $foo (14, 8) -// test.kt:6 $foo (12, 12, 24) -// test.kt:8 $foo -// test.kt:10 $foo -// test.kt:14 $box +// test.kt:13 $box (8, 4) +// test.kt:5 $foo (14) +// test.kt:6 $foo (12, 24) +// test.kt:8 $foo (13) +// test.kt:5 $foo (8) +// test.kt:10 $foo (1) +// test.kt:14 $box (1) diff --git a/compiler/testData/debug/stepping/whenIsChecks.kt b/compiler/testData/debug/stepping/whenIsChecks.kt index c27ffa0eedfb3..336f83b7e105f 100644 --- a/compiler/testData/debug/stepping/whenIsChecks.kt +++ b/compiler/testData/debug/stepping/whenIsChecks.kt @@ -63,14 +63,21 @@ fun box() { // test.kt:19 box // EXPECTATIONS WASM -// test.kt:16 $box (8, 8, 4) -// test.kt:5 $foo (10, 10, 10) -// test.kt:6 $foo (8, 8, 8, 8, 8, 8) -// test.kt:7 $foo -// test.kt:13 $foo (1, 1, 1) -// test.kt:17 $box (8, 8, 4) -// test.kt:8 $foo (8, 8, 8, 8) -// test.kt:9 $foo -// test.kt:18 $box (8, 8, 4) -// test.kt:11 $foo -// test.kt:19 $box +// test.kt:16 $box (8, 4) +// test.kt:5 $foo (10) +// test.kt:6 $foo (8) +// test.kt:7 $foo (12) +// test.kt:13 $foo (1) +// test.kt:17 $box (8, 4) +// test.kt:5 $foo (10) +// test.kt:6 $foo (8) +// test.kt:8 $foo (8) +// test.kt:9 $foo (12) +// test.kt:13 $foo (1) +// test.kt:18 $box (8, 4) +// test.kt:5 $foo (10) +// test.kt:6 $foo (8) +// test.kt:8 $foo (8) +// test.kt:11 $foo (12) +// test.kt:13 $foo (1) +// test.kt:19 $box (1) diff --git a/compiler/testData/debug/stepping/whenMultiLine.kt b/compiler/testData/debug/stepping/whenMultiLine.kt index 2f455fa9fbdbb..5114e1b2c583d 100644 --- a/compiler/testData/debug/stepping/whenMultiLine.kt +++ b/compiler/testData/debug/stepping/whenMultiLine.kt @@ -75,16 +75,24 @@ fun box() { // test.kt:30 box // EXPECTATIONS WASM -// test.kt:27 $box (8, 4, 4) -// test.kt:6 $foo (8, 8, 8) -// test.kt:7 $foo -// test.kt:15 $foo (8, 8, 8) -// test.kt:16 $foo -// test.kt:23 $foo (11, 4, 11, 4, 11, 4) -// test.kt:28 $box (8, 4, 4) -// test.kt:9 $foo -// test.kt:18 $foo +// test.kt:27 $box (8, 4) +// test.kt:6 $foo (8) +// test.kt:7 $foo (12) +// test.kt:15 $foo (8) +// test.kt:16 $foo (12) +// test.kt:23 $foo (11, 4) +// test.kt:27 $box (4) +// test.kt:28 $box (8, 4) +// test.kt:6 $foo (8) +// test.kt:9 $foo (12) +// test.kt:15 $foo (8) +// test.kt:18 $foo (12) +// test.kt:23 $foo (11, 4) +// test.kt:28 $box (4) // test.kt:29 $box (8, 4) -// test.kt:11 $foo -// test.kt:20 $foo -// test.kt:30 $box +// test.kt:6 $foo (8) +// test.kt:11 $foo (12) +// test.kt:15 $foo (8) +// test.kt:20 $foo (12) +// test.kt:23 $foo (11, 4) +// test.kt:30 $box (1) diff --git a/compiler/testData/debug/stepping/whenMultiLineSubject.kt b/compiler/testData/debug/stepping/whenMultiLineSubject.kt index 96e6f68699869..e56abdedf8015 100644 --- a/compiler/testData/debug/stepping/whenMultiLineSubject.kt +++ b/compiler/testData/debug/stepping/whenMultiLineSubject.kt @@ -75,18 +75,30 @@ fun box() { // test.kt:30 box // EXPECTATIONS WASM -// test.kt:27 $box (8, 4, 4) -// test.kt:5 $foo (10, 10, 10) -// test.kt:6 $foo (8, 8, 8) -// test.kt:7 $foo -// test.kt:14 $foo (18, 18, 18) -// test.kt:15 $foo (8, 8, 8) -// test.kt:16 $foo -// test.kt:23 $foo (11, 4, 11, 4, 11, 4) -// test.kt:28 $box (8, 4, 4) -// test.kt:9 $foo -// test.kt:18 $foo +// test.kt:27 $box (8, 4) +// test.kt:5 $foo (10) +// test.kt:6 $foo (8) +// test.kt:7 $foo (12) +// test.kt:14 $foo (18) +// test.kt:15 $foo (8) +// test.kt:16 $foo (12) +// test.kt:23 $foo (11, 4) +// test.kt:27 $box (4) +// test.kt:28 $box (8, 4) +// test.kt:5 $foo (10) +// test.kt:6 $foo (8) +// test.kt:9 $foo (12) +// test.kt:14 $foo (18) +// test.kt:15 $foo (8) +// test.kt:18 $foo (12) +// test.kt:23 $foo (11, 4) +// test.kt:28 $box (4) // test.kt:29 $box (8, 4) -// test.kt:11 $foo -// test.kt:20 $foo -// test.kt:30 $box +// test.kt:5 $foo (10) +// test.kt:6 $foo (8) +// test.kt:11 $foo (12) +// test.kt:14 $foo (18) +// test.kt:15 $foo (8) +// test.kt:20 $foo (12) +// test.kt:23 $foo (11, 4) +// test.kt:30 $box (1) diff --git a/compiler/testData/debug/stepping/whenNullalbeSubject.kt b/compiler/testData/debug/stepping/whenNullalbeSubject.kt index 8619c31670c3e..36069f18325cd 100644 --- a/compiler/testData/debug/stepping/whenNullalbeSubject.kt +++ b/compiler/testData/debug/stepping/whenNullalbeSubject.kt @@ -30,9 +30,9 @@ fun box() { // test.kt:17 box // EXPECTATIONS WASM -// test.kt:5 $box (18, 18) -// test.kt:6 $box -// test.kt:7 $box -// test.kt:10 $box -// test.kt:14 $box -// test.kt:17 $box +// test.kt:5 $box (18) +// test.kt:6 $box (10) +// test.kt:7 $box (8) +// test.kt:10 $box (8) +// test.kt:14 $box (12) +// test.kt:17 $box (1) diff --git a/compiler/testData/debug/stepping/whenSubject.kt b/compiler/testData/debug/stepping/whenSubject.kt index 4dfa58bf16cc6..c9908324a02ba 100644 --- a/compiler/testData/debug/stepping/whenSubject.kt +++ b/compiler/testData/debug/stepping/whenSubject.kt @@ -115,13 +115,58 @@ fun box() { // EXPECTATIONS WASM // test.kt:19 $box (8, 4) -// test.kt:5 $foo (10, 10, 10, 10, 10, 10, 10) -// test.kt:6 $foo (8, 18, 14, 8, 8, 8, 8, 8, 8) -// test.kt:7 $foo (18, 14, 18, 14) -// test.kt:8 $foo (16, 16, 16, 16) -// test.kt:11 $foo (18, 4, 18, 18, 4, 4, 18, 18, 4, 18, 18, 4, 4, 4) -// test.kt:12 $foo (8, 8, 8, 8, 18, 14, 8, 8, 8) -// test.kt:14 $foo (16, 16, 16, 16, 16, 16, 16, 16) -// test.kt:16 $foo (1, 1, 1, 1, 1, 1, 1) -// test.kt:13 $foo (18, 14, 18, 14) -// test.kt:20 $box +// test.kt:5 $foo (10) +// test.kt:6 $foo (8, 18, 14) +// test.kt:5 $foo (10) +// test.kt:6 $foo (8) +// test.kt:7 $foo (18, 14) +// test.kt:5 $foo (10) +// test.kt:6 $foo (8) +// test.kt:8 $foo (16) +// test.kt:11 $foo (18) +// test.kt:12 $foo (8) +// test.kt:14 $foo (16) +// test.kt:11 $foo (4) +// test.kt:16 $foo (1) +// test.kt:11 $foo (18) +// test.kt:12 $foo (8) +// test.kt:13 $foo (18, 14) +// test.kt:5 $foo (10) +// test.kt:6 $foo (8) +// test.kt:8 $foo (16) +// test.kt:11 $foo (18) +// test.kt:12 $foo (8) +// test.kt:14 $foo (16) +// test.kt:11 $foo (4) +// test.kt:16 $foo (1) +// test.kt:11 $foo (4) +// test.kt:16 $foo (1) +// test.kt:11 $foo (18) +// test.kt:12 $foo (8, 18, 14) +// test.kt:5 $foo (10) +// test.kt:6 $foo (8) +// test.kt:7 $foo (18, 14) +// test.kt:5 $foo (10) +// test.kt:6 $foo (8) +// test.kt:8 $foo (16) +// test.kt:11 $foo (18) +// test.kt:12 $foo (8) +// test.kt:14 $foo (16) +// test.kt:11 $foo (4) +// test.kt:16 $foo (1) +// test.kt:11 $foo (18) +// test.kt:12 $foo (8) +// test.kt:13 $foo (18, 14) +// test.kt:5 $foo (10) +// test.kt:6 $foo (8) +// test.kt:8 $foo (16) +// test.kt:11 $foo (18) +// test.kt:12 $foo (8) +// test.kt:14 $foo (16) +// test.kt:11 $foo (4) +// test.kt:16 $foo (1) +// test.kt:11 $foo (4) +// test.kt:16 $foo (1) +// test.kt:11 $foo (4) +// test.kt:16 $foo (1) +// test.kt:20 $box (1) diff --git a/compiler/testData/debug/stepping/whenSubject2.kt b/compiler/testData/debug/stepping/whenSubject2.kt index ecdba7cb0a965..3c7e4480c20e3 100644 --- a/compiler/testData/debug/stepping/whenSubject2.kt +++ b/compiler/testData/debug/stepping/whenSubject2.kt @@ -133,14 +133,58 @@ fun box() { // EXPECTATIONS WASM // test.kt:23 $box (8, 4) -// test.kt:6 $foo (9, 9, 9, 9, 9, 9, 9) -// test.kt:8 $foo (8, 18, 14, 8, 8, 8, 8, 8, 8) -// test.kt:9 $foo (18, 14, 18, 14) -// test.kt:10 $foo (16, 16, 16, 16) -// test.kt:14 $foo (9, 9, 9, 9, 9, 9, 9) -// test.kt:16 $foo (8, 8, 8, 8, 18, 14, 8, 8, 8) -// test.kt:18 $foo (16, 16, 16, 16, 16, 16, 16, 16) -// test.kt:13 $foo (4, 4, 4, 4, 4, 4, 4) -// test.kt:20 $foo (1, 1, 1, 1, 1, 1, 1) -// test.kt:17 $foo (18, 14, 18, 14) -// test.kt:24 $box +// test.kt:6 $foo (9) +// test.kt:8 $foo (8, 18, 14) +// test.kt:6 $foo (9) +// test.kt:8 $foo (8) +// test.kt:9 $foo (18, 14) +// test.kt:6 $foo (9) +// test.kt:8 $foo (8) +// test.kt:10 $foo (16) +// test.kt:14 $foo (9) +// test.kt:16 $foo (8) +// test.kt:18 $foo (16) +// test.kt:13 $foo (4) +// test.kt:20 $foo (1) +// test.kt:14 $foo (9) +// test.kt:16 $foo (8) +// test.kt:17 $foo (18, 14) +// test.kt:6 $foo (9) +// test.kt:8 $foo (8) +// test.kt:10 $foo (16) +// test.kt:14 $foo (9) +// test.kt:16 $foo (8) +// test.kt:18 $foo (16) +// test.kt:13 $foo (4) +// test.kt:20 $foo (1) +// test.kt:13 $foo (4) +// test.kt:20 $foo (1) +// test.kt:14 $foo (9) +// test.kt:16 $foo (8, 18, 14) +// test.kt:6 $foo (9) +// test.kt:8 $foo (8) +// test.kt:9 $foo (18, 14) +// test.kt:6 $foo (9) +// test.kt:8 $foo (8) +// test.kt:10 $foo (16) +// test.kt:14 $foo (9) +// test.kt:16 $foo (8) +// test.kt:18 $foo (16) +// test.kt:13 $foo (4) +// test.kt:20 $foo (1) +// test.kt:14 $foo (9) +// test.kt:16 $foo (8) +// test.kt:17 $foo (18, 14) +// test.kt:6 $foo (9) +// test.kt:8 $foo (8) +// test.kt:10 $foo (16) +// test.kt:14 $foo (9) +// test.kt:16 $foo (8) +// test.kt:18 $foo (16) +// test.kt:13 $foo (4) +// test.kt:20 $foo (1) +// test.kt:13 $foo (4) +// test.kt:20 $foo (1) +// test.kt:13 $foo (4) +// test.kt:20 $foo (1) +// test.kt:24 $box (1) diff --git a/compiler/testData/debug/stepping/whenWithInlineInCondition.kt b/compiler/testData/debug/stepping/whenWithInlineInCondition.kt index d12215f34449e..683b5b79e3f45 100644 --- a/compiler/testData/debug/stepping/whenWithInlineInCondition.kt +++ b/compiler/testData/debug/stepping/whenWithInlineInCondition.kt @@ -80,19 +80,33 @@ fun nop() {} // test.kt:18 box // EXPECTATIONS WASM -// test.kt:4 $box +// test.kt:4 $box (12) // test.kt:20 $value (19, 20) -// test.kt:5 $box -// test.kt:6 $box (8, 8) -// test.kt:21 $box (23, 24, 23, 24, 23, 24) -// test.kt:7 $box (8, 8) -// test.kt:22 $box (23, 24, 23, 24, 23, 24) -// test.kt:8 $box (8, 8, 16) +// test.kt:5 $box (10) +// test.kt:6 $box (8) +// test.kt:21 $box (23, 24) +// test.kt:6 $box (8) +// test.kt:7 $box (8) +// test.kt:22 $box (23, 24) +// test.kt:7 $box (8) +// test.kt:8 $box (8) // test.kt:23 $box (23, 24) -// test.kt:29 $nop (12, 12) -// test.kt:13 $box (10, 17, 10) -// test.kt:14 $box (8, 13, 8) +// test.kt:8 $box (8, 16) +// test.kt:29 $nop (12) +// test.kt:13 $box (10) +// test.kt:21 $box (23, 24) +// test.kt:13 $box (17) +// test.kt:22 $box (23, 24) +// test.kt:13 $box (10) +// test.kt:14 $box (8) +// test.kt:21 $box (23, 24) +// test.kt:14 $box (13) // test.kt:27 $box (28, 32) -// test.kt:15 $box (8, 11, 8, 8, 20) +// test.kt:14 $box (8) +// test.kt:15 $box (8, 11) +// test.kt:22 $box (23, 24) +// test.kt:15 $box (8) // test.kt:26 $box (29, 30) -// test.kt:18 $box +// test.kt:15 $box (8, 20) +// test.kt:29 $nop (12) +// test.kt:18 $box (1) diff --git a/compiler/testData/debug/stepping/while.kt b/compiler/testData/debug/stepping/while.kt index b11f3189f8b92..19d0fd1c6ed79 100644 --- a/compiler/testData/debug/stepping/while.kt +++ b/compiler/testData/debug/stepping/while.kt @@ -40,9 +40,12 @@ fun box() { // EXPECTATIONS WASM // test.kt:5 $box (12, 4) -// test.kt:6 $box (13, 11, 13, 17, 11, 11, 11, 13, 11, 13, 17, 11, 11, 11) -// test.kt:7 $box (8, 8, 8, 8, 8) +// test.kt:6 $box (13, 11, 13, 17, 11) +// test.kt:7 $box (8) +// test.kt:6 $box (13, 11, 13, 17, 11) // test.kt:10 $box (8, 4) -// test.kt:12 $box (8, 8, 8, 8, 8, 8) -// test.kt:13 $box (15, 13, 15, 19, 13, 13, 15, 13, 15, 19, 13, 13) -// test.kt:14 $box +// test.kt:12 $box (8) +// test.kt:13 $box (15, 13, 15, 19, 13) +// test.kt:12 $box (8) +// test.kt:13 $box (15, 13, 15, 19, 13) +// test.kt:14 $box (1) diff --git a/wasm/wasm.tests/test/org/jetbrains/kotlin/wasm/test/handlers/WasmDebugRunner.kt b/wasm/wasm.tests/test/org/jetbrains/kotlin/wasm/test/handlers/WasmDebugRunner.kt index 4fb4a8cdfcfb9..4d30c7dc11dd6 100644 --- a/wasm/wasm.tests/test/org/jetbrains/kotlin/wasm/test/handlers/WasmDebugRunner.kt +++ b/wasm/wasm.tests/test/org/jetbrains/kotlin/wasm/test/handlers/WasmDebugRunner.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.wasm.test.handlers +import org.jetbrains.kotlin.backend.common.push import org.jetbrains.kotlin.backend.wasm.WasmCompilerResult import org.jetbrains.kotlin.backend.wasm.writeCompilationResult import org.jetbrains.kotlin.js.parser.sourcemaps.* @@ -35,6 +36,7 @@ class WasmDebugRunner(testServices: TestServices) : AbstractWasmArtifactsCollect val collectedJsArtifacts = collectJsArtifacts(originalFile) val debugMode = DebugMode.fromSystemProperty("kotlin.wasm.debugMode") + // language=js val testFileContent = """ let messageId = 0; const locations = []; @@ -93,6 +95,7 @@ class WasmDebugRunner(testServices: TestServices) : AbstractWasmArtifactsCollect if (debugMode >= DebugMode.DEBUG) { File(dir, "index.html").writeText( + // language=html """ @@ -143,23 +146,28 @@ class WasmDebugRunner(testServices: TestServices) : AbstractWasmArtifactsCollect } } - val groupedByLinesSteppingTestLoggedData = debuggerSteps - .groupBy { Triple(it.fileName, it.functionName, it.location.line) } - .map { (key, debuggerSteps) -> - val (fileName, functionName, lineNumber) = key - val aggregatedColumns = debuggerSteps - .takeIf { it.size > 1 } - .orEmpty() - .map { it.location.column } - .joinToString(", ") - .let { if (it.isNotEmpty()) " ($it)" else it } - - SteppingTestLoggedData( - lineNumber + 1, - false, - formatAsSteppingTestExpectation(fileName, lineNumber + 1, functionName, false) + aggregatedColumns - ) + val groupedByLinesSteppingTestLoggedData = buildList { + var lastStep = ProcessedStep("DUMMY", "DUMMY", Location(-1, -1)) + var columns = mutableListOf() + + for (step in debuggerSteps.plus(lastStep)) { + if (lastStep == step) { + continue + } + + if (!lastStep.isOnTheSameLineAs(step) && columns.isNotEmpty()) { + val (fileName, functionName, location) = lastStep + val lineNumber = location.line + 1 + val aggregatedColumns = " (${columns.joinToString(", ")})" + val formatedSteppingExpectation = formatAsSteppingTestExpectation(fileName, lineNumber, functionName, false) + push(SteppingTestLoggedData(lineNumber, false, formatedSteppingExpectation + aggregatedColumns)) + columns = mutableListOf() + } + + columns.push(step.location.column) + lastStep = step } + } checkSteppingTestResult( frontendKind = mainModule.frontendKind, @@ -193,9 +201,14 @@ class WasmDebugRunner(testServices: TestServices) : AbstractWasmArtifactsCollect is SourceMapError -> error(parseResult.message) } - private class Location(val line: Int, val column: Int) + private data class Location(val line: Int, val column: Int) private class Frame(val functionName: String, val pausedLocation: Location) - private class ProcessedStep(val fileName: String, val functionName: String, val location: Location) + private data class ProcessedStep(val fileName: String, val functionName: String, val location: Location) { + fun isOnTheSameLineAs(previous: ProcessedStep) = + previous.fileName == fileName && + previous.functionName == functionName && + previous.location.line == location.line + } private class FrameParser(private val input: String) { fun parse(): List = (parseJson(input) as JsonArray).elements