From 9882e86ecb6dd5b83568728d54089385340ee636 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Fri, 28 Aug 2015 15:07:42 +0300
Subject: [PATCH] Don't render contents of enum entry classes in .txt tests,
 regenerate tests

They are irrelevant because cannot be accessed from the outside anyway
---
 compiler/testData/builtin-classes.txt         |  32 +---
 .../invoke/onObjects/invokeOnEnum1.txt        |  23 +--
 .../invoke/onObjects/invokeOnEnum2.txt        |  21 +--
 .../onObjects/invokeOnImportedEnum1.txt       |  23 +--
 .../onObjects/invokeOnImportedEnum2.txt       |  21 +--
 .../compileJavaAgainstKotlin/class/kt3561.txt |   8 +-
 .../compileJavaAgainstKotlin/class/kt4050.txt |  10 +-
 .../enum/DefaultArgumentInEnumConstructor.txt |   9 +-
 .../enumConst.txt                             |  11 +-
 .../invalidTypesInAnnotationConstructor.txt   |  11 +-
 .../tests/annotations/options/annotation.txt  |  21 +--
 .../options/targets/annotation.txt            |  21 +--
 .../options/targets/classifier.txt            |  21 +--
 .../options/targets/constructor.txt           |  21 +--
 .../annotations/options/targets/empty.txt     |  21 +--
 .../annotations/options/targets/function.txt  |  21 +--
 .../annotations/options/targets/incorrect.txt |  21 +--
 .../annotations/options/targets/local.txt     |  21 +--
 .../annotations/options/targets/property.txt  |  21 +--
 .../annotations/options/targets/type.txt      |  21 +--
 .../options/targets/valueparam.txt            |  21 +--
 .../function/abstractClassConstructors.txt    |   1 +
 .../InnerClassAccessThroughEnum.txt           |  57 +-----
 .../UninitializedOrReassignedVariables.txt    |  23 +--
 .../tests/controlFlowAnalysis/kt1185enums.txt |  75 +-------
 .../illegalModifiersOnClass.txt               |   1 +
 .../tests/declarationChecks/kt1193.txt        |  23 +--
 .../tests/delegation/DelegationNotTotrait.txt |  12 +-
 .../duplicateJvmSignature/missingNames.txt    |   2 +
 .../specialNames/enum.txt                     |  13 +-
 .../synthesized/enumValuesValueOf.txt         |  29 +---
 .../diagnostics/tests/enum/AbstractEnum.txt   |   1 +
 .../diagnostics/tests/enum/AbstractInEnum.txt |  40 +----
 .../tests/enum/AbstractOverrideInEnum.txt     |  12 +-
 .../tests/enum/ConstructorCallFromOutside.txt |  23 +--
 .../tests/enum/ExplicitConstructorCall.txt    |  25 +--
 .../tests/enum/InsideEntryConstructorCall.txt |  25 +--
 .../enum/InsideSecondaryConstructorCall.txt   |  49 +-----
 .../tests/enum/SecondaryConstructorCall.txt   |  45 +----
 .../tests/enum/classObjectInEnum.txt          |  11 +-
 .../tests/enum/classObjectInEnumPrivate.txt   |  11 +-
 .../tests/enum/commonSupertype.txt            |  22 +--
 .../dontCreatePackageTypeForEnumEntry.txt     |  28 +--
 .../tests/enum/entryShouldBeOfEnumType.txt    |  21 +--
 .../enum/enumEntryCannotHaveClassObject.txt   |  29 +---
 .../tests/enum/enumEntryInAbstractEnum.txt    |  25 +--
 .../tests/enum/enumImplementingTrait.txt      |  46 +----
 .../tests/enum/enumInheritance.txt            |   3 +
 .../enum/enumIsAssignableToBuiltInEnum.txt    |  11 +-
 .../tests/enum/enumMissingName.txt            |  34 +---
 .../diagnostics/tests/enum/enumModifier.txt   |   1 +
 .../diagnostics/tests/enum/enumStarImport.txt |  21 +--
 .../tests/enum/enumWithAnnotationKeyword.txt  |  12 +-
 .../tests/enum/enumWithEmptyName.txt          |   1 +
 .../tests/enum/extensionNamedAsEnumEntry.txt  |  11 +-
 .../diagnostics/tests/enum/ifEnumEntry.txt    |  21 +--
 .../tests/enum/inheritFromEnumEntry.txt       |  12 +-
 .../tests/enum/inheritanceFromEnum.txt        |  15 +-
 .../tests/enum/inner/existingClassObject.txt  |  22 +--
 .../tests/enum/inner/insideClass.txt          |  11 +-
 .../tests/enum/inner/insideClassObject.txt    |  11 +-
 .../tests/enum/inner/insideEnum.txt           |  22 +--
 .../tests/enum/inner/insideEnumEntry.txt      |  35 +---
 .../enum/inner/insideInnerClassNotAllowed.txt |  11 +-
 .../tests/enum/inner/insideObject.txt         |  11 +-
 .../tests/enum/inner/insideTrait.txt          |  11 +-
 .../enum/inner/redeclarationInClassObject.txt |  22 +--
 .../diagnostics/tests/enum/inner/twoEnums.txt |  22 +--
 .../twoEnumsInClassObjectAndInnerClass.txt    |  22 +--
 .../tests/enum/interfaceWithEnumKeyword.txt   |   9 +-
 .../diagnostics/tests/enum/isEnumEntry.txt    |  21 +--
 .../tests/enum/javaEnumValueOfMethod.txt      |  11 +-
 .../tests/enum/javaEnumValuesMethod.txt       |  21 +--
 .../tests/enum/javaEnumWithAbstractFun.txt    |  12 +-
 .../tests/enum/javaEnumWithFuns.txt           |  23 +--
 .../tests/enum/javaEnumWithNameClashing.txt   |  23 +--
 .../tests/enum/javaEnumWithProperty.txt       |  23 +--
 .../diagnostics/tests/enum/kt2834.txt         |  21 +--
 .../tests/enum/kt8972_cloneNotAllowed.txt     |  11 +-
 .../tests/enum/modifiersOnEnumEntry.txt       | 162 ++----------------
 .../tests/enum/openMemberInEnum.txt           |  29 +---
 .../tests/enum/overrideFinalEnumMethods.txt   |  11 +-
 .../enum/starImportNestedClassAndEntries.txt  |  21 +--
 .../tests/enum/typeParametersInEnum.txt       |   5 +-
 .../valuesValueOfAndEntriesAccessibility.txt  |  14 +-
 .../tests/imports/StarImportFromObject.txt    |  21 +--
 .../incompleteEnumReference.txt               |  31 +---
 .../tests/inference/regressions/kt3007.txt    |  21 +--
 .../tests/inference/regressions/kt3038.txt    |  21 +--
 .../nonLocalReturns/nestedNonLocals.txt       |  31 +---
 .../diagnostics/tests/inner/enumEntries.txt   |  25 +--
 .../tests/inner/illegalModifier.txt           |  19 +-
 ...estedClassAccessedViaInstanceReference.txt |  33 +---
 .../tests/inner/nestedClassNotAllowed.txt     |  18 +-
 .../qualifiedExpression/enumConstant.txt      |  21 +--
 .../nestedEnumConstant.txt                    |  21 +--
 .../testData/diagnostics/tests/j+k/kt2619.txt |  21 +--
 .../tests/modifiers/defaultModifier.txt       |  21 +--
 .../tests/modifiers/redundantTargets.txt      |  21 +--
 .../noSenselessNullOnNullableType.txt         |   1 +
 .../tests/recovery/namelessMembers.txt        |   1 +
 .../recovery/namelessToplevelDeclarations.txt |   1 +
 ...nForEnumEntriesAndDefaultObjectMembers.txt |  21 +--
 .../SingletonAndFunctionSameName.txt          |  25 +--
 .../tests/redeclarations/kt2418.txt           |  56 +-----
 .../tests/regressions/Jet183-1.txt            |  23 +--
 .../diagnostics/tests/regressions/Jet183.txt  |  23 +--
 .../diagnostics/tests/regressions/ea69735.txt |  11 +-
 .../tests/resolve/invoke/KT-4372.txt          |   1 +
 .../resolve/invoke/kt4321InvokeOnEnum.txt     |  35 +---
 .../diagnostics/tests/sealed/NeverEnum.txt    |  22 +--
 .../constructorInObject.txt                   |  12 +-
 .../tests/secondaryConstructors/enums.txt     | 140 ++-------------
 .../tests/subtyping/unresolvedSupertype.txt   |   1 +
 .../tests/when/BranchFalseBypass.txt          |  21 +--
 .../tests/when/ElseOnNullableEnum.txt         |  21 +--
 .../when/ElseOnNullableEnumWithSmartCast.txt  |  21 +--
 .../when/EmptyConditionWithExpressionEnum.txt |  21 +--
 .../tests/when/ExhaustiveEnumIs.txt           |  31 +---
 .../tests/when/ExhaustiveEnumMixed.txt        |  31 +---
 .../tests/when/ExhaustiveInitialization.txt   |  41 +----
 .../tests/when/ExhaustiveNullable.txt         |  21 +--
 .../tests/when/ExhaustivePlatformEnum.txt     |  21 +--
 .../when/ExhaustivePlatformEnumAnnotated.txt  |  21 +--
 .../tests/when/ExhaustivePlatformEnumElse.txt |  21 +--
 .../tests/when/ExhaustivePlatformEnumNull.txt |  21 +--
 .../when/ExhaustivePlatformEnumStatement.txt  |  21 +--
 .../tests/when/ExhaustiveReturn.txt           |  41 +----
 .../when/ExhaustiveWithNullabilityCheck.txt   |  21 +--
 .../ExhaustiveWithNullabilityCheckBefore.txt  |  21 +--
 .../ExhaustiveWithNullabilityCheckElse.txt    |  21 +--
 .../tests/when/NonExhaustivePlatformEnum.txt  |  21 +--
 .../tests/when/NonExhaustiveWarning.txt       |  41 +----
 .../tests/when/NonExhaustiveWarningElse.txt   |  41 +----
 .../tests/when/NonExhaustiveWarningFalse.txt  |  41 +----
 .../tests/when/NonExhaustiveWarningNull.txt   |  41 +----
 .../NonExhaustiveWithNullabilityCheck.txt     |  21 +--
 .../tests/when/PropertyNotInitialized.txt     |  21 +--
 .../nestedInnerClassifier.txt                 |  84 ++-------
 .../annotations/CustomAnnotation.txt          |   8 +-
 .../EnumArgumentWithCustomToString.txt        |   8 +-
 .../annotations/EnumConstructorParameter.txt  |   8 +-
 .../annotations/NestedEnumArgument.txt        |   8 +-
 .../compiledJava/enum/EnumMembers.txt         |  19 +-
 .../enum/EnumWithSpecializedEntry.txt         |  15 +-
 .../loadJava/compiledJava/enum/JavaEnum.txt   |  15 +-
 .../loadJava/compiledJava/static/Enum.txt     |  22 +--
 .../static/StaticMembersInEnum.txt            |   8 +-
 .../AnnotationInAnnotationArguments.txt       |   8 +-
 .../EnumArgumentWithCustomToString.txt        |   8 +-
 .../parameters/EnumConstructor.txt            |   1 +
 .../EnumWithGenericConstructorParameter.txt   |   1 +
 .../EnumWithPrimitiveConstructorParameter.txt |   1 +
 .../compiledKotlin/enum/enumVisibility.txt    |  24 +--
 .../enum/enumWithConstuctor.txt               |  34 +---
 .../enum/enumWithInnerClasses.txt             |  21 +--
 .../compiledKotlin/enum/innerEnum.txt         |   8 +-
 .../enum/innerEnumExistingClassObject.txt     |   8 +-
 .../compiledKotlin/enum/simpleEnum.txt        |   8 +-
 .../compiledKotlin/fromLoadJava/enum.txt      |  15 +-
 .../memberOrder/enumEntries.txt               |  57 +-----
 compiler/testData/renderer/Enum.kt            |   2 +-
 .../invoke/invokeOnEnumEntry1.txt             |   2 +-
 .../annotationArguments/enum.txt              |  22 +--
 .../annotationArguments/varargs.txt           |  22 +--
 .../compileTimeConstants.txt                  |  22 +--
 .../serialization/js/dynamicConstants.txt     |  22 +--
 .../util/RecursiveDescriptorComparator.java   |  17 +-
 .../kotlin/renderer/DescriptorRendererImpl.kt |  23 ++-
 169 files changed, 560 insertions(+), 3111 deletions(-)

diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt
index 79d693977f7..e1670481887 100644
--- a/compiler/testData/builtin-classes.txt
+++ b/compiler/testData/builtin-classes.txt
@@ -576,21 +576,9 @@ public interface Function</*0*/ out R> {
 }
 
 public final enum class InlineOption : kotlin.Enum<kotlin.InlineOption> {
-    public enum entry LOCAL_CONTINUE_AND_BREAK : kotlin.InlineOption {
-        /*primary*/ private constructor LOCAL_CONTINUE_AND_BREAK()
-        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kotlin.InlineOption): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry LOCAL_CONTINUE_AND_BREAK
 
-    public enum entry ONLY_LOCAL_RETURN : kotlin.InlineOption {
-        /*primary*/ private constructor ONLY_LOCAL_RETURN()
-        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kotlin.InlineOption): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry ONLY_LOCAL_RETURN
 
     /*primary*/ private constructor InlineOption()
     protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
@@ -604,21 +592,9 @@ public final enum class InlineOption : kotlin.Enum<kotlin.InlineOption> {
 }
 
 public final enum class InlineStrategy : kotlin.Enum<kotlin.InlineStrategy> {
-    public enum entry AS_FUNCTION : kotlin.InlineStrategy {
-        /*primary*/ private constructor AS_FUNCTION()
-        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kotlin.InlineStrategy): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry AS_FUNCTION
 
-    public enum entry IN_PLACE : kotlin.InlineStrategy {
-        /*primary*/ private constructor IN_PLACE()
-        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kotlin.InlineStrategy): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry IN_PLACE
 
     /*primary*/ private constructor InlineStrategy()
     protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt
index 14fbafd5964..18c988484b7 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt
+++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.txt
@@ -3,29 +3,12 @@ package
 internal fun box(): kotlin.String
 
 internal final enum class A : kotlin.Enum<A> {
-    public enum entry ONE : A {
-        private constructor ONE()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        internal final override /*1*/ /*fake_override*/ fun invoke(/*0*/ i: kotlin.Int): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ONE
 
-    public enum entry TWO : A {
-        private constructor TWO()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        internal final override /*1*/ /*fake_override*/ fun invoke(/*0*/ i: kotlin.Int): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry TWO
 
     private constructor A()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt
index ff4ca80cc14..44134884d54 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt
+++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.txt
@@ -4,27 +4,12 @@ internal fun box(): kotlin.String
 internal fun A.invoke(/*0*/ i: kotlin.Int): kotlin.Int
 
 internal final enum class A : kotlin.Enum<A> {
-    public enum entry ONE : A {
-        private constructor ONE()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ONE
 
-    public enum entry TWO : A {
-        private constructor TWO()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry TWO
 
     private constructor A()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt
index 14fbafd5964..18c988484b7 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt
+++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.txt
@@ -3,29 +3,12 @@ package
 internal fun box(): kotlin.String
 
 internal final enum class A : kotlin.Enum<A> {
-    public enum entry ONE : A {
-        private constructor ONE()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        internal final override /*1*/ /*fake_override*/ fun invoke(/*0*/ i: kotlin.Int): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ONE
 
-    public enum entry TWO : A {
-        private constructor TWO()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        internal final override /*1*/ /*fake_override*/ fun invoke(/*0*/ i: kotlin.Int): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry TWO
 
     private constructor A()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt
index ff4ca80cc14..44134884d54 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt
+++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.txt
@@ -4,27 +4,12 @@ internal fun box(): kotlin.String
 internal fun A.invoke(/*0*/ i: kotlin.Int): kotlin.Int
 
 internal final enum class A : kotlin.Enum<A> {
-    public enum entry ONE : A {
-        private constructor ONE()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ONE
 
-    public enum entry TWO : A {
-        private constructor TWO()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry TWO
 
     private constructor A()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/kt3561.txt b/compiler/testData/compileJavaAgainstKotlin/class/kt3561.txt
index e19de802198..07f06112e0e 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/kt3561.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/class/kt3561.txt
@@ -1,14 +1,10 @@
 package test
 
 internal final enum class MyEnum : kotlin.Enum<test.MyEnum> {
-    public enum entry OK : test.MyEnum {
-        private constructor OK()
-        public final /*fake_override*/ fun compareTo(/*0*/ test.MyEnum): kotlin.Int
-        public final /*fake_override*/ fun name(): kotlin.String
-        public final /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry OK
 
     private constructor MyEnum()
+    protected final /*fake_override*/ fun clone(): kotlin.Any
     public final /*fake_override*/ fun compareTo(/*0*/ test.MyEnum): kotlin.Int
     public final /*fake_override*/ fun name(): kotlin.String
     public final /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt b/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt
index 14243a9f5c5..71ad27f560e 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/class/kt4050.txt
@@ -1,17 +1,11 @@
 package test
 
 internal final enum class MyEnum : kotlin.Enum<test.MyEnum> {
-    public enum entry ENTRY : test.MyEnum {
-        private constructor ENTRY()
-        kotlin.deprecated(value = "") internal final /*fake_override*/ val ord: kotlin.Int
-        public final /*fake_override*/ fun compareTo(/*0*/ test.MyEnum): kotlin.Int
-        internal final /*fake_override*/ fun f(/*0*/ java.lang.Deprecated() kotlin.Int): kotlin.Unit
-        public final /*fake_override*/ fun name(): kotlin.String
-        public final /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry ENTRY
 
     private constructor MyEnum(/*0*/ kotlin.deprecated(value = "") kotlin.Int)
     kotlin.deprecated(value = "") internal final val ord: kotlin.Int
+    protected final /*fake_override*/ fun clone(): kotlin.Any
     public final /*fake_override*/ fun compareTo(/*0*/ test.MyEnum): kotlin.Int
     internal final fun f(/*0*/ java.lang.Deprecated() kotlin.Int): kotlin.Unit
     public final /*fake_override*/ fun name(): kotlin.String
diff --git a/compiler/testData/compileJavaAgainstKotlin/enum/DefaultArgumentInEnumConstructor.txt b/compiler/testData/compileJavaAgainstKotlin/enum/DefaultArgumentInEnumConstructor.txt
index 0b7bea2a192..7e4d6526f52 100644
--- a/compiler/testData/compileJavaAgainstKotlin/enum/DefaultArgumentInEnumConstructor.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/enum/DefaultArgumentInEnumConstructor.txt
@@ -8,16 +8,11 @@ public open class DefaultArgumentInEnumConstructor {
 }
 
 internal final enum class K : kotlin.Enum<test.K> {
-    public enum entry ENTRY : test.K {
-        private constructor ENTRY()
-        invisible_fake final /*fake_override*/ val default: kotlin.String
-        public final /*fake_override*/ fun compareTo(/*0*/ test.K): kotlin.Int
-        public final /*fake_override*/ fun name(): kotlin.String
-        public final /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry ENTRY
 
     private constructor K(/*0*/ kotlin.String = ...)
     private final val default: kotlin.String
+    protected final /*fake_override*/ fun clone(): kotlin.Any
     public final /*fake_override*/ fun compareTo(/*0*/ test.K): kotlin.Int
     public final /*fake_override*/ fun name(): kotlin.String
     public final /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt
index 6aff3a44df4..de1183cde11 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt
+++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt
@@ -11,17 +11,10 @@ kotlin.annotation.annotation() internal final class AnnE : kotlin.Annotation {
 }
 
 internal final enum class MyEnum : kotlin.Enum<MyEnum> {
-    public enum entry A : MyEnum {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
     private constructor MyEnum()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt b/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt
index 0c727b02bec..c603763f266 100644
--- a/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt
+++ b/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt
@@ -185,17 +185,10 @@ package test {
     }
 
     internal final enum class MyEnum : kotlin.Enum<test.MyEnum> {
-        public enum entry A : test.MyEnum {
-            private constructor A()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.MyEnum): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry A
 
         private constructor MyEnum()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.MyEnum): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/annotations/options/annotation.txt b/compiler/testData/diagnostics/tests/annotations/options/annotation.txt
index de452c1ea83..e9476ab3fa6 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/annotation.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/annotation.txt
@@ -1,27 +1,12 @@
 package
 
 internal final enum class Target : kotlin.Enum<Target> {
-    public enum entry CLASSIFIER : Target {
-        private constructor CLASSIFIER()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Target): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry CLASSIFIER
 
-    public enum entry FUNCTION : Target {
-        private constructor FUNCTION()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Target): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry FUNCTION
 
     private constructor Target()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Target): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt
index 4a78537850d..c8c94745fff 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt
@@ -4,27 +4,12 @@ base() internal val z: kotlin.Int = 0
 base() internal fun foo(/*0*/ base() y: @[base()] kotlin.Int): kotlin.Int
 
 base() internal final enum class My : kotlin.Enum<My> {
-    base() public enum entry FIRST : My {
-        private constructor FIRST()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    base() enum entry FIRST
 
-    base() public enum entry SECOND : My {
-        private constructor SECOND()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    base() enum entry SECOND
 
     private constructor My()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt
index b9bb02b00a6..eeb65e14ddc 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt
@@ -4,27 +4,12 @@ base() internal val z: kotlin.Int = 0
 base() internal fun foo(/*0*/ base() y: @[base()] kotlin.Int): kotlin.Int
 
 base() internal final enum class My : kotlin.Enum<My> {
-    base() public enum entry FIRST : My {
-        private constructor FIRST()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    base() enum entry FIRST
 
-    base() public enum entry SECOND : My {
-        private constructor SECOND()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    base() enum entry SECOND
 
     base() private constructor My()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt
index 1aecd91bde6..885614bcc36 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt
@@ -4,27 +4,12 @@ base() internal val z: kotlin.Int = 0
 base() internal fun foo(/*0*/ base() y: @[base()] kotlin.Int): kotlin.Int
 
 base() internal final enum class My : kotlin.Enum<My> {
-    base() public enum entry FIRST : My {
-        private constructor FIRST()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    base() enum entry FIRST
 
-    base() public enum entry SECOND : My {
-        private constructor SECOND()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    base() enum entry SECOND
 
     base() private constructor My()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt
index 20ef832c08c..fd624e15c1c 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt
@@ -4,27 +4,12 @@ empty() internal val z: kotlin.Int
 empty() internal fun foo(/*0*/ empty() y: @[empty()] kotlin.Int): kotlin.Int
 
 empty() internal final enum class My : kotlin.Enum<My> {
-    empty() public enum entry FIRST : My {
-        private constructor FIRST()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    empty() enum entry FIRST
 
-    empty() public enum entry SECOND : My {
-        private constructor SECOND()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    empty() enum entry SECOND
 
     empty() private constructor My()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt
index fd0f3cc25a5..fc201e2cfe7 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt
@@ -4,27 +4,12 @@ base() internal val z: kotlin.Int = 0
 base() internal fun foo(/*0*/ base() y: @[base()] kotlin.Int): kotlin.Int
 
 base() internal final enum class My : kotlin.Enum<My> {
-    base() public enum entry FIRST : My {
-        private constructor FIRST()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    base() enum entry FIRST
 
-    base() public enum entry SECOND : My {
-        private constructor SECOND()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    base() enum entry SECOND
 
     base() private constructor My()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt
index 7349f38fb4a..1e7cee2a629 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt
@@ -4,27 +4,12 @@ incorrect() internal val z: kotlin.Int
 incorrect() internal fun foo(/*0*/ incorrect() y: @[incorrect()] kotlin.Int): kotlin.Int
 
 incorrect() internal final enum class My : kotlin.Enum<My> {
-    incorrect() public enum entry FIRST : My {
-        private constructor FIRST()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    incorrect() enum entry FIRST
 
-    incorrect() public enum entry SECOND : My {
-        private constructor SECOND()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    incorrect() enum entry SECOND
 
     incorrect() private constructor My()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt
index ef69abc5583..bcb8f3a4dff 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt
@@ -4,27 +4,12 @@ base() internal val z: kotlin.Int = 0
 base() internal fun foo(/*0*/ base() y: @[base()] kotlin.Int): kotlin.Int
 
 base() internal final enum class My : kotlin.Enum<My> {
-    base() public enum entry FIRST : My {
-        private constructor FIRST()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    base() enum entry FIRST
 
-    base() public enum entry SECOND : My {
-        private constructor SECOND()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    base() enum entry SECOND
 
     private constructor My()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt
index 51a25e3e6e0..73099ff7b7b 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt
@@ -4,27 +4,12 @@ base() internal val z: kotlin.Int = 0
 base() internal fun foo(/*0*/ base() y: @[base()] kotlin.Int): kotlin.Int
 
 base() internal final enum class My : kotlin.Enum<My> {
-    base() public enum entry FIRST : My {
-        private constructor FIRST()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    base() enum entry FIRST
 
-    base() public enum entry SECOND : My {
-        private constructor SECOND()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    base() enum entry SECOND
 
     private constructor My()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt
index cb2288581ff..37123dc6334 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt
@@ -4,27 +4,12 @@ base() internal val z: kotlin.Int = 0
 base() internal fun foo(/*0*/ base() y: @[base()] kotlin.Int): kotlin.Int
 
 base() internal final enum class My : kotlin.Enum<My> {
-    base() public enum entry FIRST : My {
-        private constructor FIRST()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    base() enum entry FIRST
 
-    base() public enum entry SECOND : My {
-        private constructor SECOND()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    base() enum entry SECOND
 
     base() private constructor My()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt
index 2bf1f70df71..5f8cc1c401e 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt
@@ -4,27 +4,12 @@ base() internal val z: kotlin.Int = 0
 base() internal fun foo(/*0*/ base() y: @[base()] kotlin.Int): kotlin.Int
 
 base() internal final enum class My : kotlin.Enum<My> {
-    base() public enum entry FIRST : My {
-        private constructor FIRST()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    base() enum entry FIRST
 
-    base() public enum entry SECOND : My {
-        private constructor SECOND()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    base() enum entry SECOND
 
     private constructor My()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt b/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt
index 74af0216149..c7c7763757b 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.txt
@@ -24,6 +24,7 @@ kotlin.annotation.annotation() internal final class C : kotlin.Annotation {
 
 internal final enum class D : kotlin.Enum<D> {
     private constructor D()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: D): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.txt b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.txt
index 5e7290828a1..d5fe0b7ad28 100644
--- a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.txt
+++ b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.txt
@@ -4,63 +4,16 @@ package a {
     internal fun f(): kotlin.Unit
 
     internal final enum class C : kotlin.Enum<a.C> {
-        public enum entry E1 : a.C {
-            private constructor E1()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: a.C): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry E1
 
-        public enum entry E2 : a.C {
-            private constructor E2()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: a.C): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry E2
 
-        public enum entry E3 : a.C {
-            private constructor E3()
-            internal final fun b(): kotlin.Unit
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: a.C): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        enum entry E3
 
-            internal final class G {
-                public constructor G()
-                public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-                public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-                public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-            }
-
-            internal object O_O {
-                private constructor O_O()
-                public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-                public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-                public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-            }
-        }
-
-        public enum entry E4 : a.C {
-            private constructor E4()
-            internal final fun c(): kotlin.Unit
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: a.C): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry E4
 
         private constructor C()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: a.C): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt
index 44cc4af6a2b..053643eb56d 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt
@@ -117,29 +117,12 @@ package uninitialized_reassigned_variables {
     }
 
     internal final enum class ProtocolState : kotlin.Enum<uninitialized_reassigned_variables.ProtocolState> {
-        public enum entry WAITING : uninitialized_reassigned_variables.ProtocolState {
-            private constructor WAITING()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: uninitialized_reassigned_variables.ProtocolState): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            internal open override /*1*/ fun signal(): uninitialized_reassigned_variables.ProtocolState
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry WAITING
 
-        public enum entry TALKING : uninitialized_reassigned_variables.ProtocolState {
-            private constructor TALKING()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: uninitialized_reassigned_variables.ProtocolState): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            internal open override /*1*/ fun signal(): uninitialized_reassigned_variables.ProtocolState
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry TALKING
 
         private constructor ProtocolState()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: uninitialized_reassigned_variables.ProtocolState): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt
index c906986d130..d9b839192b1 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt
@@ -21,41 +21,15 @@ package kt1185 {
     }
 
     internal final enum class Color : kotlin.Enum<kt1185.Color> {
-        public enum entry RED : kt1185.Color {
-            private constructor RED()
-            internal final override /*1*/ /*fake_override*/ val rgb: kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt1185.Color): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry RED
 
-        public enum entry GREEN : kt1185.Color {
-            private constructor GREEN()
-            internal final override /*1*/ /*fake_override*/ val rgb: kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt1185.Color): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry GREEN
 
-        public enum entry BLUE : kt1185.Color {
-            private constructor BLUE()
-            internal final override /*1*/ /*fake_override*/ val rgb: kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt1185.Color): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry BLUE
 
         private constructor Color(/*0*/ rgb: kotlin.Int)
         internal final val rgb: kotlin.Int
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt1185.Color): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -69,47 +43,16 @@ package kt1185 {
     }
 
     internal final enum class Direction : kotlin.Enum<kt1185.Direction> {
-        public enum entry NORTH : kt1185.Direction {
-            private constructor NORTH()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt1185.Direction): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry NORTH
 
-        public enum entry SOUTH : kt1185.Direction {
-            private constructor SOUTH()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt1185.Direction): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry SOUTH
 
-        public enum entry WEST : kt1185.Direction {
-            private constructor WEST()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt1185.Direction): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry WEST
 
-        public enum entry EAST : kt1185.Direction {
-            private constructor EAST()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt1185.Direction): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry EAST
 
         private constructor Direction()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt1185.Direction): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt
index afd5407a54f..49df21f95e0 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt
@@ -65,6 +65,7 @@ internal object B4 {
 
 internal open enum class C : kotlin.Enum<C> {
     private constructor C()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: C): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt b/compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt
index 12378f5e4eb..490943d30c4 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt
@@ -11,30 +11,13 @@ package kt1193 {
     }
 
     internal final enum class MyEnum : kotlin.Enum<kt1193.MyEnum> {
-        public enum entry A : kt1193.MyEnum {
-            private constructor A()
-            internal final override /*1*/ /*fake_override*/ val i: kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt1193.MyEnum): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry A
 
-        public enum entry B : kt1193.MyEnum {
-            private constructor B()
-            internal final override /*1*/ /*fake_override*/ val i: kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt1193.MyEnum): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry B
 
         private constructor MyEnum(/*0*/ i: kotlin.Int)
         internal final val i: kotlin.Int
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt1193.MyEnum): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.txt b/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.txt
index b0ddc03766f..1772ebab583 100644
--- a/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.txt
+++ b/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.txt
@@ -15,17 +15,10 @@ internal final class Br : T {
 }
 
 internal open enum class EN : kotlin.Enum<EN> {
-    public enum entry A : EN {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EN): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
     private constructor EN()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EN): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -53,6 +46,7 @@ internal interface T {
 
 internal final class Test2 : EN {
     public constructor Test2(/*0*/ e: EN)
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EN): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt
index 0ec587b3416..b0e99644a65 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.txt
@@ -20,6 +20,7 @@ internal interface <no name provided> {
 
 internal final enum class <no name provided> : kotlin.Enum<<no name provided>> {
     private constructor <no name provided>()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: <no name provided>): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -69,6 +70,7 @@ internal final class Outer {
 
     internal final enum class <no name provided> : kotlin.Enum<Outer.<no name provided>> {
         private constructor <no name provided>()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Outer.<no name provided>): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt
index b14dce2ad6c..eb8683b3714 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt
@@ -1,19 +1,10 @@
 package
 
 internal final enum class E : kotlin.Enum<E> {
-    public enum entry A : E {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        internal final override /*1*/ /*fake_override*/ fun valueOf(/*0*/ s: kotlin.String): E
-        internal final override /*1*/ /*fake_override*/ fun values(): kotlin.Array<E>
-    }
+    enum entry A
 
     private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt
index 8b4d26c7894..be93762ea75 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt
@@ -1,35 +1,12 @@
 package
 
 internal final enum class A : kotlin.Enum<A> {
-    public enum entry A1 : A {
-        private constructor A1()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        internal final override /*1*/ /*fake_override*/ fun valueOf(): kotlin.String
-        internal final override /*1*/ /*fake_override*/ fun valueOf(/*0*/ s: kotlin.String): A
-        internal final override /*1*/ /*fake_override*/ fun values(): kotlin.Array<A>
-        internal final override /*1*/ /*fake_override*/ fun values(/*0*/ x: kotlin.String): kotlin.String
-    }
+    enum entry A1
 
-    public enum entry A2 : A {
-        private constructor A2()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        internal final override /*1*/ /*fake_override*/ fun valueOf(): kotlin.String
-        internal final override /*1*/ /*fake_override*/ fun valueOf(/*0*/ s: kotlin.String): A
-        internal final override /*1*/ /*fake_override*/ fun values(): kotlin.Array<A>
-        internal final override /*1*/ /*fake_override*/ fun values(/*0*/ x: kotlin.String): kotlin.String
-    }
+    enum entry A2
 
     private constructor A()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/AbstractEnum.txt b/compiler/testData/diagnostics/tests/enum/AbstractEnum.txt
index 636f6251bae..39baca63e06 100644
--- a/compiler/testData/diagnostics/tests/enum/AbstractEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/AbstractEnum.txt
@@ -4,6 +4,7 @@ package abstract {
 
     internal abstract enum class MyAbstractEnum : kotlin.Enum<abstract.MyAbstractEnum> {
         private constructor MyAbstractEnum()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: abstract.MyAbstractEnum): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/AbstractInEnum.txt b/compiler/testData/diagnostics/tests/enum/AbstractInEnum.txt
index 39ec1763174..d48677a2db3 100644
--- a/compiler/testData/diagnostics/tests/enum/AbstractInEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/AbstractInEnum.txt
@@ -3,44 +3,7 @@ package
 package abstract {
 
     internal final enum class MyEnum : kotlin.Enum<abstract.MyEnum> {
-        public enum entry INSTANCE : abstract.MyEnum {
-            private constructor INSTANCE()
-            internal final override /*1*/ /*fake_override*/ val a: kotlin.Int
-            internal final override /*1*/ /*fake_override*/ val a1: kotlin.Int
-            internal abstract override /*1*/ /*fake_override*/ val a2: kotlin.Int
-            internal abstract override /*1*/ /*fake_override*/ val a3: kotlin.Int
-            internal final override /*1*/ /*fake_override*/ var b: kotlin.Int
-            internal final override /*1*/ /*fake_override*/ var b1: kotlin.Int
-            internal abstract override /*1*/ /*fake_override*/ var b2: kotlin.Int
-            internal abstract override /*1*/ /*fake_override*/ var b3: kotlin.Int
-            internal final override /*1*/ /*fake_override*/ var c: kotlin.Int
-            internal final override /*1*/ /*fake_override*/ var c1: kotlin.Int
-            internal abstract override /*1*/ /*fake_override*/ var c2: kotlin.Int
-            internal abstract override /*1*/ /*fake_override*/ var c3: kotlin.Int
-            internal final override /*1*/ /*fake_override*/ val e: kotlin.Int
-            internal final override /*1*/ /*fake_override*/ val e1: kotlin.Int
-            internal abstract override /*1*/ /*fake_override*/ val e2: kotlin.Int
-            internal abstract override /*1*/ /*fake_override*/ val e3: kotlin.Int
-            internal final override /*1*/ /*fake_override*/ var i: kotlin.Int
-            internal final override /*1*/ /*fake_override*/ var i1: kotlin.Int
-            internal final override /*1*/ /*fake_override*/ var j: kotlin.Int
-            internal final override /*1*/ /*fake_override*/ var j1: kotlin.Int
-            internal final override /*1*/ /*fake_override*/ var k: kotlin.Int
-            internal final override /*1*/ /*fake_override*/ var k1: kotlin.Int
-            internal final override /*1*/ /*fake_override*/ var l: kotlin.Int
-            internal final override /*1*/ /*fake_override*/ var l1: kotlin.Int
-            internal final override /*1*/ /*fake_override*/ var n: kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: abstract.MyEnum): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            internal final override /*1*/ /*fake_override*/ fun f(): kotlin.Unit
-            internal final override /*1*/ /*fake_override*/ fun g(): kotlin.Unit
-            internal abstract override /*1*/ /*fake_override*/ fun h(): kotlin.Unit
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            internal abstract override /*1*/ /*fake_override*/ fun j(): kotlin.Unit
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry INSTANCE
 
         private constructor MyEnum()
         internal final val a: kotlin.Int
@@ -68,6 +31,7 @@ package abstract {
         internal final var l: kotlin.Int
         internal final var l1: kotlin.Int
         internal final var n: kotlin.Int
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: abstract.MyEnum): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         internal final fun f(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.txt b/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.txt
index 7f44f53a32a..6a847cff0a7 100644
--- a/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.txt
@@ -1,18 +1,10 @@
 package
 
 internal final enum class E : kotlin.Enum<E>, T {
-    public enum entry ENTRY : E {
-        private constructor ENTRY()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal open override /*1*/ fun f(): kotlin.Unit
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ENTRY
 
     private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public final override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract override /*1*/ fun f(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.txt b/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.txt
index 40e11906b61..8015bdeab53 100644
--- a/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.txt
+++ b/compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.txt
@@ -3,30 +3,13 @@ package
 internal fun createA(): A
 
 internal final enum class A : kotlin.Enum<A> {
-    public enum entry ONE : A {
-        private constructor ONE()
-        internal final override /*1*/ /*fake_override*/ val c: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ONE
 
-    public enum entry TWO : A {
-        private constructor TWO()
-        internal final override /*1*/ /*fake_override*/ val c: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry TWO
 
     private constructor A(/*0*/ c: kotlin.Int)
     internal final val c: kotlin.Int
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.txt b/compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.txt
index e3d55fad4c1..a1efc4ddb35 100644
--- a/compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.txt
+++ b/compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.txt
@@ -1,32 +1,13 @@
 package
 
 internal final enum class A : kotlin.Enum<A> {
-    public enum entry ONE : A {
-        private constructor ONE()
-        internal final override /*1*/ /*fake_override*/ val c: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        internal final override /*1*/ /*fake_override*/ fun createA(): A
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ONE
 
-    public enum entry TWO : A {
-        private constructor TWO()
-        internal final override /*1*/ /*fake_override*/ val c: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        internal final override /*1*/ /*fake_override*/ fun createA(): A
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry TWO
 
     private constructor A(/*0*/ c: kotlin.Int)
     internal final val c: kotlin.Int
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
     internal final fun createA(): A
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.txt b/compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.txt
index bec230f5ce7..7c461e9b9fd 100644
--- a/compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.txt
+++ b/compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.txt
@@ -1,32 +1,13 @@
 package
 
 internal final enum class A : kotlin.Enum<A> {
-    public enum entry ONE : A {
-        private constructor ONE()
-        internal final override /*1*/ /*fake_override*/ val c: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        internal open override /*1*/ fun selfOrFriend(): A
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ONE
 
-    public enum entry TWO : A {
-        private constructor TWO()
-        internal final override /*1*/ /*fake_override*/ val c: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        internal open override /*1*/ fun selfOrFriend(): A
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry TWO
 
     private constructor A(/*0*/ c: kotlin.Int)
     internal final val c: kotlin.Int
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.txt b/compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.txt
index ae2cf6af510..8cf975b0eac 100644
--- a/compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.txt
+++ b/compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.txt
@@ -1,58 +1,19 @@
 package
 
 internal final enum class A : kotlin.Enum<A> {
-    public enum entry ONE : A {
-        private constructor ONE()
-        internal final override /*1*/ /*fake_override*/ val c: kotlin.Int
-        internal final override /*1*/ /*fake_override*/ var last: A?
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ONE
 
-    public enum entry TWO : A {
-        private constructor TWO()
-        internal final override /*1*/ /*fake_override*/ val c: kotlin.Int
-        internal final override /*1*/ /*fake_override*/ var last: A?
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry TWO
 
-    public enum entry THREE : A {
-        private constructor THREE()
-        internal final override /*1*/ /*fake_override*/ val c: kotlin.Int
-        internal final override /*1*/ /*fake_override*/ var last: A?
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry THREE
 
-    public enum entry FOURTY_TWO : A {
-        private constructor FOURTY_TWO()
-        internal final override /*1*/ /*fake_override*/ val c: kotlin.Int
-        internal final override /*1*/ /*fake_override*/ var last: A?
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry FOURTY_TWO
 
     private constructor A()
     private constructor A(/*0*/ c: kotlin.Int)
     internal final val c: kotlin.Int
     internal final var last: A?
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.txt b/compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.txt
index e0453734f1c..1ce6012e4ba 100644
--- a/compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.txt
+++ b/compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.txt
@@ -1,53 +1,18 @@
 package
 
 internal final enum class A : kotlin.Enum<A> {
-    public enum entry ONE : A {
-        private constructor ONE()
-        internal final override /*1*/ /*fake_override*/ val c: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ONE
 
-    public enum entry TWO : A {
-        private constructor TWO()
-        internal final override /*1*/ /*fake_override*/ val c: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry TWO
 
-    public enum entry THREE : A {
-        private constructor THREE()
-        internal final override /*1*/ /*fake_override*/ val c: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry THREE
 
-    public enum entry FOURTY_TWO : A {
-        private constructor FOURTY_TWO()
-        internal final override /*1*/ /*fake_override*/ val c: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry FOURTY_TWO
 
     private constructor A()
     private constructor A(/*0*/ c: kotlin.Int)
     internal final val c: kotlin.Int
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt b/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt
index 3d8f8b57f1b..01cc08c9862 100644
--- a/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt
@@ -3,17 +3,10 @@ package
 internal fun bar(): E
 
 internal final enum class E : kotlin.Enum<E> {
-    public enum entry ENTRY : E {
-        private constructor ENTRY()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ENTRY
 
     private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt b/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt
index ee13f7170ea..62748c149b3 100644
--- a/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt
+++ b/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt
@@ -6,17 +6,10 @@ internal fun foo(): kotlin.Array<E>
 internal fun quux(): E.Companion
 
 internal final enum class E : kotlin.Enum<E> {
-    public enum entry ENTRY : E {
-        private constructor ENTRY()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ENTRY
 
     private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/commonSupertype.txt b/compiler/testData/diagnostics/tests/enum/commonSupertype.txt
index edfa352b0c7..aa96f35d6d7 100644
--- a/compiler/testData/diagnostics/tests/enum/commonSupertype.txt
+++ b/compiler/testData/diagnostics/tests/enum/commonSupertype.txt
@@ -3,17 +3,10 @@ package
 internal val x: kotlin.Enum<out kotlin.Enum<out kotlin.Enum<out kotlin.Enum<out kotlin.Enum<out kotlin.Any?>>>>>
 
 internal final enum class A : kotlin.Enum<A> {
-    public enum entry A : A {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
     private constructor A()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -27,17 +20,10 @@ internal final enum class A : kotlin.Enum<A> {
 }
 
 internal final enum class B : kotlin.Enum<B> {
-    public enum entry B : B {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: B): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry B
 
     private constructor B()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: B): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.txt
index 0fbd767aa8d..205f4554a8e 100644
--- a/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.txt
@@ -8,34 +8,12 @@ internal fun f4(): kotlin.Unit
 internal fun f5(): [ERROR : Error function type]
 
 internal final enum class E : kotlin.Enum<E> {
-    public enum entry FIRST : E {
-        private constructor FIRST()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry FIRST
 
-    public enum entry SECOND : E {
-        private constructor SECOND()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-        internal final class A {
-            public constructor A()
-            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
-    }
+    enum entry SECOND
 
     private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.txt b/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.txt
index 613cd191c03..4a3cd02c68a 100644
--- a/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.txt
+++ b/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.txt
@@ -3,27 +3,12 @@ package
 internal fun foo(): kotlin.Unit
 
 internal final enum class E : kotlin.Enum<E> {
-    public enum entry E1 : E {
-        private constructor E1()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry E1
 
-    public enum entry E2 : E {
-        private constructor E2()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry E2
 
     private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt b/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt
index b8230784896..650a4d0a4f6 100644
--- a/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt
@@ -3,35 +3,12 @@ package
 internal fun f(): [ERROR : Error function type]
 
 internal final enum class E : kotlin.Enum<E> {
-    public enum entry FIRST : E {
-        private constructor FIRST()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry FIRST
 
-    public enum entry SECOND : E {
-        private constructor SECOND()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-        public companion object Companion {
-            private constructor Companion()
-            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            internal final fun foo(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
-    }
+    enum entry SECOND
 
     private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.txt b/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.txt
index ddbabaa94a2..af3f7b8b2cf 100644
--- a/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.txt
@@ -1,32 +1,13 @@
 package
 
 internal final enum class EnumClass : kotlin.Enum<EnumClass> {
-    public enum entry E1 : EnumClass {
-        private constructor E1()
-        internal open override /*1*/ val bar: kotlin.String = "a"
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EnumClass): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal open override /*1*/ fun foo(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry E1
 
-    public enum entry E2 : EnumClass {
-        private constructor E2()
-        internal abstract override /*1*/ /*fake_override*/ val bar: kotlin.String
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EnumClass): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal abstract override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry E2
 
     private constructor EnumClass()
     internal abstract val bar: kotlin.String
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EnumClass): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun foo(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt b/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt
index 21fd4b68a0c..88545d197f6 100644
--- a/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt
@@ -1,29 +1,12 @@
 package
 
 internal final enum class EnumImplementingTraitWithFun : kotlin.Enum<EnumImplementingTraitWithFun>, T1 {
-    public enum entry E1 : EnumImplementingTraitWithFun {
-        private constructor E1()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EnumImplementingTraitWithFun): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal open override /*1*/ fun foo(): kotlin.Unit
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry E1
 
-    public enum entry E2 : EnumImplementingTraitWithFun {
-        private constructor E2()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EnumImplementingTraitWithFun): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal abstract override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry E2
 
     private constructor EnumImplementingTraitWithFun()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EnumImplementingTraitWithFun): kotlin.Int
     public final override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
@@ -38,30 +21,13 @@ internal final enum class EnumImplementingTraitWithFun : kotlin.Enum<EnumImpleme
 }
 
 internal final enum class EnumImplementingTraitWithVal : kotlin.Enum<EnumImplementingTraitWithVal>, T2 {
-    public enum entry E1 : EnumImplementingTraitWithVal {
-        private constructor E1()
-        internal open override /*1*/ val bar: kotlin.Int = 1
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EnumImplementingTraitWithVal): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry E1
 
-    public enum entry E2 : EnumImplementingTraitWithVal {
-        private constructor E2()
-        internal abstract override /*1*/ /*fake_override*/ val bar: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EnumImplementingTraitWithVal): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry E2
 
     private constructor EnumImplementingTraitWithVal()
     internal abstract override /*1*/ /*fake_override*/ val bar: kotlin.Int
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EnumImplementingTraitWithVal): kotlin.Int
     public final override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/enumInheritance.txt b/compiler/testData/diagnostics/tests/enum/enumInheritance.txt
index 329a0279719..3759ccbda4c 100644
--- a/compiler/testData/diagnostics/tests/enum/enumInheritance.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumInheritance.txt
@@ -20,6 +20,7 @@ internal final enum class MyEnum : MyClass {
 
 internal final enum class MyEnum2 : kotlin.Enum<MyEnum2>, MyTrait {
     private constructor MyEnum2()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum2): kotlin.Int
     public final override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -34,6 +35,7 @@ internal final enum class MyEnum2 : kotlin.Enum<MyEnum2>, MyTrait {
 
 internal final enum class MyEnum3 : MyEnumBase {
     private constructor MyEnum3()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnumBase): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -48,6 +50,7 @@ internal final enum class MyEnum3 : MyEnumBase {
 
 internal final enum class MyEnumBase : kotlin.Enum<MyEnumBase> {
     private constructor MyEnumBase()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnumBase): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt b/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt
index 4061d5471f4..401cd539b8b 100644
--- a/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt
@@ -5,17 +5,10 @@ internal val b: kotlin.Enum<java.lang.annotation.RetentionPolicy>
 internal val c: kotlin.Enum<kotlin.InlineOption>
 
 internal final enum class E : kotlin.Enum<E> {
-    public enum entry ENTRY : E {
-        private constructor ENTRY()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ENTRY
 
     private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/enumMissingName.txt b/compiler/testData/diagnostics/tests/enum/enumMissingName.txt
index 4ba360affec..ed0469f8e64 100644
--- a/compiler/testData/diagnostics/tests/enum/enumMissingName.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumMissingName.txt
@@ -1,41 +1,15 @@
 package
 
 internal final enum class <no name provided> : kotlin.Enum<<no name provided>> {
-    public enum entry RED : <no name provided> {
-        private constructor RED()
-        internal final override /*1*/ /*fake_override*/ val rgb: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: <no name provided>): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry RED
 
-    public enum entry GREEN : <no name provided> {
-        private constructor GREEN()
-        internal final override /*1*/ /*fake_override*/ val rgb: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: <no name provided>): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry GREEN
 
-    public enum entry BLUE : <no name provided> {
-        private constructor BLUE()
-        internal final override /*1*/ /*fake_override*/ val rgb: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: <no name provided>): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry BLUE
 
     private constructor <no name provided>(/*0*/ rgb: kotlin.Int)
     internal final val rgb: kotlin.Int
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: <no name provided>): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/enumModifier.txt b/compiler/testData/diagnostics/tests/enum/enumModifier.txt
index 891ff431398..93548f93f1e 100644
--- a/compiler/testData/diagnostics/tests/enum/enumModifier.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumModifier.txt
@@ -20,6 +20,7 @@ internal final class A {
 
 internal final enum class B : kotlin.Enum<B> {
     private constructor B()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: B): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/enumStarImport.txt b/compiler/testData/diagnostics/tests/enum/enumStarImport.txt
index 58ec7d61b9b..34a0dc15d6d 100644
--- a/compiler/testData/diagnostics/tests/enum/enumStarImport.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumStarImport.txt
@@ -5,27 +5,12 @@ internal fun f(/*0*/ e: enum.HappyEnum): kotlin.Unit
 package enum {
 
     internal final enum class HappyEnum : kotlin.Enum<enum.HappyEnum> {
-        public enum entry CASE1 : enum.HappyEnum {
-            private constructor CASE1()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: enum.HappyEnum): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry CASE1
 
-        public enum entry CASE2 : enum.HappyEnum {
-            private constructor CASE2()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: enum.HappyEnum): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry CASE2
 
         private constructor HappyEnum()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: enum.HappyEnum): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt b/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt
index 68956113db3..174120734f2 100644
--- a/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.txt
@@ -1,18 +1,10 @@
 package
 
 kotlin.data() kotlin.annotation.annotation() internal final enum class E : kotlin.Enum<E> {
-    public enum entry D : E {
-        private constructor D()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun copy(): E
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry D
 
     private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public final /*synthesized*/ fun copy(): E
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.txt b/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.txt
index 70588e49154..aaf0dbd4494 100644
--- a/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.txt
+++ b/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.txt
@@ -2,6 +2,7 @@ package
 
 internal final enum class <no name provided> : kotlin.Enum<<no name provided>> {
     private constructor <no name provided>()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: <no name provided>): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.txt
index 513df1298eb..58e2aa1939b 100644
--- a/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.txt
@@ -5,17 +5,10 @@ internal val kotlin.Int.entry: kotlin.Int
 internal val kotlin.Long.entry: kotlin.Int
 
 internal final enum class E : kotlin.Enum<E> {
-    public enum entry entry : E {
-        private constructor entry()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry entry
 
     private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/ifEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/ifEnumEntry.txt
index 90989ea4583..7e4b5eabaf2 100644
--- a/compiler/testData/diagnostics/tests/enum/ifEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/ifEnumEntry.txt
@@ -3,27 +3,12 @@ package
 internal fun foo(/*0*/ me: MyEnum): kotlin.Boolean
 
 internal final enum class MyEnum : kotlin.Enum<MyEnum> {
-    public enum entry FIRST : MyEnum {
-        private constructor FIRST()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry FIRST
 
-    public enum entry SECOND : MyEnum {
-        private constructor SECOND()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry SECOND
 
     private constructor MyEnum()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.txt
index a421f0cf9c6..748baebfe81 100644
--- a/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.txt
@@ -2,6 +2,7 @@ package
 
 internal final class A : E.ENTRY {
     public constructor A()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -11,17 +12,10 @@ internal final class A : E.ENTRY {
 }
 
 internal final enum class E : kotlin.Enum<E> {
-    public enum entry ENTRY : E {
-        private constructor ENTRY()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ENTRY
 
     private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.txt b/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.txt
index 1846a209750..5e1bbcde301 100644
--- a/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.txt
@@ -2,6 +2,7 @@ package
 
 internal final class MyClass : MyEnum2 {
     public constructor MyClass()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum2): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -12,6 +13,7 @@ internal final class MyClass : MyEnum2 {
 
 internal final class MyClass2 : MyJavaEnum {
     public constructor MyClass2()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyJavaEnum!): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -21,17 +23,10 @@ internal final class MyClass2 : MyJavaEnum {
 }
 
 internal open enum class MyEnum : kotlin.Enum<MyEnum> {
-    public enum entry A : MyEnum {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
     private constructor MyEnum()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -46,6 +41,7 @@ internal open enum class MyEnum : kotlin.Enum<MyEnum> {
 
 internal final enum class MyEnum2 : kotlin.Enum<MyEnum2> {
     private constructor MyEnum2()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum2): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -60,6 +56,7 @@ internal final enum class MyEnum2 : kotlin.Enum<MyEnum2> {
 
 public final enum class MyJavaEnum : kotlin.Enum<MyJavaEnum!> {
     public constructor MyJavaEnum()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyJavaEnum!): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt b/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt
index 7173b3b74a8..0821bf9a490 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt
@@ -14,17 +14,10 @@ internal final class A {
     }
 
     internal final enum class E : kotlin.Enum<A.E> {
-        public enum entry ENTRY : A.E {
-            private constructor ENTRY()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry ENTRY
 
         private constructor E()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -52,17 +45,10 @@ internal final class B {
     }
 
     internal final enum class E : kotlin.Enum<B.E> {
-        public enum entry ENTRY : B.E {
-            private constructor ENTRY()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: B.E): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry ENTRY
 
         private constructor E()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: B.E): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideClass.txt b/compiler/testData/diagnostics/tests/enum/inner/insideClass.txt
index ffd2ca81434..897e9c8f52f 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideClass.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideClass.txt
@@ -7,17 +7,10 @@ internal final class A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     internal final enum class E : kotlin.Enum<A.E> {
-        public enum entry ENTRY : A.E {
-            private constructor ENTRY()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry ENTRY
 
         private constructor E()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt b/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt
index 6791b21ddf0..4faf25d35ae 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt
@@ -13,17 +13,10 @@ internal final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         internal final enum class E : kotlin.Enum<A.Companion.E> {
-            public enum entry ENTRY : A.Companion.E {
-                private constructor ENTRY()
-                public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int
-                public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-                public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-                public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-                public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-                public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-            }
+            enum entry ENTRY
 
             private constructor E()
+            protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
             public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int
             public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideEnum.txt b/compiler/testData/diagnostics/tests/enum/inner/insideEnum.txt
index 731067648fd..e6b8fbb0981 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideEnum.txt
@@ -1,17 +1,10 @@
 package
 
 internal final enum class E : kotlin.Enum<E> {
-    public enum entry ABC : E {
-        private constructor ABC()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ABC
 
     private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -20,17 +13,10 @@ internal final enum class E : kotlin.Enum<E> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     internal final enum class F : kotlin.Enum<E.F> {
-        public enum entry DEF : E.F {
-            private constructor DEF()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E.F): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry DEF
 
         private constructor F()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E.F): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.txt
index 5d652f89d82..cb92414bb34 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.txt
@@ -1,41 +1,10 @@
 package
 
 internal final enum class E : kotlin.Enum<E> {
-    public enum entry ABC : E {
-        private constructor ABC()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-        internal final enum class F : kotlin.Enum<E.ABC.F> {
-            public enum entry DEF : E.ABC.F {
-                private constructor DEF()
-                public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E.ABC.F): kotlin.Int
-                public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-                public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-                public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-                public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-                public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-            }
-
-            private constructor F()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E.ABC.F): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-            // Static members
-            public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E.ABC.F
-            public final /*synthesized*/ fun values(): kotlin.Array<E.ABC.F>
-        }
-    }
+    enum entry ABC
 
     private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.txt b/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.txt
index 113186439ba..2eca6897b5f 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.txt
@@ -13,17 +13,10 @@ internal final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         internal final enum class E : kotlin.Enum<A.B.E> {
-            public enum entry ENTRY : A.B.E {
-                private constructor ENTRY()
-                public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.B.E): kotlin.Int
-                public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-                public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-                public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-                public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-                public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-            }
+            enum entry ENTRY
 
             private constructor E()
+            protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
             public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.B.E): kotlin.Int
             public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideObject.txt b/compiler/testData/diagnostics/tests/enum/inner/insideObject.txt
index ef4ca40b9c4..9425daf74b6 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideObject.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideObject.txt
@@ -7,17 +7,10 @@ internal object A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     internal final enum class E : kotlin.Enum<A.E> {
-        public enum entry ENTRY : A.E {
-            private constructor ENTRY()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry ENTRY
 
         private constructor E()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideTrait.txt b/compiler/testData/diagnostics/tests/enum/inner/insideTrait.txt
index 6ac34179076..1240b7b1023 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/insideTrait.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/insideTrait.txt
@@ -6,17 +6,10 @@ internal interface A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     internal final enum class E : kotlin.Enum<A.E> {
-        public enum entry ENTRY : A.E {
-            private constructor ENTRY()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry ENTRY
 
         private constructor E()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt b/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt
index 9ea0a82ec61..44cab7e9f0a 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt
@@ -13,17 +13,10 @@ internal final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         internal final enum class E : kotlin.Enum<A.Companion.E> {
-            public enum entry ENTRY2 : A.Companion.E {
-                private constructor ENTRY2()
-                public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int
-                public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-                public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-                public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-                public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-                public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-            }
+            enum entry ENTRY2
 
             private constructor E()
+            protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
             public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int
             public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -38,17 +31,10 @@ internal final class A {
     }
 
     internal final enum class E : kotlin.Enum<A.E> {
-        public enum entry ENTRY : A.E {
-            private constructor ENTRY()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry ENTRY
 
         private constructor E()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/inner/twoEnums.txt b/compiler/testData/diagnostics/tests/enum/inner/twoEnums.txt
index 7171fa727d1..78d963fb949 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/twoEnums.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/twoEnums.txt
@@ -7,17 +7,10 @@ internal final class A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     internal final enum class E : kotlin.Enum<A.E> {
-        public enum entry ABC : A.E {
-            private constructor ABC()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry ABC
 
         private constructor E()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -31,17 +24,10 @@ internal final class A {
     }
 
     internal final enum class F : kotlin.Enum<A.F> {
-        public enum entry DEF : A.F {
-            private constructor DEF()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.F): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry DEF
 
         private constructor F()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.F): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt b/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt
index 20ed2028e7c..7fabcc916a6 100644
--- a/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt
+++ b/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt
@@ -13,17 +13,10 @@ internal final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         internal final enum class E : kotlin.Enum<A.B.E> {
-            public enum entry ENTRY : A.B.E {
-                private constructor ENTRY()
-                public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.B.E): kotlin.Int
-                public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-                public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-                public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-                public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-                public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-            }
+            enum entry ENTRY
 
             private constructor E()
+            protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
             public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.B.E): kotlin.Int
             public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -44,17 +37,10 @@ internal final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         internal final enum class E : kotlin.Enum<A.Companion.E> {
-            public enum entry ENTRY : A.Companion.E {
-                private constructor ENTRY()
-                public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int
-                public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-                public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-                public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-                public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-                public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-            }
+            enum entry ENTRY
 
             private constructor E()
+            protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
             public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int
             public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/interfaceWithEnumKeyword.txt b/compiler/testData/diagnostics/tests/enum/interfaceWithEnumKeyword.txt
index 77763a6a677..aa7b8481abe 100644
--- a/compiler/testData/diagnostics/tests/enum/interfaceWithEnumKeyword.txt
+++ b/compiler/testData/diagnostics/tests/enum/interfaceWithEnumKeyword.txt
@@ -1,14 +1,7 @@
 package
 
 internal interface Some {
-    public enum entry D : Some {
-        private constructor D()
-        internal abstract override /*1*/ /*fake_override*/ val foo: kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        internal abstract override /*1*/ /*fake_override*/ fun test(): kotlin.Unit
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry D
 
     internal abstract val foo: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/enum/isEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/isEnumEntry.txt
index 90989ea4583..7e4b5eabaf2 100644
--- a/compiler/testData/diagnostics/tests/enum/isEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/isEnumEntry.txt
@@ -3,27 +3,12 @@ package
 internal fun foo(/*0*/ me: MyEnum): kotlin.Boolean
 
 internal final enum class MyEnum : kotlin.Enum<MyEnum> {
-    public enum entry FIRST : MyEnum {
-        private constructor FIRST()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry FIRST
 
-    public enum entry SECOND : MyEnum {
-        private constructor SECOND()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry SECOND
 
     private constructor MyEnum()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.txt b/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.txt
index f234728c394..9b268fc1de0 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.txt
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.txt
@@ -3,17 +3,10 @@ package
 internal fun main(): kotlin.Unit
 
 public final enum class A : kotlin.Enum<A!> {
-    public enum entry ENTRY : A {
-        private constructor ENTRY()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ENTRY
 
     public constructor A()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.txt b/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.txt
index 86d3c479fa7..ae0e35b0300 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.txt
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.txt
@@ -3,27 +3,12 @@ package
 internal fun main(): kotlin.Unit
 
 public final enum class A : kotlin.Enum<A!> {
-    public enum entry ENTRY : A {
-        private constructor ENTRY()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ENTRY
 
-    public enum entry ANOTHER : A {
-        private constructor ANOTHER()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ANOTHER
 
     public constructor A()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.txt b/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.txt
index 3a067060297..58a8f7d34d8 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.txt
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.txt
@@ -3,18 +3,10 @@ package
 internal fun main(): kotlin.Unit
 
 public abstract enum class A : kotlin.Enum<A!> {
-    public enum entry ENTRY : A {
-        private constructor ENTRY()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public abstract override /*1*/ /*fake_override*/ fun s(): kotlin.String!
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ENTRY
 
     public constructor A()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.txt b/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.txt
index 4f18160f946..dcc2f07a10a 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.txt
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.txt
@@ -3,29 +3,12 @@ package
 internal fun main(): kotlin.Unit
 
 public final enum class A : kotlin.Enum<A!> {
-    public enum entry ENTRY : A {
-        private constructor ENTRY()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun s(): kotlin.String!
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ENTRY
 
-    public enum entry ANOTHER : A {
-        private constructor ANOTHER()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun s(): kotlin.String!
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ANOTHER
 
     public constructor A()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.txt b/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.txt
index 3bbd0022c8a..a39560a855c 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.txt
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.txt
@@ -3,30 +3,13 @@ package
 internal fun main(): kotlin.Unit
 
 public final enum class A : kotlin.Enum<A!> {
-    public enum entry ENTRY : A {
-        private constructor ENTRY()
-        public final override /*1*/ /*fake_override*/ var ENTRY: kotlin.String!
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ENTRY
 
-    public enum entry ANOTHER : A {
-        private constructor ANOTHER()
-        public final override /*1*/ /*fake_override*/ var ENTRY: kotlin.String!
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ANOTHER
 
     public constructor A()
     public final var ENTRY: kotlin.String!
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.txt b/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.txt
index cd49f2b2385..3262f5f07d0 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.txt
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.txt
@@ -3,30 +3,13 @@ package
 internal fun main(): kotlin.Unit
 
 public final enum class A : kotlin.Enum<A!> {
-    public enum entry ENTRY : A {
-        private constructor ENTRY()
-        public final override /*1*/ /*fake_override*/ var s: kotlin.String!
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ENTRY
 
-    public enum entry ANOTHER : A {
-        private constructor ANOTHER()
-        public final override /*1*/ /*fake_override*/ var s: kotlin.String!
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ANOTHER
 
     private constructor A(/*0*/ s: kotlin.String!)
     public final var s: kotlin.String!
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/kt2834.txt b/compiler/testData/diagnostics/tests/enum/kt2834.txt
index ddced4c2485..905e1b683bb 100644
--- a/compiler/testData/diagnostics/tests/enum/kt2834.txt
+++ b/compiler/testData/diagnostics/tests/enum/kt2834.txt
@@ -3,27 +3,12 @@ package
 internal fun MethodKind.hasThis(): kotlin.Boolean
 
 private final enum class MethodKind : kotlin.Enum<MethodKind> {
-    public enum entry INSTANCE : MethodKind {
-        private constructor INSTANCE()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MethodKind): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry INSTANCE
 
-    public enum entry STATIC : MethodKind {
-        private constructor STATIC()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MethodKind): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry STATIC
 
     private constructor MethodKind()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MethodKind): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.txt b/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.txt
index e509a83f2e7..89bfd2250fe 100644
--- a/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.txt
+++ b/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.txt
@@ -1,16 +1,7 @@
 package
 
 internal final enum class E : kotlin.Enum<E>, kotlin.Cloneable {
-    public enum entry A : E {
-        private constructor A()
-        protected open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
     private constructor E()
     protected open override /*2*/ fun clone(): kotlin.Any
diff --git a/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt
index a5090141f8c..e9ce1c82c67 100644
--- a/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt
+++ b/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt
@@ -1,168 +1,40 @@
 package
 
 internal final enum class E : kotlin.Enum<E> {
-    public enum entry SUBCLASS : E {
-        private constructor SUBCLASS()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal final fun foo(): kotlin.Unit
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry SUBCLASS
 
-    public enum entry PUBLIC : E {
-        private constructor PUBLIC()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry PUBLIC
 
-    protected enum entry PROTECTED : E {
-        private constructor PROTECTED()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry PROTECTED
 
-    private enum entry PRIVATE : E {
-        private constructor PRIVATE()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry PRIVATE
 
-    internal enum entry INTERNAL : E {
-        private constructor INTERNAL()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry INTERNAL
 
-    public enum entry ABSTRACT : E {
-        private constructor ABSTRACT()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ABSTRACT
 
-    public enum entry OPEN : E {
-        private constructor OPEN()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry OPEN
 
-    public enum entry OVERRIDE : E {
-        private constructor OVERRIDE()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry OVERRIDE
 
-    public enum entry FINAL : E {
-        private constructor FINAL()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry FINAL
 
-    public enum entry INNER : E {
-        private constructor INNER()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry INNER
 
-    kotlin.annotation.annotation() public enum entry ANNOTATION : E {
-        private constructor ANNOTATION()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    kotlin.annotation.annotation() enum entry ANNOTATION
 
-    public enum entry ENUM : E {
-        private constructor ENUM()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ENUM
 
-    public enum entry OUT : E {
-        private constructor OUT()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry OUT
 
-    public enum entry IN : E {
-        private constructor IN()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry IN
 
-    public enum entry VARARG : E {
-        private constructor VARARG()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry VARARG
 
-    public enum entry REIFIED : E {
-        private constructor REIFIED()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry REIFIED
 
     private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt b/compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt
index f81dbe62142..294c00e537e 100644
--- a/compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt
@@ -1,37 +1,14 @@
 package
 
 internal final enum class EnumWithOpenMembers : kotlin.Enum<EnumWithOpenMembers> {
-    public enum entry E1 : EnumWithOpenMembers {
-        private constructor E1()
-        internal final override /*1*/ /*fake_override*/ val b: kotlin.Int
-        internal open override /*1*/ val bar: kotlin.String = "a"
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EnumWithOpenMembers): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ fun f(): kotlin.Int
-        internal open override /*1*/ fun foo(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry E1
 
-    public enum entry E2 : EnumWithOpenMembers {
-        private constructor E2()
-        internal open override /*1*/ val b: kotlin.Int = 4
-        internal open override /*1*/ /*fake_override*/ val bar: kotlin.String
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EnumWithOpenMembers): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal open override /*1*/ fun f(): kotlin.Int
-        internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry E2
 
     private constructor EnumWithOpenMembers()
     internal final val b: kotlin.Int = 3
     internal open val bar: kotlin.String = ""
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EnumWithOpenMembers): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal final fun f(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.txt b/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.txt
index 0c3dd505543..17fec3f1627 100644
--- a/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.txt
+++ b/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.txt
@@ -1,17 +1,10 @@
 package
 
 internal final enum class E : kotlin.Enum<E> {
-    public enum entry ENTRY : E {
-        private constructor ENTRY()
-        public open override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public open override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ENTRY
 
     private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public open override /*1*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public open override /*1*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt b/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt
index ebf875d6169..711c9c5f6b4 100644
--- a/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt
+++ b/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt
@@ -11,27 +11,12 @@ package bar {
 package foo {
 
     internal final enum class E : kotlin.Enum<foo.E> {
-        public enum entry ENTRY : foo.E {
-            private constructor ENTRY()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: foo.E): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry ENTRY
 
-        public enum entry ANOTHER : foo.E {
-            private constructor ANOTHER()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: foo.E): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry ANOTHER
 
         private constructor E()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: foo.E): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.txt b/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.txt
index e185142aca5..a226cb40c1f 100644
--- a/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.txt
+++ b/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.txt
@@ -3,11 +3,10 @@ package
 package bug {
 
     public final enum class Foo</*0*/ T> : kotlin.Enum<bug.Foo<T>> {
-        public enum entry A {
-            private constructor A()
-        }
+        enum entry A
 
         private constructor Foo</*0*/ T>()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: bug.Foo<T>): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt b/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt
index 2b91114035f..9a591fe80f2 100644
--- a/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt
+++ b/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt
@@ -5,20 +5,10 @@ internal fun baz(): E
 internal fun foo(): E
 
 internal final enum class E : kotlin.Enum<E> {
-    public enum entry ENTRY : E {
-        private constructor ENTRY()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        internal final override /*1*/ /*fake_override*/ fun oof(): E
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        internal final override /*1*/ /*fake_override*/ fun rab(): kotlin.Array<E>
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        internal final override /*1*/ /*fake_override*/ fun zab(): E
-    }
+    enum entry ENTRY
 
     private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt b/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt
index 70bd732847e..9a190e419d1 100644
--- a/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt
+++ b/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt
@@ -87,27 +87,12 @@ package a {
     }
 
     internal final enum class E : kotlin.Enum<a.E> {
-        public enum entry E1 : a.E {
-            private constructor E1()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: a.E): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry E1
 
-        public enum entry E2 : a.E {
-            private constructor E2()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: a.E): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry E2
 
         private constructor E()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: a.E): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.txt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.txt
index 09b91944a6c..0b264ae3049 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.txt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.txt
@@ -3,37 +3,14 @@ package
 internal fun foo(): kotlin.Unit
 
 internal final enum class E : kotlin.Enum<E> {
-    public enum entry A : E {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
-    public enum entry B : E {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry B
 
-    public enum entry C : E {
-        private constructor C()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry C
 
     private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt
index 28aff24a366..0fadbe80269 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt
@@ -9,27 +9,12 @@ package a {
     internal fun kotlin.Iterable<kotlin.Int>.someSimpleWithFun(): kotlin.Unit
 
     internal final enum class SomeEnum : kotlin.Enum<a.SomeEnum> {
-        public enum entry FIRST : a.SomeEnum {
-            private constructor FIRST()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: a.SomeEnum): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry FIRST
 
-        public enum entry SECOND : a.SomeEnum {
-            private constructor SECOND()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: a.SomeEnum): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry SECOND
 
         private constructor SomeEnum()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: a.SomeEnum): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt
index 21933bbe7a4..9a15b745cc8 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt
@@ -6,27 +6,12 @@ package a {
     internal fun use(/*0*/ vararg a: kotlin.Any? /*kotlin.Array<out kotlin.Any?>*/): kotlin.Array<out kotlin.Any?>
 
     internal final enum class TestEnum : kotlin.Enum<a.TestEnum> {
-        public enum entry FIRST : a.TestEnum {
-            private constructor FIRST()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: a.TestEnum): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry FIRST
 
-        public enum entry SECOND : a.TestEnum {
-            private constructor SECOND()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: a.TestEnum): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry SECOND
 
         private constructor TestEnum()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: a.TestEnum): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.txt b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.txt
index 15aac16d0e3..d8266cc1f0e 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.txt
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.txt
@@ -28,37 +28,14 @@ internal final class Internal {
 }
 
 internal final enum class Kind : kotlin.Enum<Kind> {
-    public enum entry LOCAL : Kind {
-        private constructor LOCAL()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Kind): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry LOCAL
 
-    public enum entry EXT_RETURN : Kind {
-        private constructor EXT_RETURN()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Kind): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry EXT_RETURN
 
-    public enum entry GLOBAL_RETURN : Kind {
-        private constructor GLOBAL_RETURN()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Kind): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry GLOBAL_RETURN
 
     private constructor Kind()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Kind): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/inner/enumEntries.txt b/compiler/testData/diagnostics/tests/inner/enumEntries.txt
index 3a6e335d757..91e22948cc6 100644
--- a/compiler/testData/diagnostics/tests/inner/enumEntries.txt
+++ b/compiler/testData/diagnostics/tests/inner/enumEntries.txt
@@ -1,31 +1,12 @@
 package
 
 internal final enum class E : kotlin.Enum<E> {
-    public enum entry E1 : E {
-        private constructor E1()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal open override /*1*/ fun foo(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        internal final override /*1*/ /*fake_override*/ fun outerFun(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry E1
 
-    public enum entry E2 : E {
-        private constructor E2()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal open override /*1*/ fun foo(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        internal final override /*1*/ /*fake_override*/ fun outerFun(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry E2
 
     private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun foo(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/inner/illegalModifier.txt b/compiler/testData/diagnostics/tests/inner/illegalModifier.txt
index 722225dc574..245eb8969a1 100644
--- a/compiler/testData/diagnostics/tests/inner/illegalModifier.txt
+++ b/compiler/testData/diagnostics/tests/inner/illegalModifier.txt
@@ -59,6 +59,7 @@ internal final class D {
 
     internal final enum class R : kotlin.Enum<D.R> {
         private constructor R()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: D.R): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -80,24 +81,10 @@ internal final class D {
 }
 
 internal final enum class H : kotlin.Enum<H> {
-    public enum entry I : H {
-        private constructor I()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: H): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-        internal final inner class II {
-            public constructor II()
-            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
-    }
+    enum entry I
 
     private constructor H()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: H): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt
index 0fbca295424..4784ab0b771 100644
--- a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt
+++ b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt
@@ -23,17 +23,10 @@ internal object Obj {
     }
 
     internal final enum class NestedEnum : kotlin.Enum<Obj.NestedEnum> {
-        public enum entry A : Obj.NestedEnum {
-            private constructor A()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Obj.NestedEnum): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry A
 
         private constructor NestedEnum()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Obj.NestedEnum): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -92,17 +85,10 @@ internal final class WithClassObject {
     }
 
     internal final enum class NestedEnum : kotlin.Enum<WithClassObject.NestedEnum> {
-        public enum entry A : WithClassObject.NestedEnum {
-            private constructor A()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: WithClassObject.NestedEnum): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry A
 
         private constructor NestedEnum()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: WithClassObject.NestedEnum): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -154,17 +140,10 @@ internal final class WithoutClassObject {
     }
 
     internal final enum class NestedEnum : kotlin.Enum<WithoutClassObject.NestedEnum> {
-        public enum entry A : WithoutClassObject.NestedEnum {
-            private constructor A()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: WithoutClassObject.NestedEnum): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry A
 
         private constructor NestedEnum()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: WithoutClassObject.NestedEnum): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.txt b/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.txt
index 8600f134b0e..05510599393 100644
--- a/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.txt
+++ b/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.txt
@@ -25,24 +25,10 @@ internal final class A {
 }
 
 internal final enum class E : kotlin.Enum<E> {
-    public enum entry E1 : E {
-        private constructor E1()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-        internal final class D {
-            public constructor D()
-            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
-    }
+    enum entry E1
 
     private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.txt b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.txt
index 41555b8f84d..bc00315df0a 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.txt
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.txt
@@ -4,27 +4,12 @@ internal fun bar(): E
 internal fun foo(): E
 
 internal final enum class E : kotlin.Enum<E> {
-    public enum entry E1 : E {
-        private constructor E1()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry E1
 
-    public enum entry E2 : E {
-        private constructor E2()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry E2
 
     private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.txt b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.txt
index b3dd8d6edb9..f6e9b382027 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.txt
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.txt
@@ -10,27 +10,12 @@ internal final class A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     internal final enum class E : kotlin.Enum<A.E> {
-        public enum entry E1 : A.E {
-            private constructor E1()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry E1
 
-        public enum entry E2 : A.E {
-            private constructor E2()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry E2
 
         private constructor E()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2619.txt b/compiler/testData/diagnostics/tests/j+k/kt2619.txt
index 861881a2f8b..45483e76a9e 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt2619.txt
+++ b/compiler/testData/diagnostics/tests/j+k/kt2619.txt
@@ -3,27 +3,12 @@ package
 internal fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
 
 public final enum class Type : kotlin.Enum<Type!> {
-    public enum entry TYPE : Type {
-        private constructor TYPE()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Type!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry TYPE
 
-    public enum entry NO_TYPE : Type {
-        private constructor NO_TYPE()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Type!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry NO_TYPE
 
     public constructor Type()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Type!): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt b/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt
index b73c04cb5ed..eb7069e5128 100644
--- a/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt
+++ b/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt
@@ -68,27 +68,12 @@ internal final class D {
 }
 
 internal final enum class Enum : kotlin.Enum<Enum> {
-    public enum entry E1 : Enum {
-        private constructor E1()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Enum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry E1
 
-    public enum entry E2 : Enum {
-        private constructor E2()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Enum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry E2
 
     private constructor Enum()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Enum): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/modifiers/redundantTargets.txt b/compiler/testData/diagnostics/tests/modifiers/redundantTargets.txt
index 5312b0bb3de..0a8f4d3e8e2 100644
--- a/compiler/testData/diagnostics/tests/modifiers/redundantTargets.txt
+++ b/compiler/testData/diagnostics/tests/modifiers/redundantTargets.txt
@@ -20,27 +20,12 @@ internal object Sixth {
 }
 
 internal final enum class Third : kotlin.Enum<Third> {
-    public enum entry FOURTH : Third {
-        private constructor FOURTH()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Third): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry FOURTH
 
-    public enum entry FIFTH : Third {
-        private constructor FIFTH()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Third): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry FIFTH
 
     private constructor Third()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Third): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.txt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.txt
index 4db858e68df..e854f8dc6f5 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.txt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.txt
@@ -11,6 +11,7 @@ public/*package*/ open class A {
 
     public/*package*/ final enum class Empty : kotlin.Enum<A.Empty!> {
         public/*package*/ constructor Empty()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Empty!): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt b/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt
index 289608268b6..51294f33b39 100644
--- a/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt
+++ b/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt
@@ -17,6 +17,7 @@ internal final class C {
 
     internal final enum class <no name provided> : kotlin.Enum<C.<no name provided>> {
         private constructor <no name provided>()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: C.<no name provided>): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt b/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt
index b36af47c889..8f7a7f1241e 100644
--- a/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt
+++ b/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.txt
@@ -18,6 +18,7 @@ internal interface <no name provided> {
 
 internal final enum class <no name provided> : kotlin.Enum<<no name provided>> {
     private constructor <no name provided>()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: <no name provided>): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt b/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt
index ac34dbfcbd6..06cd7e0c7f0 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt
+++ b/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt
@@ -1,27 +1,12 @@
 package
 
 internal final enum class E : kotlin.Enum<E> {
-    public enum entry FIRST : E {
-        private constructor FIRST()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry FIRST
 
-    public enum entry SECOND : E {
-        private constructor SECOND()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry SECOND
 
     private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.txt b/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.txt
index c1f56bc0f94..0173a7004ac 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.txt
+++ b/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.txt
@@ -4,33 +4,14 @@ internal fun En(): kotlin.Int
 internal fun Foo(): kotlin.Int
 
 internal final enum class En : kotlin.Enum<En> {
-    public enum entry ENTRY : En {
-        private constructor ENTRY()
-        internal final override /*1*/ /*fake_override*/ fun ENTRY(): kotlin.Int
-        internal final override /*1*/ /*fake_override*/ fun SUBCLASS(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: En): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry ENTRY
 
-    public enum entry SUBCLASS : En {
-        private constructor SUBCLASS()
-        internal final override /*1*/ /*fake_override*/ fun ENTRY(): kotlin.Int
-        internal final override /*1*/ /*fake_override*/ fun SUBCLASS(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: En): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry SUBCLASS
 
     private constructor En()
     internal final fun ENTRY(): kotlin.Int
     internal final fun SUBCLASS(): kotlin.Int
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: En): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/redeclarations/kt2418.txt b/compiler/testData/diagnostics/tests/redeclarations/kt2418.txt
index e1d7abb2e95..3d30b9f1375 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/kt2418.txt
+++ b/compiler/testData/diagnostics/tests/redeclarations/kt2418.txt
@@ -3,27 +3,12 @@ package
 package kt2418 {
 
     internal final enum class A : kotlin.Enum<kt2418.A> {
-        public enum entry FOO : kt2418.A {
-            private constructor FOO()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt2418.A): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry FOO
 
-        public enum entry FOO : kt2418.A {
-            private constructor FOO()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt2418.A): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry FOO
 
         private constructor A()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt2418.A): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -37,19 +22,11 @@ package kt2418 {
     }
 
     internal final enum class B : kotlin.Enum<kt2418.B> {
-        public enum entry FOO : kt2418.B {
-            private constructor FOO()
-            internal final override /*1*/ /*fake_override*/ fun FOO(): kotlin.Unit
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt2418.B): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry FOO
 
         private constructor B()
         internal final fun FOO(): kotlin.Unit
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt2418.B): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -63,19 +40,11 @@ package kt2418 {
     }
 
     internal final enum class C : kotlin.Enum<kt2418.C> {
-        public enum entry FOO : kt2418.C {
-            private constructor FOO()
-            internal final override /*1*/ /*fake_override*/ val FOO: kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt2418.C): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry FOO
 
         private constructor C()
         internal final val FOO: kotlin.Int = 1
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt2418.C): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -89,17 +58,10 @@ package kt2418 {
     }
 
     internal final enum class D : kotlin.Enum<kt2418.D> {
-        public enum entry FOO : kt2418.D {
-            private constructor FOO()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt2418.D): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry FOO
 
         private constructor D()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt2418.D): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet183-1.txt b/compiler/testData/diagnostics/tests/regressions/Jet183-1.txt
index 848083870cd..592a798cf93 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet183-1.txt
+++ b/compiler/testData/diagnostics/tests/regressions/Jet183-1.txt
@@ -3,29 +3,12 @@ package
 internal fun box(): kotlin.String
 
 internal final enum class ProtocolState : kotlin.Enum<ProtocolState> {
-    public enum entry WAITING : ProtocolState {
-        private constructor WAITING()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: ProtocolState): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        internal open override /*1*/ fun signal(): ProtocolState
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry WAITING
 
-    public enum entry TALKING : ProtocolState {
-        private constructor TALKING()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: ProtocolState): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        internal open override /*1*/ fun signal(): ProtocolState
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry TALKING
 
     private constructor ProtocolState()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: ProtocolState): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet183.txt b/compiler/testData/diagnostics/tests/regressions/Jet183.txt
index 92d2eef25a2..6416a9f5b0c 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet183.txt
+++ b/compiler/testData/diagnostics/tests/regressions/Jet183.txt
@@ -3,29 +3,12 @@ package
 internal fun box(): kotlin.Unit
 
 internal final enum class ProtocolState : kotlin.Enum<ProtocolState> {
-    public enum entry WAITING : ProtocolState {
-        private constructor WAITING()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: ProtocolState): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        internal open override /*1*/ fun signal(): ProtocolState
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry WAITING
 
-    public enum entry TALKING : ProtocolState {
-        private constructor TALKING()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: ProtocolState): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        internal open override /*1*/ fun signal(): ProtocolState
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry TALKING
 
     private constructor ProtocolState()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: ProtocolState): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/regressions/ea69735.txt b/compiler/testData/diagnostics/tests/regressions/ea69735.txt
index f7f2ea8a1c6..4b0fe85eccb 100644
--- a/compiler/testData/diagnostics/tests/regressions/ea69735.txt
+++ b/compiler/testData/diagnostics/tests/regressions/ea69735.txt
@@ -1,17 +1,10 @@
 package
 
 internal final enum class MyEnum : kotlin.Enum<MyEnum> {
-    public enum entry FIRST : MyEnum {
-        private constructor FIRST()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry FIRST
 
     private constructor MyEnum()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.txt b/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.txt
index 05946e2027f..977406b2af4 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.txt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.txt
@@ -7,6 +7,7 @@ internal fun </*0*/ TInner, /*1*/ TOuter> Foo<TInner, TOuter>.invoke(/*0*/ name:
 internal final enum class EnumClass : kotlin.Enum<EnumClass> {
     private constructor EnumClass(/*0*/ x: kotlin.String)
     internal final val x: kotlin.String
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EnumClass): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt b/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt
index 1c880290bce..60a511e5882 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt
@@ -3,29 +3,12 @@ package
 internal fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
 
 internal final enum class DOMElementTestClasses : kotlin.Enum<DOMElementTestClasses> {
-    public enum entry cls1 : DOMElementTestClasses {
-        private constructor cls1()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: DOMElementTestClasses): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        internal final override /*1*/ /*fake_override*/ fun invoke(): kotlin.Unit
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry cls1
 
-    public enum entry cls2 : DOMElementTestClasses {
-        private constructor cls2()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: DOMElementTestClasses): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        internal final override /*1*/ /*fake_override*/ fun invoke(): kotlin.Unit
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry cls2
 
     private constructor DOMElementTestClasses()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: DOMElementTestClasses): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -47,18 +30,10 @@ internal interface EnumStyleClass {
 }
 
 internal final enum class TestClasses : kotlin.Enum<TestClasses>, EnumStyleClass {
-    public enum entry cls : TestClasses {
-        private constructor cls()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: TestClasses): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        internal open override /*1*/ /*fake_override*/ fun invoke(): kotlin.Unit
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry cls
 
     private constructor TestClasses()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: TestClasses): kotlin.Int
     public final override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/sealed/NeverEnum.txt b/compiler/testData/diagnostics/tests/sealed/NeverEnum.txt
index d55aa959cba..033eb3842ce 100644
--- a/compiler/testData/diagnostics/tests/sealed/NeverEnum.txt
+++ b/compiler/testData/diagnostics/tests/sealed/NeverEnum.txt
@@ -1,27 +1,12 @@
 package
 
 internal sealed enum class SealedEnum : kotlin.Enum<SealedEnum> {
-    public enum entry FIRST : SealedEnum {
-        private constructor FIRST()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: SealedEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry FIRST
 
-    public enum entry SECOND : SealedEnum {
-        private constructor SECOND()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: SealedEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry SECOND
 
     private constructor SealedEnum()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: SealedEnum): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -31,6 +16,7 @@ internal sealed enum class SealedEnum : kotlin.Enum<SealedEnum> {
 
     internal final class Derived : SealedEnum {
         public constructor Derived()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: SealedEnum): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt
index 34a0f9c665a..d04efb602dd 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt
@@ -11,18 +11,10 @@ internal object A {
 }
 
 internal final enum class B : kotlin.Enum<B> {
-    public enum entry X : B {
-        private constructor X()
-        private constructor X()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: B): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry X
 
     private constructor B()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: B): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/enums.txt b/compiler/testData/diagnostics/tests/secondaryConstructors/enums.txt
index 138979dfdff..da8e60612a2 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/enums.txt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/enums.txt
@@ -1,61 +1,22 @@
 package
 
 internal final enum class A : kotlin.Enum<A> {
-    public enum entry W : A {
-        private constructor W()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry W
 
-    public enum entry X : A {
-        private constructor X()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry X
 
-    public enum entry Y : A {
-        private constructor Y()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry Y
 
-    public enum entry Z : A {
-        private constructor Z()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry Z
 
-    public enum entry E : A {
-        private constructor E()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry E
 
     private constructor A()
     private constructor A(/*0*/ x: kotlin.Double)
     private constructor A(/*0*/ x: kotlin.Int)
     private constructor A(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int)
     private constructor A(/*0*/ x: kotlin.String)
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -69,50 +30,19 @@ internal final enum class A : kotlin.Enum<A> {
 }
 
 internal final enum class B : kotlin.Enum<B> {
-    public enum entry W : B {
-        private constructor W()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: B): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry W
 
-    public enum entry X : B {
-        private constructor X()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: B): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry X
 
-    public enum entry Y : B {
-        private constructor Y()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: B): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry Y
 
-    public enum entry Z : B {
-        private constructor Z()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: B): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry Z
 
     private constructor B(/*0*/ x: kotlin.Double)
     private constructor B(/*0*/ x: kotlin.Int)
     private constructor B(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int)
     private constructor B(/*0*/ x: kotlin.String)
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: B): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -126,17 +56,10 @@ internal final enum class B : kotlin.Enum<B> {
 }
 
 internal final enum class C : kotlin.Enum<C> {
-    public enum entry EMPTY : C {
-        private constructor EMPTY()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: C): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry EMPTY
 
     private constructor C()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: C): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -150,46 +73,17 @@ internal final enum class C : kotlin.Enum<C> {
 }
 
 internal final enum class D : kotlin.Enum<D> {
-    public enum entry X : D {
-        private constructor X()
-        internal final override /*1*/ /*fake_override*/ val prop: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: D): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal open override /*1*/ fun f(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry X
 
-    public enum entry Y : D {
-        private constructor Y()
-        internal final override /*1*/ /*fake_override*/ val prop: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: D): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal open override /*1*/ fun f(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry Y
 
-    public enum entry Z : D {
-        private constructor Z()
-        internal final override /*1*/ /*fake_override*/ val prop: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: D): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal open override /*1*/ fun f(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry Z
 
     private constructor D()
     private constructor D(/*0*/ prop: kotlin.Int)
     private constructor D(/*0*/ x: kotlin.String)
     internal final val prop: kotlin.Int
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: D): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     internal abstract fun f(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.txt b/compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.txt
index e8374984d40..c53dadeb7e8 100644
--- a/compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.txt
+++ b/compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.txt
@@ -21,6 +21,7 @@ internal final class A3 {
 
 internal final enum class A4 : kotlin.Enum<A4> {
     private constructor A4()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A4): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/when/BranchFalseBypass.txt b/compiler/testData/diagnostics/tests/when/BranchFalseBypass.txt
index f6d77ab7236..c87745ff375 100644
--- a/compiler/testData/diagnostics/tests/when/BranchFalseBypass.txt
+++ b/compiler/testData/diagnostics/tests/when/BranchFalseBypass.txt
@@ -3,27 +3,12 @@ package
 internal fun test(/*0*/ a: My): kotlin.String
 
 internal final enum class My : kotlin.Enum<My> {
-    public enum entry A : My {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
-    public enum entry B : My {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry B
 
     private constructor My()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.txt b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.txt
index aa8bebf5500..990a6d646f9 100644
--- a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.txt
+++ b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.txt
@@ -7,27 +7,12 @@ internal fun withNull(/*0*/ e: E?): kotlin.Int?
 internal fun withNullableNothing(/*0*/ e: E?): kotlin.Int?
 
 internal final enum class E : kotlin.Enum<E> {
-    public enum entry A : E {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
-    public enum entry B : E {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry B
 
     private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.txt b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.txt
index e76314bff83..9f613e713f9 100644
--- a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.txt
+++ b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.txt
@@ -3,27 +3,12 @@ package
 internal fun foo(/*0*/ e: E, /*1*/ something: kotlin.Any?): kotlin.Int
 
 internal final enum class E : kotlin.Enum<E> {
-    public enum entry A : E {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
-    public enum entry B : E {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry B
 
     private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.txt b/compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.txt
index 3f3fbb3e5f4..1712965d3c9 100644
--- a/compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.txt
+++ b/compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.txt
@@ -3,27 +3,12 @@ package
 internal fun foo(/*0*/ arg: My): kotlin.Int
 
 internal final enum class My : kotlin.Enum<My> {
-    public enum entry FIRST : My {
-        private constructor FIRST()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry FIRST
 
-    public enum entry SECOND : My {
-        private constructor SECOND()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry SECOND
 
     private constructor My()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: My): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.txt
index 19bf157586f..6281c9274e6 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.txt
@@ -3,37 +3,14 @@ package
 internal fun foo(/*0*/ x: MyEnum): kotlin.Int
 
 internal final enum class MyEnum : kotlin.Enum<MyEnum> {
-    public enum entry A : MyEnum {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
-    public enum entry B : MyEnum {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry B
 
-    public enum entry C : MyEnum {
-        private constructor C()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry C
 
     private constructor MyEnum()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.txt
index 19bf157586f..6281c9274e6 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.txt
@@ -3,37 +3,14 @@ package
 internal fun foo(/*0*/ x: MyEnum): kotlin.Int
 
 internal final enum class MyEnum : kotlin.Enum<MyEnum> {
-    public enum entry A : MyEnum {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
-    public enum entry B : MyEnum {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry B
 
-    public enum entry C : MyEnum {
-        private constructor C()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry C
 
     private constructor MyEnum()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.txt
index cd0c733a48c..e28e310e0a2 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.txt
@@ -3,47 +3,16 @@ package
 internal fun foo(/*0*/ dir: Direction): kotlin.Int
 
 internal final enum class Direction : kotlin.Enum<Direction> {
-    public enum entry NORTH : Direction {
-        private constructor NORTH()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Direction): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry NORTH
 
-    public enum entry SOUTH : Direction {
-        private constructor SOUTH()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Direction): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry SOUTH
 
-    public enum entry WEST : Direction {
-        private constructor WEST()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Direction): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry WEST
 
-    public enum entry EAST : Direction {
-        private constructor EAST()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Direction): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry EAST
 
     private constructor Direction()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Direction): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.txt
index 4ad0fa7a11f..4d7078edc59 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.txt
@@ -3,27 +3,12 @@ package
 internal fun foo(/*0*/ x: MyEnum?): kotlin.Int
 
 internal final enum class MyEnum : kotlin.Enum<MyEnum> {
-    public enum entry A : MyEnum {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
-    public enum entry B : MyEnum {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry B
 
     private constructor MyEnum()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.txt
index 86c67a05e99..f0609e40b09 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.txt
@@ -3,27 +3,12 @@ package
 internal fun foo(): kotlin.Int
 
 public final enum class J : kotlin.Enum<J!> {
-    public enum entry A : J {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
-    public enum entry B : J {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry B
 
     public constructor J()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt
index a8a18e3895f..c5fa724ddc2 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt
@@ -3,27 +3,12 @@ package
 internal fun foo(): kotlin.Int
 
 public final enum class J : kotlin.Enum<J!> {
-    public enum entry A : J {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
-    public enum entry B : J {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry B
 
     public constructor J()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.txt
index 86c67a05e99..f0609e40b09 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.txt
@@ -3,27 +3,12 @@ package
 internal fun foo(): kotlin.Int
 
 public final enum class J : kotlin.Enum<J!> {
-    public enum entry A : J {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
-    public enum entry B : J {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry B
 
     public constructor J()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.txt
index 86c67a05e99..f0609e40b09 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.txt
@@ -3,27 +3,12 @@ package
 internal fun foo(): kotlin.Int
 
 public final enum class J : kotlin.Enum<J!> {
-    public enum entry A : J {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
-    public enum entry B : J {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry B
 
     public constructor J()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.txt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.txt
index 86c67a05e99..f0609e40b09 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.txt
@@ -3,27 +3,12 @@ package
 internal fun foo(): kotlin.Int
 
 public final enum class J : kotlin.Enum<J!> {
-    public enum entry A : J {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
-    public enum entry B : J {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry B
 
     public constructor J()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.txt
index cd0c733a48c..e28e310e0a2 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.txt
@@ -3,47 +3,16 @@ package
 internal fun foo(/*0*/ dir: Direction): kotlin.Int
 
 internal final enum class Direction : kotlin.Enum<Direction> {
-    public enum entry NORTH : Direction {
-        private constructor NORTH()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Direction): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry NORTH
 
-    public enum entry SOUTH : Direction {
-        private constructor SOUTH()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Direction): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry SOUTH
 
-    public enum entry WEST : Direction {
-        private constructor WEST()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Direction): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry WEST
 
-    public enum entry EAST : Direction {
-        private constructor EAST()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Direction): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry EAST
 
     private constructor Direction()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Direction): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.txt
index 27255e8808f..789d680d29d 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.txt
@@ -3,27 +3,12 @@ package
 internal fun foo(/*0*/ arg: X?): kotlin.Int
 
 internal final enum class X : kotlin.Enum<X> {
-    public enum entry A : X {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
-    public enum entry B : X {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry B
 
     private constructor X()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.txt
index 27255e8808f..789d680d29d 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.txt
@@ -3,27 +3,12 @@ package
 internal fun foo(/*0*/ arg: X?): kotlin.Int
 
 internal final enum class X : kotlin.Enum<X> {
-    public enum entry A : X {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
-    public enum entry B : X {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry B
 
     private constructor X()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.txt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.txt
index 27255e8808f..789d680d29d 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.txt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.txt
@@ -3,27 +3,12 @@ package
 internal fun foo(/*0*/ arg: X?): kotlin.Int
 
 internal final enum class X : kotlin.Enum<X> {
-    public enum entry A : X {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
-    public enum entry B : X {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry B
 
     private constructor X()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.txt b/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.txt
index 86c67a05e99..f0609e40b09 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.txt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.txt
@@ -3,27 +3,12 @@ package
 internal fun foo(): kotlin.Int
 
 public final enum class J : kotlin.Enum<J!> {
-    public enum entry A : J {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
-    public enum entry B : J {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry B
 
     public constructor J()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.txt
index a168907e08d..f274401255e 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.txt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.txt
@@ -3,47 +3,16 @@ package
 internal fun foo(/*0*/ arg: X): kotlin.String
 
 internal final enum class X : kotlin.Enum<X> {
-    public enum entry A : X {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
-    public enum entry B : X {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry B
 
-    public enum entry C : X {
-        private constructor C()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry C
 
-    public enum entry D : X {
-        private constructor D()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry D
 
     private constructor X()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.txt
index a168907e08d..f274401255e 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.txt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.txt
@@ -3,47 +3,16 @@ package
 internal fun foo(/*0*/ arg: X): kotlin.String
 
 internal final enum class X : kotlin.Enum<X> {
-    public enum entry A : X {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
-    public enum entry B : X {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry B
 
-    public enum entry C : X {
-        private constructor C()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry C
 
-    public enum entry D : X {
-        private constructor D()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry D
 
     private constructor X()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.txt
index a168907e08d..f274401255e 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.txt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.txt
@@ -3,47 +3,16 @@ package
 internal fun foo(/*0*/ arg: X): kotlin.String
 
 internal final enum class X : kotlin.Enum<X> {
-    public enum entry A : X {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
-    public enum entry B : X {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry B
 
-    public enum entry C : X {
-        private constructor C()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry C
 
-    public enum entry D : X {
-        private constructor D()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry D
 
     private constructor X()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.txt
index 050b3bc832b..197de32a464 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.txt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.txt
@@ -3,47 +3,16 @@ package
 internal fun foo(/*0*/ arg: X?): kotlin.String
 
 internal final enum class X : kotlin.Enum<X> {
-    public enum entry A : X {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
-    public enum entry B : X {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry B
 
-    public enum entry C : X {
-        private constructor C()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry C
 
-    public enum entry D : X {
-        private constructor D()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry D
 
     private constructor X()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.txt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.txt
index 27255e8808f..789d680d29d 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.txt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.txt
@@ -3,27 +3,12 @@ package
 internal fun foo(/*0*/ arg: X?): kotlin.Int
 
 internal final enum class X : kotlin.Enum<X> {
-    public enum entry A : X {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
-    public enum entry B : X {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry B
 
     private constructor X()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: X): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.txt b/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.txt
index 5196a4d37c5..8feb96fe885 100644
--- a/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.txt
+++ b/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.txt
@@ -1,27 +1,12 @@
 package
 
 internal final enum class E : kotlin.Enum<E> {
-    public enum entry A : E {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry A
 
-    public enum entry B : E {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry B
 
     private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/nestedInnerClassifier.txt b/compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/nestedInnerClassifier.txt
index 82b1df832b2..d8304b613f9 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/nestedInnerClassifier.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/nestedInnerClassifier.txt
@@ -61,27 +61,12 @@ internal final class A {
     }
 
     internal final enum class E : kotlin.Enum<A.E> {
-        public enum entry X : A.E {
-            private constructor X()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry X
 
-        public enum entry Y : A.E {
-            private constructor Y()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry Y
 
         private constructor E()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -136,27 +121,12 @@ internal final class A {
 }
 
 internal final enum class E : kotlin.Enum<E> {
-    public enum entry X : E {
-        private constructor X()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry X
 
-    public enum entry Y : E {
-        private constructor Y()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
+    enum entry Y
 
     private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -219,27 +189,12 @@ internal final enum class E : kotlin.Enum<E> {
     }
 
     internal final enum class E : kotlin.Enum<E.E> {
-        public enum entry X : E.E {
-            private constructor X()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E.E): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry X
 
-        public enum entry Y : E.E {
-            private constructor Y()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E.E): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry Y
 
         private constructor E()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E.E): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -357,27 +312,12 @@ internal interface T {
     }
 
     internal final enum class E : kotlin.Enum<T.E> {
-        public enum entry X : T.E {
-            private constructor X()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: T.E): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry X
 
-        public enum entry Y : T.E {
-            private constructor Y()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: T.E): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
+        enum entry Y
 
         private constructor E()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: T.E): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt
index 3c4e239984b..4bea0134b04 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt
@@ -9,14 +9,10 @@ public interface CustomAnnotation {
     }
 
     public final enum class MyEnum : kotlin.Enum<test.CustomAnnotation.MyEnum!> {
-        public enum entry ONE : test.CustomAnnotation.MyEnum {
-            private constructor ONE()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.CustomAnnotation.MyEnum!): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        }
+        enum entry ONE
 
         private constructor MyEnum()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.CustomAnnotation.MyEnum!): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
         public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt
index c9aa39761ce..93c4f32b1d2 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.txt
@@ -5,14 +5,10 @@ public open class EnumArgumentWithCustomToString {
     test.EnumArgumentWithCustomToString.EnumAnno(value = E.CAKE) test.EnumArgumentWithCustomToString.EnumArrayAnno(value = {E.CAKE, E.CAKE}) public/*package*/ open fun annotated(): kotlin.Unit
 
     public open enum class E : kotlin.Enum<test.EnumArgumentWithCustomToString.E!> {
-        public enum entry CAKE : test.EnumArgumentWithCustomToString.E {
-            private constructor CAKE()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumArgumentWithCustomToString.E!): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        }
+        enum entry CAKE
 
         private constructor E()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumArgumentWithCustomToString.E!): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
         public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt
index f7431df93f5..2de244fb2ca 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.txt
@@ -1,15 +1,11 @@
 package test
 
 public final enum class EnumConstructorParameter : kotlin.Enum<test.EnumConstructorParameter!> {
-    public enum entry INSTANCE : test.EnumConstructorParameter {
-        private constructor INSTANCE()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumConstructorParameter!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry INSTANCE
 
     private constructor EnumConstructorParameter(/*0*/ p0: kotlin.Int)
     private constructor EnumConstructorParameter(/*0*/ test.EnumConstructorParameter.Anno(value = "string") p0: kotlin.String!)
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumConstructorParameter!): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.txt b/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.txt
index d4436bb8921..9a94712bb18 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.txt
@@ -11,14 +11,10 @@ public open class NestedEnumArgument {
     }
 
     public final enum class E : kotlin.Enum<test.NestedEnumArgument.E!> {
-        public enum entry FIRST : test.NestedEnumArgument.E {
-            private constructor FIRST()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.NestedEnumArgument.E!): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        }
+        enum entry FIRST
 
         private constructor E()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.NestedEnumArgument.E!): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
         public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledJava/enum/EnumMembers.txt b/compiler/testData/loadJava/compiledJava/enum/EnumMembers.txt
index b65b4477181..3097fc0268d 100644
--- a/compiler/testData/loadJava/compiledJava/enum/EnumMembers.txt
+++ b/compiler/testData/loadJava/compiledJava/enum/EnumMembers.txt
@@ -1,26 +1,13 @@
 package test
 
 public final enum class EnumMembers : kotlin.Enum<test.EnumMembers!> {
-    public enum entry FIRST : test.EnumMembers {
-        private constructor FIRST()
-        public final override /*1*/ /*fake_override*/ val isFirst: kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumMembers!): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun first(): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry FIRST
 
-    public enum entry SECOND : test.EnumMembers {
-        private constructor SECOND()
-        public final override /*1*/ /*fake_override*/ val isFirst: kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumMembers!): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun first(): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry SECOND
 
     private constructor EnumMembers(/*0*/ p0: kotlin.Boolean)
     public final val isFirst: kotlin.Boolean
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumMembers!): kotlin.Int
     public open fun first(): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
diff --git a/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.txt b/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.txt
index 09c93e4eccb..0d03916a6a7 100644
--- a/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.txt
+++ b/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.txt
@@ -1,21 +1,12 @@
 package test
 
 public open enum class EnumWithSpecializedEntry : kotlin.Enum<test.EnumWithSpecializedEntry!> {
-    public enum entry E1 : test.EnumWithSpecializedEntry {
-        private constructor E1()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumWithSpecializedEntry!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry E1
 
-    public enum entry E2 : test.EnumWithSpecializedEntry {
-        private constructor E2()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumWithSpecializedEntry!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry E2
 
     private constructor EnumWithSpecializedEntry()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumWithSpecializedEntry!): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledJava/enum/JavaEnum.txt b/compiler/testData/loadJava/compiledJava/enum/JavaEnum.txt
index 63d66a7c272..1e92c5542db 100644
--- a/compiler/testData/loadJava/compiledJava/enum/JavaEnum.txt
+++ b/compiler/testData/loadJava/compiledJava/enum/JavaEnum.txt
@@ -1,21 +1,12 @@
 package test
 
 public final enum class JavaEnum : kotlin.Enum<test.JavaEnum!> {
-    public enum entry ENTRY : test.JavaEnum {
-        private constructor ENTRY()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.JavaEnum!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry ENTRY
 
-    public enum entry ANOTHER : test.JavaEnum {
-        private constructor ANOTHER()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.JavaEnum!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry ANOTHER
 
     private constructor JavaEnum()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.JavaEnum!): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledJava/static/Enum.txt b/compiler/testData/loadJava/compiledJava/static/Enum.txt
index 4f06980ad0d..54279047800 100644
--- a/compiler/testData/loadJava/compiledJava/static/Enum.txt
+++ b/compiler/testData/loadJava/compiledJava/static/Enum.txt
@@ -1,28 +1,14 @@
 package test
 
 public final enum class Enum : kotlin.Enum<test.Enum!> {
-    public enum entry A : test.Enum {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Enum!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry A
 
-    public enum entry B : test.Enum {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Enum!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry B
 
-    public enum entry C : test.Enum {
-        private constructor C()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Enum!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry C
 
     private constructor Enum()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Enum!): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt
index 711c666c99f..9ba8583d90b 100644
--- a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt
+++ b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt
@@ -1,14 +1,10 @@
 package test
 
 public final enum class StaticMembersInEnum : kotlin.Enum<test.StaticMembersInEnum!> {
-    public enum entry ENTRY : test.StaticMembersInEnum {
-        private constructor ENTRY()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.StaticMembersInEnum!): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry ENTRY
 
     private constructor StaticMembersInEnum()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.StaticMembersInEnum!): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.txt b/compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.txt
index d7c67438af2..ad59c1c9598 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.txt
@@ -5,14 +5,10 @@ test.OptionGroups(o1 = test.StringOptions(option = {"abc", "d", "ef"}), o2 = tes
 }
 
 internal final enum class E : kotlin.Enum<test.E> {
-    public enum entry ENTRY : test.E {
-        /*primary*/ private constructor ENTRY()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry ENTRY
 
     /*primary*/ private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt b/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt
index 9ecf3aaec69..a03f1a1acf0 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.txt
@@ -1,14 +1,10 @@
 package test
 
 internal final enum class E : kotlin.Enum<test.E> {
-    public enum entry CAKE : test.E {
-        /*primary*/ private constructor CAKE()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry CAKE
 
     /*primary*/ private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt
index 3f2bf6f2b1a..be566195504 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt
@@ -14,6 +14,7 @@ internal final enum class E : kotlin.Enum<test.E> {
         internal final fun <get-x>(): kotlin.String
     test.B() internal final val y: kotlin.Int
         internal final fun <get-y>(): kotlin.Int
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt b/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt
index 3feeffb89f4..d53917648e2 100644
--- a/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt
+++ b/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt
@@ -2,6 +2,7 @@ package test
 
 internal final enum class EnumWithGenericConstructorParameter : kotlin.Enum<test.EnumWithGenericConstructorParameter> {
     /*primary*/ private constructor EnumWithGenericConstructorParameter(/*0*/ list: kotlin.List<kotlin.String>?)
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumWithGenericConstructorParameter): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt b/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt
index 0e96cb94aff..fc84f328694 100644
--- a/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt
+++ b/compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt
@@ -2,6 +2,7 @@ package test
 
 internal final enum class EnumWithPrimitiveConstructorParameter : kotlin.Enum<test.EnumWithPrimitiveConstructorParameter> {
     /*primary*/ private constructor EnumWithPrimitiveConstructorParameter(/*0*/ b: kotlin.Boolean)
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.EnumWithPrimitiveConstructorParameter): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt b/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt
index 5fa20ea215f..e6341fa5071 100644
--- a/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt
+++ b/compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt
@@ -1,14 +1,10 @@
 package test
 
 internal final enum class In : kotlin.Enum<test.In> {
-    public enum entry A : test.In {
-        /*primary*/ private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.In): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry A
 
     /*primary*/ private constructor In()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.In): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
@@ -19,14 +15,10 @@ internal final enum class In : kotlin.Enum<test.In> {
 }
 
 private final enum class Pr : kotlin.Enum<test.Pr> {
-    public enum entry A : test.Pr {
-        /*primary*/ private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Pr): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry A
 
     /*primary*/ private constructor Pr()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Pr): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
@@ -37,14 +29,10 @@ private final enum class Pr : kotlin.Enum<test.Pr> {
 }
 
 public final enum class Pu : kotlin.Enum<test.Pu> {
-    public enum entry A : test.Pu {
-        /*primary*/ private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Pu): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry A
 
     /*primary*/ private constructor Pu()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Pu): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.txt b/compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.txt
index a4a29e5e00f..1edc9eaeb09 100644
--- a/compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.txt
+++ b/compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.txt
@@ -1,44 +1,18 @@
 package test
 
 internal final enum class En : kotlin.Enum<test.En> {
-    public enum entry E1 : test.En {
-        /*primary*/ private constructor E1()
-        internal final override /*1*/ /*fake_override*/ val b: kotlin.Boolean
-            internal final override /*1*/ /*fake_override*/ fun <get-b>(): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ val i: kotlin.Int
-            internal final override /*1*/ /*fake_override*/ fun <get-i>(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.En): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry E1
 
-    public enum entry E2 : test.En {
-        /*primary*/ private constructor E2()
-        internal final override /*1*/ /*fake_override*/ val b: kotlin.Boolean
-            internal final override /*1*/ /*fake_override*/ fun <get-b>(): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ val i: kotlin.Int
-            internal final override /*1*/ /*fake_override*/ fun <get-i>(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.En): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry E2
 
-    public enum entry E3 : test.En {
-        /*primary*/ private constructor E3()
-        internal final override /*1*/ /*fake_override*/ val b: kotlin.Boolean
-            internal final override /*1*/ /*fake_override*/ fun <get-b>(): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ val i: kotlin.Int
-            internal final override /*1*/ /*fake_override*/ fun <get-i>(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.En): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry E3
 
     /*primary*/ private constructor En(/*0*/ b: kotlin.Boolean = ..., /*1*/ i: kotlin.Int = ...)
     internal final val b: kotlin.Boolean
         internal final fun <get-b>(): kotlin.Boolean
     internal final val i: kotlin.Int
         internal final fun <get-i>(): kotlin.Int
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.En): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.txt b/compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.txt
index eb38b06c2c2..2084c16649e 100644
--- a/compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.txt
+++ b/compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.txt
@@ -1,29 +1,14 @@
 package test
 
 internal final enum class Enum : kotlin.Enum<test.Enum> {
-    public enum entry ENTRY1 : test.Enum {
-        /*primary*/ private constructor ENTRY1()
-        internal final override /*1*/ /*fake_override*/ val c: kotlin.Int
-            internal final override /*1*/ /*fake_override*/ fun <get-c>(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Enum): kotlin.Int
-        internal final override /*1*/ /*fake_override*/ fun f(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry ENTRY1
 
-    public enum entry ENTRY2 : test.Enum {
-        /*primary*/ private constructor ENTRY2()
-        internal final override /*1*/ /*fake_override*/ val c: kotlin.Int
-            internal final override /*1*/ /*fake_override*/ fun <get-c>(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Enum): kotlin.Int
-        internal final override /*1*/ /*fake_override*/ fun f(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry ENTRY2
 
     /*primary*/ private constructor Enum()
     internal final val c: kotlin.Int = 1
         internal final fun <get-c>(): kotlin.Int
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Enum): kotlin.Int
     internal final fun f(): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt b/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt
index 36e05316b07..542709911e9 100644
--- a/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt
+++ b/compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt
@@ -4,14 +4,10 @@ internal final class A {
     /*primary*/ public constructor A()
 
     internal final enum class E : kotlin.Enum<test.A.E> {
-        public enum entry ENTRY : test.A.E {
-            /*primary*/ private constructor ENTRY()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.A.E): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        }
+        enum entry ENTRY
 
         /*primary*/ private constructor E()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.A.E): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
         public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt b/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt
index 7b9cb8ce13f..248db6280fa 100644
--- a/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt
+++ b/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt
@@ -8,14 +8,10 @@ internal final class A {
     }
 
     internal final enum class E : kotlin.Enum<test.A.E> {
-        public enum entry ENTRY : test.A.E {
-            /*primary*/ private constructor ENTRY()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.A.E): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        }
+        enum entry ENTRY
 
         /*primary*/ private constructor E()
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.A.E): kotlin.Int
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
         public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt b/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt
index 0fe97636c12..9cf18ea9b80 100644
--- a/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt
+++ b/compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt
@@ -1,14 +1,10 @@
 package test
 
 internal final enum class MyEnum : kotlin.Enum<test.MyEnum> {
-    public enum entry ENTRY : test.MyEnum {
-        /*primary*/ private constructor ENTRY()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry ENTRY
 
     /*primary*/ private constructor MyEnum()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.MyEnum): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.txt
index b25175aac00..1ce021c07c2 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.txt
@@ -1,21 +1,12 @@
 package test
 
 internal final enum class Test : kotlin.Enum<test.Test> {
-    public enum entry A : test.Test {
-        /*primary*/ private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Test): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry A
 
-    public enum entry B : test.Test {
-        /*primary*/ private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Test): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry B
 
     /*primary*/ private constructor Test(/*0*/ a: kotlin.Int)
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Test): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.txt b/compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.txt
index 5b21742e91a..5a375e03602 100644
--- a/compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.txt
+++ b/compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.txt
@@ -1,63 +1,24 @@
 package test
 
 internal final enum class E : kotlin.Enum<test.E> {
-    public enum entry ONE : test.E {
-        /*primary*/ private constructor ONE()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry ONE
 
-    public enum entry TWO : test.E {
-        /*primary*/ private constructor TWO()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry TWO
 
-    public enum entry THREE : test.E {
-        /*primary*/ private constructor THREE()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry THREE
 
-    public enum entry FOUR : test.E {
-        /*primary*/ private constructor FOUR()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry FOUR
 
-    public enum entry FIVE : test.E {
-        /*primary*/ private constructor FIVE()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry FIVE
 
-    public enum entry SIX : test.E {
-        /*primary*/ private constructor SIX()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry SIX
 
-    public enum entry SEVEN : test.E {
-        /*primary*/ private constructor SEVEN()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry SEVEN
 
-    public enum entry EIGHT : test.E {
-        /*primary*/ private constructor EIGHT()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry EIGHT
 
     /*primary*/ private constructor E()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.E): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/testData/renderer/Enum.kt b/compiler/testData/renderer/Enum.kt
index 7314b8f6a23..f2f73a00ad1 100644
--- a/compiler/testData/renderer/Enum.kt
+++ b/compiler/testData/renderer/Enum.kt
@@ -8,5 +8,5 @@ private enum class TheEnum(val rgb: Int) {
 //private final enum class TheEnum : kotlin.Enum<rendererTest.TheEnum> defined in rendererTest
 //private constructor TheEnum(rgb: kotlin.Int) defined in rendererTest.TheEnum
 //value-parameter val rgb: kotlin.Int defined in rendererTest.TheEnum.<init>
-//public enum entry VAL1 : rendererTest.TheEnum defined in rendererTest.TheEnum
+//enum entry VAL1 defined in rendererTest.TheEnum
 //private constructor VAL1() defined in rendererTest.TheEnum.VAL1
diff --git a/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry1.txt b/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry1.txt
index 52c0f485d25..1ed172b3c7c 100644
--- a/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry1.txt
+++ b/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry1.txt
@@ -10,7 +10,7 @@ fun test() = A.<caret>ONE(1)
 
 Resolved call:
 
-Resulting descriptor: enum entry ONE : A defined in A
+Resulting descriptor: enum entry ONE defined in A
 
 Explicit receiver kind = NO_EXPLICIT_RECEIVER
 Dispatch receiver = NO_RECEIVER
diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt
index d37e6bbe6e8..727a48ec8aa 100644
--- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt
+++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt
@@ -19,28 +19,14 @@ kotlin.annotation.annotation() internal final class JustEnum : kotlin.Annotation
 }
 
 internal final enum class Weapon : kotlin.Enum<test.Weapon> {
-    public enum entry ROCK : test.Weapon {
-        private constructor ROCK()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Weapon): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry ROCK
 
-    public enum entry PAPER : test.Weapon {
-        private constructor PAPER()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Weapon): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry PAPER
 
-    public enum entry SCISSORS : test.Weapon {
-        private constructor SCISSORS()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Weapon): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry SCISSORS
 
     private constructor Weapon()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Weapon): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt
index af5bb7fcbb9..35848a2dd16 100644
--- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt
+++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt
@@ -1,28 +1,14 @@
 package test
 
 internal final enum class My : kotlin.Enum<test.My> {
-    public enum entry ALPHA : test.My {
-        private constructor ALPHA()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry ALPHA
 
-    public enum entry BETA : test.My {
-        private constructor BETA()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry BETA
 
-    public enum entry OMEGA : test.My {
-        private constructor OMEGA()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.My): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry OMEGA
 
     private constructor My()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.My): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.txt b/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.txt
index 3f5be0b4866..6cd814555fe 100644
--- a/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.txt
+++ b/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.txt
@@ -32,28 +32,14 @@ internal final class Class {
 }
 
 internal final enum class Weapon : kotlin.Enum<test.Weapon> {
-    public enum entry ROCK : test.Weapon {
-        private constructor ROCK()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Weapon): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry ROCK
 
-    public enum entry PAPER : test.Weapon {
-        private constructor PAPER()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Weapon): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry PAPER
 
-    public enum entry SCISSORS : test.Weapon {
-        private constructor SCISSORS()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Weapon): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry SCISSORS
 
     private constructor Weapon()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Weapon): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/testData/serialization/js/dynamicConstants.txt b/compiler/testData/serialization/js/dynamicConstants.txt
index b38b6b079f0..8caf83df269 100644
--- a/compiler/testData/serialization/js/dynamicConstants.txt
+++ b/compiler/testData/serialization/js/dynamicConstants.txt
@@ -30,28 +30,14 @@ internal final class Class {
 }
 
 internal final enum class Weapon : kotlin.Enum<test.Weapon> {
-    public enum entry ROCK : test.Weapon {
-        private constructor ROCK()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Weapon): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry ROCK
 
-    public enum entry PAPER : test.Weapon {
-        private constructor PAPER()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Weapon): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry PAPER
 
-    public enum entry SCISSORS : test.Weapon {
-        private constructor SCISSORS()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Weapon): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    }
+    enum entry SCISSORS
 
     private constructor Weapon()
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.Weapon): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
diff --git a/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java
index 3f6f4537bbf..502ee4510c7 100644
--- a/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java
+++ b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java
@@ -37,9 +37,9 @@ import org.jetbrains.kotlin.utils.Printer;
 import org.junit.Assert;
 
 import java.io.File;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 import static org.jetbrains.kotlin.resolve.DescriptorUtils.isEnumEntry;
 import static org.jetbrains.kotlin.test.util.DescriptorValidator.ValidationVisitor.errorTypesForbidden;
@@ -104,15 +104,18 @@ public class RecursiveDescriptorComparator {
             @NotNull Printer printer,
             boolean topLevel
     ) {
-        if (!isEnumEntry(descriptor) &&
-            (descriptor instanceof ClassOrPackageFragmentDescriptor || descriptor instanceof PackageViewDescriptor) && !topLevel) {
+        boolean isEnumEntry = isEnumEntry(descriptor);
+        boolean isClassOrPackage =
+                (descriptor instanceof ClassOrPackageFragmentDescriptor || descriptor instanceof PackageViewDescriptor) && !isEnumEntry;
+
+        if (isClassOrPackage && !topLevel) {
             printer.println();
         }
 
         boolean isPrimaryConstructor = descriptor instanceof ConstructorDescriptor && ((ConstructorDescriptor) descriptor).isPrimary();
         printer.print(isPrimaryConstructor && conf.checkPrimaryConstructors ? "/*primary*/ " : "", conf.renderer.render(descriptor));
 
-        if (descriptor instanceof ClassOrPackageFragmentDescriptor || descriptor instanceof PackageViewDescriptor) {
+        if (isClassOrPackage) {
             if (!topLevel) {
                 printer.printlnWithNoIndent(" {").pushIndent();
             }
@@ -167,7 +170,7 @@ public class RecursiveDescriptorComparator {
             printer.printlnWithNoIndent();
         }
 
-        if (isEnumEntry(descriptor)) {
+        if (isEnumEntry) {
             printer.println();
         }
     }
diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
index 98696f27b6e..a748ec8fe3b 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
@@ -725,13 +725,18 @@ internal class DescriptorRendererImpl(
 
     /* CLASSES */
     private fun renderClass(klass: ClassDescriptor, builder: StringBuilder) {
+        val isEnumEntry = klass.kind == ClassKind.ENUM_ENTRY
+
         if (!startFromName) {
             renderAnnotations(klass, builder)
-            renderVisibility(klass.getVisibility(), builder)
-            if (!(klass.getKind() == ClassKind.INTERFACE && klass.getModality() == Modality.ABSTRACT || klass.getKind().isSingleton() && klass.getModality() == Modality.FINAL)) {
-                renderModality(klass.getModality(), builder)
+            if (!isEnumEntry) {
+                renderVisibility(klass.visibility, builder)
             }
-            renderInner(klass.isInner(), builder)
+            if (!(klass.kind == ClassKind.INTERFACE && klass.modality == Modality.ABSTRACT ||
+                  klass.kind.isSingleton && klass.modality == Modality.FINAL)) {
+                renderModality(klass.modality, builder)
+            }
+            renderInner(klass.isInner, builder)
             renderClassKindPrefix(klass, builder)
         }
 
@@ -743,15 +748,17 @@ internal class DescriptorRendererImpl(
             renderCompanionObjectName(klass, builder)
         }
 
-        val typeParameters = klass.getTypeConstructor().getParameters()
+        if (isEnumEntry) return
+
+        val typeParameters = klass.typeConstructor.getParameters()
         renderTypeParameters(typeParameters, builder, false)
 
-        if (!klass.getKind().isSingleton() && classWithPrimaryConstructor) {
-            val primaryConstructor = klass.getUnsubstitutedPrimaryConstructor()
+        if (!klass.kind.isSingleton && classWithPrimaryConstructor) {
+            val primaryConstructor = klass.unsubstitutedPrimaryConstructor
             if (primaryConstructor != null) {
                 builder.append(" ")
                 renderAnnotations(primaryConstructor, builder, true)
-                renderVisibility(primaryConstructor.getVisibility(), builder)
+                renderVisibility(primaryConstructor.visibility, builder)
                 builder.append("constructor")
                 renderValueParameters(primaryConstructor.valueParameters, primaryConstructor.hasSynthesizedParameterNames(), builder)
             }