diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.dot index cc8386fe616..21ee7fbf08f 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.dot @@ -44,7 +44,7 @@ digraph localClassesWithImplicit_kt { } 20 [label="Exit local class test"]; 21 [label="Exit anonymous object"]; - 22 [label="Variable declaration: lval x: R|anonymous|"]; + 22 [label="Variable declaration: lval x: R||"]; 6 [label="Exit function test" style="filled" fillcolor=red]; } 5 -> {7}; @@ -284,7 +284,7 @@ digraph localClassesWithImplicit_kt { 99 [label="Enter block"]; 100 [label="Access variable R|/b|"]; 101 [label="Access variable R|kotlin/String.length|"]; - 102 [label="Function call: this@R|/anonymous|.R|/anonymous.bar|()"]; + 102 [label="Function call: this@R|/|.R|/.bar|()"]; 103 [label="Exit block"]; } 104 [label="Exit when branch result"]; @@ -299,7 +299,7 @@ digraph localClassesWithImplicit_kt { ^ when () { (R|/b| is R|kotlin/String|) -> { R|/b|.R|kotlin/String.length| - this@R|/anonymous|.R|/anonymous.bar|() + this@R|/|.R|/.bar|() } else -> { Int(1) @@ -356,7 +356,7 @@ digraph localClassesWithImplicit_kt { 122 [label="Access variable R|kotlin/String.length|"]; 123 [label="Access variable R|/b|"]; 124 [label="Access variable #"]; - 125 [label="Function call: this@R|/anonymous|.R|/anonymous.baz|()"]; + 125 [label="Function call: this@R|/|.R|/.baz|()"]; 120 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; } 115 [label="Postponed exit from lambda"]; @@ -364,7 +364,7 @@ digraph localClassesWithImplicit_kt { 117 [label="Jump: ^bar R|/myRun|( = myRun@fun (): R|kotlin/Int| { R|/a|.R|kotlin/String.length| R|/b|.# - ^ this@R|/anonymous|.R|/anonymous.baz|() + ^ this@R|/|.R|/.baz|() } )"]; 118 [label="Stub" style="filled" fillcolor=gray]; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.txt index fb570522aba..55b03f55ca3 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.txt +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.txt @@ -46,8 +46,8 @@ FILE: localClassesWithImplicit.kt } - lval x: R|anonymous| = object : R|kotlin/Any| { - private[local] constructor(): R|anonymous| { + lval x: R|| = object : R|kotlin/Any| { + private[local] constructor(): R|| { super() } @@ -57,7 +57,7 @@ FILE: localClassesWithImplicit.kt ^ when () { (R|/b| is R|kotlin/String|) -> { R|/b|.R|kotlin/String.length| - this@R|/anonymous|.R|/anonymous.bar|() + this@R|/|.R|/.bar|() } else -> { Int(1) @@ -72,7 +72,7 @@ FILE: localClassesWithImplicit.kt ^bar R|/myRun|( = myRun@fun (): R|kotlin/Int| { R|/a|.R|kotlin/String.length| R|/b|.# - ^ this@R|/anonymous|.R|/anonymous.baz|() + ^ this@R|/|.R|/.baz|() } ) } diff --git a/compiler/fir/analysis-tests/testData/resolve/enum.txt b/compiler/fir/analysis-tests/testData/resolve/enum.txt index f3b54c518e5..35ee119e905 100644 --- a/compiler/fir/analysis-tests/testData/resolve/enum.txt +++ b/compiler/fir/analysis-tests/testData/resolve/enum.txt @@ -22,7 +22,7 @@ FILE: enum.kt public get(): R|Some| public final static enum entry FIRST: R|SomeEnum| = object : R|SomeEnum| { - private[local] constructor(): R|anonymous| { + private[local] constructor(): R|| { super(Q|O1|) } @@ -33,7 +33,7 @@ FILE: enum.kt } public final static enum entry SECOND: R|SomeEnum| = object : R|SomeEnum| { - private[local] constructor(): R|anonymous| { + private[local] constructor(): R|| { super(Q|O2|) } @@ -71,7 +71,7 @@ FILE: enum.kt } public final static enum entry E1: R|EnumClass| = object : R|EnumClass| { - private[local] constructor(): R|anonymous| { + private[local] constructor(): R|| { super() } @@ -85,14 +85,14 @@ FILE: enum.kt } public final static enum entry E2: R|EnumClass| = object : R|EnumClass| { - private[local] constructor(): R|anonymous| { + private[local] constructor(): R|| { super() } } public final static enum entry E3: R|EnumClass| = object : R|EnumClass| { - private[local] constructor(): R|anonymous| { + private[local] constructor(): R|| { super() } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.txt index 71faa0653ab..d39ed186e52 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.txt @@ -30,17 +30,17 @@ FILE: CallBasedInExpressionGenerator.kt private final fun gen(argument: R|ERROR CLASS: Symbol not found, for `StackValue`|): R|ERROR CLASS: Symbol not found, for `BranchedValue`| { ^gen object : R|ERROR CLASS: Symbol not found, for `BranchedValue`| { - private[local] constructor(): R|anonymous| { + private[local] constructor(): R|| { super(R|/argument|, Null(null), R|/argument|.#, #.#) } public[local] final override fun putSelector(type: R|ERROR CLASS: Symbol not found, for `Type`|, kotlinType: R|ERROR CLASS: Symbol not found, for `KotlinType?`|, v: R|ERROR CLASS: Symbol not found, for `InstructionAdapter`|): R|kotlin/Unit| { - this@R|/anonymous|.R|/anonymous.invokeFunction|(R|/v|) + this@R|/|.R|/.invokeFunction|(R|/v|) #(R|/type|, R|/kotlinType|, R|/v|) } public[local] final override fun condJump(jumpLabel: R|ERROR CLASS: Symbol not found, for `Label`|, v: R|ERROR CLASS: Symbol not found, for `InstructionAdapter`|, jumpIfFalse: R|kotlin/Boolean|): R|kotlin/Unit| { - this@R|/anonymous|.R|/anonymous.invokeFunction|(R|/v|) + this@R|/|.R|/.invokeFunction|(R|/v|) R|/v|.#(when () { R|/jumpIfFalse| -> { #.# diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/enumEntryUse.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/enumEntryUse.txt index cd03048ea96..03a2eeb9259 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/enumEntryUse.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/enumEntryUse.txt @@ -7,7 +7,7 @@ FILE: enumEntryUse.kt public final static enum entry FIRST: R|TestEnum| public final static enum entry SECOND: R|TestEnum| public final static enum entry THIRD: R|TestEnum| = object : R|TestEnum| { - private[local] constructor(): R|anonymous| { + private[local] constructor(): R|| { super() } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/localImplicitBodies.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/localImplicitBodies.txt index a9d8ff6a44e..bdda8550189 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/localImplicitBodies.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/localImplicitBodies.txt @@ -1,12 +1,12 @@ FILE: localImplicitBodies.kt public final fun foo(): R|kotlin/Unit| { - lval x: R|anonymous| = object : R|kotlin/Any| { - private[local] constructor(): R|anonymous| { + lval x: R|| = object : R|kotlin/Any| { + private[local] constructor(): R|| { super() } public[local] final fun sss(): R|kotlin/Int| { - ^sss this@R|/anonymous|.R|/anonymous.abc|() + ^sss this@R|/|.R|/.abc|() } public[local] final fun abc(): R|kotlin/Int| { @@ -15,5 +15,5 @@ FILE: localImplicitBodies.kt } - lval g: R|kotlin/Int| = R|/x|.R|/anonymous.sss|() + lval g: R|kotlin/Int| = R|/x|.R|/.sss|() } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/localInnerClass.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/localInnerClass.txt index 7d0106776f6..a00a9704402 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/localInnerClass.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/localInnerClass.txt @@ -3,12 +3,12 @@ FILE: localInnerClass.kt } public final fun bar(): R|kotlin/Unit| { object : R|Foo| { - private[local] constructor(): R|anonymous| { + private[local] constructor(): R|| { super() } public[local] final fun foo(): R|Foo| { - ^foo this@R|/anonymous|.R|/.Derived.Derived|(Int(42)) + ^foo this@R|/|.R|/.Derived.Derived|(Int(42)) } local final inner class Derived : R|Foo| { diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/localObjects.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/localObjects.txt index b5967df8dba..6bf10c11cd9 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/localObjects.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/localObjects.txt @@ -20,8 +20,8 @@ FILE: localObjects.kt } public final fun test(): R|kotlin/Unit| { Q|A|.R|/A.x| - lval b: R|anonymous| = object : R|Foo| { - private[local] constructor(): R|anonymous| { + lval b: R|| = object : R|Foo| { + private[local] constructor(): R|| { super() } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/localScopes.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/localScopes.txt index cd9d3f195cb..b8e94125f7b 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/localScopes.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/localScopes.txt @@ -22,8 +22,8 @@ FILE: localScopes.kt lval base: R|BaseLocal| = R|/BaseLocal.BaseLocal|() R|/base|.R|/BaseLocal.baz|() R|/base|.R|/Bar.foo|() - lval anonymous: R|anonymous| = object : R|Bar| { - private[local] constructor(): R|anonymous| { + lval anonymous: R|| = object : R|Bar| { + private[local] constructor(): R|| { super() } @@ -32,7 +32,7 @@ FILE: localScopes.kt } - R|/anonymous|.R|/anonymous.baz|() + R|/anonymous|.R|/.baz|() R|/anonymous|.R|/Bar.foo|() local final class DerivedLocal : R|BaseLocal| { public[local] constructor(): R|DerivedLocal| { diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/localWithBooleanNot.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/localWithBooleanNot.txt index 8edb4faf6e4..be5ce04085c 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/localWithBooleanNot.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/localWithBooleanNot.txt @@ -1,7 +1,7 @@ FILE: foo.kt public final fun foo(): R|kotlin/Boolean| { object : R|Node| { - private[local] constructor(): R|anonymous| { + private[local] constructor(): R|| { super() } @@ -10,11 +10,11 @@ FILE: foo.kt private set(value: R|kotlin/Boolean|): R|kotlin/Unit| public[local] final fun bar(): R|kotlin/Boolean| { - ^bar this@R|/anonymous|.R|/anonymous.result|.R|kotlin/Boolean.not|() + ^bar this@R|/|.R|/.result|.R|kotlin/Boolean.not|() } public[local] final override fun result(): R|kotlin/Boolean| { - ^result this@R|/anonymous|.R|/anonymous.result| + ^result this@R|/|.R|/.result| } } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/outerMemberAccesses.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/outerMemberAccesses.txt index 6035641b94c..7394ec2470f 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/outerMemberAccesses.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/outerMemberAccesses.txt @@ -31,8 +31,8 @@ FILE: O.kt public[private] final fun test(): R|kotlin/Unit| { lval x: R|kotlin/Int| = this@R|/O.Derived|.R|/O.Derived.bar| - lval o: R|anonymous| = object : R|Wrapper| { - private[local] constructor(): R|anonymous| { + lval o: R|| = object : R|Wrapper| { + private[local] constructor(): R|| { super(this@R|/O.Derived.Some|.R|/O.Derived.Some.z|) } @@ -40,8 +40,8 @@ FILE: O.kt lval y: R|ft!| = this@R|/O.Derived|.R|/Base.foo|() } - public[local] final val oo: R|anonymous| = object : R|kotlin/Any| { - private[local] constructor(): R|anonymous| { + public[local] final val oo: R|| = object : R|kotlin/Any| { + private[local] constructor(): R|| { super() } @@ -50,7 +50,7 @@ FILE: O.kt } - public get(): R|anonymous| + public get(): R|| } @@ -60,8 +60,8 @@ FILE: O.kt public[private] final fun test(): R|kotlin/Unit| { lval x: R|kotlin/Int| = this@R|/O.Derived|.R|/O.Derived.bar| - lval o: R|anonymous| = object : R|kotlin/Any| { - private[local] constructor(): R|anonymous| { + lval o: R|| = object : R|kotlin/Any| { + private[local] constructor(): R|| { super() } @@ -86,7 +86,7 @@ FILE: O.kt private final fun gen(): R|kotlin/Any| { ^gen object : R|Wrapper| { - private[local] constructor(): R|anonymous| { + private[local] constructor(): R|| { super(Boolean(true)) } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/privateObjectLiteral.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/privateObjectLiteral.txt index 71aa1293cbe..fcdaf5083bd 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/privateObjectLiteral.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/privateObjectLiteral.txt @@ -4,8 +4,8 @@ FILE: privateObjectLiteral.kt super() } - private final val x: R|anonymous| = object : R|kotlin/Any| { - private[local] constructor(): R|anonymous| { + private final val x: R|| = object : R|kotlin/Any| { + private[local] constructor(): R|| { super() } @@ -15,13 +15,13 @@ FILE: privateObjectLiteral.kt } - private get(): R|anonymous| + private get(): R|| - public final val y: R|kotlin/Int| = this@R|/C|.R|/C.x|.R|/anonymous.foo|() + public final val y: R|kotlin/Int| = this@R|/C|.R|/C.x|.R|/.foo|() public get(): R|kotlin/Int| - internal final val z: R|anonymous| = object : R|kotlin/Any| { - private[local] constructor(): R|anonymous| { + internal final val z: R|| = object : R|kotlin/Any| { + private[local] constructor(): R|| { super() } @@ -31,9 +31,9 @@ FILE: privateObjectLiteral.kt } - internal get(): R|anonymous| + internal get(): R|| - public final val w: R|kotlin/Int| = this@R|/C|.R|/C.z|.R|/anonymous.foo|() + public final val w: R|kotlin/Int| = this@R|/C|.R|/C.z|.R|/.foo|() public get(): R|kotlin/Int| } diff --git a/compiler/fir/analysis-tests/testData/resolve/fromBuilder/enums.txt b/compiler/fir/analysis-tests/testData/resolve/fromBuilder/enums.txt index b46597da1fc..88d4ec320ff 100644 --- a/compiler/fir/analysis-tests/testData/resolve/fromBuilder/enums.txt +++ b/compiler/fir/analysis-tests/testData/resolve/fromBuilder/enums.txt @@ -26,7 +26,7 @@ FILE: enums.kt internal get(): R|kotlin/Double| public final static enum entry MERCURY: R|Planet| = object : R|Planet| { - private[local] constructor(): R|anonymous| { + private[local] constructor(): R|| { super(Double(1.0), Double(2.0)) } @@ -37,7 +37,7 @@ FILE: enums.kt } public final static enum entry VENERA: R|Planet| = object : R|Planet| { - private[local] constructor(): R|anonymous| { + private[local] constructor(): R|| { super(Double(3.0), Double(4.0)) } @@ -48,7 +48,7 @@ FILE: enums.kt } public final static enum entry EARTH: R|Planet| = object : R|Planet| { - private[local] constructor(): R|anonymous| { + private[local] constructor(): R|| { super(Double(5.0), Double(6.0)) } diff --git a/compiler/fir/analysis-tests/testData/resolve/localClasses/implicitInAnonymous.txt b/compiler/fir/analysis-tests/testData/resolve/localClasses/implicitInAnonymous.txt index b1f27a077d1..4310cac8385 100644 --- a/compiler/fir/analysis-tests/testData/resolve/localClasses/implicitInAnonymous.txt +++ b/compiler/fir/analysis-tests/testData/resolve/localClasses/implicitInAnonymous.txt @@ -1,35 +1,35 @@ FILE: implicitInAnonymous.kt - private final val x: R|anonymous| = object : R|kotlin/Any| { - private[local] constructor(): R|anonymous| { + private final val x: R|| = object : R|kotlin/Any| { + private[local] constructor(): R|| { super() } public[local] final fun foo(x: R|kotlin/Int|): R|kotlin/Boolean| { - ^foo this@R|/anonymous|.R|/anonymous.bar|(R|/x|) + ^foo this@R|/|.R|/.bar|(R|/x|) } public[local] final fun bar(y: R|kotlin/Int|): R|kotlin/Boolean| { - ^bar CMP(>, this@R|/anonymous|.R|kotlin/Any.hashCode|().R|kotlin/Int.plus|(R|/y|).R|kotlin/Int.compareTo|(Int(0))) + ^bar CMP(>, this@R|/|.R|kotlin/Any.hashCode|().R|kotlin/Int.plus|(R|/y|).R|kotlin/Int.compareTo|(Int(0))) } public[local] final val w: R|kotlin/Boolean| public get(): R|kotlin/Boolean| { - ^ this@R|/anonymous|.R|/anonymous.z| + ^ this@R|/|.R|/.z| } public[local] final val z: R|kotlin/Boolean| public get(): R|kotlin/Boolean| { - ^ ==(this@R|/anonymous|.R|kotlin/Any.hashCode|(), Int(0)) + ^ ==(this@R|/|.R|kotlin/Any.hashCode|(), Int(0)) } } - private get(): R|anonymous| + private get(): R|| public final fun useBoolean(b: R|kotlin/Boolean|): R|kotlin/Unit| { } public final fun main(): R|kotlin/Unit| { - R|/useBoolean|(R|/x|.R|/anonymous.foo|(Int(1))) - R|/useBoolean|(R|/x|.R|/anonymous.bar|(Int(2))) - R|/useBoolean|(R|/x|.R|/anonymous.w|) - R|/useBoolean|(R|/x|.R|/anonymous.z|) + R|/useBoolean|(R|/x|.R|/.foo|(Int(1))) + R|/useBoolean|(R|/x|.R|/.bar|(Int(2))) + R|/useBoolean|(R|/x|.R|/.w|) + R|/useBoolean|(R|/x|.R|/.z|) } diff --git a/compiler/fir/analysis-tests/testData/resolve/localClasses/typesFromSuperClasses.txt b/compiler/fir/analysis-tests/testData/resolve/localClasses/typesFromSuperClasses.txt index 9e96f9c55e8..16a4010319c 100644 --- a/compiler/fir/analysis-tests/testData/resolve/localClasses/typesFromSuperClasses.txt +++ b/compiler/fir/analysis-tests/testData/resolve/localClasses/typesFromSuperClasses.txt @@ -12,7 +12,7 @@ FILE: typesFromSuperClasses.kt } public final fun main(): R|kotlin/Unit| { object : R|Outer| { - private[local] constructor(): R|anonymous| { + private[local] constructor(): R|| { super() } diff --git a/compiler/fir/analysis-tests/testData/resolve/localObject.txt b/compiler/fir/analysis-tests/testData/resolve/localObject.txt index 09bb6419147..4e3f2183bd4 100644 --- a/compiler/fir/analysis-tests/testData/resolve/localObject.txt +++ b/compiler/fir/analysis-tests/testData/resolve/localObject.txt @@ -8,8 +8,8 @@ FILE: localObject.kt } public final fun tesLambda(x: R|kotlin/Int|): R|kotlin/Int| { ^tesLambda R|/run|( = run@fun (): R|kotlin/Int| { - lval obj: R|anonymous| = object : R|Foo| { - private[local] constructor(): R|anonymous| { + lval obj: R|| = object : R|Foo| { + private[local] constructor(): R|| { super() } @@ -34,8 +34,8 @@ FILE: localObject.kt public final var x: R|kotlin/Int| = Int(1) public get(): R|kotlin/Int| public set(value: R|kotlin/Int|): R|kotlin/Unit| { - lval obj: R|anonymous| = object : R|Foo| { - private[local] constructor(): R|anonymous| { + lval obj: R|| = object : R|Foo| { + private[local] constructor(): R|| { super() } @@ -50,8 +50,8 @@ FILE: localObject.kt public final val y: R|kotlin/Int| public get(): R|kotlin/Int| { - lval obj: R|anonymous| = object : R|Foo| { - private[local] constructor(): R|anonymous| { + lval obj: R|| = object : R|Foo| { + private[local] constructor(): R|| { super() } @@ -65,8 +65,8 @@ FILE: localObject.kt } public final val z: R|kotlin/Int| = this@R|/TestProperty|.R|kotlin/run|( = run@fun R|TestProperty|.(): R|kotlin/Int| { - lval obj: R|anonymous| = object : R|Foo| { - private[local] constructor(): R|anonymous| { + lval obj: R|| = object : R|Foo| { + private[local] constructor(): R|| { super() } diff --git a/compiler/fir/analysis-tests/testData/resolve/objectInnerClass.txt b/compiler/fir/analysis-tests/testData/resolve/objectInnerClass.txt index 637a1c92c5e..2689301c4ff 100644 --- a/compiler/fir/analysis-tests/testData/resolve/objectInnerClass.txt +++ b/compiler/fir/analysis-tests/testData/resolve/objectInnerClass.txt @@ -1,12 +1,12 @@ FILE: objectInnerClass.kt - public final val case1: R|anonymous| = object : R|A| { - private[local] constructor(): R|anonymous| { + public final val case1: R|| = object : R|A| { + private[local] constructor(): R|| { super() } local final inner class Child : R|.Base| { public[local] constructor(property: R|B|): R|.Child| { - this@R|/anonymous|.super.Base|>(R|/property|) + this@R|/|.super.Base|>(R|/property|) } public[local] final fun R|.Base|.zoo(): R|kotlin/Unit| { @@ -17,17 +17,17 @@ FILE: objectInnerClass.kt this@R|/.Child|.R|/.Base.baseFun|() lval x: R|B| = this@R|/.Child|.R|/.Base.property| (this@R|/.Child|, this@R|/.Child|).R|/.Child.zoo|() - (this@R|/anonymous|, this@R|/.Child|).R|/anonymous.hoo|() + (this@R|/|, this@R|/.Child|).R|/.hoo|() } } public[local] final fun R|.Child|.voo(): R|kotlin/Unit| { - lval x: R|B| = this@R|/anonymous.voo|.R|/.Base.property| + lval x: R|B| = this@R|/.voo|.R|/.Base.property| } public[local] final fun R|.Base|.hoo(): R|kotlin/Unit| { - lval x: R|B| = this@R|/anonymous.hoo|.R|/.Base.property| + lval x: R|B| = this@R|/.hoo|.R|/.Base.property| } local open inner class Base : R|kotlin/Any| { @@ -44,48 +44,48 @@ FILE: objectInnerClass.kt } public[local] final fun caseForBase(): R|kotlin/Unit| { - lval base: R|.Base| = this@R|/anonymous|.R|/.Base.Base|(R|/B.B|()) + lval base: R|.Base| = this@R|/|.R|/.Base.Base|(R|/B.B|()) R|/base|.R|/.Base.baseFun|() R|/base|.R|/.Base.property| - (this@R|/anonymous|, R|/base|).R|/anonymous.hoo|() + (this@R|/|, R|/base|).R|/.hoo|() } public[local] final fun caseForChild(): R|kotlin/Unit| { - lval child: R|.Child| = this@R|/anonymous|.R|/.Child.Child|(R|/B.B|()) + lval child: R|.Child| = this@R|/|.R|/.Child.Child|(R|/B.B|()) R|/child|.R|/.Base.baseFun|() R|/child|.R|/.Base.property| R|/child|.R|/.Child.foo|() - (this@R|/anonymous|, R|/child|).R|/anonymous.hoo|() - (this@R|/anonymous|, R|/child|).R|/anonymous.voo|() + (this@R|/|, R|/child|).R|/.hoo|() + (this@R|/|, R|/child|).R|/.voo|() } } - public get(): R|anonymous| + public get(): R|| public final class Case2 : R|kotlin/Any| { public constructor(): R|Case2| { super() } - public final val x: R|anonymous| = object : R|Case2.Base| { - private[local] constructor(): R|anonymous| { + public final val x: R|| = object : R|Case2.Base| { + private[local] constructor(): R|| { this@R|/Case2|.super(R|/B.B|()) } public[local] final fun R|Case2.Base|.zoo(): R|kotlin/Unit| { - lval x: R|B| = this@R|/anonymous.zoo|.R|/Case2.Base.property| + lval x: R|B| = this@R|/.zoo|.R|/Case2.Base.property| } public[local] final fun foo(): R|kotlin/Unit| { - this@R|/anonymous|.R|/Case2.Base.baseFun|() - lval x: R|B| = this@R|/anonymous|.R|/Case2.Base.property| - (this@R|/anonymous|, this@R|/anonymous|).R|/anonymous.zoo|() - (this@R|/Case2|, this@R|/anonymous|).R|/Case2.hoo|() + this@R|/|.R|/Case2.Base.baseFun|() + lval x: R|B| = this@R|/|.R|/Case2.Base.property| + (this@R|/|, this@R|/|).R|/.zoo|() + (this@R|/Case2|, this@R|/|).R|/Case2.hoo|() } } - public get(): R|anonymous| + public get(): R|| public final fun R|Case2.Base|.hoo(): R|kotlin/Unit| { lval x: R|B| = this@R|/Case2.hoo|.R|/Case2.Base.property| @@ -112,7 +112,7 @@ FILE: objectInnerClass.kt } public final fun caseForChild(): R|kotlin/Unit| { - lval child: R|anonymous| = this@R|/Case2|.R|/Case2.x| + lval child: R|| = this@R|/Case2|.R|/Case2.x| R|/child|.R|/Case2.Base.baseFun|() R|/child|.R|/Case2.Base.property| (this@R|/Case2|, R|/child|).R|/Case2.hoo|() @@ -124,14 +124,14 @@ FILE: objectInnerClass.kt super() } - public final val x: R|anonymous| = object : R|A| { - private[local] constructor(): R|anonymous| { + public final val x: R|| = object : R|A| { + private[local] constructor(): R|| { super() } local final inner class Child : R|Case3..Base| { public[local] constructor(property: R|B|): R|Case3..Child| { - this@R|/anonymous|.super.Base|>(R|/property|) + this@R|/|.super.Base|>(R|/property|) } public[local] final fun R|Case3..Base|.zoo(): R|kotlin/Unit| { @@ -142,17 +142,17 @@ FILE: objectInnerClass.kt this@R|/Case3..Child|.R|/Case3..Base.baseFun|() lval x: R|B| = this@R|/Case3..Child|.R|/Case3..Base.property| (this@R|/Case3..Child|, this@R|/Case3..Child|).R|/Case3..Child.zoo|() - (this@R|/anonymous|, this@R|/Case3..Child|).R|/anonymous.hoo|() + (this@R|/|, this@R|/Case3..Child|).R|/.hoo|() } } public[local] final fun R|Case3..Child|.voo(): R|kotlin/Unit| { - lval x: R|B| = this@R|/anonymous.voo|.R|/Case3..Base.property| + lval x: R|B| = this@R|/.voo|.R|/Case3..Base.property| } public[local] final fun R|Case3..Base|.hoo(): R|kotlin/Unit| { - lval x: R|B| = this@R|/anonymous.hoo|.R|/Case3..Base.property| + lval x: R|B| = this@R|/.hoo|.R|/Case3..Base.property| } local open inner class Base : R|kotlin/Any| { @@ -169,24 +169,24 @@ FILE: objectInnerClass.kt } public[local] final fun caseForBase(): R|kotlin/Unit| { - lval base: R|Case3..Base| = this@R|/anonymous|.R|/Case3..Base.Base|(R|/B.B|()) + lval base: R|Case3..Base| = this@R|/|.R|/Case3..Base.Base|(R|/B.B|()) R|/base|.R|/Case3..Base.baseFun|() R|/base|.R|/Case3..Base.property| - (this@R|/anonymous|, R|/base|).R|/anonymous.hoo|() + (this@R|/|, R|/base|).R|/.hoo|() } public[local] final fun caseForChild(): R|kotlin/Unit| { - lval child: R|Case3..Child| = this@R|/anonymous|.R|/Case3..Child.Child|(R|/B.B|()) + lval child: R|Case3..Child| = this@R|/|.R|/Case3..Child.Child|(R|/B.B|()) R|/child|.R|/Case3..Base.baseFun|() R|/child|.R|/Case3..Base.property| R|/child|.R|/Case3..Child.foo|() - (this@R|/anonymous|, R|/child|).R|/anonymous.hoo|() - (this@R|/anonymous|, R|/child|).R|/anonymous.voo|() + (this@R|/|, R|/child|).R|/.hoo|() + (this@R|/|, R|/child|).R|/.voo|() } } - public get(): R|anonymous| + public get(): R|| } public abstract interface A : R|kotlin/Any| { diff --git a/compiler/fir/analysis-tests/testData/resolve/problems/objectDerivedFromInnerClass.txt b/compiler/fir/analysis-tests/testData/resolve/problems/objectDerivedFromInnerClass.txt index 6ac3a76e932..4a4f0794961 100644 --- a/compiler/fir/analysis-tests/testData/resolve/problems/objectDerivedFromInnerClass.txt +++ b/compiler/fir/analysis-tests/testData/resolve/problems/objectDerivedFromInnerClass.txt @@ -13,8 +13,8 @@ FILE: objectDerivedFromInnerClass.kt } public final fun test(): R|kotlin/Unit| { - lval x: R|anonymous| = object : R|Outer.Inner| { - private[local] constructor(): R|anonymous| { + lval x: R|| = object : R|Outer.Inner| { + private[local] constructor(): R|| { super() } diff --git a/compiler/fir/analysis-tests/testData/resolve/visibility/singletonConstructors.txt b/compiler/fir/analysis-tests/testData/resolve/visibility/singletonConstructors.txt index daee35cb753..f4dc1b073f3 100644 --- a/compiler/fir/analysis-tests/testData/resolve/visibility/singletonConstructors.txt +++ b/compiler/fir/analysis-tests/testData/resolve/visibility/singletonConstructors.txt @@ -51,7 +51,7 @@ FILE: singletonConstructors.kt } public final static enum entry X: R|E| = object : R|E| { - private[local] constructor(): R|anonymous| { + private[local] constructor(): R|| { super() } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/anonymousInDelegate.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/anonymousInDelegate.txt index c570c010aae..d5c4d542eeb 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/anonymousInDelegate.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/anonymousInDelegate.txt @@ -4,8 +4,8 @@ FILE: anonymousInDelegate.kt } public final val x: R|kotlin/Int|by R|kotlin/lazy|( = lazy@fun (): R|kotlin/Int| { - lval foo: R|anonymous| = object : R|Foo| { - private[local] constructor(): R|anonymous| { + lval foo: R|| = object : R|Foo| { + private[local] constructor(): R|| { super() } @@ -15,7 +15,7 @@ FILE: anonymousInDelegate.kt } - ^ R|/foo|.R|/anonymous.bar|() + ^ R|/foo|.R|/.bar|() } ) public get(): R|kotlin/Int| { diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.txt index 927d2dcfd25..8d4e2c1b094 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.txt @@ -24,7 +24,7 @@ FILE: delegateWithAnonymousObject.kt public final var issueListView: R|IssueListView|by this@R|/IssuesListUserProfile|.R|/delegate|( = delegate@fun (): R|kotlin/properties/ReadWriteProperty| { ^ object : R|kotlin/properties/ReadWriteProperty| { - private[local] constructor(): R|anonymous| { + private[local] constructor(): R|| { super() } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems.txt index 373e1a00973..4be7261cdbe 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems.txt @@ -1,8 +1,8 @@ FILE: problems.kt public final val sb: R|java/lang/StringBuilder| = R|java/lang/StringBuilder.StringBuilder|() public get(): R|java/lang/StringBuilder| - public final val o: R|anonymous| = object : R|kotlin/Any| { - private[local] constructor(): R|anonymous| { + public final val o: R|| = object : R|kotlin/Any| { + private[local] constructor(): R|| { super() } @@ -10,12 +10,12 @@ FILE: problems.kt public get(): R|kotlin/String| public[local] final fun test(): R|kotlin/Unit| { - this@R|/anonymous|.R|/anonymous.name| + this@R|/|.R|/.name| } } - public get(): R|anonymous| + public get(): R|| public final fun test(): R|kotlin/Unit| { local final class Local : R|kotlin/Any| { public[local] constructor(): R|Local| { diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotation.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotation.txt index cc74045688b..14d2ce2116b 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotation.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotation.txt @@ -30,14 +30,14 @@ FILE: annotation.kt } public final static enum entry FIRST: R|My| = @base() object : R|My| { - private constructor(): R|anonymous| { + private constructor(): R|| { super() } } public final static enum entry SECOND: R|My| = @base() object : R|My| { - private constructor(): R|anonymous| { + private constructor(): R|| { super() } diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/constructorInObject.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/constructorInObject.txt index a1a37c0eff3..0fb314d5dd2 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/constructorInObject.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/constructorInObject.txt @@ -14,12 +14,12 @@ FILE: constructorInObject.kt } public final static enum entry X: R|B| = object : R|B| { - private constructor(): R|anonymous| { + private constructor(): R|| { super() } - public? constructor(): R|anonymous| { - this() + public? constructor(): R|| { + this|>() } } @@ -45,7 +45,7 @@ FILE: constructorInObject.kt } public? final? val anonObject: = object : R|kotlin/Any| { - public? constructor(): R|anonymous| { + public? constructor(): R|| { super() } diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/constructorOfAnonymousObject.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/constructorOfAnonymousObject.txt index 2e4bb2b9902..84e8265bdc2 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/constructorOfAnonymousObject.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/constructorOfAnonymousObject.txt @@ -1,7 +1,7 @@ FILE: constructorOfAnonymousObject.kt private final? fun resolveAccessorCall(suspendPropertyDescriptor: PropertyDescriptor, context: TranslationContext): ResolvedCall { ^resolveAccessorCall object : ResolvedCall { - private constructor(): R|anonymous| { + private constructor(): R|| { super<>() } diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/emptyAnonymousObject.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/emptyAnonymousObject.txt index 84a0f198a2a..3f8ff2f506e 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/emptyAnonymousObject.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/emptyAnonymousObject.txt @@ -1,7 +1,7 @@ FILE: emptyAnonymousObject.kt public? final? fun test(): R|kotlin/Unit| { lval x: = object : R|kotlin/Any| { - private constructor(): R|anonymous| { + private constructor(): R|| { super() } diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/enums.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/enums.txt index c251f73ba61..fcad62ee318 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/enums.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/enums.txt @@ -26,7 +26,7 @@ FILE: enums.kt internal get(): Double public final static enum entry MERCURY: R|Planet| = object : R|Planet| { - private constructor(): R|anonymous| { + private constructor(): R|| { super(Double(1.0), Double(2.0)) } @@ -37,7 +37,7 @@ FILE: enums.kt } public final static enum entry VENERA: R|Planet| = object : R|Planet| { - private constructor(): R|anonymous| { + private constructor(): R|| { super(Double(3.0), Double(4.0)) } @@ -48,7 +48,7 @@ FILE: enums.kt } public final static enum entry EARTH: R|Planet| = object : R|Planet| { - private constructor(): R|anonymous| { + private constructor(): R|| { super(Double(5.0), Double(6.0)) } @@ -89,49 +89,49 @@ FILE: enums.kt public? get(): String public final static enum entry FIX_STACK_BEFORE_JUMP: R|PseudoInsn| = object : R|PseudoInsn| { - private constructor(): R|anonymous| { + private constructor(): R|| { super() } } public final static enum entry FAKE_ALWAYS_TRUE_IFEQ: R|PseudoInsn| = object : R|PseudoInsn| { - private constructor(): R|anonymous| { + private constructor(): R|| { super(String(()I)) } } public final static enum entry FAKE_ALWAYS_FALSE_IFEQ: R|PseudoInsn| = object : R|PseudoInsn| { - private constructor(): R|anonymous| { + private constructor(): R|| { super(String(()I)) } } public final static enum entry SAVE_STACK_BEFORE_TRY: R|PseudoInsn| = object : R|PseudoInsn| { - private constructor(): R|anonymous| { + private constructor(): R|| { super() } } public final static enum entry RESTORE_STACK_IN_TRY_CATCH: R|PseudoInsn| = object : R|PseudoInsn| { - private constructor(): R|anonymous| { + private constructor(): R|| { super() } } public final static enum entry STORE_NOT_NULL: R|PseudoInsn| = object : R|PseudoInsn| { - private constructor(): R|anonymous| { + private constructor(): R|| { super() } } public final static enum entry AS_NOT_NULL: R|PseudoInsn| = object : R|PseudoInsn| { - private constructor(): R|anonymous| { + private constructor(): R|| { super(String((Ljava/lang/Object;)Ljava/lang/Object;)) } diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/enums2.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/enums2.txt index 047594e1ec6..708f4462eee 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/enums2.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/enums2.txt @@ -22,7 +22,7 @@ FILE: enums2.kt public? get(): Some public final static enum entry FIRST: R|SomeEnum| = object : R|SomeEnum| { - private constructor(): R|anonymous| { + private constructor(): R|| { super(O1#) } @@ -33,7 +33,7 @@ FILE: enums2.kt } public final static enum entry SECOND: R|SomeEnum| = object : R|SomeEnum| { - private constructor(): R|anonymous| { + private constructor(): R|| { super(O2#) } diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/locals.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/locals.txt index a5b0e3c9215..ad51f3afe51 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/locals.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/locals.txt @@ -20,7 +20,7 @@ FILE: locals.kt } lval code: = object : Any { - private constructor(): R|anonymous| { + private constructor(): R|| { super() } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirClassLikeSymbol.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirClassLikeSymbol.kt index e9e178c9374..11b3303bde1 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirClassLikeSymbol.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirClassLikeSymbol.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.name.Name sealed class FirClassLikeSymbol( val classId: ClassId @@ -27,7 +28,7 @@ sealed class FirClassSymbol>(classId: ClassId) : FirClassLikeSym class FirRegularClassSymbol(classId: ClassId) : FirClassSymbol(classId) -val ANONYMOUS_CLASS_ID = ClassId(FqName.ROOT, FqName("anonymous"), true) +val ANONYMOUS_CLASS_ID = ClassId(FqName.ROOT, FqName.topLevel(Name.special("")), true) class FirAnonymousObjectSymbol : FirClassSymbol(ANONYMOUS_CLASS_ID) diff --git a/compiler/testData/diagnostics/tests/ObjectWithConstructor.fir.kt b/compiler/testData/diagnostics/tests/ObjectWithConstructor.fir.kt index 9f7eaf5fbc0..963a57289f6 100644 --- a/compiler/testData/diagnostics/tests/ObjectWithConstructor.fir.kt +++ b/compiler/testData/diagnostics/tests/ObjectWithConstructor.fir.kt @@ -11,7 +11,7 @@ object A2 public constructor(private val prop: Int) } val x = object (val prop: Int) { - constructor() : this(1) { + constructor() : this(1) { val x = 1 x * x }