azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-51883 Don't use "-" in generated unique lifted declaration names

Browse Source
This commit is contained in:
Pavel Mikhailovskii
2022-06-09 09:45:10 +02:00
committed by teamcity
parent fb9c5c13bd
commit ecb3cc193c
29 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/asmLike/receiverMangling/deepInline.asm.ir.txt
Vendored
+3 -3
View File
@@ -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;
compiler/testData/codegen/asmLike/receiverMangling/deepInlineWithLabels.asm.ir.txt
Vendored
+3 -3
View File
@@ -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;
compiler/testData/codegen/asmLike/receiverMangling/inlineReceivers.asm.ir.txt
Vendored
+1 -1
View File
@@ -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;
compiler/testData/codegen/asmLike/receiverMangling/localFunctions.asm.ir.txt
Vendored
+1 -1
View File
@@ -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
}
compiler/testData/codegen/asmLike/typeAnnotations/implicit.asm.ir.txt
Vendored
+1 -1
View File
@@ -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
compiler/testData/codegen/box/coroutines/tailCallOptimizations/crossinline_ir.txt
Vendored
+9 -9
View File
@@ -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 <init>(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 <init>(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 <init>(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
compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndLocalDelegatedProperty_ir.txt
Vendored
+1 -1
View File
@@ -22,7 +22,7 @@ public final class MemberExtensionPropertyAndLocalDelegatedPropertyKt {
// source: 'memberExtensionPropertyAndLocalDelegatedProperty.kt'
synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[]
static method <clinit>(): 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
}
compiler/testData/codegen/box/invokedynamic/lambdas/genericLambdaSignature_ir.txt
Vendored
+1 -1
View File
@@ -4,5 +4,5 @@ public final class<null> GenericLambdaSignatureKt {
public final static <<T1:Ljava/lang/Object;R:Ljava/lang/Object;>(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 <<T2:Ljava/lang/Object;>(TT2;)TT2;> method test(p0: java.lang.Object): java.lang.Object
public final static @org.jetbrains.annotations.NotNull <null> method box(): java.lang.String
private final static <null> method test$lambda-0(p0: java.lang.Object): java.lang.Object
private final static <null> method test$lambda$0(p0: java.lang.Object): java.lang.Object
}
compiler/testData/codegen/box/invokedynamic/sam/genericLambdaSignature_ir.txt
Vendored
+1 -1
View File
@@ -10,5 +10,5 @@ public final class<null> GenericLambdaSignatureKt {
public final static <<T1:Ljava/lang/Object;R:Ljava/lang/Object;>(TT1;LFunIFace<TT1;TR;>;)TR;> method call(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: FunIFace): java.lang.Object
public final static <<T2:Ljava/lang/Object;>(TT2;)TT2;> method test(p0: java.lang.Object): java.lang.Object
public final static @org.jetbrains.annotations.NotNull <null> method box(): java.lang.String
private final static <null> method test$lambda-0(p0: java.lang.Object): java.lang.Object
private final static <null> method test$lambda$0(p0: java.lang.Object): java.lang.Object
}
compiler/testData/codegen/box/jvm8/defaults/allCompatibility/localDelegatedProperties_ir.txt
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ public interface Foo {
public synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[]
static method <clinit>(): 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
}
compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/localDelegatedProperties_ir.txt
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ public interface Foo {
// source: 'localDelegatedProperties.kt'
public synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[]
static method <clinit>(): 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
}
compiler/testData/codegen/bytecodeListing/callableReference/adaptedReference_ir.txt
Vendored
+2 -2
View File
@@ -26,11 +26,11 @@ public final class A {
inner (anonymous) class A$testDefaultArguments$1
inner (anonymous) class A$testDefaultArguments$2
public method <init>(): 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
}
compiler/testData/codegen/bytecodeListing/coroutines/tcoContinuation_ir.txt
Vendored
+9 -9
View File
@@ -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 <init>(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 <init>(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 <init>(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
compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/crossinlineLambdaChain_ir.txt
Vendored
+6 -6
View File
@@ -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 <init>(): 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 <init>(): 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 <init>(): void
public synthetic bridge method invoke(): java.lang.Object
public final @org.jetbrains.annotations.NotNull method invoke(): java.lang.String
compiler/testData/codegen/bytecodeListing/localFunctions/inInitBlock_ir.txt
Vendored
+7 -7
View File
@@ -4,12 +4,12 @@ public final class C {
public method <init>(): void
public method <init>(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
public method <init>(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
}
compiler/testData/codegen/bytecodeListing/sam/indySamConversionViaProxyFun.txt
Vendored
+2 -2
View File
@@ -6,9 +6,9 @@ public final class<null> IndySamConversionViaProxyFun_ktKt {
public final static <null> method ifn(): void
private final static <null> method test$ifn__proxy(): void
private varargs final static <null> method test$intArrayOf__proxy(p0: int[]): int[]
private synthetic final static <null> method test$plus__proxy$0(p0: java.lang.String, p1: java.lang.Object): java.lang.String
private synthetic final static <null> method test$plus__proxy$1(p0: java.lang.String, p1: java.lang.Object): java.lang.String
private synthetic final static <null> method test$plus__proxy(p0: java.lang.String, p1: java.lang.Object): java.lang.String
private synthetic final static <null> method test$plus__proxy-0(p0: java.lang.String, p1: java.lang.Object): java.lang.String
private synthetic final static <null> method test$plus__proxy-1(p0: java.lang.String, p1: java.lang.Object): java.lang.String
public final static <null> method test(): void
public final static <null> method use(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void
}
compiler/testData/codegen/bytecodeListing/sam/severalProxyFunsInInit_ir.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ public final class C$Companion {
public synthetic method <init>(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
}
compiler/testData/codegen/bytecodeText/inlineClasses/mangledSamWrappersIndy.kt
Vendored
+1 -1
View File
@@ -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;