diff --git a/compiler/testData/debug/stepping/IfTrueThenFalse.kt b/compiler/testData/debug/stepping/IfTrueThenFalse.kt
index ff1076672cc..1973b60ba6c 100644
--- a/compiler/testData/debug/stepping/IfTrueThenFalse.kt
+++ b/compiler/testData/debug/stepping/IfTrueThenFalse.kt
@@ -18,4 +18,3 @@ fun box() {
 // EXPECTATIONS JS_IR
 // test.kt:5 box
 // test.kt:2 cond
-// test.kt:2 cond
diff --git a/compiler/testData/debug/stepping/anonymousFunction.kt b/compiler/testData/debug/stepping/anonymousFunction.kt
index 6ff64d2796b..162e5423391 100644
--- a/compiler/testData/debug/stepping/anonymousFunction.kt
+++ b/compiler/testData/debug/stepping/anonymousFunction.kt
@@ -20,5 +20,3 @@ fun box() {
 // test.kt:6 box
 // test.kt:3 eval_0
 // test.kt:7 box$lambda
-// test.kt:7 box$lambda
-// test.kt:3 eval_0
diff --git a/compiler/testData/debug/stepping/anonymousFunctionDirect.kt b/compiler/testData/debug/stepping/anonymousFunctionDirect.kt
index 5e6e78a8b53..b102420fc21 100644
--- a/compiler/testData/debug/stepping/anonymousFunctionDirect.kt
+++ b/compiler/testData/debug/stepping/anonymousFunctionDirect.kt
@@ -18,4 +18,3 @@ fun box() {
 // EXPECTATIONS JS_IR
 // test.kt:4 box
 // test.kt:5 box$lambda
-// test.kt:5 box$lambda
diff --git a/compiler/testData/debug/stepping/beforeGotoToWhileStart.kt b/compiler/testData/debug/stepping/beforeGotoToWhileStart.kt
index 6f1197a9502..224ac278406 100644
--- a/compiler/testData/debug/stepping/beforeGotoToWhileStart.kt
+++ b/compiler/testData/debug/stepping/beforeGotoToWhileStart.kt
@@ -40,9 +40,7 @@ fun box() {
 // test.kt:12 foo
 // test.kt:6 alternate
 // test.kt:7 alternate
-// test.kt:7 alternate
 // test.kt:12 foo
 // test.kt:6 alternate
 // test.kt:7 alternate
-// test.kt:7 alternate
 // test.kt:13 foo
diff --git a/compiler/testData/debug/stepping/callWithCallInArguments.kt b/compiler/testData/debug/stepping/callWithCallInArguments.kt
index 94753d427d2..63a6a92c3f0 100644
--- a/compiler/testData/debug/stepping/callWithCallInArguments.kt
+++ b/compiler/testData/debug/stepping/callWithCallInArguments.kt
@@ -36,10 +36,7 @@ fun box() {
 // test.kt:8 box
 // test.kt:9 box
 // test.kt:5 bar
+// test.kt:10 box
 // test.kt:5 bar
 // test.kt:9 box
 // test.kt:5 bar
-// test.kt:5 bar
-// test.kt:9 box
-// test.kt:5 bar
-// test.kt:5 bar
diff --git a/compiler/testData/debug/stepping/callWithReceiver.kt b/compiler/testData/debug/stepping/callWithReceiver.kt
index ff3f64e1acb..d6f117af1d1 100644
--- a/compiler/testData/debug/stepping/callWithReceiver.kt
+++ b/compiler/testData/debug/stepping/callWithReceiver.kt
@@ -29,7 +29,6 @@ fun box() {
 
 // EXPECTATIONS JS_IR
 // test.kt:9 box
-// test.kt:10 box
-// test.kt:4 A.foo_26di_k$
+// test.kt:11 box
 // test.kt:4 A.foo_26di_k$
 // test.kt:5 box
diff --git a/compiler/testData/debug/stepping/chainCall.kt b/compiler/testData/debug/stepping/chainCall.kt
index d564c4ddbc8..fdd5ab778c0 100644
--- a/compiler/testData/debug/stepping/chainCall.kt
+++ b/compiler/testData/debug/stepping/chainCall.kt
@@ -33,9 +33,7 @@ fun box() {
 // test.kt:9 box
 // test.kt:10 box
 // test.kt:4 A.foo_26di_k$
-// test.kt:4 A.foo_26di_k$
-// test.kt:10 box
-// test.kt:4 A.foo_26di_k$
+// test.kt:11 box
 // test.kt:4 A.foo_26di_k$
 // test.kt:5 box
 // test.kt:13 box
diff --git a/compiler/testData/debug/stepping/classObject.kt b/compiler/testData/debug/stepping/classObject.kt
index 3832c8b746d..9d81af6854e 100644
--- a/compiler/testData/debug/stepping/classObject.kt
+++ b/compiler/testData/debug/stepping/classObject.kt
@@ -46,4 +46,3 @@ fun box() {
 // test.kt:16 box
 // test.kt:16 box
 // test.kt:8 Companion_19.foo_26di_k$
-// test.kt:8 Companion_19.foo_26di_k$
diff --git a/compiler/testData/debug/stepping/compileTimeConstant.kt b/compiler/testData/debug/stepping/compileTimeConstant.kt
index a94e2864fe3..b02068bdf56 100644
--- a/compiler/testData/debug/stepping/compileTimeConstant.kt
+++ b/compiler/testData/debug/stepping/compileTimeConstant.kt
@@ -11,4 +11,4 @@ fun box() {
 // test.kt:6 box
 
 // EXPECTATIONS JS_IR
-// test.kt:4 box
+// test.kt:5 box
diff --git a/compiler/testData/debug/stepping/constantConditions.kt b/compiler/testData/debug/stepping/constantConditions.kt
index 86edcbdd925..eaaec2fcb80 100644
--- a/compiler/testData/debug/stepping/constantConditions.kt
+++ b/compiler/testData/debug/stepping/constantConditions.kt
@@ -27,4 +27,3 @@ fun test(): Long {
 // EXPECTATIONS JS_IR
 // test.kt:5 box
 // test.kt:11 test
-// test.kt:11 test
diff --git a/compiler/testData/debug/stepping/dataClass.kt b/compiler/testData/debug/stepping/dataClass.kt
index b71e4a80be8..cafc7cd6120 100644
--- a/compiler/testData/debug/stepping/dataClass.kt
+++ b/compiler/testData/debug/stepping/dataClass.kt
@@ -74,21 +74,16 @@ fun box() {
 // test.kt:1 D.equals
 // test.kt:1 D.equals
 // test.kt:1 D.equals
-// test.kt:1 D.equals
 // test.kt:15 box
 // test.kt:1 D.hashCode
 // test.kt:1 D.hashCode
-// test.kt:1 D.hashCode
 // test.kt:16 box
 // test.kt:1 D.toString
-// test.kt:1 D.toString
 // test.kt:17 box
 // test.kt:17 box
 // test.kt:1 D.component1_7eebsc_k$
-// test.kt:1 D.component1_7eebsc_k$
 // test.kt:17 box
 // test.kt:1 D.component2_7eebsb_k$
-// test.kt:1 D.component2_7eebsb_k$
 // test.kt:18 box
 // test.kt:1 D.copy$default_cbhffz_k$
 // test.kt:1 D.copy$default_cbhffz_k$
@@ -98,8 +93,6 @@ fun box() {
 // test.kt:1 D.copy_t8q04r_k$
 // test.kt:3 D
 // test.kt:3 D
-// test.kt:1 D.copy_t8q04r_k$
-// test.kt:1 D.copy$default_cbhffz_k$
 // test.kt:19 box
 // test.kt:5 E
 // test.kt:5 E
@@ -108,22 +101,16 @@ fun box() {
 // test.kt:5 E
 // test.kt:20 box
 // test.kt:7 E.equals
-// test.kt:7 E.equals
 // test.kt:21 box
 // test.kt:8 E.hashCode
-// test.kt:8 E.hashCode
 // test.kt:22 box
 // test.kt:6 E.toString
-// test.kt:6 E.toString
 // test.kt:23 box
 // test.kt:23 box
 // test.kt:1 E.component1_7eebsc_k$
-// test.kt:1 E.component1_7eebsc_k$
 // test.kt:23 box
 // test.kt:1 E.component2_7eebsb_k$
-// test.kt:1 E.component2_7eebsb_k$
 // test.kt:24 box
 // test.kt:9 E.copy_1tks5_k$
 // test.kt:5 E
 // test.kt:5 E
-// test.kt:9 E.copy_1tks5_k$
diff --git a/compiler/testData/debug/stepping/defaultParameter.kt b/compiler/testData/debug/stepping/defaultParameter.kt
index f888fff7f92..512f0c8b0e2 100644
--- a/compiler/testData/debug/stepping/defaultParameter.kt
+++ b/compiler/testData/debug/stepping/defaultParameter.kt
@@ -29,6 +29,4 @@ fun box() {
 // test.kt:6 A.foo$default_dec9f7_k$
 // test.kt:6 A.foo$default_dec9f7_k$
 // test.kt:4 A.computeParam_vubdyi_k$
-// test.kt:4 A.computeParam_vubdyi_k$
-// test.kt:6 A.foo$default_dec9f7_k$
 // test.kt:6 A.foo$default_dec9f7_k$
diff --git a/compiler/testData/debug/stepping/enum.kt b/compiler/testData/debug/stepping/enum.kt
index cf3cb3b409a..bb8934c046b 100644
--- a/compiler/testData/debug/stepping/enum.kt
+++ b/compiler/testData/debug/stepping/enum.kt
@@ -58,7 +58,6 @@ fun box() {
 // test.kt:11 E
 // test.kt:22 box
 // test.kt:9 E.foo_26di_k$
-// test.kt:9 E.foo_26di_k$
 // test.kt:15 E2_initEntries
 // test.kt:14 E2
 // test.kt:17 E2_initEntries
diff --git a/compiler/testData/debug/stepping/functionCallWithDefault.kt b/compiler/testData/debug/stepping/functionCallWithDefault.kt
index af6fc9ac84e..ed5667b2e7b 100644
--- a/compiler/testData/debug/stepping/functionCallWithDefault.kt
+++ b/compiler/testData/debug/stepping/functionCallWithDefault.kt
@@ -27,4 +27,3 @@ inline fun bar(i: Int = 1) {
 // test.kt:8 foo$default
 // test.kt:8 foo$default
 // test.kt:8 foo$default
-// test.kt:8 foo$default
diff --git a/compiler/testData/debug/stepping/functionInAnotherFile.kt b/compiler/testData/debug/stepping/functionInAnotherFile.kt
index 1a2b63fcaf3..1a9afb56f65 100644
--- a/compiler/testData/debug/stepping/functionInAnotherFile.kt
+++ b/compiler/testData/debug/stepping/functionInAnotherFile.kt
@@ -42,7 +42,4 @@ fun bar(x: Int) =
 // test.kt:18 bar
 // foo.kt:4 foo
 // foo.kt:5 foo
-// foo.kt:5 foo
 // test.kt:21 bar
-// test.kt:21 bar
-// foo.kt:7 foo
diff --git a/compiler/testData/debug/stepping/ifThen.kt b/compiler/testData/debug/stepping/ifThen.kt
index f271d142989..7b2c9fe0b23 100644
--- a/compiler/testData/debug/stepping/ifThen.kt
+++ b/compiler/testData/debug/stepping/ifThen.kt
@@ -28,7 +28,6 @@ fun box() {
 // test.kt:12 box
 // test.kt:4 foo
 // test.kt:5 foo
-// test.kt:5 foo
 // test.kt:13 box
 // test.kt:14 box
 // test.kt:4 foo
diff --git a/compiler/testData/debug/stepping/ifThenElseFalse.kt b/compiler/testData/debug/stepping/ifThenElseFalse.kt
index 90622e89c89..08ad26c13ce 100644
--- a/compiler/testData/debug/stepping/ifThenElseFalse.kt
+++ b/compiler/testData/debug/stepping/ifThenElseFalse.kt
@@ -39,12 +39,9 @@ fun box() {
 // test.kt:15 box
 // test.kt:8 foo
 // test.kt:5 cond
-// test.kt:5 cond
 // test.kt:16 box
 // test.kt:17 box
 // test.kt:8 foo
 // test.kt:5 cond
-// test.kt:5 cond
 // test.kt:9 foo
 // test.kt:5 cond
-// test.kt:5 cond
diff --git a/compiler/testData/debug/stepping/iincStepping.kt b/compiler/testData/debug/stepping/iincStepping.kt
index 8719b30f9e0..75f649341f7 100644
--- a/compiler/testData/debug/stepping/iincStepping.kt
+++ b/compiler/testData/debug/stepping/iincStepping.kt
@@ -54,5 +54,5 @@ fun box() {
 // test.kt:9 box
 // test.kt:10 box
 // test.kt:12 box
-// test.kt:13 box
-// test.kt:15 box
+// test.kt:14 box
+// test.kt:16 box
diff --git a/compiler/testData/debug/stepping/initBlocks.kt b/compiler/testData/debug/stepping/initBlocks.kt
index d8b2f76c26a..ce46d53b431 100644
--- a/compiler/testData/debug/stepping/initBlocks.kt
+++ b/compiler/testData/debug/stepping/initBlocks.kt
@@ -111,7 +111,6 @@ fun box() {
 // test.kt:48 box
 // test.kt:7 Foo
 // test.kt:45 x
-// test.kt:45 x
 // test.kt:49 box
 // test.kt:13 Bar
 // test.kt:17 Bar
@@ -119,7 +118,6 @@ fun box() {
 // test.kt:23 Boo
 // test.kt:26 Boo
 // test.kt:45 x
-// test.kt:45 x
 // test.kt:29 Boo
 // test.kt:51 box
 // test.kt:34 Zoo
diff --git a/compiler/testData/debug/stepping/initBlocksCompanion.kt b/compiler/testData/debug/stepping/initBlocksCompanion.kt
index d63810d55bb..f650be90095 100644
--- a/compiler/testData/debug/stepping/initBlocksCompanion.kt
+++ b/compiler/testData/debug/stepping/initBlocksCompanion.kt
@@ -57,7 +57,6 @@ fun box() {
 // test.kt:8 Companion_19
 // test.kt:11 Companion_19
 // test.kt:26 x
-// test.kt:26 x
 // test.kt:13 Companion_19
 // test.kt:16 Companion_19
 // test.kt:21 Companion_19
diff --git a/compiler/testData/debug/stepping/inlineCallableReference.kt b/compiler/testData/debug/stepping/inlineCallableReference.kt
index 9eaab230df4..502d0f82677 100644
--- a/compiler/testData/debug/stepping/inlineCallableReference.kt
+++ b/compiler/testData/debug/stepping/inlineCallableReference.kt
@@ -37,5 +37,5 @@ inline fun f(block: () -> Unit) {
 // EXPECTATIONS JS_IR
 // test.kt:3 box
 // test.kt:5 box
-// test.kt:7 box
+// test.kt:8 box
 // test.kt:10 box
diff --git a/compiler/testData/debug/stepping/kt15259.kt b/compiler/testData/debug/stepping/kt15259.kt
index 53a13b31a6f..e90f412be23 100644
--- a/compiler/testData/debug/stepping/kt15259.kt
+++ b/compiler/testData/debug/stepping/kt15259.kt
@@ -26,4 +26,3 @@ fun box() {
 // EXPECTATIONS JS_IR
 // test.kt:12 box
 // test.kt:9 makeFace
-// test.kt:9 makeFace
diff --git a/compiler/testData/debug/stepping/kt42208.kt b/compiler/testData/debug/stepping/kt42208.kt
index 38b7c1afed0..afff7be91b3 100644
--- a/compiler/testData/debug/stepping/kt42208.kt
+++ b/compiler/testData/debug/stepping/kt42208.kt
@@ -21,4 +21,3 @@ inline fun foo() = {
 // EXPECTATIONS JS_IR
 // test.kt:4 box
 // test1.kt:6 box$lambda
-// test1.kt:6 box$lambda
diff --git a/compiler/testData/debug/stepping/kt42208b.kt b/compiler/testData/debug/stepping/kt42208b.kt
index 597f11a2ce6..f1b1071c730 100644
--- a/compiler/testData/debug/stepping/kt42208b.kt
+++ b/compiler/testData/debug/stepping/kt42208b.kt
@@ -28,4 +28,3 @@ inline fun foo() = {
 // test.kt:4 box
 // test.kt:5 box
 // test1.kt:7 box$lambda
-// test1.kt:7 box$lambda
diff --git a/compiler/testData/debug/stepping/kt42208c.kt b/compiler/testData/debug/stepping/kt42208c.kt
index da8fe0f26c9..b0985a76e3c 100644
--- a/compiler/testData/debug/stepping/kt42208c.kt
+++ b/compiler/testData/debug/stepping/kt42208c.kt
@@ -41,10 +41,8 @@ fun baz(v:(() -> Unit)) {
 // test.kt:4 box
 // test3.kt:14 baz
 // test1.kt:8 box$lambda
-// test1.kt:8 box$lambda
 // test1.kt:11 box
 // test.kt:5 box
 // test.kt:6 box
 // test3.kt:14 baz
 // test1.kt:8 box$lambda_0
-// test1.kt:8 box$lambda_0
diff --git a/compiler/testData/debug/stepping/lambdaStepInline.kt b/compiler/testData/debug/stepping/lambdaStepInline.kt
index a5617f9ab53..a5f9d2f8c94 100644
--- a/compiler/testData/debug/stepping/lambdaStepInline.kt
+++ b/compiler/testData/debug/stepping/lambdaStepInline.kt
@@ -30,4 +30,3 @@ fun box(): String {
 // test.kt:10 box
 // test.kt:4 box
 // test.kt:13 box
-// test.kt:13 box
diff --git a/compiler/testData/debug/stepping/localProperty.kt b/compiler/testData/debug/stepping/localProperty.kt
index 419ad2467bc..be56de80e4d 100644
--- a/compiler/testData/debug/stepping/localProperty.kt
+++ b/compiler/testData/debug/stepping/localProperty.kt
@@ -21,7 +21,6 @@ fun box(): String {
 // test.kt:13 box
 
 // EXPECTATIONS JS_IR
-// test.kt:5 box
+// test.kt:8 box
 // test.kt:11 box
 // test.kt:13 box
-// test.kt:13 box
diff --git a/compiler/testData/debug/stepping/multiModule.kt b/compiler/testData/debug/stepping/multiModule.kt
index 21b5269a767..6bc006668d5 100644
--- a/compiler/testData/debug/stepping/multiModule.kt
+++ b/compiler/testData/debug/stepping/multiModule.kt
@@ -27,7 +27,5 @@ fun box() {
 // EXPECTATIONS JS_IR
 // test.kt:14 box
 // a.kt:4 a
-// a.kt:4 a
 // test.kt:15 box
 // b.kt:8 b
-// b.kt:8 b
diff --git a/compiler/testData/debug/stepping/multilineExpression.kt b/compiler/testData/debug/stepping/multilineExpression.kt
index 8700a95d50b..8b0efd0e5e0 100644
--- a/compiler/testData/debug/stepping/multilineExpression.kt
+++ b/compiler/testData/debug/stepping/multilineExpression.kt
@@ -25,4 +25,3 @@ fun test(a: Boolean, b: Boolean, c: Boolean): Boolean {
 // EXPECTATIONS JS_IR
 // test.kt:5 box
 // test.kt:9 test
-// test.kt:9 test
diff --git a/compiler/testData/debug/stepping/namedCallableReference.kt b/compiler/testData/debug/stepping/namedCallableReference.kt
index 6af7817daaa..487c30c982a 100644
--- a/compiler/testData/debug/stepping/namedCallableReference.kt
+++ b/compiler/testData/debug/stepping/namedCallableReference.kt
@@ -36,4 +36,3 @@ fun g() {}
 // test.kt:8 f
 // test.kt:4 l
 // test.kt:4 l
-// test.kt:4 l
diff --git a/compiler/testData/debug/stepping/nestedInline.kt b/compiler/testData/debug/stepping/nestedInline.kt
index 8818c0d981b..428dfdd6f45 100644
--- a/compiler/testData/debug/stepping/nestedInline.kt
+++ b/compiler/testData/debug/stepping/nestedInline.kt
@@ -67,4 +67,3 @@ inline fun html(init: () -> Unit) {
 // EXPECTATIONS JS_IR
 // test.kt:19 box
 // test.kt:21 box
-// test.kt:21 box
diff --git a/compiler/testData/debug/stepping/nullcheck.kt b/compiler/testData/debug/stepping/nullcheck.kt
index f0d3aeb3384..0c62c3d0088 100644
--- a/compiler/testData/debug/stepping/nullcheck.kt
+++ b/compiler/testData/debug/stepping/nullcheck.kt
@@ -69,13 +69,9 @@ fun testExpressionBody(nullable: String?) =
 // EXPECTATIONS JS_IR
 // test.kt:6 box
 // test.kt:13 test
-// test.kt:13 test
 // test.kt:7 box
 // test.kt:13 test
-// test.kt:13 test
 // test.kt:8 box
 // test.kt:21 testExpressionBody
-// test.kt:21 testExpressionBody
 // test.kt:9 box
 // test.kt:21 testExpressionBody
-// test.kt:21 testExpressionBody
diff --git a/compiler/testData/debug/stepping/primitiveNullChecks.kt b/compiler/testData/debug/stepping/primitiveNullChecks.kt
index d7ff1ba144f..ef3ae278b3e 100644
--- a/compiler/testData/debug/stepping/primitiveNullChecks.kt
+++ b/compiler/testData/debug/stepping/primitiveNullChecks.kt
@@ -16,4 +16,3 @@ fun box(): String {
 // test.kt:5 box
 // test.kt:5 box
 // test.kt:6 box
-// test.kt:6 box
diff --git a/compiler/testData/debug/stepping/propertyAccessor.kt b/compiler/testData/debug/stepping/propertyAccessor.kt
index 02fd413e345..f08a3da2fa9 100644
--- a/compiler/testData/debug/stepping/propertyAccessor.kt
+++ b/compiler/testData/debug/stepping/propertyAccessor.kt
@@ -23,4 +23,3 @@ fun box() {
 // test.kt:11 box
 // test.kt:11 box
 // test.kt:6 A.get_prop_wosl9o_k$
-// test.kt:6 A.get_prop_wosl9o_k$
diff --git a/compiler/testData/debug/stepping/recursion.kt b/compiler/testData/debug/stepping/recursion.kt
index 7f1d8de019f..b7b4bc52585 100644
--- a/compiler/testData/debug/stepping/recursion.kt
+++ b/compiler/testData/debug/stepping/recursion.kt
@@ -34,8 +34,5 @@ fun foo(n :Int ) : Int {
 // test.kt:11 foo
 // test.kt:8 foo
 // test.kt:9 foo
-// test.kt:9 foo
-// test.kt:11 foo
-// test.kt:11 foo
 // test.kt:11 foo
 // test.kt:11 foo
diff --git a/compiler/testData/debug/stepping/simpleDefaultArg.kt b/compiler/testData/debug/stepping/simpleDefaultArg.kt
index 7b9565c8cca..59815af1241 100644
--- a/compiler/testData/debug/stepping/simpleDefaultArg.kt
+++ b/compiler/testData/debug/stepping/simpleDefaultArg.kt
@@ -22,6 +22,3 @@ fun box(): String {
 // test.kt:3 ifoo$default
 // test.kt:3 ifoo$default
 // test.kt:4 ifoo
-// test.kt:4 ifoo
-// test.kt:3 ifoo$default
-// test.kt:8 box
diff --git a/compiler/testData/debug/stepping/simpleInlineDefaultArg.kt b/compiler/testData/debug/stepping/simpleInlineDefaultArg.kt
index ef264b020aa..89cd1d1415a 100644
--- a/compiler/testData/debug/stepping/simpleInlineDefaultArg.kt
+++ b/compiler/testData/debug/stepping/simpleInlineDefaultArg.kt
@@ -38,4 +38,3 @@ fun box(): String {
 // test.kt:10 box
 
 // EXPECTATIONS JS_IR
-// test.kt:10 box
diff --git a/compiler/testData/debug/stepping/smapInlineAsArgument.kt b/compiler/testData/debug/stepping/smapInlineAsArgument.kt
index fdcabd284f4..45421c7635f 100644
--- a/compiler/testData/debug/stepping/smapInlineAsArgument.kt
+++ b/compiler/testData/debug/stepping/smapInlineAsArgument.kt
@@ -40,10 +40,8 @@ fun fail() : String {
 // EXPECTATIONS JS_IR
 // test.kt:4 box
 // test.kt:20 fail
-// test.kt:20 fail
 // test.kt:4 box
 // test.kt:7 box
 // test.kt:20 fail
-// test.kt:20 fail
 // test.kt:16 box
 // test.kt:7 box
diff --git a/compiler/testData/debug/stepping/smapInlineAsInfixArgument.kt b/compiler/testData/debug/stepping/smapInlineAsInfixArgument.kt
index 4cda3afc5c7..2fb3ed91587 100644
--- a/compiler/testData/debug/stepping/smapInlineAsInfixArgument.kt
+++ b/compiler/testData/debug/stepping/smapInlineAsInfixArgument.kt
@@ -38,14 +38,10 @@ fun fail() : String {
 // EXPECTATIONS JS_IR
 // test.kt:6 box
 // test.kt:18 fail
-// test.kt:18 fail
 // test.kt:6 box
 // test.kt:3 execute
-// test.kt:3 execute
 // test.kt:9 box
 // test.kt:18 fail
-// test.kt:18 fail
 // test.kt:14 box
 // test.kt:9 box
 // test.kt:3 execute
-// test.kt:3 execute
diff --git a/compiler/testData/debug/stepping/smapInlineAsInlineArgument.kt b/compiler/testData/debug/stepping/smapInlineAsInlineArgument.kt
index 3cdfa9ab7bc..6c85b910956 100644
--- a/compiler/testData/debug/stepping/smapInlineAsInlineArgument.kt
+++ b/compiler/testData/debug/stepping/smapInlineAsInlineArgument.kt
@@ -41,11 +41,9 @@ fun fail() : String {
 // test.kt:4 box
 // test.kt:5 box
 // test.kt:20 fail
-// test.kt:20 fail
 // test.kt:16 box
 // test.kt:7 box
 // test.kt:20 fail
-// test.kt:20 fail
 // test.kt:16 box
 // test.kt:8 box
 // test.kt:16 box
diff --git a/compiler/testData/debug/stepping/smapInlineInIntrinsicArgument.kt b/compiler/testData/debug/stepping/smapInlineInIntrinsicArgument.kt
index f95440cccfc..8d104117df3 100644
--- a/compiler/testData/debug/stepping/smapInlineInIntrinsicArgument.kt
+++ b/compiler/testData/debug/stepping/smapInlineInIntrinsicArgument.kt
@@ -39,9 +39,7 @@ fun fail() : String {
 // EXPECTATIONS JS_IR
 // test.kt:4 box
 // test.kt:16 fail
-// test.kt:16 fail
 // test.kt:7 box
 // test.kt:16 fail
-// test.kt:16 fail
 // test.kt:12 box
 // test.kt:7 box
diff --git a/compiler/testData/debug/stepping/suspendFunWithLambdaParameter.kt b/compiler/testData/debug/stepping/suspendFunWithLambdaParameter.kt
index 1c859ae723b..bea9ad99ffb 100644
--- a/compiler/testData/debug/stepping/suspendFunWithLambdaParameter.kt
+++ b/compiler/testData/debug/stepping/suspendFunWithLambdaParameter.kt
@@ -23,6 +23,3 @@ suspend fun box() {
 // test.kt:4 foo
 // test.kt:4 foo
 // test.kt:9 box$lambda
-// test.kt:9 box$lambda
-// test.kt:4 foo
-// test.kt:7 box
diff --git a/compiler/testData/debug/stepping/topLevel.kt b/compiler/testData/debug/stepping/topLevel.kt
index 3e9716d7fa5..da384efda15 100644
--- a/compiler/testData/debug/stepping/topLevel.kt
+++ b/compiler/testData/debug/stepping/topLevel.kt
@@ -17,4 +17,3 @@ fun box() {
 // EXPECTATIONS JS_IR
 // test.kt:8 box
 // test.kt:3 foo
-// test.kt:3 foo
diff --git a/compiler/testData/debug/stepping/trait.kt b/compiler/testData/debug/stepping/trait.kt
index 3c4e548f4da..1ad2fef37db 100644
--- a/compiler/testData/debug/stepping/trait.kt
+++ b/compiler/testData/debug/stepping/trait.kt
@@ -49,11 +49,7 @@ fun box() {
 // test.kt:14 box
 // test.kt:7 bar
 // test.kt:4 foo
-// test.kt:4 foo
-// test.kt:7 bar
 // test.kt:15 box
 // test.kt:15 box
 // test.kt:7 bar
 // test.kt:4 foo
-// test.kt:4 foo
-// test.kt:7 bar
diff --git a/compiler/testData/debug/stepping/tryCatchExpression.kt b/compiler/testData/debug/stepping/tryCatchExpression.kt
index 23f0dc70374..4ae726a89a4 100644
--- a/compiler/testData/debug/stepping/tryCatchExpression.kt
+++ b/compiler/testData/debug/stepping/tryCatchExpression.kt
@@ -116,7 +116,6 @@ fun box() {
 // test.kt:17 foo
 // test.kt:36 mightThrow3
 // test.kt:37 mightThrow3
-// test.kt:37 mightThrow3
 // test.kt:16 foo
 // test.kt:42 box
 // test.kt:43 box
@@ -129,7 +128,6 @@ fun box() {
 // test.kt:36 mightThrow3
 // test.kt:36 mightThrow3
 // test.kt:19 foo
-// test.kt:19 foo
 // test.kt:44 box
 // test.kt:45 box
 // test.kt:5 foo
@@ -138,11 +136,9 @@ fun box() {
 // test.kt:32 mightThrow2
 // test.kt:32 mightThrow2
 // test.kt:13 foo
-// test.kt:13 foo
 // test.kt:46 box
 // test.kt:47 box
 // test.kt:5 foo
 // test.kt:28 mightThrow
 // test.kt:28 mightThrow
 // test.kt:7 foo
-// test.kt:7 foo
diff --git a/compiler/testData/debug/stepping/voidLambdaStepInline.kt b/compiler/testData/debug/stepping/voidLambdaStepInline.kt
index 0f74a52d199..bb23d0f11ec 100644
--- a/compiler/testData/debug/stepping/voidLambdaStepInline.kt
+++ b/compiler/testData/debug/stepping/voidLambdaStepInline.kt
@@ -21,4 +21,3 @@ fun box(): String {
 // test.kt:4 box
 // test.kt:6 box
 // test.kt:8 box
-// test.kt:8 box
diff --git a/compiler/testData/debug/stepping/whenMultiLine.kt b/compiler/testData/debug/stepping/whenMultiLine.kt
index 6a6efb5dadf..aaa0ecd7564 100644
--- a/compiler/testData/debug/stepping/whenMultiLine.kt
+++ b/compiler/testData/debug/stepping/whenMultiLine.kt
@@ -86,12 +86,9 @@ fun box() {
 // test.kt:26 box
 // test.kt:15 foo
 // test.kt:22 foo
-// test.kt:22 foo
 // test.kt:27 box
 // test.kt:17 foo
 // test.kt:22 foo
-// test.kt:22 foo
 // test.kt:28 box
 // test.kt:19 foo
 // test.kt:22 foo
-// test.kt:22 foo
diff --git a/compiler/testData/debug/stepping/whenMultiLineSubject.kt b/compiler/testData/debug/stepping/whenMultiLineSubject.kt
index 242da062a43..13424258c6d 100644
--- a/compiler/testData/debug/stepping/whenMultiLineSubject.kt
+++ b/compiler/testData/debug/stepping/whenMultiLineSubject.kt
@@ -61,16 +61,13 @@ fun box() {
 // test.kt:13 foo
 // test.kt:15 foo
 // test.kt:22 foo
-// test.kt:22 foo
 // test.kt:27 box
 // test.kt:4 foo
 // test.kt:13 foo
 // test.kt:17 foo
 // test.kt:22 foo
-// test.kt:22 foo
 // test.kt:28 box
 // test.kt:4 foo
 // test.kt:13 foo
 // test.kt:19 foo
 // test.kt:22 foo
-// test.kt:22 foo
diff --git a/compiler/testData/debug/stepping/whenWithInlineInCondition.kt b/compiler/testData/debug/stepping/whenWithInlineInCondition.kt
index 456a8fc92fd..6464ac4e6f4 100644
--- a/compiler/testData/debug/stepping/whenWithInlineInCondition.kt
+++ b/compiler/testData/debug/stepping/whenWithInlineInCondition.kt
@@ -73,7 +73,6 @@ fun nop() {}
 // EXPECTATIONS JS_IR
 // test.kt:3 box
 // test.kt:19 value
-// test.kt:19 value
 // test.kt:4 box
 // test.kt:20 box
 // test.kt:5 box
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsDebugRunner.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsDebugRunner.kt
index 43c1574b578..e32e6bae596 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsDebugRunner.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsDebugRunner.kt
@@ -182,9 +182,15 @@ class JsDebugRunner(testServices: TestServices) : AbstractJsArtifactsCollector(t
         val segment = if (columnNumber <= group.segments[0].generatedColumnNumber) {
             group.segments[0]
         } else {
-            group.segments.find {
-                columnNumber > it.generatedColumnNumber
+            val candidateIndex = group.segments.indexOfFirst {
+                columnNumber <= it.generatedColumnNumber
             }
+            if (candidateIndex < 0)
+                null
+            else if (candidateIndex == 0 || group.segments[candidateIndex].generatedColumnNumber == columnNumber)
+                group.segments[candidateIndex]
+            else
+                group.segments[candidateIndex - 1]
         }
         return segment?.sourceFileAndLine()
     }