diff --git a/compiler/testData/codegen/light-analysis/controlStructures/breakContinueInExpressions/breakInDoWhile.txt b/compiler/testData/codegen/light-analysis/controlStructures/breakContinueInExpressions/breakInDoWhile.txt
new file mode 100644
index 00000000000..493a710c9ae
--- /dev/null
+++ b/compiler/testData/codegen/light-analysis/controlStructures/breakContinueInExpressions/breakInDoWhile.txt
@@ -0,0 +1,3 @@
+public final class BreakInDoWhileKt {
+    public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
+}
diff --git a/compiler/testData/codegen/light-analysis/controlStructures/breakContinueInExpressions/continueInDoWhile.txt b/compiler/testData/codegen/light-analysis/controlStructures/breakContinueInExpressions/continueInDoWhile.txt
new file mode 100644
index 00000000000..cb7e3e79374
--- /dev/null
+++ b/compiler/testData/codegen/light-analysis/controlStructures/breakContinueInExpressions/continueInDoWhile.txt
@@ -0,0 +1,3 @@
+public final class ContinueInDoWhileKt {
+    public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
+}
diff --git a/compiler/testData/codegen/light-analysis/controlStructures/breakContinueInExpressions/kt14581.txt b/compiler/testData/codegen/light-analysis/controlStructures/breakContinueInExpressions/kt14581.txt
new file mode 100644
index 00000000000..b09f673144f
--- /dev/null
+++ b/compiler/testData/codegen/light-analysis/controlStructures/breakContinueInExpressions/kt14581.txt
@@ -0,0 +1,5 @@
+public final class Kt14581Kt {
+    public final static @org.jetbrains.annotations.NotNull method bar(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String
+    public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
+    public final static @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+}
diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/companionObject.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/companionObject.txt
index d9ede30f1aa..926bada020c 100644
--- a/compiler/testData/codegen/light-analysis/jvmOverloads/companionObject.txt
+++ b/compiler/testData/codegen/light-analysis/jvmOverloads/companionObject.txt
@@ -2,7 +2,7 @@ public final class C {
     public final static field Companion: C.Companion
     inner class C/Companion
     public method <init>(): void
-    public static @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public final static @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
     public final static @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String
 }
 
@@ -11,7 +11,7 @@ public final static class C/Companion {
     inner class C/Companion
     private method <init>(): void
     public synthetic static method foo$default(p0: C.Companion, p1: java.lang.String, p2: java.lang.String, p3: int, p4: java.lang.Object): java.lang.String
-    public @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public final @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
     public final @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String
 }
 
diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/defaultsNotAtEnd.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/defaultsNotAtEnd.txt
index 0bb0d132b2e..d5d4bbfe6a4 100644
--- a/compiler/testData/codegen/light-analysis/jvmOverloads/defaultsNotAtEnd.txt
+++ b/compiler/testData/codegen/light-analysis/jvmOverloads/defaultsNotAtEnd.txt
@@ -2,8 +2,8 @@ public final class C {
     public method <init>(): void
     public synthetic static method foo$default(p0: C, p1: java.lang.String, p2: int, p3: java.lang.String, p4: int, p5: int, p6: java.lang.Object): java.lang.String
     public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String, p3: int): java.lang.String
-    public @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int, p2: int): java.lang.String
-    public @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(p0: int, p1: int): java.lang.String
+    public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int, p2: int): java.lang.String
+    public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(p0: int, p1: int): java.lang.String
 }
 
 
diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/doubleParameters.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/doubleParameters.txt
index 72fa07b0ae2..fc1dfc374f7 100644
--- a/compiler/testData/codegen/light-analysis/jvmOverloads/doubleParameters.txt
+++ b/compiler/testData/codegen/light-analysis/jvmOverloads/doubleParameters.txt
@@ -1,7 +1,7 @@
 public final class C {
     public method <init>(): void
     public synthetic static method foo$default(p0: C, p1: double, p2: double, p3: java.lang.String, p4: int, p5: java.lang.Object): java.lang.String
-    public @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(p0: double, p1: double): java.lang.String
+    public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(p0: double, p1: double): java.lang.String
     public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: java.lang.String): java.lang.String
 }
 
diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/extensionMethod.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/extensionMethod.txt
index f16ba219724..0ccc8068899 100644
--- a/compiler/testData/codegen/light-analysis/jvmOverloads/extensionMethod.txt
+++ b/compiler/testData/codegen/light-analysis/jvmOverloads/extensionMethod.txt
@@ -7,5 +7,5 @@ public final class ExtensionMethodKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
     public synthetic static method foo$default(p0: C, p1: java.lang.String, p2: java.lang.String, p3: int, p4: java.lang.Object): java.lang.String
     public final static @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: C, @org.jetbrains.annotations.NotNull p1: java.lang.String, @org.jetbrains.annotations.NotNull p2: java.lang.String): java.lang.String
-    public static @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: C, p1: java.lang.String): java.lang.String
+    public final static @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: C, p1: java.lang.String): java.lang.String
 }
diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/generics.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/generics.txt
index 1c672f9087b..08ddc08c575 100644
--- a/compiler/testData/codegen/light-analysis/jvmOverloads/generics.txt
+++ b/compiler/testData/codegen/light-analysis/jvmOverloads/generics.txt
@@ -1,7 +1,7 @@
 public final class C {
     public method <init>(): void
     public synthetic static method foo$default(p0: C, p1: java.lang.Object, p2: java.lang.String, p3: int, p4: java.lang.Object): java.lang.String
-    public @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object): java.lang.String
+    public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object): java.lang.String
     public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String
 }
 
diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/innerClass.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/innerClass.txt
new file mode 100644
index 00000000000..bf5a340f600
--- /dev/null
+++ b/compiler/testData/codegen/light-analysis/jvmOverloads/innerClass.txt
@@ -0,0 +1,22 @@
+public final class InnerClassKt {
+    public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
+}
+
+
+public final class Outer {
+    inner class Outer/Inner
+    public method <init>(): void
+}
+
+
+public final class Outer/Inner {
+    private final @org.jetbrains.annotations.NotNull field s1: java.lang.String
+    private final @org.jetbrains.annotations.NotNull field s2: java.lang.String
+    synthetic final field this$0: Outer
+    inner class Outer/Inner
+    public @kotlin.jvm.JvmOverloads method <init>(@java.lang.Synthetic p0: Outer, @org.jetbrains.annotations.NotNull p1: java.lang.String, @org.jetbrains.annotations.NotNull p2: java.lang.String): void
+    public @kotlin.jvm.JvmOverloads method <init>(@org.jetbrains.annotations.NotNull p0: Outer, p1: java.lang.String): void
+    public synthetic method <init>(p0: Outer, p1: java.lang.String, p2: java.lang.String, p3: int, p4: kotlin.jvm.internal.DefaultConstructorMarker): void
+    public final @org.jetbrains.annotations.NotNull method getS1(): java.lang.String
+    public final @org.jetbrains.annotations.NotNull method getS2(): java.lang.String
+}
diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/multipleDefaultParameters.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/multipleDefaultParameters.txt
index a451d04716e..adcf716a3d6 100644
--- a/compiler/testData/codegen/light-analysis/jvmOverloads/multipleDefaultParameters.txt
+++ b/compiler/testData/codegen/light-analysis/jvmOverloads/multipleDefaultParameters.txt
@@ -1,8 +1,8 @@
 public final class C {
     public method <init>(): void
     public synthetic static method foo$default(p0: C, p1: java.lang.String, p2: java.lang.String, p3: int, p4: java.lang.Object): java.lang.String
-    public @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(): java.lang.String
-    public @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(): java.lang.String
+    public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
     public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String
 }
 
diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/nonDefaultParameter.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/nonDefaultParameter.txt
index 569d643ad95..1ff725ce52f 100644
--- a/compiler/testData/codegen/light-analysis/jvmOverloads/nonDefaultParameter.txt
+++ b/compiler/testData/codegen/light-analysis/jvmOverloads/nonDefaultParameter.txt
@@ -1,7 +1,7 @@
 public final class C {
     public method <init>(): void
     public synthetic static method foo$default(p0: C, p1: java.lang.String, p2: java.lang.String, p3: int, p4: java.lang.Object): java.lang.String
-    public @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
     public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String
 }
 
diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/privateClass.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/privateClass.txt
new file mode 100644
index 00000000000..7fa124063db
--- /dev/null
+++ b/compiler/testData/codegen/light-analysis/jvmOverloads/privateClass.txt
@@ -0,0 +1,18 @@
+final class C {
+    private final @org.jetbrains.annotations.NotNull field status: java.lang.String
+    public method <init>(): void
+    public method <init>(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
+    public synthetic method <init>(p0: java.lang.String, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void
+    public final @org.jetbrains.annotations.NotNull method component1(): java.lang.String
+    public synthetic static method copy$default(p0: C, p1: java.lang.String, p2: int, p3: java.lang.Object): C
+    public final @org.jetbrains.annotations.NotNull method copy(@org.jetbrains.annotations.NotNull p0: java.lang.String): C
+    public method equals(p0: java.lang.Object): boolean
+    public final @org.jetbrains.annotations.NotNull method getStatus(): java.lang.String
+    public method hashCode(): int
+    public method toString(): java.lang.String
+}
+
+
+public final class PrivateClassKt {
+    public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
+}
diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/simple.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/simple.txt
index 7119acaf784..792ba16fc23 100644
--- a/compiler/testData/codegen/light-analysis/jvmOverloads/simple.txt
+++ b/compiler/testData/codegen/light-analysis/jvmOverloads/simple.txt
@@ -1,7 +1,7 @@
 public final class C {
     public method <init>(): void
     public synthetic static method foo$default(p0: C, p1: java.lang.String, p2: int, p3: java.lang.Object): java.lang.String
-    public @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(): java.lang.String
+    public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(): java.lang.String
     public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
 }
 
diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/simpleJavaCall.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/simpleJavaCall.txt
index 1314d7cd36d..33d0751f2d4 100644
--- a/compiler/testData/codegen/light-analysis/jvmOverloads/simpleJavaCall.txt
+++ b/compiler/testData/codegen/light-analysis/jvmOverloads/simpleJavaCall.txt
@@ -1,8 +1,8 @@
 public final class C {
     public method <init>(): void
     public synthetic static method foo$default(p0: C, p1: java.lang.String, p2: java.lang.String, p3: int, p4: java.lang.Object): java.lang.String
-    public @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(): java.lang.String
-    public @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(): java.lang.String
+    public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
     public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String
 }
 
diff --git a/compiler/testData/codegen/light-analysis/jvmOverloads/varargs.txt b/compiler/testData/codegen/light-analysis/jvmOverloads/varargs.txt
new file mode 100644
index 00000000000..cb585dd0c5f
--- /dev/null
+++ b/compiler/testData/codegen/light-analysis/jvmOverloads/varargs.txt
@@ -0,0 +1,11 @@
+public final class C {
+    public method <init>(): void
+    public synthetic static method foo$default(p0: C, p1: int, p2: java.lang.String[], p3: int, p4: java.lang.Object): void
+    public final @kotlin.jvm.JvmOverloads method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String[]): void
+    public final @kotlin.jvm.JvmOverloads method foo(p0: int, @org.jetbrains.annotations.NotNull p1: java.lang.String[]): void
+}
+
+
+public final class VarargsKt {
+    public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
+}