From e5ad035039ee49bd3b6b8a0f7ce64db1fef58940 Mon Sep 17 00:00:00 2001
From: Sonya Valchuk <pyos@google.com>
Date: Mon, 11 Mar 2024 09:00:41 +0000
Subject: [PATCH] JVM: do not write trivial SMAPs to any classes

Even ones inside inline functions. This was a backwards compatibility
hack for Kotlin 1.4, where the inliner would crash if it attempted to
regenerate an anonymous object with no SMAP; that has been fixed in 1.5,
and ever since then trivial SMAPs could be inferred from line number
markers in methods.

There are three kinds of changes to tests in this commit:

  * Some SMAPs are gone entirely - self-explanatory.

  * Some SMAPs have narrower line ranges - that's because the old SMAP
    had the range for the entire file, while the new one only maps up to
    the last line number used in the class. There should be no
    difference in behavior.

  * Some "source file name" markers are removed in continuation objects
    - continuations don't have any line numbers, so there's no debugging
    information anyway. The actual source information is in the
    containing class.
---
 .../kotlin/codegen/AbstractClassBuilder.java  | 16 +++++---
 .../kotlin/codegen/ClosureCodegen.java        |  2 -
 .../codegen/ImplementationBodyCodegen.java    |  2 -
 .../kotlin/codegen/MemberCodegen.java         | 22 +---------
 .../backend/jvm/codegen/ClassCodegen.kt       |  9 +----
 .../tailCallOptimizations/crossinline.ir.txt  |  5 ---
 .../tailCallOptimizations/crossinline.txt     |  8 ----
 .../innerObjectRetransformation.ir.txt        |  1 -
 .../innerObjectRetransformation.jvm_abi.txt   |  8 ++--
 .../innerObjectRetransformation.txt           |  2 -
 .../crossinlineCallableReference.jvm_abi.txt  | 20 +++++-----
 .../exactlyOnceCrossinline2.jvm_abi.txt       | 20 +++++-----
 .../boxInline/smap/anonymous/kt19175.smap     | 14 +------
 .../boxInline/smap/anonymous/lambda.kt        |  2 +-
 .../boxInline/smap/anonymous/lambda.smap      | 14 +------
 .../anonymous/lambdaOnInlineCallSite.smap     | 22 ----------
 .../boxInline/smap/anonymous/object.kt        |  2 +-
 .../boxInline/smap/anonymous/object.smap      | 14 +------
 .../smap/anonymous/objectOnInlineCallSite.kt  |  4 +-
 .../anonymous/objectOnInlineCallSite.smap     | 40 +++++--------------
 .../smap/anonymous/objectOnInlineCallSite2.kt |  3 +-
 .../anonymous/objectOnInlineCallSite2.smap    | 10 ++---
 .../objectOnInlineCallSiteWithCapture.kt      |  4 +-
 .../objectOnInlineCallSiteWithCapture.smap    | 14 +++----
 .../codegen/boxInline/smap/crossroutines.kt   |  2 +-
 .../codegen/boxInline/smap/crossroutines.smap | 40 ++-----------------
 .../boxInline/smap/defaultFunction.smap       | 10 -----
 .../defaultLambda/defaultLambdaInAnonymous.kt |  2 +-
 ...daInAnonymous.smap-nonseparate-compilation | 26 +-----------
 ...ambdaInAnonymous.smap-separate-compilation | 30 ++------------
 .../defaultLambda/inlineAnonymousInDefault.kt |  2 +-
 ...mousInDefault.smap-nonseparate-compilation | 15 +------
 ...onymousInDefault.smap-separate-compilation | 19 ++-------
 .../inlineAnonymousInDefault2.kt              |  2 +-
 ...ousInDefault2.smap-nonseparate-compilation | 15 +------
 ...nymousInDefault2.smap-separate-compilation | 19 ++-------
 .../boxInline/smap/defaultLambda/kt21827.smap | 10 -----
 .../boxInline/smap/defaultLambda/nested.kt    |  2 +-
 .../boxInline/smap/defaultLambda/nested.smap  | 25 +-----------
 .../boxInline/smap/defaultLambda/simple.smap  | 10 -----
 .../boxInline/smap/defaultLambda/simple2.smap | 10 -----
 .../innerObjectRetransformation.jvm_abi.txt   |  8 ++--
 .../coroutines/tcoContinuation.txt            |  5 ---
 43 files changed, 104 insertions(+), 406 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AbstractClassBuilder.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AbstractClassBuilder.java
index 6d199a43089..e56ca51aaf3 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AbstractClassBuilder.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AbstractClassBuilder.java
@@ -151,12 +151,16 @@ public abstract class AbstractClassBuilder implements ClassBuilder {
 
     @Override
     public void visitSMAP(@NotNull SourceMapper smap, boolean backwardsCompatibleSyntax) {
-        if (!GENERATE_SMAP) return;
-
-        List<FileMapping> fileMappings = smap.getResultMappings();
-        if (fileMappings.isEmpty()) return;
-
-        visitSource(fileMappings.get(0).getName(), SMAPBuilder.INSTANCE.build(fileMappings, backwardsCompatibleSyntax));
+        if (GENERATE_SMAP && !smap.isTrivial()) {
+            List<FileMapping> fileMappings = smap.getResultMappings();
+            visitSource(fileMappings.get(0).getName(), SMAPBuilder.INSTANCE.build(fileMappings, backwardsCompatibleSyntax));
+        } else {
+            SourceInfo sourceInfo = smap.getSourceInfo();
+            if (sourceInfo == null) return;
+            String fileName = sourceInfo.getSourceFileName();
+            if (fileName == null) return;
+            visitSource(fileName, null);
+        }
     }
 
     @Override
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java
index 2a5a2ee7341..f4a8dc8d43b 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java
@@ -181,8 +181,6 @@ public class ClosureCodegen extends MemberCodegen<KtElement> {
                 superInterfaceAsmTypes
         );
 
-        initDefaultSourceMappingIfNeeded();
-
         v.visitSource(element.getContainingFile().getName(), null);
     }
 
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
index b37dcf967dd..ffde60bb212 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
@@ -242,8 +242,6 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
 
         v.visitSource(myClass.getContainingKtFile().getName(), null);
 
-        initDefaultSourceMappingIfNeeded();
-
         writeEnclosingMethod();
 
         AnnotationCodegen.forClass(v.getVisitor(), this, state).genAnnotations(descriptor, null, null);
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
index b02f5667bbc..693c0b416ea 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
@@ -92,7 +92,6 @@ public abstract class MemberCodegen<T extends KtPureElement/* TODO: & KtDeclarat
     private NameGenerator inlineNameGenerator;
     private boolean jvmAssertFieldGenerated;
 
-    private boolean alwaysWriteSourceMap;
     private SourceMapper sourceMapper;
 
     public MemberCodegen(
@@ -187,10 +186,7 @@ public abstract class MemberCodegen<T extends KtPureElement/* TODO: & KtDeclarat
 
         writeInnerClasses();
 
-        if (alwaysWriteSourceMap || (sourceMapper != null && !sourceMapper.isTrivial())) {
-            v.visitSMAP(getOrCreateSourceMapper(), !state.getLanguageVersionSettings().supportsFeature(LanguageFeature.CorrectSourceMappingSyntax));
-        }
-
+        v.visitSMAP(getOrCreateSourceMapper(), !state.getLanguageVersionSettings().supportsFeature(LanguageFeature.CorrectSourceMappingSyntax));
         v.done(state.getConfig().getGenerateSmapCopyToAnnotation());
     }
 
@@ -749,25 +745,11 @@ public abstract class MemberCodegen<T extends KtPureElement/* TODO: & KtDeclarat
     @NotNull
     public SourceMapper getOrCreateSourceMapper() {
         if (sourceMapper == null) {
-            // note: this is used in InlineCodegen and the element is always physical (KtElement) there
-            sourceMapper = new SourceMapper(SourceInfo.Companion.createFromPsi((KtElement)element, getClassName()));
+            sourceMapper = new SourceMapper(element instanceof KtElement ? SourceInfo.Companion.createFromPsi((KtElement)element, getClassName()) : null);
         }
         return sourceMapper;
     }
 
-    protected void initDefaultSourceMappingIfNeeded() {
-        if (state.getConfig().isInlineDisabled()) return;
-
-        CodegenContext parentContext = context.getParentContext();
-        while (parentContext != null) {
-            if (parentContext.isInlineMethodContext()) {
-                alwaysWriteSourceMap = true;
-                return;
-            }
-            parentContext = parentContext.getParentContext();
-        }
-    }
-
     protected void generateConstInstance(@NotNull Type thisAsmType, @NotNull Type fieldAsmType) {
         v.newField(
                 JvmDeclarationOriginKt.OtherOriginFromPure(element), ACC_STATIC | ACC_FINAL | ACC_PUBLIC, JvmAbi.INSTANCE_FIELD,
diff --git a/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt
index b7dd6ecb3b6..140ed2c66a0 100644
--- a/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt
+++ b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt
@@ -73,7 +73,6 @@ class ClassCodegen private constructor(
     private val parentClassCodegen by lazy {
         (parentFunction?.parentAsClass ?: irClass.parent as? IrClass)?.let { getOrCreate(it, context) }
     }
-    private val withinInline: Boolean by lazy { parentClassCodegen?.withinInline == true || parentFunction?.isInline == true }
     private val metadataSerializer: MetadataSerializer by lazy {
         context.backendExtension.createSerializer(
             context, irClass, type, visitor.serializationBindings, parentClassCodegen?.metadataSerializer
@@ -202,13 +201,7 @@ class ClassCodegen private constructor(
 
         generateKotlinMetadataAnnotation()
 
-        if (withinInline || !smap.isTrivial) {
-            visitor.visitSMAP(smap, !config.languageVersionSettings.supportsFeature(LanguageFeature.CorrectSourceMappingSyntax))
-        } else {
-            smap.sourceInfo!!.sourceFileName?.let {
-                visitor.visitSource(it, null)
-            }
-        }
+        visitor.visitSMAP(smap, !config.languageVersionSettings.supportsFeature(LanguageFeature.CorrectSourceMappingSyntax))
 
         reifiedTypeParametersUsages.mergeAll(irClass.reifiedTypeParameters)
 
diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.ir.txt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.ir.txt
index 234d3ce2756..85b0d5ee7be 100644
--- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.ir.txt
+++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.ir.txt
@@ -1,7 +1,6 @@
 @kotlin.Metadata
 @kotlin.coroutines.jvm.internal.DebugMetadata
 public final class CrossinlineKt$box$1$invokeSuspend$$inlined$filter$1$1 {
-    // source: 'crossinline.kt'
     enclosing method CrossinlineKt$box$1$invokeSuspend$$inlined$filter$1.consume(LSink;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
     field L$0: java.lang.Object
     field label: int
@@ -94,7 +93,6 @@ public final class CrossinlineKt$consumeEach$2 {
 @kotlin.Metadata
 @kotlin.coroutines.jvm.internal.DebugMetadata
 public final class CrossinlineKt$filter$$inlined$source$1$1 {
-    // source: 'crossinline.kt'
     enclosing method CrossinlineKt$filter$$inlined$source$1.consume(LSink;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
     field L$0: java.lang.Object
     field label: int
@@ -121,7 +119,6 @@ public final class CrossinlineKt$filter$$inlined$source$1 {
 
 @kotlin.Metadata
 public final class CrossinlineKt$filter$lambda$3$$inlined$consumeEach$1$1 {
-    // source: 'crossinline.kt'
     enclosing method CrossinlineKt$filter$lambda$3$$inlined$consumeEach$1.send(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
     field label: int
     synthetic field result: java.lang.Object
@@ -149,7 +146,6 @@ public final class CrossinlineKt$filter$lambda$3$$inlined$consumeEach$1 {
 @kotlin.Metadata
 @kotlin.coroutines.jvm.internal.DebugMetadata
 public final class CrossinlineKt$fold$$inlined$consumeEach$1$1 {
-    // source: 'crossinline.kt'
     enclosing method CrossinlineKt$fold$$inlined$consumeEach$1.send(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
     field L$0: java.lang.Object
     field label: int
@@ -191,7 +187,6 @@ final class CrossinlineKt$fold$1 {
 @kotlin.Metadata
 @kotlin.coroutines.jvm.internal.DebugMetadata
 public final class CrossinlineKt$range$$inlined$source$1$1 {
-    // source: 'crossinline.kt'
     enclosing method CrossinlineKt$range$$inlined$source$1.consume(LSink;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
     field I$0: int
     field I$1: int
diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.txt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.txt
index b26384243d5..6bb65200a50 100644
--- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.txt
+++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline.txt
@@ -1,7 +1,6 @@
 @kotlin.Metadata
 @kotlin.coroutines.jvm.internal.DebugMetadata
 public final class CrossinlineKt$box$1$filter$$inlined$source$1$1 {
-    // source: 'crossinline.kt'
     enclosing method CrossinlineKt$box$1$filter$$inlined$source$1.consume(LSink;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
     field L$0: java.lang.Object
     field label: int
@@ -15,7 +14,6 @@ public final class CrossinlineKt$box$1$filter$$inlined$source$1$1 {
 
 @kotlin.Metadata
 public final class CrossinlineKt$box$1$filter$$inlined$source$1$lambda$1$1 {
-    // source: 'crossinline.kt'
     enclosing method CrossinlineKt$box$1$filter$$inlined$source$1$lambda$1.send(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
     field label: int
     synthetic field result: java.lang.Object
@@ -56,7 +54,6 @@ public final class CrossinlineKt$box$1$filter$$inlined$source$1 {
 @kotlin.Metadata
 @kotlin.coroutines.jvm.internal.DebugMetadata
 public final class CrossinlineKt$box$1$fold$$inlined$consumeEach$1$1 {
-    // source: 'crossinline.kt'
     enclosing method CrossinlineKt$box$1$fold$$inlined$consumeEach$1.send(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
     field L$0: java.lang.Object
     field label: int
@@ -85,7 +82,6 @@ public final class CrossinlineKt$box$1$fold$$inlined$consumeEach$1 {
 @kotlin.Metadata
 @kotlin.coroutines.jvm.internal.DebugMetadata
 public final class CrossinlineKt$box$1$invokeSuspend$$inlined$filter$1$1 {
-    // source: 'crossinline.kt'
     enclosing method CrossinlineKt$box$1$invokeSuspend$$inlined$filter$1.consume(LSink;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
     field L$0: java.lang.Object
     field label: int
@@ -176,7 +172,6 @@ public final class CrossinlineKt$consumeEach$2 {
 @kotlin.Metadata
 @kotlin.coroutines.jvm.internal.DebugMetadata
 public final class CrossinlineKt$filter$$inlined$source$1$1 {
-    // source: 'crossinline.kt'
     enclosing method CrossinlineKt$filter$$inlined$source$1.consume(LSink;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
     field L$0: java.lang.Object
     field label: int
@@ -190,7 +185,6 @@ public final class CrossinlineKt$filter$$inlined$source$1$1 {
 
 @kotlin.Metadata
 public final class CrossinlineKt$filter$$inlined$source$1$lambda$1$1 {
-    // source: 'crossinline.kt'
     enclosing method CrossinlineKt$filter$$inlined$source$1$lambda$1.send(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
     field label: int
     synthetic field result: java.lang.Object
@@ -231,7 +225,6 @@ public final class CrossinlineKt$filter$$inlined$source$1 {
 @kotlin.Metadata
 @kotlin.coroutines.jvm.internal.DebugMetadata
 public final class CrossinlineKt$fold$$inlined$consumeEach$1$1 {
-    // source: 'crossinline.kt'
     enclosing method CrossinlineKt$fold$$inlined$consumeEach$1.send(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
     field L$0: java.lang.Object
     field label: int
@@ -273,7 +266,6 @@ public final class CrossinlineKt$fold$1 {
 @kotlin.Metadata
 @kotlin.coroutines.jvm.internal.DebugMetadata
 public final class CrossinlineKt$range$$inlined$source$1$1 {
-    // source: 'crossinline.kt'
     enclosing method CrossinlineKt$range$$inlined$source$1.consume(LSink;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
     field I$0: int
     field I$1: int
diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.ir.txt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.ir.txt
index 0c42960845f..4b9125c70be 100644
--- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.ir.txt
+++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.ir.txt
@@ -116,7 +116,6 @@ public final class flow/InnerObjectRetransformationKt$flow$1 {
 
 @kotlin.Metadata
 public final class flow/InnerObjectRetransformationKt$flowWith$$inlined$flow$1$1 {
-    // source: 'innerObjectRetransformation.kt'
     enclosing method flow/InnerObjectRetransformationKt$flowWith$$inlined$flow$1.collect(Lflow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
     field label: int
     synthetic field result: java.lang.Object
diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.jvm_abi.txt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.jvm_abi.txt
index 29831c7f21d..350782c16a1 100644
--- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.jvm_abi.txt
+++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.jvm_abi.txt
@@ -12,8 +12,8 @@ MODULE main
 				+ 2 innerObjectRetransformation.kt
 				flow/InnerObjectRetransformationKt
 				*L
-				1#1,64:1
-				54#2:65
+				1#1,36:1
+				54#2:37
 				*E
 				 } )
 			K2
@@ -27,7 +27,7 @@ MODULE main
 				+ 2 innerObjectRetransformation.kt
 				flow/InnerObjectRetransformationKt
 				*L
-				1#1,64:1
-				55#2:65
+				1#1,36:1
+				55#2:37
 				*E
 				 } )
diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.txt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.txt
index 258e09da829..4d2d8a3d8c7 100644
--- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.txt
+++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/innerObjectRetransformation.txt
@@ -115,7 +115,6 @@ public final class flow/InnerObjectRetransformationKt$flow$1 {
 
 @kotlin.Metadata
 public final class flow/InnerObjectRetransformationKt$flowWith$$inlined$flow$1$1 {
-    // source: 'innerObjectRetransformation.kt'
     enclosing method flow/InnerObjectRetransformationKt$flowWith$$inlined$flow$1.collect(Lflow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
     field label: int
     synthetic field result: java.lang.Object
@@ -141,7 +140,6 @@ public final class flow/InnerObjectRetransformationKt$flowWith$$inlined$flow$1 {
 
 @kotlin.Metadata
 public final class flow/InnerObjectRetransformationKt$flowWith$$inlined$flow$2$1 {
-    // source: 'innerObjectRetransformation.kt'
     enclosing method flow/InnerObjectRetransformationKt$flowWith$$inlined$flow$2.collect(Lflow/FlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
     field label: int
     synthetic field result: java.lang.Object
diff --git a/compiler/testData/codegen/boxInline/contracts/crossinlineCallableReference.jvm_abi.txt b/compiler/testData/codegen/boxInline/contracts/crossinlineCallableReference.jvm_abi.txt
index 20ae9c2b2d4..2bea8867283 100644
--- a/compiler/testData/codegen/boxInline/contracts/crossinlineCallableReference.jvm_abi.txt
+++ b/compiler/testData/codegen/boxInline/contracts/crossinlineCallableReference.jvm_abi.txt
@@ -70,16 +70,16 @@ MODULE main
 				+ 3 1.kt
 				test/_1Kt
 				*L
-				1#1,32:1
-				17#2:33
-				18#2:36
-				29#3,2:34
+				1#1,25:1
+				17#2:26
+				18#2:29
+				29#3,2:27
 				*S KotlinDebug
 				*F
 				+ 1 1.kt
 				test/OutputWorkScreenView
 				*L
-				17#1:34,2
+				17#1:27,2
 				*E
 				 } )
 			K2
@@ -95,15 +95,15 @@ MODULE main
 				+ 3 1.kt
 				test/_1Kt
 				*L
-				1#1,32:1
-				17#2:33
-				18#2:36
-				29#3,2:34
+				1#1,25:1
+				17#2:26
+				18#2:29
+				29#3,2:27
 				*S KotlinDebug
 				*F
 				+ 1 1.kt
 				test/OutputWorkScreenView
 				*L
-				17#1:34,2
+				17#1:27,2
 				*E
 				 } )
diff --git a/compiler/testData/codegen/boxInline/contracts/exactlyOnceCrossinline2.jvm_abi.txt b/compiler/testData/codegen/boxInline/contracts/exactlyOnceCrossinline2.jvm_abi.txt
index 8c3411cc77e..1c6dcf19536 100644
--- a/compiler/testData/codegen/boxInline/contracts/exactlyOnceCrossinline2.jvm_abi.txt
+++ b/compiler/testData/codegen/boxInline/contracts/exactlyOnceCrossinline2.jvm_abi.txt
@@ -92,8 +92,8 @@ MODULE main
 				+ 2 1.kt
 				test/A
 				*L
-				1#1,33:1
-				20#2,2:34
+				1#1,30:1
+				20#2,2:31
 				*E
 				 } )
 			K2
@@ -107,8 +107,8 @@ MODULE main
 				+ 2 1.kt
 				test/A
 				*L
-				1#1,33:1
-				20#2,2:34
+				1#1,30:1
+				20#2,2:31
 				*E
 				 } )
 	CLASS test/A$foo$$inlined$bar$1.class
@@ -124,9 +124,9 @@ MODULE main
 				+ 2 1.kt
 				test/A
 				*L
-				1#1,33:1
-				20#2:34
-				14#2,8:35
+				1#1,30:1
+				20#2:31
+				14#2,8:32
 				*E
 				 } )
 			K2
@@ -140,8 +140,8 @@ MODULE main
 				+ 2 1.kt
 				test/A
 				*L
-				1#1,33:1
-				20#2:34
-				14#2,8:35
+				1#1,30:1
+				20#2:31
+				14#2,8:32
 				*E
 				 } )
diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/kt19175.smap b/compiler/testData/codegen/boxInline/smap/anonymous/kt19175.smap
index 5b2fca89b81..77b37c30f43 100644
--- a/compiler/testData/codegen/boxInline/smap/anonymous/kt19175.smap
+++ b/compiler/testData/codegen/boxInline/smap/anonymous/kt19175.smap
@@ -1,14 +1,4 @@
 // FILE: 1.kt
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/Introspector$SchemaRetriever$inSchema$lambda$1
-*L
-1#1,14:1
-*E
 
 // FILE: 2.kt
 SMAP
@@ -41,7 +31,7 @@ test/Introspector$SchemaRetriever$inSchema$lambda$1
 + 2 2.kt
 IntrospectorImpl$SchemaRetriever
 *L
-1#1,14:1
-22#2:15
+1#1,10:1
+22#2:11
 *E
 
diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/lambda.kt b/compiler/testData/codegen/boxInline/smap/anonymous/lambda.kt
index 93826d84808..75d33df0b8c 100644
--- a/compiler/testData/codegen/boxInline/smap/anonymous/lambda.kt
+++ b/compiler/testData/codegen/boxInline/smap/anonymous/lambda.kt
@@ -1,5 +1,5 @@
 // NO_CHECK_LAMBDA_INLINING
-// IGNORE_INLINER_K2: IR
+// IGNORE_INLINER: IR
 // FILE: 1.kt
 
 package builders
diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/lambda.smap b/compiler/testData/codegen/boxInline/smap/anonymous/lambda.smap
index 37db878d610..b4d8ec45a10 100644
--- a/compiler/testData/codegen/boxInline/smap/anonymous/lambda.smap
+++ b/compiler/testData/codegen/boxInline/smap/anonymous/lambda.smap
@@ -1,14 +1,4 @@
 // FILE: 1.kt
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-builders/_1Kt$call$lambda$1
-*L
-1#1,13:1
-*E
 
 // FILE: 2.kt
 SMAP
@@ -41,7 +31,7 @@ builders/_1Kt$call$lambda$1
 + 2 2.kt
 _2Kt
 *L
-1#1,13:1
-21#2,2:14
+1#1,10:1
+21#2,2:11
 *E
 
diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.smap b/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.smap
index cb3869e00a4..311690474bb 100644
--- a/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.smap
+++ b/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.smap
@@ -27,25 +27,3 @@ _2Kt
 30#1:37
 *E
 
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt$test$1$1
-*L
-1#1,32:1
-*E
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt$test$1$1
-*L
-1#1,32:1
-*E
-
diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/object.kt b/compiler/testData/codegen/boxInline/smap/anonymous/object.kt
index ae92844e2de..d5623a59bee 100644
--- a/compiler/testData/codegen/boxInline/smap/anonymous/object.kt
+++ b/compiler/testData/codegen/boxInline/smap/anonymous/object.kt
@@ -1,7 +1,7 @@
 // NO_CHECK_LAMBDA_INLINING
+// IGNORE_INLINER: IR
 // FILE: 1.kt
 
-
 package builders
 
 inline fun call(crossinline init: () -> Unit) {
diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/object.smap b/compiler/testData/codegen/boxInline/smap/anonymous/object.smap
index 5b38bce24d9..72ae8d24bf8 100644
--- a/compiler/testData/codegen/boxInline/smap/anonymous/object.smap
+++ b/compiler/testData/codegen/boxInline/smap/anonymous/object.smap
@@ -1,14 +1,4 @@
 // FILE: 1.kt
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-builders/_1Kt$call$1
-*L
-1#1,15:1
-*E
 
 // FILE: 2.kt
 SMAP
@@ -41,7 +31,7 @@ builders/_1Kt$call$1
 + 2 2.kt
 _2Kt
 *L
-1#1,15:1
-24#2,2:16
+1#1,11:1
+24#2,2:12
 *E
 
diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.kt b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.kt
index 9d276c9c78e..a946dabb170 100644
--- a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.kt
+++ b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.kt
@@ -1,8 +1,6 @@
-// IGNORE_BACKEND_MULTI_MODULE: JVM_IR, JVM_MULTI_MODULE_IR_AGAINST_OLD
-// IGNORE_BACKEND: JVM_IR
-// IGNORE_BACKEND_K2_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
 // NO_CHECK_LAMBDA_INLINING
 // FILE: 1.kt
+
 package builders
 inline fun call(crossinline init: () -> Unit) {
     return init()
diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.smap b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.smap
index d123ab534ff..db7ee72eed3 100644
--- a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.smap
+++ b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.smap
@@ -11,41 +11,19 @@ _2Kt
 + 2 1.kt
 builders/_1Kt
 *L
-1#1,34:1
-17#1,3:36
-20#1,8:40
-8#2:35
-8#2:39
+1#1,32:1
+15#1,3:34
+18#1,8:38
+6#2:33
+6#2:37
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-32#1:36,3
-32#1:40,8
-19#1:35
-32#1:39
-*E
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt$test$1$1
-*L
-1#1,34:1
-*E
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt$test$1$1
-*L
-1#1,34:1
+30#1:34,3
+30#1:38,8
+17#1:33
+30#1:37
 *E
 
diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.kt b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.kt
index 797663d4f41..c823caf1116 100644
--- a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.kt
+++ b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.kt
@@ -1,10 +1,9 @@
 // IGNORE
 // NO_CHECK_LAMBDA_INLINING
-// IGNORE_BACKEND_MULTI_MODULE: JVM, JVM_IR, JVM_MULTI_MODULE_OLD_AGAINST_IR, JVM_MULTI_MODULE_IR_AGAINST_OLD
-// IGNORE_BACKEND_K2_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
 // FILE: 1.kt
 // NO_SMAP_DUMP
 
+
 package builders
 
 inline fun call(crossinline init: () -> Unit) {
diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.smap b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.smap
index e95a99769b7..b47ee8e448e 100644
--- a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.smap
+++ b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.smap
@@ -9,15 +9,15 @@ _2Kt
 + 2 1.kt
 builders/_1Kt
 *L
-1#1,36:1
-15#2,3:37
-11#2,15:40
+1#1,35:1
+14#2,3:36
+10#2,15:39
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-34#1:37,3
-34#1:40,15
+33#1:36,3
+33#1:39,15
 *E
 
diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSiteWithCapture.kt b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSiteWithCapture.kt
index 294ce31ba4c..8503b0763a3 100644
--- a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSiteWithCapture.kt
+++ b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSiteWithCapture.kt
@@ -1,7 +1,9 @@
 // NO_CHECK_LAMBDA_INLINING
+// IGNORE_BACKEND: JVM
+// IGNORE_BACKEND_MULTI_MODULE: JVM, JVM_MULTI_MODULE_IR_AGAINST_OLD
+// IGNORE_INLINER: IR
 // FILE: 1.kt
 // NO_SMAP_DUMP
-
 package builders
 //TODO there is a bug in asm it's skips linenumber on same line on reading bytecode
 inline fun call(crossinline init: () -> Unit) {
diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSiteWithCapture.smap b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSiteWithCapture.smap
index 41e420e11ae..cb2583eb250 100644
--- a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSiteWithCapture.smap
+++ b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSiteWithCapture.smap
@@ -9,16 +9,16 @@ _2Kt
 + 2 1.kt
 builders/_1Kt
 *L
-1#1,34:1
-12#2,3:35
-8#2,15:38
+1#1,36:1
+14#2,3:37
+10#2,15:40
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-31#1:35,3
-31#1:38,15
+33#1:37,3
+33#1:40,15
 *E
 
 SMAP
@@ -31,7 +31,7 @@ builders/_1Kt$test$1$1
 + 2 2.kt
 _2Kt
 *L
-1#1,25:1
-31#2:26
+1#1,20:1
+33#2:21
 *E
 
diff --git a/compiler/testData/codegen/boxInline/smap/crossroutines.kt b/compiler/testData/codegen/boxInline/smap/crossroutines.kt
index de57c0623d6..9237ef2660b 100644
--- a/compiler/testData/codegen/boxInline/smap/crossroutines.kt
+++ b/compiler/testData/codegen/boxInline/smap/crossroutines.kt
@@ -1,6 +1,6 @@
 // This test depends on line numbers
+// IGNORE_INLINER: IR
 // WITH_STDLIB
-
 // FILE: 1.kt
 package test
 
diff --git a/compiler/testData/codegen/boxInline/smap/crossroutines.smap b/compiler/testData/codegen/boxInline/smap/crossroutines.smap
index dcc6a864d97..6f21461c541 100644
--- a/compiler/testData/codegen/boxInline/smap/crossroutines.smap
+++ b/compiler/testData/codegen/boxInline/smap/crossroutines.smap
@@ -1,36 +1,4 @@
 // FILE: 1.kt
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$inlineMe2$2
-*L
-1#1,23:1
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$inlineMe1$2
-*L
-1#1,23:1
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$inlineMe1$2$run$1
-*L
-1#1,23:1
-*E
 
 // FILE: 2.kt
 SMAP
@@ -65,8 +33,8 @@ test/_1Kt$inlineMe2$2
 + 2 2.kt
 _2Kt$box$1
 *L
-1#1,23:1
-45#2,2:24
+1#1,21:1
+45#2,2:22
 *E
 
 SMAP
@@ -79,7 +47,7 @@ test/_1Kt$inlineMe1$2
 + 2 2.kt
 _2Kt$box$1
 *L
-1#1,23:1
-42#2,2:24
+1#1,15:1
+42#2,2:16
 *E
 
diff --git a/compiler/testData/codegen/boxInline/smap/defaultFunction.smap b/compiler/testData/codegen/boxInline/smap/defaultFunction.smap
index 381bfe1c877..300cb006d52 100644
--- a/compiler/testData/codegen/boxInline/smap/defaultFunction.smap
+++ b/compiler/testData/codegen/boxInline/smap/defaultFunction.smap
@@ -1,12 +1,2 @@
 // FILE: 1.kt
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$inlineFun$1
-*L
-1#1,10:1
-*E
 
diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.kt b/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.kt
index 33eea83cfb3..ca3b9058613 100644
--- a/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.kt
+++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.kt
@@ -1,4 +1,4 @@
-// IGNORE_INLINER_K2: IR
+// IGNORE_INLINER: IR
 // SEPARATE_SMAP_DUMPS
 // SKIP_INLINE_CHECK_IN: lParams$default
 
diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.smap-nonseparate-compilation b/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.smap-nonseparate-compilation
index ae28ababe8b..d784c120d75 100644
--- a/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.smap-nonseparate-compilation
+++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.smap-nonseparate-compilation
@@ -1,15 +1,4 @@
 // FILE: 1.kt
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$lParams$1
-*L
-1#1,41:1
-*E
-
 SMAP
 1.kt
 Kotlin
@@ -40,19 +29,8 @@ test/_1Kt$kValue$lambda$1
 + 2 1.kt
 test/_1Kt$lParams$1$lambda$1
 *L
-1#1,41:1
-35#2:42
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$kValue$lambda$1
-*L
-1#1,41:1
+1#1,32:1
+35#2:33
 *E
 
 // FILE: 2.kt
diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.smap-separate-compilation b/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.smap-separate-compilation
index bbaf1b64be2..b053ad00fe5 100644
--- a/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.smap-separate-compilation
+++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.smap-separate-compilation
@@ -1,15 +1,4 @@
 // FILE: 1.kt
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$lParams$1
-*L
-1#1,41:1
-*E
-
 SMAP
 1.kt
 Kotlin
@@ -40,19 +29,8 @@ test/_1Kt$kValue$lambda$1
 + 2 1.kt
 test/_1Kt$lParams$1$lambda$1
 *L
-1#1,41:1
-35#2:42
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$kValue$lambda$1
-*L
-1#1,41:1
+1#1,32:1
+35#2:33
 *E
 
 // FILE: 2.kt
@@ -110,7 +88,7 @@ test/_1Kt$kValue$lambda$1
 + 2 1.kt
 test/_1Kt$lParams$1$lambda$1
 *L
-1#1,41:1
-35#2:42
+1#1,32:1
+35#2:33
 *E
 
diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.kt b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.kt
index 15a60ae874d..8cc3ee77308 100644
--- a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.kt
+++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.kt
@@ -1,7 +1,7 @@
 // SEPARATE_SMAP_DUMPS
 // SKIP_INLINE_CHECK_IN: lParams$default
 // IGNORE_BACKEND: JS
-// IGNORE_INLINER_K2: IR
+// IGNORE_INLINER: IR
 // FILE: 1.kt
 
 package test
diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.smap-nonseparate-compilation b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.smap-nonseparate-compilation
index 1f08175d0c9..7d71faece49 100644
--- a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.smap-nonseparate-compilation
+++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.smap-nonseparate-compilation
@@ -29,19 +29,8 @@ test/_1Kt$kValue$lambda$1
 + 2 1.kt
 test/_1Kt$lParams$1
 *L
-1#1,41:1
-35#2:42
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$kValue$lambda$1
-*L
-1#1,41:1
+1#1,32:1
+35#2:33
 *E
 
 // FILE: 2.kt
diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.smap-separate-compilation b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.smap-separate-compilation
index 7c8c2f986dc..5d9114d3931 100644
--- a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.smap-separate-compilation
+++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.smap-separate-compilation
@@ -29,19 +29,8 @@ test/_1Kt$kValue$lambda$1
 + 2 1.kt
 test/_1Kt$lParams$1
 *L
-1#1,41:1
-35#2:42
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$kValue$lambda$1
-*L
-1#1,41:1
+1#1,32:1
+35#2:33
 *E
 
 // FILE: 2.kt
@@ -81,7 +70,7 @@ test/_1Kt$kValue$lambda$1
 + 2 1.kt
 test/_1Kt$lParams$1
 *L
-1#1,41:1
-35#2:42
+1#1,32:1
+35#2:33
 *E
 
diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.kt b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.kt
index aa14cfeb627..4a1b6c625f2 100644
--- a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.kt
+++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.kt
@@ -1,7 +1,7 @@
 // SEPARATE_SMAP_DUMPS
 // SKIP_INLINE_CHECK_IN: lParams$default
 // IGNORE_BACKEND: JS
-// IGNORE_INLINER_K2: IR
+// IGNORE_INLINER: IR
 // FILE: 1.kt
 
 package test
diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.smap-nonseparate-compilation b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.smap-nonseparate-compilation
index 226eebc9738..86c75a58d98 100644
--- a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.smap-nonseparate-compilation
+++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.smap-nonseparate-compilation
@@ -29,19 +29,8 @@ test/_1Kt$kValue$lambda$1
 + 2 1.kt
 test/_1Kt$lParams$1
 *L
-1#1,41:1
-35#2:42
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$kValue$lambda$1
-*L
-1#1,41:1
+1#1,32:1
+35#2:33
 *E
 
 // FILE: 2.kt
diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.smap-separate-compilation b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.smap-separate-compilation
index 156550b916f..7baf992b398 100644
--- a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.smap-separate-compilation
+++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.smap-separate-compilation
@@ -29,19 +29,8 @@ test/_1Kt$kValue$lambda$1
 + 2 1.kt
 test/_1Kt$lParams$1
 *L
-1#1,41:1
-35#2:42
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$kValue$lambda$1
-*L
-1#1,41:1
+1#1,32:1
+35#2:33
 *E
 
 // FILE: 2.kt
@@ -81,7 +70,7 @@ test/_1Kt$kValue$lambda$1
 + 2 1.kt
 test/_1Kt$lParams$1
 *L
-1#1,41:1
-35#2:42
+1#1,32:1
+35#2:33
 *E
 
diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/kt21827.smap b/compiler/testData/codegen/boxInline/smap/defaultLambda/kt21827.smap
index dc5b3ef1fde..444d5634b27 100644
--- a/compiler/testData/codegen/boxInline/smap/defaultLambda/kt21827.smap
+++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/kt21827.smap
@@ -1,14 +1,4 @@
 // FILE: 1.kt
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$lParams$1
-*L
-1#1,38:1
-*E
 
 // FILE: 2.kt
 SMAP
diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/nested.kt b/compiler/testData/codegen/boxInline/smap/defaultLambda/nested.kt
index af9d5891999..7aaf9fa2151 100644
--- a/compiler/testData/codegen/boxInline/smap/defaultLambda/nested.kt
+++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/nested.kt
@@ -1,4 +1,4 @@
-// IGNORE_INLINER_K2: IR
+// IGNORE_INLINER: IR
 // SKIP_INLINE_CHECK_IN: inlineFun$default
 // FILE: 1.kt
 
diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/nested.smap b/compiler/testData/codegen/boxInline/smap/defaultLambda/nested.smap
index 4a9ca28145b..5824353ae58 100644
--- a/compiler/testData/codegen/boxInline/smap/defaultLambda/nested.smap
+++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/nested.smap
@@ -1,25 +1,4 @@
 // FILE: 1.kt
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$inlineFun$lambda2$1
-*L
-1#1,13:1
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$inlineFun$1
-*L
-1#1,13:1
-*E
 
 // FILE: 2.kt
 SMAP
@@ -52,7 +31,7 @@ test/_1Kt$inlineFun$lambda2$1
 + 2 1.kt
 test/_1Kt$inlineFun$1
 *L
-1#1,13:1
-7#2:14
+1#1,9:1
+7#2:10
 *E
 
diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/simple.smap b/compiler/testData/codegen/boxInline/smap/defaultLambda/simple.smap
index 795617691f5..04c5b63d5bf 100644
--- a/compiler/testData/codegen/boxInline/smap/defaultLambda/simple.smap
+++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/simple.smap
@@ -1,14 +1,4 @@
 // FILE: 1.kt
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$inlineFun$1
-*L
-1#1,11:1
-*E
 
 // FILE: 2.kt
 SMAP
diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/simple2.smap b/compiler/testData/codegen/boxInline/smap/defaultLambda/simple2.smap
index 7b1f7f7ee59..9bb7ac7a92b 100644
--- a/compiler/testData/codegen/boxInline/smap/defaultLambda/simple2.smap
+++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/simple2.smap
@@ -1,14 +1,4 @@
 // FILE: 1.kt
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$lParams$1
-*L
-1#1,38:1
-*E
 
 // FILE: 2.kt
 SMAP
diff --git a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.jvm_abi.txt b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.jvm_abi.txt
index 5b53b11f8f8..6a4bd51d0fc 100644
--- a/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.jvm_abi.txt
+++ b/compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.jvm_abi.txt
@@ -12,8 +12,8 @@ MODULE main
 				+ 2 box.kt
 				BoxKt
 				*L
-				1#1,48:1
-				66#2:49
+				1#1,38:1
+				66#2:39
 				*E
 				 } )
 			K2
@@ -27,7 +27,7 @@ MODULE main
 				+ 2 box.kt
 				BoxKt
 				*L
-				1#1,48:1
-				67#2:49
+				1#1,38:1
+				67#2:39
 				*E
 				 } )
diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.txt b/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.txt
index df3d01777c5..89d0678844f 100644
--- a/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.txt
+++ b/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation.txt
@@ -81,7 +81,6 @@ public final class TcoContinuationKt$foo$$inlined$flow$1 {
 @kotlin.Metadata
 @kotlin.coroutines.jvm.internal.DebugMetadata
 public final class TcoContinuationKt$foo$$inlined$map$1$2$1 {
-    // source: 'tcoContinuation.kt'
     enclosing method TcoContinuationKt$foo$$inlined$map$1$2.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
     field L$0: java.lang.Object
     field label: int
@@ -116,7 +115,6 @@ public final class TcoContinuationKt$foo$$inlined$map$1 {
 
 @kotlin.Metadata
 public final class TcoContinuationKt$map$$inlined$transform$1$1 {
-    // source: 'tcoContinuation.kt'
     enclosing method TcoContinuationKt$map$$inlined$transform$1.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
     field label: int
     synthetic field result: java.lang.Object
@@ -130,7 +128,6 @@ public final class TcoContinuationKt$map$$inlined$transform$1$1 {
 @kotlin.Metadata
 @kotlin.coroutines.jvm.internal.DebugMetadata
 public final class TcoContinuationKt$map$$inlined$transform$1$2$1 {
-    // source: 'tcoContinuation.kt'
     enclosing method TcoContinuationKt$map$$inlined$transform$1$2.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
     field L$0: java.lang.Object
     field label: int
@@ -170,7 +167,6 @@ public final class TcoContinuationKt$map$$inlined$transform$1 {
 
 @kotlin.Metadata
 public final class TcoContinuationKt$transform$$inlined$flow$1$1 {
-    // source: 'tcoContinuation.kt'
     enclosing method TcoContinuationKt$transform$$inlined$flow$1.collect(LFlowCollector;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
     field label: int
     synthetic field result: java.lang.Object
@@ -196,7 +192,6 @@ public final class TcoContinuationKt$transform$$inlined$flow$1 {
 
 @kotlin.Metadata
 public final class TcoContinuationKt$transform$lambda$1$$inlined$collect$1$1 {
-    // source: 'tcoContinuation.kt'
     enclosing method TcoContinuationKt$transform$lambda$1$$inlined$collect$1.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
     field label: int
     synthetic field result: java.lang.Object