From 1aae9d64560288e8a5c89b43089739dca1ce4157 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 18 Nov 2022 16:24:43 +0100 Subject: [PATCH] FIR2IR: generate this reference to non-source class properly #KT-53983 Fixed --- .../kotlin/fir/backend/Fir2IrVisitor.kt | 9 ++- .../runners/ir/Fir2IrTextTestGenerated.java | 6 ++ .../ir/LightTreeFir2IrTextTestGenerated.java | 6 ++ .../thisInEnumConstructor.fir.ir.txt | 76 ++++++++++++++++++ .../thisInEnumConstructor.fir.kt.txt | 18 +++++ .../firProblems/thisInEnumConstructor.ir.txt | 80 +++++++++++++++++++ .../firProblems/thisInEnumConstructor.kt | 5 ++ .../firProblems/thisInEnumConstructor.kt.txt | 18 +++++ .../test/runners/ir/IrTextTestGenerated.java | 6 ++ .../klib/KlibTextTestCaseGenerated.java | 5 ++ 10 files changed, 228 insertions(+), 1 deletion(-) create mode 100644 compiler/testData/ir/irText/firProblems/thisInEnumConstructor.fir.ir.txt create mode 100644 compiler/testData/ir/irText/firProblems/thisInEnumConstructor.fir.kt.txt create mode 100644 compiler/testData/ir/irText/firProblems/thisInEnumConstructor.ir.txt create mode 100644 compiler/testData/ir/irText/firProblems/thisInEnumConstructor.kt create mode 100644 compiler/testData/ir/irText/firProblems/thisInEnumConstructor.kt.txt diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt index 654a7c56f5d..00b200f6924 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt @@ -515,7 +515,14 @@ class Fir2IrVisitor( if (boundSymbol is FirClassSymbol) { // Object case val firClass = boundSymbol.fir as FirClass - val irClass = classifierStorage.getCachedIrClass(firClass)!! + val irClass = if (firClass.origin == FirDeclarationOrigin.Source) { + // We anyway can use 'else' branch as fallback, but + // this is an additional check of FIR2IR invariants + // (source classes should be already built when we analyze bodies) + classifierStorage.getCachedIrClass(firClass)!! + } else { + classifierStorage.getIrClassSymbol(boundSymbol).owner + } // NB: IR generates anonymous objects as classes, not singleton objects if (firClass is FirRegularClass && firClass.classKind == ClassKind.OBJECT && !isThisForClassPhysicallyAvailable(irClass)) { return thisReceiverExpression.convertWithOffsets { startOffset, endOffset -> diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/Fir2IrTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/Fir2IrTextTestGenerated.java index d436f0899ad..65712c0c988 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/Fir2IrTextTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/Fir2IrTextTestGenerated.java @@ -2750,6 +2750,12 @@ public class Fir2IrTextTestGenerated extends AbstractFir2IrTextTest { runTest("compiler/testData/ir/irText/firProblems/SyntheticSetterType.kt"); } + @Test + @TestMetadata("thisInEnumConstructor.kt") + public void testThisInEnumConstructor() throws Exception { + runTest("compiler/testData/ir/irText/firProblems/thisInEnumConstructor.kt"); + } + @Test @TestMetadata("throwableStackTrace.kt") public void testThrowableStackTrace() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/LightTreeFir2IrTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/LightTreeFir2IrTextTestGenerated.java index 4441f89195a..247a97ac104 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/LightTreeFir2IrTextTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/LightTreeFir2IrTextTestGenerated.java @@ -2750,6 +2750,12 @@ public class LightTreeFir2IrTextTestGenerated extends AbstractLightTreeFir2IrTex runTest("compiler/testData/ir/irText/firProblems/SyntheticSetterType.kt"); } + @Test + @TestMetadata("thisInEnumConstructor.kt") + public void testThisInEnumConstructor() throws Exception { + runTest("compiler/testData/ir/irText/firProblems/thisInEnumConstructor.kt"); + } + @Test @TestMetadata("throwableStackTrace.kt") public void testThrowableStackTrace() throws Exception { diff --git a/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.fir.ir.txt b/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.fir.ir.txt new file mode 100644 index 00000000000..ca86c73657b --- /dev/null +++ b/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.fir.ir.txt @@ -0,0 +1,76 @@ +FILE fqName: fileName:/thisInEnumConstructor.kt + CLASS ENUM_CLASS name:EE modality:OPEN visibility:public superTypes:[kotlin.Enum<.EE>] + $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.EE + CONSTRUCTOR visibility:private <> (myName:kotlin.String) returnType:.EE [primary] + VALUE_PARAMETER name:myName index:0 type:kotlin.String + EXPRESSION_BODY + CALL 'public final fun lowercase (): kotlin.String [inline] declared in kotlin.text.StringsKt' type=kotlin.String origin=null + $receiver: CALL 'public open fun toString (): kotlin.String [fake_override] declared in kotlin.Enum.Companion' type=kotlin.String origin=null + $this: GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=kotlin.Enum.Companion + BLOCK_BODY + ENUM_CONSTRUCTOR_CALL 'public constructor (name: kotlin.String, ordinal: kotlin.Int) [primary] declared in kotlin.Enum' + : .EE + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:EE modality:OPEN visibility:public superTypes:[kotlin.Enum<.EE>]' + PROPERTY name:myName visibility:public modality:FINAL [val] + FIELD PROPERTY_BACKING_FIELD name:myName type:kotlin.String visibility:private [final] + EXPRESSION_BODY + GET_VAR 'myName: kotlin.String declared in .EE.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.EE) returnType:kotlin.String + correspondingProperty: PROPERTY name:myName visibility:public modality:FINAL [val] + $this: VALUE_PARAMETER name: type:.EE + BLOCK_BODY + RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .EE' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:myName type:kotlin.String visibility:private [final]' type=kotlin.String origin=null + receiver: GET_VAR ': .EE declared in .EE.' type=.EE origin=null + ENUM_ENTRY name:ENTRY + init: EXPRESSION_BODY + ENUM_CONSTRUCTOR_CALL 'private constructor (myName: kotlin.String) [primary] declared in .EE' + FUN ENUM_CLASS_SPECIAL_MEMBER name:values visibility:public modality:FINAL <> () returnType:kotlin.Array<.EE> + SYNTHETIC_BODY kind=ENUM_VALUES + FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.EE + VALUE_PARAMETER name:value index:0 type:kotlin.String + SYNTHETIC_BODY kind=ENUM_VALUEOF + FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] + overridden: + protected final fun clone (): kotlin.Any declared in kotlin.Enum + $this: VALUE_PARAMETER name: type:kotlin.Enum + FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum, other:.EE) returnType:kotlin.Int [fake_override,operator] + overridden: + public final fun compareTo (other: E of kotlin.Enum): kotlin.Int [operator] declared in kotlin.Enum + $this: VALUE_PARAMETER name: type:kotlin.Enum + VALUE_PARAMETER name:other index:0 type:.EE + FUN FAKE_OVERRIDE name:equals visibility:public modality:FINAL <> ($this:kotlin.Enum, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] + overridden: + public final fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Enum + $this: VALUE_PARAMETER name: type:kotlin.Enum + VALUE_PARAMETER name:other index:0 type:kotlin.Any? + FUN FAKE_OVERRIDE name:hashCode visibility:public modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Int [fake_override] + overridden: + public final fun hashCode (): kotlin.Int declared in kotlin.Enum + $this: VALUE_PARAMETER name: type:kotlin.Enum + FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Enum) returnType:kotlin.String [fake_override] + overridden: + public open fun toString (): kotlin.String declared in kotlin.Enum + $this: VALUE_PARAMETER name: type:kotlin.Enum + PROPERTY FAKE_OVERRIDE name:name visibility:public modality:FINAL [fake_override,val] + annotations: + IntrinsicConstEvaluation + overridden: + public final name: kotlin.String [val] + FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.String [fake_override] + correspondingProperty: PROPERTY FAKE_OVERRIDE name:name visibility:public modality:FINAL [fake_override,val] + overridden: + public final fun (): kotlin.String declared in kotlin.Enum + $this: VALUE_PARAMETER name: type:kotlin.Enum + PROPERTY FAKE_OVERRIDE name:ordinal visibility:public modality:FINAL [fake_override,val] + overridden: + public final ordinal: kotlin.Int [val] + FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Int [fake_override] + correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal visibility:public modality:FINAL [fake_override,val] + overridden: + public final fun (): kotlin.Int declared in kotlin.Enum + $this: VALUE_PARAMETER name: type:kotlin.Enum + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .EE?>? [fake_override] + overridden: + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum + $this: VALUE_PARAMETER name: type:kotlin.Enum diff --git a/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.fir.kt.txt b/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.fir.kt.txt new file mode 100644 index 00000000000..b696e3f12b0 --- /dev/null +++ b/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.fir.kt.txt @@ -0,0 +1,18 @@ +open enum class EE : Enum { + private constructor(myName: String = Companion.toString().lowercase()) /* primary */ { + super/*Enum*/() + /* () */ + + } + + val myName: String + field = myName + get + + ENTRY = EE() + + fun values(): Array /* Synthetic body for ENUM_VALUES */ + + fun valueOf(value: String): EE /* Synthetic body for ENUM_VALUEOF */ + +} diff --git a/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.ir.txt b/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.ir.txt new file mode 100644 index 00000000000..cceecff566b --- /dev/null +++ b/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.ir.txt @@ -0,0 +1,80 @@ +FILE fqName: fileName:/thisInEnumConstructor.kt + CLASS ENUM_CLASS name:EE modality:FINAL visibility:public superTypes:[kotlin.Enum<.EE>] + $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.EE + CONSTRUCTOR visibility:private <> (myName:kotlin.String) returnType:.EE [primary] + VALUE_PARAMETER name:myName index:0 type:kotlin.String + EXPRESSION_BODY + CALL 'public final fun lowercase (): kotlin.String [inline] declared in kotlin.text.StringsKt' type=kotlin.String origin=null + $receiver: CALL 'public open fun toString (): kotlin.String [fake_override] declared in kotlin.Enum.Companion' type=kotlin.String origin=null + $this: GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=kotlin.Enum.Companion + BLOCK_BODY + ENUM_CONSTRUCTOR_CALL 'public constructor (name: kotlin.String, ordinal: kotlin.Int) [primary] declared in kotlin.Enum' + : .EE + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:EE modality:FINAL visibility:public superTypes:[kotlin.Enum<.EE>]' + PROPERTY name:myName visibility:public modality:FINAL [val] + FIELD PROPERTY_BACKING_FIELD name:myName type:kotlin.String visibility:private [final] + EXPRESSION_BODY + GET_VAR 'myName: kotlin.String declared in .EE.' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.EE) returnType:kotlin.String + correspondingProperty: PROPERTY name:myName visibility:public modality:FINAL [val] + $this: VALUE_PARAMETER name: type:.EE + BLOCK_BODY + RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .EE' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:myName type:kotlin.String visibility:private [final]' type=kotlin.String origin=null + receiver: GET_VAR ': .EE declared in .EE.' type=.EE origin=null + ENUM_ENTRY name:ENTRY + init: EXPRESSION_BODY + ENUM_CONSTRUCTOR_CALL 'private constructor (myName: kotlin.String) [primary] declared in .EE' + PROPERTY FAKE_OVERRIDE name:name visibility:public modality:FINAL [fake_override,val] + annotations: + IntrinsicConstEvaluation + overridden: + public final name: kotlin.String [val] + FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:kotlin.Enum<.EE>) returnType:kotlin.String [fake_override] + correspondingProperty: PROPERTY FAKE_OVERRIDE name:name visibility:public modality:FINAL [fake_override,val] + overridden: + public final fun (): kotlin.String declared in kotlin.Enum + $this: VALUE_PARAMETER name: type:kotlin.Enum<.EE> + PROPERTY FAKE_OVERRIDE name:ordinal visibility:public modality:FINAL [fake_override,val] + overridden: + public final ordinal: kotlin.Int [val] + FUN FAKE_OVERRIDE name: visibility:public modality:FINAL <> ($this:kotlin.Enum<.EE>) returnType:kotlin.Int [fake_override] + correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal visibility:public modality:FINAL [fake_override,val] + overridden: + public final fun (): kotlin.Int declared in kotlin.Enum + $this: VALUE_PARAMETER name: type:kotlin.Enum<.EE> + FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum<.EE>) returnType:kotlin.Any [fake_override] + overridden: + protected final fun clone (): kotlin.Any declared in kotlin.Enum + $this: VALUE_PARAMETER name: type:kotlin.Enum<.EE> + FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<.EE>, other:.EE) returnType:kotlin.Int [fake_override,operator] + overridden: + public final fun compareTo (other: E of kotlin.Enum): kotlin.Int [operator] declared in kotlin.Enum + $this: VALUE_PARAMETER name: type:kotlin.Enum<.EE> + VALUE_PARAMETER name:other index:0 type:.EE + FUN FAKE_OVERRIDE name:equals visibility:public modality:FINAL <> ($this:kotlin.Enum<.EE>, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] + overridden: + public final fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Enum + $this: VALUE_PARAMETER name: type:kotlin.Enum<.EE> + VALUE_PARAMETER name:other index:0 type:kotlin.Any? + FUN FAKE_OVERRIDE name:finalize visibility:protected/*protected and package*/ modality:FINAL <> ($this:kotlin.Enum<.EE>) returnType:kotlin.Unit [fake_override] + overridden: + protected/*protected and package*/ final fun finalize (): kotlin.Unit declared in kotlin.Enum + $this: VALUE_PARAMETER name: type:kotlin.Enum<.EE> + FUN FAKE_OVERRIDE name:getDeclaringClass visibility:public modality:FINAL <> ($this:kotlin.Enum<.EE>) returnType:@[FlexibleNullability] java.lang.Class<@[FlexibleNullability] .EE?>? [fake_override] + overridden: + public final fun getDeclaringClass (): @[FlexibleNullability] java.lang.Class<@[FlexibleNullability] E of kotlin.Enum?>? declared in kotlin.Enum + $this: VALUE_PARAMETER name: type:kotlin.Enum<.EE> + FUN FAKE_OVERRIDE name:hashCode visibility:public modality:FINAL <> ($this:kotlin.Enum<.EE>) returnType:kotlin.Int [fake_override] + overridden: + public final fun hashCode (): kotlin.Int declared in kotlin.Enum + $this: VALUE_PARAMETER name: type:kotlin.Enum<.EE> + FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Enum<.EE>) returnType:kotlin.String [fake_override] + overridden: + public open fun toString (): kotlin.String declared in kotlin.Enum + $this: VALUE_PARAMETER name: type:kotlin.Enum<.EE> + FUN ENUM_CLASS_SPECIAL_MEMBER name:values visibility:public modality:FINAL <> () returnType:kotlin.Array<.EE> + SYNTHETIC_BODY kind=ENUM_VALUES + FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:.EE + VALUE_PARAMETER name:value index:0 type:kotlin.String + SYNTHETIC_BODY kind=ENUM_VALUEOF diff --git a/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.kt b/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.kt new file mode 100644 index 00000000000..84cac19ce8d --- /dev/null +++ b/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.kt @@ -0,0 +1,5 @@ +// WITH_STDLIB + +enum class EE(val myName: String = this.toString().lowercase()) { + ENTRY; +} diff --git a/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.kt.txt b/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.kt.txt new file mode 100644 index 00000000000..e69f0dad3d1 --- /dev/null +++ b/compiler/testData/ir/irText/firProblems/thisInEnumConstructor.kt.txt @@ -0,0 +1,18 @@ +enum class EE : Enum { + private constructor(myName: String = Companion.toString().lowercase()) /* primary */ { + super/*Enum*/() + /* () */ + + } + + val myName: String + field = myName + get + + ENTRY = EE() + + fun values(): Array /* Synthetic body for ENUM_VALUES */ + + fun valueOf(value: String): EE /* Synthetic body for ENUM_VALUEOF */ + +} diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/IrTextTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/IrTextTestGenerated.java index 0554f9d0a20..4c529f4e03c 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/IrTextTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/IrTextTestGenerated.java @@ -2750,6 +2750,12 @@ public class IrTextTestGenerated extends AbstractIrTextTest { runTest("compiler/testData/ir/irText/firProblems/SyntheticSetterType.kt"); } + @Test + @TestMetadata("thisInEnumConstructor.kt") + public void testThisInEnumConstructor() throws Exception { + runTest("compiler/testData/ir/irText/firProblems/thisInEnumConstructor.kt"); + } + @Test @TestMetadata("throwableStackTrace.kt") public void testThrowableStackTrace() throws Exception { diff --git a/compiler/tests-gen/org/jetbrains/kotlin/klib/KlibTextTestCaseGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/klib/KlibTextTestCaseGenerated.java index 89eed1fbfae..2a91ee97466 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/klib/KlibTextTestCaseGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/klib/KlibTextTestCaseGenerated.java @@ -1990,6 +1990,11 @@ public class KlibTextTestCaseGenerated extends AbstractKlibTextTestCase { runTest("compiler/testData/ir/irText/firProblems/SimpleTypeMarker.kt"); } + @TestMetadata("thisInEnumConstructor.kt") + public void testThisInEnumConstructor() throws Exception { + runTest("compiler/testData/ir/irText/firProblems/thisInEnumConstructor.kt"); + } + @TestMetadata("TypeParameterBounds.kt") public void testTypeParameterBounds() throws Exception { runTest("compiler/testData/ir/irText/firProblems/TypeParameterBounds.kt");