diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt index 3a295319e4f..f7276412272 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt @@ -70,7 +70,7 @@ class LocalDeclarationsLowering( val context: CommonBackendContext, val localNameSanitizer: (String) -> String = { it }, val visibilityPolicy: VisibilityPolicy = VisibilityPolicy.DEFAULT, - val suggestUniqueNames: Boolean = true, // When `true` appends a `-#index` suffix to lifted declaration names + val suggestUniqueNames: Boolean = true, // When `true` appends a `$#index` suffix to lifted declaration names val forceFieldsForInlineCaptures: Boolean = false, // See `LocalClassContext` private val postLocalDeclarationLoweringCallback: ((IntermediateDatastructures) -> Unit)? = null ) : @@ -594,7 +594,7 @@ class LocalDeclarationsLowering( localFunctions[declaration]?.let { val baseName = if (declaration.name.isSpecial) "lambda" else declarationName if (it.index >= 0) - return if (suggestUniqueNames) "$baseName-${it.index}" else baseName + return if (suggestUniqueNames) "$baseName\$${it.index}" else baseName } return declarationName diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.lib.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.lib.java index f5d0fb5615f..45b43875d54 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.lib.java +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.lib.java @@ -76,17 +76,17 @@ public final class Class /* Class*/ { @org.jetbrains.annotations.Nullable() public final void setNotNullVarWithGetSet(@org.jetbrains.annotations.NotNull() java.lang.String);// setNotNullVarWithGetSet(java.lang.String) - private static final java.lang.String notNullVal$lambda-2();// notNullVal$lambda-2() + private static final java.lang.String notNullVal$lambda$2();// notNullVal$lambda$2() - private static final java.lang.String notNullVar$lambda-3();// notNullVar$lambda-3() + private static final java.lang.String notNullVar$lambda$3();// notNullVar$lambda$3() - private static final java.lang.String nullableVal$lambda-0();// nullableVal$lambda-0() + private static final java.lang.String nullableVal$lambda$0();// nullableVal$lambda$0() - private static final java.lang.String nullableVar$lambda-1();// nullableVar$lambda-1() + private static final java.lang.String nullableVar$lambda$1();// nullableVar$lambda$1() - private static final java.lang.String privateN$lambda-5();// privateN$lambda-5() + private static final java.lang.String privateN$lambda$5();// privateN$lambda$5() - private static final java.lang.String privateNN$lambda-4();// privateNN$lambda-4() + private static final java.lang.String privateNN$lambda$4();// privateNN$lambda$4() public Class();// .ctor() @@ -96,4 +96,4 @@ public final class Class /* Class*/ { public final void setNullableVar(@org.jetbrains.annotations.Nullable() java.lang.String);// setNullableVar(java.lang.String) -} +} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.lib.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.lib.java index 8ca58ac8f98..afd3ebdbe32 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.lib.java +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.lib.java @@ -8,9 +8,9 @@ public final class ClassObjectField /* ClassObjectField*/ { @org.jetbrains.annotations.Nullable() private static final java.lang.String y; - private static final java.lang.String x$lambda-0();// x$lambda-0() + private static final java.lang.String x$lambda$0();// x$lambda$0() - private static final java.lang.String y$lambda-1();// y$lambda-1() + private static final java.lang.String y$lambda$1();// y$lambda$1() public ClassObjectField();// .ctor() @@ -21,4 +21,4 @@ public static final class Companion /* ClassObjectField.Companion*/ { private Companion();// .ctor() -}} +}} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.lib.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.lib.java index 51c6cc86ed1..2d691e4d943 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.lib.java +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.lib.java @@ -71,22 +71,22 @@ public final class FileFacadeKt /* FileFacadeKt*/ { @org.jetbrains.annotations.Nullable() public static final void setNotNullVarWithGetSet(@org.jetbrains.annotations.NotNull() java.lang.String);// setNotNullVarWithGetSet(java.lang.String) - private static final java.lang.String notNullVal$lambda-2();// notNullVal$lambda-2() + private static final java.lang.String notNullVal$lambda$2();// notNullVal$lambda$2() - private static final java.lang.String notNullVar$lambda-3();// notNullVar$lambda-3() + private static final java.lang.String notNullVar$lambda$3();// notNullVar$lambda$3() - private static final java.lang.String nullableVal$lambda-0();// nullableVal$lambda-0() + private static final java.lang.String nullableVal$lambda$0();// nullableVal$lambda$0() - private static final java.lang.String nullableVar$lambda-1();// nullableVar$lambda-1() + private static final java.lang.String nullableVar$lambda$1();// nullableVar$lambda$1() private static final java.lang.String privateFun(java.lang.String, java.lang.String);// privateFun(java.lang.String, java.lang.String) - private static final java.lang.String privateN$lambda-5();// privateN$lambda-5() + private static final java.lang.String privateN$lambda$5();// privateN$lambda$5() - private static final java.lang.String privateNn$lambda-4();// privateNn$lambda-4() + private static final java.lang.String privateNn$lambda$4();// privateNn$lambda$4() public static final void setNotNullVar(@org.jetbrains.annotations.NotNull() java.lang.String);// setNotNullVar(java.lang.String) public static final void setNullableVar(@org.jetbrains.annotations.Nullable() java.lang.String);// setNullableVar(java.lang.String) -} +} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.lib.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.lib.java index ac0c1b50c36..e29b743b649 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.lib.java +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.lib.java @@ -7,8 +7,8 @@ public final class C /* C*/ implements Tr { @org.jetbrains.annotations.NotNull() public java.lang.Integer getV();// getV() - private static final int v$lambda-0();// v$lambda-0() + private static final int v$lambda$0();// v$lambda$0() public C();// .ctor() -} +} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/object/SimpleObject.lib.java b/compiler/testData/asJava/lightClasses/object/SimpleObject.lib.java index ee1f8a69875..39966160650 100644 --- a/compiler/testData/asJava/lightClasses/object/SimpleObject.lib.java +++ b/compiler/testData/asJava/lightClasses/object/SimpleObject.lib.java @@ -17,9 +17,9 @@ public final class A /* pack.A*/ { private A();// .ctor() - private static final int c$lambda-0();// c$lambda-0() + private static final int c$lambda$0();// c$lambda$0() - private static final java.lang.String v$lambda-1();// v$lambda-1() + private static final java.lang.String v$lambda$1();// v$lambda$1() public final int f();// f() @@ -27,4 +27,4 @@ public final class A /* pack.A*/ { public final void setV(@org.jetbrains.annotations.NotNull() java.lang.String);// setV(java.lang.String) -} +} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/publicField/CompanionObject.lib.java b/compiler/testData/asJava/lightClasses/publicField/CompanionObject.lib.java index 010ee8409c8..a00ea57fe08 100644 --- a/compiler/testData/asJava/lightClasses/publicField/CompanionObject.lib.java +++ b/compiler/testData/asJava/lightClasses/publicField/CompanionObject.lib.java @@ -6,7 +6,7 @@ public final class C /* C*/ { @org.jetbrains.annotations.NotNull() public static final C.Companion Companion; - private static final java.lang.String foo$lambda-0();// foo$lambda-0() + private static final java.lang.String foo$lambda$0();// foo$lambda$0() public C();// .ctor() diff --git a/compiler/testData/asJava/lightClasses/publicField/Simple.lib.java b/compiler/testData/asJava/lightClasses/publicField/Simple.lib.java index f7231f1ba73..795a5141d19 100644 --- a/compiler/testData/asJava/lightClasses/publicField/Simple.lib.java +++ b/compiler/testData/asJava/lightClasses/publicField/Simple.lib.java @@ -3,8 +3,8 @@ public final class C /* C*/ { @org.jetbrains.annotations.NotNull() public final java.lang.String foo; - private static final java.lang.String foo$lambda-0();// foo$lambda-0() + private static final java.lang.String foo$lambda$0();// foo$lambda$0() public C();// .ctor() -} +} \ No newline at end of file diff --git a/compiler/testData/codegen/asmLike/receiverMangling/deepInline.asm.ir.txt b/compiler/testData/codegen/asmLike/receiverMangling/deepInline.asm.ir.txt index e8f5d8ed120..569a114f10f 100644 --- a/compiler/testData/codegen/asmLike/receiverMangling/deepInline.asm.ir.txt +++ b/compiler/testData/codegen/asmLike/receiverMangling/deepInline.asm.ir.txt @@ -8,15 +8,15 @@ public final class DeepInlineKt : java/lang/Object { public final static void foo(java.lang.String $this$foo, int count) { Local variables: 16 $i$a$-block-DeepInlineKt$foo$1$1$1: I - 14 $this$foo_u24lambda_u2d2_u24lambda_u2d1_u24lambda_u2d0: J + 14 $this$foo_u24lambda_u242_u24lambda_u241_u24lambda_u240: J 13 $i$f$block: I 11 $i$a$-block-DeepInlineKt$foo$1$1: I 12 z: Z - 9 $this$foo_u24lambda_u2d2_u24lambda_u2d1: J + 9 $this$foo_u24lambda_u242_u24lambda_u241: J 8 $i$f$block: I 6 $i$a$-block-DeepInlineKt$foo$1: I 7 y: Z - 4 $this$foo_u24lambda_u2d2: J + 4 $this$foo_u24lambda_u242: J 3 $i$f$block: I 2 x: Z 0 $this$foo: Ljava/lang/String; diff --git a/compiler/testData/codegen/asmLike/receiverMangling/deepInlineWithLabels.asm.ir.txt b/compiler/testData/codegen/asmLike/receiverMangling/deepInlineWithLabels.asm.ir.txt index a44be4d92a7..071b4d04f26 100644 --- a/compiler/testData/codegen/asmLike/receiverMangling/deepInlineWithLabels.asm.ir.txt +++ b/compiler/testData/codegen/asmLike/receiverMangling/deepInlineWithLabels.asm.ir.txt @@ -8,15 +8,15 @@ public final class DeepInlineWithLabelsKt : java/lang/Object { public final static void foo(java.lang.String $this$foo, int count) { Local variables: 16 $i$a$-block-DeepInlineWithLabelsKt$foo$1$1$1: I - 14 $this$foo_u24lambda_u2d2_u24lambda_u2d1_u24lambda_u2d0: J + 14 $this$foo_u24lambda_u242_u24lambda_u241_u24lambda_u240: J 13 $i$f$block: I 11 $i$a$-block-DeepInlineWithLabelsKt$foo$1$1: I 12 z: Z - 9 $this$foo_u24lambda_u2d2_u24lambda_u2d1: J + 9 $this$foo_u24lambda_u242_u24lambda_u241: J 8 $i$f$block: I 6 $i$a$-block-DeepInlineWithLabelsKt$foo$1: I 7 y: Z - 4 $this$foo_u24lambda_u2d2: J + 4 $this$foo_u24lambda_u242: J 3 $i$f$block: I 2 x: Z 0 $this$foo: Ljava/lang/String; diff --git a/compiler/testData/codegen/asmLike/receiverMangling/inlineReceivers.asm.ir.txt b/compiler/testData/codegen/asmLike/receiverMangling/inlineReceivers.asm.ir.txt index e9abee2344d..53d4ccfca79 100644 --- a/compiler/testData/codegen/asmLike/receiverMangling/inlineReceivers.asm.ir.txt +++ b/compiler/testData/codegen/asmLike/receiverMangling/inlineReceivers.asm.ir.txt @@ -8,7 +8,7 @@ public final class InlineReceiversKt : java/lang/Object { public final static void foo(java.lang.String $this$foo, int count) { Local variables: 6 $i$a$-block-InlineReceiversKt$foo$1: I - 4 $this$foo_u24lambda_u2d0: J + 4 $this$foo_u24lambda_u240: J 3 $i$f$block: I 2 x: Z 0 $this$foo: Ljava/lang/String; diff --git a/compiler/testData/codegen/asmLike/receiverMangling/localFunctions.asm.ir.txt b/compiler/testData/codegen/asmLike/receiverMangling/localFunctions.asm.ir.txt index 940cf3d37b3..c78af50705f 100644 --- a/compiler/testData/codegen/asmLike/receiverMangling/localFunctions.asm.ir.txt +++ b/compiler/testData/codegen/asmLike/receiverMangling/localFunctions.asm.ir.txt @@ -5,7 +5,7 @@ public final class LocalFunctionsKt : java/lang/Object { private final static void foo$a2() - private final static void foo$a2-0(int a) { + private final static void foo$a2$0(int a) { Local variables: 0 a: I } diff --git a/compiler/testData/codegen/asmLike/typeAnnotations/implicit.asm.ir.txt b/compiler/testData/codegen/asmLike/typeAnnotations/implicit.asm.ir.txt index 2841809f8bb..e5bc4a125d7 100644 --- a/compiler/testData/codegen/asmLike/typeAnnotations/implicit.asm.ir.txt +++ b/compiler/testData/codegen/asmLike/typeAnnotations/implicit.asm.ir.txt @@ -30,7 +30,7 @@ public final class foo/Kotlin : java/lang/Object { @Lfoo/TypeAnn;([name="2"]) : METHOD_RETURN, null @Lfoo/TypeAnnBinary;([]) : METHOD_RETURN, null // invisible - private final static java.lang.String foo4$lambda-0(foo.Kotlin this$0) + private final static java.lang.String foo4$lambda$0(foo.Kotlin this$0) @Lfoo/TypeAnn;([name="2"]) : METHOD_RETURN, null @Lfoo/TypeAnnBinary;([]) : METHOD_RETURN, null // invisible diff --git a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline_ir.txt b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline_ir.txt index 45a815a3807..484144cd642 100644 --- a/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline_ir.txt +++ b/compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline_ir.txt @@ -118,26 +118,26 @@ public final class CrossinlineKt$filter$$inlined$source$1 { } @kotlin.Metadata -public final class CrossinlineKt$filter$lambda-3$$inlined$consumeEach$1$1 { +public final class CrossinlineKt$filter$lambda$3$$inlined$consumeEach$1$1 { // source: 'crossinline.kt' - enclosing method CrossinlineKt$filter$lambda-3$$inlined$consumeEach$1.send(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + enclosing method CrossinlineKt$filter$lambda$3$$inlined$consumeEach$1.send(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; field label: int synthetic field result: java.lang.Object - synthetic final field this$0: CrossinlineKt$filter$lambda-3$$inlined$consumeEach$1 - inner (anonymous) class CrossinlineKt$filter$lambda-3$$inlined$consumeEach$1 - inner (anonymous) class CrossinlineKt$filter$lambda-3$$inlined$consumeEach$1$1 - public method (p0: CrossinlineKt$filter$lambda-3$$inlined$consumeEach$1, p1: kotlin.coroutines.Continuation): void + synthetic final field this$0: CrossinlineKt$filter$lambda$3$$inlined$consumeEach$1 + inner (anonymous) class CrossinlineKt$filter$lambda$3$$inlined$consumeEach$1 + inner (anonymous) class CrossinlineKt$filter$lambda$3$$inlined$consumeEach$1$1 + public method (p0: CrossinlineKt$filter$lambda$3$$inlined$consumeEach$1, p1: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object } @kotlin.Metadata -public final class CrossinlineKt$filter$lambda-3$$inlined$consumeEach$1 { +public final class CrossinlineKt$filter$lambda$3$$inlined$consumeEach$1 { // source: 'crossinline.kt' enclosing method CrossinlineKt.filter(LSourceCrossinline;Lkotlin/jvm/functions/Function1;)LSourceCrossinline; synthetic final field $predicate$inlined: kotlin.jvm.functions.Function1 synthetic final field $this_source$inlined: Sink - inner (anonymous) class CrossinlineKt$filter$lambda-3$$inlined$consumeEach$1 - inner (anonymous) class CrossinlineKt$filter$lambda-3$$inlined$consumeEach$1$1 + inner (anonymous) class CrossinlineKt$filter$lambda$3$$inlined$consumeEach$1 + inner (anonymous) class CrossinlineKt$filter$lambda$3$$inlined$consumeEach$1$1 public method (p0: kotlin.jvm.functions.Function1, p1: Sink): void public method close(@org.jetbrains.annotations.Nullable p0: java.lang.Throwable): void public @org.jetbrains.annotations.Nullable method send$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object diff --git a/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndLocalDelegatedProperty_ir.txt b/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndLocalDelegatedProperty_ir.txt index 603595c0a2a..1fee7d4e9ac 100644 --- a/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndLocalDelegatedProperty_ir.txt +++ b/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndLocalDelegatedProperty_ir.txt @@ -22,7 +22,7 @@ public final class MemberExtensionPropertyAndLocalDelegatedPropertyKt { // source: 'memberExtensionPropertyAndLocalDelegatedProperty.kt' synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] static method (): void - private final static method box$lambda-1$lambda-0(p0: Delegate): java.lang.String + private final static method box$lambda$1$lambda$0(p0: Delegate): java.lang.String public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String } diff --git a/compiler/testData/codegen/box/invokedynamic/lambdas/genericLambdaSignature_ir.txt b/compiler/testData/codegen/box/invokedynamic/lambdas/genericLambdaSignature_ir.txt index 4aab92b8a36..93e360ec71d 100644 --- a/compiler/testData/codegen/box/invokedynamic/lambdas/genericLambdaSignature_ir.txt +++ b/compiler/testData/codegen/box/invokedynamic/lambdas/genericLambdaSignature_ir.txt @@ -4,5 +4,5 @@ public final class GenericLambdaSignatureKt { public final static <(TT1;Lkotlin/jvm/functions/Function1<-TT1;+TR;>;)TR;> method call(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function1): java.lang.Object public final static <(TT2;)TT2;> method test(p0: java.lang.Object): java.lang.Object public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String - private final static method test$lambda-0(p0: java.lang.Object): java.lang.Object + private final static method test$lambda$0(p0: java.lang.Object): java.lang.Object } diff --git a/compiler/testData/codegen/box/invokedynamic/sam/genericLambdaSignature_ir.txt b/compiler/testData/codegen/box/invokedynamic/sam/genericLambdaSignature_ir.txt index e1352cb859d..016dbd1ea65 100644 --- a/compiler/testData/codegen/box/invokedynamic/sam/genericLambdaSignature_ir.txt +++ b/compiler/testData/codegen/box/invokedynamic/sam/genericLambdaSignature_ir.txt @@ -10,5 +10,5 @@ public final class GenericLambdaSignatureKt { public final static <(TT1;LFunIFace;)TR;> method call(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: FunIFace): java.lang.Object public final static <(TT2;)TT2;> method test(p0: java.lang.Object): java.lang.Object public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String - private final static method test$lambda-0(p0: java.lang.Object): java.lang.Object + private final static method test$lambda$0(p0: java.lang.Object): java.lang.Object } diff --git a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/localDelegatedProperties_ir.txt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/localDelegatedProperties_ir.txt index e28d0daa498..f01aee50412 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/localDelegatedProperties_ir.txt +++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/localDelegatedProperties_ir.txt @@ -18,7 +18,7 @@ public interface Foo { public synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] static method (): void public synthetic static method access$test$jd(p0: Foo): java.lang.String - private static method test$lambda-0(p0: Delegate): java.lang.String + private static method test$lambda$0(p0: Delegate): java.lang.String public @org.jetbrains.annotations.NotNull method test(): java.lang.String public final inner class Foo$DefaultImpls } diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/localDelegatedProperties_ir.txt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/localDelegatedProperties_ir.txt index ab60212ceb1..b9a98bc8366 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/localDelegatedProperties_ir.txt +++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/localDelegatedProperties_ir.txt @@ -10,7 +10,7 @@ public interface Foo { // source: 'localDelegatedProperties.kt' public synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[] static method (): void - private static method test$lambda-0(p0: Delegate): java.lang.String + private static method test$lambda$0(p0: Delegate): java.lang.String public @org.jetbrains.annotations.NotNull method test(): java.lang.String } diff --git a/compiler/testData/codegen/bytecodeListing/callableReference/adaptedReference_ir.txt b/compiler/testData/codegen/bytecodeListing/callableReference/adaptedReference_ir.txt index c203b865e6e..e045311ae93 100644 --- a/compiler/testData/codegen/bytecodeListing/callableReference/adaptedReference_ir.txt +++ b/compiler/testData/codegen/bytecodeListing/callableReference/adaptedReference_ir.txt @@ -26,11 +26,11 @@ public final class A { inner (anonymous) class A$testDefaultArguments$1 inner (anonymous) class A$testDefaultArguments$2 public method (): void - public synthetic final static method access$testDefaultArguments$defaultArgs-0(p0: A, p1: kotlin.coroutines.Continuation): java.lang.Object + public synthetic final static method access$testDefaultArguments$defaultArgs$0(p0: A, p1: kotlin.coroutines.Continuation): java.lang.Object synthetic static method defaultArgs$default(p0: A, p1: int, p2: java.lang.String, p3: int, p4: java.lang.Object): java.lang.String private final method defaultArgs(p0: int, p1: java.lang.String): java.lang.String private final method myApply(p0: kotlin.jvm.functions.Function0): void private final method myApplySuspend(p0: kotlin.jvm.functions.Function1): void - private synthetic final static method testDefaultArguments$defaultArgs-0(p0: A, p1: kotlin.coroutines.Continuation): java.lang.Object + private synthetic final static method testDefaultArguments$defaultArgs$0(p0: A, p1: kotlin.coroutines.Continuation): java.lang.Object public final method testDefaultArguments(): void } diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation_ir.txt b/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation_ir.txt index 3d2b630a082..342ab70f56b 100644 --- a/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation_ir.txt +++ b/compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation_ir.txt @@ -195,26 +195,26 @@ public final class TcoContinuationKt$transform$$inlined$flow$1 { } @kotlin.Metadata -public final class TcoContinuationKt$transform$lambda-1$$inlined$collect$1$1 { +public final class TcoContinuationKt$transform$lambda$1$$inlined$collect$1$1 { // source: 'tcoContinuation.kt' - enclosing method TcoContinuationKt$transform$lambda-1$$inlined$collect$1.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + enclosing method TcoContinuationKt$transform$lambda$1$$inlined$collect$1.emit(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; field label: int synthetic field result: java.lang.Object - synthetic final field this$0: TcoContinuationKt$transform$lambda-1$$inlined$collect$1 - inner (anonymous) class TcoContinuationKt$transform$lambda-1$$inlined$collect$1 - inner (anonymous) class TcoContinuationKt$transform$lambda-1$$inlined$collect$1$1 - public method (p0: TcoContinuationKt$transform$lambda-1$$inlined$collect$1, p1: kotlin.coroutines.Continuation): void + synthetic final field this$0: TcoContinuationKt$transform$lambda$1$$inlined$collect$1 + inner (anonymous) class TcoContinuationKt$transform$lambda$1$$inlined$collect$1 + inner (anonymous) class TcoContinuationKt$transform$lambda$1$$inlined$collect$1$1 + public method (p0: TcoContinuationKt$transform$lambda$1$$inlined$collect$1, p1: kotlin.coroutines.Continuation): void public final @org.jetbrains.annotations.Nullable method invokeSuspend(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object } @kotlin.Metadata -public final class TcoContinuationKt$transform$lambda-1$$inlined$collect$1 { +public final class TcoContinuationKt$transform$lambda$1$$inlined$collect$1 { // source: 'tcoContinuation.kt' enclosing method TcoContinuationKt.transform(LFlow;Lkotlin/jvm/functions/Function3;)LFlow; synthetic final field $this_flow$inlined: FlowCollector synthetic final field $transformer$inlined: kotlin.jvm.functions.Function3 - inner (anonymous) class TcoContinuationKt$transform$lambda-1$$inlined$collect$1 - inner (anonymous) class TcoContinuationKt$transform$lambda-1$$inlined$collect$1$1 + inner (anonymous) class TcoContinuationKt$transform$lambda$1$$inlined$collect$1 + inner (anonymous) class TcoContinuationKt$transform$lambda$1$$inlined$collect$1$1 public method (p0: kotlin.jvm.functions.Function3, p1: FlowCollector): void public @org.jetbrains.annotations.Nullable method emit$$forInline(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object public @org.jetbrains.annotations.Nullable method emit(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): java.lang.Object diff --git a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/crossinlineLambdaChain_ir.txt b/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/crossinlineLambdaChain_ir.txt index cc3004e5d3d..8e8ebef0e24 100644 --- a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/crossinlineLambdaChain_ir.txt +++ b/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/crossinlineLambdaChain_ir.txt @@ -17,29 +17,29 @@ public final class _2Kt$box$$inlined$call$2 { } @kotlin.Metadata -public final class _2Kt$box$lambda-1$$inlined$test$1 { +public final class _2Kt$box$lambda$1$$inlined$test$1 { // source: '1.kt' enclosing method _2Kt.box()V - inner (anonymous) class _2Kt$box$lambda-1$$inlined$test$1 + inner (anonymous) class _2Kt$box$lambda$1$$inlined$test$1 public method (): void public synthetic bridge method invoke(): java.lang.Object public final @org.jetbrains.annotations.NotNull method invoke(): java.lang.String } @kotlin.Metadata -public final class _2Kt$box$lambda-4$$inlined$call$1 { +public final class _2Kt$box$lambda$4$$inlined$call$1 { // source: '1.kt' enclosing method _2Kt.box()V - inner (anonymous) class _2Kt$box$lambda-4$$inlined$call$1 + inner (anonymous) class _2Kt$box$lambda$4$$inlined$call$1 public method (): void public final method invoke(): java.lang.Object } @kotlin.Metadata -public final class _2Kt$box$lambda-4$lambda-3$$inlined$test$1 { +public final class _2Kt$box$lambda$4$lambda$3$$inlined$test$1 { // source: '1.kt' enclosing method _2Kt.box()V - inner (anonymous) class _2Kt$box$lambda-4$lambda-3$$inlined$test$1 + inner (anonymous) class _2Kt$box$lambda$4$lambda$3$$inlined$test$1 public method (): void public synthetic bridge method invoke(): java.lang.Object public final @org.jetbrains.annotations.NotNull method invoke(): java.lang.String diff --git a/compiler/testData/codegen/bytecodeListing/localFunctions/inInitBlock_ir.txt b/compiler/testData/codegen/bytecodeListing/localFunctions/inInitBlock_ir.txt index 4c40d07fc97..b20f2c19118 100644 --- a/compiler/testData/codegen/bytecodeListing/localFunctions/inInitBlock_ir.txt +++ b/compiler/testData/codegen/bytecodeListing/localFunctions/inInitBlock_ir.txt @@ -4,12 +4,12 @@ public final class C { public method (): void public method (@org.jetbrains.annotations.NotNull p0: java.lang.String): void public method (p0: int): void - private final static method _init_$test-0$test(): void - private final static method _init_$test-0(): void - private final static method _init_$test-2$test-1(): void - private final static method _init_$test-2(): void - private final static method _init_$test-5(): void - private final static method test$test-3(): void + private final static method _init_$test$0$test(): void + private final static method _init_$test$0(): void + private final static method _init_$test$2$test$1(): void + private final static method _init_$test$2(): void + private final static method _init_$test$5(): void + private final static method test$5$test$4(): void + private final static method test$test$3(): void public final method test(): void - private final static method test-5$test-4(): void } diff --git a/compiler/testData/codegen/bytecodeListing/sam/indySamConversionViaProxyFun.txt b/compiler/testData/codegen/bytecodeListing/sam/indySamConversionViaProxyFun.txt index 0412517e011..c18a69e90ec 100644 --- a/compiler/testData/codegen/bytecodeListing/sam/indySamConversionViaProxyFun.txt +++ b/compiler/testData/codegen/bytecodeListing/sam/indySamConversionViaProxyFun.txt @@ -6,9 +6,9 @@ public final class IndySamConversionViaProxyFun_ktKt { public final static method ifn(): void private final static method test$ifn__proxy(): void private varargs final static method test$intArrayOf__proxy(p0: int[]): int[] + private synthetic final static method test$plus__proxy$0(p0: java.lang.String, p1: java.lang.Object): java.lang.String + private synthetic final static method test$plus__proxy$1(p0: java.lang.String, p1: java.lang.Object): java.lang.String private synthetic final static method test$plus__proxy(p0: java.lang.String, p1: java.lang.Object): java.lang.String - private synthetic final static method test$plus__proxy-0(p0: java.lang.String, p1: java.lang.Object): java.lang.String - private synthetic final static method test$plus__proxy-1(p0: java.lang.String, p1: java.lang.Object): java.lang.String public final static method test(): void public final static method use(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void } diff --git a/compiler/testData/codegen/bytecodeListing/sam/severalProxyFunsInInit_ir.txt b/compiler/testData/codegen/bytecodeListing/sam/severalProxyFunsInInit_ir.txt index b92de74b8b8..15f315811dc 100644 --- a/compiler/testData/codegen/bytecodeListing/sam/severalProxyFunsInInit_ir.txt +++ b/compiler/testData/codegen/bytecodeListing/sam/severalProxyFunsInInit_ir.txt @@ -5,7 +5,7 @@ public final class C$Companion { public synthetic method (p0: kotlin.jvm.internal.DefaultConstructorMarker): void private synthetic final static method x1$_init___proxy(): C public final method x1(): void - private synthetic final static method x2$_init___proxy-0(): C + private synthetic final static method x2$_init___proxy$0(): C public final method x2(): void public final inner class C$Companion } diff --git a/compiler/testData/codegen/bytecodeText/inlineClasses/mangledSamWrappersIndy.kt b/compiler/testData/codegen/bytecodeText/inlineClasses/mangledSamWrappersIndy.kt index 5272c66f53b..f3a1a7a64bb 100644 --- a/compiler/testData/codegen/bytecodeText/inlineClasses/mangledSamWrappersIndy.kt +++ b/compiler/testData/codegen/bytecodeText/inlineClasses/mangledSamWrappersIndy.kt @@ -25,6 +25,6 @@ fun box(): String { // 1 public abstract f-ZsE1S_E\(Ljava/lang/String;\)Ljava/lang/String; // @MangledSamWrappersKt.class: // 3 INVOKEINTERFACE B.f-ZsE1S_E \(Ljava/lang/String;\)Ljava/lang/String; -// 1 private final static box\$lambda-0\(LA;\)LA; +// 0 private final static box\$lambda-0\(LA;\)LA; // @MangledSamWrappersKt$sam$B$0.class: // public final synthetic f-ZsE1S_E\(Ljava/lang/String;\)Ljava/lang/String; \ No newline at end of file diff --git a/compiler/testData/debug/stepping/anonymousFunctionDirect.kt b/compiler/testData/debug/stepping/anonymousFunctionDirect.kt index 8c1a5651cd0..7763d63451e 100644 --- a/compiler/testData/debug/stepping/anonymousFunctionDirect.kt +++ b/compiler/testData/debug/stepping/anonymousFunctionDirect.kt @@ -11,7 +11,7 @@ fun box() { // EXPECTATIONS JVM // test.kt:5 invoke // EXPECTATIONS JVM_IR -// test.kt:5 box$lambda-0 +// test.kt:5 box$lambda$0 // EXPECTATIONS // test.kt:4 box // test.kt:7 box diff --git a/plugins/allopen/testData/bytecodeListing/anonymousObject_ir.txt b/plugins/allopen/testData/bytecodeListing/anonymousObject_ir.txt index bed315082b6..a4abaa3636d 100644 --- a/plugins/allopen/testData/bytecodeListing/anonymousObject_ir.txt +++ b/plugins/allopen/testData/bytecodeListing/anonymousObject_ir.txt @@ -30,7 +30,7 @@ public class Test { inner (anonymous) class Test$a$1 inner (anonymous) class Test$b$1 public method (): void - private final static method b$lambda-0(): void + private final static method b$lambda$0(): void public method b(): void public @org.jetbrains.annotations.NotNull method getA(): java.lang.Runnable } diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/codegen/Delegated.ir.txt b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/codegen/Delegated.ir.txt index c29c2c1b47c..a5743113856 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/codegen/Delegated.ir.txt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/codegen/Delegated.ir.txt @@ -5,7 +5,7 @@ public abstract interface A : java/lang/Object { public final class DelegatedKt : java/lang/Object { public final static A generateImpl() - private final static java.lang.String generateImpl$lambda-0() + private final static java.lang.String generateImpl$lambda$0() } public final class Test$$serializer : java/lang/Object, kotlinx/serialization/internal/GeneratedSerializer {