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

IR: fix origin of default getter of Enum.entries synthetic property

Browse Source
This commit is contained in:
Mikhail Glukhikh
2022-08-16 12:05:08 +02:00
committed by Space
parent 28c83e43ad
commit 8a4105e542
9 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
+3 -2
View File
@@ -854,8 +854,8 @@ class Fir2IrDeclarationStorage(
containingClass: ConeClassLikeLookupTag? = (irParent as? IrClass)?.classId?.let { ConeClassLikeLookupTagImpl(it) },
forceTopLevelPrivate: Boolean = false,
): IrProperty = convertCatching(property) {
val origin = if (property.isStatic && property.name in ENUM_SYNTHETIC_NAMES)
IrDeclarationOrigin.ENUM_CLASS_SPECIAL_MEMBER
val origin =
if (property.isStatic && property.name in ENUM_SYNTHETIC_NAMES) IrDeclarationOrigin.ENUM_CLASS_SPECIAL_MEMBER
else property.computeIrOrigin(predefinedOrigin)
// See similar comments in createIrFunction above
val signature =
@@ -934,6 +934,7 @@ class Fir2IrDeclarationStorage(
getter, property, this, type, irParent, thisReceiverOwner, false,
when {
origin == IrDeclarationOrigin.IR_EXTERNAL_DECLARATION_STUB -> origin
origin == IrDeclarationOrigin.ENUM_CLASS_SPECIAL_MEMBER -> origin
delegate != null -> IrDeclarationOrigin.DELEGATED_PROPERTY_ACCESSOR
getter is FirDefaultPropertyGetter -> IrDeclarationOrigin.DEFAULT_PROPERTY_ACCESSOR
else -> origin
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/ClassMemberGenerator.kt
+2 -1
View File
@@ -170,7 +170,8 @@ internal class ClassMemberGenerator(
when {
// Create fake bodies for Enum.values/Enum.valueOf
irFunction.origin == IrDeclarationOrigin.ENUM_CLASS_SPECIAL_MEMBER -> {
val kind = Fir2IrDeclarationStorage.ENUM_SYNTHETIC_NAMES.getValue(irFunction.name)
val name = (irFunction as? IrSimpleFunction)?.correspondingPropertySymbol?.owner?.name ?: irFunction.name
val kind = Fir2IrDeclarationStorage.ENUM_SYNTHETIC_NAMES.getValue(name)
irFunction.body = IrSyntheticBodyImpl(startOffset, endOffset, kind)
}
irFunction.parent is IrClass && irFunction.parentAsClass.isData -> {
compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/EnumClassMembersGenerator.kt
+1 -1
View File
@@ -94,7 +94,7 @@ class EnumClassMembersGenerator(declarationGenerator: DeclarationGenerator) : De
).also { irProperty ->
irProperty.getter = context.symbolTable.declareSimpleFunctionWithOverrides(
SYNTHETIC_OFFSET, SYNTHETIC_OFFSET,
IrDeclarationOrigin.DEFAULT_PROPERTY_ACCESSOR,
IrDeclarationOrigin.ENUM_CLASS_SPECIAL_MEMBER,
entriesProperty.getter!!
).also { getter ->
getter.correspondingPropertySymbol = irProperty.symbol
compiler/testData/codegen/bytecodeListing/enumEntries.txt
Vendored
+4 -4
View File
@@ -16,7 +16,7 @@ public final enum class SimpleEnum {
private synthetic final static method $values(): SimpleEnum[]
static method <clinit>(): void
private method <init>(p0: java.lang.String, p1: int): void
public final static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries
public static method getEntries(): kotlin.enums.EnumEntries
public static method valueOf(p0: java.lang.String): SimpleEnum
public static method values(): SimpleEnum[]
}
@@ -32,7 +32,7 @@ public final enum class WithAnnotations {
private synthetic final static method $values(): WithAnnotations[]
static method <clinit>(): void
private method <init>(p0: java.lang.String, p1: int): void
public final static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries
public static method getEntries(): kotlin.enums.EnumEntries
public static method valueOf(p0: java.lang.String): WithAnnotations
public static method values(): WithAnnotations[]
}
@@ -50,7 +50,7 @@ public final enum class WithConstructor {
private synthetic final static method $values(): WithConstructor[]
static method <clinit>(): void
private method <init>(p0: java.lang.String, p1: int, p2: java.lang.String): void
public final static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries
public static method getEntries(): kotlin.enums.EnumEntries
public final @org.jetbrains.annotations.NotNull method getX(): java.lang.String
public static method valueOf(p0: java.lang.String): WithConstructor
public static method values(): WithConstructor[]
@@ -77,7 +77,7 @@ public abstract enum class WithEntryClass {
private method <init>(p0: java.lang.String, p1: int): void
public synthetic method <init>(p0: java.lang.String, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void
public abstract method foo(): void
public final static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries
public static method getEntries(): kotlin.enums.EnumEntries
public static method valueOf(p0: java.lang.String): WithEntryClass
public static method values(): WithEntryClass[]
}
compiler/testData/codegen/bytecodeText/enum/enumEntries.kt
Vendored
+1 -1
View File
@@ -8,6 +8,6 @@ enum class MyEnum {
// 1 INVOKEDYNAMIC
// 1 kotlin.enums.EnumEntries<MyEnum> getEntries\(\)
// 1 private final static synthetic Lkotlin/enums/EnumEntries; \$ENTRIES
// 1 public final static getEntries\(\)Lkotlin/enums/EnumEntries;
// 1 public static getEntries\(\)Lkotlin/enums/EnumEntries;
// 0 [^\$]entries
// 0 class [a-zA-Z]+\$EntriesMappings
compiler/testData/ir/irText/classes/enumEntries.fir.ir.txt
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ FILE fqName:<root> fileName:/enumEntries.kt
VALUE_PARAMETER name:value index:0 type:kotlin.String
SYNTHETIC_BODY kind=ENUM_VALUEOF
PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.MyEnum>
FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.MyEnum>
correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
SYNTHETIC_BODY kind=ENUM_ENTRIES
FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum<E of kotlin.Enum>) returnType:kotlin.Any [fake_override]
compiler/testData/ir/irText/classes/enumEntries.fir.kt.txt
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ enum class MyEnum : Enum<MyEnum> {
fun valueOf(value: String): MyEnum /* Synthetic body for ENUM_VALUEOF */
val entries: EnumEntries<MyEnum>
get
get(): EnumEntries<MyEnum> /* Synthetic body for ENUM_ENTRIES */
}
compiler/testData/ir/irText/classes/enumEntries.ir.txt
Vendored
+1 -1
View File
@@ -66,7 +66,7 @@ FILE fqName:<root> fileName:/enumEntries.kt
VALUE_PARAMETER name:value index:0 type:kotlin.String
SYNTHETIC_BODY kind=ENUM_VALUEOF
PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.MyEnum>
FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.MyEnum>
correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
SYNTHETIC_BODY kind=ENUM_ENTRIES
FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.MyEnum>
compiler/testData/ir/irText/classes/enumEntries.kt.txt
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ enum class MyEnum : Enum<MyEnum> {
fun valueOf(value: String): MyEnum /* Synthetic body for ENUM_VALUEOF */
val entries: EnumEntries<MyEnum>
get
get(): EnumEntries<MyEnum> /* Synthetic body for ENUM_ENTRIES */
}