diff --git a/plugins/kotlin/testData/results/pkg/TestCompileTimeErrors.dec b/plugins/kotlin/testData/results/pkg/TestCompileTimeErrors.dec
index 7593b4c6a..013bd9fd9 100644
--- a/plugins/kotlin/testData/results/pkg/TestCompileTimeErrors.dec
+++ b/plugins/kotlin/testData/results/pkg/TestCompileTimeErrors.dec
@@ -1,7 +1,5 @@
 package pkg
 
-import org.jetbrains.annotations.Nullable
-
 class TestCompileTimeErrors {
    public fun <I, O> test(i: I): O where O : I, O : pkg.TestCompileTimeErrors.Test {
       throw new NotImplementedError(null, 1, null);// 10
@@ -9,16 +7,14 @@ class TestCompileTimeErrors {
 
    public fun test2(i: Int?): pkg.TestCompileTimeErrors.Test? {
       return if (i == null) null else new TestCompileTimeErrors.Test(i) {
-         @Nullable
          private final Integer testValue;
 
          {
-            this.testValue = `$i`;
+            this.testValue = `$i`;// 16
          }// 14
 
-         @Nullable
          public Integer getTestValue() {
-            return this.testValue;// 16
+            return this.testValue;// 15
          }
 
          /** @deprecated */
@@ -35,50 +31,51 @@ class TestCompileTimeErrors {
 
 class 'pkg/TestCompileTimeErrors' {
    method 'test (Ljava/lang/Object;)Ljava/lang/Object;' {
-      4      6
-      5      6
-      6      6
-      a      6
+      4      4
+      5      4
+      6      4
+      a      4
    }
 
    method 'test2 (Ljava/lang/Integer;)Lpkg/TestCompileTimeErrors$Test;' {
-      0      10
-      1      10
-      2      10
-      3      10
-      4      10
-      c      10
-      10      10
-      11      10
-      12      10
-      13      10
+      0      8
+      1      8
+      2      8
+      3      8
+      4      8
+      c      8
+      10      8
+      11      8
+      12      8
+      13      8
    }
 }
 
 class 'pkg/TestCompileTimeErrors$test2$1' {
    method '<init> (Ljava/lang/Integer;)V' {
-      4      15
-      5      15
-      6      15
-      7      15
-      8      15
-      9      16
+      4      12
+      5      12
+      6      12
+      7      12
+      8      12
+      9      13
    }
 
    method 'getTestValue ()Ljava/lang/Integer;' {
-      0      20
-      1      20
-      2      20
-      3      20
-      4      20
+      0      16
+      1      16
+      2      16
+      3      16
+      4      16
    }
 
    method 'getTestValue$annotations ()V' {
-      0      26
+      0      22
    }
 }
 
 Lines mapping:
-10 <-> 7
-14 <-> 17
-16 <-> 21
+10 <-> 5
+14 <-> 14
+15 <-> 17
+16 <-> 13
diff --git a/plugins/kotlin/testData/results/pkg/TestContracts.dec b/plugins/kotlin/testData/results/pkg/TestContracts.dec
index d7a520b05..00ad4fdcd 100644
--- a/plugins/kotlin/testData/results/pkg/TestContracts.dec
+++ b/plugins/kotlin/testData/results/pkg/TestContracts.dec
@@ -1,7 +1,9 @@
 package pkg
 
 import kotlin.contracts.InvocationKind
+import kotlin.jvm.internal.SourceDebugExtension
 
+@SourceDebugExtension(["SMAP\nTestContracts.kt\nKotlin\n*S Kotlin\n*F\n+ 1 TestContracts.kt\npkg/TestContracts\n+ 2 fake.kt\nkotlin/jvm/internal/FakeKt\n*L\n1#1,56:1\n1#2:57\n*E\n"])
 class TestContracts {
    public fun testSimpleContract(x: Int?): Int {
       contract {
@@ -73,176 +75,170 @@ class TestContracts {
 
 class 'pkg/TestContracts' {
    method 'testSimpleContract (Ljava/lang/Integer;)I' {
-      1      10
-      2      10
-      3      10
-      4      10
-      9      11
-      a      11
-      b      11
-      c      11
-      d      11
-      11      11
-      12      13
-      13      13
-      14      13
-      15      13
-      16      13
+      0      12
+      1      12
+      2      12
+      3      12
+      8      13
+      9      13
+      a      13
+      b      13
+      c      13
+      10      13
+      11      15
+      12      15
+      13      15
+      14      15
+      15      15
    }
 
    method 'testBooleanContract (ZZ)Ljava/lang/Boolean;' {
-      1      24
-      2      24
-      3      24
-      4      24
-      5      24
-      6      24
-      7      24
-      8      24
-      9      24
-      d      24
-      e      24
-      f      24
-      10      24
-      11      24
-      12      24
-      13      24
-      14      24
-      1a      24
-      1b      24
-      1c      24
-      1d      24
+      0      26
+      1      26
+      2      26
+      3      26
+      4      26
+      5      26
+      6      26
+      7      26
+      8      26
+      c      26
+      d      26
+      e      26
+      f      26
+      10      26
+      11      26
+      12      26
+      13      26
+      19      26
+      1a      26
+      1b      26
+      1c      26
    }
 
    method 'testTypeContract (Ljava/lang/Object;)I' {
-      1      32
-      5      32
-      6      32
-      7      32
-      c      33
-      d      33
-      e      33
-      f      33
-      10      33
-      14      33
-      15      35
-      16      35
-      17      35
-      18      35
-      19      35
-      1a      35
-      1b      35
-      1c      35
+      0      34
+      4      34
+      5      34
+      6      34
+      b      35
+      c      35
+      d      35
+      e      35
+      f      35
+      13      35
+      14      37
+      15      37
+      16      37
+      17      37
+      18      37
+      19      37
+      1a      37
+      1b      37
    }
 
    method 'testFunctionalContract (Lkotlin/jvm/functions/Function0;)I' {
-      7      44
-      8      44
-      9      44
-      a      44
-      b      44
-      c      44
-      d      44
-      e      44
-      f      44
-      10      44
-      11      44
-      12      44
-      13      44
+      6      46
+      7      46
+      8      46
+      9      46
+      a      46
+      b      46
+      c      46
+      d      46
+      e      46
+      f      46
+      10      46
+      11      46
+      12      46
    }
 
    method 'testFunctionalContract2 (Lkotlin/jvm/functions/Function0;Z)I' {
-      7      52
-      8      52
-      9      52
-      a      52
-      b      52
-      c      52
-      d      52
-      e      52
-      f      52
-      10      52
-      11      52
-      12      52
-      13      52
-      14      52
-      15      52
-      16      52
-      1a      52
-      1b      52
+      6      54
+      7      54
+      8      54
+      9      54
+      a      54
+      b      54
+      c      54
+      d      54
+      e      54
+      f      54
+      10      54
+      11      54
+      12      54
+      13      54
+      14      54
+      15      54
+      19      54
+      1a      54
    }
 
    method 'testFunctionalContract3 (Lkotlin/jvm/functions/Function0;I)I' {
-      b      60
-      c      60
-      10      60
-      11      60
-      12      60
-      13      60
-      14      61
-      15      61
-      16      61
-      17      62
-      18      62
-      19      62
-      1a      62
-      1b      62
-      1c      62
-      1d      62
-      1e      62
-      1f      64
-      20      64
-      21      64
-      22      64
-      23      64
-      24      64
-      25      64
-      29      65
-      2a      65
-      2b      65
-      2c      65
-      2d      65
-      2e      65
-      2f      65
-      30      65
-      31      65
-      32      65
-      3e      66
-      3f      66
-      40      66
-      41      66
-      42      66
-      43      66
-      44      66
-      45      66
-      46      66
-      47      66
-      48      66
-      49      66
-      4e      66
-      4f      66
-      51      66
-      52      66
-      56      69
-      57      69
-      58      69
+      a      62
+      b      62
+      f      62
+      10      62
+      11      62
+      12      62
+      13      63
+      14      63
+      15      63
+      16      64
+      17      64
+      18      64
+      19      64
+      1a      64
+      1b      64
+      1c      64
+      1d      64
+      1e      66
+      1f      66
+      20      66
+      21      66
+      22      66
+      23      66
+      24      66
+      28      67
+      29      67
+      2a      67
+      2b      67
+      2c      67
+      2d      67
+      2e      67
+      2f      67
+      30      67
+      31      67
+      3d      68
+      3e      68
+      3f      68
+      40      68
+      41      68
+      42      68
+      43      68
+      44      68
+      45      68
+      46      68
+      47      68
+      48      68
+      4d      68
+      4e      68
+      50      68
+      51      68
+      55      71
+      56      71
+      57      71
    }
 }
 
 Lines mapping:
-13 <-> 11
-14 <-> 14
-24 <-> 25
-31 <-> 33
-32 <-> 36
-39 <-> 45
-46 <-> 53
-53 <-> 70
+13 <-> 13
+14 <-> 16
+24 <-> 27
+31 <-> 35
+32 <-> 38
+39 <-> 47
+46 <-> 55
+53 <-> 72
 Not mapped:
-10
-18
-28
-36
-43
-50
 57
diff --git a/plugins/kotlin/testData/results/pkg/TestDestructors.dec b/plugins/kotlin/testData/results/pkg/TestDestructors.dec
index 3d2afeff4..201601657 100644
--- a/plugins/kotlin/testData/results/pkg/TestDestructors.dec
+++ b/plugins/kotlin/testData/results/pkg/TestDestructors.dec
@@ -1,7 +1,9 @@
 package pkg
 
 import kotlin.jvm.functions.Function0
+import kotlin.jvm.internal.SourceDebugExtension
 
+@SourceDebugExtension(["SMAP\nTestDestructors.kt\nKotlin\n*S Kotlin\n*F\n+ 1 TestDestructors.kt\npkg/TestDestructors\n*L\n1#1,71:1\n68#1,3:72\n68#1,3:75\n*S KotlinDebug\n*F\n+ 1 TestDestructors.kt\npkg/TestDestructors\n*L\n49#1:72,3\n54#1:75,3\n*E\n"])
 class TestDestructors {
    public fun destructDataClasses(x: Pair<String, Int?>, y: Triple<Number, Boolean?, String>) {
       System.out.println(x.component1() as java.lang.String + " " + x.component2() as Integer);// 8 9
@@ -31,891 +33,607 @@ class TestDestructors {
       System.out.println("" + this.component1(x) + this.component2(x) + this.component3(x));// 44 45
    }// 46
 
-   public inline fun destructInlineLambda(x: () -> Int) {
-      System.out
-         .println(
-            ""
-               + this.component1((x.invoke() as java.lang.Number).intValue())// 49 50 85
-               + this.component2((x.invoke() as java.lang.Number).intValue())// 86
-               + this.component3((x.invoke() as java.lang.Number).intValue())// 87
-         );
-   }// 51
-
-   public fun callDestructInlineLambda() {
-      System.out.println("" + this.component1(123) + this.component2(123) + this.component3(123));// 54 88 89 90 91 92
-   }// 55
-
-   public fun callDestructInlineLambdaWithControlFlow(x: Int) {
-      if (100 <= x && x < 1000) {
-         var `a$iv`: Int = this.component1(x);// 95
-         if (100 <= x && x < 1000) {// 96
-            var `b$iv`: Int = this.component2(x);
-            if (100 <= x && x < 1000) {// 58 97
-               System.out.println("" + `a$iv` + `b$iv` + this.component3(x));// 94 98
-            }
-         }
-      }
-   }// 99
-
    public fun destructInlineLambdaNoInline(x: () -> Int) {
       System.out
          .println(
             ""
-               + this.component1((x.invoke() as java.lang.Number).intValue())// 62 63 100
-               + this.component2((x.invoke() as java.lang.Number).intValue())// 101
-               + this.component3((x.invoke() as java.lang.Number).intValue())// 102
+               + this.component1((x.invoke() as java.lang.Number).intValue())// 49 50 72
+               + this.component2((x.invoke() as java.lang.Number).intValue())// 73
+               + this.component3((x.invoke() as java.lang.Number).intValue())// 74
          );
-   }// 64
+   }// 51
 
    public fun destructLambdaInline(x: Int) {
-      var var2: Function0 = new <undefinedtype>(x);// 67
+      var var2: Function0 = TestDestructors::destructLambdaInline$lambda$0;
       System.out
          .println(
             ""
-               + this.component1((var2.invoke() as java.lang.Number).intValue())// 68 103
-               + this.component2((var2.invoke() as java.lang.Number).intValue())// 104
-               + this.component3((var2.invoke() as java.lang.Number).intValue())// 105
+               + this.component1((var2.invoke() as java.lang.Number).intValue())// 55 75
+               + this.component2((var2.invoke() as java.lang.Number).intValue())// 76
+               + this.component3((var2.invoke() as java.lang.Number).intValue())// 77
          );
-   }// 69
+   }// 56
 
    public operator fun Int.component1(): Int {
-      return java.lang.String.valueOf(`$this$component1`).charAt(0) - 48;// 77
+      return java.lang.String.valueOf(`$this$component1`).charAt(0) - 48;// 64
    }
 
    public operator fun Int.component2(): Int {
-      return java.lang.String.valueOf(`$this$component2`).charAt(1) - 48;// 78
+      return java.lang.String.valueOf(`$this$component2`).charAt(1) - 48;// 65
    }
 
    public operator fun Int.component3(): Int {
-      return java.lang.String.valueOf(`$this$component3`).charAt(2) - 48;// 79
+      return java.lang.String.valueOf(`$this$component3`).charAt(2) - 48;// 66
    }
 
    public inline operator fun (() -> Int).component1(): Int {
-      return this.component1((`$this$component1`.invoke() as java.lang.Number).intValue());// 81
+      return this.component1((`$this$component1`.invoke() as java.lang.Number).intValue());// 68
    }
 
    public inline operator fun (() -> Int).component2(): Int {
-      return this.component2((`$this$component2`.invoke() as java.lang.Number).intValue());// 82
+      return this.component2((`$this$component2`.invoke() as java.lang.Number).intValue());// 69
    }
 
    public inline operator fun (() -> Int).component3(): Int {
-      return this.component3((`$this$component3`.invoke() as java.lang.Number).intValue());// 83
+      return this.component3((`$this$component3`.invoke() as java.lang.Number).intValue());// 70
+   }
+
+   @JvmStatic
+   fun `destructLambdaInline$lambda$0`(`$x`: Int): Int {
+      return `$x`;// 54
    }
 }
 
 class 'pkg/TestDestructors' {
    method 'destructDataClasses (Lkotlin/Pair;Lkotlin/Triple;)V' {
-      c      6
-      d      6
-      e      6
-      f      6
-      10      6
-      11      6
-      12      6
-      14      6
-      15      6
-      16      6
-      17      6
-      18      6
-      19      6
-      1a      6
-      1d      6
-      1e      6
-      1f      6
-      20      6
-      21      6
-      22      6
-      23      6
-      24      6
-      25      6
-      26      6
-      27      6
-      29      6
-      2a      6
-      2b      6
-      2c      7
-      2d      7
-      2e      7
-      2f      7
-      30      7
-      31      7
-      32      7
-      35      7
-      36      7
-      37      7
-      38      7
-      39      7
-      3a      7
-      3b      7
-      3e      7
-      3f      7
-      40      7
-      41      7
-      42      7
-      43      7
-      44      7
-      47      7
-      48      7
-      49      7
-      4a      7
-      4b      7
-      4c      7
-      4d      7
-      4e      7
-      4f      7
-      50      7
-      51      7
-      52      7
-      53      7
-      54      7
-      56      7
-      57      7
-      58      7
-      59      8
+      c      8
+      d      8
+      e      8
+      f      8
+      10      8
+      11      8
+      12      8
+      14      8
+      15      8
+      16      8
+      17      8
+      18      8
+      19      8
+      1a      8
+      1d      8
+      1e      8
+      1f      8
+      20      8
+      21      8
+      22      8
+      23      8
+      24      8
+      25      8
+      26      8
+      27      8
+      29      8
+      2a      8
+      2b      8
+      2c      9
+      2d      9
+      2e      9
+      2f      9
+      30      9
+      31      9
+      32      9
+      35      9
+      36      9
+      37      9
+      38      9
+      39      9
+      3a      9
+      3b      9
+      3e      9
+      3f      9
+      40      9
+      41      9
+      42      9
+      43      9
+      44      9
+      47      9
+      48      9
+      49      9
+      4a      9
+      4b      9
+      4c      9
+      4d      9
+      4e      9
+      4f      9
+      50      9
+      51      9
+      52      9
+      53      9
+      54      9
+      56      9
+      57      9
+      58      9
+      59      10
    }
 
    method 'destructDataClassesSpecial (Lkotlin/Pair;Lkotlin/Triple;)V' {
-      c      11
-      d      11
-      e      11
-      f      11
-      10      11
-      11      11
-      12      11
-      13      11
-      14      11
-      15      11
-      17      11
-      18      11
-      19      11
-      1a      11
-      1b      11
-      1c      11
-      1d      11
-      20      11
-      21      11
-      22      11
-      23      11
-      24      11
-      25      11
-      26      11
-      27      11
-      28      11
-      29      11
-      2a      11
-      2c      11
-      2d      11
-      2e      11
-      2f      12
-      30      12
-      31      12
-      32      12
-      33      12
-      34      12
-      35      12
-      36      12
-      37      12
-      38      13
-      39      13
-      3a      13
-      3b      13
-      3c      13
-      3d      13
-      3e      13
-      3f      13
-      40      13
-      41      14
-      42      14
-      43      14
-      44      14
-      46      15
-      47      15
-      48      15
-      4b      15
-      4c      15
-      4d      15
-      4e      15
-      4f      15
-      50      15
-      51      15
-      52      15
-      53      15
-      54      15
-      55      15
-      56      15
-      57      15
-      58      15
-      5a      15
-      5b      15
-      5c      15
-      5d      16
+      c      13
+      d      13
+      e      13
+      f      13
+      10      13
+      11      13
+      12      13
+      13      13
+      14      13
+      15      13
+      17      13
+      18      13
+      19      13
+      1a      13
+      1b      13
+      1c      13
+      1d      13
+      20      13
+      21      13
+      22      13
+      23      13
+      24      13
+      25      13
+      26      13
+      27      13
+      28      13
+      29      13
+      2a      13
+      2c      13
+      2d      13
+      2e      13
+      2f      14
+      30      14
+      31      14
+      32      14
+      33      14
+      34      14
+      35      14
+      36      14
+      37      14
+      38      15
+      39      15
+      3a      15
+      3b      15
+      3c      15
+      3d      15
+      3e      15
+      3f      15
+      40      15
+      41      16
+      42      16
+      43      16
+      44      16
+      46      17
+      47      17
+      48      17
+      4b      17
+      4c      17
+      4d      17
+      4e      17
+      4f      17
+      50      17
+      51      17
+      52      17
+      53      17
+      54      17
+      55      17
+      56      17
+      57      17
+      58      17
+      5a      17
+      5b      17
+      5c      17
+      5d      18
    }
 
    method 'destructDataClassesSkip (Lkotlin/Triple;Lkotlin/Triple;)V' {
-      c      19
-      d      19
-      e      19
-      f      19
-      10      19
-      11      19
-      12      19
-      14      19
-      15      19
-      16      19
-      17      19
-      18      19
-      19      19
-      1a      19
-      1b      20
-      1c      20
-      1d      20
-      1e      20
-      1f      20
-      20      20
-      21      20
-      24      20
-      25      20
-      26      20
-      27      20
-      28      20
-      29      20
-      2a      20
-      2d      20
-      2e      20
-      2f      20
-      30      20
-      31      20
-      32      20
-      33      20
-      34      20
-      35      20
-      36      20
-      37      20
-      38      20
-      3a      20
-      3b      20
-      3c      20
-      3d      21
+      c      21
+      d      21
+      e      21
+      f      21
+      10      21
+      11      21
+      12      21
+      14      21
+      15      21
+      16      21
+      17      21
+      18      21
+      19      21
+      1a      21
+      1b      22
+      1c      22
+      1d      22
+      1e      22
+      1f      22
+      20      22
+      21      22
+      24      22
+      25      22
+      26      22
+      27      22
+      28      22
+      29      22
+      2a      22
+      2d      22
+      2e      22
+      2f      22
+      30      22
+      31      22
+      32      22
+      33      22
+      34      22
+      35      22
+      36      22
+      37      22
+      38      22
+      3a      22
+      3b      22
+      3c      22
+      3d      23
    }
 
    method 'destructorImpossible (Lkotlin/Pair;)Ljava/lang/String;' {
-      6      24
-      7      24
-      8      24
-      9      24
-      a      24
-      b      24
-      c      24
-      d      24
-      e      25
-      f      25
-      10      25
-      11      25
-      1a      26
+      6      26
+      7      26
+      8      26
+      9      26
+      a      26
+      b      26
+      c      26
+      d      26
+      e      27
+      f      27
+      10      27
+      11      27
+      1a      28
    }
 
    method 'destructExtensionFunction (I)V' {
-      0      30
-      1      30
-      2      30
-      3      30
-      4      30
-      6      30
-      7      30
-      8      30
-      9      30
-      a      30
-      c      30
-      d      30
-      e      30
-      f      30
-      10      30
-      13      30
-      14      30
-      15      30
-      16      30
-      17      30
-      18      30
-      19      30
-      1a      30
-      1b      30
-      1c      30
-      1d      30
-      1e      30
-      20      30
-      21      30
-      22      30
-      23      31
+      0      32
+      1      32
+      2      32
+      3      32
+      4      32
+      6      32
+      7      32
+      8      32
+      9      32
+      a      32
+      c      32
+      d      32
+      e      32
+      f      32
+      10      32
+      13      32
+      14      32
+      15      32
+      16      32
+      17      32
+      18      32
+      19      32
+      1a      32
+      1b      32
+      1c      32
+      1d      32
+      1e      32
+      20      32
+      21      32
+      22      32
+      23      33
    }
 
-   method 'destructInlineLambda (Lkotlin/jvm/functions/Function0;)V' {
-      8      37
-      b      37
-      11      37
-      12      37
-      13      37
-      14      37
-      15      37
-      16      37
-      17      37
-      18      37
-      19      37
-      1a      37
-      1b      37
-      1c      37
-      1d      37
-      1e      37
-      1f      37
-      20      37
-      21      37
-      22      37
-      24      38
-      27      38
-      2d      38
-      2e      38
-      2f      38
-      30      38
-      31      38
-      32      38
-      33      38
-      34      38
-      35      38
-      36      38
-      37      38
-      38      38
-      39      38
-      3a      38
-      3b      38
-      3c      38
-      3d      38
-      3e      38
-      41      39
-      44      39
-      4a      39
-      4b      39
-      4c      39
-      4d      39
-      4e      39
-      4f      39
-      50      39
-      51      39
-      52      39
-      53      39
-      54      39
-      55      39
-      56      39
-      57      39
-      58      39
+   method 'destructInlineLambdaNoInline (Lkotlin/jvm/functions/Function0;)V' {
+      6      39
+      8      39
+      e      39
+      f      39
+      10      39
+      11      39
+      12      39
+      13      39
+      14      39
+      15      39
+      16      39
+      17      39
+      18      39
+      19      39
+      1a      39
+      1b      39
+      1c      39
+      1d      39
+      1e      39
+      20      40
+      23      40
+      29      40
+      2a      40
+      2b      40
+      2c      40
+      2d      40
+      2e      40
+      2f      40
+      30      40
+      31      40
+      32      40
+      33      40
+      34      40
+      35      40
+      36      40
+      37      40
+      38      40
+      39      40
+      3a      40
+      3c      41
+      3f      41
+      45      41
+      46      41
+      47      41
+      48      41
+      49      41
+      4a      41
+      4b      41
+      4c      41
+      4d      41
+      4e      41
+      4f      41
+      50      41
+      51      41
+      52      41
+      53      41
+      54      41
+      55      41
+      56      41
       59      39
-      5a      39
-      5b      39
-      5e      37
+      5a      40
+      5b      41
+      5c      41
+      5d      38
+      5e      38
       5f      38
       60      38
-      61      39
-      62      39
+      61      38
+      62      36
       63      36
       64      36
-      65      36
-      66      36
-      67      36
-      68      34
-      69      34
-      6a      34
-      6c      35
-      6d      35
-      6e      35
-      6f      41
+      66      37
+      67      37
+      68      37
+      69      43
    }
 
-   method 'callDestructInlineLambda ()V' {
-      0      44
-      4      44
-      9      44
-      f      44
-      10      44
-      13      44
-      14      44
-      15      44
-      16      44
-      17      44
-      18      44
-      19      44
-      1c      44
-      22      44
-      23      44
-      29      44
-      2a      44
-      2d      44
-      2e      44
-      2f      44
-      30      44
-      31      44
-      32      44
-      33      44
-      35      44
-      3b      44
-      3c      44
-      42      44
-      43      44
-      46      44
-      47      44
-      48      44
-      49      44
-      4a      44
-      4b      44
-      4c      44
-      4f      44
-      50      44
-      51      44
-      52      44
-      53      44
-      54      44
-      55      44
-      56      44
-      57      44
-      58      44
-      59      44
-      5a      44
-      5b      44
-      5d      44
-      5e      44
-      5f      44
-      61      45
-   }
-
-   method 'callDestructInlineLambdaWithControlFlow (I)V' {
-      0      49
-      4      49
-      a      49
-      b      49
-      11      48
-      12      48
-      13      48
-      14      48
-      15      48
-      16      48
-      17      48
-      18      48
-      19      48
-      1a      48
-      1b      48
-      1c      48
-      1d      48
-      27      48
-      28      48
-      29      48
-      2a      49
-      2e      57
-      2f      49
-      30      49
-      31      49
-      32      49
-      33      49
-      34      49
-      35      49
-      36      49
+   method 'destructLambdaInline (I)V' {
+      6      46
+      7      50
+      a      50
+      10      50
+      11      50
+      12      50
+      13      50
+      14      50
+      15      50
+      16      50
+      17      50
+      18      50
+      19      50
+      1a      50
+      1b      50
+      1c      50
+      1d      50
+      1e      50
+      1f      50
+      20      50
+      21      50
+      23      51
+      26      51
+      2c      51
+      2d      51
+      2e      51
+      2f      51
+      30      51
+      31      51
+      32      51
+      33      51
+      34      51
+      35      51
+      36      51
+      37      51
       38      51
-      3e      51
-      3f      51
-      45      50
-      46      50
-      47      50
-      49      50
-      4a      50
-      4b      50
-      4d      50
-      4e      50
-      4f      50
-      50      50
-      51      50
-      52      50
-      53      50
+      39      51
+      3a      51
+      3b      51
+      3c      51
+      3d      51
+      40      52
+      43      52
+      49      52
+      4a      52
+      4b      52
+      4c      52
+      4d      52
+      4e      52
+      4f      52
+      50      52
+      51      52
+      52      52
+      53      52
+      54      52
+      55      52
+      56      52
+      57      52
+      58      52
+      59      52
+      5a      52
       5d      50
-      5e      50
-      5f      50
-      60      51
-      64      57
-      65      51
-      66      51
-      67      51
-      68      51
-      69      51
-      6a      51
-      6b      51
-      6c      51
-      6e      53
-      74      53
-      75      53
-      7b      52
-      7c      52
-      7d      52
-      7f      52
-      80      52
-      81      52
-      83      52
-      84      52
-      85      52
-      86      52
-      87      52
-      88      52
-      89      52
-      93      52
-      94      52
-      95      52
-      96      53
-      9a      57
-      9b      53
-      9c      53
-      9d      53
-      9e      53
-      9f      53
-      a0      53
-      a1      53
-      a4      53
-      a5      53
-      a6      53
-      a7      53
-      a8      53
-      a9      53
-      aa      53
-      ab      53
-      ac      53
-      ad      53
-      ae      53
-      b4      53
-      b5      53
-      b6      53
-      b8      57
-   }
-
-   method 'destructInlineLambdaNoInline (Lkotlin/jvm/functions/Function0;)V' {
-      6      63
-      8      63
-      e      63
-      f      63
-      10      63
-      11      63
-      12      63
-      13      63
-      14      63
-      15      63
-      16      63
-      17      63
-      18      63
-      19      63
-      1a      63
-      1b      63
-      1c      63
-      1d      63
-      1e      63
-      20      64
-      23      64
-      29      64
-      2a      64
-      2b      64
-      2c      64
-      2d      64
-      2e      64
-      2f      64
-      30      64
-      31      64
-      32      64
-      33      64
-      34      64
-      35      64
-      36      64
-      37      64
-      38      64
-      39      64
-      3a      64
-      3c      65
-      3f      65
-      45      65
-      46      65
-      47      65
-      48      65
-      49      65
-      4a      65
-      4b      65
-      4c      65
-      4d      65
-      4e      65
-      4f      65
-      50      65
-      51      65
-      52      65
-      53      65
-      54      65
-      55      65
-      56      65
-      59      63
-      5a      64
-      5b      65
-      5c      65
-      5d      62
-      5e      62
-      5f      62
-      60      62
-      61      62
-      62      60
-      63      60
-      64      60
-      66      61
-      67      61
-      68      61
-      69      67
-   }
-
-   method 'destructLambdaInline (I)V' {
-      4      70
-      8      70
-      9      70
-      a      70
-      b      70
-      c      74
-      f      74
-      15      74
-      16      74
-      17      74
-      18      74
-      19      74
-      1a      74
-      1b      74
-      1c      74
-      1d      74
-      1e      74
-      1f      74
-      20      74
-      21      74
-      22      74
-      23      74
-      24      74
-      25      74
-      26      74
-      28      75
-      2b      75
-      31      75
-      32      75
-      33      75
-      34      75
-      35      75
-      36      75
-      37      75
-      38      75
-      39      75
-      3a      75
-      3b      75
-      3c      75
-      3d      75
-      3e      75
-      3f      75
-      40      75
-      41      75
-      42      75
-      45      76
-      48      76
-      4e      76
-      4f      76
-      50      76
-      51      76
-      52      76
-      53      76
-      54      76
-      55      76
-      56      76
-      57      76
-      58      76
-      59      76
-      5a      76
-      5b      76
-      5c      76
-      5d      76
-      5e      76
-      5f      76
-      62      74
-      63      75
-      64      75
-      65      76
-      66      76
-      67      73
-      68      73
-      69      73
-      6a      73
-      6b      73
-      6c      71
-      6d      71
-      6e      71
-      70      72
-      71      72
-      72      72
-      73      78
+      5e      51
+      5f      51
+      60      52
+      61      52
+      62      49
+      63      49
+      64      49
+      65      49
+      66      49
+      67      47
+      68      47
+      69      47
+      6b      48
+      6c      48
+      6d      48
+      6e      54
    }
 
    method 'component1 (I)I' {
-      0      81
-      1      81
-      2      81
-      3      81
-      4      81
-      5      81
-      6      81
-      7      81
-      8      81
-      9      81
-      a      81
-      b      81
+      0      57
+      1      57
+      2      57
+      3      57
+      4      57
+      5      57
+      6      57
+      7      57
+      8      57
+      9      57
+      a      57
+      b      57
    }
 
    method 'component2 (I)I' {
-      0      85
-      1      85
-      2      85
-      3      85
-      4      85
-      5      85
-      6      85
-      7      85
-      8      85
-      9      85
-      a      85
-      b      85
+      0      61
+      1      61
+      2      61
+      3      61
+      4      61
+      5      61
+      6      61
+      7      61
+      8      61
+      9      61
+      a      61
+      b      61
    }
 
    method 'component3 (I)I' {
-      0      89
-      1      89
-      2      89
-      3      89
-      4      89
-      5      89
-      6      89
-      7      89
-      8      89
-      9      89
-      a      89
-      b      89
+      0      65
+      1      65
+      2      65
+      3      65
+      4      65
+      5      65
+      6      65
+      7      65
+      8      65
+      9      65
+      a      65
+      b      65
    }
 
    method 'component1 (Lkotlin/jvm/functions/Function0;)I' {
-      8      93
-      9      93
-      a      93
-      b      93
-      c      93
-      d      93
-      e      93
-      f      93
-      10      93
-      11      93
-      12      93
-      13      93
-      14      93
-      15      93
-      16      93
-      17      93
-      18      93
+      8      69
+      9      69
+      a      69
+      b      69
+      c      69
+      d      69
+      e      69
+      f      69
+      10      69
+      11      69
+      12      69
+      13      69
+      14      69
+      15      69
+      16      69
+      17      69
+      18      69
    }
 
    method 'component2 (Lkotlin/jvm/functions/Function0;)I' {
-      8      97
-      9      97
-      a      97
-      b      97
-      c      97
-      d      97
-      e      97
-      f      97
-      10      97
-      11      97
-      12      97
-      13      97
-      14      97
-      15      97
-      16      97
-      17      97
-      18      97
+      8      73
+      9      73
+      a      73
+      b      73
+      c      73
+      d      73
+      e      73
+      f      73
+      10      73
+      11      73
+      12      73
+      13      73
+      14      73
+      15      73
+      16      73
+      17      73
+      18      73
    }
 
    method 'component3 (Lkotlin/jvm/functions/Function0;)I' {
-      8      101
-      9      101
-      a      101
-      b      101
-      c      101
-      d      101
-      e      101
-      f      101
-      10      101
-      11      101
-      12      101
-      13      101
-      14      101
-      15      101
-      16      101
-      17      101
-      18      101
+      8      77
+      9      77
+      a      77
+      b      77
+      c      77
+      d      77
+      e      77
+      f      77
+      10      77
+      11      77
+      12      77
+      13      77
+      14      77
+      15      77
+      16      77
+      17      77
+      18      77
+   }
+
+   method 'destructLambdaInline$lambda$0 (I)I' {
+      0      82
+      1      82
    }
 }
 
 Lines mapping:
-8 <-> 7
-9 <-> 7
-11 <-> 8
-12 <-> 8
-13 <-> 9
-19 <-> 12
-20 <-> 12
-22 <-> 13
-23 <-> 16
-24 <-> 17
-30 <-> 20
-31 <-> 20
-33 <-> 21
-34 <-> 21
-35 <-> 22
-38 <-> 25
-44 <-> 31
-45 <-> 31
-46 <-> 32
-49 <-> 38
-50 <-> 38
-51 <-> 42
-54 <-> 45
-55 <-> 46
-58 <-> 53
-62 <-> 64
-63 <-> 64
-64 <-> 68
-67 <-> 71
-68 <-> 75
-69 <-> 79
-77 <-> 82
-78 <-> 86
-79 <-> 90
-81 <-> 94
-82 <-> 98
-83 <-> 102
-85 <-> 38
-86 <-> 39
-87 <-> 40
-88 <-> 45
-89 <-> 45
-90 <-> 45
-91 <-> 45
-92 <-> 45
-94 <-> 54
-95 <-> 50
-96 <-> 51
-97 <-> 53
-98 <-> 54
-99 <-> 58
-100 <-> 64
-101 <-> 65
-102 <-> 66
-103 <-> 75
-104 <-> 76
-105 <-> 77
-Not mapped:
-59
-93
+8 <-> 9
+9 <-> 9
+11 <-> 10
+12 <-> 10
+13 <-> 11
+19 <-> 14
+20 <-> 14
+22 <-> 15
+23 <-> 18
+24 <-> 19
+30 <-> 22
+31 <-> 22
+33 <-> 23
+34 <-> 23
+35 <-> 24
+38 <-> 27
+44 <-> 33
+45 <-> 33
+46 <-> 34
+49 <-> 40
+50 <-> 40
+51 <-> 44
+54 <-> 83
+55 <-> 51
+56 <-> 55
+64 <-> 58
+65 <-> 62
+66 <-> 66
+68 <-> 70
+69 <-> 74
+70 <-> 78
+72 <-> 40
+73 <-> 41
+74 <-> 42
+75 <-> 51
+76 <-> 52
+77 <-> 53
diff --git a/plugins/kotlin/testData/results/pkg/TestNonInlineLambda.dec b/plugins/kotlin/testData/results/pkg/TestNonInlineLambda.dec
index 71185f91e..54df97d19 100644
--- a/plugins/kotlin/testData/results/pkg/TestNonInlineLambda.dec
+++ b/plugins/kotlin/testData/results/pkg/TestNonInlineLambda.dec
@@ -770,6 +770,8 @@ class 'pkg/TestNonInlineLambda' {
       b      184
       c      184
       d      184
+      e      184
+      f      184
       10      185
       11      185
       12      185
@@ -795,6 +797,8 @@ class 'pkg/TestNonInlineLambda' {
       9      193
       a      193
       b      193
+      c      193
+      d      193
       e      194
       f      194
       10      194
@@ -833,6 +837,8 @@ class 'pkg/TestNonInlineLambda' {
       11      204
       12      204
       13      204
+      14      204
+      15      204
       16      205
       17      205
       18      205
@@ -874,6 +880,8 @@ class 'pkg/TestNonInlineLambda' {
       f      214
       10      214
       11      214
+      12      214
+      13      214
       1c      215
       1d      215
       1e      215
diff --git a/plugins/kotlin/testData/results/pkg/TestNullableOperator.dec b/plugins/kotlin/testData/results/pkg/TestNullableOperator.dec
index c2375598b..af8a6f679 100644
--- a/plugins/kotlin/testData/results/pkg/TestNullableOperator.dec
+++ b/plugins/kotlin/testData/results/pkg/TestNullableOperator.dec
@@ -47,18 +47,12 @@ class TestNullableOperator {
    }// 26
 
    public fun test5(x: Exception?) {
-      var var10000: Unit;
       if (x != null) {// 29
          x.printStackTrace();
-         var10000 = Unit.INSTANCE;
       } else {
-         var10000 = null;
-      }
-
-      if (var10000 == null) {
          throw new Exception();
       }
-   }// 30
+   }
 
    public fun test6(x: Int?): Int {
       if (x != null) {// 33
@@ -138,59 +132,52 @@ class 'pkg/TestNullableOperator' {
    }
 
    method 'test5 (Ljava/lang/Exception;)V' {
-      0      50
-      2      50
-      3      50
-      4      50
-      5      51
-      6      51
-      7      51
-      8      52
-      9      52
-      a      52
-      f      54
-      10      57
-      11      57
-      12      57
-      1a      58
-      1b      60
+      0      49
+      2      49
+      3      49
+      4      49
+      5      50
+      6      50
+      7      50
+      8      54
+      13      52
    }
 
    method 'test6 (Ljava/lang/Integer;)I' {
-      0      63
-      2      63
-      3      63
-      4      63
-      5      64
-      6      64
-      7      64
-      8      64
-      c      68
-      d      68
-      e      65
-      f      65
-      10      65
-      12      65
-      13      65
-      14      65
-      16      66
+      0      57
+      2      57
+      3      57
+      4      57
+      5      58
+      6      58
+      7      58
+      8      58
+      c      62
+      d      62
+      e      59
+      f      59
+      10      59
+      12      59
+      13      59
+      14      59
+      16      60
    }
 
    method 'test6_1 (Ljava/lang/Integer;)V' {
-      0      73
-      2      73
-      3      73
-      4      73
-      5      74
-      6      74
-      7      74
-      c      76
-      d      74
-      e      74
-      f      74
-      11      74
-      12      74
-      13      74
+      0      67
+      2      67
+      3      67
+      4      67
+      5      68
+      6      68
+      7      68
+      c      70
+      d      68
+      e      68
+      f      68
+      11      68
+      12      68
+      13      68
    }
 }
 
@@ -202,12 +189,12 @@ Lines mapping:
 21 <-> 36
 25 <-> 44
 26 <-> 47
-29 <-> 51
-30 <-> 61
-33 <-> 64
-35 <-> 66
-37 <-> 67
-41 <-> 74
-43 <-> 75
+29 <-> 50
+33 <-> 58
+35 <-> 60
+37 <-> 61
+41 <-> 68
+43 <-> 69
 Not mapped:
+30
 44
diff --git a/plugins/kotlin/testData/results/pkg/TestSafeCasts.dec b/plugins/kotlin/testData/results/pkg/TestSafeCasts.dec
index aead2eaff..50038555e 100644
--- a/plugins/kotlin/testData/results/pkg/TestSafeCasts.dec
+++ b/plugins/kotlin/testData/results/pkg/TestSafeCasts.dec
@@ -119,29 +119,30 @@ class 'pkg/TestSafeCasts' {
       c      15
       d      16
       e      16
-      13      18
-      14      18
+      f      18
       15      18
       16      18
-      1e      18
-      1f      19
-      20      20
-      23      19
-      24      19
+      17      18
+      18      18
+      20      18
+      21      19
+      22      20
       25      19
-      2a      20
-      2b      20
+      26      19
+      27      19
       2c      20
       2d      20
       2e      20
       2f      20
       30      20
-      31      21
-      35      25
-      36      21
-      37      21
+      31      20
+      32      20
+      33      21
+      37      25
       38      21
       39      21
+      3a      21
+      3b      21
    }
 
    method 'testHardIncompatible (I)Z' {
@@ -166,13 +167,14 @@ class 'pkg/TestSafeCasts' {
       a      34
       b      34
       c      34
-      13      34
-      14      34
+      f      34
       15      34
       16      34
-      1f      34
-      20      34
+      17      34
+      18      34
       21      34
+      22      34
+      23      34
    }
 
    method 'testCastNonNullToNullable (Ljava/lang/Object;)Z' {
@@ -205,29 +207,30 @@ class 'pkg/TestSafeCasts' {
       c      49
       d      50
       e      50
-      13      52
-      14      52
+      f      52
       15      52
       16      52
-      1e      52
-      1f      53
-      20      54
-      23      53
-      24      53
+      17      52
+      18      52
+      20      52
+      21      53
+      22      54
       25      53
-      2a      54
-      2b      54
+      26      53
+      27      53
       2c      54
       2d      54
       2e      54
       2f      54
       30      54
-      31      55
-      35      59
-      36      55
-      37      55
+      31      54
+      32      54
+      33      55
+      37      59
       38      55
       39      55
+      3a      55
+      3b      55
    }
 
    method 'testCastNullableToNullable (Ljava/lang/Object;)Z' {
@@ -266,29 +269,30 @@ class 'pkg/TestSafeCasts' {
       f      75
       10      76
       11      76
-      16      78
-      17      78
+      12      78
       18      78
       19      78
-      21      78
-      22      79
-      23      80
-      26      79
-      27      79
+      1a      78
+      1b      78
+      23      78
+      24      79
+      25      80
       28      79
-      2d      80
-      2e      80
+      29      79
+      2a      79
       2f      80
       30      80
       31      80
       32      80
       33      80
-      34      81
-      38      85
-      39      81
-      3a      81
+      34      80
+      35      80
+      36      81
+      3a      85
       3b      81
       3c      81
+      3d      81
+      3e      81
    }
 }
 
diff --git a/plugins/kotlin/testData/results/pkg/TestSmartCasts.dec b/plugins/kotlin/testData/results/pkg/TestSmartCasts.dec
index ee55a4a7b..79b4ba3c0 100644
--- a/plugins/kotlin/testData/results/pkg/TestSmartCasts.dec
+++ b/plugins/kotlin/testData/results/pkg/TestSmartCasts.dec
@@ -23,11 +23,7 @@ class TestSmartCasts {
             System.out.println("C: " + o);
          }
 
-         if (o == null) {// 31
-            throw new NullPointerException("null cannot be cast to non-null type pkg.TestSmartCasts.A");
-         } else {
-            return (o as TestSmartCasts.A).test();
-         }
+         return (o as TestSmartCasts.A).test();// 31
       }
    }
 
@@ -58,14 +54,10 @@ class TestSmartCasts {
 
    public fun testCast(a: Any?) {
       System.out.println(a);// 64
-      if (a == null) {// 65
-         throw new NullPointerException("null cannot be cast to non-null type kotlin.String");
-      } else {
-         System.out.println("hello");// 66
-         System.out.println(a);// 67
-         (a as java.lang.String).charAt(0);// 68
-         System.out.println((a as java.lang.String).charAt(0));// 69
-      }
+      System.out.println("hello");// 66
+      System.out.println(a);// 67
+      (a as java.lang.String).charAt(0);// 68
+      System.out.println((a as java.lang.String).charAt(0));// 69
    }// 70
 
    public fun testSealedIf(a: pkg.TestSmartCasts.A): String {
@@ -105,7 +97,7 @@ class TestSmartCasts {
       // $VF: Class flags could not be determined
       internal class DefaultImpls {
          @JvmStatic
-         fun woo(var0: TestSmartCasts.X, receiver: MutableIterable<*>): java.lang.String {
+         fun woo(`$this`: TestSmartCasts.X, `$receiver`: MutableIterable<*>): java.lang.String {
             return "A";// 5
          }
       }
@@ -212,225 +204,248 @@ class 'pkg/TestSmartCasts' {
       6b      19
       6c      19
       6d      25
-      6f      25
-      70      25
-      71      25
-      77      26
-      78      26
-      7c      26
-      7d      28
-      7e      28
-      7f      28
-      80      28
-      81      28
-      82      28
-      83      28
+      74      25
+      75      25
+      76      25
+      77      25
+      78      25
+      79      25
+      7a      25
    }
 
    method 'testIf (Ljava/lang/Object;)Ljava/lang/String;' {
+      0      30
+      4      30
+      5      30
+      6      30
+      7      30
+      b      30
+      c      30
+      d      30
+      e      30
+      f      30
+      10      30
+      11      30
+      12      30
+      13      30
+      14      30
+      16      30
+      17      30
+      18      30
+      19      30
+      1a      30
+      1b      30
+   }
+
+   method 'testIf2 (Ljava/lang/Object;)Ljava/lang/String;' {
       0      34
+      1      34
+      2      34
+      3      34
       4      34
       5      34
       6      34
-      7      34
-      b      34
-      c      34
-      d      34
-      e      34
-      f      34
-      10      34
-      11      34
-      12      34
-      13      34
-      14      34
-      16      34
-      17      34
-      18      34
-      19      34
-      1a      34
-      1b      34
-   }
-
-   method 'testIf2 (Ljava/lang/Object;)Ljava/lang/String;' {
-      0      38
-      1      38
-      2      38
-      3      38
-      4      38
-      5      38
-      6      38
-      7      39
-      8      39
-      9      39
-      a      39
-      b      39
-      c      39
-      d      39
-      e      39
-      f      39
-      10      39
-      11      39
-      12      39
-      13      39
-      14      39
-      15      40
-      16      40
-      17      40
-      18      40
-      19      40
-      1a      40
-      1b      40
-      1c      40
-      1d      40
-      1e      40
-      20      40
-      21      40
-      22      40
-      23      43
-      24      43
-      25      43
-      26      43
-      27      43
-      28      43
-      29      43
-      2a      44
-      2b      44
-      2c      44
-      2d      44
-      2e      44
-      2f      44
-      30      44
-      31      45
-      32      45
-      33      45
-      34      45
-      35      45
-      36      45
-      37      45
-      38      45
-      39      45
-      3a      45
-      3c      45
-      3d      45
-      3e      45
-      3f      46
-      40      46
-      41      46
-      42      46
-      43      46
-      44      46
-      45      46
-      46      46
-      47      46
-      48      46
-      4a      46
-      4b      46
-      4c      46
-      4d      49
-      4e      49
-      4f      49
-      50      49
-      51      49
-      52      49
-      53      49
-      54      49
-      55      49
-      56      49
-      57      49
-      58      49
-      59      49
-      5a      49
-      5b      49
-      5c      49
-      60      49
-      61      49
-      62      49
-      63      49
-      64      49
-      65      49
-      66      49
-      67      49
-      68      49
-      69      49
-      6a      50
-      6b      50
-      6c      50
-      6d      50
-      6e      50
-      6f      50
-      70      50
-      71      50
-      72      50
-      73      50
-      75      50
-      76      50
-      77      50
-      78      55
-      79      55
-      7a      55
-      7b      55
-      7c      55
-      7d      55
-      7e      55
+      7      35
+      8      35
+      9      35
+      a      35
+      b      35
+      c      35
+      d      35
+      e      35
+      f      35
+      10      35
+      11      35
+      12      35
+      13      35
+      14      35
+      15      36
+      16      36
+      17      36
+      18      36
+      19      36
+      1a      36
+      1b      36
+      1c      36
+      1d      36
+      1e      36
+      20      36
+      21      36
+      22      36
+      23      39
+      24      39
+      25      39
+      26      39
+      27      39
+      28      39
+      29      39
+      2a      40
+      2b      40
+      2c      40
+      2d      40
+      2e      40
+      2f      40
+      30      40
+      31      41
+      32      41
+      33      41
+      34      41
+      35      41
+      36      41
+      37      41
+      38      41
+      39      41
+      3a      41
+      3c      41
+      3d      41
+      3e      41
+      3f      42
+      40      42
+      41      42
+      42      42
+      43      42
+      44      42
+      45      42
+      46      42
+      47      42
+      48      42
+      4a      42
+      4b      42
+      4c      42
+      4d      45
+      4e      45
+      4f      45
+      50      45
+      51      45
+      52      45
+      53      45
+      54      45
+      55      45
+      56      45
+      57      45
+      58      45
+      59      45
+      5a      45
+      5b      45
+      5c      45
+      60      45
+      61      45
+      62      45
+      63      45
+      64      45
+      65      45
+      66      45
+      67      45
+      68      45
+      69      45
+      6a      46
+      6b      46
+      6c      46
+      6d      46
+      6e      46
+      6f      46
+      70      46
+      71      46
+      72      46
+      73      46
+      75      46
+      76      46
+      77      46
+      78      51
+      79      51
+      7a      51
+      7b      51
+      7c      51
+      7d      51
+      7e      51
    }
 
    method 'testCast (Ljava/lang/Object;)V' {
-      0      59
-      1      59
-      2      59
-      3      59
-      4      59
-      5      59
-      6      59
-      7      60
-      9      60
-      a      60
-      b      60
-      11      61
-      12      61
-      16      61
-      1b      63
-      1c      63
-      1d      63
-      1e      63
-      1f      63
-      21      63
-      22      63
-      23      63
-      24      64
-      25      64
-      26      64
-      27      64
-      28      64
-      29      64
-      2a      64
-      2b      65
-      2c      65
-      2d      65
-      2e      65
-      2f      65
-      30      65
-      31      65
-      32      65
-      34      66
-      35      66
-      36      66
-      37      66
-      38      66
-      39      66
-      3a      66
-      3b      66
-      3d      66
-      3e      66
-      3f      66
-      40      66
-      41      66
-      42      66
-      43      66
-      44      68
+      0      55
+      1      55
+      2      55
+      3      55
+      4      55
+      5      55
+      6      55
+      12      56
+      13      56
+      14      56
+      15      56
+      16      56
+      18      56
+      19      56
+      1a      56
+      1b      57
+      1c      57
+      1d      57
+      1e      57
+      20      57
+      21      57
+      22      57
+      23      58
+      24      58
+      25      58
+      26      58
+      27      58
+      28      58
+      29      58
+      2a      58
+      2c      59
+      2d      59
+      2e      59
+      2f      59
+      30      59
+      31      59
+      32      59
+      33      59
+      35      59
+      36      59
+      37      59
+      38      59
+      39      59
+      3a      59
+      3b      59
+      3c      60
    }
 
    method 'testSealedIf (Lpkg/TestSmartCasts$A;)Ljava/lang/String;' {
+      6      63
+      7      63
+      8      63
+      9      63
+      a      63
+      b      63
+      c      63
+      d      64
+      e      64
+      f      64
+      10      64
+      11      64
+      12      64
+      13      64
+      14      64
+      15      66
+      16      66
+      17      66
+      18      66
+      19      66
+      1a      66
+      1b      66
+      1c      66
+      1d      66
+      1e      66
+      1f      66
+      20      66
+      21      66
+      22      66
+      24      66
+      25      66
+      26      66
+      27      66
+   }
+
+   method 'testDoubleType (Ljava/util/List;)Ljava/lang/String;' {
       6      71
       7      71
       8      71
@@ -438,120 +453,84 @@ class 'pkg/TestSmartCasts' {
       a      71
       b      71
       c      71
-      d      72
-      e      72
-      f      72
-      10      72
-      11      72
-      12      72
-      13      72
-      14      72
-      15      74
-      16      74
-      17      74
-      18      74
-      19      74
-      1a      74
-      1b      74
-      1c      74
-      1d      74
-      1e      74
-      1f      74
-      20      74
-      21      74
-      22      74
-      24      74
-      25      74
-      26      74
-      27      74
-   }
-
-   method 'testDoubleType (Ljava/util/List;)Ljava/lang/String;' {
-      6      79
-      7      79
-      8      79
-      9      79
-      a      79
-      b      79
-      c      79
-      d      79
-      11      79
-      12      79
-      13      79
-      14      79
-      15      79
-      16      79
-      17      79
-      18      79
-      19      79
-      1a      79
-      1b      79
-      1c      79
-      1d      79
-      1f      79
-      20      79
-      21      79
-      22      79
-      23      79
-      24      79
-      25      79
-      26      79
-      27      79
-      28      79
+      d      71
+      11      71
+      12      71
+      13      71
+      14      71
+      15      71
+      16      71
+      17      71
+      18      71
+      19      71
+      1a      71
+      1b      71
+      1c      71
+      1d      71
+      1f      71
+      20      71
+      21      71
+      22      71
+      23      71
+      24      71
+      25      71
+      26      71
+      27      71
+      28      71
    }
 }
 
 class 'pkg/TestSmartCasts$A' {
    method 'test ()Ljava/lang/String;' {
-      0      84
-      1      84
-      2      84
+      0      76
+      1      76
+      2      76
    }
 }
 
 class 'pkg/TestSmartCasts$A$B' {
    method '<init> ()V' {
-      2      87
-      3      87
-      4      87
+      2      79
+      3      79
+      4      79
    }
 
    method 'testB ()Ljava/lang/String;' {
-      0      89
-      1      89
-      2      89
+      0      81
+      1      81
+      2      81
    }
 }
 
 class 'pkg/TestSmartCasts$A$C' {
    method '<init> ()V' {
-      2      93
-      3      93
-      4      93
+      2      85
+      3      85
+      4      85
    }
 
    method 'testC ()Ljava/lang/String;' {
-      0      95
-      1      95
-      2      95
+      0      87
+      1      87
+      2      87
    }
 }
 
 class 'pkg/TestSmartCasts$X$DefaultImpls' {
    method 'woo (Lpkg/TestSmartCasts$X;Ljava/lang/Iterable;)Ljava/lang/String;' {
-      6      108
-      7      108
-      8      108
+      6      100
+      7      100
+      8      100
    }
 }
 
 Lines mapping:
-5 <-> 109
-8 <-> 88
-9 <-> 90
-11 <-> 94
-12 <-> 96
-15 <-> 85
+5 <-> 101
+8 <-> 80
+9 <-> 82
+11 <-> 86
+12 <-> 88
+15 <-> 77
 19 <-> 5
 20 <-> 5
 21 <-> 6
@@ -561,31 +540,32 @@ Lines mapping:
 27 <-> 16
 28 <-> 20
 31 <-> 26
-35 <-> 35
-36 <-> 35
-39 <-> 35
-43 <-> 39
-44 <-> 40
-45 <-> 41
-48 <-> 44
-49 <-> 45
-50 <-> 46
-51 <-> 47
-54 <-> 50
-55 <-> 51
-60 <-> 56
-64 <-> 60
-65 <-> 61
-66 <-> 64
-67 <-> 65
-68 <-> 66
-69 <-> 67
-70 <-> 69
-73 <-> 72
-74 <-> 73
-75 <-> 75
-76 <-> 75
-78 <-> 75
-83 <-> 80
-84 <-> 80
-87 <-> 80
+35 <-> 31
+36 <-> 31
+39 <-> 31
+43 <-> 35
+44 <-> 36
+45 <-> 37
+48 <-> 40
+49 <-> 41
+50 <-> 42
+51 <-> 43
+54 <-> 46
+55 <-> 47
+60 <-> 52
+64 <-> 56
+66 <-> 57
+67 <-> 58
+68 <-> 59
+69 <-> 60
+70 <-> 61
+73 <-> 64
+74 <-> 65
+75 <-> 67
+76 <-> 67
+78 <-> 67
+83 <-> 72
+84 <-> 72
+87 <-> 72
+Not mapped:
+65
diff --git a/plugins/kotlin/testData/results/pkg/TestTailrecFunctions.dec b/plugins/kotlin/testData/results/pkg/TestTailrecFunctions.dec
index c5a29a684..17098d881 100644
--- a/plugins/kotlin/testData/results/pkg/TestTailrecFunctions.dec
+++ b/plugins/kotlin/testData/results/pkg/TestTailrecFunctions.dec
@@ -3,18 +3,16 @@ package pkg
 class TestTailrecFunctions {
    public tailrec fun sum(x: Long, sum: Long): Long {
       var var5: TestTailrecFunctions = this;// 4
-      var var6: Long = x;
-      var var8: Long = sum;
 
-      while (var6 != 0L) {// 5
-         var var15: Long = var6 - 1L;// 6
-         var var17: Long = var8 + var6;
-         var5 = var5;
-         var6 = var15;
-         var8 = var17;
+      while (x != 0L) {// 5
+         var var7: Long = x - 1L;
+         var var9: Long = sum + x;
+         var5 = var5;// 6
+         x = var7;
+         sum = var9;
       }
 
-      return var8;
+      return sum;
    }
 
    public tailrec fun testFinally() {
@@ -22,10 +20,10 @@ class TestTailrecFunctions {
          try {
             ;
          } catch (java.lang.Throwable var2) {
-            this.testFinally();// 13
+            this.testFinally();
          }
 
-         this.testFinally();
+         this.testFinally();// 13
       }
    }
 
@@ -33,10 +31,10 @@ class TestTailrecFunctions {
       try {
          ;
       } catch (java.lang.Throwable var2) {
-         return this.testFinallyReturn();// 21
+         return this.testFinallyReturn();
       }
 
-      return this.testFinallyReturn();
+      return this.testFinallyReturn();// 21
    }
 
    public tailrec fun fooTry() {
@@ -57,10 +55,10 @@ class TestTailrecFunctions {
                   this.testTryCatchFinally();// 37
                }
             } catch (java.lang.Throwable var3) {
-               this.testTryCatchFinally();// 39
+               this.testTryCatchFinally();
             }
 
-            this.testTryCatchFinally();
+            this.testTryCatchFinally();// 39
             return;// 41
          }
 
@@ -70,29 +68,26 @@ class TestTailrecFunctions {
 
    public tailrec fun fastPow(x: Long, n: Long, acc: Long = 1L): Long {
       var var7: TestTailrecFunctions = this;
-      var var8: Long = x;
-      var var10: Long = n;
-      var var12: Long = acc;
 
-      while (var10 != 0L) {// 44
-         if (var10 % 2 == 0L) {// 45
-            var var21: Long = var8 * var8;
-            var var23: Long = var10 / 2;
+      while (n != 0L) {// 44
+         if (n % 2 == 0L) {// 45
+            var var9: Long = x * x;
+            var var11: Long = n / 2;
             var7 = var7;
-            var8 = var21;
-            var10 = var23;
-            var12 = var12;
+            x = var9;
+            n = var11;
+            acc = acc;
          } else {
-            var var25: Long = var10 - 1L;// 46
-            var var26: Long = var12 * var8;
-            var7 = var7;
-            var8 = var8;
-            var10 = var25;
-            var12 = var26;
+            var var15: Long = n - 1L;
+            var var13: Long = acc * x;
+            var7 = var7;// 46
+            x = x;
+            n = var15;
+            acc = var13;
          }
       }
 
-      return var12;
+      return acc;
    }
 
    @JvmStatic
@@ -107,26 +102,24 @@ class TestTailrecFunctions {
 
    public tailrec fun fastPow(x: Long, n: Long): Long {
       var var5: TestTailrecFunctions = this;// 49
-      var var6: Long = x;
-      var var8: Long = n;
 
       var var10000: Long;
       while (true) {
-         if (var8 == 0L) {// 50
+         if (n == 0L) {// 50
             var10000 = 1L;
             break;
          }
 
-         if (var8 % 2 != 0L) {// 51
-            var10000 = var6 * var5.fastPow(var6, var8 - 1L);// 52
+         if (n % 2 != 0L) {// 51
+            var10000 = x * var5.fastPow(x, n - 1L);// 52
             break;
          }
 
-         var var15: Long = var6 * var6;
-         var var17: Long = var8 / 2;
+         var var7: Long = x * x;
+         var var9: Long = n / 2;
          var5 = var5;
-         var6 = var15;
-         var8 = var17;
+         x = var7;
+         n = var9;
       }
 
       return var10000;// 53
@@ -138,343 +131,282 @@ class 'pkg/TestTailrecFunctions' {
       0      4
       1      4
       2      4
-      3      5
-      4      5
-      5      5
-      6      6
-      7      6
-      8      6
-      9      11
-      a      11
-      d      8
-      e      8
-      11      10
-      12      10
+      3      6
+      4      6
+      5      6
+      9      14
+      a      14
+      b      9
+      c      9
+      f      7
+      10      7
+      11      7
+      12      7
+      13      7
+      14      8
       15      8
       16      8
       17      8
       18      8
-      1c      16
-      1d      16
-      1e      16
-      1f      9
-      20      9
-      21      9
-      22      9
-      23      9
-      24      9
-      25      10
-      26      10
-      27      10
-      28      10
-      29      10
-      2a      10
-      2b      10
-      2c      11
-      2d      11
-      2e      11
-      2f      11
-      30      12
-      31      12
-      32      12
-      33      12
-      34      13
-      35      13
-      36      13
-      37      13
+      19      9
+      1a      9
+      1b      9
+      1c      9
+      1d      10
+      1e      10
+      1f      10
+      20      11
+      21      11
+      22      11
    }
 
    method 'testFinally ()V' {
-      1      27
-      2      27
-      3      27
-      4      27
-      9      24
-      a      24
-      b      24
-      c      24
+      1      25
+      2      25
+      3      25
+      4      25
+      9      22
+      a      22
+      b      22
+      c      22
    }
 
    method 'testFinallyReturn ()I' {
-      1      38
-      2      38
-      3      38
-      4      38
-      5      38
-      7      35
-      8      35
-      9      35
-      a      35
-      b      35
+      1      36
+      2      36
+      3      36
+      4      36
+      5      36
+      7      33
+      8      33
+      9      33
+      a      33
+      b      33
    }
 
    method 'fooTry ()V' {
-      1      43
-      2      43
-      3      43
-      4      43
-      5      46
-      6      44
-      7      46
+      1      41
+      2      41
+      3      41
+      4      41
+      5      44
+      6      42
+      7      44
    }
 
    method 'testTryCatchFinally ()V' {
-      1      53
-      2      53
-      3      53
-      4      53
-      5      66
-      6      66
-      7      66
-      8      66
-      c      55
-      d      56
-      e      56
-      f      56
-      10      56
-      11      62
-      12      62
-      13      62
-      14      62
-      19      59
-      1a      59
-      1b      59
-      1c      59
-      1f      63
+      1      51
+      2      51
+      3      51
+      4      51
+      5      64
+      6      64
+      7      64
+      8      64
+      c      53
+      d      54
+      e      54
+      f      54
+      10      54
+      11      60
+      12      60
+      13      60
+      14      60
+      19      57
+      1a      57
+      1b      57
+      1c      57
+      1f      61
    }
 
    method 'fastPow (JJJ)J' {
-      0      71
-      1      71
-      2      71
-      3      72
-      4      72
-      5      72
-      6      73
-      7      70
-      8      73
-      9      74
-      a      74
-      b      74
-      c      74
-      d      80
-      e      80
-      11      78
-      12      78
-      15      76
-      16      76
-      19      83
-      1a      83
-      1d      76
-      1e      76
-      1f      76
-      20      76
-      24      94
-      25      94
-      26      94
-      27      77
-      28      77
-      29      77
-      2a      77
-      2b      77
-      2c      77
-      2d      77
-      2e      77
+      0      69
+      1      69
+      2      69
+      3      71
+      4      71
+      5      71
+      7      68
+      9      89
+      a      89
+      b      89
+      c      72
+      d      72
+      e      72
+      f      72
+      10      72
+      11      72
+      12      72
+      13      72
+      14      72
+      15      75
+      16      75
+      19      73
+      1a      73
+      1b      73
+      1c      73
+      1d      73
+      1e      74
+      1f      74
+      20      74
+      21      74
+      22      74
+      23      74
+      24      78
+      25      78
+      28      75
+      29      75
+      2a      75
+      2b      75
+      2c      76
+      2d      76
+      2e      76
       2f      77
       30      77
-      31      78
+      31      77
       32      78
       33      78
       34      78
       35      78
-      36      78
-      37      78
-      38      79
-      39      79
-      3a      79
-      3b      79
-      3c      79
-      3d      79
-      3e      79
-      3f      80
+      39      82
+      3a      82
+      3d      83
       40      80
       41      80
       42      80
-      43      81
-      44      81
+      43      80
+      44      80
       45      81
       46      81
-      47      82
-      48      82
-      49      82
-      4a      82
-      4b      83
-      4c      83
-      4d      83
-      4e      83
-      52      85
-      53      85
-      54      85
+      47      81
+      48      81
+      49      81
+      4a      81
+      4b      82
+      4c      82
+      4d      82
+      4e      82
+      4f      83
+      50      83
+      51      83
+      52      84
+      53      84
+      54      84
       55      85
       56      85
       57      85
-      58      86
-      59      86
-      5a      86
-      5b      86
-      5c      86
-      5d      86
-      5e      86
-      5f      87
-      60      87
-      61      87
-      62      87
-      63      88
-      64      88
-      65      88
-      66      88
-      67      89
-      68      89
-      69      89
-      6a      89
-      6b      90
-      6c      90
-      6d      90
-      6e      90
+      58      85
    }
 
    method 'fastPow$default (Lpkg/TestTailrecFunctions;JJJILjava/lang/Object;)J' {
-      0      100
-      1      100
-      2      100
-      3      100
-      4      100
-      5      100
-      6      100
-      7      101
-      8      101
-      9      101
-      a      104
-      b      104
-      c      104
-      d      104
-      e      104
-      f      104
-      10      104
-      11      104
-      12      104
+      0      95
+      1      95
+      2      95
+      3      95
+      4      95
+      5      95
+      6      95
+      7      96
+      8      96
+      9      96
+      a      99
+      b      99
+      c      99
+      d      99
+      e      99
+      f      99
+      10      99
+      11      99
+      12      99
    }
 
    method 'fastPow (JJ)J' {
-      0      108
-      1      108
-      2      108
-      3      109
-      4      109
-      5      109
-      6      110
-      7      110
-      8      110
-      9      120
-      a      120
-      d      120
-      e      120
-      11      114
-      12      114
-      15      114
-      16      114
-      17      114
-      18      114
-      19      114
-      1a      114
-      1b      114
-      1c      115
-      1d      116
-      20      119
-      21      119
-      22      119
-      23      119
-      24      119
+      0      103
+      1      103
+      2      103
+      3      107
+      4      107
+      5      107
+      6      107
+      7      107
+      8      107
+      9      108
+      a      109
+      d      112
+      e      112
+      f      112
+      10      112
+      11      112
+      12      112
+      13      112
+      14      112
+      15      112
+      16      119
+      17      119
+      1a      117
+      1b      117
+      1c      117
+      1d      117
+      1e      117
+      1f      118
+      20      118
+      21      118
+      22      118
+      23      118
+      24      118
       25      119
       26      119
       27      119
       28      119
-      29      119
-      2a      124
-      2b      124
-      2c      124
-      2d      124
-      2e      124
-      2f      124
-      30      124
-      31      125
-      32      125
-      33      125
-      34      125
-      35      125
-      36      125
-      37      125
-      38      126
-      39      126
-      3a      126
-      3b      126
-      3c      127
-      3d      127
-      3e      127
-      3f      127
-      40      128
-      41      128
-      42      128
-      43      128
-      47      120
-      48      120
-      49      120
-      4a      120
-      4b      120
-      4c      120
-      4d      120
-      4e      120
-      4f      120
-      50      120
-      51      120
-      52      120
-      53      120
-      54      120
-      55      131
+      29      120
+      2a      120
+      2b      120
+      2c      121
+      2d      121
+      2e      121
+      32      113
+      33      113
+      34      113
+      35      113
+      36      113
+      37      113
+      38      113
+      39      113
+      3a      113
+      3b      113
+      3c      113
+      3d      124
    }
 }
 
 Lines mapping:
 4 <-> 5
-5 <-> 9
+5 <-> 7
 6 <-> 10
-13 <-> 25
-21 <-> 36
-27 <-> 44
-29 <-> 45
-31 <-> 47
-35 <-> 54
-36 <-> 56
-37 <-> 57
-39 <-> 60
-41 <-> 64
-43 <-> 101
-44 <-> 77
-45 <-> 78
-46 <-> 86
-49 <-> 109
-50 <-> 115
-51 <-> 120
-52 <-> 121
-53 <-> 132
+13 <-> 26
+21 <-> 37
+27 <-> 42
+29 <-> 43
+31 <-> 45
+35 <-> 52
+36 <-> 54
+37 <-> 55
+39 <-> 61
+41 <-> 62
+43 <-> 96
+44 <-> 72
+45 <-> 73
+46 <-> 83
+49 <-> 104
+50 <-> 108
+51 <-> 113
+52 <-> 114
+53 <-> 125
 Not mapped:
 10
-12
 14
 15
 18
-20
 26
 34
-38
 40
diff --git a/plugins/kotlin/testData/results/pkg/TestTryCatchExpressions.dec b/plugins/kotlin/testData/results/pkg/TestTryCatchExpressions.dec
index b029be688..f89af1f5b 100644
--- a/plugins/kotlin/testData/results/pkg/TestTryCatchExpressions.dec
+++ b/plugins/kotlin/testData/results/pkg/TestTryCatchExpressions.dec
@@ -1,7 +1,9 @@
 package pkg
 
 import java.io.IOException
+import kotlin.jvm.internal.SourceDebugExtension
 
+@SourceDebugExtension(["SMAP\nTestTryCatchExpressions.kt\nKotlin\n*S Kotlin\n*F\n+ 1 TestTryCatchExpressions.kt\npkg/TestTryCatchExpressions\n+ 2 fake.kt\nkotlin/jvm/internal/FakeKt\n*L\n1#1,59:1\n1#2:60\n*E\n"])
 class TestTryCatchExpressions {
    public fun test0(s: String) {
       var var2: java.lang.String;
@@ -115,300 +117,300 @@ class TestTryCatchExpressions {
 
 class 'pkg/TestTryCatchExpressions' {
    method 'test0 (Ljava/lang/String;)V' {
-      7      8
-      8      8
-      9      8
-      a      8
-      b      8
-      c      8
-      d      8
-      e      8
-      f      8
-      13      9
-      14      10
-      15      10
-      16      10
-      17      10
-      19      11
-      1a      11
-      1b      11
-      1d      12
-      1e      12
-      1f      15
-      20      18
-      22      18
-      23      18
-      24      18
-      25      18
-      26      18
-      27      18
-      28      18
-      29      19
+      7      10
+      8      10
+      9      10
+      a      10
+      b      10
+      c      10
+      d      10
+      e      10
+      f      10
+      13      11
+      14      12
+      15      12
+      16      12
+      17      12
+      19      13
+      1a      13
+      1b      13
+      1d      14
+      1e      14
+      1f      17
+      20      20
+      22      20
+      23      20
+      24      20
+      25      20
+      26      20
+      27      20
+      28      20
+      29      21
    }
 
    method 'test1 (Ljava/lang/String;Ljava/lang/String;)V' {
-      c      22
-      d      22
-      e      23
-      f      23
-      10      23
-      12      28
-      13      28
-      14      29
-      15      29
-      16      29
-      17      29
-      18      29
-      19      29
-      1a      29
-      1b      29
-      1c      29
-      1d      29
-      21      30
-      23      31
-      24      31
-      25      32
-      26      32
-      27      33
-      28      33
-      29      33
-      2a      33
-      2b      33
-      2d      34
-      2e      34
-      2f      34
-      31      35
-      32      35
-      33      38
-      34      38
-      35      41
-      36      41
-      37      41
-      38      41
-      39      42
-      3a      42
-      3c      46
-      3d      46
-      3e      47
-      3f      47
-      40      48
-      41      48
-      42      48
-      43      48
-      44      48
-      45      48
-      46      48
-      47      48
-      48      48
-      49      48
-      4d      49
-      4f      50
-      50      50
-      51      51
-      52      51
-      53      52
-      54      52
-      55      52
-      56      52
-      57      52
-      59      53
-      5a      53
-      5b      53
-      5d      54
-      5e      54
-      5f      57
-      60      57
-      61      60
-      62      60
-      63      60
-      64      60
-      65      60
-      66      60
-      67      60
-      68      60
-      69      60
-      6a      60
-      6b      61
+      c      24
+      d      24
+      e      25
+      f      25
+      10      25
+      12      30
+      13      30
+      14      31
+      15      31
+      16      31
+      17      31
+      18      31
+      19      31
+      1a      31
+      1b      31
+      1c      31
+      1d      31
+      21      32
+      23      33
+      24      33
+      25      34
+      26      34
+      27      35
+      28      35
+      29      35
+      2a      35
+      2b      35
+      2d      36
+      2e      36
+      2f      36
+      31      37
+      32      37
+      33      40
+      34      40
+      35      43
+      36      43
+      37      43
+      38      43
+      39      44
+      3a      44
+      3c      48
+      3d      48
+      3e      49
+      3f      49
+      40      50
+      41      50
+      42      50
+      43      50
+      44      50
+      45      50
+      46      50
+      47      50
+      48      50
+      49      50
+      4d      51
+      4f      52
+      50      52
+      51      53
+      52      53
+      53      54
+      54      54
+      55      54
+      56      54
+      57      54
+      59      55
+      5a      55
+      5b      55
+      5d      56
+      5e      56
+      5f      59
+      60      59
+      61      62
+      62      62
+      63      62
+      64      62
+      65      62
+      66      62
+      67      62
+      68      62
+      69      62
+      6a      62
+      6b      63
    }
 
    method 'test2 (Ljava/lang/String;Ljava/lang/String;)V' {
-      e      64
-      f      64
-      10      65
-      11      65
-      12      65
-      14      70
-      15      70
-      16      71
-      17      71
-      18      71
-      19      71
-      1a      71
-      1b      71
-      1c      71
-      1d      71
-      1e      71
-      1f      71
-      20      71
-      21      72
-      22      75
-      23      75
-      24      76
-      25      76
-      26      76
-      27      76
-      28      76
-      29      77
-      2a      77
-      2b      77
-      2f      78
-      31      79
-      32      79
-      33      80
-      34      80
-      35      81
-      36      81
-      37      81
-      38      81
-      39      81
-      3a      81
-      3b      81
-      3c      81
-      3d      81
-      3e      82
-      3f      82
-      40      82
-      41      82
-      42      82
-      43      82
-      49      84
-      4a      84
-      4b      85
-      4c      85
-      50      85
-      51      85
-      52      85
-      53      85
-      57      85
-      58      83
-      59      86
-      5a      86
-      5b      86
-      5c      86
-      5d      86
-      5e      86
-      5f      89
-      60      89
-      61      89
-      62      89
-      63      90
-      64      90
-      66      96
-      67      96
-      68      97
-      69      97
-      6a      94
-      6b      94
-      6c      94
-      6d      94
-      6e      94
-      6f      94
-      70      94
-      71      94
-      72      94
-      73      94
-      74      95
-      75      95
-      7f      95
-      80      95
-      81      95
-      87      96
-      88      96
-      89      97
-      8a      97
-      8b      98
-      8c      98
-      8d      98
-      8e      98
-      92      99
-      94      100
-      95      100
-      96      101
-      97      101
-      98      102
-      99      102
-      9a      102
-      9b      102
-      9d      102
-      9e      102
-      9f      102
-      a0      108
-      a1      103
-      a2      103
-      a3      103
-      a4      103
-      a5      103
-      a7      104
-      a8      104
-      a9      104
-      ab      105
-      ac      105
-      ad      108
-      ae      108
-      af      108
-      b0      108
-      b1      108
-      b2      108
-      b3      108
-      b4      111
-      b5      111
-      b6      111
-      b7      111
-      b8      111
-      b9      112
+      e      66
+      f      66
+      10      67
+      11      67
+      12      67
+      14      72
+      15      72
+      16      73
+      17      73
+      18      73
+      19      73
+      1a      73
+      1b      73
+      1c      73
+      1d      73
+      1e      73
+      1f      73
+      20      73
+      21      74
+      22      77
+      23      77
+      24      78
+      25      78
+      26      78
+      27      78
+      28      78
+      29      79
+      2a      79
+      2b      79
+      2f      80
+      31      81
+      32      81
+      33      82
+      34      82
+      35      83
+      36      83
+      37      83
+      38      83
+      39      83
+      3a      83
+      3b      83
+      3c      83
+      3d      83
+      3e      84
+      3f      84
+      40      84
+      41      84
+      42      84
+      43      84
+      49      86
+      4a      86
+      4b      87
+      4c      87
+      50      87
+      51      87
+      52      87
+      53      87
+      57      87
+      58      85
+      59      88
+      5a      88
+      5b      88
+      5c      88
+      5d      88
+      5e      88
+      5f      91
+      60      91
+      61      91
+      62      91
+      63      92
+      64      92
+      66      98
+      67      98
+      68      99
+      69      99
+      6a      96
+      6b      96
+      6c      96
+      6d      96
+      6e      96
+      6f      96
+      70      96
+      71      96
+      72      96
+      73      96
+      74      97
+      75      97
+      7f      97
+      80      97
+      81      97
+      87      98
+      88      98
+      89      99
+      8a      99
+      8b      100
+      8c      100
+      8d      100
+      8e      100
+      92      101
+      94      102
+      95      102
+      96      103
+      97      103
+      98      104
+      99      104
+      9a      104
+      9b      104
+      9d      104
+      9e      104
+      9f      104
+      a0      110
+      a1      105
+      a2      105
+      a3      105
+      a4      105
+      a5      105
+      a7      106
+      a8      106
+      a9      106
+      ab      107
+      ac      107
+      ad      110
+      ae      110
+      af      110
+      b0      110
+      b1      110
+      b2      110
+      b3      110
+      b4      113
+      b5      113
+      b6      113
+      b7      113
+      b8      113
+      b9      114
    }
 }
 
 Lines mapping:
-7 <-> 19
-9 <-> 9
-10 <-> 10
-11 <-> 11
-14 <-> 20
-17 <-> 23
-18 <-> 61
-19 <-> 24
-20 <-> 30
-21 <-> 31
-22 <-> 33
-23 <-> 34
-24 <-> 42
-25 <-> 49
-26 <-> 50
-27 <-> 53
-30 <-> 62
-33 <-> 65
-34 <-> 112
-35 <-> 72
-36 <-> 73
-38 <-> 76
-39 <-> 77
-40 <-> 78
-41 <-> 79
-42 <-> 81
-43 <-> 82
-44 <-> 83
-45 <-> 85
-46 <-> 84
-47 <-> 86
-49 <-> 86
-51 <-> 87
-52 <-> 90
-53 <-> 99
-54 <-> 100
-55 <-> 103
-56 <-> 109
-58 <-> 113
+7 <-> 21
+9 <-> 11
+10 <-> 12
+11 <-> 13
+14 <-> 22
+17 <-> 25
+18 <-> 63
+19 <-> 26
+20 <-> 32
+21 <-> 33
+22 <-> 35
+23 <-> 36
+24 <-> 44
+25 <-> 51
+26 <-> 52
+27 <-> 55
+30 <-> 64
+33 <-> 67
+34 <-> 114
+35 <-> 74
+36 <-> 75
+38 <-> 78
+39 <-> 79
+40 <-> 80
+41 <-> 81
+42 <-> 83
+43 <-> 84
+44 <-> 85
+45 <-> 87
+46 <-> 86
+47 <-> 88
+49 <-> 88
+51 <-> 89
+52 <-> 92
+53 <-> 101
+54 <-> 102
+55 <-> 105
+56 <-> 111
+58 <-> 115
 Not mapped:
 8
 60
diff --git a/plugins/kotlin/testData/results/pkg/TestTryFinallyExpressions.dec b/plugins/kotlin/testData/results/pkg/TestTryFinallyExpressions.dec
index 4a6b3d5ca..18d74e77d 100644
--- a/plugins/kotlin/testData/results/pkg/TestTryFinallyExpressions.dec
+++ b/plugins/kotlin/testData/results/pkg/TestTryFinallyExpressions.dec
@@ -1,17 +1,19 @@
 package pkg
 
 import java.io.IOException
+import kotlin.jvm.internal.SourceDebugExtension
 
+@SourceDebugExtension(["SMAP\nTestTryFinallyExpressions.kt\nKotlin\n*S Kotlin\n*F\n+ 1 TestTryFinallyExpressions.kt\npkg/TestTryFinallyExpressions\n+ 2 fake.kt\nkotlin/jvm/internal/FakeKt\n*L\n1#1,52:1\n1#2:53\n*E\n"])
 class TestTryFinallyExpressions {
    public fun test0(s: String) {
       label15: {
          try {
             var var2: java.lang.String = StringsKt.repeat(s as java.lang.CharSequence, 5);// 8
          } catch (java.lang.Throwable var4) {
-            System.out.println("bye");// 10
+            System.out.println("bye");
          }
 
-         System.out.println("bye");
+         System.out.println("bye");// 10
       }
    }
 
@@ -30,10 +32,10 @@ class TestTryFinallyExpressions {
          try {
             var var15: java.lang.String = StringsKt.repeat(x as java.lang.CharSequence, 5);// 21
          } catch (java.lang.Throwable var8) {
-            System.out.println(a);// 23
+            System.out.println(a);
          }
 
-         System.out.println(a);
+         System.out.println(a);// 23
       }
    }
 
@@ -72,10 +74,10 @@ class TestTryFinallyExpressions {
             try {
                var19 = StringsKt.repeat(var19 as java.lang.CharSequence, 5);// 47
             } catch (java.lang.Throwable var10) {
-               System.out.println(var19);// 49
+               System.out.println(var19);
             }
 
-            System.out.println(var19);
+            System.out.println(var19);// 49
          }
 
          var19 = if (a == a) b else a;
@@ -85,208 +87,203 @@ class TestTryFinallyExpressions {
 
 class 'pkg/TestTryFinallyExpressions' {
    method 'test0 (Ljava/lang/String;)V' {
-      7      8
-      8      8
-      9      8
-      a      8
-      b      8
-      c      8
-      d      8
-      e      8
-      f      8
-      10      13
-      11      13
-      12      13
-      13      13
-      14      13
-      16      13
-      17      13
-      18      13
-      1d      10
-      1e      10
-      1f      10
-      20      10
-      21      10
-      23      10
-      24      10
-      25      10
+      7      10
+      8      10
+      9      10
+      a      10
+      b      10
+      c      10
+      d      10
+      e      10
+      f      10
+      10      15
+      11      15
+      12      15
+      13      15
+      14      15
+      16      15
+      17      15
+      18      15
+      1d      12
+      1e      12
+      1f      12
+      20      12
+      21      12
+      23      12
+      24      12
+      25      12
    }
 
    method 'test1 (Ljava/lang/String;Ljava/lang/String;)V' {
-      c      19
-      d      19
-      14      22
-      15      22
-      16      22
-      17      22
-      18      22
-      19      22
-      1a      22
-      1b      22
-      1c      22
-      1d      22
-      1e      27
-      1f      27
-      35      30
-      36      30
-      37      30
-      38      30
-      39      30
-      3a      30
-      3b      30
-      3c      30
-      3d      30
-      3e      30
-      3f      35
-      40      35
-      41      35
-      42      35
-      43      35
-      44      35
-      45      35
-      4b      32
-      4c      32
-      4d      32
-      4e      32
-      4f      32
-      50      32
-      51      32
+      c      21
+      d      21
+      14      24
+      15      24
+      16      24
+      17      24
+      18      24
+      19      24
+      1a      24
+      1b      24
+      1c      24
+      1d      24
+      1e      29
+      1f      29
+      35      32
+      36      32
+      37      32
+      38      32
+      39      32
+      3a      32
+      3b      32
+      3c      32
+      3d      32
+      3e      32
+      3f      37
+      40      37
+      41      37
+      42      37
+      43      37
+      44      37
+      45      37
+      4b      34
+      4c      34
+      4d      34
+      4e      34
+      4f      34
+      50      34
+      51      34
    }
 
    method 'test2 (Ljava/lang/String;Ljava/lang/String;)V' {
-      e      41
-      f      41
-      16      48
-      17      48
-      1b      48
-      1c      48
-      1d      48
-      1f      80
-      20      80
-      24      80
-      25      80
-      26      80
-      27      80
-      2b      80
-      2c      80
-      2e      52
-      2f      52
-      30      53
-      31      53
-      32      53
-      33      53
-      34      53
-      38      68
-      39      68
-      3d      68
-      3e      68
-      3f      68
-      40      68
-      44      68
-      45      68
-      49      55
-      4d      56
-      4e      56
-      4f      57
-      50      57
-      51      57
-      52      57
-      53      57
-      54      57
-      55      57
-      56      57
-      57      57
-      58      58
-      59      58
-      5a      58
-      5b      58
-      5c      58
-      5d      58
-      5e      64
-      5f      64
-      63      64
-      64      64
-      65      64
-      66      64
-      6a      64
-      6b      64
-      6c      65
-      71      61
-      72      61
-      76      61
-      77      61
-      78      61
-      79      61
-      7d      61
-      7e      61
-      8d      72
-      8e      72
-      8f      72
-      90      72
-      91      72
-      92      72
-      93      72
-      94      72
-      97      72
-      98      72
-      a2      72
-      a3      72
-      a4      72
-      b2      77
-      b3      77
-      b4      77
-      b5      77
-      b7      77
-      b8      77
-      b9      77
-      bf      74
-      c0      74
-      c1      74
-      c2      74
-      c4      74
-      c5      74
-      c6      74
+      e      43
+      f      43
+      16      50
+      17      50
+      1b      50
+      1c      50
+      1d      50
+      1f      82
+      20      82
+      24      82
+      25      82
+      26      82
+      27      82
+      2b      82
+      2c      82
+      2e      54
+      2f      54
+      30      55
+      31      55
+      32      55
+      33      55
+      34      55
+      38      70
+      39      70
+      3d      70
+      3e      70
+      3f      70
+      40      70
+      44      70
+      45      70
+      49      57
+      4d      58
+      4e      58
+      4f      59
+      50      59
+      51      59
+      52      59
+      53      59
+      54      59
+      55      59
+      56      59
+      57      59
+      58      60
+      59      60
+      5a      60
+      5b      60
+      5c      60
+      5d      60
+      5e      66
+      5f      66
+      63      66
+      64      66
+      65      66
+      66      66
+      6a      66
+      6b      66
+      6c      67
+      71      63
+      72      63
+      76      63
+      77      63
+      78      63
+      79      63
+      7d      63
+      7e      63
+      8d      74
+      8e      74
+      8f      74
+      90      74
+      91      74
+      92      74
+      93      74
+      94      74
+      97      74
+      98      74
+      a2      74
+      a3      74
+      a4      74
+      b2      79
+      b3      79
+      b4      79
+      b5      79
+      b7      79
+      b8      79
+      b9      79
+      bf      76
+      c0      76
+      c1      76
+      c2      76
+      c4      76
+      c5      76
+      c6      76
    }
 }
 
 Lines mapping:
-8 <-> 9
-10 <-> 11
-15 <-> 20
-17 <-> 23
-19 <-> 28
-21 <-> 31
-23 <-> 33
-28 <-> 42
-30 <-> 49
-33 <-> 53
-34 <-> 54
-36 <-> 56
-37 <-> 57
-38 <-> 58
-39 <-> 59
-41 <-> 62
-42 <-> 62
-44 <-> 62
-46 <-> 66
-47 <-> 73
-49 <-> 75
+8 <-> 11
+10 <-> 16
+15 <-> 22
+17 <-> 25
+19 <-> 30
+21 <-> 33
+23 <-> 38
+28 <-> 44
+30 <-> 51
+33 <-> 55
+34 <-> 56
+36 <-> 58
+37 <-> 59
+38 <-> 60
+39 <-> 61
+41 <-> 64
+42 <-> 64
+44 <-> 64
+46 <-> 68
+47 <-> 75
+49 <-> 80
 Not mapped:
 7
-9
 11
 12
 16
-18
 20
-22
 24
 25
 29
 31
 35
-40
-48
 50
 51
 53
diff --git a/testData/results/pkg/TestIllegalVarName.dec b/testData/results/pkg/TestIllegalVarName.dec
index c92aaf5c2..0fd8b3f3d 100644
--- a/testData/results/pkg/TestIllegalVarName.dec
+++ b/testData/results/pkg/TestIllegalVarName.dec
@@ -5,11 +5,11 @@ import kotlin.jvm.internal.Intrinsics;
 import org.jetbrains.annotations.NotNull;
 
 @Metadata(
-   mv = {1, 6, 0},
+   mv = {2, 0, 0},
    k = 1,
    xi = 48,
-   d1 = {"\u0000\u001a\n\u0002\u0018\u0002\n\u0002\u0010\u0000\n\u0002\b\u0002\n\u0002\u0010\u000e\n\u0002\b\u0002\n\u0002\u0010\b\n\u0000\u0018\u00002\u00020\u0001B\u0005¢\u0006\u0002\u0010\u0002J\u0016\u0010\u0003\u001a\u00020\u00042\u0006\u0010\u0005\u001a\u00020\u00042\u0006\u0010\u0006\u001a\u00020\u0007¨\u0006\b"},
-   d2 = {"Lpkg/TestIllegalVarName;", "", "()V", "m", "", "this", "enum", "", "vineflower_testDataKotlin"}
+   d1 = {"\u0000\u001a\n\u0002\u0018\u0002\n\u0002\u0010\u0000\n\u0002\b\u0003\n\u0002\u0010\u000e\n\u0002\b\u0002\n\u0002\u0010\b\n\u0000\u0018\u00002\u00020\u0001B\u0007¢\u0006\u0004\b\u0002\u0010\u0003J\u0016\u0010\u0004\u001a\u00020\u00052\u0006\u0010\u0006\u001a\u00020\u00052\u0006\u0010\u0007\u001a\u00020\b¨\u0006\t"},
+   d2 = {"Lpkg/TestIllegalVarName;", "", "<init>", "()V", "m", "", "this", "enum", "", "vineflower_testDataKotlin"}
 )
 public final class TestIllegalVarName {
    @NotNull
diff --git a/testData/results/pkg/TestKotlinConstructorKt.dec b/testData/results/pkg/TestKotlinConstructorKt.dec
index 682b7ef36..a3a049865 100644
--- a/testData/results/pkg/TestKotlinConstructorKt.dec
+++ b/testData/results/pkg/TestKotlinConstructorKt.dec
@@ -5,14 +5,17 @@ import java.util.Collection;
 import java.util.List;
 import kotlin.Metadata;
 import kotlin.collections.CollectionsKt;
+import kotlin.jvm.internal.Intrinsics;
+import kotlin.jvm.internal.SourceDebugExtension;
 
 @Metadata(
-   mv = {1, 6, 0},
+   mv = {2, 0, 0},
    k = 2,
    xi = 48,
    d1 = {"\u0000\u0016\n\u0000\n\u0002\u0010 \n\u0002\u0018\u0002\n\u0000\n\u0002\u0010\u001e\n\u0002\u0010\u000e\n\u0000\u001a\u001e\u0010\u0000\u001a\b\u0012\u0004\u0012\u00020\u00020\u00012\u000e\u0010\u0003\u001a\n\u0012\u0006\u0012\u0004\u0018\u00010\u00050\u0004H\u0002¨\u0006\u0006"},
    d2 = {"foo", "", "Lpkg/Mapping;", "list", "", "", "vineflower_testDataKotlin"}
 )
+@SourceDebugExtension({"SMAP\nTestKotlinConstructor.kt\nKotlin\n*S Kotlin\n*F\n+ 1 TestKotlinConstructor.kt\npkg/TestKotlinConstructorKt\n+ 2 _Collections.kt\nkotlin/collections/CollectionsKt___CollectionsKt\n*L\n1#1,11:1\n1557#2:12\n1628#2,3:13\n*S KotlinDebug\n*F\n+ 1 TestKotlinConstructor.kt\npkg/TestKotlinConstructorKt\n*L\n4#1:12\n4#1:13,3\n*E\n"})
 public final class TestKotlinConstructorKt {
    private static final List<Mapping> foo(Collection<String> list) {
       Iterable $this$map$iv = list;
@@ -23,13 +26,8 @@ public final class TestKotlinConstructorKt {
       for (Object item$iv$iv : $this$map$iv) {// 12 13
          String it = (String)item$iv$iv;
          int $i$a$-map-TestKotlinConstructorKt$foo$1 = 0;
-         Mapping var10000 = new Mapping;
-         if (it == null) {// 5
-            throw new NullPointerException("null cannot be cast to non-null type kotlin.String");
-         }
-
-         var10000./* $VF: Unable to resugar constructor */<init>(it);
-         destination$iv$iv.add(var10000);// 14
+         Intrinsics.checkNotNull(it, "null cannot be cast to non-null type kotlin.String");// 5
+         destination$iv$iv.add(new Mapping(it));// 14
       }
 
       return CollectionsKt.toList(destination$iv$iv);// 4 6 15
@@ -38,92 +36,90 @@ public final class TestKotlinConstructorKt {
 
 class 'pkg/TestKotlinConstructorKt' {
    method 'foo (Ljava/util/Collection;)Ljava/util/List;' {
-      0      17
-      1      17
-      2      17
-      3      17
-      4      17
-      5      18
-      6      18
-      7      22
-      d      19
-      e      19
-      f      19
-      10      19
-      11      19
-      12      19
-      16      19
-      17      19
-      18      19
-      19      19
-      1a      19
-      1b      20
-      1c      20
-      1d      20
-      1e      22
-      1f      22
-      20      22
-      21      22
-      22      22
-      23      22
-      24      22
-      25      22
-      30      22
-      31      22
-      32      22
-      33      22
-      34      22
-      35      22
-      36      22
-      37      22
-      38      22
-      39      31
-      3a      31
-      3b      23
-      3c      23
-      3d      23
-      3e      23
-      3f      23
-      40      23
-      41      23
-      44      24
-      45      24
-      46      24
-      4b      26
-      4c      26
-      4e      26
-      4f      26
-      50      26
-      56      27
-      57      27
-      5b      27
-      5c      30
-      5d      30
-      5e      30
-      5f      31
-      60      31
-      62      31
-      63      31
-      64      31
-      65      31
-      66      31
-      6b      34
-      6c      34
-      71      34
-      72      34
-      73      34
-      74      34
-      75      34
-      76      34
-      77      34
+      0      20
+      1      20
+      2      20
+      3      20
+      4      20
+      5      21
+      6      21
+      7      25
+      d      22
+      e      22
+      f      22
+      10      22
+      11      22
+      12      22
+      16      22
+      17      22
+      18      22
+      19      22
+      1a      22
+      1b      23
+      1c      23
+      1d      23
+      1e      25
+      1f      25
+      20      25
+      21      25
+      22      25
+      23      25
+      24      25
+      25      25
+      30      25
+      31      25
+      32      25
+      33      25
+      34      25
+      35      25
+      36      25
+      37      25
+      38      25
+      39      29
+      3a      29
+      3b      26
+      3c      26
+      3d      26
+      3e      26
+      3f      26
+      40      26
+      41      26
+      44      27
+      45      27
+      46      27
+      4b      28
+      4c      28
+      4d      28
+      4e      28
+      4f      28
+      50      28
+      51      28
+      52      29
+      53      29
+      57      29
+      58      29
+      5a      29
+      5b      29
+      5c      29
+      5d      29
+      5e      29
+      63      32
+      64      32
+      69      32
+      6a      32
+      6b      32
+      6c      32
+      6d      32
+      6e      32
+      6f      32
    }
 }
 
 Lines mapping:
-4 <-> 35
-5 <-> 27
-6 <-> 35
-12 <-> 23
-13 <-> 23
-14 <-> 32
-15 <-> 35
+4 <-> 33
+5 <-> 29
+6 <-> 33
+12 <-> 26
+13 <-> 26
+14 <-> 30
+15 <-> 33
diff --git a/testData/results/pkg/TestKotlinEnumWhen.dec b/testData/results/pkg/TestKotlinEnumWhen.dec
index 06dd01988..4093f0ccd 100644
--- a/testData/results/pkg/TestKotlinEnumWhen.dec
+++ b/testData/results/pkg/TestKotlinEnumWhen.dec
@@ -3,13 +3,15 @@ package pkg;
 import kotlin.DeprecationLevel;
 import kotlin.Metadata;
 import kotlin.NoWhenBranchMatchedException;
+import kotlin.enums.EnumEntries;
+import org.jetbrains.annotations.NotNull;
 
 @Metadata(
-   mv = {1, 6, 0},
+   mv = {2, 0, 0},
    k = 1,
    xi = 48,
-   d1 = {"\u0000\u0014\n\u0002\u0018\u0002\n\u0002\u0010\u0010\n\u0002\b\u0002\n\u0002\u0010\u0002\n\u0002\b\b\b\u0086\u0001\u0018\u00002\b\u0012\u0004\u0012\u00020\u00000\u0001B\u0007\b\u0002¢\u0006\u0002\u0010\u0002J\u0006\u0010\u0003\u001a\u00020\u0004J\u0006\u0010\u0005\u001a\u00020\u0004J\u0006\u0010\u0006\u001a\u00020\u0004J\u0006\u0010\u0007\u001a\u00020\u0004J\u0006\u0010\b\u001a\u00020\u0004j\u0002\b\tj\u0002\b\nj\u0002\b\u000b¨\u0006\f"},
-   d2 = {"Lpkg/TestKotlinEnumWhen;", "", "(Ljava/lang/String;I)V", "testAnotherEnum", "", "testConsecutive", "testConsecutiveMixed", "testExpression", "testStatement", "FIRST", "SECOND", "THIRD", "vineflower_testDataKotlin"}
+   d1 = {"\u0000\u0014\n\u0002\u0018\u0002\n\u0002\u0010\u0010\n\u0002\b\u0006\n\u0002\u0010\u0002\n\u0002\b\u0005\b\u0086\u0081\u0002\u0018\u00002\b\u0012\u0004\u0012\u00020\u00000\u0001B\t\b\u0002¢\u0006\u0004\b\u0002\u0010\u0003J\u0006\u0010\u0007\u001a\u00020\bJ\u0006\u0010\t\u001a\u00020\bJ\u0006\u0010\n\u001a\u00020\bJ\u0006\u0010\u000b\u001a\u00020\bJ\u0006\u0010\f\u001a\u00020\bj\u0002\b\u0004j\u0002\b\u0005j\u0002\b\u0006¨\u0006\r"},
+   d2 = {"Lpkg/TestKotlinEnumWhen;", "", "<init>", "(Ljava/lang/String;I)V", "FIRST", "SECOND", "THIRD", "testStatement", "", "testExpression", "testAnotherEnum", "testConsecutive", "testConsecutiveMixed", "vineflower_testDataKotlin"}
 )
 public enum TestKotlinEnumWhen {
    FIRST,
@@ -26,6 +28,9 @@ public enum TestKotlinEnumWhen {
             break;
          case THIRD:
             System.out.println("third!");// 10
+            break;
+         default:
+            throw new NoWhenBranchMatchedException();
       }
    }// 12
 
@@ -50,6 +55,9 @@ public enum TestKotlinEnumWhen {
             break;
          case HIDDEN:
             System.out.println("hidden " + level);// 31
+            break;
+         default:
+            throw new NoWhenBranchMatchedException();
       }
    }// 33
 
@@ -63,6 +71,9 @@ public enum TestKotlinEnumWhen {
             break;
          case THIRD:
             System.out.println("third!");// 39
+            break;
+         default:
+            throw new NoWhenBranchMatchedException();
       }
 
       switch (this) {// 42
@@ -74,11 +85,14 @@ public enum TestKotlinEnumWhen {
             break;
          case THIRD:
             System.out.println("third, again!");// 45
+            break;
+         default:
+            throw new NoWhenBranchMatchedException();
       }
    }// 47
 
    public final void testConsecutiveMixed() {
-      DeprecationLevel level = testConsecutiveMixed$getLevel-0();// 53
+      DeprecationLevel level = testConsecutiveMixed$getLevel$0();// 53
       switch (level) {
          case WARNING:
             System.out.println("warning " + level);// 54
@@ -88,6 +102,9 @@ public enum TestKotlinEnumWhen {
             break;
          case HIDDEN:
             System.out.println("hidden " + level);// 56
+            break;
+         default:
+            throw new NoWhenBranchMatchedException();
       }
 
       switch (this) {// 59
@@ -99,488 +116,518 @@ public enum TestKotlinEnumWhen {
             break;
          case THIRD:
             System.out.println("third!");// 62
+            break;
+         default:
+            throw new NoWhenBranchMatchedException();
       }
    }// 64
 
+   @NotNull
+   public static EnumEntries<TestKotlinEnumWhen> getEntries() {
+      return $ENTRIES;// 65
+   }
+
    private static final DeprecationLevel testAnotherEnum$getLevel() {
       throw new Exception();// 26
    }
 
-   private static final DeprecationLevel testConsecutiveMixed$getLevel_0/* $VF was: testConsecutiveMixed$getLevel-0*/() {
+   private static final DeprecationLevel testConsecutiveMixed$getLevel$0() {
       throw new Exception();// 51
    }
 }
 
 class 'pkg/TestKotlinEnumWhen' {
    method 'testStatement ()V' {
-      0      19
-      8      19
-      9      19
-      a      19
-      b      19
-      c      19
-      d      19
-      e      19
-      f      19
-      10      19
-      11      19
-      12      19
-      13      19
-      14      19
-      15      19
-      16      19
-      17      19
-      18      19
-      19      19
-      1a      19
-      1b      19
-      1c      19
-      1d      19
-      1e      19
-      1f      19
-      20      19
-      21      19
-      22      19
-      23      19
-      24      21
-      25      21
-      26      21
-      27      21
-      28      21
-      2a      21
-      2b      21
-      2c      21
-      2d      22
-      30      24
-      31      24
-      32      24
-      33      24
-      34      24
-      36      24
-      37      24
-      38      24
-      39      25
-      3c      27
-      3d      27
-      3e      27
-      3f      27
-      40      27
-      42      27
-      43      27
-      44      27
-      45      29
+      0      21
+      8      21
+      9      21
+      a      21
+      b      21
+      c      21
+      d      21
+      e      21
+      f      21
+      10      21
+      11      21
+      12      21
+      13      21
+      14      21
+      15      21
+      16      21
+      17      21
+      18      21
+      19      21
+      1a      21
+      1b      21
+      1c      21
+      1d      21
+      1e      21
+      1f      21
+      20      21
+      21      21
+      22      21
+      23      21
+      24      23
+      25      23
+      26      23
+      27      23
+      28      23
+      2a      23
+      2b      23
+      2c      23
+      2d      24
+      30      26
+      31      26
+      32      26
+      33      26
+      34      26
+      36      26
+      37      26
+      38      26
+      39      27
+      3c      29
+      3d      29
+      3e      29
+      3f      29
+      40      29
+      42      29
+      43      29
+      44      29
+      45      30
+      4f      32
+      50      34
    }
 
    method 'testExpression ()V' {
-      0      32
-      8      32
-      9      32
-      a      32
-      b      32
-      c      32
-      d      32
-      e      32
-      f      32
-      10      32
-      11      32
-      12      32
-      13      32
-      14      32
-      15      32
-      16      32
-      17      32
-      18      32
-      19      32
-      1a      32
-      1b      32
-      1c      32
-      1d      32
-      1e      32
-      1f      32
-      20      32
-      21      32
-      22      32
-      23      32
-      24      33
-      25      33
-      29      34
-      2a      34
-      2e      35
-      2f      35
-      3a      36
-      3b      32
-      3c      38
-      3d      38
-      3e      38
-      3f      38
-      40      38
-      41      38
-      42      38
-      43      39
+      0      37
+      8      37
+      9      37
+      a      37
+      b      37
+      c      37
+      d      37
+      e      37
+      f      37
+      10      37
+      11      37
+      12      37
+      13      37
+      14      37
+      15      37
+      16      37
+      17      37
+      18      37
+      19      37
+      1a      37
+      1b      37
+      1c      37
+      1d      37
+      1e      37
+      1f      37
+      20      37
+      21      37
+      22      37
+      23      37
+      24      38
+      25      38
+      29      39
+      2a      39
+      2e      40
+      2f      40
+      3a      41
+      3b      37
+      3c      43
+      3d      43
+      3e      43
+      3f      43
+      40      43
+      41      43
+      42      43
+      43      44
    }
 
    method 'testAnotherEnum ()V' {
-      0      42
-      1      42
-      2      42
-      3      42
-      7      43
-      b      43
-      c      43
-      d      43
-      e      43
-      f      43
-      10      43
-      11      43
-      12      43
-      13      43
-      14      43
-      15      43
-      16      43
-      17      43
-      18      43
-      19      43
-      1a      43
-      1b      43
-      1c      43
-      1d      43
-      1e      43
-      1f      43
-      20      43
-      21      43
-      22      43
-      23      43
-      24      43
-      25      43
-      26      43
-      27      43
-      28      45
-      29      45
-      2a      45
-      2b      45
-      2c      45
-      2d      45
-      2e      45
-      2f      45
-      30      45
-      32      45
-      33      45
-      34      45
-      35      46
-      38      48
-      39      48
-      3a      48
-      3b      48
-      3c      48
-      3d      48
-      3e      48
-      3f      48
-      40      48
-      42      48
-      43      48
-      44      48
-      45      49
-      48      51
-      49      51
-      4a      51
-      4b      51
-      4c      51
-      4d      51
-      4e      51
-      4f      51
-      50      51
-      52      51
-      53      51
-      54      51
-      55      53
+      0      47
+      1      47
+      2      47
+      3      47
+      7      48
+      b      48
+      c      48
+      d      48
+      e      48
+      f      48
+      10      48
+      11      48
+      12      48
+      13      48
+      14      48
+      15      48
+      16      48
+      17      48
+      18      48
+      19      48
+      1a      48
+      1b      48
+      1c      48
+      1d      48
+      1e      48
+      1f      48
+      20      48
+      21      48
+      22      48
+      23      48
+      24      48
+      25      48
+      26      48
+      27      48
+      28      50
+      29      50
+      2a      50
+      2b      50
+      2c      50
+      2d      50
+      2e      50
+      2f      50
+      30      50
+      32      50
+      33      50
+      34      50
+      35      51
+      38      53
+      39      53
+      3a      53
+      3b      53
+      3c      53
+      3d      53
+      3e      53
+      3f      53
+      40      53
+      42      53
+      43      53
+      44      53
+      45      54
+      48      56
+      49      56
+      4a      56
+      4b      56
+      4c      56
+      4d      56
+      4e      56
+      4f      56
+      50      56
+      52      56
+      53      56
+      54      56
+      55      57
+      5f      59
+      60      61
    }
 
    method 'testConsecutive ()V' {
-      0      56
-      8      56
-      9      56
-      a      56
-      b      56
-      c      56
-      d      56
-      e      56
-      f      56
-      10      56
-      11      56
-      12      56
-      13      56
-      14      56
-      15      56
-      16      56
-      17      56
-      18      56
-      19      56
-      1a      56
-      1b      56
-      1c      56
-      1d      56
-      1e      56
-      1f      56
-      20      56
-      21      56
-      22      56
-      23      56
-      24      58
-      25      58
-      26      58
-      27      58
-      28      58
-      2a      58
-      2b      58
-      2c      58
-      2d      59
-      30      61
-      31      61
-      32      61
-      33      61
-      34      61
-      36      61
-      37      61
-      38      61
-      39      62
-      3c      64
-      3d      64
-      3e      64
-      3f      64
-      40      64
-      42      64
-      43      64
-      44      64
-      45      67
-      4d      67
-      4e      67
-      4f      67
-      50      67
-      51      67
-      52      67
-      53      67
-      54      67
-      55      67
-      56      67
-      57      67
-      58      67
-      59      67
-      5a      67
-      5b      67
-      5c      67
-      5d      67
-      5e      67
-      5f      67
-      60      67
-      61      67
-      62      67
-      63      67
-      64      67
-      65      67
-      66      67
-      67      67
-      68      69
-      69      69
-      6a      69
-      6b      69
-      6c      69
-      6e      69
-      6f      69
-      70      69
-      71      70
-      74      72
-      75      72
-      76      72
-      77      72
-      78      72
-      7a      72
-      7b      72
-      7c      72
-      7d      73
-      80      75
-      81      75
-      82      75
-      83      75
-      84      75
-      86      75
-      87      75
-      88      75
-      89      77
+      0      64
+      8      64
+      9      64
+      a      64
+      b      64
+      c      64
+      d      64
+      e      64
+      f      64
+      10      64
+      11      64
+      12      64
+      13      64
+      14      64
+      15      64
+      16      64
+      17      64
+      18      64
+      19      64
+      1a      64
+      1b      64
+      1c      64
+      1d      64
+      1e      64
+      1f      64
+      20      64
+      21      64
+      22      64
+      23      64
+      24      66
+      25      66
+      26      66
+      27      66
+      28      66
+      2a      66
+      2b      66
+      2c      66
+      2d      67
+      30      69
+      31      69
+      32      69
+      33      69
+      34      69
+      36      69
+      37      69
+      38      69
+      39      70
+      3c      72
+      3d      72
+      3e      72
+      3f      72
+      40      72
+      42      72
+      43      72
+      44      72
+      45      73
+      4f      75
+      50      78
+      58      78
+      59      78
+      5a      78
+      5b      78
+      5c      78
+      5d      78
+      5e      78
+      5f      78
+      60      78
+      61      78
+      62      78
+      63      78
+      64      78
+      65      78
+      66      78
+      67      78
+      68      78
+      69      78
+      6a      78
+      6b      78
+      6c      78
+      6d      78
+      6e      78
+      6f      78
+      70      78
+      71      78
+      72      78
+      73      78
+      74      80
+      75      80
+      76      80
+      77      80
+      78      80
+      7a      80
+      7b      80
+      7c      80
+      7d      81
+      80      83
+      81      83
+      82      83
+      83      83
+      84      83
+      86      83
+      87      83
+      88      83
+      89      84
+      8c      86
+      8d      86
+      8e      86
+      8f      86
+      90      86
+      92      86
+      93      86
+      94      86
+      95      87
+      9f      89
+      a0      91
    }
 
    method 'testConsecutiveMixed ()V' {
-      0      80
-      1      80
-      2      80
-      3      80
-      7      81
-      b      81
-      c      81
-      d      81
-      e      81
-      f      81
-      10      81
-      11      81
-      12      81
-      13      81
-      14      81
-      15      81
-      16      81
-      17      81
-      18      81
-      19      81
-      1a      81
-      1b      81
-      1c      81
-      1d      81
-      1e      81
-      1f      81
-      20      81
-      21      81
-      22      81
-      23      81
-      24      81
-      25      81
-      26      81
-      27      81
-      28      83
-      29      83
-      2a      83
-      2b      83
-      2c      83
-      2d      83
-      2e      83
-      2f      83
-      30      83
-      32      83
-      33      83
-      34      83
-      35      84
-      38      86
-      39      86
-      3a      86
-      3b      86
-      3c      86
-      3d      86
-      3e      86
-      3f      86
-      40      86
-      42      86
-      43      86
-      44      86
-      45      87
-      48      89
-      49      89
-      4a      89
-      4b      89
-      4c      89
-      4d      89
-      4e      89
-      4f      89
-      50      89
-      52      89
-      53      89
-      54      89
-      55      92
-      5d      92
-      5e      92
-      5f      92
-      60      92
-      61      92
-      62      92
-      63      92
-      64      92
-      65      92
-      66      92
-      67      92
-      68      92
-      69      92
-      6a      92
-      6b      92
-      6c      92
-      6d      92
-      6e      92
-      6f      92
-      70      92
-      71      92
-      72      92
-      73      92
-      74      92
-      75      92
-      76      92
-      77      92
-      78      94
-      79      94
-      7a      94
-      7b      94
-      7c      94
-      7e      94
-      7f      94
-      80      94
-      81      95
-      84      97
-      85      97
-      86      97
-      87      97
-      88      97
-      8a      97
-      8b      97
-      8c      97
-      8d      98
-      90      100
-      91      100
-      92      100
-      93      100
-      94      100
-      96      100
-      97      100
-      98      100
-      99      102
+      0      94
+      1      94
+      2      94
+      3      94
+      7      95
+      b      95
+      c      95
+      d      95
+      e      95
+      f      95
+      10      95
+      11      95
+      12      95
+      13      95
+      14      95
+      15      95
+      16      95
+      17      95
+      18      95
+      19      95
+      1a      95
+      1b      95
+      1c      95
+      1d      95
+      1e      95
+      1f      95
+      20      95
+      21      95
+      22      95
+      23      95
+      24      95
+      25      95
+      26      95
+      27      95
+      28      97
+      29      97
+      2a      97
+      2b      97
+      2c      97
+      2d      97
+      2e      97
+      2f      97
+      30      97
+      32      97
+      33      97
+      34      97
+      35      98
+      38      100
+      39      100
+      3a      100
+      3b      100
+      3c      100
+      3d      100
+      3e      100
+      3f      100
+      40      100
+      42      100
+      43      100
+      44      100
+      45      101
+      48      103
+      49      103
+      4a      103
+      4b      103
+      4c      103
+      4d      103
+      4e      103
+      4f      103
+      50      103
+      52      103
+      53      103
+      54      103
+      55      104
+      5f      106
+      60      109
+      68      109
+      69      109
+      6a      109
+      6b      109
+      6c      109
+      6d      109
+      6e      109
+      6f      109
+      70      109
+      71      109
+      72      109
+      73      109
+      74      109
+      75      109
+      76      109
+      77      109
+      78      109
+      79      109
+      7a      109
+      7b      109
+      7c      109
+      7d      109
+      7e      109
+      7f      109
+      80      109
+      81      109
+      82      109
+      83      109
+      84      111
+      85      111
+      86      111
+      87      111
+      88      111
+      8a      111
+      8b      111
+      8c      111
+      8d      112
+      90      114
+      91      114
+      92      114
+      93      114
+      94      114
+      96      114
+      97      114
+      98      114
+      99      115
+      9c      117
+      9d      117
+      9e      117
+      9f      117
+      a0      117
+      a2      117
+      a3      117
+      a4      117
+      a5      118
+      af      120
+      b0      122
+   }
+
+   method 'getEntries ()Lkotlin/enums/EnumEntries;' {
+      0      126
+      1      126
+      2      126
+      3      126
    }
 
    method 'testAnotherEnum$getLevel ()Lkotlin/DeprecationLevel;' {
-      7      105
+      7      130
    }
 
-   method 'testConsecutiveMixed$getLevel-0 ()Lkotlin/DeprecationLevel;' {
-      7      109
+   method 'testConsecutiveMixed$getLevel$0 ()Lkotlin/DeprecationLevel;' {
+      7      134
    }
 }
 
 Lines mapping:
-7 <-> 20
-8 <-> 22
-9 <-> 25
-10 <-> 28
-12 <-> 30
-15 <-> 39
-16 <-> 33
-17 <-> 34
-18 <-> 35
-19 <-> 36
-22 <-> 40
-26 <-> 106
-28 <-> 43
-29 <-> 46
-30 <-> 49
-31 <-> 52
-33 <-> 54
-36 <-> 57
-37 <-> 59
-38 <-> 62
-39 <-> 65
-42 <-> 68
-43 <-> 70
-44 <-> 73
-45 <-> 76
-47 <-> 78
-51 <-> 110
-53 <-> 81
-54 <-> 84
-55 <-> 87
-56 <-> 90
-59 <-> 93
-60 <-> 95
-61 <-> 98
-62 <-> 101
-64 <-> 103
+7 <-> 22
+8 <-> 24
+9 <-> 27
+10 <-> 30
+12 <-> 35
+15 <-> 44
+16 <-> 38
+17 <-> 39
+18 <-> 40
+19 <-> 41
+22 <-> 45
+26 <-> 131
+28 <-> 48
+29 <-> 51
+30 <-> 54
+31 <-> 57
+33 <-> 62
+36 <-> 65
+37 <-> 67
+38 <-> 70
+39 <-> 73
+42 <-> 79
+43 <-> 81
+44 <-> 84
+45 <-> 87
+47 <-> 92
+51 <-> 135
+53 <-> 95
+54 <-> 98
+55 <-> 101
+56 <-> 104
+59 <-> 110
+60 <-> 112
+61 <-> 115
+62 <-> 118
+64 <-> 123
+65 <-> 127
diff --git a/testData/results/pkg/TestNamedSuspendFun2Kt.dec b/testData/results/pkg/TestNamedSuspendFun2Kt.dec
index 401195f1c..2e2c5987b 100644
--- a/testData/results/pkg/TestNamedSuspendFun2Kt.dec
+++ b/testData/results/pkg/TestNamedSuspendFun2Kt.dec
@@ -11,11 +11,11 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 @Metadata(
-   mv = {1, 6, 0},
+   mv = {2, 0, 0},
    k = 2,
    xi = 48,
-   d1 = {"\u0000\n\n\u0000\n\u0002\u0010\b\n\u0002\b\u0003\u001a\u0011\u0010\u0000\u001a\u00020\u0001H\u0086@ø\u0001\u0000¢\u0006\u0002\u0010\u0002\u001a\u0011\u0010\u0003\u001a\u00020\u0001H\u0086@ø\u0001\u0000¢\u0006\u0002\u0010\u0002\u0082\u0002\u0004\n\u0002\b\u0019¨\u0006\u0004"},
-   d2 = {"bar", "", "(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;", "foo2", "vineflower_testDataKotlin"}
+   d1 = {"\u0000\n\n\u0000\n\u0002\u0010\b\n\u0002\b\u0003\u001a\u000e\u0010\u0000\u001a\u00020\u0001H\u0086@¢\u0006\u0002\u0010\u0002\u001a\u000e\u0010\u0003\u001a\u00020\u0001H\u0086@¢\u0006\u0002\u0010\u0002¨\u0006\u0004"},
+   d2 = {"foo2", "", "(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;", "bar", "vineflower_testDataKotlin"}
 )
 public final class TestNamedSuspendFun2Kt {
    // $VF: Handled exception range with multiple entry points by splitting it
@@ -23,7 +23,7 @@ public final class TestNamedSuspendFun2Kt {
    // $VF: Irreducible bytecode was duplicated to produce valid code
    // $VF: Could not inline inconsistent finally blocks
    @Nullable
-   public static final Object foo2(@NotNull Continuation<? super Integer> var0) {
+   public static final Object foo2(@NotNull Continuation<? super Integer> $completion) {
       Continuation $continuation;
 
       @DebugMetadata(
@@ -36,7 +36,7 @@ public final class TestNamedSuspendFun2Kt {
          c = "pkg.TestNamedSuspendFun2Kt"
       )
       @Metadata(
-         mv = {1, 6, 0},
+         mv = {2, 0, 0},
          k = 3,
          xi = 48
       )
@@ -58,15 +58,15 @@ public final class TestNamedSuspendFun2Kt {
       }
 
       label261: {
-         if (var0 instanceof NamelessClass_1) {
-            $continuation = (NamelessClass_1)var0;
+         if ($completion instanceof NamelessClass_1) {
+            $continuation = (NamelessClass_1)$completion;
             if (($continuation.label & -2147483648) != 0) {
                $continuation.label -= -2147483648;
                break label261;
             }
          }
 
-         $continuation = new NamelessClass_1(var0);
+         $continuation = new NamelessClass_1($completion);
       }
 
       Object var4;
@@ -151,8 +151,8 @@ public final class TestNamedSuspendFun2Kt {
             }
          }
 
-         Throwable x = var10000;// 7
-         $continuation.L$0 = x;// 8
+         Throwable x = var10000;// 8
+         $continuation.L$0 = x;
          $continuation.label = 4;
          if (bar($continuation) == var4) {
             return var4;// 2
@@ -421,8 +421,7 @@ Lines mapping:
 4 <-> 125
 5 <-> 93
 6 <-> 94
-7 <-> 154
-8 <-> 155
+8 <-> 154
 11 <-> 110
 14 <-> 170
 Not mapped:
diff --git a/testData/results/pkg/TestRunSuspend.dec b/testData/results/pkg/TestRunSuspend.dec
index b1c27c6c0..a60959e9d 100644
--- a/testData/results/pkg/TestRunSuspend.dec
+++ b/testData/results/pkg/TestRunSuspend.dec
@@ -4,14 +4,15 @@ import kotlin.Metadata;
 import kotlin.Result;
 import kotlin.ResultKt;
 import kotlin.Unit;
+import kotlin.jvm.internal.Intrinsics;
 import org.jetbrains.annotations.Nullable;
 
 @Metadata(
-   mv = {1, 6, 0},
+   mv = {2, 0, 0},
    k = 1,
    xi = 48,
-   d1 = {"\u0000\u0018\n\u0002\u0018\u0002\n\u0002\u0010\u0000\n\u0002\b\u0002\n\u0002\u0018\u0002\n\u0002\u0010\u0002\n\u0002\b\u0006\b\u0002\u0018\u00002\u00020\u0001B\u0005¢\u0006\u0002\u0010\u0002J\u0006\u0010\n\u001a\u00020\u0005R+\u0010\u0003\u001a\n\u0012\u0004\u0012\u00020\u0005\u0018\u00010\u0004X\u0086\u000eø\u0001\u0000ø\u0001\u0001ø\u0001\u0002¢\u0006\u000e\n\u0000\u001a\u0004\b\u0006\u0010\u0007\"\u0004\b\b\u0010\t\u0082\u0002\u000f\n\u0002\b\u0019\n\u0005\b¡\u001e0\u0001\n\u0002\b!¨\u0006\u000b"},
-   d2 = {"Lpkg/TestRunSuspend;", "", "()V", "result", "Lkotlin/Result;", "", "getResult-xLWZpok", "()Lkotlin/Result;", "setResult", "(Lkotlin/Result;)V", "await", "vineflower_testDataKotlin"}
+   d1 = {"\u0000\u0018\n\u0002\u0018\u0002\n\u0002\u0010\u0000\n\u0002\b\u0003\n\u0002\u0018\u0002\n\u0002\u0010\u0002\n\u0002\b\u0006\b\u0002\u0018\u00002\u00020\u0001B\u0007¢\u0006\u0004\b\u0002\u0010\u0003J\u0006\u0010\u000b\u001a\u00020\u0006R\"\u0010\u0004\u001a\n\u0012\u0004\u0012\u00020\u0006\u0018\u00010\u0005X\u0086\u000e¢\u0006\u000e\n\u0000\u001a\u0004\b\u0007\u0010\b\"\u0004\b\t\u0010\n¨\u0006\f"},
+   d2 = {"Lpkg/TestRunSuspend;", "", "<init>", "()V", "result", "Lkotlin/Result;", "", "getResult-xLWZpok", "()Lkotlin/Result;", "setResult", "(Lkotlin/Result;)V", "await", "vineflower_testDataKotlin"}
 )
 final class TestRunSuspend {
    @Nullable
@@ -42,6 +43,7 @@ final class TestRunSuspend {
                return;
             }
 
+            Intrinsics.checkNotNull(this, "null cannot be cast to non-null type java.lang.Object");
             this.wait();
          }
       }
@@ -50,70 +52,76 @@ final class TestRunSuspend {
 
 class 'pkg/TestRunSuspend' {
    method '<init> ()V' {
-      4      20
+      4      21
    }
 
    method 'getResult-xLWZpok ()Lkotlin/Result;' {
-      0      24
-      1      24
-      2      24
-      3      24
-      4      24
+      0      25
+      1      25
+      2      25
+      3      25
+      4      25
    }
 
    method 'setResult (Lkotlin/Result;)V' {
-      0      28
-      1      28
-      2      28
-      3      28
-      4      28
-      5      29
+      0      29
+      1      29
+      2      29
+      3      29
+      4      29
+      5      30
    }
 
    method 'await ()V' {
-      0      33
-      2      33
-      3      33
-      5      34
-      6      34
-      8      37
-      9      37
-      a      37
-      b      37
-      c      37
-      d      38
-      e      38
-      f      38
-      10      38
-      11      44
-      12      44
-      13      44
-      14      44
-      15      44
-      16      44
-      17      44
-      1b      39
-      1c      39
-      1d      39
-      1e      39
-      1f      39
-      20      39
+      0      34
+      2      34
+      3      34
+      5      35
+      6      35
+      8      38
+      9      38
+      a      38
+      b      38
+      c      38
+      d      39
+      e      39
+      f      39
+      10      39
+      11      45
+      12      45
+      13      45
+      14      45
+      15      45
+      16      45
+      17      46
+      18      46
+      19      46
+      1a      46
+      1b      46
+      1c      46
+      1d      46
       21      40
       22      40
       23      40
       24      40
       25      40
+      26      40
+      27      41
+      28      41
       29      41
+      2a      41
+      2b      41
+      2f      42
    }
 }
 
 Lines mapping:
-4 <-> 21
-5 <-> 29
-7 <-> 34
-9 <-> 38
-10 <-> 39
-12 <-> 40
+4 <-> 22
+5 <-> 30
+7 <-> 35
+9 <-> 39
+10 <-> 40
+12 <-> 41
 Not mapped:
 8
 13
diff --git a/testData/results/pkg/TestSuspendLambdaKt.dec b/testData/results/pkg/TestSuspendLambdaKt.dec
index 41ac47e9f..f7e560b7f 100644
--- a/testData/results/pkg/TestSuspendLambdaKt.dec
+++ b/testData/results/pkg/TestSuspendLambdaKt.dec
@@ -9,13 +9,12 @@ import kotlin.coroutines.jvm.internal.DebugMetadata;
 import kotlin.coroutines.jvm.internal.SuspendLambda;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 @Metadata(
-   mv = {1, 6, 0},
+   mv = {2, 0, 0},
    k = 2,
    xi = 48,
-   d1 = {"\u0000\u0016\n\u0000\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\u0010\u0002\n\u0002\u0010\u0000\n\u0002\b\u0004\",\u0010\u0000\u001a\u0018\b\u0001\u0012\n\u0012\b\u0012\u0004\u0012\u00020\u00030\u0002\u0012\u0006\u0012\u0004\u0018\u00010\u00040\u0001ø\u0001\u0000¢\u0006\n\n\u0002\u0010\u0007\u001a\u0004\b\u0005\u0010\u0006\u0082\u0002\u0004\n\u0002\b\u0019¨\u0006\b"},
+   d1 = {"\u0000\u0016\n\u0000\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\u0010\u0002\n\u0002\u0010\u0000\n\u0002\b\u0004\")\u0010\u0000\u001a\u0018\b\u0001\u0012\n\u0012\b\u0012\u0004\u0012\u00020\u00030\u0002\u0012\u0006\u0012\u0004\u0018\u00010\u00040\u0001¢\u0006\n\n\u0002\u0010\u0007\u001a\u0004\b\u0005\u0010\u0006¨\u0006\b"},
    d2 = {"sl1", "Lkotlin/Function1;", "Lkotlin/coroutines/Continuation;", "", "", "getSl1", "()Lkotlin/jvm/functions/Function1;", "Lkotlin/jvm/functions/Function1;", "vineflower_testDataKotlin"}
 )
 public final class TestSuspendLambdaKt {
@@ -38,10 +37,10 @@ public final class TestSuspendLambdaKt {
          c = "pkg.TestSuspendLambdaKt$sl1$1"
       )
       @Metadata(
-         mv = {1, 6, 0},
+         mv = {2, 0, 0},
          k = 3,
          xi = 48,
-         d1 = {"\u0000\u0006\n\u0000\n\u0002\u0010\u0002\u0010\u0000\u001a\u00020\u0001H\u008a@"},
+         d1 = {"\u0000\u0006\n\u0000\n\u0002\u0010\u0002\u0010\u0000\u001a\u00020\u0001H\n"},
          d2 = {"<anonymous>", ""}
       )
       final class NamelessClass_1 extends SuspendLambda implements Function1<Continuation<? super Unit>, Object> {
@@ -51,8 +50,7 @@ public final class TestSuspendLambdaKt {
             super(1, $completion);
          }
 
-         @Nullable
-         public final Object invokeSuspend(@NotNull Object $result) {
+         public final Object invokeSuspend(Object $result) {
             IntrinsicsKt.getCOROUTINE_SUSPENDED();
             switch (this.label) {
                case 0:
@@ -64,13 +62,11 @@ public final class TestSuspendLambdaKt {
             }
          }
 
-         @NotNull
-         public final Continuation<Unit> create(@NotNull Continuation<?> $completion) {
+         public final Continuation<Unit> create(Continuation<?> $completion) {
             return (Continuation<Unit>)(new NamelessClass_1($completion));
          }
 
-         @Nullable
-         public final Object invoke(@Nullable Continuation<? super Unit> p1) {
+         public final Object invoke(Continuation<? super Unit> p1) {
             return ((NamelessClass_1)this.create(p1)).invokeSuspend(Unit.INSTANCE);
          }
       }
@@ -80,104 +76,104 @@ public final class TestSuspendLambdaKt {
 
 class 'pkg/TestSuspendLambdaKt' {
    method 'getSl1 ()Lkotlin/jvm/functions/Function1;' {
-      0      26
-      1      26
-      2      26
-      3      26
+      0      25
+      1      25
+      2      25
+      3      25
    }
 
    method '<clinit> ()V' {
-      e      77
+      e      73
    }
 }
 
 class 'pkg/TestSuspendLambdaKt$sl1$1' {
    method '<init> (Lkotlin/coroutines/Continuation;)V' {
-      1      50
-      2      50
-      3      50
-      4      50
-      5      50
-      6      51
+      1      49
+      2      49
+      3      49
+      4      49
+      5      49
+      6      50
    }
 
    method 'invokeSuspend (Ljava/lang/Object;)Ljava/lang/Object;' {
-      0      55
-      1      55
-      2      55
-      4      56
-      5      56
-      6      56
-      7      56
-      8      56
-      9      56
-      a      56
-      b      56
-      c      56
-      d      56
-      e      56
-      f      56
-      10      56
-      11      56
-      12      56
-      13      56
-      14      56
-      15      56
-      16      56
-      17      56
-      18      56
-      19      56
-      1a      56
-      1b      56
-      1c      58
-      1d      58
-      1e      58
-      1f      58
-      20      59
-      21      59
-      22      59
-      23      59
-      24      59
-      26      59
-      27      59
-      28      59
-      29      60
-      2a      60
-      2b      60
-      2c      60
-      31      62
-      32      62
-      36      62
+      0      53
+      1      53
+      2      53
+      4      54
+      5      54
+      6      54
+      7      54
+      8      54
+      9      54
+      a      54
+      b      54
+      c      54
+      d      54
+      e      54
+      f      54
+      10      54
+      11      54
+      12      54
+      13      54
+      14      54
+      15      54
+      16      54
+      17      54
+      18      54
+      19      54
+      1a      54
+      1b      54
+      1c      56
+      1d      56
+      1e      56
+      1f      56
+      20      57
+      21      57
+      22      57
+      23      57
+      24      57
+      26      57
+      27      57
+      28      57
+      29      58
+      2a      58
+      2b      58
+      2c      58
+      31      60
+      32      60
+      36      60
    }
 
    method 'create (Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;' {
-      4      68
-      8      68
-      9      68
-      a      68
-      b      68
+      4      65
+      8      65
+      9      65
+      a      65
+      b      65
    }
 
    method 'invoke (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;' {
-      0      73
-      1      73
-      2      73
-      3      73
-      4      73
-      5      73
-      6      73
-      7      73
-      8      73
-      9      73
-      a      73
-      b      73
-      c      73
-      d      73
-      e      73
+      0      69
+      1      69
+      2      69
+      3      69
+      4      69
+      5      69
+      6      69
+      7      69
+      8      69
+      9      69
+      a      69
+      b      69
+      c      69
+      d      69
+      e      69
    }
 }
 
 Lines mapping:
-3 <-> 78
-4 <-> 60
-5 <-> 61
+3 <-> 74
+4 <-> 58
+5 <-> 59
diff --git a/testData/results/pkg/TestSynchronizedUnprotected.dec b/testData/results/pkg/TestSynchronizedUnprotected.dec
index acf2f582a..afb3bac56 100644
--- a/testData/results/pkg/TestSynchronizedUnprotected.dec
+++ b/testData/results/pkg/TestSynchronizedUnprotected.dec
@@ -4,11 +4,11 @@ import kotlin.Metadata;
 import kotlin.Unit;
 
 @Metadata(
-   mv = {1, 6, 0},
+   mv = {2, 0, 0},
    k = 1,
    xi = 48,
-   d1 = {"\u0000\u0012\n\u0002\u0018\u0002\n\u0002\u0010\u0000\n\u0002\b\u0002\n\u0002\u0010\u0002\n\u0000\u0018\u00002\u00020\u0001B\u0005¢\u0006\u0002\u0010\u0002J\u0006\u0010\u0003\u001a\u00020\u0004¨\u0006\u0005"},
-   d2 = {"Lpkg/TestSynchronizedUnprotected;", "", "()V", "test", "", "vineflower_testDataKotlin"}
+   d1 = {"\u0000\u0012\n\u0002\u0018\u0002\n\u0002\u0010\u0000\n\u0002\b\u0003\n\u0002\u0010\u0002\n\u0000\u0018\u00002\u00020\u0001B\u0007¢\u0006\u0004\b\u0002\u0010\u0003J\u0006\u0010\u0004\u001a\u00020\u0005¨\u0006\u0006"},
+   d2 = {"Lpkg/TestSynchronizedUnprotected;", "", "<init>", "()V", "test", "", "vineflower_testDataKotlin"}
 )
 public final class TestSynchronizedUnprotected {
    // $VF: Extended synchronized range to monitorexit