diff --git a/compiler/testData/lineNumber/custom/callWithReceiver.kt b/compiler/testData/lineNumber/custom/callWithReceiver.kt
index acf769512aa..e892b755131 100644
--- a/compiler/testData/lineNumber/custom/callWithReceiver.kt
+++ b/compiler/testData/lineNumber/custom/callWithReceiver.kt
@@ -12,4 +12,4 @@ fun foo() {
      .bar()
 }
 
-// 2 3 7 8 9 11 12 17 13
+// 2 3 7 8 9 8 9 11 12 11 12 17 13
diff --git a/compiler/testData/lineNumber/custom/chainCall.kt b/compiler/testData/lineNumber/custom/chainCall.kt
index 991ed7c35eb..50ec38aee4f 100644
--- a/compiler/testData/lineNumber/custom/chainCall.kt
+++ b/compiler/testData/lineNumber/custom/chainCall.kt
@@ -12,4 +12,4 @@ fun foo() {
         .bar()
 }
 
-// 2 3 7 8 9 11 17 12 17 13
+// 2 3 7 8 9 8 9 11 12 11 17 12 17 13
diff --git a/compiler/testData/lineNumber/custom/compileTimeConstant.kt b/compiler/testData/lineNumber/custom/compileTimeConstant.kt
index c0b7a897922..47a285b40cb 100644
--- a/compiler/testData/lineNumber/custom/compileTimeConstant.kt
+++ b/compiler/testData/lineNumber/custom/compileTimeConstant.kt
@@ -3,4 +3,4 @@ fun foo() {
             42
 }
 
-// 3 4
+// 2 3 4
diff --git a/compiler/testData/lineNumber/custom/functionCallWithDefault.kt b/compiler/testData/lineNumber/custom/functionCallWithDefault.kt
index 9f57ad21f88..137d81d6f7b 100644
--- a/compiler/testData/lineNumber/custom/functionCallWithDefault.kt
+++ b/compiler/testData/lineNumber/custom/functionCallWithDefault.kt
@@ -9,4 +9,4 @@ fun foo(i: Int = 1) {
 inline fun bar(i: Int = 1) {
 }
 
-// 2 3 9 4 7 6 10 9 10
+// 2 3 9 10 4 7 6 10 9 10
diff --git a/compiler/testData/lineNumber/custom/functionCallWithInlinedLambdaParam.kt b/compiler/testData/lineNumber/custom/functionCallWithInlinedLambdaParam.kt
index 95cad2a2f6c..73f223d696e 100644
--- a/compiler/testData/lineNumber/custom/functionCallWithInlinedLambdaParam.kt
+++ b/compiler/testData/lineNumber/custom/functionCallWithInlinedLambdaParam.kt
@@ -13,4 +13,4 @@ inline fun foo(f: () -> Unit) {
     f()
 }
 
-// 2 12 3 6 12 7 9 12 13 14
+// 2 12 13 3 14 6 12 13 7 14 9 12 13 14
diff --git a/compiler/testData/lineNumber/custom/ifThenElse.kt b/compiler/testData/lineNumber/custom/ifThenElse.kt
index c5287abb636..066417809fd 100644
--- a/compiler/testData/lineNumber/custom/ifThenElse.kt
+++ b/compiler/testData/lineNumber/custom/ifThenElse.kt
@@ -12,4 +12,4 @@ fun foo() {
     }
 }
 
-// 2 3 5 8 9 11 8 13
+// 2 3 5 6 8 9 11 8 13
diff --git a/compiler/testData/lineNumber/custom/tryCatchExpression.kt b/compiler/testData/lineNumber/custom/tryCatchExpression.kt
index 647d463f808..d6a577c63ed 100644
--- a/compiler/testData/lineNumber/custom/tryCatchExpression.kt
+++ b/compiler/testData/lineNumber/custom/tryCatchExpression.kt
@@ -12,4 +12,4 @@ fun foo() {
     }
 }
 
-// 2 3 5 8 9 11 8 13
+// 2 3 5 6 8 9 11 8 13
diff --git a/compiler/testData/lineNumber/custom/tryCatchFinally.kt b/compiler/testData/lineNumber/custom/tryCatchFinally.kt
index ef4093566a5..02158a669be 100644
--- a/compiler/testData/lineNumber/custom/tryCatchFinally.kt
+++ b/compiler/testData/lineNumber/custom/tryCatchFinally.kt
@@ -16,4 +16,4 @@ fun foo() {
     }
 }
 
-// 2 3 7 5 7 10 11 15 13 15 10 17
+// 2 3 7 5 7 8 10 11 15 13 15 10 17
diff --git a/compiler/testData/lineNumber/custom/tryFinally.kt b/compiler/testData/lineNumber/custom/tryFinally.kt
index ed861341c48..ccf48210009 100644
--- a/compiler/testData/lineNumber/custom/tryFinally.kt
+++ b/compiler/testData/lineNumber/custom/tryFinally.kt
@@ -12,4 +12,4 @@ fun foo() {
     }
 }
 
-// 2 3 5 8 9 11 8 13
+// 2 3 5 6 8 9 11 8 13
diff --git a/compiler/testData/lineNumber/custom/when.kt b/compiler/testData/lineNumber/custom/when.kt
index 65ee342fce0..b8ead48506d 100644
--- a/compiler/testData/lineNumber/custom/when.kt
+++ b/compiler/testData/lineNumber/custom/when.kt
@@ -12,4 +12,4 @@ fun foo(x: Int) {
     }
 }
 
-// 3 4 5 9 10 11 8 13
+// 2 3 4 5 6 8 9 10 11 8 13
diff --git a/compiler/testData/lineNumber/custom/whenSubject.kt b/compiler/testData/lineNumber/custom/whenSubject.kt
index b23cb932781..728a6301724 100644
--- a/compiler/testData/lineNumber/custom/whenSubject.kt
+++ b/compiler/testData/lineNumber/custom/whenSubject.kt
@@ -12,4 +12,4 @@ fun foo(x: Int) {
     }
 }
 
-// 2 3 4 5 8 9 10 11 8 13
+// 2 3 4 5 6 8 9 10 11 8 13