diff --git a/compiler/testData/builtin-classes/java6/kotlin.txt b/compiler/testData/builtin-classes/java6/kotlin.txt
index 881737ee81e..deeabb0849e 100644
--- a/compiler/testData/builtin-classes/java6/kotlin.txt
+++ b/compiler/testData/builtin-classes/java6/kotlin.txt
@@ -252,6 +252,8 @@ public final enum class DeprecationLevel : kotlin.Enum<kotlin.DeprecationLevel>
     public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<kotlin.DeprecationLevel!>!
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<kotlin.DeprecationLevel>
+        public final /*synthesized*/ fun `<get-entries>`(): kotlin.enums.EnumEntries<kotlin.DeprecationLevel>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kotlin.DeprecationLevel
     public final /*synthesized*/ fun values(): kotlin.Array<kotlin.DeprecationLevel>
 }
@@ -691,6 +693,8 @@ public abstract class Number : kotlin.Any, java.io.Serializable {
         public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<kotlin.RequiresOptIn.Level!>!
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<kotlin.RequiresOptIn.Level>
+            public final /*synthesized*/ fun `<get-entries>`(): kotlin.enums.EnumEntries<kotlin.RequiresOptIn.Level>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kotlin.RequiresOptIn.Level
         public final /*synthesized*/ fun values(): kotlin.Array<kotlin.RequiresOptIn.Level>
     }
diff --git a/compiler/testData/builtin-classes/java8/kotlin.txt b/compiler/testData/builtin-classes/java8/kotlin.txt
index 36e4ce2b477..4f75c888b5d 100644
--- a/compiler/testData/builtin-classes/java8/kotlin.txt
+++ b/compiler/testData/builtin-classes/java8/kotlin.txt
@@ -254,6 +254,8 @@ public final enum class DeprecationLevel : kotlin.Enum<kotlin.DeprecationLevel>
     public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<kotlin.DeprecationLevel!>!
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<kotlin.DeprecationLevel>
+        public final /*synthesized*/ fun `<get-entries>`(): kotlin.enums.EnumEntries<kotlin.DeprecationLevel>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kotlin.DeprecationLevel
     public final /*synthesized*/ fun values(): kotlin.Array<kotlin.DeprecationLevel>
 }
@@ -693,6 +695,8 @@ public abstract class Number : kotlin.Any, java.io.Serializable {
         public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<kotlin.RequiresOptIn.Level!>!
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<kotlin.RequiresOptIn.Level>
+            public final /*synthesized*/ fun `<get-entries>`(): kotlin.enums.EnumEntries<kotlin.RequiresOptIn.Level>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kotlin.RequiresOptIn.Level
         public final /*synthesized*/ fun values(): kotlin.Array<kotlin.RequiresOptIn.Level>
     }
diff --git a/compiler/testData/builtin-classes/newMethods/kotlin.txt b/compiler/testData/builtin-classes/newMethods/kotlin.txt
index 02dfe9635ec..7afea2912d8 100644
--- a/compiler/testData/builtin-classes/newMethods/kotlin.txt
+++ b/compiler/testData/builtin-classes/newMethods/kotlin.txt
@@ -252,6 +252,8 @@ public final enum class DeprecationLevel : kotlin.Enum<kotlin.DeprecationLevel>
     public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<kotlin.DeprecationLevel!>!
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<kotlin.DeprecationLevel>
+        public final /*synthesized*/ fun `<get-entries>`(): kotlin.enums.EnumEntries<kotlin.DeprecationLevel>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kotlin.DeprecationLevel
     public final /*synthesized*/ fun values(): kotlin.Array<kotlin.DeprecationLevel>
 }
@@ -691,6 +693,8 @@ public abstract class Number : kotlin.Any, java.io.Serializable {
         public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<kotlin.RequiresOptIn.Level!>!
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<kotlin.RequiresOptIn.Level>
+            public final /*synthesized*/ fun `<get-entries>`(): kotlin.enums.EnumEntries<kotlin.RequiresOptIn.Level>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kotlin.RequiresOptIn.Level
         public final /*synthesized*/ fun values(): kotlin.Array<kotlin.RequiresOptIn.Level>
     }
diff --git a/compiler/testData/codegen/asmLike/typeAnnotations/enumClassConstructor.kt b/compiler/testData/codegen/asmLike/typeAnnotations/enumClassConstructor.kt
index b9d22ab43ca..0eb1aaa408b 100644
--- a/compiler/testData/codegen/asmLike/typeAnnotations/enumClassConstructor.kt
+++ b/compiler/testData/codegen/asmLike/typeAnnotations/enumClassConstructor.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // IR_DIFFERENCE
 // EMIT_JVM_TYPE_ANNOTATIONS
 // RENDER_ANNOTATIONS
diff --git a/compiler/testData/codegen/box/annotations/annotationOnWhen.kt b/compiler/testData/codegen/box/annotations/annotationOnWhen.kt
index 00847779653..2acd8d99853 100644
--- a/compiler/testData/codegen/box/annotations/annotationOnWhen.kt
+++ b/compiler/testData/codegen/box/annotations/annotationOnWhen.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // TARGET_BACKEND: JVM
 
 enum class SomeEnum {
diff --git a/compiler/testData/codegen/box/annotations/nestedClassesInAnnotations.kt b/compiler/testData/codegen/box/annotations/nestedClassesInAnnotations.kt
index 53ac5fead09..25c4b4546af 100644
--- a/compiler/testData/codegen/box/annotations/nestedClassesInAnnotations.kt
+++ b/compiler/testData/codegen/box/annotations/nestedClassesInAnnotations.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // !LANGUAGE: +NestedClassesInAnnotations
 
 annotation class Foo(val kind: Kind) {
diff --git a/compiler/testData/codegen/box/bridges/simpleEnum.kt b/compiler/testData/codegen/box/bridges/simpleEnum.kt
index 4d809ea7c10..0446aba8c33 100644
--- a/compiler/testData/codegen/box/bridges/simpleEnum.kt
+++ b/compiler/testData/codegen/box/bridges/simpleEnum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 interface A<T> {
     open fun foo(t: T) = "A"
 }
diff --git a/compiler/testData/codegen/box/bridges/substitutionInSuperClass/enum.kt b/compiler/testData/codegen/box/bridges/substitutionInSuperClass/enum.kt
index 685998480b9..243498038e6 100644
--- a/compiler/testData/codegen/box/bridges/substitutionInSuperClass/enum.kt
+++ b/compiler/testData/codegen/box/bridges/substitutionInSuperClass/enum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 interface A<T> {
     open fun foo(t: T) = "A"
 }
diff --git a/compiler/testData/codegen/box/callableReference/bound/enumEntryMember.kt b/compiler/testData/codegen/box/callableReference/bound/enumEntryMember.kt
index b00ac9c2c29..e5f9ff6f262 100644
--- a/compiler/testData/codegen/box/callableReference/bound/enumEntryMember.kt
+++ b/compiler/testData/codegen/box/callableReference/bound/enumEntryMember.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // IGNORE_BACKEND: WASM
 // WASM_MUTE_REASON: FUNCTION_REFERENCES
 // IGNORE_BACKEND: JS, JS_IR
diff --git a/compiler/testData/codegen/box/callableReference/function/enumValueOfMethod.kt b/compiler/testData/codegen/box/callableReference/function/enumValueOfMethod.kt
index ef33b51f0ba..21a53adfff3 100644
--- a/compiler/testData/codegen/box/callableReference/function/enumValueOfMethod.kt
+++ b/compiler/testData/codegen/box/callableReference/function/enumValueOfMethod.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class E {
     ENTRY
 }
diff --git a/compiler/testData/codegen/box/callableReference/function/local/enumExtendsTrait.kt b/compiler/testData/codegen/box/callableReference/function/local/enumExtendsTrait.kt
index 4ca0e53bd80..5ae74283aee 100644
--- a/compiler/testData/codegen/box/callableReference/function/local/enumExtendsTrait.kt
+++ b/compiler/testData/codegen/box/callableReference/function/local/enumExtendsTrait.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 interface Named {
     val name: String
 }
diff --git a/compiler/testData/codegen/box/callableReference/property/enumNameOrdinal.kt b/compiler/testData/codegen/box/callableReference/property/enumNameOrdinal.kt
index 0432dcb6f8c..10ccfbdee1e 100644
--- a/compiler/testData/codegen/box/callableReference/property/enumNameOrdinal.kt
+++ b/compiler/testData/codegen/box/callableReference/property/enumNameOrdinal.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class E {
     I
 }
diff --git a/compiler/testData/codegen/box/callableReference/property/inEnum.kt b/compiler/testData/codegen/box/callableReference/property/inEnum.kt
index 3d7c7b81ecc..87ccf327b55 100644
--- a/compiler/testData/codegen/box/callableReference/property/inEnum.kt
+++ b/compiler/testData/codegen/box/callableReference/property/inEnum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 import kotlin.reflect.KProperty1
 
 class Q {
diff --git a/compiler/testData/codegen/box/classes/kt2626.kt b/compiler/testData/codegen/box/classes/kt2626.kt
index 4407a1de86f..34ba1d2ad8d 100644
--- a/compiler/testData/codegen/box/classes/kt2626.kt
+++ b/compiler/testData/codegen/box/classes/kt2626.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 package example2
 
 fun box() = Context.OsType.OK.toString()
diff --git a/compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerEnumEntryCapturedInLambdaInInnerClass.kt b/compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerEnumEntryCapturedInLambdaInInnerClass.kt
index 5dbca0353d0..1efe120d20a 100644
--- a/compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerEnumEntryCapturedInLambdaInInnerClass.kt
+++ b/compiler/testData/codegen/box/closures/captureInSuperConstructorCall/outerEnumEntryCapturedInLambdaInInnerClass.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 abstract class Base(val fn: () -> Test)
 
 enum class Test(val ok: String) {
diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/companionObjectInEnum.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/companionObjectInEnum.kt
index db5ca7d3f92..2ac79105a2e 100644
--- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/companionObjectInEnum.kt
+++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/companionObjectInEnum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // MODULE: lib
 // FILE: A.kt
 
diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/enum.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/enum.kt
index 6ae27ab5412..9eb2f9c1842 100644
--- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/enum.kt
+++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/enum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // MODULE: lib
 // FILE: A.kt
 
diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/nestedClassInAnnotationArgument.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/nestedClassInAnnotationArgument.kt
index 83abac13ad7..29b87a9af70 100644
--- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/nestedClassInAnnotationArgument.kt
+++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/nestedClassInAnnotationArgument.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // MODULE: lib
 // FILE: 1.kt
 
diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/nestedEnum.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/nestedEnum.kt
index 1e971cf1039..e5ef9e1f522 100644
--- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/nestedEnum.kt
+++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/nestedEnum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // MODULE: lib
 // FILE: A.kt
 
diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/starImportEnum.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/starImportEnum.kt
index 989dc3e411d..31e939b7f0a 100644
--- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/starImportEnum.kt
+++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/starImportEnum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // MODULE: lib
 // FILE: A.kt
 
diff --git a/compiler/testData/codegen/box/defaultArguments/constructor/enum.kt b/compiler/testData/codegen/box/defaultArguments/constructor/enum.kt
index e8bf90312bc..edc9e061d4c 100644
--- a/compiler/testData/codegen/box/defaultArguments/constructor/enum.kt
+++ b/compiler/testData/codegen/box/defaultArguments/constructor/enum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class A(val a: Int = 1) {
   FIRST(),
   SECOND(2)
diff --git a/compiler/testData/codegen/box/defaultArguments/constructor/enumWithOneDefArg.kt b/compiler/testData/codegen/box/defaultArguments/constructor/enumWithOneDefArg.kt
index 64dbf69e198..339ab868c0d 100644
--- a/compiler/testData/codegen/box/defaultArguments/constructor/enumWithOneDefArg.kt
+++ b/compiler/testData/codegen/box/defaultArguments/constructor/enumWithOneDefArg.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class Foo(val a: Int = 1, val b: String) {
   B(2, "b"),
   C(b = "b")
diff --git a/compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDefArgs.kt b/compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDefArgs.kt
index 1e86fa00211..7a7d6db0814 100644
--- a/compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDefArgs.kt
+++ b/compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDefArgs.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class Foo(val a: Int = 1, val b: String = "a") {
   A(),
   B(2, "b"),
diff --git a/compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDoubleDefArgs.kt b/compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDoubleDefArgs.kt
index d7af534e531..e461fd6a32e 100644
--- a/compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDoubleDefArgs.kt
+++ b/compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDoubleDefArgs.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class Foo(val a: Double = 1.0, val b: Double = 1.0) {
     A(),
     B(2.0, 2.0),
diff --git a/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndImportFromObject.kt b/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndImportFromObject.kt
index 9354c586b3c..28cb40cfe03 100644
--- a/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndImportFromObject.kt
+++ b/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndImportFromObject.kt
@@ -1,5 +1,4 @@
 // CHECK_BYTECODE_LISTING
-// WITH_STDLIB
 
 import O.d
 
diff --git a/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndLocalDelegatedProperty.kt b/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndLocalDelegatedProperty.kt
index 8c3451b1784..da75dca67f1 100644
--- a/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndLocalDelegatedProperty.kt
+++ b/compiler/testData/codegen/box/delegatedProperty/delegateToFinalProperty/memberExtensionPropertyAndLocalDelegatedProperty.kt
@@ -1,5 +1,4 @@
 // CHECK_BYTECODE_LISTING
-// WITH_STDLIB
 
 enum class E { X }
 
diff --git a/compiler/testData/codegen/box/delegatedProperty/delegatedPropertyInEnum.kt b/compiler/testData/codegen/box/delegatedProperty/delegatedPropertyInEnum.kt
index 8addc603e62..6b5e34adeb9 100644
--- a/compiler/testData/codegen/box/delegatedProperty/delegatedPropertyInEnum.kt
+++ b/compiler/testData/codegen/box/delegatedProperty/delegatedPropertyInEnum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // IGNORE_BACKEND: JVM
 // IGNORE_LIGHT_ANALYSIS
 
diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.kt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.kt
index 2eafc419f86..6491d8e0cc9 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class A {
     ONE,
     TWO;
diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.kt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.kt
index ce1d0c91e14..95eb4b9c827 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class A {
     ONE,
     TWO
diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.kt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.kt
index 6613e03b822..d627dad85a8 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 import A.ONE
 
 enum class A {
diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.kt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.kt
index 892c9ba2de7..53ecfc65908 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.kt
+++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 import A.ONE
 
 enum class A {
diff --git a/compiler/testData/codegen/box/enum/abstractMethodInEnum.kt b/compiler/testData/codegen/box/enum/abstractMethodInEnum.kt
index 1986e96b7da..0d3ed6de674 100644
--- a/compiler/testData/codegen/box/enum/abstractMethodInEnum.kt
+++ b/compiler/testData/codegen/box/enum/abstractMethodInEnum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class A() {
     ENTRY(){ override fun t() = "OK"};
 
diff --git a/compiler/testData/codegen/box/enum/abstractNestedClass.kt b/compiler/testData/codegen/box/enum/abstractNestedClass.kt
index ceb2d051cbc..3994bd54e17 100644
--- a/compiler/testData/codegen/box/enum/abstractNestedClass.kt
+++ b/compiler/testData/codegen/box/enum/abstractNestedClass.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class E {
     ENTRY;
 
diff --git a/compiler/testData/codegen/box/enum/annotatedParameter.kt b/compiler/testData/codegen/box/enum/annotatedParameter.kt
index f36137d319b..1bff61e2593 100644
--- a/compiler/testData/codegen/box/enum/annotatedParameter.kt
+++ b/compiler/testData/codegen/box/enum/annotatedParameter.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // TARGET_BACKEND: JVM
 // FILE: Foo.java
 
diff --git a/compiler/testData/codegen/box/enum/annotatedParameter2.kt b/compiler/testData/codegen/box/enum/annotatedParameter2.kt
index 17bb45e442e..4d49865ade5 100644
--- a/compiler/testData/codegen/box/enum/annotatedParameter2.kt
+++ b/compiler/testData/codegen/box/enum/annotatedParameter2.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // TARGET_BACKEND: JVM
 // FILE: Foo.java
 
diff --git a/compiler/testData/codegen/box/enum/asReturnExpression.kt b/compiler/testData/codegen/box/enum/asReturnExpression.kt
index 30d0651ce74..c001e02763a 100644
--- a/compiler/testData/codegen/box/enum/asReturnExpression.kt
+++ b/compiler/testData/codegen/box/enum/asReturnExpression.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // http://youtrack.jetbrains.com/issue/KT-2167
 
 enum class Season {
diff --git a/compiler/testData/codegen/box/enum/bigEnum.kt b/compiler/testData/codegen/box/enum/bigEnum.kt
index 183f6289bc2..96202b7a180 100644
--- a/compiler/testData/codegen/box/enum/bigEnum.kt
+++ b/compiler/testData/codegen/box/enum/bigEnum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // TARGET_BACKEND: JVM
 // IGNORE_BACKEND: JVM
 
diff --git a/compiler/testData/codegen/box/enum/companionAccessingEnumValue.kt b/compiler/testData/codegen/box/enum/companionAccessingEnumValue.kt
index 01fd72f676d..ea358a6d4da 100644
--- a/compiler/testData/codegen/box/enum/companionAccessingEnumValue.kt
+++ b/compiler/testData/codegen/box/enum/companionAccessingEnumValue.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 private var logs = ""
 
 enum class Foo(val text: String) {
diff --git a/compiler/testData/codegen/box/enum/companionObjectInEnum.kt b/compiler/testData/codegen/box/enum/companionObjectInEnum.kt
index ab9186f3e02..3e6d423f64e 100644
--- a/compiler/testData/codegen/box/enum/companionObjectInEnum.kt
+++ b/compiler/testData/codegen/box/enum/companionObjectInEnum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class Game {
     ROCK,
     PAPER,
diff --git a/compiler/testData/codegen/box/enum/constructorWithReordering.kt b/compiler/testData/codegen/box/enum/constructorWithReordering.kt
index 28ca40fdcfa..0ff1d169734 100644
--- a/compiler/testData/codegen/box/enum/constructorWithReordering.kt
+++ b/compiler/testData/codegen/box/enum/constructorWithReordering.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // IGNORE_BACKEND: JS
 fun f(): String = "O"
 fun g(): String = "K"
diff --git a/compiler/testData/codegen/box/enum/declaringClassOnEnumObject.kt b/compiler/testData/codegen/box/enum/declaringClassOnEnumObject.kt
index 93a359f1800..14258af4cf7 100644
--- a/compiler/testData/codegen/box/enum/declaringClassOnEnumObject.kt
+++ b/compiler/testData/codegen/box/enum/declaringClassOnEnumObject.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // TARGET_BACKEND: JVM
 // IGNORE_BACKEND_K2: JVM_IR
 // K2 status: declaringClass is error for enums since Kotlin 1.9
diff --git a/compiler/testData/codegen/box/enum/deepInnerClassInEnumEntryClass.kt b/compiler/testData/codegen/box/enum/deepInnerClassInEnumEntryClass.kt
index 02b4db55de0..4c12585119f 100644
--- a/compiler/testData/codegen/box/enum/deepInnerClassInEnumEntryClass.kt
+++ b/compiler/testData/codegen/box/enum/deepInnerClassInEnumEntryClass.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class A {
     X {
         val x = "OK"
diff --git a/compiler/testData/codegen/box/enum/deepInnerClassInEnumEntryClass2.kt b/compiler/testData/codegen/box/enum/deepInnerClassInEnumEntryClass2.kt
index 06106477160..958b0be830f 100644
--- a/compiler/testData/codegen/box/enum/deepInnerClassInEnumEntryClass2.kt
+++ b/compiler/testData/codegen/box/enum/deepInnerClassInEnumEntryClass2.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class A {
     X {
         val k = "K"
diff --git a/compiler/testData/codegen/box/enum/defaultCtor/constructorWithDefaultArguments.kt b/compiler/testData/codegen/box/enum/defaultCtor/constructorWithDefaultArguments.kt
index 0de7485b39d..fcdaf5b62ae 100644
--- a/compiler/testData/codegen/box/enum/defaultCtor/constructorWithDefaultArguments.kt
+++ b/compiler/testData/codegen/box/enum/defaultCtor/constructorWithDefaultArguments.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class Test(val str: String = "OK") {
     OK
 }
diff --git a/compiler/testData/codegen/box/enum/defaultCtor/constructorWithVararg.kt b/compiler/testData/codegen/box/enum/defaultCtor/constructorWithVararg.kt
index 4409051fcd6..f293632dffa 100644
--- a/compiler/testData/codegen/box/enum/defaultCtor/constructorWithVararg.kt
+++ b/compiler/testData/codegen/box/enum/defaultCtor/constructorWithVararg.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class Test(vararg xs: Int) {
     OK;
     val values = xs
diff --git a/compiler/testData/codegen/box/enum/defaultCtor/entryClassConstructorWithDefaultArguments.kt b/compiler/testData/codegen/box/enum/defaultCtor/entryClassConstructorWithDefaultArguments.kt
index 2b163ba842b..dfe8da0b5ca 100644
--- a/compiler/testData/codegen/box/enum/defaultCtor/entryClassConstructorWithDefaultArguments.kt
+++ b/compiler/testData/codegen/box/enum/defaultCtor/entryClassConstructorWithDefaultArguments.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class Test(val str: String = "OK") {
     OK {
         fun foo() {}
diff --git a/compiler/testData/codegen/box/enum/defaultCtor/entryClassConstructorWithVarargs.kt b/compiler/testData/codegen/box/enum/defaultCtor/entryClassConstructorWithVarargs.kt
index e2cde6381c0..b5d7511a0b0 100644
--- a/compiler/testData/codegen/box/enum/defaultCtor/entryClassConstructorWithVarargs.kt
+++ b/compiler/testData/codegen/box/enum/defaultCtor/entryClassConstructorWithVarargs.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // IGNORE_BACKEND: JS
 
 
diff --git a/compiler/testData/codegen/box/enum/defaultCtor/noPrimaryConstructor.kt b/compiler/testData/codegen/box/enum/defaultCtor/noPrimaryConstructor.kt
index 10ab2f47b4b..2426cc0538e 100644
--- a/compiler/testData/codegen/box/enum/defaultCtor/noPrimaryConstructor.kt
+++ b/compiler/testData/codegen/box/enum/defaultCtor/noPrimaryConstructor.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // IGNORE_BACKEND_K2: JS_IR, NATIVE
 
 enum class Test {
diff --git a/compiler/testData/codegen/box/enum/defaultCtor/secondaryConstructorWithDefaultArguments.kt b/compiler/testData/codegen/box/enum/defaultCtor/secondaryConstructorWithDefaultArguments.kt
index 58c06b9d1e2..995cc739d2e 100644
--- a/compiler/testData/codegen/box/enum/defaultCtor/secondaryConstructorWithDefaultArguments.kt
+++ b/compiler/testData/codegen/box/enum/defaultCtor/secondaryConstructorWithDefaultArguments.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // IGNORE_BACKEND_K2: JS_IR, NATIVE
 enum class Test(val x: Int, val str: String) {
     OK;
diff --git a/compiler/testData/codegen/box/enum/defaultCtor/secondaryConstructorWithVararg.kt b/compiler/testData/codegen/box/enum/defaultCtor/secondaryConstructorWithVararg.kt
index 74b92582d85..941c0ec86d9 100644
--- a/compiler/testData/codegen/box/enum/defaultCtor/secondaryConstructorWithVararg.kt
+++ b/compiler/testData/codegen/box/enum/defaultCtor/secondaryConstructorWithVararg.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // IGNORE_BACKEND_K2: JS_IR, NATIVE
 enum class Test(val x: Int, val str: String) {
     OK;
diff --git a/compiler/testData/codegen/box/enum/emptyConstructor.kt b/compiler/testData/codegen/box/enum/emptyConstructor.kt
index 3e82ce88983..9c0040e25c6 100644
--- a/compiler/testData/codegen/box/enum/emptyConstructor.kt
+++ b/compiler/testData/codegen/box/enum/emptyConstructor.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // IGNORE_BACKEND_K2: JS_IR, NATIVE
 package test
 
diff --git a/compiler/testData/codegen/box/enum/emptyEnumValuesValueOf.kt b/compiler/testData/codegen/box/enum/emptyEnumValuesValueOf.kt
index 410c1bfbe56..ca89f7a37d0 100644
--- a/compiler/testData/codegen/box/enum/emptyEnumValuesValueOf.kt
+++ b/compiler/testData/codegen/box/enum/emptyEnumValuesValueOf.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 
 enum class Empty
 
diff --git a/compiler/testData/codegen/box/enum/enumCompanionInit.kt b/compiler/testData/codegen/box/enum/enumCompanionInit.kt
index c6a4c7ff51c..f7d2b29b8b9 100644
--- a/compiler/testData/codegen/box/enum/enumCompanionInit.kt
+++ b/compiler/testData/codegen/box/enum/enumCompanionInit.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // DONT_TARGET_EXACT_BACKEND: JS
 // DONT_TARGET_EXACT_BACKEND: JS_IR
 // DONT_TARGET_EXACT_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/enum/enumConstructorParameterClashWithDefaults.kt b/compiler/testData/codegen/box/enum/enumConstructorParameterClashWithDefaults.kt
index c9d0663552a..d641ed44995 100644
--- a/compiler/testData/codegen/box/enum/enumConstructorParameterClashWithDefaults.kt
+++ b/compiler/testData/codegen/box/enum/enumConstructorParameterClashWithDefaults.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class A(
     name: String,
     ordinal: Int
diff --git a/compiler/testData/codegen/box/enum/enumEntryReferenceFromInnerClassConstructor1.kt b/compiler/testData/codegen/box/enum/enumEntryReferenceFromInnerClassConstructor1.kt
index 86d64a31d6e..135eeffae89 100644
--- a/compiler/testData/codegen/box/enum/enumEntryReferenceFromInnerClassConstructor1.kt
+++ b/compiler/testData/codegen/box/enum/enumEntryReferenceFromInnerClassConstructor1.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 interface IFoo {
     fun foo(): String
 }
diff --git a/compiler/testData/codegen/box/enum/enumEntryReferenceFromInnerClassConstructor2.kt b/compiler/testData/codegen/box/enum/enumEntryReferenceFromInnerClassConstructor2.kt
index 7b46cad2e30..7745c582462 100644
--- a/compiler/testData/codegen/box/enum/enumEntryReferenceFromInnerClassConstructor2.kt
+++ b/compiler/testData/codegen/box/enum/enumEntryReferenceFromInnerClassConstructor2.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 interface IFoo {
     fun foo(): String
 }
diff --git a/compiler/testData/codegen/box/enum/enumEntryReferenceFromInnerClassConstructor3.kt b/compiler/testData/codegen/box/enum/enumEntryReferenceFromInnerClassConstructor3.kt
index f4dc780beec..635103b8b02 100644
--- a/compiler/testData/codegen/box/enum/enumEntryReferenceFromInnerClassConstructor3.kt
+++ b/compiler/testData/codegen/box/enum/enumEntryReferenceFromInnerClassConstructor3.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 interface IFoo {
     fun foo(): String
 }
diff --git a/compiler/testData/codegen/box/enum/enumInheritedFromTrait.kt b/compiler/testData/codegen/box/enum/enumInheritedFromTrait.kt
index b94d47a2c40..8171865caed 100644
--- a/compiler/testData/codegen/box/enum/enumInheritedFromTrait.kt
+++ b/compiler/testData/codegen/box/enum/enumInheritedFromTrait.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 package test
 
 fun box() = MyEnum.E1.f() + MyEnum.E2.f()
diff --git a/compiler/testData/codegen/box/enum/enumShort.kt b/compiler/testData/codegen/box/enum/enumShort.kt
index 2cb5dc439a8..78935006d2b 100644
--- a/compiler/testData/codegen/box/enum/enumShort.kt
+++ b/compiler/testData/codegen/box/enum/enumShort.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class Color(val rgb: Int) {
     RED(0xff0000),
     GREEN(0x00ff00),
diff --git a/compiler/testData/codegen/box/enum/enumValueOf.kt b/compiler/testData/codegen/box/enum/enumValueOf.kt
index c6ee285747f..82beff54335 100644
--- a/compiler/testData/codegen/box/enum/enumValueOf.kt
+++ b/compiler/testData/codegen/box/enum/enumValueOf.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // IGNORE_BACKEND: WASM
 enum class E { OK }
 
diff --git a/compiler/testData/codegen/box/enum/enumWithLambdaParameter.kt b/compiler/testData/codegen/box/enum/enumWithLambdaParameter.kt
index 4a18afa234a..7316dbdd631 100644
--- a/compiler/testData/codegen/box/enum/enumWithLambdaParameter.kt
+++ b/compiler/testData/codegen/box/enum/enumWithLambdaParameter.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // KT-4423 Enum with function not compiled
 // SKIP_MANGLE_VERIFICATION
 
diff --git a/compiler/testData/codegen/box/enum/getEnumEntityByOrdinal.kt b/compiler/testData/codegen/box/enum/getEnumEntityByOrdinal.kt
index dc63a6591b8..db0cbdb3609 100644
--- a/compiler/testData/codegen/box/enum/getEnumEntityByOrdinal.kt
+++ b/compiler/testData/codegen/box/enum/getEnumEntityByOrdinal.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 package foo
 
 enum class X {
diff --git a/compiler/testData/codegen/box/enum/inPackage.kt b/compiler/testData/codegen/box/enum/inPackage.kt
index 7bdac5ef508..388eb0a0dd3 100644
--- a/compiler/testData/codegen/box/enum/inPackage.kt
+++ b/compiler/testData/codegen/box/enum/inPackage.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 package test
 
 enum class Season {
diff --git a/compiler/testData/codegen/box/enum/inclassobj.kt b/compiler/testData/codegen/box/enum/inclassobj.kt
index 269dbe76318..5006013d4b7 100644
--- a/compiler/testData/codegen/box/enum/inclassobj.kt
+++ b/compiler/testData/codegen/box/enum/inclassobj.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 fun box() = if(Context.operatingSystemType == Context.Companion.OsType.OTHER) "OK" else "fail"
 
 public class Context
diff --git a/compiler/testData/codegen/box/enum/initEntriesInCompanionObject.kt b/compiler/testData/codegen/box/enum/initEntriesInCompanionObject.kt
index c902d72a3ba..876963fb292 100644
--- a/compiler/testData/codegen/box/enum/initEntriesInCompanionObject.kt
+++ b/compiler/testData/codegen/box/enum/initEntriesInCompanionObject.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // IGNORE_BACKEND: JS
 
 var l = ""
diff --git a/compiler/testData/codegen/box/enum/initEntriesInCompanionObject2.kt b/compiler/testData/codegen/box/enum/initEntriesInCompanionObject2.kt
index d06b4f8a7be..7a8b0162e65 100644
--- a/compiler/testData/codegen/box/enum/initEntriesInCompanionObject2.kt
+++ b/compiler/testData/codegen/box/enum/initEntriesInCompanionObject2.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // IGNORE_BACKEND: JS
 // IGNORE_BACKEND: WASM
 
diff --git a/compiler/testData/codegen/box/enum/initEntriesInValueOf.kt b/compiler/testData/codegen/box/enum/initEntriesInValueOf.kt
index c902d72a3ba..876963fb292 100644
--- a/compiler/testData/codegen/box/enum/initEntriesInValueOf.kt
+++ b/compiler/testData/codegen/box/enum/initEntriesInValueOf.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // IGNORE_BACKEND: JS
 
 var l = ""
diff --git a/compiler/testData/codegen/box/enum/initEnumAfterObjectAccess.kt b/compiler/testData/codegen/box/enum/initEnumAfterObjectAccess.kt
index d72d1deb3d4..4426245fc4f 100644
--- a/compiler/testData/codegen/box/enum/initEnumAfterObjectAccess.kt
+++ b/compiler/testData/codegen/box/enum/initEnumAfterObjectAccess.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // DONT_TARGET_EXACT_BACKEND: JS
 // DONT_TARGET_EXACT_BACKEND: JS_IR
 // DONT_TARGET_EXACT_BACKEND: JS_IR_ES6
diff --git a/compiler/testData/codegen/box/enum/inner.kt b/compiler/testData/codegen/box/enum/inner.kt
index bf6699effdd..01ef380fbc3 100644
--- a/compiler/testData/codegen/box/enum/inner.kt
+++ b/compiler/testData/codegen/box/enum/inner.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 class A {
     enum class E {
         OK
diff --git a/compiler/testData/codegen/box/enum/innerClassInEnumEntryClass.kt b/compiler/testData/codegen/box/enum/innerClassInEnumEntryClass.kt
index 8871e425dba..154e0a4539f 100644
--- a/compiler/testData/codegen/box/enum/innerClassInEnumEntryClass.kt
+++ b/compiler/testData/codegen/box/enum/innerClassInEnumEntryClass.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class A {
     X {
         val x = "OK"
diff --git a/compiler/testData/codegen/box/enum/innerClassMethodInEnumEntryClass.kt b/compiler/testData/codegen/box/enum/innerClassMethodInEnumEntryClass.kt
index a65b55c6d8b..8e561ccd6d1 100644
--- a/compiler/testData/codegen/box/enum/innerClassMethodInEnumEntryClass.kt
+++ b/compiler/testData/codegen/box/enum/innerClassMethodInEnumEntryClass.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class A {
     X {
         val x = "OK"
diff --git a/compiler/testData/codegen/box/enum/innerClassMethodInEnumEntryClass2.kt b/compiler/testData/codegen/box/enum/innerClassMethodInEnumEntryClass2.kt
index ed67c413279..38a1ffc04f6 100644
--- a/compiler/testData/codegen/box/enum/innerClassMethodInEnumEntryClass2.kt
+++ b/compiler/testData/codegen/box/enum/innerClassMethodInEnumEntryClass2.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class A {
     X {
         val x = "OK"
diff --git a/compiler/testData/codegen/box/enum/innerWithExistingClassObject.kt b/compiler/testData/codegen/box/enum/innerWithExistingClassObject.kt
index e3154efece2..139345cc14a 100644
--- a/compiler/testData/codegen/box/enum/innerWithExistingClassObject.kt
+++ b/compiler/testData/codegen/box/enum/innerWithExistingClassObject.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 class A {
     companion object {}
     enum class E {
diff --git a/compiler/testData/codegen/box/enum/kt1119.kt b/compiler/testData/codegen/box/enum/kt1119.kt
index 0bd2b8e625d..6445197faee 100644
--- a/compiler/testData/codegen/box/enum/kt1119.kt
+++ b/compiler/testData/codegen/box/enum/kt1119.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class Direction() {
     NORTH {
         val someSpecialValue = "OK"
diff --git a/compiler/testData/codegen/box/enum/kt18731.kt b/compiler/testData/codegen/box/enum/kt18731.kt
index 587b2043eed..465457e31bc 100644
--- a/compiler/testData/codegen/box/enum/kt18731.kt
+++ b/compiler/testData/codegen/box/enum/kt18731.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class Bar {
     ONE,
     TWO
diff --git a/compiler/testData/codegen/box/enum/kt18731_2.kt b/compiler/testData/codegen/box/enum/kt18731_2.kt
index 354e9927e51..cbba381aa00 100644
--- a/compiler/testData/codegen/box/enum/kt18731_2.kt
+++ b/compiler/testData/codegen/box/enum/kt18731_2.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // SKIP_DCE_DRIVEN
 
 enum class Bar {
diff --git a/compiler/testData/codegen/box/enum/kt20651.kt b/compiler/testData/codegen/box/enum/kt20651.kt
index 745d9f2cc89..8845e4c6d48 100644
--- a/compiler/testData/codegen/box/enum/kt20651.kt
+++ b/compiler/testData/codegen/box/enum/kt20651.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class Test(val x: String, val closure1: () -> String) {
     FOO("O", { FOO.x }) {
         override val y: String = "K"
diff --git a/compiler/testData/codegen/box/enum/kt20651_inlineLambda.kt b/compiler/testData/codegen/box/enum/kt20651_inlineLambda.kt
index 1e5db2e4d65..d1f12734575 100644
--- a/compiler/testData/codegen/box/enum/kt20651_inlineLambda.kt
+++ b/compiler/testData/codegen/box/enum/kt20651_inlineLambda.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class Test(val x: String, val closure1: () -> String) {
     FOO("O", run { { FOO.x } }) {
         override val y: String = "K"
diff --git a/compiler/testData/codegen/box/enum/kt20651a.kt b/compiler/testData/codegen/box/enum/kt20651a.kt
index 1ceb217e14d..56ad7c1adde 100644
--- a/compiler/testData/codegen/box/enum/kt20651a.kt
+++ b/compiler/testData/codegen/box/enum/kt20651a.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // SKIP_MANGLE_VERIFICATION
 enum class Foo(
         val x: String,
diff --git a/compiler/testData/codegen/box/enum/kt20651b.kt b/compiler/testData/codegen/box/enum/kt20651b.kt
index 8abc29195f8..3ea67f9574d 100644
--- a/compiler/testData/codegen/box/enum/kt20651b.kt
+++ b/compiler/testData/codegen/box/enum/kt20651b.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // SKIP_MANGLE_VERIFICATION
 interface Callback {
     fun invoke(): String
diff --git a/compiler/testData/codegen/box/enum/kt2350.kt b/compiler/testData/codegen/box/enum/kt2350.kt
index 0ba6ed68a69..d4a363062b3 100644
--- a/compiler/testData/codegen/box/enum/kt2350.kt
+++ b/compiler/testData/codegen/box/enum/kt2350.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class A(val b: String) {
     E1("OK"){ override fun t() = b };
 
diff --git a/compiler/testData/codegen/box/enum/kt38996.kt b/compiler/testData/codegen/box/enum/kt38996.kt
index d34a64770d1..83f2c00dd40 100644
--- a/compiler/testData/codegen/box/enum/kt38996.kt
+++ b/compiler/testData/codegen/box/enum/kt38996.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class E(val b: Boolean) {
     TRUE(1 == 1)
 }
diff --git a/compiler/testData/codegen/box/enum/kt44744.kt b/compiler/testData/codegen/box/enum/kt44744.kt
index 0fec0820ee2..71f2ddb5a0f 100644
--- a/compiler/testData/codegen/box/enum/kt44744.kt
+++ b/compiler/testData/codegen/box/enum/kt44744.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class ContentType {
 
     PLAIN_TEXT {
diff --git a/compiler/testData/codegen/box/enum/kt44744_innerClass.kt b/compiler/testData/codegen/box/enum/kt44744_innerClass.kt
index 998c5678332..63fd4b49873 100644
--- a/compiler/testData/codegen/box/enum/kt44744_innerClass.kt
+++ b/compiler/testData/codegen/box/enum/kt44744_innerClass.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 interface IFoo {
     fun foo(e: En): String
 }
diff --git a/compiler/testData/codegen/box/enum/kt46605.kt b/compiler/testData/codegen/box/enum/kt46605.kt
index dc753cafc1b..fb275d0c164 100644
--- a/compiler/testData/codegen/box/enum/kt46605.kt
+++ b/compiler/testData/codegen/box/enum/kt46605.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 fun call(f: () -> Unit) {
     f()
 }
diff --git a/compiler/testData/codegen/box/enum/kt7257.kt b/compiler/testData/codegen/box/enum/kt7257.kt
index 55928cc3c27..78dca7e9610 100644
--- a/compiler/testData/codegen/box/enum/kt7257.kt
+++ b/compiler/testData/codegen/box/enum/kt7257.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class X {
     B {
         val value2 = "K"
diff --git a/compiler/testData/codegen/box/enum/kt7257_anonObjectInit.kt b/compiler/testData/codegen/box/enum/kt7257_anonObjectInit.kt
index ebd1f4b29ac..2cc9963d5c6 100644
--- a/compiler/testData/codegen/box/enum/kt7257_anonObjectInit.kt
+++ b/compiler/testData/codegen/box/enum/kt7257_anonObjectInit.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class X {
     B {
         val value2 = "K"
diff --git a/compiler/testData/codegen/box/enum/kt7257_anonObjectMethod.kt b/compiler/testData/codegen/box/enum/kt7257_anonObjectMethod.kt
index 11d3c385ade..4f5e5ce5bda 100644
--- a/compiler/testData/codegen/box/enum/kt7257_anonObjectMethod.kt
+++ b/compiler/testData/codegen/box/enum/kt7257_anonObjectMethod.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class X {
     B {
         val value2 = "K"
diff --git a/compiler/testData/codegen/box/enum/kt7257_boundReference1.kt b/compiler/testData/codegen/box/enum/kt7257_boundReference1.kt
index 8f13d365b8d..071d5fef979 100644
--- a/compiler/testData/codegen/box/enum/kt7257_boundReference1.kt
+++ b/compiler/testData/codegen/box/enum/kt7257_boundReference1.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 
 enum class X {
     B {
diff --git a/compiler/testData/codegen/box/enum/kt7257_boundReference2.kt b/compiler/testData/codegen/box/enum/kt7257_boundReference2.kt
index e4bbf63f6b0..e34bc6403ba 100644
--- a/compiler/testData/codegen/box/enum/kt7257_boundReference2.kt
+++ b/compiler/testData/codegen/box/enum/kt7257_boundReference2.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class X {
     B {
 
diff --git a/compiler/testData/codegen/box/enum/kt7257_boundReferenceWithImplicitReceiver.kt b/compiler/testData/codegen/box/enum/kt7257_boundReferenceWithImplicitReceiver.kt
index 14e7be26b50..50948f805ff 100644
--- a/compiler/testData/codegen/box/enum/kt7257_boundReferenceWithImplicitReceiver.kt
+++ b/compiler/testData/codegen/box/enum/kt7257_boundReferenceWithImplicitReceiver.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class X {
     B {
         override val value = "OK"
diff --git a/compiler/testData/codegen/box/enum/kt7257_explicitReceiver.kt b/compiler/testData/codegen/box/enum/kt7257_explicitReceiver.kt
index eb5dd9c8a98..44c3183a50a 100644
--- a/compiler/testData/codegen/box/enum/kt7257_explicitReceiver.kt
+++ b/compiler/testData/codegen/box/enum/kt7257_explicitReceiver.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class X {
     B {
         override val value2 = "K"
diff --git a/compiler/testData/codegen/box/enum/kt7257_fullyQualifiedReceiver.kt b/compiler/testData/codegen/box/enum/kt7257_fullyQualifiedReceiver.kt
index 75c8f3916a5..384e2daa331 100644
--- a/compiler/testData/codegen/box/enum/kt7257_fullyQualifiedReceiver.kt
+++ b/compiler/testData/codegen/box/enum/kt7257_fullyQualifiedReceiver.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class X {
     B {
         override val value2 = "K"
diff --git a/compiler/testData/codegen/box/enum/kt7257_namedLocalFun.kt b/compiler/testData/codegen/box/enum/kt7257_namedLocalFun.kt
index 2d3d329ca9a..5438d725fba 100644
--- a/compiler/testData/codegen/box/enum/kt7257_namedLocalFun.kt
+++ b/compiler/testData/codegen/box/enum/kt7257_namedLocalFun.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class X {
     B {
         val value2 = "K"
diff --git a/compiler/testData/codegen/box/enum/kt7257_notInline.kt b/compiler/testData/codegen/box/enum/kt7257_notInline.kt
index 24fa65d584a..3851efb5669 100644
--- a/compiler/testData/codegen/box/enum/kt7257_notInline.kt
+++ b/compiler/testData/codegen/box/enum/kt7257_notInline.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 fun <T, R> T.letNoInline(fn: (T) -> R) =
         fn(this)
 
diff --git a/compiler/testData/codegen/box/enum/kt9711.kt b/compiler/testData/codegen/box/enum/kt9711.kt
index f531e02701e..096316ed24b 100644
--- a/compiler/testData/codegen/box/enum/kt9711.kt
+++ b/compiler/testData/codegen/box/enum/kt9711.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class X {
 
     B {
diff --git a/compiler/testData/codegen/box/enum/kt9711_2.kt b/compiler/testData/codegen/box/enum/kt9711_2.kt
index 1a3473f5d6c..dcad91e092b 100644
--- a/compiler/testData/codegen/box/enum/kt9711_2.kt
+++ b/compiler/testData/codegen/box/enum/kt9711_2.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class IssueState {
 
     FIXED {
diff --git a/compiler/testData/codegen/box/enum/manyDefaultParameters.kt b/compiler/testData/codegen/box/enum/manyDefaultParameters.kt
index f7c39bfa5b4..a094da96f27 100644
--- a/compiler/testData/codegen/box/enum/manyDefaultParameters.kt
+++ b/compiler/testData/codegen/box/enum/manyDefaultParameters.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class ClassTemplate(
         // var bug: Int = 1,
         var code: Int,
diff --git a/compiler/testData/codegen/box/enum/ordinal.kt b/compiler/testData/codegen/box/enum/ordinal.kt
index b301a8554a5..d66c3e0ae4e 100644
--- a/compiler/testData/codegen/box/enum/ordinal.kt
+++ b/compiler/testData/codegen/box/enum/ordinal.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class State {
   _0,
   _1,
diff --git a/compiler/testData/codegen/box/enum/overloadedEnumValues.kt b/compiler/testData/codegen/box/enum/overloadedEnumValues.kt
index 8270c58d627..0f0a39b5905 100644
--- a/compiler/testData/codegen/box/enum/overloadedEnumValues.kt
+++ b/compiler/testData/codegen/box/enum/overloadedEnumValues.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class E {
     A;
 
diff --git a/compiler/testData/codegen/box/enum/refToThis.kt b/compiler/testData/codegen/box/enum/refToThis.kt
index 0fad02720f3..77da3bf2133 100644
--- a/compiler/testData/codegen/box/enum/refToThis.kt
+++ b/compiler/testData/codegen/box/enum/refToThis.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class Enum {
     ENUM_VALUE {
         override fun test() = ENUM_VALUE
diff --git a/compiler/testData/codegen/box/enum/simple.kt b/compiler/testData/codegen/box/enum/simple.kt
index 89e10604050..ed48d29a5d9 100644
--- a/compiler/testData/codegen/box/enum/simple.kt
+++ b/compiler/testData/codegen/box/enum/simple.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class Season {
     WINTER,
     SPRING,
diff --git a/compiler/testData/codegen/box/enum/superCallInEnumLiteral.kt b/compiler/testData/codegen/box/enum/superCallInEnumLiteral.kt
index 4aa10063b0a..11507d9d147 100644
--- a/compiler/testData/codegen/box/enum/superCallInEnumLiteral.kt
+++ b/compiler/testData/codegen/box/enum/superCallInEnumLiteral.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 package test
 
 fun box() = E.E1.f() + E.E2.f()
diff --git a/compiler/testData/codegen/box/enum/toString.kt b/compiler/testData/codegen/box/enum/toString.kt
index cf64259927d..b4890365b12 100644
--- a/compiler/testData/codegen/box/enum/toString.kt
+++ b/compiler/testData/codegen/box/enum/toString.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class State {
   O,
   K
diff --git a/compiler/testData/codegen/box/enum/valueof.kt b/compiler/testData/codegen/box/enum/valueof.kt
index f8d4432331d..f6f7f09c8c0 100644
--- a/compiler/testData/codegen/box/enum/valueof.kt
+++ b/compiler/testData/codegen/box/enum/valueof.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 
 enum class Color {
   RED,
diff --git a/compiler/testData/codegen/box/enum/whenInObject.kt b/compiler/testData/codegen/box/enum/whenInObject.kt
index 2536f9e1b2b..39234df7d84 100644
--- a/compiler/testData/codegen/box/enum/whenInObject.kt
+++ b/compiler/testData/codegen/box/enum/whenInObject.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class E {
     OK, NOT_OK
 }
diff --git a/compiler/testData/codegen/box/innerNested/nestedEnumConstant.kt b/compiler/testData/codegen/box/innerNested/nestedEnumConstant.kt
index e41168b31d8..d8ae583f3d5 100644
--- a/compiler/testData/codegen/box/innerNested/nestedEnumConstant.kt
+++ b/compiler/testData/codegen/box/innerNested/nestedEnumConstant.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 class Outer {
     enum class Nested {
         O,
diff --git a/compiler/testData/codegen/box/invokedynamic/sam/functionRefToJavaInterface/specialFunctions/enumValueOf.kt b/compiler/testData/codegen/box/invokedynamic/sam/functionRefToJavaInterface/specialFunctions/enumValueOf.kt
index 5ce0cb5949d..077b1c01666 100644
--- a/compiler/testData/codegen/box/invokedynamic/sam/functionRefToJavaInterface/specialFunctions/enumValueOf.kt
+++ b/compiler/testData/codegen/box/invokedynamic/sam/functionRefToJavaInterface/specialFunctions/enumValueOf.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // SAM_CONVERSIONS: INDY
diff --git a/compiler/testData/codegen/box/invokedynamic/sam/functionRefToJavaInterface/specialFunctions/enumValues.kt b/compiler/testData/codegen/box/invokedynamic/sam/functionRefToJavaInterface/specialFunctions/enumValues.kt
index 78a58203a27..b5073ca13be 100644
--- a/compiler/testData/codegen/box/invokedynamic/sam/functionRefToJavaInterface/specialFunctions/enumValues.kt
+++ b/compiler/testData/codegen/box/invokedynamic/sam/functionRefToJavaInterface/specialFunctions/enumValues.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // SAM_CONVERSIONS: INDY
diff --git a/compiler/testData/codegen/box/involvesIrInterpreter/kt53480.kt b/compiler/testData/codegen/box/involvesIrInterpreter/kt53480.kt
index eb81cfb40d2..7029e4e2fcf 100644
--- a/compiler/testData/codegen/box/involvesIrInterpreter/kt53480.kt
+++ b/compiler/testData/codegen/box/involvesIrInterpreter/kt53480.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
 // FILE: J.java
 public class J {
diff --git a/compiler/testData/codegen/box/ir/privateSignatures/enumEntryArguments.kt b/compiler/testData/codegen/box/ir/privateSignatures/enumEntryArguments.kt
index 07d83ea5a1f..256e5460977 100644
--- a/compiler/testData/codegen/box/ir/privateSignatures/enumEntryArguments.kt
+++ b/compiler/testData/codegen/box/ir/privateSignatures/enumEntryArguments.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // SKIP_MANGLE_VERIFICATION
 
 // MODULE: lib
diff --git a/compiler/testData/codegen/box/ir/serializationRegressions/innerClassInEnumEntryClass.kt b/compiler/testData/codegen/box/ir/serializationRegressions/innerClassInEnumEntryClass.kt
index 9581c370660..af6389de744 100644
--- a/compiler/testData/codegen/box/ir/serializationRegressions/innerClassInEnumEntryClass.kt
+++ b/compiler/testData/codegen/box/ir/serializationRegressions/innerClassInEnumEntryClass.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 
 // MODULE: lib
 // FILE: lib.kt
diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/nestedEnumEntryValue.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/nestedEnumEntryValue.kt
index 06ac9590701..00b690b26ed 100644
--- a/compiler/testData/codegen/box/multiplatform/defaultArguments/nestedEnumEntryValue.kt
+++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/nestedEnumEntryValue.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // IGNORE_BACKEND: JS_IR, JS_IR_ES6, WASM
 //  JS IR & Wasm: https://youtrack.jetbrains.com/issue/KT-51225
 // IGNORE_BACKEND_K2: JVM_IR, NATIVE
diff --git a/compiler/testData/codegen/box/multiplatform/exhaustiveness/commonEnum.kt b/compiler/testData/codegen/box/multiplatform/exhaustiveness/commonEnum.kt
index 06fe0fbe5a8..cc77796e38f 100644
--- a/compiler/testData/codegen/box/multiplatform/exhaustiveness/commonEnum.kt
+++ b/compiler/testData/codegen/box/multiplatform/exhaustiveness/commonEnum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // TARGET_BACKEND: JVM
 // !LANGUAGE: +MultiPlatformProjects
 // ISSUE: KT-20306
diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/enumEntryNameCall.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/enumEntryNameCall.kt
index fa84eda4658..690a913299a 100644
--- a/compiler/testData/codegen/box/multiplatform/k2/basic/enumEntryNameCall.kt
+++ b/compiler/testData/codegen/box/multiplatform/k2/basic/enumEntryNameCall.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // TARGET_BACKEND: JVM
 // !LANGUAGE: +MultiPlatformProjects
 
diff --git a/compiler/testData/codegen/box/multiplatform/starImportOfExpectEnumWithActualTypeAlias.kt b/compiler/testData/codegen/box/multiplatform/starImportOfExpectEnumWithActualTypeAlias.kt
index fde5fdfe964..e9d1b2a3bd3 100644
--- a/compiler/testData/codegen/box/multiplatform/starImportOfExpectEnumWithActualTypeAlias.kt
+++ b/compiler/testData/codegen/box/multiplatform/starImportOfExpectEnumWithActualTypeAlias.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // !LANGUAGE: +MultiPlatformProjects
 // IGNORE_BACKEND: JS
 // IGNORE_BACKEND: JS_IR
diff --git a/compiler/testData/codegen/box/objects/kt1186.kt b/compiler/testData/codegen/box/objects/kt1186.kt
index 327cd1a5ae4..6100f7092fa 100644
--- a/compiler/testData/codegen/box/objects/kt1186.kt
+++ b/compiler/testData/codegen/box/objects/kt1186.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class Color(val rgb : Int) {
     RED(0xFF0000),
     GREEN(0x00FF00),
diff --git a/compiler/testData/codegen/box/objects/kt694.kt b/compiler/testData/codegen/box/objects/kt694.kt
index ca7cd912cf1..945e1298489 100644
--- a/compiler/testData/codegen/box/objects/kt694.kt
+++ b/compiler/testData/codegen/box/objects/kt694.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class Test {
     A,
     B,
diff --git a/compiler/testData/codegen/box/objects/substitutionFunctionFromSuper.kt b/compiler/testData/codegen/box/objects/substitutionFunctionFromSuper.kt
index 87186e1b7fa..ff7785b0e0c 100644
--- a/compiler/testData/codegen/box/objects/substitutionFunctionFromSuper.kt
+++ b/compiler/testData/codegen/box/objects/substitutionFunctionFromSuper.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // KT-44054
 
 enum class Enum {
diff --git a/compiler/testData/codegen/box/objects/useAnonymousObjectFunction.kt b/compiler/testData/codegen/box/objects/useAnonymousObjectFunction.kt
index 2b1eff924f2..2a4a870eed2 100644
--- a/compiler/testData/codegen/box/objects/useAnonymousObjectFunction.kt
+++ b/compiler/testData/codegen/box/objects/useAnonymousObjectFunction.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // KT-44050
 
 enum class Enum {
diff --git a/compiler/testData/codegen/box/package/privateMembersInImportList.kt b/compiler/testData/codegen/box/package/privateMembersInImportList.kt
index 201bcffd2a3..e7009753efa 100644
--- a/compiler/testData/codegen/box/package/privateMembersInImportList.kt
+++ b/compiler/testData/codegen/box/package/privateMembersInImportList.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 package test
 
 import test.C.E1
diff --git a/compiler/testData/codegen/box/secondaryConstructors/enums.kt b/compiler/testData/codegen/box/secondaryConstructors/enums.kt
index f637015fcdc..acc6fdcdf5b 100644
--- a/compiler/testData/codegen/box/secondaryConstructors/enums.kt
+++ b/compiler/testData/codegen/box/secondaryConstructors/enums.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // IGNORE_BACKEND_K2: JS_IR, NATIVE
 
 enum class A1(val prop1: String) {
diff --git a/compiler/testData/codegen/box/specialBuiltins/enumAsOrdinaled.kt b/compiler/testData/codegen/box/specialBuiltins/enumAsOrdinaled.kt
index e0957db6137..434c332237d 100644
--- a/compiler/testData/codegen/box/specialBuiltins/enumAsOrdinaled.kt
+++ b/compiler/testData/codegen/box/specialBuiltins/enumAsOrdinaled.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 interface Ordinaled {
     val ordinal: Int
 }
diff --git a/compiler/testData/codegen/box/specialBuiltins/valuesInsideEnum.kt b/compiler/testData/codegen/box/specialBuiltins/valuesInsideEnum.kt
index 627ae53dd22..ee008bfcf82 100644
--- a/compiler/testData/codegen/box/specialBuiltins/valuesInsideEnum.kt
+++ b/compiler/testData/codegen/box/specialBuiltins/valuesInsideEnum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class Variants {
     O, K;
     companion object {
diff --git a/compiler/testData/codegen/box/typealias/enumEntryQualifier.kt b/compiler/testData/codegen/box/typealias/enumEntryQualifier.kt
index bbadfdb2f51..19c383aaed0 100644
--- a/compiler/testData/codegen/box/typealias/enumEntryQualifier.kt
+++ b/compiler/testData/codegen/box/typealias/enumEntryQualifier.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class MyEnum {
     O;
     companion object {
diff --git a/compiler/testData/codegen/box/when/emptyWhen.kt b/compiler/testData/codegen/box/when/emptyWhen.kt
index db56fffbb64..58fbad659db 100644
--- a/compiler/testData/codegen/box/when/emptyWhen.kt
+++ b/compiler/testData/codegen/box/when/emptyWhen.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class A { X1, X2 }
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/when/enumOptimization/differentEnumClasses.kt b/compiler/testData/codegen/box/when/enumOptimization/differentEnumClasses.kt
index 4e77a209d66..867bc2f5b7a 100644
--- a/compiler/testData/codegen/box/when/enumOptimization/differentEnumClasses.kt
+++ b/compiler/testData/codegen/box/when/enumOptimization/differentEnumClasses.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // !LANGUAGE: -ProhibitComparisonOfIncompatibleEnums
 
 enum class A {
diff --git a/compiler/testData/codegen/box/when/enumOptimization/differentEnumClasses2.kt b/compiler/testData/codegen/box/when/enumOptimization/differentEnumClasses2.kt
index ed49a037750..deffe8ae56f 100644
--- a/compiler/testData/codegen/box/when/enumOptimization/differentEnumClasses2.kt
+++ b/compiler/testData/codegen/box/when/enumOptimization/differentEnumClasses2.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // !LANGUAGE: -ProhibitComparisonOfIncompatibleEnums
 
 enum class A {
diff --git a/compiler/testData/codegen/box/when/enumOptimization/functionLiteralInTopLevel.kt b/compiler/testData/codegen/box/when/enumOptimization/functionLiteralInTopLevel.kt
index 160289ef78c..75b8e707d78 100644
--- a/compiler/testData/codegen/box/when/enumOptimization/functionLiteralInTopLevel.kt
+++ b/compiler/testData/codegen/box/when/enumOptimization/functionLiteralInTopLevel.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // CHECK_CASES_COUNT: function=box$lambda count=0
 // CHECK_IF_COUNT: function=box$lambda count=1 TARGET_BACKENDS=JS
 // CHECK_IF_COUNT: function=box$lambda count=0 IGNORED_BACKENDS=JS
diff --git a/compiler/testData/codegen/box/when/enumOptimization/kt14597.kt b/compiler/testData/codegen/box/when/enumOptimization/kt14597.kt
index 629e0ea90c2..7af0d40883e 100644
--- a/compiler/testData/codegen/box/when/enumOptimization/kt14597.kt
+++ b/compiler/testData/codegen/box/when/enumOptimization/kt14597.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // CHECK_CASES_COUNT: function=box count=6
 // CHECK_IF_COUNT: function=box count=1
 
diff --git a/compiler/testData/codegen/box/when/enumOptimization/kt14597_full.kt b/compiler/testData/codegen/box/when/enumOptimization/kt14597_full.kt
index 69f974c6db6..2926f787c9e 100644
--- a/compiler/testData/codegen/box/when/enumOptimization/kt14597_full.kt
+++ b/compiler/testData/codegen/box/when/enumOptimization/kt14597_full.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // CHECK_CASES_COUNT: function=box count=18
 // CHECK_IF_COUNT: function=box count=3
 
diff --git a/compiler/testData/codegen/box/when/enumOptimization/kt14802.kt b/compiler/testData/codegen/box/when/enumOptimization/kt14802.kt
index b1772e3db5d..5818daa933a 100644
--- a/compiler/testData/codegen/box/when/enumOptimization/kt14802.kt
+++ b/compiler/testData/codegen/box/when/enumOptimization/kt14802.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // IGNORE_BACKEND_K2: JS_IR
 // CHECK_CASES_COUNT: function=crash count=2 TARGET_BACKENDS=JS
 // CHECK_CASES_COUNT: function=crash count=0 IGNORED_BACKENDS=JS
diff --git a/compiler/testData/codegen/box/when/enumOptimization/kt15806.kt b/compiler/testData/codegen/box/when/enumOptimization/kt15806.kt
index e931e744630..cde1795146d 100644
--- a/compiler/testData/codegen/box/when/enumOptimization/kt15806.kt
+++ b/compiler/testData/codegen/box/when/enumOptimization/kt15806.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // IGNORE_BACKEND_K2: JS_IR
 // CHECK_CASES_COUNT: function=doTheThing count=2 TARGET_BACKENDS=JS
 // CHECK_CASES_COUNT: function=doTheThing count=0 IGNORED_BACKENDS=JS
diff --git a/compiler/testData/codegen/box/when/enumOptimization/kt50258.kt b/compiler/testData/codegen/box/when/enumOptimization/kt50258.kt
index a6adef17325..adaaf227157 100644
--- a/compiler/testData/codegen/box/when/enumOptimization/kt50258.kt
+++ b/compiler/testData/codegen/box/when/enumOptimization/kt50258.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class MyEnum {
     First,
     Second
diff --git a/compiler/testData/codegen/box/when/enumOptimization/nestedWhenInCondition.kt b/compiler/testData/codegen/box/when/enumOptimization/nestedWhenInCondition.kt
index f0414b77251..d27345bad6c 100644
--- a/compiler/testData/codegen/box/when/enumOptimization/nestedWhenInCondition.kt
+++ b/compiler/testData/codegen/box/when/enumOptimization/nestedWhenInCondition.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class ABCD {
     A, B, C, D
 }
diff --git a/compiler/testData/codegen/box/when/enumOptimization/nestedWhenInResult.kt b/compiler/testData/codegen/box/when/enumOptimization/nestedWhenInResult.kt
index 9ad6924f59f..ef82ff0e03d 100644
--- a/compiler/testData/codegen/box/when/enumOptimization/nestedWhenInResult.kt
+++ b/compiler/testData/codegen/box/when/enumOptimization/nestedWhenInResult.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class ABCD {
     A, B, C, D
 }
diff --git a/compiler/testData/codegen/box/when/enumOptimization/nonConstantEnum.kt b/compiler/testData/codegen/box/when/enumOptimization/nonConstantEnum.kt
index 292d8b2b864..f613b0c7f4f 100644
--- a/compiler/testData/codegen/box/when/enumOptimization/nonConstantEnum.kt
+++ b/compiler/testData/codegen/box/when/enumOptimization/nonConstantEnum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // CHECK_CASES_COUNT: function=box count=0
 // CHECK_IF_COUNT: function=box count=1
 
diff --git a/compiler/testData/codegen/box/when/enumOptimization/notAllEntriesAreConstants.kt b/compiler/testData/codegen/box/when/enumOptimization/notAllEntriesAreConstants.kt
index 53efa027147..ab28ac66b88 100644
--- a/compiler/testData/codegen/box/when/enumOptimization/notAllEntriesAreConstants.kt
+++ b/compiler/testData/codegen/box/when/enumOptimization/notAllEntriesAreConstants.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
 
 enum class E {
diff --git a/compiler/testData/codegen/box/when/enumOptimization/nullIsTheFirstEntry.kt b/compiler/testData/codegen/box/when/enumOptimization/nullIsTheFirstEntry.kt
index 2f945d158d2..74908190cdc 100644
--- a/compiler/testData/codegen/box/when/enumOptimization/nullIsTheFirstEntry.kt
+++ b/compiler/testData/codegen/box/when/enumOptimization/nullIsTheFirstEntry.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class E {
     A, B;
 }
diff --git a/compiler/testData/codegen/box/when/enumOptimization/nullableEnum.kt b/compiler/testData/codegen/box/when/enumOptimization/nullableEnum.kt
index b60c7fdfebe..7707e796750 100644
--- a/compiler/testData/codegen/box/when/enumOptimization/nullableEnum.kt
+++ b/compiler/testData/codegen/box/when/enumOptimization/nullableEnum.kt
@@ -1,6 +1,5 @@
-// WITH_STDLIB
-// CHECK_CASES_COUNT: function=test count=0 TARGET_BACKENDS=JS;JS_IR;JS_IR_ES6
-// CHECK_CASES_COUNT: function=test count=3 IGNORED_BACKENDS=JS;JS_IR;JS_IR_ES6
+// CHECK_CASES_COUNT: function=test count=0 TARGET_BACKENDS=JS
+// CHECK_CASES_COUNT: function=test count=3 IGNORED_BACKENDS=JS
 // CHECK_IF_COUNT: function=test count=3 TARGET_BACKENDS=JS
 // CHECK_IF_COUNT: function=test count=0 IGNORED_BACKENDS=JS
 
diff --git a/compiler/testData/codegen/box/when/exhaustiveBreakContinue.kt b/compiler/testData/codegen/box/when/exhaustiveBreakContinue.kt
index 0c75041c820..69c959e13cb 100644
--- a/compiler/testData/codegen/box/when/exhaustiveBreakContinue.kt
+++ b/compiler/testData/codegen/box/when/exhaustiveBreakContinue.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class Color { RED, GREEN, BLUE }
 
 fun foo(arr: Array<Color>): Color {
diff --git a/compiler/testData/codegen/box/when/exhaustiveWhenInitialization.kt b/compiler/testData/codegen/box/when/exhaustiveWhenInitialization.kt
index 32f2327df81..ccf67614e6c 100644
--- a/compiler/testData/codegen/box/when/exhaustiveWhenInitialization.kt
+++ b/compiler/testData/codegen/box/when/exhaustiveWhenInitialization.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class A { V }
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/when/exhaustiveWhenReturn.kt b/compiler/testData/codegen/box/when/exhaustiveWhenReturn.kt
index 2ca79543f76..6b3b7658cc2 100644
--- a/compiler/testData/codegen/box/when/exhaustiveWhenReturn.kt
+++ b/compiler/testData/codegen/box/when/exhaustiveWhenReturn.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class A { V }
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/when/kt47475.kt b/compiler/testData/codegen/box/when/kt47475.kt
index 2fd7208b3a2..569e7ab63f9 100644
--- a/compiler/testData/codegen/box/when/kt47475.kt
+++ b/compiler/testData/codegen/box/when/kt47475.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // TARGET_BACKEND: JVM
 // CHECK_BYTECODE_TEXT
 
diff --git a/compiler/testData/codegen/box/when/noElseExhaustive.kt b/compiler/testData/codegen/box/when/noElseExhaustive.kt
index f9cc2cb0a4f..e02125f19c8 100644
--- a/compiler/testData/codegen/box/when/noElseExhaustive.kt
+++ b/compiler/testData/codegen/box/when/noElseExhaustive.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class En {
     A,
     B
diff --git a/compiler/testData/codegen/box/when/noElseExhaustiveStatement.kt b/compiler/testData/codegen/box/when/noElseExhaustiveStatement.kt
index 071481ed769..da79d180335 100644
--- a/compiler/testData/codegen/box/when/noElseExhaustiveStatement.kt
+++ b/compiler/testData/codegen/box/when/noElseExhaustiveStatement.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class En {
     A,
     B
diff --git a/compiler/testData/codegen/box/when/noElseExhaustiveUnitExpected.kt b/compiler/testData/codegen/box/when/noElseExhaustiveUnitExpected.kt
index dd4dd981212..2c69069abac 100644
--- a/compiler/testData/codegen/box/when/noElseExhaustiveUnitExpected.kt
+++ b/compiler/testData/codegen/box/when/noElseExhaustiveUnitExpected.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class En {
     A,
     B
diff --git a/compiler/testData/codegen/box/when/switchOptimizationMultipleMixedConditions.kt b/compiler/testData/codegen/box/when/switchOptimizationMultipleMixedConditions.kt
index 7ebd6fe6c30..d600955f52a 100644
--- a/compiler/testData/codegen/box/when/switchOptimizationMultipleMixedConditions.kt
+++ b/compiler/testData/codegen/box/when/switchOptimizationMultipleMixedConditions.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 private fun parse(text: String) = when (text) {
     Numbers.One.name, "one", "1" -> 1
     Numbers.Two.name, "two", "2" -> 2
diff --git a/compiler/testData/codegen/box/when/whenSubjectVariable/kt27161.kt b/compiler/testData/codegen/box/when/whenSubjectVariable/kt27161.kt
index 40795e16ea4..18862bde022 100644
--- a/compiler/testData/codegen/box/when/whenSubjectVariable/kt27161.kt
+++ b/compiler/testData/codegen/box/when/whenSubjectVariable/kt27161.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class Test {
     A, B, OTHER
 }
diff --git a/compiler/testData/codegen/box/when/whenSubjectVariable/kt27161_nested.kt b/compiler/testData/codegen/box/when/whenSubjectVariable/kt27161_nested.kt
index 5da8a4b9462..e75b6085120 100644
--- a/compiler/testData/codegen/box/when/whenSubjectVariable/kt27161_nested.kt
+++ b/compiler/testData/codegen/box/when/whenSubjectVariable/kt27161_nested.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class Test {
     A, B, OTHER
 }
diff --git a/compiler/testData/codegen/box/when/whenSubjectVariable/kt27161_nested2.kt b/compiler/testData/codegen/box/when/whenSubjectVariable/kt27161_nested2.kt
index b6a1bdb6938..f0dbde680a1 100644
--- a/compiler/testData/codegen/box/when/whenSubjectVariable/kt27161_nested2.kt
+++ b/compiler/testData/codegen/box/when/whenSubjectVariable/kt27161_nested2.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class Test {
     A, B, OTHER
 }
diff --git a/compiler/testData/codegen/boxInline/anonymousObject/enumWhen/callSite.kt b/compiler/testData/codegen/boxInline/anonymousObject/enumWhen/callSite.kt
index 4fd67afac9f..3539bbfb478 100644
--- a/compiler/testData/codegen/boxInline/anonymousObject/enumWhen/callSite.kt
+++ b/compiler/testData/codegen/boxInline/anonymousObject/enumWhen/callSite.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // NO_CHECK_LAMBDA_INLINING
 // FILE: 1.kt
 
diff --git a/compiler/testData/codegen/boxInline/anonymousObject/enumWhen/declSite.kt b/compiler/testData/codegen/boxInline/anonymousObject/enumWhen/declSite.kt
index a47f4ecd576..e5942e3987e 100644
--- a/compiler/testData/codegen/boxInline/anonymousObject/enumWhen/declSite.kt
+++ b/compiler/testData/codegen/boxInline/anonymousObject/enumWhen/declSite.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // FILE: 1.kt
 
 package test
diff --git a/compiler/testData/codegen/boxInline/anonymousObject/enumWhen/declSiteSeveralMappings.kt b/compiler/testData/codegen/boxInline/anonymousObject/enumWhen/declSiteSeveralMappings.kt
index 0b545eaced0..7e01061e0df 100644
--- a/compiler/testData/codegen/boxInline/anonymousObject/enumWhen/declSiteSeveralMappings.kt
+++ b/compiler/testData/codegen/boxInline/anonymousObject/enumWhen/declSiteSeveralMappings.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // FILE: 1.kt
 
 package test
diff --git a/compiler/testData/codegen/boxInline/anonymousObject/enumWhen/declSiteSeveralMappingsDifOrder.kt b/compiler/testData/codegen/boxInline/anonymousObject/enumWhen/declSiteSeveralMappingsDifOrder.kt
index c6800dd257d..a54536a0b2f 100644
--- a/compiler/testData/codegen/boxInline/anonymousObject/enumWhen/declSiteSeveralMappingsDifOrder.kt
+++ b/compiler/testData/codegen/boxInline/anonymousObject/enumWhen/declSiteSeveralMappingsDifOrder.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // FILE: 1.kt
 
 package test
diff --git a/compiler/testData/codegen/boxInline/anonymousObject/kt6552.kt b/compiler/testData/codegen/boxInline/anonymousObject/kt6552.kt
index 8a926d5411e..fefcc854cbc 100644
--- a/compiler/testData/codegen/boxInline/anonymousObject/kt6552.kt
+++ b/compiler/testData/codegen/boxInline/anonymousObject/kt6552.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // FILE: 1.kt
 
 package test
diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/nestedNonLocals.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/nestedNonLocals.kt
index c774cd11911..97ff7ccdaeb 100644
--- a/compiler/testData/codegen/boxInline/nonLocalReturns/nestedNonLocals.kt
+++ b/compiler/testData/codegen/boxInline/nonLocalReturns/nestedNonLocals.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // FILE: 1.kt
 
 package test
diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/callSite.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/callSite.kt
index 5c104972159..0b168a75dbe 100644
--- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/callSite.kt
+++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/callSite.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // FILE: 1.kt
 
 package test
diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/callSiteComplex.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/callSiteComplex.kt
index 8357476d1eb..304d0c1b23b 100644
--- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/callSiteComplex.kt
+++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/callSiteComplex.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // FILE: 1.kt
 
 package test
diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/complex.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/complex.kt
index 18ade4ee7ed..583f141128c 100644
--- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/complex.kt
+++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/complex.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // FILE: 1.kt
 
 package test
diff --git a/compiler/testData/codegen/boxInline/private/nestedInPrivateClass2.kt b/compiler/testData/codegen/boxInline/private/nestedInPrivateClass2.kt
index d3130957f5c..ef3bcc4c76e 100644
--- a/compiler/testData/codegen/boxInline/private/nestedInPrivateClass2.kt
+++ b/compiler/testData/codegen/boxInline/private/nestedInPrivateClass2.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // FILE: 1.kt
 
 package test
diff --git a/compiler/testData/codegen/boxInline/simple/simpleEnum.kt b/compiler/testData/codegen/boxInline/simple/simpleEnum.kt
index faa9cd12f5e..2c775f9ea5a 100644
--- a/compiler/testData/codegen/boxInline/simple/simpleEnum.kt
+++ b/compiler/testData/codegen/boxInline/simple/simpleEnum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // FILE: 1.kt
 
 package test
diff --git a/compiler/testData/codegen/bytecodeListing/enum.kt b/compiler/testData/codegen/bytecodeListing/enum.kt
index c20691add9a..a193aa6cfd4 100644
--- a/compiler/testData/codegen/bytecodeListing/enum.kt
+++ b/compiler/testData/codegen/bytecodeListing/enum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class SimpleEnum {
     A, B, C
 }
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.kt
index 6b0f6b218cd..c8f0b7ffcba 100644
--- a/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.kt
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // !LANGUAGE: +InlineClasses
 
 inline class Z(val x: Int)
diff --git a/compiler/testData/codegen/bytecodeListing/kt55769.kt b/compiler/testData/codegen/bytecodeListing/kt55769.kt
index 4329a326bc4..d9533054e89 100644
--- a/compiler/testData/codegen/bytecodeListing/kt55769.kt
+++ b/compiler/testData/codegen/bytecodeListing/kt55769.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // DONT_SORT_DECLARATIONS
 
 class Main {
diff --git a/compiler/testData/codegen/script/kt20707.kts b/compiler/testData/codegen/script/kt20707.kts
index cb166b4839e..3ddef76bccc 100644
--- a/compiler/testData/codegen/script/kt20707.kts
+++ b/compiler/testData/codegen/script/kt20707.kts
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class Build { Debug, Release }
 
 fun applySomething(build: Build) = when (build) {
diff --git a/compiler/testData/debug/stepping/enum.kt b/compiler/testData/debug/stepping/enum.kt
index 612a2324998..cb51df5f195 100644
--- a/compiler/testData/debug/stepping/enum.kt
+++ b/compiler/testData/debug/stepping/enum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // FILE: test.kt
 
 enum class E() {
@@ -36,36 +35,36 @@ fun box() {
 // but not for the allocation of the object.
 
 // EXPECTATIONS JVM JVM_IR
-// test.kt:23 box
+// test.kt:22 box
 // EXPECTATIONS JVM_IR
+// test.kt:4 <clinit>
 // test.kt:5 <clinit>
-// test.kt:6 <clinit>
 // EXPECTATIONS JVM JVM_IR
-// test.kt:8 foo
-// test.kt:10 foo
+// test.kt:7 foo
+// test.kt:9 foo
+// test.kt:22 box
 // test.kt:23 box
-// test.kt:24 box
-// test.kt:16 <clinit>
+// test.kt:15 <clinit>
 // EXPECTATIONS JVM_IR
-// test.kt:17 <clinit>
+// test.kt:16 <clinit>
 // EXPECTATIONS JVM JVM_IR
-// test.kt:18 <clinit>
 // test.kt:17 <clinit>
-// test.kt:25 box
+// test.kt:16 <clinit>
+// test.kt:24 box
 
 // EXPECTATIONS JS_IR
-// test.kt:23 box
-// test.kt:12 <init>
-// test.kt:4 <init>
-// test.kt:12 <init>
-// test.kt:4 <init>
-// test.kt:23 box
-// test.kt:10 foo
-// test.kt:8 E$foo$lambda
-// test.kt:16 E2_initEntries
-// test.kt:15 <init>
-// test.kt:15 <init>
-// test.kt:18 E2_initEntries
-// test.kt:15 <init>
-// test.kt:15 <init>
-// test.kt:25 box
\ No newline at end of file
+// test.kt:22 box
+// test.kt:11 <init>
+// test.kt:3 <init>
+// test.kt:11 <init>
+// test.kt:3 <init>
+// test.kt:22 box
+// test.kt:9 foo
+// test.kt:7 E$foo$lambda
+// test.kt:15 E2_initEntries
+// test.kt:14 <init>
+// test.kt:14 <init>
+// test.kt:17 E2_initEntries
+// test.kt:14 <init>
+// test.kt:14 <init>
+// test.kt:24 box
diff --git a/compiler/testData/diagnostics/tests/EnumEntryAsType.txt b/compiler/testData/diagnostics/tests/EnumEntryAsType.txt
index 471b8b3673d..4176d98081d 100644
--- a/compiler/testData/diagnostics/tests/EnumEntryAsType.txt
+++ b/compiler/testData/diagnostics/tests/EnumEntryAsType.txt
@@ -21,6 +21,7 @@ public final enum class Color : kotlin.Enum<Color> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Color>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Color
     public final /*synthesized*/ fun values(): kotlin.Array<Color>
 }
diff --git a/compiler/testData/diagnostics/tests/ReserveYield2.txt b/compiler/testData/diagnostics/tests/ReserveYield2.txt
index 3fe7f0aebbd..d7ce52436ac 100644
--- a/compiler/testData/diagnostics/tests/ReserveYield2.txt
+++ b/compiler/testData/diagnostics/tests/ReserveYield2.txt
@@ -39,6 +39,7 @@ package p3 {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<p3.yield>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): p3.yield
         public final /*synthesized*/ fun values(): kotlin.Array<p3.yield>
     }
diff --git a/compiler/testData/diagnostics/tests/ReserveYieldNoMore2.txt b/compiler/testData/diagnostics/tests/ReserveYieldNoMore2.txt
index 3fe7f0aebbd..d7ce52436ac 100644
--- a/compiler/testData/diagnostics/tests/ReserveYieldNoMore2.txt
+++ b/compiler/testData/diagnostics/tests/ReserveYieldNoMore2.txt
@@ -39,6 +39,7 @@ package p3 {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<p3.yield>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): p3.yield
         public final /*synthesized*/ fun values(): kotlin.Array<p3.yield>
     }
diff --git a/compiler/testData/diagnostics/tests/Serializable.txt b/compiler/testData/diagnostics/tests/Serializable.txt
index 947e10c716e..3c4d6973a4a 100644
--- a/compiler/testData/diagnostics/tests/Serializable.txt
+++ b/compiler/testData/diagnostics/tests/Serializable.txt
@@ -26,6 +26,7 @@ public final enum class C : kotlin.Enum<C> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<C>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): C
     public final /*synthesized*/ fun values(): kotlin.Array<C>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst_after.txt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst_after.txt
index d46458a6fde..03c5ea9260d 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst_after.txt
+++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst_after.txt
@@ -25,6 +25,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst_before.txt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst_before.txt
index d46458a6fde..03c5ea9260d 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst_before.txt
+++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst_before.txt
@@ -25,6 +25,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/standaloneInExpression.txt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/standaloneInExpression.txt
index 427e65054cc..bb480c509ed 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/standaloneInExpression.txt
+++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/standaloneInExpression.txt
@@ -23,6 +23,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt b/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt
index c7adf39db96..8fb10efa85a 100644
--- a/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt
+++ b/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt
@@ -207,6 +207,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.MyEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.MyEnum
         public final /*synthesized*/ fun values(): kotlin.Array<test.MyEnum>
     }
diff --git a/compiler/testData/diagnostics/tests/annotations/nestedClassesInAnnotations.txt b/compiler/testData/diagnostics/tests/annotations/nestedClassesInAnnotations.txt
index 6c864085dce..7ee916fc8d5 100644
--- a/compiler/testData/diagnostics/tests/annotations/nestedClassesInAnnotations.txt
+++ b/compiler/testData/diagnostics/tests/annotations/nestedClassesInAnnotations.txt
@@ -42,6 +42,7 @@ public final annotation class Foo : kotlin.Annotation {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Foo.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Foo.E
         public final /*synthesized*/ fun values(): kotlin.Array<Foo.E>
     }
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt
index 540acff8d8d..2462981c06f 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt
@@ -20,6 +20,7 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt
index 6417cfd5a04..5101c6a9700 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt
@@ -20,6 +20,7 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt
index a05a319feda..cf5508468d7 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt
@@ -20,6 +20,7 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt
index f5b8205d3f3..4e23440bffb 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt
@@ -20,6 +20,7 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/field.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/field.txt
index e896ac05636..cc2f41c2545 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/field.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/field.txt
@@ -53,6 +53,7 @@ public final enum class Your : kotlin.Enum<Your> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Your>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Your
     public final /*synthesized*/ fun values(): kotlin.Array<Your>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt
index d7a5213c7df..544adc8416a 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt
@@ -20,6 +20,7 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt
index e6ab2ce8566..6b64998ab24 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt
@@ -20,6 +20,7 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt
index 5891d81aecb..2f8a26aa81c 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt
@@ -20,6 +20,7 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt
index 07666f7abe1..37072fd5fdb 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt
@@ -20,6 +20,7 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt
index 1e6e2d28c8d..3e5637f52c5 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt
@@ -20,6 +20,7 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt
index 9f87dafeb98..90c604ab7ef 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt
@@ -20,6 +20,7 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/callableReference/bound/referenceToStaticMethodOnInstance.txt b/compiler/testData/diagnostics/tests/callableReference/bound/referenceToStaticMethodOnInstance.txt
index 60446dd49b6..32f2017977a 100644
--- a/compiler/testData/diagnostics/tests/callableReference/bound/referenceToStaticMethodOnInstance.txt
+++ b/compiler/testData/diagnostics/tests/callableReference/bound/referenceToStaticMethodOnInstance.txt
@@ -27,6 +27,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt b/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt
index b5841dd2b67..ce3003997be 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt
@@ -35,6 +35,7 @@ public final enum class D : kotlin.Enum<D> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<D>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): D
     public final /*synthesized*/ fun values(): kotlin.Array<D>
 }
diff --git a/compiler/testData/diagnostics/tests/classLiteral/classAndObjectLiteralType.txt b/compiler/testData/diagnostics/tests/classLiteral/classAndObjectLiteralType.txt
index 5c6942316a2..cbb6d0e5571 100644
--- a/compiler/testData/diagnostics/tests/classLiteral/classAndObjectLiteralType.txt
+++ b/compiler/testData/diagnostics/tests/classLiteral/classAndObjectLiteralType.txt
@@ -44,6 +44,7 @@ public final enum class TestEnum : kotlin.Enum<TestEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<TestEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): TestEnum
     public final /*synthesized*/ fun values(): kotlin.Array<TestEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum_after.txt b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum_after.txt
index c2eaf579e22..547b4b71181 100644
--- a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum_after.txt
+++ b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum_after.txt
@@ -52,6 +52,7 @@ package a {
         }
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<a.C>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): a.C
         public final /*synthesized*/ fun values(): kotlin.Array<a.C>
     }
diff --git a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum_before.txt b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum_before.txt
index c2eaf579e22..547b4b71181 100644
--- a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum_before.txt
+++ b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum_before.txt
@@ -52,6 +52,7 @@ package a {
         }
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<a.C>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): a.C
         public final /*synthesized*/ fun values(): kotlin.Array<a.C>
     }
diff --git a/compiler/testData/diagnostics/tests/constantEvaluator/usesVariableAsConstant/OtherTypes.txt b/compiler/testData/diagnostics/tests/constantEvaluator/usesVariableAsConstant/OtherTypes.txt
index a7a65aaf20c..dfff2e5372b 100644
--- a/compiler/testData/diagnostics/tests/constantEvaluator/usesVariableAsConstant/OtherTypes.txt
+++ b/compiler/testData/diagnostics/tests/constantEvaluator/usesVariableAsConstant/OtherTypes.txt
@@ -26,6 +26,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.MyEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.MyEnum
         public final /*synthesized*/ fun values(): kotlin.Array<test.MyEnum>
     }
diff --git a/compiler/testData/diagnostics/tests/constructorConsistency/open.txt b/compiler/testData/diagnostics/tests/constructorConsistency/open.txt
index 1aeaeb4c888..83919dbb91c 100644
--- a/compiler/testData/diagnostics/tests/constructorConsistency/open.txt
+++ b/compiler/testData/diagnostics/tests/constructorConsistency/open.txt
@@ -35,6 +35,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt
index 8538301c79a..998b790621a 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt
@@ -136,6 +136,7 @@ package uninitialized_reassigned_variables {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<uninitialized_reassigned_variables.ProtocolState>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): uninitialized_reassigned_variables.ProtocolState
         public final /*synthesized*/ fun values(): kotlin.Array<uninitialized_reassigned_variables.ProtocolState>
     }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/enumCompanionInterdependence.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/enumCompanionInterdependence.txt
index 5aaa2ab6ce4..bebae4d702b 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/enumCompanionInterdependence.txt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/enumCompanionInterdependence.txt
@@ -27,6 +27,7 @@ public final enum class B : kotlin.Enum<B> {
     }
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<B>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): B
     public final /*synthesized*/ fun values(): kotlin.Array<B>
 }
@@ -58,6 +59,7 @@ public final enum class C : kotlin.Enum<C> {
     }
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<C>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): C
     public final /*synthesized*/ fun values(): kotlin.Array<C>
 }
@@ -88,6 +90,7 @@ public final enum class EnumCompanion1 : kotlin.Enum<EnumCompanion1> {
     }
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<EnumCompanion1>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumCompanion1
     public final /*synthesized*/ fun values(): kotlin.Array<EnumCompanion1>
 }
@@ -116,6 +119,7 @@ public final enum class EnumCompanion2 : kotlin.Enum<EnumCompanion2> {
     }
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<EnumCompanion2>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumCompanion2
     public final /*synthesized*/ fun values(): kotlin.Array<EnumCompanion2>
 }
@@ -145,6 +149,7 @@ public final enum class EnumCompanion3 : kotlin.Enum<EnumCompanion3> {
     }
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<EnumCompanion3>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumCompanion3
     public final /*synthesized*/ fun values(): kotlin.Array<EnumCompanion3>
 }
@@ -183,6 +188,7 @@ public final enum class ExtractionTarget : kotlin.Enum<ExtractionTarget> {
     }
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<ExtractionTarget>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): ExtractionTarget
     public final /*synthesized*/ fun values(): kotlin.Array<ExtractionTarget>
 }
@@ -212,6 +218,7 @@ public final enum class Fruit : kotlin.Enum<Fruit> {
     }
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Fruit>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Fruit
     public final /*synthesized*/ fun values(): kotlin.Array<Fruit>
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/enumInterdependence.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/enumInterdependence.txt
index 69d65068b88..221edbbc927 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/enumInterdependence.txt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/enumInterdependence.txt
@@ -20,6 +20,7 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
@@ -42,6 +43,7 @@ public final enum class D : kotlin.Enum<D> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<D>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): D
     public final /*synthesized*/ fun values(): kotlin.Array<D>
 }
@@ -70,6 +72,7 @@ public final enum class E : kotlin.Enum<E> {
     }
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
@@ -92,6 +95,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt
index b645b6e2660..4995780a16f 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt
@@ -40,6 +40,7 @@ package kt1185 {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<kt1185.Color>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt1185.Color
         public final /*synthesized*/ fun values(): kotlin.Array<kt1185.Color>
     }
@@ -65,6 +66,7 @@ package kt1185 {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<kt1185.Direction>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt1185.Direction
         public final /*synthesized*/ fun values(): kotlin.Array<kt1185.Direction>
     }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedCompanionOfEnum_after.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedCompanionOfEnum_after.txt
index cbd6c01c891..18fb4e36949 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedCompanionOfEnum_after.txt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedCompanionOfEnum_after.txt
@@ -30,6 +30,7 @@ public final enum class EnumWithLambda : kotlin.Enum<EnumWithLambda> {
     }
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<EnumWithLambda>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumWithLambda
     public final /*synthesized*/ fun values(): kotlin.Array<EnumWithLambda>
 }
@@ -69,6 +70,7 @@ public final enum class OtherEnum : kotlin.Enum<OtherEnum> {
     }
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<OtherEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): OtherEnum
     public final /*synthesized*/ fun values(): kotlin.Array<OtherEnum>
 }
@@ -108,7 +110,7 @@ public final enum class SomeEnum : kotlin.Enum<SomeEnum> {
     }
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<SomeEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): SomeEnum
     public final /*synthesized*/ fun values(): kotlin.Array<SomeEnum>
 }
-
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedCompanionOfEnum_before.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedCompanionOfEnum_before.txt
index cbd6c01c891..18fb4e36949 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedCompanionOfEnum_before.txt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedCompanionOfEnum_before.txt
@@ -30,6 +30,7 @@ public final enum class EnumWithLambda : kotlin.Enum<EnumWithLambda> {
     }
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<EnumWithLambda>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumWithLambda
     public final /*synthesized*/ fun values(): kotlin.Array<EnumWithLambda>
 }
@@ -69,6 +70,7 @@ public final enum class OtherEnum : kotlin.Enum<OtherEnum> {
     }
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<OtherEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): OtherEnum
     public final /*synthesized*/ fun values(): kotlin.Array<OtherEnum>
 }
@@ -108,7 +110,7 @@ public final enum class SomeEnum : kotlin.Enum<SomeEnum> {
     }
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<SomeEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): SomeEnum
     public final /*synthesized*/ fun values(): kotlin.Array<SomeEnum>
 }
-
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedQualifiedEnumEntry.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedQualifiedEnumEntry.txt
index 6d19b0e9564..34b15d9fdbb 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedQualifiedEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedQualifiedEnumEntry.txt
@@ -18,6 +18,7 @@ public final enum class SomeEnum11 : kotlin.Enum<SomeEnum11> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<SomeEnum11>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): SomeEnum11
     public final /*synthesized*/ fun values(): kotlin.Array<SomeEnum11>
 }
@@ -40,6 +41,7 @@ public final enum class SomeEnum12 : kotlin.Enum<SomeEnum12> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<SomeEnum12>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): SomeEnum12
     public final /*synthesized*/ fun values(): kotlin.Array<SomeEnum12>
 }
@@ -62,6 +64,7 @@ public final enum class SomeEnum21 : kotlin.Enum<SomeEnum21> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<SomeEnum21>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): SomeEnum21
     public final /*synthesized*/ fun values(): kotlin.Array<SomeEnum21>
 }
@@ -84,6 +87,7 @@ public final enum class SomeEnum22 : kotlin.Enum<SomeEnum22> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<SomeEnum22>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): SomeEnum22
     public final /*synthesized*/ fun values(): kotlin.Array<SomeEnum22>
 }
@@ -106,7 +110,7 @@ public final enum class SomeEnum3 : kotlin.Enum<SomeEnum3> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<SomeEnum3>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): SomeEnum3
     public final /*synthesized*/ fun values(): kotlin.Array<SomeEnum3>
 }
-
diff --git a/compiler/testData/diagnostics/tests/dataClasses/strange.txt b/compiler/testData/diagnostics/tests/dataClasses/strange.txt
index 57fd6e3beac..2ec7fd6de4d 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/strange.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/strange.txt
@@ -18,6 +18,7 @@ public final data enum class First : kotlin.Enum<First> {
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<First>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): First
     public final /*synthesized*/ fun values(): kotlin.Array<First>
 }
@@ -42,4 +43,3 @@ public data interface Third {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt
index 461e0162d9e..a7a6bcbecea 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt
@@ -76,6 +76,7 @@ public open enum class C : kotlin.Enum<C> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<C>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): C
     public final /*synthesized*/ fun values(): kotlin.Array<C>
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt b/compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt
index 37ed67c3910..51529062403 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt
@@ -28,6 +28,7 @@ package kt1193 {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<kt1193.MyEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt1193.MyEnum
         public final /*synthesized*/ fun values(): kotlin.Array<kt1193.MyEnum>
     }
diff --git a/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.txt b/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.txt
index 28e1dff31c0..c85fbdf3059 100644
--- a/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.txt
+++ b/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.txt
@@ -29,6 +29,7 @@ public open enum class EN : kotlin.Enum<EN> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<EN>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EN
     public final /*synthesized*/ fun values(): kotlin.Array<EN>
 }
diff --git a/compiler/testData/diagnostics/tests/deprecated/usageOnEnum.txt b/compiler/testData/diagnostics/tests/deprecated/usageOnEnum.txt
index e58f8dd747f..3f7c49ae6e2 100644
--- a/compiler/testData/diagnostics/tests/deprecated/usageOnEnum.txt
+++ b/compiler/testData/diagnostics/tests/deprecated/usageOnEnum.txt
@@ -16,6 +16,7 @@ package
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Foo>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Foo
     public final /*synthesized*/ fun values(): kotlin.Array<Foo>
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.txt
index f98ef97b7ca..3f7affbbc51 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.txt
@@ -15,6 +15,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt
index 913152a71c7..cd2af0ff43a 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt
@@ -31,6 +31,7 @@ public final enum class `<no name provided>` : kotlin.Enum<`<no name provided>`>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<`<no name provided>`>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): `<no name provided>`
     public final /*synthesized*/ fun values(): kotlin.Array<`<no name provided>`>
 }
@@ -83,6 +84,7 @@ public final class Outer {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Outer.`<no name provided>`>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Outer.`<no name provided>`
         public final /*synthesized*/ fun values(): kotlin.Array<Outer.`<no name provided>`>
     }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt
index 180a7d063b9..39631f48ed9 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt
@@ -17,6 +17,7 @@ public final enum class E : kotlin.Enum<E> {
     public final fun values(): kotlin.Array<E>
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt
index b6e1baac0ae..6bf796092ee 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt
@@ -21,6 +21,7 @@ public final enum class A : kotlin.Enum<A> {
     public final fun values(/*0*/ x: kotlin.String): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/AbstractEnum.txt b/compiler/testData/diagnostics/tests/enum/AbstractEnum.txt
index 69daf9bad0d..9b77b606d7b 100644
--- a/compiler/testData/diagnostics/tests/enum/AbstractEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/AbstractEnum.txt
@@ -15,6 +15,7 @@ package abstract {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<abstract.MyAbstractEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): abstract.MyAbstractEnum
         public final /*synthesized*/ fun values(): kotlin.Array<abstract.MyAbstractEnum>
     }
diff --git a/compiler/testData/diagnostics/tests/enum/AbstractInEnum.txt b/compiler/testData/diagnostics/tests/enum/AbstractInEnum.txt
index a710384789b..7a68f8921e9 100644
--- a/compiler/testData/diagnostics/tests/enum/AbstractInEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/AbstractInEnum.txt
@@ -46,6 +46,7 @@ package abstract {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<abstract.MyEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): abstract.MyEnum
         public final /*synthesized*/ fun values(): kotlin.Array<abstract.MyEnum>
     }
diff --git a/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.txt b/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.txt
index beac85688d0..bd8fbfbd84e 100644
--- a/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.txt
@@ -16,6 +16,7 @@ public final enum class E : kotlin.Enum<E>, T {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.txt b/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.txt
index acf7058f2be..b31824c8905 100644
--- a/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.txt
+++ b/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.txt
@@ -20,6 +20,7 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.txt b/compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.txt
index e6ee5b723e6..239a6754c8c 100644
--- a/compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.txt
+++ b/compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.txt
@@ -19,6 +19,7 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.txt b/compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.txt
index af1d1b96f90..6dd99435a5f 100644
--- a/compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.txt
+++ b/compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.txt
@@ -19,6 +19,7 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.txt b/compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.txt
index 3979b1fcfaf..05d2b4f04d3 100644
--- a/compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.txt
+++ b/compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.txt
@@ -24,6 +24,7 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/NonPrivateConstructor.txt b/compiler/testData/diagnostics/tests/enum/NonPrivateConstructor.txt
index a39e8313015..3796ccf74be 100644
--- a/compiler/testData/diagnostics/tests/enum/NonPrivateConstructor.txt
+++ b/compiler/testData/diagnostics/tests/enum/NonPrivateConstructor.txt
@@ -18,6 +18,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.txt b/compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.txt
index 58b1acde495..941164bd2d5 100644
--- a/compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.txt
+++ b/compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.txt
@@ -23,6 +23,7 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt b/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt
index 26d3a508a19..e115b3fde8c 100644
--- a/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt
@@ -25,6 +25,7 @@ public final enum class E : kotlin.Enum<E> {
     }
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt b/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt
index e60201f1cf5..ac8ed406c90 100644
--- a/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt
+++ b/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt
@@ -27,6 +27,7 @@ public final enum class E : kotlin.Enum<E> {
     }
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/commonSupertype.ni.txt b/compiler/testData/diagnostics/tests/enum/commonSupertype.ni.txt
index 92e74ebfbbd..08b9cf5207f 100644
--- a/compiler/testData/diagnostics/tests/enum/commonSupertype.ni.txt
+++ b/compiler/testData/diagnostics/tests/enum/commonSupertype.ni.txt
@@ -17,6 +17,7 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
@@ -36,6 +37,7 @@ public final enum class B : kotlin.Enum<B> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<B>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): B
     public final /*synthesized*/ fun values(): kotlin.Array<B>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/compareTwoDifferentEnums.txt b/compiler/testData/diagnostics/tests/enum/compareTwoDifferentEnums.txt
index 1ccd7b2b488..306501cee79 100644
--- a/compiler/testData/diagnostics/tests/enum/compareTwoDifferentEnums.txt
+++ b/compiler/testData/diagnostics/tests/enum/compareTwoDifferentEnums.txt
@@ -17,6 +17,7 @@ public final enum class JavaEnumA : kotlin.Enum<JavaEnumA!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<JavaEnumA>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): JavaEnumA
     public final /*synthesized*/ fun values(): kotlin.Array<JavaEnumA>
 }
@@ -34,6 +35,7 @@ public final enum class JavaEnumB : kotlin.Enum<JavaEnumB!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<JavaEnumB>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): JavaEnumB
     public final /*synthesized*/ fun values(): kotlin.Array<JavaEnumB>
 }
@@ -51,6 +53,7 @@ public final enum class KotlinEnumA : kotlin.Enum<KotlinEnumA> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<KotlinEnumA>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): KotlinEnumA
     public final /*synthesized*/ fun values(): kotlin.Array<KotlinEnumA>
 }
@@ -68,6 +71,7 @@ public final enum class KotlinEnumB : kotlin.Enum<KotlinEnumB> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<KotlinEnumB>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): KotlinEnumB
     public final /*synthesized*/ fun values(): kotlin.Array<KotlinEnumB>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/constructorWithDefaultParametersOnly.txt b/compiler/testData/diagnostics/tests/enum/constructorWithDefaultParametersOnly.txt
index 8b842a48217..0dfb5c4887e 100644
--- a/compiler/testData/diagnostics/tests/enum/constructorWithDefaultParametersOnly.txt
+++ b/compiler/testData/diagnostics/tests/enum/constructorWithDefaultParametersOnly.txt
@@ -20,6 +20,7 @@ public final enum class TestErrors : kotlin.Enum<TestErrors> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<TestErrors>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): TestErrors
     public final /*synthesized*/ fun values(): kotlin.Array<TestErrors>
 }
@@ -42,6 +43,7 @@ public final enum class TestMultipleConstructors : kotlin.Enum<TestMultipleConst
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<TestMultipleConstructors>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): TestMultipleConstructors
     public final /*synthesized*/ fun values(): kotlin.Array<TestMultipleConstructors>
 }
@@ -66,6 +68,7 @@ public final enum class TestOk : kotlin.Enum<TestOk> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<TestOk>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): TestOk
     public final /*synthesized*/ fun values(): kotlin.Array<TestOk>
 }
@@ -87,6 +90,7 @@ public final enum class TestVarargs : kotlin.Enum<TestVarargs> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<TestVarargs>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): TestVarargs
     public final /*synthesized*/ fun values(): kotlin.Array<TestVarargs>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry_after.txt b/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry_after.txt
index e4c5bd0b9a0..1682f7250e7 100644
--- a/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry_after.txt
+++ b/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry_after.txt
@@ -24,6 +24,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry_before.txt b/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry_before.txt
index e4c5bd0b9a0..1682f7250e7 100644
--- a/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry_before.txt
+++ b/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry_before.txt
@@ -24,6 +24,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/emptyConstructor.txt b/compiler/testData/diagnostics/tests/enum/emptyConstructor.txt
index 91bc9e87c35..ecd7f1d1085 100644
--- a/compiler/testData/diagnostics/tests/enum/emptyConstructor.txt
+++ b/compiler/testData/diagnostics/tests/enum/emptyConstructor.txt
@@ -15,6 +15,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.txt b/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.txt
index 76544569912..40d65561697 100644
--- a/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.txt
+++ b/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.txt
@@ -19,6 +19,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt b/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt
index 576739f2328..5d9f84d5d7c 100644
--- a/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt
@@ -19,6 +19,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.txt b/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.txt
index 8cd11aed75b..3774fc4eff0 100644
--- a/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.txt
@@ -19,6 +19,7 @@ public final enum class EnumClass : kotlin.Enum<EnumClass> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<EnumClass>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumClass
     public final /*synthesized*/ fun values(): kotlin.Array<EnumClass>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt b/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt
index 5a115c80a16..a296d7d139f 100644
--- a/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt
@@ -18,6 +18,7 @@ public final enum class EnumImplementingTraitWithFun : kotlin.Enum<EnumImplement
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<EnumImplementingTraitWithFun>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumImplementingTraitWithFun
     public final /*synthesized*/ fun values(): kotlin.Array<EnumImplementingTraitWithFun>
 }
@@ -40,6 +41,7 @@ public final enum class EnumImplementingTraitWithVal : kotlin.Enum<EnumImplement
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<EnumImplementingTraitWithVal>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumImplementingTraitWithVal
     public final /*synthesized*/ fun values(): kotlin.Array<EnumImplementingTraitWithVal>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumInheritance.txt b/compiler/testData/diagnostics/tests/enum/enumInheritance.txt
index a84c71e4a21..4b898ea27c1 100644
--- a/compiler/testData/diagnostics/tests/enum/enumInheritance.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumInheritance.txt
@@ -14,6 +14,7 @@ public final enum class MyEnum : MyClass {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
@@ -31,6 +32,7 @@ public final enum class MyEnum2 : kotlin.Enum<MyEnum2>, MyTrait {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MyEnum2>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum2
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum2>
 }
@@ -48,6 +50,7 @@ public final enum class MyEnum2_1 : kotlin.Enum<MyEnum2_1>, MyTrait {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MyEnum2_1>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum2_1
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum2_1>
 }
@@ -65,6 +68,7 @@ public final enum class MyEnum3 : MyEnumBase {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MyEnum3>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum3
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum3>
 }
@@ -82,6 +86,7 @@ public final enum class MyEnumBase : kotlin.Enum<MyEnumBase> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MyEnumBase>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnumBase
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnumBase>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt b/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt
index 156f7a537fd..f7961c207c5 100644
--- a/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt
@@ -19,6 +19,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumMissingName.txt b/compiler/testData/diagnostics/tests/enum/enumMissingName.txt
index 8dc75bcf4d8..93c595ed5af 100644
--- a/compiler/testData/diagnostics/tests/enum/enumMissingName.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumMissingName.txt
@@ -20,6 +20,7 @@ public final enum class `<no name provided>` : kotlin.Enum<`<no name provided>`>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<`<no name provided>`>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): `<no name provided>`
     public final /*synthesized*/ fun values(): kotlin.Array<`<no name provided>`>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumModifier.txt b/compiler/testData/diagnostics/tests/enum/enumModifier.txt
index 76f236dd0c3..59824ae7094 100644
--- a/compiler/testData/diagnostics/tests/enum/enumModifier.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumModifier.txt
@@ -31,6 +31,7 @@ public final enum class B : kotlin.Enum<B> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<B>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): B
     public final /*synthesized*/ fun values(): kotlin.Array<B>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumStarImport.txt b/compiler/testData/diagnostics/tests/enum/enumStarImport.txt
index 153fdc7da47..d9c3777e414 100644
--- a/compiler/testData/diagnostics/tests/enum/enumStarImport.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumStarImport.txt
@@ -21,6 +21,7 @@ package enum {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<enum.HappyEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): enum.HappyEnum
         public final /*synthesized*/ fun values(): kotlin.Array<enum.HappyEnum>
     }
diff --git a/compiler/testData/diagnostics/tests/enum/enumSubjectTypeCheck.txt b/compiler/testData/diagnostics/tests/enum/enumSubjectTypeCheck.txt
index aebb5de0fed..9aafb487d63 100644
--- a/compiler/testData/diagnostics/tests/enum/enumSubjectTypeCheck.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumSubjectTypeCheck.txt
@@ -24,6 +24,7 @@ public final enum class En : kotlin.Enum<En> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<En>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): En
     public final /*synthesized*/ fun values(): kotlin.Array<En>
 }
@@ -47,6 +48,7 @@ public final enum class En2 : kotlin.Enum<En2> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<En2>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): En2
     public final /*synthesized*/ fun values(): kotlin.Array<En2>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt b/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt
index e8407061105..d5977e4025b 100644
--- a/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt
@@ -15,6 +15,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.txt b/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.txt
index 2621a402d67..a7ce3c29073 100644
--- a/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.txt
@@ -13,6 +13,7 @@ public final enum class `<no name provided>` : kotlin.Enum<`<no name provided>`>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<`<no name provided>`>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): `<no name provided>`
     public final /*synthesized*/ fun values(): kotlin.Array<`<no name provided>`>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.txt
index 568ca0539cf..f5dd8ff0fc0 100644
--- a/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.txt
@@ -19,6 +19,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/ifEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/ifEnumEntry.txt
index 87f14fc0f2d..6024c917f83 100644
--- a/compiler/testData/diagnostics/tests/enum/ifEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/ifEnumEntry.txt
@@ -19,6 +19,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/incompatibleEnumEntryClasses.txt b/compiler/testData/diagnostics/tests/enum/incompatibleEnumEntryClasses.txt
index b5a9c2f75ae..a5c5b163b6d 100644
--- a/compiler/testData/diagnostics/tests/enum/incompatibleEnumEntryClasses.txt
+++ b/compiler/testData/diagnostics/tests/enum/incompatibleEnumEntryClasses.txt
@@ -22,6 +22,7 @@ public final enum class E1 : kotlin.Enum<E1>, I {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E1>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E1
     public final /*synthesized*/ fun values(): kotlin.Array<E1>
 }
@@ -44,6 +45,7 @@ public final enum class E2 : kotlin.Enum<E2>, I {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E2>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E2
     public final /*synthesized*/ fun values(): kotlin.Array<E2>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/incompatibleEnums.txt b/compiler/testData/diagnostics/tests/enum/incompatibleEnums.txt
index ac182208e71..8d9a836b350 100644
--- a/compiler/testData/diagnostics/tests/enum/incompatibleEnums.txt
+++ b/compiler/testData/diagnostics/tests/enum/incompatibleEnums.txt
@@ -28,6 +28,7 @@ public final enum class E1 : kotlin.Enum<E1> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E1>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E1
     public final /*synthesized*/ fun values(): kotlin.Array<E1>
 }
@@ -49,6 +50,7 @@ public final enum class E2 : kotlin.Enum<E2> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E2>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E2
     public final /*synthesized*/ fun values(): kotlin.Array<E2>
 }
@@ -70,6 +72,7 @@ public final enum class E3 : kotlin.Enum<E3>, MyInterface {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E3>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E3
     public final /*synthesized*/ fun values(): kotlin.Array<E3>
 }
@@ -89,6 +92,7 @@ public final enum class E4 : kotlin.Enum<E4>, Inv<kotlin.Int> {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E4>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E4
     public final /*synthesized*/ fun values(): kotlin.Array<E4>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/incompatibleEnums_1_4.txt b/compiler/testData/diagnostics/tests/enum/incompatibleEnums_1_4.txt
index ac182208e71..8d9a836b350 100644
--- a/compiler/testData/diagnostics/tests/enum/incompatibleEnums_1_4.txt
+++ b/compiler/testData/diagnostics/tests/enum/incompatibleEnums_1_4.txt
@@ -28,6 +28,7 @@ public final enum class E1 : kotlin.Enum<E1> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E1>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E1
     public final /*synthesized*/ fun values(): kotlin.Array<E1>
 }
@@ -49,6 +50,7 @@ public final enum class E2 : kotlin.Enum<E2> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E2>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E2
     public final /*synthesized*/ fun values(): kotlin.Array<E2>
 }
@@ -70,6 +72,7 @@ public final enum class E3 : kotlin.Enum<E3>, MyInterface {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E3>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E3
     public final /*synthesized*/ fun values(): kotlin.Array<E3>
 }
@@ -89,6 +92,7 @@ public final enum class E4 : kotlin.Enum<E4>, Inv<kotlin.Int> {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E4>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E4
     public final /*synthesized*/ fun values(): kotlin.Array<E4>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.txt
index e4478b8aa8a..1f58091ab4b 100644
--- a/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.txt
@@ -28,6 +28,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.txt b/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.txt
index f2c4cc543c6..c999ddb523f 100644
--- a/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.txt
@@ -41,6 +41,7 @@ public open enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
@@ -58,6 +59,7 @@ public final enum class MyEnum2 : kotlin.Enum<MyEnum2> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MyEnum2>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum2
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum2>
 }
@@ -75,6 +77,7 @@ public final enum class MyJavaEnum : kotlin.Enum<MyJavaEnum!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MyJavaEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyJavaEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyJavaEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inline.txt b/compiler/testData/diagnostics/tests/enum/inline.txt
index 5d9b03b5379..39273f809a6 100644
--- a/compiler/testData/diagnostics/tests/enum/inline.txt
+++ b/compiler/testData/diagnostics/tests/enum/inline.txt
@@ -15,6 +15,7 @@ public final enum class My : kotlin.Enum<My> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt b/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt
index 9a73f3652ad..810f75702de 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt
@@ -28,6 +28,7 @@ public final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
         public final /*synthesized*/ fun values(): kotlin.Array<A.E>
     }
@@ -61,6 +62,7 @@ public final class B {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<B.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): B.E
         public final /*synthesized*/ fun values(): kotlin.Array<B.E>
     }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideClass.txt b/compiler/testData/diagnostics/tests/enum/inner/insideClass.txt
index 91b7d545f89..889a70292b9 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideClass.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideClass.txt
@@ -21,6 +21,7 @@ public final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
         public final /*synthesized*/ fun values(): kotlin.Array<A.E>
     }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt b/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt
index 0dc96c2897a..3de7c44ecde 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt
@@ -27,6 +27,7 @@ public final class A {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
             // Static members
+            public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A.Companion.E>
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Companion.E
             public final /*synthesized*/ fun values(): kotlin.Array<A.Companion.E>
         }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideEnum.txt b/compiler/testData/diagnostics/tests/enum/inner/insideEnum.txt
index ce0a3b15076..60a823e0eb6 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideEnum.txt
@@ -29,11 +29,13 @@ public final enum class E : kotlin.Enum<E> {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E.F>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E.F
         public final /*synthesized*/ fun values(): kotlin.Array<E.F>
     }
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry_after.txt b/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry_after.txt
index 64128a1bc9b..52a4a0902c4 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry_after.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry_after.txt
@@ -15,6 +15,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry_before.txt b/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry_before.txt
index 64128a1bc9b..52a4a0902c4 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry_before.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry_before.txt
@@ -15,6 +15,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.txt b/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.txt
index a5a1a11ede7..46e2556f21d 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.txt
@@ -27,6 +27,7 @@ public final class A {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
             // Static members
+            public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A.B.E>
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.B.E
             public final /*synthesized*/ fun values(): kotlin.Array<A.B.E>
         }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideObject.txt b/compiler/testData/diagnostics/tests/enum/inner/insideObject.txt
index fce490a91ad..b4c547c5474 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideObject.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideObject.txt
@@ -21,6 +21,7 @@ public object A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
         public final /*synthesized*/ fun values(): kotlin.Array<A.E>
     }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideTrait.txt b/compiler/testData/diagnostics/tests/enum/inner/insideTrait.txt
index 341524d6176..64481121c57 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideTrait.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideTrait.txt
@@ -20,6 +20,7 @@ public interface A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
         public final /*synthesized*/ fun values(): kotlin.Array<A.E>
     }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt b/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt
index 75f92704212..ea0edf96c30 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt
@@ -27,6 +27,7 @@ public final class A {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
             // Static members
+            public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A.Companion.E>
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Companion.E
             public final /*synthesized*/ fun values(): kotlin.Array<A.Companion.E>
         }
@@ -47,6 +48,7 @@ public final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
         public final /*synthesized*/ fun values(): kotlin.Array<A.E>
     }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/twoEnums.txt b/compiler/testData/diagnostics/tests/enum/inner/twoEnums.txt
index 5607d7ed9e7..c1bec4806fb 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/twoEnums.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/twoEnums.txt
@@ -21,6 +21,7 @@ public final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
         public final /*synthesized*/ fun values(): kotlin.Array<A.E>
     }
@@ -40,6 +41,7 @@ public final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A.F>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.F
         public final /*synthesized*/ fun values(): kotlin.Array<A.F>
     }
diff --git a/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt b/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt
index dc523e32087..8d99817917a 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt
@@ -27,6 +27,7 @@ public final class A {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
             // Static members
+            public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A.B.E>
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.B.E
             public final /*synthesized*/ fun values(): kotlin.Array<A.B.E>
         }
@@ -53,6 +54,7 @@ public final class A {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
             // Static members
+            public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A.Companion.E>
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Companion.E
             public final /*synthesized*/ fun values(): kotlin.Array<A.Companion.E>
         }
diff --git a/compiler/testData/diagnostics/tests/enum/isEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/isEnumEntry.txt
index 87f14fc0f2d..6024c917f83 100644
--- a/compiler/testData/diagnostics/tests/enum/isEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/isEnumEntry.txt
@@ -19,6 +19,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.txt b/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.txt
index 6b9d2b89a1b..282e2f9c14b 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.txt
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.txt
@@ -17,6 +17,7 @@ public final enum class A : kotlin.Enum<A!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.txt b/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.txt
index 7581f327062..96daa765c8a 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.txt
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.txt
@@ -19,6 +19,7 @@ public final enum class A : kotlin.Enum<A!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.txt b/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.txt
index 6e73ac7aa02..d2932060b35 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.txt
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.txt
@@ -18,6 +18,7 @@ public final enum class A : kotlin.Enum<A!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.txt b/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.txt
index 0be72fc17c6..edcc0e4178c 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.txt
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.txt
@@ -20,6 +20,7 @@ public final enum class A : kotlin.Enum<A!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.txt b/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.txt
index a56c07d9b83..6b57e5832a2 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.txt
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.txt
@@ -20,6 +20,7 @@ public final enum class A : kotlin.Enum<A!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.txt b/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.txt
index 696a76ec9a8..7a2d76f13a4 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.txt
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.txt
@@ -20,6 +20,7 @@ public final enum class A : kotlin.Enum<A!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/kt2834.txt b/compiler/testData/diagnostics/tests/enum/kt2834.txt
index 11f24ff8872..7759a465e61 100644
--- a/compiler/testData/diagnostics/tests/enum/kt2834.txt
+++ b/compiler/testData/diagnostics/tests/enum/kt2834.txt
@@ -19,6 +19,7 @@ private final enum class MethodKind : kotlin.Enum<MethodKind> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MethodKind>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MethodKind
     public final /*synthesized*/ fun values(): kotlin.Array<MethodKind>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.txt b/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.txt
index 5073f9bf983..449ff878660 100644
--- a/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.txt
+++ b/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.txt
@@ -15,6 +15,7 @@ public final enum class E : kotlin.Enum<E>, kotlin.Cloneable {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt
index 34634bfced5..a9ad9b6f849 100644
--- a/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt
@@ -45,6 +45,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/multipleConstructors.txt b/compiler/testData/diagnostics/tests/enum/multipleConstructors.txt
index e78de39c453..1071262838d 100644
--- a/compiler/testData/diagnostics/tests/enum/multipleConstructors.txt
+++ b/compiler/testData/diagnostics/tests/enum/multipleConstructors.txt
@@ -23,6 +23,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt b/compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt
index 035b81abb51..dedf4d329e2 100644
--- a/compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt
@@ -21,6 +21,7 @@ public final enum class EnumWithOpenMembers : kotlin.Enum<EnumWithOpenMembers> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<EnumWithOpenMembers>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumWithOpenMembers
     public final /*synthesized*/ fun values(): kotlin.Array<EnumWithOpenMembers>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.txt b/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.txt
index 52c8f28432f..904598ba8bb 100644
--- a/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.txt
+++ b/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.txt
@@ -15,6 +15,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/secondaryConstructorWithoutDelegatingToPrimaryOne.txt b/compiler/testData/diagnostics/tests/enum/secondaryConstructorWithoutDelegatingToPrimaryOne.txt
index 9f8e93c31c7..f01fad83ff1 100644
--- a/compiler/testData/diagnostics/tests/enum/secondaryConstructorWithoutDelegatingToPrimaryOne.txt
+++ b/compiler/testData/diagnostics/tests/enum/secondaryConstructorWithoutDelegatingToPrimaryOne.txt
@@ -17,6 +17,7 @@ public final enum class Enum1 : kotlin.Enum<Enum1> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Enum1>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Enum1
     public final /*synthesized*/ fun values(): kotlin.Array<Enum1>
 }
@@ -40,6 +41,7 @@ public final enum class Enum2 : kotlin.Enum<Enum2> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Enum2>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Enum2
     public final /*synthesized*/ fun values(): kotlin.Array<Enum2>
 }
@@ -65,6 +67,7 @@ public final enum class Enum3 : kotlin.Enum<Enum3> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Enum3>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Enum3
     public final /*synthesized*/ fun values(): kotlin.Array<Enum3>
 }
@@ -90,6 +93,7 @@ public final enum class Enum4 : kotlin.Enum<Enum4> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Enum4>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Enum4
     public final /*synthesized*/ fun values(): kotlin.Array<Enum4>
 }
@@ -115,6 +119,7 @@ public final enum class Enum5 : kotlin.Enum<Enum5> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Enum5>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Enum5
     public final /*synthesized*/ fun values(): kotlin.Array<Enum5>
 }
@@ -139,6 +144,7 @@ public final enum class Enum6 : kotlin.Enum<Enum6> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Enum6>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Enum6
     public final /*synthesized*/ fun values(): kotlin.Array<Enum6>
 }
@@ -165,6 +171,7 @@ public final enum class Enum7 : kotlin.Enum<Enum7> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Enum7>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Enum7
     public final /*synthesized*/ fun values(): kotlin.Array<Enum7>
 }
@@ -191,6 +198,7 @@ public final enum class Enum8 : kotlin.Enum<Enum8> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Enum8>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Enum8
     public final /*synthesized*/ fun values(): kotlin.Array<Enum8>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/secondaryConstructorWithoutDelegatingToPrimaryOneWithEnabledFeature.txt b/compiler/testData/diagnostics/tests/enum/secondaryConstructorWithoutDelegatingToPrimaryOneWithEnabledFeature.txt
index 9f8e93c31c7..f01fad83ff1 100644
--- a/compiler/testData/diagnostics/tests/enum/secondaryConstructorWithoutDelegatingToPrimaryOneWithEnabledFeature.txt
+++ b/compiler/testData/diagnostics/tests/enum/secondaryConstructorWithoutDelegatingToPrimaryOneWithEnabledFeature.txt
@@ -17,6 +17,7 @@ public final enum class Enum1 : kotlin.Enum<Enum1> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Enum1>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Enum1
     public final /*synthesized*/ fun values(): kotlin.Array<Enum1>
 }
@@ -40,6 +41,7 @@ public final enum class Enum2 : kotlin.Enum<Enum2> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Enum2>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Enum2
     public final /*synthesized*/ fun values(): kotlin.Array<Enum2>
 }
@@ -65,6 +67,7 @@ public final enum class Enum3 : kotlin.Enum<Enum3> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Enum3>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Enum3
     public final /*synthesized*/ fun values(): kotlin.Array<Enum3>
 }
@@ -90,6 +93,7 @@ public final enum class Enum4 : kotlin.Enum<Enum4> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Enum4>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Enum4
     public final /*synthesized*/ fun values(): kotlin.Array<Enum4>
 }
@@ -115,6 +119,7 @@ public final enum class Enum5 : kotlin.Enum<Enum5> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Enum5>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Enum5
     public final /*synthesized*/ fun values(): kotlin.Array<Enum5>
 }
@@ -139,6 +144,7 @@ public final enum class Enum6 : kotlin.Enum<Enum6> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Enum6>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Enum6
     public final /*synthesized*/ fun values(): kotlin.Array<Enum6>
 }
@@ -165,6 +171,7 @@ public final enum class Enum7 : kotlin.Enum<Enum7> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Enum7>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Enum7
     public final /*synthesized*/ fun values(): kotlin.Array<Enum7>
 }
@@ -191,6 +198,7 @@ public final enum class Enum8 : kotlin.Enum<Enum8> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Enum8>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Enum8
     public final /*synthesized*/ fun values(): kotlin.Array<Enum8>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt b/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt
index ae5c5b8917a..cad940e3d4e 100644
--- a/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt
+++ b/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt
@@ -42,6 +42,7 @@ package foo {
         }
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<foo.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): foo.E
         public final /*synthesized*/ fun values(): kotlin.Array<foo.E>
     }
diff --git a/compiler/testData/diagnostics/tests/enum/typeCompatibility.txt b/compiler/testData/diagnostics/tests/enum/typeCompatibility.txt
index e775a7737db..7f39fb81675 100644
--- a/compiler/testData/diagnostics/tests/enum/typeCompatibility.txt
+++ b/compiler/testData/diagnostics/tests/enum/typeCompatibility.txt
@@ -78,6 +78,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.txt b/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.txt
index ba16a46951f..88db2b712fe 100644
--- a/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.txt
@@ -17,6 +17,7 @@ package bug {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<bug.Foo<T>>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): bug.Foo<T>
         public final /*synthesized*/ fun values(): kotlin.Array<bug.Foo<T>>
     }
diff --git a/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt b/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt
index 31e966739ad..f4ab67ba355 100644
--- a/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt
+++ b/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt
@@ -33,6 +33,7 @@ public final enum class E : kotlin.Enum<E> {
     }
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/enum/wrongUnitializedEnumCompanion.txt b/compiler/testData/diagnostics/tests/enum/wrongUnitializedEnumCompanion.txt
index bdc591b5246..eb4cfd815d1 100644
--- a/compiler/testData/diagnostics/tests/enum/wrongUnitializedEnumCompanion.txt
+++ b/compiler/testData/diagnostics/tests/enum/wrongUnitializedEnumCompanion.txt
@@ -22,6 +22,7 @@ public final enum class Foo : kotlin.Enum<Foo> {
     }
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Foo>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Foo
     public final /*synthesized*/ fun values(): kotlin.Array<Foo>
 }
diff --git a/compiler/testData/diagnostics/tests/exposed/privatePropertyInPrivateConstructor.txt b/compiler/testData/diagnostics/tests/exposed/privatePropertyInPrivateConstructor.txt
index 602f1b10694..e563de87f66 100644
--- a/compiler/testData/diagnostics/tests/exposed/privatePropertyInPrivateConstructor.txt
+++ b/compiler/testData/diagnostics/tests/exposed/privatePropertyInPrivateConstructor.txt
@@ -25,6 +25,7 @@ private final enum class Foo : kotlin.Enum<Foo> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Foo>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Foo
     public final /*synthesized*/ fun values(): kotlin.Array<Foo>
 }
diff --git a/compiler/testData/diagnostics/tests/exposed/propertyInConstructorOfPrivateClass.txt b/compiler/testData/diagnostics/tests/exposed/propertyInConstructorOfPrivateClass.txt
index 9734caed747..d9a0e32ff21 100644
--- a/compiler/testData/diagnostics/tests/exposed/propertyInConstructorOfPrivateClass.txt
+++ b/compiler/testData/diagnostics/tests/exposed/propertyInConstructorOfPrivateClass.txt
@@ -25,6 +25,7 @@ private final enum class Foo : kotlin.Enum<Foo> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Foo>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Foo
     public final /*synthesized*/ fun values(): kotlin.Array<Foo>
 }
diff --git a/compiler/testData/diagnostics/tests/exposed/propertyInPrivateConstructor.txt b/compiler/testData/diagnostics/tests/exposed/propertyInPrivateConstructor.txt
index aac34f26f2f..da03e91ef58 100644
--- a/compiler/testData/diagnostics/tests/exposed/propertyInPrivateConstructor.txt
+++ b/compiler/testData/diagnostics/tests/exposed/propertyInPrivateConstructor.txt
@@ -25,6 +25,7 @@ private final enum class Foo : kotlin.Enum<Foo> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Foo>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Foo
     public final /*synthesized*/ fun values(): kotlin.Array<Foo>
 }
diff --git a/compiler/testData/diagnostics/tests/exposed/propertyInPrivateConstructorError.txt b/compiler/testData/diagnostics/tests/exposed/propertyInPrivateConstructorError.txt
index aac34f26f2f..da03e91ef58 100644
--- a/compiler/testData/diagnostics/tests/exposed/propertyInPrivateConstructorError.txt
+++ b/compiler/testData/diagnostics/tests/exposed/propertyInPrivateConstructorError.txt
@@ -25,6 +25,7 @@ private final enum class Foo : kotlin.Enum<Foo> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Foo>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Foo
     public final /*synthesized*/ fun values(): kotlin.Array<Foo>
 }
diff --git a/compiler/testData/diagnostics/tests/exposed/propertyInSimpleConstructor.txt b/compiler/testData/diagnostics/tests/exposed/propertyInSimpleConstructor.txt
index ee3b531f6e3..a17d6e388e1 100644
--- a/compiler/testData/diagnostics/tests/exposed/propertyInSimpleConstructor.txt
+++ b/compiler/testData/diagnostics/tests/exposed/propertyInSimpleConstructor.txt
@@ -25,6 +25,7 @@ private final enum class Foo : kotlin.Enum<Foo> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Foo>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Foo
     public final /*synthesized*/ fun values(): kotlin.Array<Foo>
 }
diff --git a/compiler/testData/diagnostics/tests/imports/EnumEntryVsStaticAmbiguity.txt b/compiler/testData/diagnostics/tests/imports/EnumEntryVsStaticAmbiguity.txt
index 9e2def9a15f..ae26d4f2e21 100644
--- a/compiler/testData/diagnostics/tests/imports/EnumEntryVsStaticAmbiguity.txt
+++ b/compiler/testData/diagnostics/tests/imports/EnumEntryVsStaticAmbiguity.txt
@@ -31,6 +31,7 @@ package second {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<second.SomeEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): second.SomeEnum
         public final /*synthesized*/ fun values(): kotlin.Array<second.SomeEnum>
     }
diff --git a/compiler/testData/diagnostics/tests/imports/EnumEntryVsStaticAmbiguity2.txt b/compiler/testData/diagnostics/tests/imports/EnumEntryVsStaticAmbiguity2.txt
index b79831712b1..847515cd8f6 100644
--- a/compiler/testData/diagnostics/tests/imports/EnumEntryVsStaticAmbiguity2.txt
+++ b/compiler/testData/diagnostics/tests/imports/EnumEntryVsStaticAmbiguity2.txt
@@ -31,6 +31,7 @@ package second {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<second.SomeEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): second.SomeEnum
         public final /*synthesized*/ fun values(): kotlin.Array<second.SomeEnum>
     }
@@ -53,6 +54,7 @@ package third {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<third.SomeEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): third.SomeEnum
         public final /*synthesized*/ fun values(): kotlin.Array<third.SomeEnum>
     }
diff --git a/compiler/testData/diagnostics/tests/imports/EnumEntryVsStaticAmbiguity3.txt b/compiler/testData/diagnostics/tests/imports/EnumEntryVsStaticAmbiguity3.txt
index 9e2def9a15f..ae26d4f2e21 100644
--- a/compiler/testData/diagnostics/tests/imports/EnumEntryVsStaticAmbiguity3.txt
+++ b/compiler/testData/diagnostics/tests/imports/EnumEntryVsStaticAmbiguity3.txt
@@ -31,6 +31,7 @@ package second {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<second.SomeEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): second.SomeEnum
         public final /*synthesized*/ fun values(): kotlin.Array<second.SomeEnum>
     }
diff --git a/compiler/testData/diagnostics/tests/imports/EnumEntryVsStaticAmbiguity4.txt b/compiler/testData/diagnostics/tests/imports/EnumEntryVsStaticAmbiguity4.txt
index 52a55219f01..57aca8bca59 100644
--- a/compiler/testData/diagnostics/tests/imports/EnumEntryVsStaticAmbiguity4.txt
+++ b/compiler/testData/diagnostics/tests/imports/EnumEntryVsStaticAmbiguity4.txt
@@ -31,6 +31,7 @@ package second {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<second.SomeEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): second.SomeEnum
         public final /*synthesized*/ fun values(): kotlin.Array<second.SomeEnum>
     }
diff --git a/compiler/testData/diagnostics/tests/imports/ImportPrivateMember.txt b/compiler/testData/diagnostics/tests/imports/ImportPrivateMember.txt
index 701c276bf21..70b2d4af84f 100644
--- a/compiler/testData/diagnostics/tests/imports/ImportPrivateMember.txt
+++ b/compiler/testData/diagnostics/tests/imports/ImportPrivateMember.txt
@@ -55,11 +55,13 @@ package test {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
             // Static members
+            public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.TopLevelEnum.NestedEnum>
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.TopLevelEnum.NestedEnum
             public final /*synthesized*/ fun values(): kotlin.Array<test.TopLevelEnum.NestedEnum>
         }
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.TopLevelEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.TopLevelEnum
         public final /*synthesized*/ fun values(): kotlin.Array<test.TopLevelEnum>
     }
diff --git a/compiler/testData/diagnostics/tests/imports/ImportPrivateMembersWithStar.txt b/compiler/testData/diagnostics/tests/imports/ImportPrivateMembersWithStar.txt
index 3152653ec48..e82e854bf8a 100644
--- a/compiler/testData/diagnostics/tests/imports/ImportPrivateMembersWithStar.txt
+++ b/compiler/testData/diagnostics/tests/imports/ImportPrivateMembersWithStar.txt
@@ -62,11 +62,13 @@ package test {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
             // Static members
+            public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.TopLevelEnum.NestedEnum>
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.TopLevelEnum.NestedEnum
             public final /*synthesized*/ fun values(): kotlin.Array<test.TopLevelEnum.NestedEnum>
         }
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.TopLevelEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.TopLevelEnum
         public final /*synthesized*/ fun values(): kotlin.Array<test.TopLevelEnum>
     }
diff --git a/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt b/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt
index abf645a4642..e5f91138813 100644
--- a/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt
+++ b/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt
@@ -103,6 +103,7 @@ package a {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<a.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): a.E
         public final /*synthesized*/ fun values(): kotlin.Array<a.E>
     }
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.txt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.txt
index 2917339ee36..222afef2b69 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.txt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.txt
@@ -21,6 +21,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/kt51148.txt b/compiler/testData/diagnostics/tests/inference/builderInference/kt51148.txt
index 89a327a44c0..74f4b4657cf 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/kt51148.txt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/kt51148.txt
@@ -22,6 +22,7 @@ public final enum class SomeEnum : kotlin.Enum<SomeEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<SomeEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): SomeEnum
     public final /*synthesized*/ fun values(): kotlin.Array<SomeEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/inference/intersectionWithEnum.ni.txt b/compiler/testData/diagnostics/tests/inference/intersectionWithEnum.ni.txt
index 3e8d4077934..eefac551a7c 100644
--- a/compiler/testData/diagnostics/tests/inference/intersectionWithEnum.ni.txt
+++ b/compiler/testData/diagnostics/tests/inference/intersectionWithEnum.ni.txt
@@ -27,6 +27,7 @@ public final enum class AFoo : kotlin.Enum<AFoo>, Foo {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<AFoo>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): AFoo
     public final /*synthesized*/ fun values(): kotlin.Array<AFoo>
 }
@@ -51,6 +52,7 @@ public final enum class BFoo : kotlin.Enum<BFoo>, Foo {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<BFoo>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): BFoo
     public final /*synthesized*/ fun values(): kotlin.Array<BFoo>
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt
index bbc2be8e708..4a491dcd044 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt
@@ -25,6 +25,7 @@ package a {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<a.SomeEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): a.SomeEnum
         public final /*synthesized*/ fun values(): kotlin.Array<a.SomeEnum>
     }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt
index 286c6363e0a..50efea05ee7 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt
@@ -22,6 +22,7 @@ package a {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<a.TestEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): a.TestEnum
         public final /*synthesized*/ fun values(): kotlin.Array<a.TestEnum>
     }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt37419.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt37419.txt
index 8d3922065bf..3636599ab4f 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt37419.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt37419.txt
@@ -20,6 +20,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.txt b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.txt
index e62992c25d3..44037be1bad 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.txt
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.txt
@@ -46,6 +46,7 @@ public final enum class Kind : kotlin.Enum<Kind> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Kind>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Kind
     public final /*synthesized*/ fun values(): kotlin.Array<Kind>
 }
diff --git a/compiler/testData/diagnostics/tests/inline/superCallDepecation.txt b/compiler/testData/diagnostics/tests/inline/superCallDepecation.txt
index 5c264e42d4d..79532ce92f1 100644
--- a/compiler/testData/diagnostics/tests/inline/superCallDepecation.txt
+++ b/compiler/testData/diagnostics/tests/inline/superCallDepecation.txt
@@ -49,6 +49,7 @@ public final enum class FooEmum : kotlin.Enum<FooEmum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<FooEmum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): FooEmum
     public final /*synthesized*/ fun values(): kotlin.Array<FooEmum>
 }
diff --git a/compiler/testData/diagnostics/tests/inline/superCallDepecationWarning.txt b/compiler/testData/diagnostics/tests/inline/superCallDepecationWarning.txt
index 5c264e42d4d..79532ce92f1 100644
--- a/compiler/testData/diagnostics/tests/inline/superCallDepecationWarning.txt
+++ b/compiler/testData/diagnostics/tests/inline/superCallDepecationWarning.txt
@@ -49,6 +49,7 @@ public final enum class FooEmum : kotlin.Enum<FooEmum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<FooEmum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): FooEmum
     public final /*synthesized*/ fun values(): kotlin.Array<FooEmum>
 }
diff --git a/compiler/testData/diagnostics/tests/inline/virtualMemberInEnum.txt b/compiler/testData/diagnostics/tests/inline/virtualMemberInEnum.txt
index b6437ce7469..1167116ad59 100644
--- a/compiler/testData/diagnostics/tests/inline/virtualMemberInEnum.txt
+++ b/compiler/testData/diagnostics/tests/inline/virtualMemberInEnum.txt
@@ -16,6 +16,7 @@ public final enum class Some : kotlin.Enum<Some> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Some>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Some
     public final /*synthesized*/ fun values(): kotlin.Array<Some>
 }
diff --git a/compiler/testData/diagnostics/tests/inlineClasses/basicInlineClassDeclaration.txt b/compiler/testData/diagnostics/tests/inlineClasses/basicInlineClassDeclaration.txt
index 027962864fe..fa153d4fe31 100644
--- a/compiler/testData/diagnostics/tests/inlineClasses/basicInlineClassDeclaration.txt
+++ b/compiler/testData/diagnostics/tests/inlineClasses/basicInlineClassDeclaration.txt
@@ -28,6 +28,7 @@ public final inline enum class InlineEnum : kotlin.Enum<InlineEnum> {
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<InlineEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): InlineEnum
     public final /*synthesized*/ fun values(): kotlin.Array<InlineEnum>
 }
@@ -44,4 +45,3 @@ public inline object InlineObject {
     public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
-
diff --git a/compiler/testData/diagnostics/tests/inlineClasses/basicInlineClassDeclarationDisabled.txt b/compiler/testData/diagnostics/tests/inlineClasses/basicInlineClassDeclarationDisabled.txt
index 3d1bfb42d8e..8f57345d3fb 100644
--- a/compiler/testData/diagnostics/tests/inlineClasses/basicInlineClassDeclarationDisabled.txt
+++ b/compiler/testData/diagnostics/tests/inlineClasses/basicInlineClassDeclarationDisabled.txt
@@ -28,6 +28,7 @@ public final inline enum class InlineEnum : kotlin.Enum<InlineEnum> {
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<InlineEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): InlineEnum
     public final /*synthesized*/ fun values(): kotlin.Array<InlineEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/inner/enumEntries.txt b/compiler/testData/diagnostics/tests/inner/enumEntries.txt
index 5124a8e821c..ec62ac8d42c 100644
--- a/compiler/testData/diagnostics/tests/inner/enumEntries.txt
+++ b/compiler/testData/diagnostics/tests/inner/enumEntries.txt
@@ -19,6 +19,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/inner/enumInInnerClass.txt b/compiler/testData/diagnostics/tests/inner/enumInInnerClass.txt
index afbde96de38..84da7306a0b 100644
--- a/compiler/testData/diagnostics/tests/inner/enumInInnerClass.txt
+++ b/compiler/testData/diagnostics/tests/inner/enumInInnerClass.txt
@@ -25,6 +25,7 @@ public final class Outer {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
             // Static members
+            public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Outer.Inner.TestNestedEnum>
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Outer.Inner.TestNestedEnum
             public final /*synthesized*/ fun values(): kotlin.Array<Outer.Inner.TestNestedEnum>
         }
diff --git a/compiler/testData/diagnostics/tests/inner/illegalModifier_lv12.txt b/compiler/testData/diagnostics/tests/inner/illegalModifier_lv12.txt
index 709007982da..12ca0b2aeb8 100644
--- a/compiler/testData/diagnostics/tests/inner/illegalModifier_lv12.txt
+++ b/compiler/testData/diagnostics/tests/inner/illegalModifier_lv12.txt
@@ -70,6 +70,7 @@ public final class D {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<D.R>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): D.R
         public final /*synthesized*/ fun values(): kotlin.Array<D.R>
     }
@@ -106,6 +107,7 @@ public final enum class H : kotlin.Enum<H> {
     }
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<H>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): H
     public final /*synthesized*/ fun values(): kotlin.Array<H>
 }
diff --git a/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClassMemberResolve.txt b/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClassMemberResolve.txt
index 65ad3781992..75ac7910373 100644
--- a/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClassMemberResolve.txt
+++ b/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClassMemberResolve.txt
@@ -15,6 +15,7 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClass_lv12.txt b/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClass_lv12.txt
index eeae0d43e11..406eb2f9665 100644
--- a/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClass_lv12.txt
+++ b/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClass_lv12.txt
@@ -15,6 +15,7 @@ public final enum class Enum : kotlin.Enum<Enum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Enum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Enum
     public final /*synthesized*/ fun values(): kotlin.Array<Enum>
 }
diff --git a/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClass_lv13.txt b/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClass_lv13.txt
index eeae0d43e11..406eb2f9665 100644
--- a/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClass_lv13.txt
+++ b/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClass_lv13.txt
@@ -15,6 +15,7 @@ public final enum class Enum : kotlin.Enum<Enum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Enum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Enum
     public final /*synthesized*/ fun values(): kotlin.Array<Enum>
 }
diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt
index 3077b33eb41..ec431721d3c 100644
--- a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt
+++ b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt
@@ -37,6 +37,7 @@ public object Obj {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Obj.NestedEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Obj.NestedEnum
         public final /*synthesized*/ fun values(): kotlin.Array<Obj.NestedEnum>
     }
@@ -101,6 +102,7 @@ public final class WithClassObject {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<WithClassObject.NestedEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): WithClassObject.NestedEnum
         public final /*synthesized*/ fun values(): kotlin.Array<WithClassObject.NestedEnum>
     }
@@ -158,6 +160,7 @@ public final class WithoutClassObject {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<WithoutClassObject.NestedEnum>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): WithoutClassObject.NestedEnum
         public final /*synthesized*/ fun values(): kotlin.Array<WithoutClassObject.NestedEnum>
     }
diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed_after.txt b/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed_after.txt
index e76d6c67086..9547be5e7fa 100644
--- a/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed_after.txt
+++ b/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed_after.txt
@@ -39,6 +39,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed_before.txt b/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed_before.txt
index e76d6c67086..9547be5e7fa 100644
--- a/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed_before.txt
+++ b/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed_before.txt
@@ -39,6 +39,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.txt b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.txt
index 17be0087721..45c96b4db9f 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.txt
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.txt
@@ -20,6 +20,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.txt b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.txt
index d78245fa412..e4d2012c07d 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.txt
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.txt
@@ -26,6 +26,7 @@ public final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
         public final /*synthesized*/ fun values(): kotlin.Array<A.E>
     }
diff --git a/compiler/testData/diagnostics/tests/j+k/enumGetOrdinal.txt b/compiler/testData/diagnostics/tests/j+k/enumGetOrdinal.txt
index 17f9531764d..dd8120ff92a 100644
--- a/compiler/testData/diagnostics/tests/j+k/enumGetOrdinal.txt
+++ b/compiler/testData/diagnostics/tests/j+k/enumGetOrdinal.txt
@@ -18,6 +18,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2619.txt b/compiler/testData/diagnostics/tests/j+k/kt2619.txt
index 9856db2025e..3059b3b8840 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt2619.txt
+++ b/compiler/testData/diagnostics/tests/j+k/kt2619.txt
@@ -19,6 +19,7 @@ public final enum class Type : kotlin.Enum<Type!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Type>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Type
     public final /*synthesized*/ fun values(): kotlin.Array<Type>
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/serializable.txt b/compiler/testData/diagnostics/tests/j+k/serializable.txt
index 916c258da13..089169fa656 100644
--- a/compiler/testData/diagnostics/tests/j+k/serializable.txt
+++ b/compiler/testData/diagnostics/tests/j+k/serializable.txt
@@ -24,6 +24,7 @@ public final enum class C : kotlin.Enum<C> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<C>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): C
     public final /*synthesized*/ fun values(): kotlin.Array<C>
 }
diff --git a/compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.txt b/compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.txt
index 65303ecdc00..ee02a70b4e4 100644
--- a/compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.txt
+++ b/compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.txt
@@ -126,6 +126,7 @@ package illegal_modifiers {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
             // Static members
+            public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<illegal_modifiers.IllegalModifiers8.constructor>
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): illegal_modifiers.IllegalModifiers8.constructor
             public final /*synthesized*/ fun values(): kotlin.Array<illegal_modifiers.IllegalModifiers8.constructor>
         }
@@ -176,4 +177,3 @@ package illegal_modifiers {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
-
diff --git a/compiler/testData/diagnostics/tests/modifiers/const/applicability.txt b/compiler/testData/diagnostics/tests/modifiers/const/applicability.txt
index a7e30c3ac80..71d124ab7dc 100644
--- a/compiler/testData/diagnostics/tests/modifiers/const/applicability.txt
+++ b/compiler/testData/diagnostics/tests/modifiers/const/applicability.txt
@@ -108,6 +108,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/modifiers/const/enumConstName.txt b/compiler/testData/diagnostics/tests/modifiers/const/enumConstName.txt
index 4ad4db9890b..88a559a93ee 100644
--- a/compiler/testData/diagnostics/tests/modifiers/const/enumConstName.txt
+++ b/compiler/testData/diagnostics/tests/modifiers/const/enumConstName.txt
@@ -26,6 +26,7 @@ public final enum class EnumClass : kotlin.Enum<EnumClass> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<EnumClass>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumClass
     public final /*synthesized*/ fun values(): kotlin.Array<EnumClass>
 }
diff --git a/compiler/testData/diagnostics/tests/modifiers/const/types.txt b/compiler/testData/diagnostics/tests/modifiers/const/types.txt
index 6e9fc8579ad..edece64444d 100644
--- a/compiler/testData/diagnostics/tests/modifiers/const/types.txt
+++ b/compiler/testData/diagnostics/tests/modifiers/const/types.txt
@@ -26,6 +26,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt b/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt
index b1821abf4c5..61d57f7f098 100644
--- a/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt
+++ b/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt
@@ -91,6 +91,7 @@ public final enum class Enum : kotlin.Enum<Enum> {
     }
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Enum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Enum
     public final /*synthesized*/ fun values(): kotlin.Array<Enum>
 }
diff --git a/compiler/testData/diagnostics/tests/modifiers/protected.txt b/compiler/testData/diagnostics/tests/modifiers/protected.txt
index b548b894cbd..148fb640424 100644
--- a/compiler/testData/diagnostics/tests/modifiers/protected.txt
+++ b/compiler/testData/diagnostics/tests/modifiers/protected.txt
@@ -48,6 +48,7 @@ public final enum class Our : kotlin.Enum<Our> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Our>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Our
     public final /*synthesized*/ fun values(): kotlin.Array<Our>
 }
diff --git a/compiler/testData/diagnostics/tests/modifiers/redundantTargets.txt b/compiler/testData/diagnostics/tests/modifiers/redundantTargets.txt
index 63f5afe2f28..57863b4630a 100644
--- a/compiler/testData/diagnostics/tests/modifiers/redundantTargets.txt
+++ b/compiler/testData/diagnostics/tests/modifiers/redundantTargets.txt
@@ -36,6 +36,7 @@ public final enum class Third : kotlin.Enum<Third> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Third>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Third
     public final /*synthesized*/ fun values(): kotlin.Array<Third>
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/redundantElseInWhen.txt b/compiler/testData/diagnostics/tests/multimodule/redundantElseInWhen.txt
index 6c24002752f..0505cfbcf94 100644
--- a/compiler/testData/diagnostics/tests/multimodule/redundantElseInWhen.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/redundantElseInWhen.txt
@@ -25,6 +25,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E
         public final /*synthesized*/ fun values(): kotlin.Array<test.E>
     }
@@ -46,4 +47,3 @@ package other {
     public fun baz(/*0*/ b: kotlin.Boolean?): kotlin.Int
     public fun foo(/*0*/ e: test.E): kotlin.Int
 }
-
diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationArgumentEquality.txt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationArgumentEquality.txt
index a06d2142ea7..5b3f5477cd7 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationArgumentEquality.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationArgumentEquality.txt
@@ -128,6 +128,7 @@ public final enum class En : kotlin.Enum<En> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<En>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): En
     public final /*synthesized*/ fun values(): kotlin.Array<En>
 }
@@ -161,4 +162,3 @@ public final actual annotation class Primitives : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-
diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias2.txt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias2.txt
index e0f170c9fc8..9a62c0060f1 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias2.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias2.txt
@@ -95,6 +95,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
@@ -130,4 +131,3 @@ public final annotation class Jnno : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 public actual typealias Anno = Jnno
-
diff --git a/compiler/testData/diagnostics/tests/multiplatform/deprecated/header.txt b/compiler/testData/diagnostics/tests/multiplatform/deprecated/header.txt
index 8027d1f2b6a..7bb31468cc3 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/deprecated/header.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/deprecated/header.txt
@@ -53,6 +53,7 @@ public final actual enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
@@ -70,4 +71,3 @@ public actual object O {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-
diff --git a/compiler/testData/diagnostics/tests/multiplatform/enum/additionalEntriesInImpl.txt b/compiler/testData/diagnostics/tests/multiplatform/enum/additionalEntriesInImpl.txt
index 3f074c5ac77..15362e23a80 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/enum/additionalEntriesInImpl.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/enum/additionalEntriesInImpl.txt
@@ -65,6 +65,7 @@ public final actual enum class Bar : kotlin.Enum<Bar> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Bar>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Bar
     public final /*synthesized*/ fun values(): kotlin.Array<Bar>
 }
@@ -92,7 +93,7 @@ public final actual enum class Foo : kotlin.Enum<Foo> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Foo>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Foo
     public final /*synthesized*/ fun values(): kotlin.Array<Foo>
 }
-
diff --git a/compiler/testData/diagnostics/tests/multiplatform/enum/differentEntryOrder.txt b/compiler/testData/diagnostics/tests/multiplatform/enum/differentEntryOrder.txt
index 30cafd9d562..616cbdf1979 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/enum/differentEntryOrder.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/enum/differentEntryOrder.txt
@@ -61,6 +61,7 @@ public final actual enum class Bar : kotlin.Enum<Bar> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Bar>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Bar
     public final /*synthesized*/ fun values(): kotlin.Array<Bar>
 }
@@ -82,7 +83,7 @@ public final actual enum class Foo : kotlin.Enum<Foo> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Foo>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Foo
     public final /*synthesized*/ fun values(): kotlin.Array<Foo>
 }
-
diff --git a/compiler/testData/diagnostics/tests/multiplatform/enum/javaEnum.txt b/compiler/testData/diagnostics/tests/multiplatform/enum/javaEnum.txt
index 575526544a3..96f442cfe4c 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/enum/javaEnum.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/enum/javaEnum.txt
@@ -51,9 +51,9 @@ public final enum class FooImpl : kotlin.Enum<FooImpl!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<FooImpl>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): FooImpl
     public final /*synthesized*/ fun values(): kotlin.Array<FooImpl>
 }
 public actual typealias Foo = FooImpl
 public actual typealias _TimeUnit = java.util.concurrent.TimeUnit
-
diff --git a/compiler/testData/diagnostics/tests/multiplatform/enum/simpleEnum.txt b/compiler/testData/diagnostics/tests/multiplatform/enum/simpleEnum.txt
index 02a9d97f26e..096cdd1e780 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/enum/simpleEnum.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/enum/simpleEnum.txt
@@ -44,7 +44,7 @@ public final actual enum class Foo : kotlin.Enum<Foo> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Foo>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Foo
     public final /*synthesized*/ fun values(): kotlin.Array<Foo>
 }
-
diff --git a/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectEnum.txt b/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectEnum.txt
index 3cf3342b49e..cc8659a9587 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectEnum.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/exhaustiveness/expectEnum.txt
@@ -47,6 +47,7 @@ public final actual enum class Base : kotlin.Enum<Base> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Base>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Base
     public final /*synthesized*/ fun values(): kotlin.Array<Base>
 }
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/classKinds.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/classKinds.txt
index a500cc63053..213ef1b20ec 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/classKinds.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/classKinds.txt
@@ -76,6 +76,7 @@ public final actual enum class En : kotlin.Enum<En> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<En>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): En
     public final /*synthesized*/ fun values(): kotlin.Array<En>
 }
@@ -92,4 +93,3 @@ public actual object Object {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.txt
index b1cc3e6d158..7bbe1f0d131 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.txt
@@ -109,6 +109,7 @@ public final actual class C {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<C.E>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): C.E
         public final /*synthesized*/ fun values(): kotlin.Array<C.E>
     }
@@ -148,4 +149,3 @@ public final actual class E {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
-
diff --git a/compiler/testData/diagnostics/tests/multiplatform/smartcastOnMemberPropertyFromCommonClass.txt b/compiler/testData/diagnostics/tests/multiplatform/smartcastOnMemberPropertyFromCommonClass.txt
index 32b01a09f9e..c18c5b2d013 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/smartcastOnMemberPropertyFromCommonClass.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/smartcastOnMemberPropertyFromCommonClass.txt
@@ -26,6 +26,7 @@ public final enum class SomeEnum : kotlin.Enum<SomeEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<SomeEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): SomeEnum
     public final /*synthesized*/ fun values(): kotlin.Array<SomeEnum>
 }
@@ -60,6 +61,7 @@ public final enum class SomeEnum : kotlin.Enum<SomeEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<SomeEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): SomeEnum
     public final /*synthesized*/ fun values(): kotlin.Array<SomeEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.txt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.txt
index 9e5d0a3cf9d..04174d6cdbb 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.txt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.txt
@@ -22,6 +22,7 @@ public/*package*/ open class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A.Empty>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Empty
         public final /*synthesized*/ fun values(): kotlin.Array<A.Empty>
     }
diff --git a/compiler/testData/diagnostics/tests/override/derivedClasses/EnumValues.txt b/compiler/testData/diagnostics/tests/override/derivedClasses/EnumValues.txt
index 7bf6eb34bf3..cb1bde387e6 100644
--- a/compiler/testData/diagnostics/tests/override/derivedClasses/EnumValues.txt
+++ b/compiler/testData/diagnostics/tests/override/derivedClasses/EnumValues.txt
@@ -23,6 +23,7 @@ public final enum class Direction : kotlin.Enum<Direction> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Direction>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Direction
     public final /*synthesized*/ fun values(): kotlin.Array<Direction>
 }
diff --git a/compiler/testData/diagnostics/tests/properDefaultInitializationInTailrec.txt b/compiler/testData/diagnostics/tests/properDefaultInitializationInTailrec.txt
index d5fc7cd02da..f20a724386b 100644
--- a/compiler/testData/diagnostics/tests/properDefaultInitializationInTailrec.txt
+++ b/compiler/testData/diagnostics/tests/properDefaultInitializationInTailrec.txt
@@ -25,6 +25,7 @@ public final enum class EnumA : kotlin.Enum<EnumA> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<EnumA>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumA
     public final /*synthesized*/ fun values(): kotlin.Array<EnumA>
 }
diff --git a/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt b/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt
index 3db5da35bfc..60e992f8955 100644
--- a/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt
+++ b/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt
@@ -28,6 +28,7 @@ public final class C {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<C.`<no name provided>`>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): C.`<no name provided>`
         public final /*synthesized*/ fun values(): kotlin.Array<C.`<no name provided>`>
     }
diff --git a/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt b/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt
index 8f9b7629bc1..2406979229b 100644
--- a/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt
+++ b/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt
@@ -29,6 +29,7 @@ public final enum class `<no name provided>` : kotlin.Enum<`<no name provided>`>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<`<no name provided>`>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): `<no name provided>`
     public final /*synthesized*/ fun values(): kotlin.Array<`<no name provided>`>
 }
diff --git a/compiler/testData/diagnostics/tests/redeclarations/EnumName.txt b/compiler/testData/diagnostics/tests/redeclarations/EnumName.txt
index b381e6e8a66..3cd84a9102b 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/EnumName.txt
+++ b/compiler/testData/diagnostics/tests/redeclarations/EnumName.txt
@@ -15,6 +15,7 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
diff --git a/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt b/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt
index 6a2908bd6a9..e2c94ba261c 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt
+++ b/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt
@@ -32,6 +32,7 @@ public final enum class E : kotlin.Enum<E> {
     }
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.txt b/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.txt
index cdee8025d84..f540d78eddd 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.txt
+++ b/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.txt
@@ -22,6 +22,7 @@ public final enum class En : kotlin.Enum<En> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<En>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): En
     public final /*synthesized*/ fun values(): kotlin.Array<En>
 }
diff --git a/compiler/testData/diagnostics/tests/redeclarations/kt2418.txt b/compiler/testData/diagnostics/tests/redeclarations/kt2418.txt
index a3db945ad96..cc688c461d8 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/kt2418.txt
+++ b/compiler/testData/diagnostics/tests/redeclarations/kt2418.txt
@@ -19,6 +19,7 @@ package kt2418 {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<kt2418.A>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt2418.A
         public final /*synthesized*/ fun values(): kotlin.Array<kt2418.A>
     }
@@ -39,6 +40,7 @@ package kt2418 {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<kt2418.B>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt2418.B
         public final /*synthesized*/ fun values(): kotlin.Array<kt2418.B>
     }
@@ -59,6 +61,7 @@ package kt2418 {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<kt2418.C>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt2418.C
         public final /*synthesized*/ fun values(): kotlin.Array<kt2418.C>
     }
@@ -85,6 +88,7 @@ package kt2418 {
         }
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<kt2418.D>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt2418.D
         public final /*synthesized*/ fun values(): kotlin.Array<kt2418.D>
     }
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet183-1.txt b/compiler/testData/diagnostics/tests/regressions/Jet183-1.txt
index 91234fe3c5e..5c9fd8591cf 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet183-1.txt
+++ b/compiler/testData/diagnostics/tests/regressions/Jet183-1.txt
@@ -20,6 +20,7 @@ public final enum class ProtocolState : kotlin.Enum<ProtocolState> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<ProtocolState>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): ProtocolState
     public final /*synthesized*/ fun values(): kotlin.Array<ProtocolState>
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet183.txt b/compiler/testData/diagnostics/tests/regressions/Jet183.txt
index 062c81ebcd5..1a1f1c85fef 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet183.txt
+++ b/compiler/testData/diagnostics/tests/regressions/Jet183.txt
@@ -20,6 +20,7 @@ public final enum class ProtocolState : kotlin.Enum<ProtocolState> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<ProtocolState>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): ProtocolState
     public final /*synthesized*/ fun values(): kotlin.Array<ProtocolState>
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/ea69735.txt b/compiler/testData/diagnostics/tests/regressions/ea69735.txt
index f9fe4cdc9fe..ceb0be21696 100644
--- a/compiler/testData/diagnostics/tests/regressions/ea69735.txt
+++ b/compiler/testData/diagnostics/tests/regressions/ea69735.txt
@@ -15,6 +15,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt30245.txt b/compiler/testData/diagnostics/tests/regressions/kt30245.txt
index 54ee68dd0d3..a1b5419699e 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt30245.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt30245.txt
@@ -37,6 +37,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt4693.txt b/compiler/testData/diagnostics/tests/regressions/kt4693.txt
index 32b8c347b0c..e26df1dc1da 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt4693.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt4693.txt
@@ -16,6 +16,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.txt b/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.txt
index 57ad1e42046..b005162c8de 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.txt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.txt
@@ -18,6 +18,7 @@ public final enum class EnumClass : kotlin.Enum<EnumClass> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<EnumClass>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumClass
     public final /*synthesized*/ fun values(): kotlin.Array<EnumClass>
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt b/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt
index 0a8ed38055d..dbc89b66ccf 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt
@@ -20,6 +20,7 @@ public final enum class DOMElementTestClasses : kotlin.Enum<DOMElementTestClasse
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<DOMElementTestClasses>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): DOMElementTestClasses
     public final /*synthesized*/ fun values(): kotlin.Array<DOMElementTestClasses>
 }
@@ -47,6 +48,7 @@ public final enum class TestClasses : kotlin.Enum<TestClasses>, EnumStyleClass {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<TestClasses>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): TestClasses
     public final /*synthesized*/ fun values(): kotlin.Array<TestClasses>
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758.txt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758.txt
index ef13b0a8e93..ac3c3489a4a 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758.txt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758.txt
@@ -20,6 +20,7 @@ package a {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<a.A>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): a.A
         public final /*synthesized*/ fun values(): kotlin.Array<a.A>
     }
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsWithRecursiveGenerics.txt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsWithRecursiveGenerics.txt
index eff035c6df4..89be22b1b0f 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsWithRecursiveGenerics.txt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsWithRecursiveGenerics.txt
@@ -36,6 +36,7 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
     public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/priority/kt9965.txt b/compiler/testData/diagnostics/tests/resolve/priority/kt9965.txt
index aad61eaa860..677beaf2997 100644
--- a/compiler/testData/diagnostics/tests/resolve/priority/kt9965.txt
+++ b/compiler/testData/diagnostics/tests/resolve/priority/kt9965.txt
@@ -26,6 +26,7 @@ public final enum class Foo : kotlin.Enum<Foo> {
     }
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Foo>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Foo
     public final /*synthesized*/ fun values(): kotlin.Array<Foo>
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/resolveToStarImportMemberInsteadOfBuiltin.txt b/compiler/testData/diagnostics/tests/resolve/resolveToStarImportMemberInsteadOfBuiltin.txt
index 7ee56b369aa..0daca50304e 100644
--- a/compiler/testData/diagnostics/tests/resolve/resolveToStarImportMemberInsteadOfBuiltin.txt
+++ b/compiler/testData/diagnostics/tests/resolve/resolveToStarImportMemberInsteadOfBuiltin.txt
@@ -29,6 +29,7 @@ public final enum class TestEnum : kotlin.Enum<TestEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<TestEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): TestEnum
     public final /*synthesized*/ fun values(): kotlin.Array<TestEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/sealed/NeverEnum.txt b/compiler/testData/diagnostics/tests/sealed/NeverEnum.txt
index 1bf626a9a64..dd75c393f6c 100644
--- a/compiler/testData/diagnostics/tests/sealed/NeverEnum.txt
+++ b/compiler/testData/diagnostics/tests/sealed/NeverEnum.txt
@@ -30,6 +30,7 @@ public sealed enum class SealedEnum : kotlin.Enum<SealedEnum> {
     }
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<SealedEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): SealedEnum
     public final /*synthesized*/ fun values(): kotlin.Array<SealedEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/sealed/interfaces/simpleSealedInterface.txt b/compiler/testData/diagnostics/tests/sealed/interfaces/simpleSealedInterface.txt
index 76bdd316e54..4926e479462 100644
--- a/compiler/testData/diagnostics/tests/sealed/interfaces/simpleSealedInterface.txt
+++ b/compiler/testData/diagnostics/tests/sealed/interfaces/simpleSealedInterface.txt
@@ -53,6 +53,7 @@ public final enum class C : kotlin.Enum<C>, Base {
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<C>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): C
     public final /*synthesized*/ fun values(): kotlin.Array<C>
 }
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt
index 8b20817072b..36486a3aeb3 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt
@@ -25,6 +25,7 @@ public final enum class B : kotlin.Enum<B> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<B>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): B
     public final /*synthesized*/ fun values(): kotlin.Array<B>
 }
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/enums.txt b/compiler/testData/diagnostics/tests/secondaryConstructors/enums.txt
index 04f7a2434ac..5c9a97f43e8 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/enums.txt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/enums.txt
@@ -27,6 +27,7 @@ public final enum class A : kotlin.Enum<A> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>
 }
@@ -55,6 +56,7 @@ public final enum class B : kotlin.Enum<B> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<B>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): B
     public final /*synthesized*/ fun values(): kotlin.Array<B>
 }
@@ -74,6 +76,7 @@ public final enum class C : kotlin.Enum<C> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<C>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): C
     public final /*synthesized*/ fun values(): kotlin.Array<C>
 }
@@ -101,6 +104,7 @@ public final enum class D : kotlin.Enum<D> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<D>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): D
     public final /*synthesized*/ fun values(): kotlin.Array<D>
 }
diff --git a/compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.txt b/compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.txt
index 3dbb518ea66..c649c30d4a3 100644
--- a/compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.txt
+++ b/compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.txt
@@ -32,6 +32,7 @@ public final enum class A4 : kotlin.Enum<A4> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<A4>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A4
     public final /*synthesized*/ fun values(): kotlin.Array<A4>
 }
diff --git a/compiler/testData/diagnostics/tests/tailRecOnVirtualMember.txt b/compiler/testData/diagnostics/tests/tailRecOnVirtualMember.txt
index 69a27dbf922..e5f645127b8 100644
--- a/compiler/testData/diagnostics/tests/tailRecOnVirtualMember.txt
+++ b/compiler/testData/diagnostics/tests/tailRecOnVirtualMember.txt
@@ -102,6 +102,7 @@ public final enum class F : kotlin.Enum<F> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<F>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): F
     public final /*synthesized*/ fun values(): kotlin.Array<F>
 }
@@ -126,7 +127,7 @@ public final enum class G : kotlin.Enum<G> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<G>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): G
     public final /*synthesized*/ fun values(): kotlin.Array<G>
 }
-
diff --git a/compiler/testData/diagnostics/tests/tailRecOnVirtualMemberError.txt b/compiler/testData/diagnostics/tests/tailRecOnVirtualMemberError.txt
index 478a5ef3118..a2829d542eb 100644
--- a/compiler/testData/diagnostics/tests/tailRecOnVirtualMemberError.txt
+++ b/compiler/testData/diagnostics/tests/tailRecOnVirtualMemberError.txt
@@ -96,6 +96,7 @@ public final enum class F : kotlin.Enum<F> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<F>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): F
     public final /*synthesized*/ fun values(): kotlin.Array<F>
 }
@@ -120,7 +121,7 @@ public final enum class G : kotlin.Enum<G> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<G>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): G
     public final /*synthesized*/ fun values(): kotlin.Array<G>
 }
-
diff --git a/compiler/testData/diagnostics/tests/tailRecSingleton.txt b/compiler/testData/diagnostics/tests/tailRecSingleton.txt
index 1059001f76a..f88e144ceeb 100644
--- a/compiler/testData/diagnostics/tests/tailRecSingleton.txt
+++ b/compiler/testData/diagnostics/tests/tailRecSingleton.txt
@@ -38,6 +38,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
@@ -51,4 +52,3 @@ public object Foo {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-
diff --git a/compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/finalize.txt b/compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/finalize.txt
index bfc875dc225..f279e626459 100644
--- a/compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/finalize.txt
+++ b/compiler/testData/diagnostics/tests/targetedBuiltIns/backwardCompatibility/finalize.txt
@@ -15,6 +15,7 @@ public final enum class TestEnum : kotlin.Enum<TestEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<TestEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): TestEnum
     public final /*synthesized*/ fun values(): kotlin.Array<TestEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/typeParameters/cannotHaveManyClassUpperBounds.txt b/compiler/testData/diagnostics/tests/typeParameters/cannotHaveManyClassUpperBounds.txt
index 591671b9fe0..772bb70cd8d 100644
--- a/compiler/testData/diagnostics/tests/typeParameters/cannotHaveManyClassUpperBounds.txt
+++ b/compiler/testData/diagnostics/tests/typeParameters/cannotHaveManyClassUpperBounds.txt
@@ -80,6 +80,7 @@ public final enum class E1 : kotlin.Enum<E1> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E1>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E1
     public final /*synthesized*/ fun values(): kotlin.Array<E1>
 }
diff --git a/compiler/testData/diagnostics/tests/typealias/enumEntryQualifier.txt b/compiler/testData/diagnostics/tests/typealias/enumEntryQualifier.txt
index d0b9d0d8915..c913bbac34a 100644
--- a/compiler/testData/diagnostics/tests/typealias/enumEntryQualifier.txt
+++ b/compiler/testData/diagnostics/tests/typealias/enumEntryQualifier.txt
@@ -18,6 +18,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/typealias/starImportOnTypeAlias.txt b/compiler/testData/diagnostics/tests/typealias/starImportOnTypeAlias.txt
index 4381d0d0a39..b1275466918 100644
--- a/compiler/testData/diagnostics/tests/typealias/starImportOnTypeAlias.txt
+++ b/compiler/testData/diagnostics/tests/typealias/starImportOnTypeAlias.txt
@@ -26,6 +26,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.EnumSample>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumSample
         public final /*synthesized*/ fun values(): kotlin.Array<test.EnumSample>
     }
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongClass.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongClass.txt
index 59c19676541..3a5c50aa79e 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongClass.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongClass.txt
@@ -46,6 +46,7 @@ public final enum class EnumClass : kotlin.Enum<EnumClass> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<EnumClass>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumClass
     public final /*synthesized*/ fun values(): kotlin.Array<EnumClass>
 }
@@ -76,4 +77,3 @@ public typealias Test2 = AnnotationClass
 public typealias Test3 = EnumClass
 public typealias Test4 = SealedClass
 public typealias Test5 = Outer.Inner
-
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasesInImportDirectives.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasesInImportDirectives.txt
index 0677e6e9c8e..55f650b1314 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasesInImportDirectives.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasesInImportDirectives.txt
@@ -40,6 +40,7 @@ package test {
         }
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.EnumSample>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumSample
         public final /*synthesized*/ fun values(): kotlin.Array<test.EnumSample>
     }
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasesInQualifiers.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasesInQualifiers.txt
index 7c3f1952bcd..cee4d6d22e4 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasesInQualifiers.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasesInQualifiers.txt
@@ -44,6 +44,7 @@ package test {
         }
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.EnumSample>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumSample
         public final /*synthesized*/ fun values(): kotlin.Array<test.EnumSample>
     }
diff --git a/compiler/testData/diagnostics/tests/unproperDefaultInitializationInTailrec.txt b/compiler/testData/diagnostics/tests/unproperDefaultInitializationInTailrec.txt
index d5fc7cd02da..f20a724386b 100644
--- a/compiler/testData/diagnostics/tests/unproperDefaultInitializationInTailrec.txt
+++ b/compiler/testData/diagnostics/tests/unproperDefaultInitializationInTailrec.txt
@@ -25,6 +25,7 @@ public final enum class EnumA : kotlin.Enum<EnumA> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<EnumA>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumA
     public final /*synthesized*/ fun values(): kotlin.Array<EnumA>
 }
diff --git a/compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclaration.txt b/compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclaration.txt
index 30ad6b899ca..1ffe789c485 100644
--- a/compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclaration.txt
+++ b/compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclaration.txt
@@ -32,6 +32,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 
             // Static members
+            public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<kotlin.jvm.InlineEnum>
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kotlin.jvm.InlineEnum
             public final /*synthesized*/ fun values(): kotlin.Array<kotlin.jvm.InlineEnum>
         }
@@ -57,4 +58,3 @@ package kotlin {
         }
     }
 }
-
diff --git a/compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclarationDisabled.txt b/compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclarationDisabled.txt
index 6a77ee29f9b..8669fa100af 100644
--- a/compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclarationDisabled.txt
+++ b/compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclarationDisabled.txt
@@ -32,6 +32,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 
             // Static members
+            public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<kotlin.jvm.InlineEnum>
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kotlin.jvm.InlineEnum
             public final /*synthesized*/ fun values(): kotlin.Array<kotlin.jvm.InlineEnum>
         }
diff --git a/compiler/testData/diagnostics/tests/when/BranchFalseBypass.txt b/compiler/testData/diagnostics/tests/when/BranchFalseBypass.txt
index e3f651f1857..d95475204fa 100644
--- a/compiler/testData/diagnostics/tests/when/BranchFalseBypass.txt
+++ b/compiler/testData/diagnostics/tests/when/BranchFalseBypass.txt
@@ -19,6 +19,7 @@ public final enum class My : kotlin.Enum<My> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/when/DuplicatedLabels.txt b/compiler/testData/diagnostics/tests/when/DuplicatedLabels.txt
index 9754d21df26..d3ad54cae64 100644
--- a/compiler/testData/diagnostics/tests/when/DuplicatedLabels.txt
+++ b/compiler/testData/diagnostics/tests/when/DuplicatedLabels.txt
@@ -28,6 +28,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
+        public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<test.Color>
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Color
         public final /*synthesized*/ fun values(): kotlin.Array<test.Color>
     }
@@ -39,4 +40,3 @@ package test {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
-
diff --git a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.txt b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.txt
index 49847a41ff3..5e51b93d217 100644
--- a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.txt
+++ b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.txt
@@ -24,6 +24,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.txt b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.txt
index a56b04ebc8a..7de834fdeb0 100644
--- a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.txt
+++ b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.txt
@@ -19,6 +19,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.txt b/compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.txt
index 5a841fad7a5..bf108915ba9 100644
--- a/compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.txt
+++ b/compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.txt
@@ -19,6 +19,7 @@ public final enum class My : kotlin.Enum<My> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<My>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): My
     public final /*synthesized*/ fun values(): kotlin.Array<My>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveBreakContinue.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveBreakContinue.txt
index 574f2e37adb..3d0c148fcd4 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveBreakContinue.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveBreakContinue.txt
@@ -21,6 +21,7 @@ public final enum class Color : kotlin.Enum<Color> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Color>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Color
     public final /*synthesized*/ fun values(): kotlin.Array<Color>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.txt
index b77ec95fa6f..9ad0526b25e 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.txt
@@ -21,6 +21,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.txt
index b77ec95fa6f..9ad0526b25e 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.txt
@@ -21,6 +21,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.txt
index cfbaa930ad9..5d88e35dbce 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.txt
@@ -23,6 +23,7 @@ public final enum class Direction : kotlin.Enum<Direction> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Direction>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Direction
     public final /*synthesized*/ fun values(): kotlin.Array<Direction>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.txt
index 6081bdd76c6..2ff3412b564 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.txt
@@ -19,6 +19,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MyEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.txt
index a4d51d95706..d26fb602496 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.txt
@@ -19,6 +19,7 @@ public final enum class J : kotlin.Enum<J!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<J>
     public open fun create(): J!
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): J
     public final /*synthesized*/ fun values(): kotlin.Array<J>
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt
index a457628e9d9..5c508caee84 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt
@@ -19,6 +19,7 @@ public final enum class J : kotlin.Enum<J!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<J>
     @org.jetbrains.annotations.NotNull public open fun create(): J
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): J
     public final /*synthesized*/ fun values(): kotlin.Array<J>
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.txt
index a4d51d95706..d26fb602496 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.txt
@@ -19,6 +19,7 @@ public final enum class J : kotlin.Enum<J!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<J>
     public open fun create(): J!
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): J
     public final /*synthesized*/ fun values(): kotlin.Array<J>
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.txt
index a4d51d95706..d26fb602496 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.txt
@@ -19,6 +19,7 @@ public final enum class J : kotlin.Enum<J!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<J>
     public open fun create(): J!
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): J
     public final /*synthesized*/ fun values(): kotlin.Array<J>
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.txt
index a4d51d95706..d26fb602496 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.txt
@@ -19,6 +19,7 @@ public final enum class J : kotlin.Enum<J!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<J>
     public open fun create(): J!
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): J
     public final /*synthesized*/ fun values(): kotlin.Array<J>
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.txt
index cfbaa930ad9..5d88e35dbce 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.txt
@@ -23,6 +23,7 @@ public final enum class Direction : kotlin.Enum<Direction> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Direction>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Direction
     public final /*synthesized*/ fun values(): kotlin.Array<Direction>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveReturnThrow.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveReturnThrow.txt
index cfbaa930ad9..5d88e35dbce 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveReturnThrow.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveReturnThrow.txt
@@ -23,6 +23,7 @@ public final enum class Direction : kotlin.Enum<Direction> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<Direction>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Direction
     public final /*synthesized*/ fun values(): kotlin.Array<Direction>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.txt
index 5be983a983c..61d9dbed7ab 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.txt
@@ -19,6 +19,7 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
     public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.txt
index 5be983a983c..61d9dbed7ab 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.txt
@@ -19,6 +19,7 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
     public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.txt
index 5be983a983c..61d9dbed7ab 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.txt
@@ -19,6 +19,7 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
     public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.txt b/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.txt
index a4d51d95706..d26fb602496 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.txt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.txt
@@ -19,6 +19,7 @@ public final enum class J : kotlin.Enum<J!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<J>
     public open fun create(): J!
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): J
     public final /*synthesized*/ fun values(): kotlin.Array<J>
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.txt
index 30d68241847..62ccff16a17 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.txt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.txt
@@ -23,6 +23,7 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
     public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.txt
index 30d68241847..62ccff16a17 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.txt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.txt
@@ -23,6 +23,7 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
     public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.txt
index 30d68241847..62ccff16a17 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.txt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.txt
@@ -23,6 +23,7 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
     public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.txt
index 68f9218cb19..15e4d95d089 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.txt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.txt
@@ -23,6 +23,7 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
     public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.txt
index 5be983a983c..61d9dbed7ab 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.txt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.txt
@@ -19,6 +19,7 @@ public final enum class X : kotlin.Enum<X> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<X>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): X
     public final /*synthesized*/ fun values(): kotlin.Array<X>
 }
diff --git a/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.txt b/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.txt
index e6f8049d509..0642c9f8722 100644
--- a/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.txt
+++ b/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.txt
@@ -17,6 +17,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/tests/when/RedundantElse.txt b/compiler/testData/diagnostics/tests/when/RedundantElse.txt
index ffdbf319964..0122d50c01f 100644
--- a/compiler/testData/diagnostics/tests/when/RedundantElse.txt
+++ b/compiler/testData/diagnostics/tests/when/RedundantElse.txt
@@ -25,6 +25,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
@@ -44,6 +45,7 @@ public final enum class MyEnum : kotlin.Enum<MyEnum!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<MyEnum>
     public open fun getInstance(): MyEnum!
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
@@ -69,4 +71,3 @@ public sealed class X {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
-
diff --git a/compiler/testData/diagnostics/tests/when/nonExhaustiveWhenStatement_1_5.txt b/compiler/testData/diagnostics/tests/when/nonExhaustiveWhenStatement_1_5.txt
index df88adc5102..a1eb29b5a3b 100644
--- a/compiler/testData/diagnostics/tests/when/nonExhaustiveWhenStatement_1_5.txt
+++ b/compiler/testData/diagnostics/tests/when/nonExhaustiveWhenStatement_1_5.txt
@@ -73,6 +73,7 @@ public final enum class SomeEnum : kotlin.Enum<SomeEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<SomeEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): SomeEnum
     public final /*synthesized*/ fun values(): kotlin.Array<SomeEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/when/nonExhaustiveWhenStatement_1_6.txt b/compiler/testData/diagnostics/tests/when/nonExhaustiveWhenStatement_1_6.txt
index df88adc5102..a1eb29b5a3b 100644
--- a/compiler/testData/diagnostics/tests/when/nonExhaustiveWhenStatement_1_6.txt
+++ b/compiler/testData/diagnostics/tests/when/nonExhaustiveWhenStatement_1_6.txt
@@ -73,6 +73,7 @@ public final enum class SomeEnum : kotlin.Enum<SomeEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<SomeEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): SomeEnum
     public final /*synthesized*/ fun values(): kotlin.Array<SomeEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/when/nonExhaustiveWhenStatement_1_7.txt b/compiler/testData/diagnostics/tests/when/nonExhaustiveWhenStatement_1_7.txt
index df88adc5102..a1eb29b5a3b 100644
--- a/compiler/testData/diagnostics/tests/when/nonExhaustiveWhenStatement_1_7.txt
+++ b/compiler/testData/diagnostics/tests/when/nonExhaustiveWhenStatement_1_7.txt
@@ -73,6 +73,7 @@ public final enum class SomeEnum : kotlin.Enum<SomeEnum> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<SomeEnum>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): SomeEnum
     public final /*synthesized*/ fun values(): kotlin.Array<SomeEnum>
 }
diff --git a/compiler/testData/diagnostics/tests/when/withSubjectVariable/smartcastToEnum.txt b/compiler/testData/diagnostics/tests/when/withSubjectVariable/smartcastToEnum.txt
index 0d7a203ce2d..a8736c99f0d 100644
--- a/compiler/testData/diagnostics/tests/when/withSubjectVariable/smartcastToEnum.txt
+++ b/compiler/testData/diagnostics/tests/when/withSubjectVariable/smartcastToEnum.txt
@@ -20,6 +20,7 @@ public final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
+    public final /*synthesized*/ val entries: kotlin.enums.EnumEntries<E>
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.fir.kt
index 979d87a8d7b..8bc20f758b1 100644
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.fir.kt
+++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.fir.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class E {
     ENTRY;
 
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.kt
index 47b2236be67..d333d24e91d 100644
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.kt
+++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class E {
     ENTRY;
 
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/enum.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/enum.kt
index a1150efa5e6..226d81bd119 100644
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/enum.kt
+++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/enum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 enum class <!CONFLICTING_JVM_DECLARATIONS, CONFLICTING_JVM_DECLARATIONS!>E<!> {
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/synthesized/enumValuesValueOf.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/synthesized/enumValuesValueOf.kt
index 46e7003420e..2e928695092 100644
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/synthesized/enumValuesValueOf.kt
+++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/synthesized/enumValuesValueOf.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // FIR_IDENTICAL
 enum class <!CONFLICTING_JVM_DECLARATIONS, CONFLICTING_JVM_DECLARATIONS!>A<!> {
     A1,
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/enumCapturesProperty.diag.txt b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/enumCapturesProperty.diag.txt
index e60e8bd0571..62735a9a13a 100644
--- a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/enumCapturesProperty.diag.txt
+++ b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/enumCapturesProperty.diag.txt
@@ -1 +1 @@
-/enumCapturesProperty.kts:8:1: error: Enum class Bar captures the script class instance. Try to use class or anonymous object instead
\ No newline at end of file
+/enumCapturesProperty.kts:7:1: error: Enum class Bar captures the script class instance. Try to use class or anonymous object instead
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/enumCapturesProperty.kts b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/enumCapturesProperty.kts
index 831daf44984..e2a40d9eb60 100644
--- a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/enumCapturesProperty.kts
+++ b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/enumCapturesProperty.kts
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // !RENDER_DIAGNOSTICS_FULL_TEXT
 // TARGET_BACKEND: JVM_IR
 
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/enumEntryCapturesProperty.diag.txt b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/enumEntryCapturesProperty.diag.txt
index dff88cf716a..084a60c4588 100644
--- a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/enumEntryCapturesProperty.diag.txt
+++ b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/enumEntryCapturesProperty.diag.txt
@@ -1 +1 @@
-/enumEntryCapturesProperty.kts:8:1: error: Enum class Bar captures the script class instance. Try to use class or anonymous object instead
\ No newline at end of file
+/enumEntryCapturesProperty.kts:7:1: error: Enum class Bar captures the script class instance. Try to use class or anonymous object instead
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/enumEntryCapturesProperty.kts b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/enumEntryCapturesProperty.kts
index b7ed654ae44..f65bdd94f61 100644
--- a/compiler/testData/diagnostics/testsWithJvmBackend/scripts/enumEntryCapturesProperty.kts
+++ b/compiler/testData/diagnostics/testsWithJvmBackend/scripts/enumEntryCapturesProperty.kts
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // !RENDER_DIAGNOSTICS_FULL_TEXT
 // TARGET_BACKEND: JVM_IR
 
diff --git a/compiler/testData/ir/irText/classes/classes.fir.ir.txt b/compiler/testData/ir/irText/classes/classes.fir.ir.txt
index 5bbb6e08947..cdaa8e1a69d 100644
--- a/compiler/testData/ir/irText/classes/classes.fir.ir.txt
+++ b/compiler/testData/ir/irText/classes/classes.fir.ir.txt
@@ -84,7 +84,7 @@ FILE fqName:<root> fileName:/classes.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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries
+      FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.TestEnumClass>
         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]
diff --git a/compiler/testData/ir/irText/classes/classes.fir.kt.txt b/compiler/testData/ir/irText/classes/classes.fir.kt.txt
index 6ef3484b7ba..93b202fb336 100644
--- a/compiler/testData/ir/irText/classes/classes.fir.kt.txt
+++ b/compiler/testData/ir/irText/classes/classes.fir.kt.txt
@@ -40,8 +40,7 @@ enum class TestEnumClass : Enum<TestEnumClass> {
 
   fun valueOf(value: String): TestEnumClass /* Synthetic body for ENUM_VALUEOF */
 
-  val entries: EnumEntries
-    get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */
+  val entries: EnumEntries<TestEnumClass>
+    get(): EnumEntries<TestEnumClass> /* Synthetic body for ENUM_ENTRIES */
 
 }
-
diff --git a/compiler/testData/ir/irText/classes/classes.ir.txt b/compiler/testData/ir/irText/classes/classes.ir.txt
index ffd11e8f250..256b3e01f6c 100644
--- a/compiler/testData/ir/irText/classes/classes.ir.txt
+++ b/compiler/testData/ir/irText/classes/classes.ir.txt
@@ -131,3 +131,7 @@ FILE fqName:<root> fileName:/classes.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.TestEnumClass
       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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.TestEnumClass>
+        correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
+        SYNTHETIC_BODY kind=ENUM_ENTRIES
diff --git a/compiler/testData/ir/irText/classes/classes.kt.txt b/compiler/testData/ir/irText/classes/classes.kt.txt
index 902608557ae..93b202fb336 100644
--- a/compiler/testData/ir/irText/classes/classes.kt.txt
+++ b/compiler/testData/ir/irText/classes/classes.kt.txt
@@ -40,4 +40,7 @@ enum class TestEnumClass : Enum<TestEnumClass> {
 
   fun valueOf(value: String): TestEnumClass /* Synthetic body for ENUM_VALUEOF */
 
+  val entries: EnumEntries<TestEnumClass>
+    get(): EnumEntries<TestEnumClass> /* Synthetic body for ENUM_ENTRIES */
+
 }
diff --git a/compiler/testData/ir/irText/classes/enumClassModality.fir.ir.txt b/compiler/testData/ir/irText/classes/enumClassModality.fir.ir.txt
index f27917540a8..728ecafbd2f 100644
--- a/compiler/testData/ir/irText/classes/enumClassModality.fir.ir.txt
+++ b/compiler/testData/ir/irText/classes/enumClassModality.fir.ir.txt
@@ -15,7 +15,7 @@ FILE fqName:<root> fileName:/enumClassModality.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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries
+      FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.TestFinalEnum1>
         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]
@@ -87,7 +87,7 @@ FILE fqName:<root> fileName:/enumClassModality.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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries
+      FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.TestFinalEnum2>
         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]
@@ -149,7 +149,7 @@ FILE fqName:<root> fileName:/enumClassModality.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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries
+      FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.TestFinalEnum3>
         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]
@@ -257,7 +257,7 @@ FILE fqName:<root> fileName:/enumClassModality.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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries
+      FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.TestOpenEnum1>
         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]
@@ -370,7 +370,7 @@ FILE fqName:<root> fileName:/enumClassModality.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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries
+      FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.TestOpenEnum2>
         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]
@@ -482,7 +482,7 @@ FILE fqName:<root> fileName:/enumClassModality.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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries
+      FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.TestAbstractEnum1>
         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]
@@ -609,7 +609,7 @@ FILE fqName:<root> fileName:/enumClassModality.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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries
+      FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.TestAbstractEnum2>
         correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
         SYNTHETIC_BODY kind=ENUM_ENTRIES
     FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.IFoo) returnType:kotlin.Unit [fake_override]
diff --git a/compiler/testData/ir/irText/classes/enumClassModality.fir.kt.txt b/compiler/testData/ir/irText/classes/enumClassModality.fir.kt.txt
index 412ff657fba..b06a3d26b50 100644
--- a/compiler/testData/ir/irText/classes/enumClassModality.fir.kt.txt
+++ b/compiler/testData/ir/irText/classes/enumClassModality.fir.kt.txt
@@ -11,8 +11,8 @@ enum class TestFinalEnum1 : Enum<TestFinalEnum1> {
 
   fun valueOf(value: String): TestFinalEnum1 /* Synthetic body for ENUM_VALUEOF */
 
-  val entries: EnumEntries
-    get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */
+  val entries: EnumEntries<TestFinalEnum1>
+    get(): EnumEntries<TestFinalEnum1> /* Synthetic body for ENUM_ENTRIES */
 
 }
 
@@ -33,8 +33,8 @@ open enum class TestFinalEnum2 : Enum<TestFinalEnum2> {
 
   fun valueOf(value: String): TestFinalEnum2 /* Synthetic body for ENUM_VALUEOF */
 
-  val entries: EnumEntries
-    get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */
+  val entries: EnumEntries<TestFinalEnum2>
+    get(): EnumEntries<TestFinalEnum2> /* Synthetic body for ENUM_ENTRIES */
 
 }
 
@@ -54,8 +54,8 @@ enum class TestFinalEnum3 : Enum<TestFinalEnum3> {
 
   fun valueOf(value: String): TestFinalEnum3 /* Synthetic body for ENUM_VALUEOF */
 
-  val entries: EnumEntries
-    get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */
+  val entries: EnumEntries<TestFinalEnum3>
+    get(): EnumEntries<TestFinalEnum3> /* Synthetic body for ENUM_ENTRIES */
 
 }
 
@@ -84,8 +84,8 @@ open enum class TestOpenEnum1 : Enum<TestOpenEnum1> {
 
   fun valueOf(value: String): TestOpenEnum1 /* Synthetic body for ENUM_VALUEOF */
 
-  val entries: EnumEntries
-    get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */
+  val entries: EnumEntries<TestOpenEnum1>
+    get(): EnumEntries<TestOpenEnum1> /* Synthetic body for ENUM_ENTRIES */
 
 }
 
@@ -116,8 +116,8 @@ open enum class TestOpenEnum2 : Enum<TestOpenEnum2> {
 
   fun valueOf(value: String): TestOpenEnum2 /* Synthetic body for ENUM_VALUEOF */
 
-  val entries: EnumEntries
-    get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */
+  val entries: EnumEntries<TestOpenEnum2>
+    get(): EnumEntries<TestOpenEnum2> /* Synthetic body for ENUM_ENTRIES */
 
 }
 
@@ -146,8 +146,8 @@ abstract enum class TestAbstractEnum1 : Enum<TestAbstractEnum1> {
 
   fun valueOf(value: String): TestAbstractEnum1 /* Synthetic body for ENUM_VALUEOF */
 
-  val entries: EnumEntries
-    get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */
+  val entries: EnumEntries<TestAbstractEnum1>
+    get(): EnumEntries<TestAbstractEnum1> /* Synthetic body for ENUM_ENTRIES */
 
 }
 
@@ -180,8 +180,7 @@ abstract enum class TestAbstractEnum2 : IFoo, Enum<TestAbstractEnum2> {
 
   fun valueOf(value: String): TestAbstractEnum2 /* Synthetic body for ENUM_VALUEOF */
 
-  val entries: EnumEntries
-    get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */
+  val entries: EnumEntries<TestAbstractEnum2>
+    get(): EnumEntries<TestAbstractEnum2> /* Synthetic body for ENUM_ENTRIES */
 
 }
-
diff --git a/compiler/testData/ir/irText/classes/enumClassModality.ir.txt b/compiler/testData/ir/irText/classes/enumClassModality.ir.txt
index a64d001afb3..e8495da83db 100644
--- a/compiler/testData/ir/irText/classes/enumClassModality.ir.txt
+++ b/compiler/testData/ir/irText/classes/enumClassModality.ir.txt
@@ -62,6 +62,10 @@ FILE fqName:<root> fileName:/enumClassModality.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.TestFinalEnum1
       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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.TestFinalEnum1>
+        correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
+        SYNTHETIC_BODY kind=ENUM_ENTRIES
   CLASS ENUM_CLASS name:TestFinalEnum2 modality:FINAL visibility:public superTypes:[kotlin.Enum<<root>.TestFinalEnum2>]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestFinalEnum2
     CONSTRUCTOR visibility:private <> (x:kotlin.Int) returnType:<root>.TestFinalEnum2 [primary]
@@ -138,6 +142,10 @@ FILE fqName:<root> fileName:/enumClassModality.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.TestFinalEnum2
       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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.TestFinalEnum2>
+        correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
+        SYNTHETIC_BODY kind=ENUM_ENTRIES
   CLASS ENUM_CLASS name:TestFinalEnum3 modality:FINAL visibility:public superTypes:[kotlin.Enum<<root>.TestFinalEnum3>]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestFinalEnum3
     CONSTRUCTOR visibility:private <> () returnType:<root>.TestFinalEnum3 [primary]
@@ -204,6 +212,10 @@ FILE fqName:<root> fileName:/enumClassModality.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.TestFinalEnum3
       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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.TestFinalEnum3>
+        correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
+        SYNTHETIC_BODY kind=ENUM_ENTRIES
   CLASS ENUM_CLASS name:TestOpenEnum1 modality:OPEN visibility:public superTypes:[kotlin.Enum<<root>.TestOpenEnum1>]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestOpenEnum1
     CONSTRUCTOR visibility:private <> () returnType:<root>.TestOpenEnum1 [primary]
@@ -325,6 +337,10 @@ FILE fqName:<root> fileName:/enumClassModality.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.TestOpenEnum1
       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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.TestOpenEnum1>
+        correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
+        SYNTHETIC_BODY kind=ENUM_ENTRIES
   CLASS ENUM_CLASS name:TestOpenEnum2 modality:OPEN visibility:public superTypes:[kotlin.Enum<<root>.TestOpenEnum2>]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestOpenEnum2
     CONSTRUCTOR visibility:private <> () returnType:<root>.TestOpenEnum2 [primary]
@@ -451,6 +467,10 @@ FILE fqName:<root> fileName:/enumClassModality.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.TestOpenEnum2
       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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.TestOpenEnum2>
+        correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
+        SYNTHETIC_BODY kind=ENUM_ENTRIES
   CLASS ENUM_CLASS name:TestAbstractEnum1 modality:ABSTRACT visibility:public superTypes:[kotlin.Enum<<root>.TestAbstractEnum1>]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestAbstractEnum1
     CONSTRUCTOR visibility:private <> () returnType:<root>.TestAbstractEnum1 [primary]
@@ -576,6 +596,10 @@ FILE fqName:<root> fileName:/enumClassModality.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.TestAbstractEnum1
       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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.TestAbstractEnum1>
+        correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
+        SYNTHETIC_BODY kind=ENUM_ENTRIES
   CLASS INTERFACE name:IFoo modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IFoo
     FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.IFoo) returnType:kotlin.Unit
@@ -723,3 +747,7 @@ FILE fqName:<root> fileName:/enumClassModality.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.TestAbstractEnum2
       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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.TestAbstractEnum2>
+        correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
+        SYNTHETIC_BODY kind=ENUM_ENTRIES
diff --git a/compiler/testData/ir/irText/classes/enumClassModality.kt.txt b/compiler/testData/ir/irText/classes/enumClassModality.kt.txt
index 9e12e4da291..ad443f06bb4 100644
--- a/compiler/testData/ir/irText/classes/enumClassModality.kt.txt
+++ b/compiler/testData/ir/irText/classes/enumClassModality.kt.txt
@@ -11,6 +11,9 @@ enum class TestFinalEnum1 : Enum<TestFinalEnum1> {
 
   fun valueOf(value: String): TestFinalEnum1 /* Synthetic body for ENUM_VALUEOF */
 
+  val entries: EnumEntries<TestFinalEnum1>
+    get(): EnumEntries<TestFinalEnum1> /* Synthetic body for ENUM_ENTRIES */
+
 }
 
 enum class TestFinalEnum2 : Enum<TestFinalEnum2> {
@@ -30,6 +33,9 @@ enum class TestFinalEnum2 : Enum<TestFinalEnum2> {
 
   fun valueOf(value: String): TestFinalEnum2 /* Synthetic body for ENUM_VALUEOF */
 
+  val entries: EnumEntries<TestFinalEnum2>
+    get(): EnumEntries<TestFinalEnum2> /* Synthetic body for ENUM_ENTRIES */
+
 }
 
 enum class TestFinalEnum3 : Enum<TestFinalEnum3> {
@@ -48,6 +54,9 @@ enum class TestFinalEnum3 : Enum<TestFinalEnum3> {
 
   fun valueOf(value: String): TestFinalEnum3 /* Synthetic body for ENUM_VALUEOF */
 
+  val entries: EnumEntries<TestFinalEnum3>
+    get(): EnumEntries<TestFinalEnum3> /* Synthetic body for ENUM_ENTRIES */
+
 }
 
 open enum class TestOpenEnum1 : Enum<TestOpenEnum1> {
@@ -75,6 +84,9 @@ open enum class TestOpenEnum1 : Enum<TestOpenEnum1> {
 
   fun valueOf(value: String): TestOpenEnum1 /* Synthetic body for ENUM_VALUEOF */
 
+  val entries: EnumEntries<TestOpenEnum1>
+    get(): EnumEntries<TestOpenEnum1> /* Synthetic body for ENUM_ENTRIES */
+
 }
 
 open enum class TestOpenEnum2 : Enum<TestOpenEnum2> {
@@ -104,6 +116,9 @@ open enum class TestOpenEnum2 : Enum<TestOpenEnum2> {
 
   fun valueOf(value: String): TestOpenEnum2 /* Synthetic body for ENUM_VALUEOF */
 
+  val entries: EnumEntries<TestOpenEnum2>
+    get(): EnumEntries<TestOpenEnum2> /* Synthetic body for ENUM_ENTRIES */
+
 }
 
 abstract enum class TestAbstractEnum1 : Enum<TestAbstractEnum1> {
@@ -132,6 +147,9 @@ abstract enum class TestAbstractEnum1 : Enum<TestAbstractEnum1> {
 
   fun valueOf(value: String): TestAbstractEnum1 /* Synthetic body for ENUM_VALUEOF */
 
+  val entries: EnumEntries<TestAbstractEnum1>
+    get(): EnumEntries<TestAbstractEnum1> /* Synthetic body for ENUM_ENTRIES */
+
 }
 
 interface IFoo {
@@ -163,4 +181,7 @@ abstract enum class TestAbstractEnum2 : Enum<TestAbstractEnum2>, IFoo {
 
   fun valueOf(value: String): TestAbstractEnum2 /* Synthetic body for ENUM_VALUEOF */
 
+  val entries: EnumEntries<TestAbstractEnum2>
+    get(): EnumEntries<TestAbstractEnum2> /* Synthetic body for ENUM_ENTRIES */
+
 }
diff --git a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.ir.txt b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.ir.txt
index 1354f71778b..3b330bfc82d 100644
--- a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.ir.txt
+++ b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.ir.txt
@@ -185,7 +185,7 @@ FILE fqName:<root> fileName:/enumWithMultipleCtors.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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries
+      FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.A>
         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]
diff --git a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.kt.txt b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.kt.txt
index 94bbc7fff96..69517ef58fd 100644
--- a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.kt.txt
+++ b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.kt.txt
@@ -57,8 +57,7 @@ open enum class A : Enum<A> {
 
   fun valueOf(value: String): A /* Synthetic body for ENUM_VALUEOF */
 
-  val entries: EnumEntries
-    get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */
+  val entries: EnumEntries<A>
+    get(): EnumEntries<A> /* Synthetic body for ENUM_ENTRIES */
 
 }
-
diff --git a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.ir.txt b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.ir.txt
index 6088f90a5a2..2a9eea5f4bc 100644
--- a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.ir.txt
+++ b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.ir.txt
@@ -241,3 +241,7 @@ FILE fqName:<root> fileName:/enumWithMultipleCtors.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.A
       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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.A>
+        correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
+        SYNTHETIC_BODY kind=ENUM_ENTRIES
diff --git a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.kt.txt b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.kt.txt
index 5bae7ca8a4b..1f60cbe9e32 100644
--- a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.kt.txt
+++ b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.kt.txt
@@ -57,4 +57,7 @@ open enum class A : Enum<A> {
 
   fun valueOf(value: String): A /* Synthetic body for ENUM_VALUEOF */
 
+  val entries: EnumEntries<A>
+    get(): EnumEntries<A> /* Synthetic body for ENUM_ENTRIES */
+
 }
diff --git a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.ir.txt b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.ir.txt
index 4bb76d25a52..03d7a8afbf4 100644
--- a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.ir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.ir.txt
@@ -144,7 +144,7 @@ FILE fqName:<root> fileName:/classesWithAnnotations.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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries
+      FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.TestEnum>
         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]
diff --git a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.kt.txt b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.kt.txt
index 7dd70494a73..700f9ca6112 100644
--- a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.kt.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.kt.txt
@@ -67,8 +67,8 @@ enum class TestEnum : Enum<TestEnum> {
 
   fun valueOf(value: String): TestEnum /* Synthetic body for ENUM_VALUEOF */
 
-  val entries: EnumEntries
-    get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */
+  val entries: EnumEntries<TestEnum>
+    get(): EnumEntries<TestEnum> /* Synthetic body for ENUM_ENTRIES */
 
 }
 
@@ -81,4 +81,3 @@ open annotation class TestAnnotation : Annotation {
   }
 
 }
-
diff --git a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.ir.txt b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.ir.txt
index 0c7253e6da8..264e3f9a0fa 100644
--- a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.ir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.ir.txt
@@ -191,6 +191,10 @@ FILE fqName:<root> fileName:/classesWithAnnotations.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.TestEnum
       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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.TestEnum>
+        correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
+        SYNTHETIC_BODY kind=ENUM_ENTRIES
   CLASS ANNOTATION_CLASS name:TestAnnotation modality:OPEN visibility:public superTypes:[kotlin.Annotation]
     annotations:
       TestAnn(x = 'annotation')
diff --git a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.kt.txt
index 88aa89d0dcc..700f9ca6112 100644
--- a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.kt.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.kt.txt
@@ -67,6 +67,9 @@ enum class TestEnum : Enum<TestEnum> {
 
   fun valueOf(value: String): TestEnum /* Synthetic body for ENUM_VALUEOF */
 
+  val entries: EnumEntries<TestEnum>
+    get(): EnumEntries<TestEnum> /* Synthetic body for ENUM_ENTRIES */
+
 }
 
 @TestAnn(x = "annotation")
diff --git a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.ir.txt b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.ir.txt
index 86bf75ab132..afa2873a533 100644
--- a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.ir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.ir.txt
@@ -110,7 +110,7 @@ FILE fqName:<root> fileName:/enumEntriesWithAnnotations.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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries
+      FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.TestEnum>
         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]
diff --git a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.kt.txt b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.kt.txt
index e0c10b2e195..5627be26e78 100644
--- a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.kt.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.kt.txt
@@ -40,8 +40,7 @@ open enum class TestEnum : Enum<TestEnum> {
 
   fun valueOf(value: String): TestEnum /* Synthetic body for ENUM_VALUEOF */
 
-  val entries: EnumEntries
-    get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */
+  val entries: EnumEntries<TestEnum>
+    get(): EnumEntries<TestEnum> /* Synthetic body for ENUM_ENTRIES */
 
 }
-
diff --git a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.ir.txt b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.ir.txt
index 0cc2d6ea2cf..463055f6c3d 100644
--- a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.ir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.ir.txt
@@ -168,3 +168,7 @@ FILE fqName:<root> fileName:/enumEntriesWithAnnotations.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.TestEnum
       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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.TestEnum>
+        correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
+        SYNTHETIC_BODY kind=ENUM_ENTRIES
diff --git a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.kt.txt
index 057e1499bb0..8f45a4e6258 100644
--- a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.kt.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.kt.txt
@@ -41,4 +41,7 @@ open enum class TestEnum : Enum<TestEnum> {
 
   fun valueOf(value: String): TestEnum /* Synthetic body for ENUM_VALUEOF */
 
+  val entries: EnumEntries<TestEnum>
+    get(): EnumEntries<TestEnum> /* Synthetic body for ENUM_ENTRIES */
+
 }
diff --git a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.ir.txt b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.ir.txt
index 798a46e4a1a..136eb6683d6 100644
--- a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.ir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.ir.txt
@@ -24,7 +24,7 @@ FILE fqName:<root> fileName:/enumsInAnnotationArguments.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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries
+      FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.En>
         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]
diff --git a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.kt.txt b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.kt.txt
index 65e078009c9..76eb2065083 100644
--- a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.kt.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.kt.txt
@@ -17,8 +17,8 @@ enum class En : Enum<En> {
 
   fun valueOf(value: String): En /* Synthetic body for ENUM_VALUEOF */
 
-  val entries: EnumEntries
-    get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */
+  val entries: EnumEntries<En>
+    get(): EnumEntries<En> /* Synthetic body for ENUM_ENTRIES */
 
 }
 
@@ -38,4 +38,3 @@ open annotation class TestAnn : Annotation {
 @TestAnn(x = En.A)
 fun test1() {
 }
-
diff --git a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.ir.txt b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.ir.txt
index 37937c16159..6188fc2fcb5 100644
--- a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.ir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.ir.txt
@@ -71,6 +71,10 @@ FILE fqName:<root> fileName:/enumsInAnnotationArguments.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.En
       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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.En>
+        correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
+        SYNTHETIC_BODY kind=ENUM_ENTRIES
   CLASS ANNOTATION_CLASS name:TestAnn modality:OPEN visibility:public superTypes:[kotlin.Annotation]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestAnn
     CONSTRUCTOR visibility:public <> (x:<root>.En) returnType:<root>.TestAnn [primary]
diff --git a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.kt.txt b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.kt.txt
index 9a05791b38f..76eb2065083 100644
--- a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.kt.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.kt.txt
@@ -17,6 +17,9 @@ enum class En : Enum<En> {
 
   fun valueOf(value: String): En /* Synthetic body for ENUM_VALUEOF */
 
+  val entries: EnumEntries<En>
+    get(): EnumEntries<En> /* Synthetic body for ENUM_ENTRIES */
+
 }
 
 open annotation class TestAnn : Annotation {
diff --git a/compiler/testData/ir/irText/declarations/annotations/javaAnnotationWithSingleArrayArgument.fir.ir.txt b/compiler/testData/ir/irText/declarations/annotations/javaAnnotationWithSingleArrayArgument.fir.ir.txt
index 8382723ad70..d7733ed1303 100644
--- a/compiler/testData/ir/irText/declarations/annotations/javaAnnotationWithSingleArrayArgument.fir.ir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/javaAnnotationWithSingleArrayArgument.fir.ir.txt
@@ -46,7 +46,7 @@ FILE fqName:<root> fileName:/C.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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries
+      FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.E>
         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]
diff --git a/compiler/testData/ir/irText/declarations/annotations/javaAnnotationWithSingleArrayArgument.ir.txt b/compiler/testData/ir/irText/declarations/annotations/javaAnnotationWithSingleArrayArgument.ir.txt
index 7ef6cef522b..ff2086592e5 100644
--- a/compiler/testData/ir/irText/declarations/annotations/javaAnnotationWithSingleArrayArgument.ir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/javaAnnotationWithSingleArrayArgument.ir.txt
@@ -93,6 +93,10 @@ FILE fqName:<root> fileName:/C.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.E
       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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.E>
+        correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
+        SYNTHETIC_BODY kind=ENUM_ENTRIES
   CLASS ANNOTATION_CLASS name:Annos modality:OPEN visibility:public superTypes:[kotlin.Annotation]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Annos
     CONSTRUCTOR visibility:public <> (value:kotlin.Array<<root>.Anno>) returnType:<root>.Annos [primary]
diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.ir.txt b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.ir.txt
index 1be4fe0306a..2f450c18c89 100644
--- a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.ir.txt
+++ b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.ir.txt
@@ -56,6 +56,10 @@ FILE fqName:<root> fileName:/expectedEnumClass.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.MyEnum
       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 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
   CLASS ENUM_CLASS name:MyEnum modality:FINAL visibility:public superTypes:[kotlin.Enum<<root>.MyEnum>]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyEnum
     CONSTRUCTOR visibility:private <> () returnType:<root>.MyEnum [primary]
@@ -125,3 +129,7 @@ FILE fqName:<root> fileName:/expectedEnumClass.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.MyEnum
       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 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
diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt.txt
index d61071557d0..21902285ff5 100644
--- a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt.txt
+++ b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt.txt
@@ -7,6 +7,9 @@ expect enum class MyEnum : Enum<MyEnum> {
 
   fun valueOf(value: String): MyEnum /* Synthetic body for ENUM_VALUEOF */
 
+  val entries: EnumEntries<MyEnum>
+    get(): EnumEntries<MyEnum> /* Synthetic body for ENUM_ENTRIES */
+
 }
 
 enum class MyEnum : Enum<MyEnum> {
@@ -26,4 +29,7 @@ enum class MyEnum : Enum<MyEnum> {
 
   fun valueOf(value: String): MyEnum /* Synthetic body for ENUM_VALUEOF */
 
+  val entries: EnumEntries<MyEnum>
+    get(): EnumEntries<MyEnum> /* Synthetic body for ENUM_ENTRIES */
+
 }
diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.ir.txt b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.ir.txt
index f013067784c..512ceba8c70 100644
--- a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.ir.txt
+++ b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.ir.txt
@@ -21,7 +21,7 @@ FILE fqName:<root> fileName:/main.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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries
+      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]
diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.kt.txt
index 08fa8fe162d..00d8f6767e2 100644
--- a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.kt.txt
+++ b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.kt.txt
@@ -17,7 +17,7 @@ enum class MyEnum : Enum<MyEnum> {
 
   fun valueOf(value: String): MyEnum /* Synthetic body for ENUM_VALUEOF */
 
-  val entries: EnumEntries
-    get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */
+  val entries: EnumEntries<MyEnum>
+    get(): EnumEntries<MyEnum> /* Synthetic body for ENUM_ENTRIES */
 
 }
diff --git a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.ir.txt b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.ir.txt
index acf3b97a4f2..4a3b03c4034 100644
--- a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.ir.txt
+++ b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.ir.txt
@@ -96,7 +96,7 @@ FILE fqName:<root> fileName:/enumEntryAsReceiver.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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries
+      FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.X>
         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]
diff --git a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.kt.txt b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.kt.txt
index a0d41a38b3c..dac77e5b3a7 100644
--- a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.kt.txt
+++ b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.kt.txt
@@ -33,12 +33,11 @@ abstract enum class X : Enum<X> {
 
   fun valueOf(value: String): X /* Synthetic body for ENUM_VALUEOF */
 
-  val entries: EnumEntries
-    get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */
+  val entries: EnumEntries<X>
+    get(): EnumEntries<X> /* Synthetic body for ENUM_ENTRIES */
 
 }
 
 fun box(): String {
   return X.B.<get-value>().invoke()
 }
-
diff --git a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.ir.txt b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.ir.txt
index dccfea22156..dd9db5084bc 100644
--- a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.ir.txt
+++ b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.ir.txt
@@ -152,6 +152,10 @@ FILE fqName:<root> fileName:/enumEntryAsReceiver.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.X
       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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.X>
+        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.String
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
diff --git a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.kt.txt b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.kt.txt
index a87fdc9929b..cd7fb27a0eb 100644
--- a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.kt.txt
+++ b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.kt.txt
@@ -33,6 +33,9 @@ abstract enum class X : Enum<X> {
 
   fun valueOf(value: String): X /* Synthetic body for ENUM_VALUEOF */
 
+  val entries: EnumEntries<X>
+    get(): EnumEntries<X> /* Synthetic body for ENUM_ENTRIES */
+
 }
 
 fun box(): String {
diff --git a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.ir.txt b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.ir.txt
index 5cea0dddfa6..da18d149b87 100644
--- a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.ir.txt
+++ b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.ir.txt
@@ -155,7 +155,7 @@ FILE fqName:<root> fileName:/enumEntryReferenceFromEnumEntryClass.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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries
+      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]
diff --git a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.kt.txt b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.kt.txt
index 60694d16c79..bcd4f339770 100644
--- a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.kt.txt
+++ b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.kt.txt
@@ -65,8 +65,7 @@ open enum class MyEnum : Enum<MyEnum> {
 
   fun valueOf(value: String): MyEnum /* Synthetic body for ENUM_VALUEOF */
 
-  val entries: EnumEntries
-    get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */
+  val entries: EnumEntries<MyEnum>
+    get(): EnumEntries<MyEnum> /* Synthetic body for ENUM_ENTRIES */
 
 }
-
diff --git a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.ir.txt b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.ir.txt
index f8e157b6f17..be58403bd14 100644
--- a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.ir.txt
+++ b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.ir.txt
@@ -211,3 +211,7 @@ FILE fqName:<root> fileName:/enumEntryReferenceFromEnumEntryClass.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.MyEnum
       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 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
diff --git a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.kt.txt b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.kt.txt
index f69020df91d..090b7bf57fa 100644
--- a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.kt.txt
+++ b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.kt.txt
@@ -65,4 +65,7 @@ open enum class MyEnum : Enum<MyEnum> {
 
   fun valueOf(value: String): MyEnum /* Synthetic body for ENUM_VALUEOF */
 
+  val entries: EnumEntries<MyEnum>
+    get(): EnumEntries<MyEnum> /* Synthetic body for ENUM_ENTRIES */
+
 }
diff --git a/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.fir.ir.txt b/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.fir.ir.txt
index 8bcddc8536e..2be1cb39d69 100644
--- a/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.fir.ir.txt
+++ b/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.fir.ir.txt
@@ -15,7 +15,7 @@ FILE fqName:<root> fileName:/exhaustiveWhenElseBranch.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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries
+      FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.A>
         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]
diff --git a/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.fir.kt.txt b/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.fir.kt.txt
index 53f36e74438..79807772048 100644
--- a/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.fir.kt.txt
+++ b/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.fir.kt.txt
@@ -11,8 +11,8 @@ enum class A : Enum<A> {
 
   fun valueOf(value: String): A /* Synthetic body for ENUM_VALUEOF */
 
-  val entries: EnumEntries
-    get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */
+  val entries: EnumEntries<A>
+    get(): EnumEntries<A> /* Synthetic body for ENUM_ENTRIES */
 
 }
 
@@ -120,4 +120,3 @@ fun testLambdaResultExpression_throws(a: A) {
   }
 .invoke() /*~> Unit */
 }
-
diff --git a/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.ir.txt b/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.ir.txt
index c04b71e40f9..dab5f9cd914 100644
--- a/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.ir.txt
+++ b/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.ir.txt
@@ -62,6 +62,10 @@ FILE fqName:<root> fileName:/exhaustiveWhenElseBranch.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.A
       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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.A>
+        correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
+        SYNTHETIC_BODY kind=ENUM_ENTRIES
   FUN name:testVariableAssignment_throws visibility:public modality:FINAL <> (a:<root>.A) returnType:kotlin.Unit
     VALUE_PARAMETER name:a index:0 type:<root>.A
     BLOCK_BODY
diff --git a/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.kt.txt b/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.kt.txt
index f14ddace5ea..4692c723bdd 100644
--- a/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.kt.txt
+++ b/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.kt.txt
@@ -11,6 +11,9 @@ enum class A : Enum<A> {
 
   fun valueOf(value: String): A /* Synthetic body for ENUM_VALUEOF */
 
+  val entries: EnumEntries<A>
+    get(): EnumEntries<A> /* Synthetic body for ENUM_ENTRIES */
+
 }
 
 fun testVariableAssignment_throws(a: A) {
diff --git a/compiler/testData/ir/irText/expressions/objectAsCallable.fir.ir.txt b/compiler/testData/ir/irText/expressions/objectAsCallable.fir.ir.txt
index fc51b4079a4..b3dfc3db634 100644
--- a/compiler/testData/ir/irText/expressions/objectAsCallable.fir.ir.txt
+++ b/compiler/testData/ir/irText/expressions/objectAsCallable.fir.ir.txt
@@ -34,7 +34,7 @@ FILE fqName:<root> fileName:/objectAsCallable.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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries
+      FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.En>
         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]
diff --git a/compiler/testData/ir/irText/expressions/objectAsCallable.fir.kt.txt b/compiler/testData/ir/irText/expressions/objectAsCallable.fir.kt.txt
index 2b6a119e962..4a739c8fa16 100644
--- a/compiler/testData/ir/irText/expressions/objectAsCallable.fir.kt.txt
+++ b/compiler/testData/ir/irText/expressions/objectAsCallable.fir.kt.txt
@@ -20,8 +20,8 @@ enum class En : Enum<En> {
 
   fun valueOf(value: String): En /* Synthetic body for ENUM_VALUEOF */
 
-  val entries: EnumEntries
-    get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */
+  val entries: EnumEntries<En>
+    get(): EnumEntries<En> /* Synthetic body for ENUM_ENTRIES */
 
 }
 
@@ -40,4 +40,3 @@ val test1: Int
 val test2: Int
   field = En.X.invoke(i = 42)
   get
-
diff --git a/compiler/testData/ir/irText/expressions/objectAsCallable.ir.txt b/compiler/testData/ir/irText/expressions/objectAsCallable.ir.txt
index a66a5d8a50b..82f1c023e62 100644
--- a/compiler/testData/ir/irText/expressions/objectAsCallable.ir.txt
+++ b/compiler/testData/ir/irText/expressions/objectAsCallable.ir.txt
@@ -81,6 +81,10 @@ FILE fqName:<root> fileName:/objectAsCallable.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.En
       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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.En>
+        correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
+        SYNTHETIC_BODY kind=ENUM_ENTRIES
   FUN name:invoke visibility:public modality:FINAL <> ($receiver:<root>.A, i:kotlin.Int) returnType:kotlin.Int [operator]
     $receiver: VALUE_PARAMETER name:<this> type:<root>.A
     VALUE_PARAMETER name:i index:0 type:kotlin.Int
diff --git a/compiler/testData/ir/irText/expressions/objectAsCallable.kt.txt b/compiler/testData/ir/irText/expressions/objectAsCallable.kt.txt
index 11639efa551..4a739c8fa16 100644
--- a/compiler/testData/ir/irText/expressions/objectAsCallable.kt.txt
+++ b/compiler/testData/ir/irText/expressions/objectAsCallable.kt.txt
@@ -20,6 +20,9 @@ enum class En : Enum<En> {
 
   fun valueOf(value: String): En /* Synthetic body for ENUM_VALUEOF */
 
+  val entries: EnumEntries<En>
+    get(): EnumEntries<En> /* Synthetic body for ENUM_ENTRIES */
+
 }
 
 operator fun A.invoke(i: Int): Int {
diff --git a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.ir.txt b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.ir.txt
index 6c7f8f1e7cf..fe0739baa1d 100644
--- a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.ir.txt
+++ b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.ir.txt
@@ -49,7 +49,7 @@ FILE fqName:<root> fileName:/temporaryInEnumEntryInitializer.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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries
+      FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.En>
         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]
diff --git a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.kt.txt b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.kt.txt
index 31fab7fc4cc..b8dc6ba2289 100644
--- a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.kt.txt
+++ b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.kt.txt
@@ -25,8 +25,7 @@ open enum class En : Enum<En> {
 
   fun valueOf(value: String): En /* Synthetic body for ENUM_VALUEOF */
 
-  val entries: EnumEntries
-    get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */
+  val entries: EnumEntries<En>
+    get(): EnumEntries<En> /* Synthetic body for ENUM_ENTRIES */
 
 }
-
diff --git a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.ir.txt b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.ir.txt
index fbe1af75617..5315a5f88a4 100644
--- a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.ir.txt
+++ b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.ir.txt
@@ -96,3 +96,7 @@ FILE fqName:<root> fileName:/temporaryInEnumEntryInitializer.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.En
       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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.En>
+        correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
+        SYNTHETIC_BODY kind=ENUM_ENTRIES
diff --git a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.kt.txt b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.kt.txt
index 55a5687d4bb..07fc4d04ed3 100644
--- a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.kt.txt
+++ b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.kt.txt
@@ -25,4 +25,7 @@ enum class En : Enum<En> {
 
   fun valueOf(value: String): En /* Synthetic body for ENUM_VALUEOF */
 
+  val entries: EnumEntries<En>
+    get(): EnumEntries<En> /* Synthetic body for ENUM_ENTRIES */
+
 }
diff --git a/compiler/testData/ir/irText/expressions/values.fir.ir.txt b/compiler/testData/ir/irText/expressions/values.fir.ir.txt
index df6bdc8f0ad..93f843645d6 100644
--- a/compiler/testData/ir/irText/expressions/values.fir.ir.txt
+++ b/compiler/testData/ir/irText/expressions/values.fir.ir.txt
@@ -15,7 +15,7 @@ FILE fqName:<root> fileName:/values.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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries
+      FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.Enum>
         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]
diff --git a/compiler/testData/ir/irText/expressions/values.fir.kt.txt b/compiler/testData/ir/irText/expressions/values.fir.kt.txt
index 15c58e94f05..f3324a849b5 100644
--- a/compiler/testData/ir/irText/expressions/values.fir.kt.txt
+++ b/compiler/testData/ir/irText/expressions/values.fir.kt.txt
@@ -11,8 +11,8 @@ enum class Enum : Enum<Enum> {
 
   fun valueOf(value: String): Enum /* Synthetic body for ENUM_VALUEOF */
 
-  val entries: EnumEntries
-    get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */
+  val entries: EnumEntries<Enum>
+    get(): EnumEntries<Enum> /* Synthetic body for ENUM_ENTRIES */
 
 }
 
@@ -62,4 +62,3 @@ fun test3(): Int {
 fun test4(): Companion {
   return Companion
 }
-
diff --git a/compiler/testData/ir/irText/expressions/values.ir.txt b/compiler/testData/ir/irText/expressions/values.ir.txt
index f156805b14f..84fb15d91f4 100644
--- a/compiler/testData/ir/irText/expressions/values.ir.txt
+++ b/compiler/testData/ir/irText/expressions/values.ir.txt
@@ -62,6 +62,10 @@ FILE fqName:<root> fileName:/values.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.Enum
       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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.Enum>
+        correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
+        SYNTHETIC_BODY kind=ENUM_ENTRIES
   CLASS OBJECT name:A modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A
     CONSTRUCTOR visibility:private <> () returnType:<root>.A [primary]
diff --git a/compiler/testData/ir/irText/expressions/values.kt.txt b/compiler/testData/ir/irText/expressions/values.kt.txt
index 0466612fce3..f3324a849b5 100644
--- a/compiler/testData/ir/irText/expressions/values.kt.txt
+++ b/compiler/testData/ir/irText/expressions/values.kt.txt
@@ -11,6 +11,9 @@ enum class Enum : Enum<Enum> {
 
   fun valueOf(value: String): Enum /* Synthetic body for ENUM_VALUEOF */
 
+  val entries: EnumEntries<Enum>
+    get(): EnumEntries<Enum> /* Synthetic body for ENUM_ENTRIES */
+
 }
 
 object A {
diff --git a/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.fir.ir.txt b/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.fir.ir.txt
index 7c1e4aebf89..198e7ea4984 100644
--- a/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.fir.ir.txt
+++ b/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.fir.ir.txt
@@ -21,7 +21,7 @@ FILE fqName:<root> fileName:/whenSmartCastToEnum.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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries
+      FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.En>
         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]
diff --git a/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.fir.kt.txt b/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.fir.kt.txt
index 1130c973fb9..5352cf38614 100644
--- a/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.fir.kt.txt
+++ b/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.fir.kt.txt
@@ -15,8 +15,8 @@ enum class En : Enum<En> {
 
   fun valueOf(value: String): En /* Synthetic body for ENUM_VALUEOF */
 
-  val entries: EnumEntries
-    get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */
+  val entries: EnumEntries<En>
+    get(): EnumEntries<En> /* Synthetic body for ENUM_ENTRIES */
 
 }
 
@@ -55,4 +55,3 @@ fun test() {
     }
   }
 }
-
diff --git a/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.ir.txt b/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.ir.txt
index e3b1c371d17..869c2acd5b6 100644
--- a/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.ir.txt
+++ b/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.ir.txt
@@ -68,6 +68,10 @@ FILE fqName:<root> fileName:/whenSmartCastToEnum.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.En
       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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.En>
+        correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
+        SYNTHETIC_BODY kind=ENUM_ENTRIES
   FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
       VAR name:r type:kotlin.String [var]
diff --git a/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.kt.txt b/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.kt.txt
index 4ec7d8471ab..a0df38708d4 100644
--- a/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.kt.txt
+++ b/compiler/testData/ir/irText/expressions/whenSmartCastToEnum.kt.txt
@@ -15,6 +15,9 @@ enum class En : Enum<En> {
 
   fun valueOf(value: String): En /* Synthetic body for ENUM_VALUEOF */
 
+  val entries: EnumEntries<En>
+    get(): EnumEntries<En> /* Synthetic body for ENUM_ENTRIES */
+
 }
 
 fun test() {
diff --git a/compiler/testData/ir/irText/singletons/enumEntry.fir.ir.txt b/compiler/testData/ir/irText/singletons/enumEntry.fir.ir.txt
index ba193083af0..ac25618addc 100644
--- a/compiler/testData/ir/irText/singletons/enumEntry.fir.ir.txt
+++ b/compiler/testData/ir/irText/singletons/enumEntry.fir.ir.txt
@@ -89,7 +89,7 @@ FILE fqName:<root> fileName:/enumEntry.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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries
+      FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.Z>
         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]
diff --git a/compiler/testData/ir/irText/singletons/enumEntry.fir.kt.txt b/compiler/testData/ir/irText/singletons/enumEntry.fir.kt.txt
index 8a4f98da5dd..4d74702ba85 100644
--- a/compiler/testData/ir/irText/singletons/enumEntry.fir.kt.txt
+++ b/compiler/testData/ir/irText/singletons/enumEntry.fir.kt.txt
@@ -35,8 +35,7 @@ open enum class Z : Enum<Z> {
 
   fun valueOf(value: String): Z /* Synthetic body for ENUM_VALUEOF */
 
-  val entries: EnumEntries
-    get(): EnumEntries /* Synthetic body for ENUM_ENTRIES */
+  val entries: EnumEntries<Z>
+    get(): EnumEntries<Z> /* Synthetic body for ENUM_ENTRIES */
 
 }
-
diff --git a/compiler/testData/ir/irText/singletons/enumEntry.ir.txt b/compiler/testData/ir/irText/singletons/enumEntry.ir.txt
index b6ac753074d..0d0587fd1f0 100644
--- a/compiler/testData/ir/irText/singletons/enumEntry.ir.txt
+++ b/compiler/testData/ir/irText/singletons/enumEntry.ir.txt
@@ -145,3 +145,7 @@ FILE fqName:<root> fileName:/enumEntry.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.Z
       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 ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.Z>
+        correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
+        SYNTHETIC_BODY kind=ENUM_ENTRIES
diff --git a/compiler/testData/ir/irText/singletons/enumEntry.kt.txt b/compiler/testData/ir/irText/singletons/enumEntry.kt.txt
index ce927f6b75b..d191dde51ce 100644
--- a/compiler/testData/ir/irText/singletons/enumEntry.kt.txt
+++ b/compiler/testData/ir/irText/singletons/enumEntry.kt.txt
@@ -35,4 +35,7 @@ open enum class Z : Enum<Z> {
 
   fun valueOf(value: String): Z /* Synthetic body for ENUM_VALUEOF */
 
+  val entries: EnumEntries<Z>
+    get(): EnumEntries<Z> /* Synthetic body for ENUM_ENTRIES */
+
 }
diff --git a/compiler/testData/ir/irText/stubs/javaEnum.__JEnum.fir.ir.txt b/compiler/testData/ir/irText/stubs/javaEnum.__JEnum.fir.ir.txt
index 34a1e1dc637..ae3156cd9aa 100644
--- a/compiler/testData/ir/irText/stubs/javaEnum.__JEnum.fir.ir.txt
+++ b/compiler/testData/ir/irText/stubs/javaEnum.__JEnum.fir.ir.txt
@@ -7,8 +7,8 @@ CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB ENUM_CLASS name:JEnum modality:FINAL vis
   FUN IR_EXTERNAL_JAVA_DECLARATION_STUB name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.JEnum
     VALUE_PARAMETER name:value index:0 type:kotlin.String
   PROPERTY IR_EXTERNAL_JAVA_DECLARATION_STUB name:entries visibility:public modality:FINAL [val]
-    FIELD PROPERTY_BACKING_FIELD name:entries type:kotlin.enums.EnumEntries visibility:public [final,static]
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries
+    FIELD PROPERTY_BACKING_FIELD name:entries type:kotlin.enums.EnumEntries<<root>.JEnum> visibility:public [final,static]
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.JEnum>
       correspondingProperty: PROPERTY IR_EXTERNAL_JAVA_DECLARATION_STUB name:entries visibility:public modality:FINAL [val]
   FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:<root>.JEnum) returnType:kotlin.Any [fake_override]
     overridden:
diff --git a/compiler/testData/ir/irText/stubs/javaEnum.__JEnum.ir.txt b/compiler/testData/ir/irText/stubs/javaEnum.__JEnum.ir.txt
index f80d3462a82..b38cd290720 100644
--- a/compiler/testData/ir/irText/stubs/javaEnum.__JEnum.ir.txt
+++ b/compiler/testData/ir/irText/stubs/javaEnum.__JEnum.ir.txt
@@ -55,3 +55,6 @@ CLASS IR_EXTERNAL_JAVA_DECLARATION_STUB ENUM_CLASS name:JEnum modality:FINAL vis
   FUN IR_EXTERNAL_DECLARATION_STUB name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.JEnum
     VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:value index:0 type:kotlin.String
   FUN IR_EXTERNAL_DECLARATION_STUB name:values visibility:public modality:FINAL <> () returnType:kotlin.Array<<root>.JEnum>
+  PROPERTY IR_EXTERNAL_DECLARATION_STUB name:entries visibility:public modality:FINAL [val]
+    FUN IR_EXTERNAL_DECLARATION_STUB name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.JEnum>
+      correspondingProperty: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:entries visibility:public modality:FINAL [val]
diff --git a/compiler/testData/ir/sourceRanges/declarations/classes.txt b/compiler/testData/ir/sourceRanges/declarations/classes.txt
index 3657d4d39a8..bfc72c1d171 100644
--- a/compiler/testData/ir/sourceRanges/declarations/classes.txt
+++ b/compiler/testData/ir/sourceRanges/declarations/classes.txt
@@ -89,6 +89,9 @@
     @-1:-1..-1 FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.Test5
       @-1:-1..-1 VALUE_PARAMETER name:value index:0 type:kotlin.String
       @-1:-1..-1 SYNTHETIC_BODY kind=ENUM_VALUEOF
+    @-1:-1..-1 PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
+      @-1:-1..-1 FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.Test5>
+        @-1:-1..-1 SYNTHETIC_BODY kind=ENUM_ENTRIES
     @17:0..18:11 VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test5
   @21:0..22:11 CLASS ANNOTATION_CLASS name:Test6 modality:OPEN visibility:public superTypes:[kotlin.Annotation]
     @22:0..11 CONSTRUCTOR visibility:public <> () returnType:<root>.Test6 [primary]
diff --git a/compiler/testData/writeFlags/class/accessFlags/mappingWhen.kt b/compiler/testData/writeFlags/class/accessFlags/mappingWhen.kt
index f9e09f99482..654230c2e59 100644
--- a/compiler/testData/writeFlags/class/accessFlags/mappingWhen.kt
+++ b/compiler/testData/writeFlags/class/accessFlags/mappingWhen.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class BigEnum {
     ITEM1,
     ITEM2
diff --git a/compiler/testData/writeFlags/class/deprecatedFlag/enumClass.kt b/compiler/testData/writeFlags/class/deprecatedFlag/enumClass.kt
index 7dcf53b4d12..e8308c34df7 100644
--- a/compiler/testData/writeFlags/class/deprecatedFlag/enumClass.kt
+++ b/compiler/testData/writeFlags/class/deprecatedFlag/enumClass.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 @Deprecated("") enum class MyEnum {
     FIRST
 }
diff --git a/compiler/testData/writeFlags/class/visibility/internal/enum.kt b/compiler/testData/writeFlags/class/visibility/internal/enum.kt
index 86ac3850438..fe2786b49c7 100644
--- a/compiler/testData/writeFlags/class/visibility/internal/enum.kt
+++ b/compiler/testData/writeFlags/class/visibility/internal/enum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class MyClass() {
 }
 
diff --git a/compiler/testData/writeFlags/class/visibility/internal/innerEnum.kt b/compiler/testData/writeFlags/class/visibility/internal/innerEnum.kt
index 6f2a05c6bdf..a4286f152bf 100644
--- a/compiler/testData/writeFlags/class/visibility/internal/innerEnum.kt
+++ b/compiler/testData/writeFlags/class/visibility/internal/innerEnum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 class Foo {
   enum class MyClass() {
   }
diff --git a/compiler/testData/writeFlags/class/visibility/packageprivate/enumEntry.kt b/compiler/testData/writeFlags/class/visibility/packageprivate/enumEntry.kt
index 715166ef9ee..1057270d64a 100644
--- a/compiler/testData/writeFlags/class/visibility/packageprivate/enumEntry.kt
+++ b/compiler/testData/writeFlags/class/visibility/packageprivate/enumEntry.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class Foo {
     A {
         fun foo() {}
diff --git a/compiler/testData/writeFlags/class/visibility/private/enum.kt b/compiler/testData/writeFlags/class/visibility/private/enum.kt
index 0b25ec94a35..f828907646d 100644
--- a/compiler/testData/writeFlags/class/visibility/private/enum.kt
+++ b/compiler/testData/writeFlags/class/visibility/private/enum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 private enum class MyClass() {
 }
 
diff --git a/compiler/testData/writeFlags/class/visibility/private/innerEnum.kt b/compiler/testData/writeFlags/class/visibility/private/innerEnum.kt
index 40db3f1db0e..9e741f1e400 100644
--- a/compiler/testData/writeFlags/class/visibility/private/innerEnum.kt
+++ b/compiler/testData/writeFlags/class/visibility/private/innerEnum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 // NO_FLAGS because we put enum in companion object of foo. When it will be fixed - MyClass should have ACC_PRIVATE flag
 
 class Foo {
diff --git a/compiler/testData/writeFlags/class/visibility/public/enum.kt b/compiler/testData/writeFlags/class/visibility/public/enum.kt
index da9bd3ee632..5bcda7fb324 100644
--- a/compiler/testData/writeFlags/class/visibility/public/enum.kt
+++ b/compiler/testData/writeFlags/class/visibility/public/enum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 public enum class MyClass() {
 }
 
diff --git a/compiler/testData/writeFlags/class/visibility/public/innerEnum.kt b/compiler/testData/writeFlags/class/visibility/public/innerEnum.kt
index e6e536e886b..cee3b737e99 100644
--- a/compiler/testData/writeFlags/class/visibility/public/innerEnum.kt
+++ b/compiler/testData/writeFlags/class/visibility/public/innerEnum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 class Foo {
   public enum class MyClass() {
   }
diff --git a/compiler/testData/writeFlags/function/constructors/enum.kt b/compiler/testData/writeFlags/function/constructors/enum.kt
index 7511357c6ec..235310cd3dd 100644
--- a/compiler/testData/writeFlags/function/constructors/enum.kt
+++ b/compiler/testData/writeFlags/function/constructors/enum.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class Foo {
     A, B, C
 }
diff --git a/compiler/testData/writeFlags/property/enumFields.kt b/compiler/testData/writeFlags/property/enumFields.kt
index a8c7b938b7d..b10164604b1 100644
--- a/compiler/testData/writeFlags/property/enumFields.kt
+++ b/compiler/testData/writeFlags/property/enumFields.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 enum class Test {
     A
 }
diff --git a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
index 6b57db7672c..8ca8886d3e9 100644
--- a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
+++ b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
@@ -38,13 +38,17 @@ val copySources by task<Sync> {
         .include("kotlin/TypeAliases.kt",
                  "kotlin/text/TypeAliases.kt")
     from(stdlibProjectDir.resolve("src"))
-        .include("kotlin/collections/TypeAliases.kt")
+        .include("kotlin/collections/TypeAliases.kt",
+                 "kotlin/enums/EnumEntriesSerializationProxy.kt")
     from(stdlibProjectDir.resolve("../src"))
         .include("kotlin/util/Standard.kt",
                  "kotlin/internal/Annotations.kt",
                  "kotlin/contracts/ContractBuilder.kt",
                  "kotlin/contracts/Effect.kt",
-                 "kotlin/annotations/WasExperimental.kt")
+                 "kotlin/annotations/WasExperimental.kt",
+                 "kotlin/enums/EnumEntries.kt",
+                 "kotlin/collections/AbstractList.kt",
+                 "kotlin/io/Serializable.kt")
     into(File(buildDir, "src"))
 }
 
diff --git a/libraries/stdlib/jvm/src/kotlin/enums/EnumEntriesSerializationProxy.kt b/libraries/stdlib/jvm/src/kotlin/enums/EnumEntriesSerializationProxy.kt
index ee9190ea835..acb91a1ccb4 100644
--- a/libraries/stdlib/jvm/src/kotlin/enums/EnumEntriesSerializationProxy.kt
+++ b/libraries/stdlib/jvm/src/kotlin/enums/EnumEntriesSerializationProxy.kt
@@ -3,6 +3,8 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:Suppress("EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE") // for building kotlin-stdlib-jvm-minimal-for-test
+
 package kotlin.enums
 
 @Suppress("UNCHECKED_CAST", "unused")
diff --git a/libraries/stdlib/src/kotlin/enums/EnumEntries.kt b/libraries/stdlib/src/kotlin/enums/EnumEntries.kt
index 836f5d0ba02..32c23a1971f 100644
--- a/libraries/stdlib/src/kotlin/enums/EnumEntries.kt
+++ b/libraries/stdlib/src/kotlin/enums/EnumEntries.kt
@@ -3,6 +3,8 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
+@file:Suppress("EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE") // for building kotlin-stdlib-jvm-minimal-for-test
+
 package kotlin.enums
 
 import kotlin.jvm.Volatile
diff --git a/plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.kt b/plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.kt
index 0ad61b6c22e..06f09020ab6 100644
--- a/plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.kt
+++ b/plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 @AllOpen
 annotation class AllOpen
 
diff --git a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.kt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.kt
index 1c8a8a9d302..e7af2fab98d 100644
--- a/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.kt
+++ b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.kt
@@ -1,5 +1,3 @@
-// WITH_STDLIB
-
 package test
 
 /**
diff --git a/plugins/noarg/testData/bytecodeListing/annoOnNotClass.kt b/plugins/noarg/testData/bytecodeListing/annoOnNotClass.kt
index 18c9503221c..00b0f5c307f 100644
--- a/plugins/noarg/testData/bytecodeListing/annoOnNotClass.kt
+++ b/plugins/noarg/testData/bytecodeListing/annoOnNotClass.kt
@@ -1,4 +1,3 @@
-// WITH_STDLIB
 @NoArg
 annotation class NoArg
 
diff --git a/repo/codebase-tests/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt b/repo/codebase-tests/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt
index 2efe5d31055..37c465dcc58 100644
--- a/repo/codebase-tests/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt
+++ b/repo/codebase-tests/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt
@@ -106,6 +106,7 @@ class CodeConformanceTest : TestCase() {
                 "libraries/stdlib/js-v1/.gradle",
                 "libraries/stdlib/js-v1/build",
                 "libraries/stdlib/js-v1/node_modules",
+                "libraries/stdlib/jvm-minimal-for-test/build",
                 "libraries/stdlib/wasm/build",
                 "libraries/tools/atomicfu/build",
                 "libraries/tools/gradle/android-test-fixes/build",