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

JVM IR: initialize enum entries without invokedynamic

Browse Source 
#KT-57316 Fixed
This commit is contained in:
Alexander Udalov
2023-03-21 01:13:41 +01:00
committed by Space Team
parent 9c2c11f7e9
commit 562b27db4e
21 changed files with 31 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/asmLike/typeAnnotations/enumClassConstructor.asm.ir.txt
Vendored
-2
View File
@@ -13,8 +13,6 @@ public class foo/Kotlin : java/lang/Enum {
public final static foo.Kotlin A
private final static foo.Kotlin[] $entries()
private final static foo.Kotlin[] $values()
static void <clinit>()
compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndImportFromObject.ir.txt
Vendored
-1
View File
@@ -11,7 +11,6 @@ public final enum class E {
private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries
private synthetic final static field $VALUES: E[]
public final enum static field X: E
private synthetic final static method $entries(): E[]
private synthetic final static method $values(): E[]
static method <clinit>(): void
private method <init>(p0: java.lang.String, p1: int): void
compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndLocalDelegatedProperty.ir.txt
Vendored
-1
View File
@@ -11,7 +11,6 @@ public final enum class E {
private synthetic final static field $ENTRIES: kotlin.enums.EnumEntries
private synthetic final static field $VALUES: E[]
public final enum static field X: E
private synthetic final static method $entries(): E[]
private synthetic final static method $values(): E[]
static method <clinit>(): void
private method <init>(p0: java.lang.String, p1: int): void
compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/delegateToEnum.ir.txt
Vendored
-1
View File
@@ -16,7 +16,6 @@ public final enum class E {
private synthetic final static field $VALUES: E[]
public final enum static field NOT_OK: E
public final enum static field OK: E
private synthetic final static method $entries(): E[]
private synthetic final static method $values(): E[]
static method <clinit>(): void
private method <init>(p0: java.lang.String, p1: int): void
compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/delegateToEnumInAClass.ir.txt
Vendored
-1
View File
@@ -25,7 +25,6 @@ public final enum class E {
private synthetic final static field $VALUES: E[]
public final enum static field NOT_OK: E
public final enum static field OK: E
private synthetic final static method $entries(): E[]
private synthetic final static method $values(): E[]
static method <clinit>(): void
private method <init>(p0: java.lang.String, p1: int): void
compiler/testData/codegen/box/delegatedProperty/delegateToSingleton/withSideEffectsToEnum.ir.txt
Vendored
-1
View File
@@ -13,7 +13,6 @@ public final enum class E {
private synthetic final static field $VALUES: E[]
public final static @org.jetbrains.annotations.NotNull field Companion: E$Companion
public final enum static field X: E
private synthetic final static method $entries(): E[]
private synthetic final static method $values(): E[]
static method <clinit>(): void
private method <init>(p0: java.lang.String, p1: int): void
compiler/testData/codegen/box/invokedynamic/sam/functionRefToJavaInterface/specialFunctions/enumValueOf.kt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@
// CHECK_BYTECODE_TEXT
// JVM_IR_TEMPLATES
// 2 java/lang/invoke/LambdaMetafactory
// 1 java/lang/invoke/LambdaMetafactory
// FILE: enumValues.kt
enum class ABC(val x: String = "") {
compiler/testData/codegen/box/invokedynamic/sam/functionRefToJavaInterface/specialFunctions/enumValues.kt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@
// CHECK_BYTECODE_TEXT
// JVM_IR_TEMPLATES
// 2 java/lang/invoke/LambdaMetafactory
// 1 java/lang/invoke/LambdaMetafactory
// FILE: enumValues.kt
enum class ABC(val x: String = "") {
compiler/testData/codegen/bytecodeListing/deprecated/deprecatedEnumEntryFields.ir.txt
Vendored
-1
View File
@@ -6,7 +6,6 @@ public final enum class Test {
public deprecated final enum static @kotlin.Deprecated(message="") field ENTRY1: Test
public final enum static field ENTRY2: Test
public deprecated final enum static @kotlin.Deprecated(message="") field ENTRY3: Test
private synthetic final static method $entries(): Test[]
private synthetic final static method $values(): Test[]
static method <clinit>(): void
private method <init>(p0: java.lang.String, p1: int): void
compiler/testData/codegen/bytecodeListing/enum.ir.txt
Vendored
-4
View File
@@ -12,7 +12,6 @@ public final enum class SimpleEnum {
public final enum static field A: SimpleEnum
public final enum static field B: SimpleEnum
public final enum static field C: SimpleEnum
private synthetic final static method $entries(): SimpleEnum[]
private synthetic final static method $values(): SimpleEnum[]
static method <clinit>(): void
private method <init>(p0: java.lang.String, p1: int): void
@@ -28,7 +27,6 @@ public final enum class WithAnnotations {
private synthetic final static field $VALUES: WithAnnotations[]
public final enum static @Ann field A: WithAnnotations
public final enum static @Ann field B: WithAnnotations
private synthetic final static method $entries(): WithAnnotations[]
private synthetic final static method $values(): WithAnnotations[]
static method <clinit>(): void
private method <init>(p0: java.lang.String, p1: int): void
@@ -46,7 +44,6 @@ public final enum class WithConstructor {
public final enum static field B: WithConstructor
public final enum static field C: WithConstructor
private final @org.jetbrains.annotations.NotNull field x: java.lang.String
private synthetic final static method $entries(): 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
@@ -71,7 +68,6 @@ public abstract enum class WithEntryClass {
private synthetic final static field $VALUES: WithEntryClass[]
public final enum static field A: WithEntryClass
final inner class WithEntryClass$A
private synthetic final static method $entries(): WithEntryClass[]
private synthetic final static method $values(): WithEntryClass[]
static method <clinit>(): void
private method <init>(p0: java.lang.String, p1: int): void
compiler/testData/codegen/bytecodeListing/enumEntries.txt
Vendored
-4
View File
@@ -12,7 +12,6 @@ public final enum class SimpleEnum {
public final enum static field A: SimpleEnum
public final enum static field B: SimpleEnum
public final enum static field C: SimpleEnum
private synthetic final static method $entries(): SimpleEnum[]
private synthetic final static method $values(): SimpleEnum[]
static method <clinit>(): void
private method <init>(p0: java.lang.String, p1: int): void
@@ -28,7 +27,6 @@ public final enum class WithAnnotations {
private synthetic final static field $VALUES: WithAnnotations[]
public final enum static @Ann field A: WithAnnotations
public final enum static @Ann field B: WithAnnotations
private synthetic final static method $entries(): WithAnnotations[]
private synthetic final static method $values(): WithAnnotations[]
static method <clinit>(): void
private method <init>(p0: java.lang.String, p1: int): void
@@ -46,7 +44,6 @@ public final enum class WithConstructor {
public final enum static field B: WithConstructor
public final enum static field C: WithConstructor
private final @org.jetbrains.annotations.NotNull field x: java.lang.String
private synthetic final static method $entries(): 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
@@ -71,7 +68,6 @@ public abstract enum class WithEntryClass {
private synthetic final static field $VALUES: WithEntryClass[]
public final enum static field A: WithEntryClass
final inner class WithEntryClass$A
private synthetic final static method $entries(): WithEntryClass[]
private synthetic final static method $values(): WithEntryClass[]
static method <clinit>(): void
private method <init>(p0: java.lang.String, p1: int): void
compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.ir.txt
Vendored
-1
View File
@@ -34,7 +34,6 @@ public final enum class TestEnum {
private synthetic final static field $VALUES: TestEnum[]
public final enum static field ANSWER: TestEnum
private final field z: int
private synthetic final static method $entries(): TestEnum[]
private synthetic final static method $values(): TestEnum[]
static method <clinit>(): void
private method <init>(p0: java.lang.String, p1: int, p2: int): void
compiler/testData/codegen/bytecodeListing/kt55769.ir.txt
Vendored
-1
View File
@@ -13,7 +13,6 @@ public final enum class A$B$C {
public static method valueOf(p0: java.lang.String): A$B$C
public static @org.jetbrains.annotations.NotNull method getEntries(): kotlin.enums.EnumEntries
private synthetic final static method $values(): A$B$C[]
private synthetic final static method $entries(): A$B$C[]
static method <clinit>(): void
}
compiler/testData/codegen/bytecodeText/enum/enumCheckcasts.kt
Vendored
+5
View File
@@ -3,5 +3,10 @@ enum class Foo {
open fun result() = "Fail"
}
// JVM_TEMPLATES
// There are two CHECKCASTs, one in Foo.valueOf and one in Foo.values
// 2 CHECKCAST
// JVM_IR_TEMPLATES
// For JVM IR, there's an additional checkcast of `$ENTRIES` to `[Ljava/lang/Enum;` in the static initializer.
// 3 CHECKCAST
compiler/testData/codegen/bytecodeText/enum/enumEntries.kt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ enum class MyEnum {
E
}
// 1 INVOKEDYNAMIC
// 0 INVOKEDYNAMIC
// 1 kotlin.enums.EnumEntries<MyEnum> getEntries\(\)
// 1 private final static synthetic Lkotlin/enums/EnumEntries; \$ENTRIES
// 1 public static getEntries\(\)Lkotlin/enums/EnumEntries;