Fix test data after changes to renderer and descriptors

compiler/testData/builtin-classes.txt

@@ -774,11 +774,6 @@ public trait Function9</*0*/ in P1, /*1*/ in P2, /*2*/ in P3, /*3*/ in P4, /*4*/
 }
 
 public final enum class InlineOption : kotlin.Enum<kotlin.InlineOption> {
-    /*primary*/ private constructor InlineOption()
-    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
-
     public enum entry LOCAL_CONTINUE_AND_BREAK : kotlin.InlineOption {
         /*primary*/ private constructor LOCAL_CONTINUE_AND_BREAK()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kotlin.InlineOption): kotlin.Int
@@ -807,17 +802,17 @@ public final enum class InlineOption : kotlin.Enum<kotlin.InlineOption> {
         }
     }
 
+    /*primary*/ private constructor InlineOption()
+    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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kotlin.InlineOption
     public final /*synthesized*/ fun values(): kotlin.Array<kotlin.InlineOption>
 }
 
 public final enum class InlineStrategy : kotlin.Enum<kotlin.InlineStrategy> {
-    /*primary*/ private constructor InlineStrategy()
-    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
-
     public enum entry AS_FUNCTION : kotlin.InlineStrategy {
         /*primary*/ private constructor AS_FUNCTION()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kotlin.InlineStrategy): kotlin.Int
@@ -846,6 +841,11 @@ public final enum class InlineStrategy : kotlin.Enum<kotlin.InlineStrategy> {
         }
     }
 
+    /*primary*/ private constructor InlineStrategy()
+    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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kotlin.InlineStrategy
     public final /*synthesized*/ fun values(): kotlin.Array<kotlin.InlineStrategy>

compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum1.txt

@@ -3,15 +3,6 @@ package
 internal fun box(): kotlin.String
 
 internal final enum class A : kotlin.Enum<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
-    internal final 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
-
     public enum entry ONE : A {
         private constructor ONE()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
@@ -56,6 +47,15 @@ internal final enum class A : kotlin.Enum<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
+    internal final 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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>

compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum2.txt

@@ -4,14 +4,6 @@ internal fun box(): kotlin.String
 internal fun A.invoke(/*0*/ i: kotlin.Int): kotlin.Int
 
 internal final enum class A : kotlin.Enum<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
-
     public enum entry ONE : A {
         private constructor ONE()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
@@ -52,6 +44,14 @@ internal final enum class A : kotlin.Enum<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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>

compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum1.txt

@@ -3,15 +3,6 @@ package
 internal fun box(): kotlin.String
 
 internal final enum class A : kotlin.Enum<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
-    internal final 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
-
     public enum entry ONE : A {
         private constructor ONE()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
@@ -56,6 +47,15 @@ internal final enum class A : kotlin.Enum<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
+    internal final 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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>

compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum2.txt

@@ -4,14 +4,6 @@ internal fun box(): kotlin.String
 internal fun A.invoke(/*0*/ i: kotlin.Int): kotlin.Int
 
 internal final enum class A : kotlin.Enum<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
-
     public enum entry ONE : A {
         private constructor ONE()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
@@ -52,6 +44,14 @@ internal final enum class A : kotlin.Enum<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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>

compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.txt

@@ -11,14 +11,6 @@ internal final annotation class AnnE : kotlin.Annotation {
 }
 
 internal final enum class MyEnum : kotlin.Enum<MyEnum> {
-    private constructor MyEnum()
-    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
-
     public enum entry A : MyEnum {
         private constructor A()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
@@ -39,6 +31,14 @@ internal final enum class MyEnum : kotlin.Enum<MyEnum> {
         }
     }
 
+    private constructor MyEnum()
+    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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>

compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt

@@ -185,14 +185,6 @@ package test {
     }
 
     internal final enum class MyEnum : kotlin.Enum<test.MyEnum> {
-        private constructor MyEnum()
-        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
-
         public enum entry A : test.MyEnum {
             private constructor A()
             public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.MyEnum): kotlin.Int
@@ -213,6 +205,14 @@ package test {
             }
         }
 
+        private constructor MyEnum()
+        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
+
         // Static members
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.MyEnum
         public final /*synthesized*/ fun values(): kotlin.Array<test.MyEnum>

compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt

@@ -117,14 +117,27 @@ package uninitialized_reassigned_variables {
     }
 
     internal final enum class ProtocolState : kotlin.Enum<uninitialized_reassigned_variables.ProtocolState> {
-        private constructor ProtocolState()
+        public enum entry WAITING : uninitialized_reassigned_variables.ProtocolState {
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: uninitialized_reassigned_variables.ProtocolState): kotlin.Int
+            private constructor WAITING()
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: uninitialized_reassigned_variables.ProtocolState): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        internal abstract fun signal(): uninitialized_reassigned_variables.ProtocolState
+            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+            internal open override /*1*/ fun signal(): uninitialized_reassigned_variables.ProtocolState
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+            public class object <class-object-for-WAITING> : uninitialized_reassigned_variables.ProtocolState.WAITING {
+                private constructor <class-object-for-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*/ /*fake_override*/ fun signal(): uninitialized_reassigned_variables.ProtocolState
+                public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+            }
+        }
 
         public enum entry TALKING : uninitialized_reassigned_variables.ProtocolState {
             private constructor TALKING()
@@ -148,27 +161,14 @@ package uninitialized_reassigned_variables {
             }
         }
 
-        public enum entry WAITING : uninitialized_reassigned_variables.ProtocolState {
+        private constructor 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 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 equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun hashCode(): 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 name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        internal abstract fun signal(): uninitialized_reassigned_variables.ProtocolState
-            internal open override /*1*/ fun signal(): uninitialized_reassigned_variables.ProtocolState
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-            public class object <class-object-for-WAITING> : uninitialized_reassigned_variables.ProtocolState.WAITING {
-                private constructor <class-object-for-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*/ /*fake_override*/ fun signal(): uninitialized_reassigned_variables.ProtocolState
-                public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-            }
-        }
 
         // Static members
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): uninitialized_reassigned_variables.ProtocolState

compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt

@@ -21,17 +21,8 @@ package kt1185 {
     }
 
     internal final enum class Color : kotlin.Enum<kt1185.Color> {
-        private constructor Color(/*0*/ rgb: kotlin.Int)
+        public enum entry RED : kt1185.Color {
-        internal final val rgb: kotlin.Int
+            private constructor RED()
-        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
-
-        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
@@ -40,8 +31,8 @@ package kt1185 {
             public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-            public class object <class-object-for-BLUE> : kt1185.Color.BLUE {
+            public class object <class-object-for-RED> : kt1185.Color.RED {
-                private constructor <class-object-for-BLUE>()
+                private constructor <class-object-for-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
@@ -74,8 +65,8 @@ package kt1185 {
             }
         }
 
-        public enum entry RED : kt1185.Color {
+        public enum entry BLUE : kt1185.Color {
-            private constructor RED()
+            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
@@ -84,8 +75,8 @@ package kt1185 {
             public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-            public class object <class-object-for-RED> : kt1185.Color.RED {
+            public class object <class-object-for-BLUE> : kt1185.Color.BLUE {
-                private constructor <class-object-for-RED>()
+                private constructor <class-object-for-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
@@ -96,40 +87,21 @@ package kt1185 {
             }
         }
 
-        // Static members
+        private constructor Color(/*0*/ rgb: kotlin.Int)
-        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt1185.Color
+        internal final val rgb: kotlin.Int
-        public final /*synthesized*/ fun values(): kotlin.Array<kt1185.Color>
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt1185.Color): kotlin.Int
-    }
-
-    internal final enum class Direction : kotlin.Enum<kt1185.Direction> {
-        private constructor Direction()
-        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
 
-        public enum entry EAST : kt1185.Direction {
+        // Static members
-            private constructor EAST()
+        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt1185.Color
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt1185.Direction): kotlin.Int
+        public final /*synthesized*/ fun values(): kotlin.Array<kt1185.Color>
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    }
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ 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 class object <class-object-for-EAST> : kt1185.Direction.EAST {
-                private constructor <class-object-for-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
-            }
-        }
 
+    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
@@ -190,6 +162,34 @@ package kt1185 {
             }
         }
 
+        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
+
+            public class object <class-object-for-EAST> : kt1185.Direction.EAST {
+                private constructor <class-object-for-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
+            }
+        }
+
+        private constructor Direction()
+        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
+
         // Static members
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt1185.Direction
         public final /*synthesized*/ fun values(): kotlin.Array<kt1185.Direction>

compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt

@@ -3,15 +3,6 @@ package
 package kt1193 {
 
     internal final enum class MyEnum : kotlin.Enum<kt1193.MyEnum> {
-        private constructor MyEnum(/*0*/ i: kotlin.Int)
-        internal final 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
-
         public enum entry A : kt1193.MyEnum {
             private constructor A()
             internal final override /*1*/ /*fake_override*/ val i: kotlin.Int
@@ -56,6 +47,15 @@ package kt1193 {
             }
         }
 
+        private constructor MyEnum(/*0*/ i: kotlin.Int)
+        internal final 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
+
         // Static members
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt1193.MyEnum
         public final /*synthesized*/ fun values(): kotlin.Array<kt1193.MyEnum>

compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.txt

@@ -15,14 +15,6 @@ internal final class Br : T {
 }
 
 internal open enum class EN : kotlin.Enum<EN> {
-    private constructor EN()
-    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
-
     public enum entry A : EN {
         private constructor A()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EN): kotlin.Int
@@ -43,6 +35,14 @@ internal open enum class EN : kotlin.Enum<EN> {
         }
     }
 
+    private constructor EN()
+    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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EN
     public final /*synthesized*/ fun values(): kotlin.Array<EN>

compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.txt

@@ -1,16 +1,6 @@
 package
 
 internal final enum class E : kotlin.Enum<E> {
-    private constructor E()
-    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 fun valueOf(/*0*/ s: kotlin.String): E
-    internal final fun values(): kotlin.Array<E>
-
     public enum entry A : E {
         private constructor A()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
@@ -35,6 +25,16 @@ internal final enum class E : kotlin.Enum<E> {
         }
     }
 
+    private constructor E()
+    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 fun valueOf(/*0*/ s: kotlin.String): E
+    internal final fun values(): kotlin.Array<E>
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>

compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.txt

@@ -1,18 +1,6 @@
 package
 
 internal final enum class A : kotlin.Enum<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
-    internal final fun valueOf(): kotlin.String
-    internal final fun valueOf(/*0*/ s: kotlin.String): A
-    internal final fun values(): kotlin.Array<A>
-    internal final fun values(/*0*/ x: kotlin.String): kotlin.String
-
     public enum entry A1 : A {
         private constructor A1()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
@@ -69,6 +57,18 @@ internal final enum class A : kotlin.Enum<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
+    internal final fun valueOf(): kotlin.String
+    internal final fun valueOf(/*0*/ s: kotlin.String): A
+    internal final fun values(): kotlin.Array<A>
+    internal final fun values(/*0*/ x: kotlin.String): kotlin.String
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>

compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.txt

@@ -1,15 +1,6 @@
 package
 
 internal final enum class E : kotlin.Enum<E>, T {
-    private constructor E()
-    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
-    public final override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-
     public enum entry ENTRY : E {
         private constructor ENTRY()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
@@ -32,6 +23,15 @@ internal final enum class E : kotlin.Enum<E>, T {
         }
     }
 
+    private constructor E()
+    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
+    public final override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>

compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt

@@ -3,22 +3,6 @@ package
 internal fun bar(): E
 
 internal final enum class E : kotlin.Enum<E> {
-    private constructor E()
-    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 class object <class-object-for-E> {
-        private constructor <class-object-for-E>()
-        internal final fun entry(): E
-        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 ENTRY : E {
         private constructor ENTRY()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
@@ -39,6 +23,22 @@ internal final enum class E : kotlin.Enum<E> {
         }
     }
 
+    private constructor E()
+    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 class object <class-object-for-E> {
+        private constructor <class-object-for-E>()
+        internal final fun entry(): E
+        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
+    }
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>

compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt

@@ -6,21 +6,6 @@ internal fun foo(): kotlin.Array<E>
 internal fun quux(): E.<class-object-for-E>
 
 internal final enum class E : kotlin.Enum<E> {
-    private constructor E()
-    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
-
-    private class object <class-object-for-E> {
-        private constructor <class-object-for-E>()
-        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 ENTRY : E {
         private constructor ENTRY()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
@@ -41,6 +26,21 @@ internal final enum class E : kotlin.Enum<E> {
         }
     }
 
+    private constructor E()
+    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
+
+    private class object <class-object-for-E> {
+        private constructor <class-object-for-E>()
+        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
+    }
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>

compiler/testData/diagnostics/tests/enum/commonSupertype.txt

@@ -3,14 +3,6 @@ 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> {
-    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
-
     public enum entry A : A {
         private constructor A()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
@@ -31,20 +23,20 @@ internal final enum class A : kotlin.Enum<A> {
         }
     }
 
-    // Static members
+    private constructor A()
-    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-    public final /*synthesized*/ fun values(): kotlin.Array<A>
-}
-
-internal final enum class B : kotlin.Enum<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
 
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
+    public final /*synthesized*/ fun values(): kotlin.Array<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
@@ -65,6 +57,14 @@ internal final enum class B : kotlin.Enum<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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): B
     public final /*synthesized*/ fun values(): kotlin.Array<B>

compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.txt

@@ -8,14 +8,6 @@ internal fun f4(): kotlin.Unit
 internal fun f5(): [ERROR : Error function type]
 
 internal final enum class E : kotlin.Enum<E> {
-    private constructor E()
-    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 enum entry FIRST : E {
         private constructor FIRST()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
@@ -63,6 +55,14 @@ internal final enum class E : kotlin.Enum<E> {
         }
     }
 
+    private constructor E()
+    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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>

compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.txt

@@ -3,14 +3,6 @@ package
 internal fun foo(): kotlin.Unit
 
 internal final enum class E : kotlin.Enum<E> {
-    private constructor E()
-    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 enum entry E1 : E {
         private constructor E1()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
@@ -51,6 +43,14 @@ internal final enum class E : kotlin.Enum<E> {
         }
     }
 
+    private constructor E()
+    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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>

compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt

@@ -3,14 +3,6 @@ package
 internal fun f(): [ERROR : Error function type]
 
 internal final enum class E : kotlin.Enum<E> {
-    private constructor E()
-    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 enum entry FIRST : E {
         private constructor FIRST()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
@@ -51,6 +43,14 @@ internal final enum class E : kotlin.Enum<E> {
         }
     }
 
+    private constructor E()
+    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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>

compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.txt

@@ -1,16 +1,6 @@
 package
 
 internal final enum class EnumClass : kotlin.Enum<EnumClass> {
-    private constructor EnumClass()
-    internal abstract 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 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
-
     public enum entry E1 : EnumClass {
         private constructor E1()
         internal open override /*1*/ val bar: kotlin.String = "a"
@@ -59,6 +49,16 @@ internal final enum class EnumClass : kotlin.Enum<EnumClass> {
         }
     }
 
+    private constructor EnumClass()
+    internal abstract 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 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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumClass
     public final /*synthesized*/ fun values(): kotlin.Array<EnumClass>

compiler/testData/diagnostics/tests/enum/enumImplementingTrait.txt

@@ -1,15 +1,6 @@
 package
 
 internal final enum class EnumImplementingTraitWithFun : kotlin.Enum<EnumImplementingTraitWithFun>, T1 {
-    private constructor EnumImplementingTraitWithFun()
-    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
-    public final override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-
     public enum entry E1 : EnumImplementingTraitWithFun {
         private constructor E1()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: EnumImplementingTraitWithFun): kotlin.Int
@@ -54,21 +45,21 @@ internal final enum class EnumImplementingTraitWithFun : kotlin.Enum<EnumImpleme
         }
     }
 
+    private constructor EnumImplementingTraitWithFun()
+    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
+    public final override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumImplementingTraitWithFun
     public final /*synthesized*/ fun values(): kotlin.Array<EnumImplementingTraitWithFun>
 }
 
 internal final enum class EnumImplementingTraitWithVal : kotlin.Enum<EnumImplementingTraitWithVal>, T2 {
-    private constructor EnumImplementingTraitWithVal()
-    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 /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-
     public enum entry E1 : EnumImplementingTraitWithVal {
         private constructor E1()
         internal open override /*1*/ val bar: kotlin.Int = 1
@@ -113,6 +104,15 @@ internal final enum class EnumImplementingTraitWithVal : kotlin.Enum<EnumImpleme
         }
     }
 
+    private constructor EnumImplementingTraitWithVal()
+    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 /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumImplementingTraitWithVal
     public final /*synthesized*/ fun values(): kotlin.Array<EnumImplementingTraitWithVal>

compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.txt

@@ -5,14 +5,6 @@ internal val b: kotlin.Enum<java.lang.annotation.RetentionPolicy>
 internal val c: kotlin.Enum<kotlin.InlineOption>
 
 internal final enum class E : kotlin.Enum<E> {
-    private constructor E()
-    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 enum entry ENTRY : E {
         private constructor ENTRY()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
@@ -33,6 +25,14 @@ internal final enum class E : kotlin.Enum<E> {
         }
     }
 
+    private constructor E()
+    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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>

compiler/testData/diagnostics/tests/enum/enumStarImport.txt

@@ -5,14 +5,6 @@ internal fun f(/*0*/ e: enum.HappyEnum): kotlin.Unit
 package enum {
 
     internal final enum class HappyEnum : kotlin.Enum<enum.HappyEnum> {
-        private constructor HappyEnum()
-        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
-
         public enum entry CASE1 : enum.HappyEnum {
             private constructor CASE1()
             public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: enum.HappyEnum): kotlin.Int
@@ -53,6 +45,14 @@ package enum {
             }
         }
 
+        private constructor HappyEnum()
+        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
+
         // Static members
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): enum.HappyEnum
         public final /*synthesized*/ fun values(): kotlin.Array<enum.HappyEnum>

compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.txt

@@ -5,14 +5,6 @@ internal val kotlin.Int.entry: kotlin.Int
 internal val kotlin.Long.entry: kotlin.Int
 
 internal final enum class E : kotlin.Enum<E> {
-    private constructor E()
-    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 enum entry entry : E {
         private constructor entry()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
@@ -33,6 +25,14 @@ internal final enum class E : kotlin.Enum<E> {
         }
     }
 
+    private constructor E()
+    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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>

compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.txt

@@ -11,14 +11,6 @@ internal final class A : E.ENTRY {
 }
 
 internal final enum class E : kotlin.Enum<E> {
-    private constructor E()
-    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 enum entry ENTRY : E {
         private constructor ENTRY()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
@@ -39,6 +31,14 @@ internal final enum class E : kotlin.Enum<E> {
         }
     }
 
+    private constructor E()
+    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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>

compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.txt

@@ -21,14 +21,6 @@ internal final class MyClass2 : MyJavaEnum {
 }
 
 internal open enum class MyEnum : kotlin.Enum<MyEnum> {
-    private constructor MyEnum()
-    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
-
     public enum entry A : MyEnum {
         private constructor A()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
@@ -49,6 +41,14 @@ internal open enum class MyEnum : kotlin.Enum<MyEnum> {
         }
     }
 
+    private constructor MyEnum()
+    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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
     public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>

compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt

@@ -14,14 +14,6 @@ internal final class A {
     }
 
     internal final enum class E : kotlin.Enum<A.E> {
-        private constructor E()
-        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
-
         public enum entry ENTRY : A.E {
             private constructor ENTRY()
             public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
@@ -42,6 +34,14 @@ internal final class A {
             }
         }
 
+        private constructor E()
+        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
+
         // Static members
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
         public final /*synthesized*/ fun values(): kotlin.Array<A.E>
@@ -62,14 +62,6 @@ internal final class B {
     }
 
     internal final enum class E : kotlin.Enum<B.E> {
-        private constructor E()
-        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
-
         public enum entry ENTRY : B.E {
             private constructor ENTRY()
             public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: B.E): kotlin.Int
@@ -90,6 +82,14 @@ internal final class B {
             }
         }
 
+        private constructor E()
+        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
+
         // Static members
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): B.E
         public final /*synthesized*/ fun values(): kotlin.Array<B.E>

compiler/testData/diagnostics/tests/enum/inner/insideClass.txt

@@ -7,14 +7,6 @@ internal final class A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     internal final enum class E : kotlin.Enum<A.E> {
-        private constructor E()
-        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
-
         public enum entry ENTRY : A.E {
             private constructor ENTRY()
             public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
@@ -35,6 +27,14 @@ internal final class A {
             }
         }
 
+        private constructor E()
+        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
+
         // Static members
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
         public final /*synthesized*/ fun values(): kotlin.Array<A.E>

compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt

@@ -13,14 +13,6 @@ internal final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         internal final enum class E : kotlin.Enum<A.E> {
-            private constructor E()
-            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
-
             public enum entry ENTRY : A.E {
                 private constructor ENTRY()
                 public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
@@ -41,6 +33,14 @@ internal final class A {
                 }
             }
 
+            private constructor E()
+            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
+
             // Static members
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
             public final /*synthesized*/ fun values(): kotlin.Array<A.E>

compiler/testData/diagnostics/tests/enum/inner/insideEnum.txt

@@ -1,14 +1,6 @@
 package
 
 internal final enum class E : kotlin.Enum<E> {
-    private constructor E()
-    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 enum entry ABC : E {
         private constructor ABC()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
@@ -29,15 +21,15 @@ internal final enum class E : kotlin.Enum<E> {
         }
     }
 
-    internal final enum class F : kotlin.Enum<E.F> {
+    private constructor E()
-        private constructor F()
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        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 equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final override /*1*/ /*fake_override*/ fun hashCode(): 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 name(): kotlin.String
+    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        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
@@ -58,6 +50,14 @@ internal final enum class E : kotlin.Enum<E> {
             }
         }
 
+        private constructor F()
+        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
+
         // Static members
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E.F
         public final /*synthesized*/ fun values(): kotlin.Array<E.F>

compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.txt

@@ -1,14 +1,6 @@
 package
 
 internal final enum class E : kotlin.Enum<E> {
-    private constructor E()
-    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 enum entry ABC : E {
         private constructor ABC()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
@@ -29,14 +21,6 @@ internal final enum class E : kotlin.Enum<E> {
         }
 
         internal final enum class F : kotlin.Enum<E.ABC.F> {
-            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
-
             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
@@ -57,12 +41,28 @@ internal final enum class E : kotlin.Enum<E> {
                 }
             }
 
+            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>
         }
     }
 
+    private constructor E()
+    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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>

compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.txt

@@ -13,14 +13,6 @@ internal final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         internal final enum class E : kotlin.Enum<A.B.E> {
-            private constructor E()
-            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
-
             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
@@ -41,6 +33,14 @@ internal final class A {
                 }
             }
 
+            private constructor E()
+            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
+
             // Static members
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.B.E
             public final /*synthesized*/ fun values(): kotlin.Array<A.B.E>

compiler/testData/diagnostics/tests/enum/inner/insideObject.txt

@@ -14,14 +14,6 @@ internal object A {
     }
 
     internal final enum class E : kotlin.Enum<A.E> {
-        private constructor E()
-        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
-
         public enum entry ENTRY : A.E {
             private constructor ENTRY()
             public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
@@ -42,6 +34,14 @@ internal object A {
             }
         }
 
+        private constructor E()
+        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
+
         // Static members
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
         public final /*synthesized*/ fun values(): kotlin.Array<A.E>

compiler/testData/diagnostics/tests/enum/inner/insideTrait.txt

@@ -6,14 +6,6 @@ internal trait A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     internal final enum class E : kotlin.Enum<A.E> {
-        private constructor E()
-        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
-
         public enum entry ENTRY : A.E {
             private constructor ENTRY()
             public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
@@ -34,6 +26,14 @@ internal trait A {
             }
         }
 
+        private constructor E()
+        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
+
         // Static members
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
         public final /*synthesized*/ fun values(): kotlin.Array<A.E>

compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt

@@ -13,14 +13,6 @@ internal final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         internal final enum class E : kotlin.Enum<A.E> {
-            private constructor E()
-            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
-
             public enum entry ENTRY2 : A.E {
                 private constructor ENTRY2()
                 public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
@@ -41,6 +33,14 @@ internal final class A {
                 }
             }
 
+            private constructor E()
+            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
+
             // Static members
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
             public final /*synthesized*/ fun values(): kotlin.Array<A.E>
@@ -48,14 +48,6 @@ internal final class A {
     }
 
     internal final enum class E : kotlin.Enum<A.E> {
-        private constructor E()
-        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
-
         public enum entry ENTRY : A.E {
             private constructor ENTRY()
             public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
@@ -76,6 +68,14 @@ internal final class A {
             }
         }
 
+        private constructor E()
+        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
+
         // Static members
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
         public final /*synthesized*/ fun values(): kotlin.Array<A.E>

compiler/testData/diagnostics/tests/enum/inner/twoEnums.txt

@@ -7,14 +7,6 @@ internal final class A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     internal final enum class E : kotlin.Enum<A.E> {
-        private constructor E()
-        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
-
         public enum entry ABC : A.E {
             private constructor ABC()
             public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
@@ -35,20 +27,20 @@ internal final class A {
             }
         }
 
-        // Static members
+        private constructor E()
-        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
-        public final /*synthesized*/ fun values(): kotlin.Array<A.E>
-    }
-
-    internal final enum class F : kotlin.Enum<A.F> {
-        private constructor F()
-        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
 
+        // Static members
+        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
+        public final /*synthesized*/ fun values(): kotlin.Array<A.E>
+    }
+
+    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
@@ -69,6 +61,14 @@ internal final class A {
             }
         }
 
+        private constructor F()
+        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
+
         // Static members
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.F
         public final /*synthesized*/ fun values(): kotlin.Array<A.F>

compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt

@@ -13,14 +13,6 @@ internal final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         internal final enum class E : kotlin.Enum<A.E> {
-            private constructor E()
-            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
-
             public enum entry ENTRY : A.E {
                 private constructor ENTRY()
                 public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
@@ -41,6 +33,14 @@ internal final class A {
                 }
             }
 
+            private constructor E()
+            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
+
             // Static members
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
             public final /*synthesized*/ fun values(): kotlin.Array<A.E>
@@ -54,14 +54,6 @@ internal final class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         internal final enum class E : kotlin.Enum<A.B.E> {
-            private constructor E()
-            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
-
             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
@@ -82,6 +74,14 @@ internal final class A {
                 }
             }
 
+            private constructor E()
+            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
+
             // Static members
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.B.E
             public final /*synthesized*/ fun values(): kotlin.Array<A.B.E>

compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.txt

@@ -3,14 +3,6 @@ package
 internal fun main(): kotlin.Unit
 
 public final enum class A : kotlin.Enum<A!> {
-    public 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
-
     public enum entry ENTRY : A {
         private constructor ENTRY()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
@@ -31,6 +23,14 @@ public final enum class A : kotlin.Enum<A!> {
         }
     }
 
+    public 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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>

compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.txt

@@ -3,13 +3,25 @@ package
 internal fun main(): kotlin.Unit
 
 public final enum class A : kotlin.Enum<A!> {
-    public constructor A()
+    public enum entry ENTRY : A {
-    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
+        private constructor ENTRY()
-    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public class object <class-object-for-ENTRY> : A.ENTRY {
+            private constructor <class-object-for-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
+        }
+    }
 
     public enum entry ANOTHER : A {
         private constructor ANOTHER()
@@ -31,25 +43,13 @@ public final enum class A : kotlin.Enum<A!> {
         }
     }
 
-    public enum entry ENTRY : A {
+    public constructor A()
-        private constructor ENTRY()
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): 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 equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final override /*1*/ /*fake_override*/ fun hashCode(): 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 name(): kotlin.String
+    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-        public class object <class-object-for-ENTRY> : A.ENTRY {
-            private constructor <class-object-for-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
-        }
-    }
 
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A

compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.txt

@@ -3,15 +3,6 @@ package
 internal fun main(): kotlin.Unit
 
 public abstract enum class A : kotlin.Enum<A!> {
-    public 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 abstract fun s(): kotlin.String!
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
     public enum entry ENTRY : A {
         private constructor ENTRY()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
@@ -34,6 +25,15 @@ public abstract enum class A : kotlin.Enum<A!> {
         }
     }
 
+    public 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 abstract fun s(): kotlin.String!
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
     public final /*synthesized*/ fun values(): kotlin.Array<A>

compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.txt

@@ -3,14 +3,27 @@ package
 internal fun main(): kotlin.Unit
 
 public final enum class A : kotlin.Enum<A!> {
-    public constructor A()
+    public enum entry ENTRY : A {
-    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
+        private constructor ENTRY()
-    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-    public open fun s(): kotlin.String!
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        public open override /*1*/ /*fake_override*/ fun s(): kotlin.String!
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public class object <class-object-for-ENTRY> : A.ENTRY {
+            private constructor <class-object-for-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
+        }
+    }
 
     public enum entry ANOTHER : A {
         private constructor ANOTHER()
@@ -34,27 +47,14 @@ public final enum class A : kotlin.Enum<A!> {
         }
     }
 
-    public enum entry ENTRY : A {
+    public constructor A()
-        private constructor ENTRY()
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): 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 equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final override /*1*/ /*fake_override*/ fun hashCode(): 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 name(): kotlin.String
+    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+    public open fun s(): kotlin.String!
-        public open override /*1*/ /*fake_override*/ fun s(): kotlin.String!
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-        public class object <class-object-for-ENTRY> : A.ENTRY {
-            private constructor <class-object-for-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
-        }
-    }
 
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A

compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.txt

@@ -3,14 +3,27 @@ package
 internal fun main(): kotlin.Unit
 
 public final enum class A : kotlin.Enum<A!> {
-    public constructor A()
+    public enum entry ENTRY : A {
-    public final var ENTRY: kotlin.String!
+        private constructor ENTRY()
-    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
+        public final override /*1*/ /*fake_override*/ var ENTRY: kotlin.String!
-    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public class object <class-object-for-ENTRY> : A.ENTRY {
+            private constructor <class-object-for-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
+        }
+    }
 
     public enum entry ANOTHER : A {
         private constructor ANOTHER()
@@ -34,27 +47,14 @@ public final enum class A : kotlin.Enum<A!> {
         }
     }
 
-    public enum entry ENTRY : A {
+    public constructor A()
-        private constructor ENTRY()
+    public final var ENTRY: kotlin.String!
-        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 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 equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final override /*1*/ /*fake_override*/ fun hashCode(): 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 name(): kotlin.String
+    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-        public class object <class-object-for-ENTRY> : A.ENTRY {
-            private constructor <class-object-for-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
-        }
-    }
 
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A

compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.txt

@@ -3,14 +3,27 @@ package
 internal fun main(): kotlin.Unit
 
 public final enum class A : kotlin.Enum<A!> {
-    private constructor A(/*0*/ s: kotlin.String!)
+    public enum entry ENTRY : A {
-    public final var s: kotlin.String!
+        private constructor ENTRY()
-    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
+        public final override /*1*/ /*fake_override*/ var s: kotlin.String!
-    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A!): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public class object <class-object-for-ENTRY> : A.ENTRY {
+            private constructor <class-object-for-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
+        }
+    }
 
     public enum entry ANOTHER : A {
         private constructor ANOTHER()
@@ -34,27 +47,14 @@ public final enum class A : kotlin.Enum<A!> {
         }
     }
 
-    public enum entry ENTRY : A {
+    private constructor A(/*0*/ s: kotlin.String!)
-        private constructor ENTRY()
+    public final var s: kotlin.String!
-        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 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 equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final override /*1*/ /*fake_override*/ fun hashCode(): 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 name(): kotlin.String
+    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-        public class object <class-object-for-ENTRY> : A.ENTRY {
-            private constructor <class-object-for-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
-        }
-    }
 
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A

compiler/testData/diagnostics/tests/enum/kt2834.txt

@@ -3,14 +3,6 @@ package
 internal fun MethodKind.hasThis(): kotlin.Boolean
 
 private final enum class MethodKind : kotlin.Enum<MethodKind> {
-    private constructor MethodKind()
-    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
-
     public enum entry INSTANCE : MethodKind {
         private constructor INSTANCE()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MethodKind): kotlin.Int
@@ -51,6 +43,14 @@ private final enum class MethodKind : kotlin.Enum<MethodKind> {
         }
     }
 
+    private constructor MethodKind()
+    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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MethodKind
     public final /*synthesized*/ fun values(): kotlin.Array<MethodKind>

compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt

@@ -1,13 +1,107 @@
 package
 
 internal final enum class E : kotlin.Enum<E> {
-    private constructor E()
+    public enum entry SUBCLASS : E {
-    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+        private constructor SUBCLASS()
-    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        internal final fun foo(): kotlin.Unit
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        public final override /*1*/ /*fake_override*/ 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 class object <class-object-for-SUBCLASS> : E.SUBCLASS {
+            private constructor <class-object-for-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 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
+        }
+    }
+
+    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
+
+        public class object <class-object-for-PUBLIC> : E.PUBLIC {
+            private constructor <class-object-for-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
+        }
+    }
+
+    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
+
+        public class object <class-object-for-PROTECTED> : E.PROTECTED {
+            private constructor <class-object-for-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
+        }
+    }
+
+    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
+
+        public class object <class-object-for-PRIVATE> : E.PRIVATE {
+            private constructor <class-object-for-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
+        }
+    }
+
+    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
+
+        public class object <class-object-for-INTERNAL> : E.INTERNAL {
+            private constructor <class-object-for-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
+        }
+    }
 
     public abstract enum entry ABSTRACT : E {
         private constructor ABSTRACT()
@@ -29,6 +123,86 @@ internal final enum class E : kotlin.Enum<E> {
         }
     }
 
+    public open 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
+
+        public class object <class-object-for-OPEN> : E.OPEN {
+            private constructor <class-object-for-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
+        }
+    }
+
+    public open 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
+
+        public class object <class-object-for-OVERRIDE> : E.OVERRIDE {
+            private constructor <class-object-for-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
+        }
+    }
+
+    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
+
+        public class object <class-object-for-FINAL> : E.FINAL {
+            private constructor <class-object-for-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
+        }
+    }
+
+    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
+
+        public class object <class-object-for-INNER> : E.INNER {
+            private constructor <class-object-for-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
+        }
+    }
+
     public enum entry ANNOTATION : E {
         private constructor ANNOTATION()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
@@ -69,8 +243,8 @@ internal final enum class E : kotlin.Enum<E> {
         }
     }
 
-    public enum entry FINAL : E {
+    public enum entry OUT : E {
-        private constructor FINAL()
+        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
@@ -78,8 +252,8 @@ internal final enum class E : kotlin.Enum<E> {
         public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        public class object <class-object-for-FINAL> : E.FINAL {
+        public class object <class-object-for-OUT> : E.OUT {
-            private constructor <class-object-for-FINAL>()
+            private constructor <class-object-for-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
@@ -109,8 +283,8 @@ internal final enum class E : kotlin.Enum<E> {
         }
     }
 
-    public enum entry INNER : E {
+    public enum entry VARARG : E {
-        private constructor INNER()
+        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
@@ -118,148 +292,8 @@ internal final enum class E : kotlin.Enum<E> {
         public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        public class object <class-object-for-INNER> : E.INNER {
+        public class object <class-object-for-VARARG> : E.VARARG {
-            private constructor <class-object-for-INNER>()
+            private constructor <class-object-for-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
-        }
-    }
-
-    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
-
-        public class object <class-object-for-INTERNAL> : E.INTERNAL {
-            private constructor <class-object-for-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
-        }
-    }
-
-    public open 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
-
-        public class object <class-object-for-OPEN> : E.OPEN {
-            private constructor <class-object-for-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
-        }
-    }
-
-    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
-
-        public class object <class-object-for-OUT> : E.OUT {
-            private constructor <class-object-for-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
-        }
-    }
-
-    public open 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
-
-        public class object <class-object-for-OVERRIDE> : E.OVERRIDE {
-            private constructor <class-object-for-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
-        }
-    }
-
-    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
-
-        public class object <class-object-for-PRIVATE> : E.PRIVATE {
-            private constructor <class-object-for-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
-        }
-    }
-
-    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
-
-        public class object <class-object-for-PROTECTED> : E.PROTECTED {
-            private constructor <class-object-for-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
-        }
-    }
-
-    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
-
-        public class object <class-object-for-PUBLIC> : E.PUBLIC {
-            private constructor <class-object-for-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
@@ -289,47 +323,13 @@ internal final enum class E : kotlin.Enum<E> {
         }
     }
 
-    public enum entry SUBCLASS : E {
+    private constructor E()
-        private constructor SUBCLASS()
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
-        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 equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        internal final fun foo(): kotlin.Unit
+    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-        public class object <class-object-for-SUBCLASS> : E.SUBCLASS {
-            private constructor <class-object-for-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 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
-        }
-    }
-
-    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
-
-        public class object <class-object-for-VARARG> : E.VARARG {
-            private constructor <class-object-for-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
-        }
-    }
 
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E

compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt

@@ -1,18 +1,6 @@
 package
 
 internal final enum class EnumWithOpenMembers : kotlin.Enum<EnumWithOpenMembers> {
-    private constructor EnumWithOpenMembers()
-    internal final val b: kotlin.Int = 3
-    internal open 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 final fun f(): kotlin.Int
-    internal open 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
-
     public enum entry E1 : EnumWithOpenMembers {
         private constructor E1()
         internal final override /*1*/ /*fake_override*/ val b: kotlin.Int
@@ -69,6 +57,18 @@ internal final enum class EnumWithOpenMembers : kotlin.Enum<EnumWithOpenMembers>
         }
     }
 
+    private constructor EnumWithOpenMembers()
+    internal final val b: kotlin.Int = 3
+    internal open 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 final fun f(): kotlin.Int
+    internal open 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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumWithOpenMembers
     public final /*synthesized*/ fun values(): kotlin.Array<EnumWithOpenMembers>

compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.txt

@@ -1,14 +1,6 @@
 package
 
 internal final enum class E : kotlin.Enum<E> {
-    private constructor E()
-    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
-    public open override /*1*/ fun name(): kotlin.String
-    public open override /*1*/ fun ordinal(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
     public enum entry ENTRY : E {
         private constructor ENTRY()
         public open override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
@@ -29,6 +21,14 @@ internal final enum class E : kotlin.Enum<E> {
         }
     }
 
+    private constructor E()
+    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
+    public open override /*1*/ fun name(): kotlin.String
+    public open override /*1*/ 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
     public final /*synthesized*/ fun values(): kotlin.Array<E>

compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt

@@ -11,13 +11,25 @@ package bar {
 package foo {
 
     internal final enum class E : kotlin.Enum<foo.E> {
-        private constructor E()
+        public enum entry ENTRY : foo.E {
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: foo.E): kotlin.Int
+            private constructor ENTRY()
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: foo.E): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+            public class object <class-object-for-ENTRY> : foo.E.ENTRY {
+                private constructor <class-object-for-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
+            }
+        }
 
         public enum entry ANOTHER : foo.E {
             private constructor ANOTHER()
@@ -39,25 +51,13 @@ package foo {
             }
         }
 
-        public enum entry ENTRY : foo.E {
+        private constructor 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 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 equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun hashCode(): 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 name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-            public class object <class-object-for-ENTRY> : foo.E.ENTRY {
-                private constructor <class-object-for-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
-            }
-        }
 
         internal final class Nested {
             public constructor Nested()

compiler/testData/diagnostics/tests/enum/typeParametersInEnum.txt

@@ -3,14 +3,6 @@ package
 package bug {
 
     public final enum class Foo</*0*/ T> : kotlin.Enum<bug.Foo<T>> {
-        private constructor Foo</*0*/ T>()
-        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
-        public final override /*1*/ /*fake_override*/ 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 enum entry A : bug.Foo<kotlin.String> {
             private constructor A()
             public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: bug.Foo<kotlin.String>): kotlin.Int
@@ -31,6 +23,14 @@ package bug {
             }
         }
 
+        private constructor Foo</*0*/ T>()
+        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
+        public final override /*1*/ /*fake_override*/ 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): bug.Foo<T>
         public final /*synthesized*/ fun values(): kotlin.Array<bug.Foo<T>>

compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt

@@ -5,28 +5,6 @@ internal fun baz(): E
 internal fun foo(): E
 
 internal final enum class E : kotlin.Enum<E> {
-    private constructor E()
-    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 fun oof(): E
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    internal final fun rab(): kotlin.Array<E>
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    internal final fun zab(): E
-
-    internal class object <class-object-for-E> {
-        private constructor <class-object-for-E>()
-        internal final val valuez: kotlin.Array<E>
-        internal final fun bar(): kotlin.Array<E>
-        internal final fun baz(): E
-        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal final fun foo(): E
-        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
     public enum entry ENTRY : E {
         private constructor ENTRY()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
@@ -53,6 +31,28 @@ internal final enum class E : kotlin.Enum<E> {
         }
     }
 
+    private constructor E()
+    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 fun oof(): E
+    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+    internal final fun rab(): kotlin.Array<E>
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    internal final fun zab(): E
+
+    internal class object <class-object-for-E> {
+        private constructor <class-object-for-E>()
+        internal final val valuez: kotlin.Array<E>
+        internal final fun bar(): kotlin.Array<E>
+        internal final fun baz(): E
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        internal final fun foo(): E
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>

compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.txt

@@ -3,14 +3,6 @@ package
 internal fun foo(): kotlin.Unit
 
 internal final enum class E : kotlin.Enum<E> {
-    private constructor E()
-    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 enum entry A : E {
         private constructor A()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
@@ -71,6 +63,14 @@ internal final enum class E : kotlin.Enum<E> {
         }
     }
 
+    private constructor E()
+    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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>

compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt

@@ -9,14 +9,6 @@ package a {
     internal fun kotlin.Iterable<kotlin.Int>.someSimpleWithFun(): kotlin.Unit
 
     internal final enum class SomeEnum : kotlin.Enum<a.SomeEnum> {
-        private constructor SomeEnum()
-        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
-
         public enum entry FIRST : a.SomeEnum {
             private constructor FIRST()
             public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: a.SomeEnum): kotlin.Int
@@ -57,6 +49,14 @@ package a {
             }
         }
 
+        private constructor SomeEnum()
+        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
+
         // Static members
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): a.SomeEnum
         public final /*synthesized*/ fun values(): kotlin.Array<a.SomeEnum>

compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt

@@ -6,14 +6,6 @@ package a {
     internal fun use(/*0*/ vararg a: kotlin.Any? /*kotlin.Array<kotlin.Any?>*/): kotlin.Array<kotlin.Any?>
 
     internal final enum class TestEnum : kotlin.Enum<a.TestEnum> {
-        private constructor TestEnum()
-        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
-
         public enum entry FIRST : a.TestEnum {
             private constructor FIRST()
             public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: a.TestEnum): kotlin.Int
@@ -54,6 +46,14 @@ package a {
             }
         }
 
+        private constructor TestEnum()
+        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
+
         // Static members
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): a.TestEnum
         public final /*synthesized*/ fun values(): kotlin.Array<a.TestEnum>

compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.txt

@@ -28,13 +28,25 @@ internal final class Internal {
 }
 
 internal final enum class Kind : kotlin.Enum<Kind> {
-    private constructor Kind()
+    public enum entry LOCAL : Kind {
-    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Kind): kotlin.Int
+        private constructor LOCAL()
-    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Kind): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public class object <class-object-for-LOCAL> : Kind.LOCAL {
+            private constructor <class-object-for-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
+        }
+    }
 
     public enum entry EXT_RETURN : Kind {
         private constructor EXT_RETURN()
@@ -76,25 +88,13 @@ internal final enum class Kind : kotlin.Enum<Kind> {
         }
     }
 
-    public enum entry LOCAL : Kind {
+    private constructor Kind()
-        private constructor LOCAL()
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Kind): kotlin.Int
-        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 equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final override /*1*/ /*fake_override*/ fun hashCode(): 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 name(): kotlin.String
+    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-        public class object <class-object-for-LOCAL> : Kind.LOCAL {
-            private constructor <class-object-for-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
-        }
-    }
 
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Kind

compiler/testData/diagnostics/tests/inner/enumEntries.txt

@@ -1,16 +1,6 @@
 package
 
 internal final enum class E : kotlin.Enum<E> {
-    private constructor E()
-    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
-    public final override /*1*/ /*fake_override*/ 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 fun outerFun(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
     public enum entry E1 : E {
         private constructor E1()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
@@ -59,6 +49,16 @@ internal final enum class E : kotlin.Enum<E> {
         }
     }
 
+    private constructor E()
+    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
+    public final override /*1*/ /*fake_override*/ 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 fun outerFun(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>

compiler/testData/diagnostics/tests/inner/illegalModifier.txt

@@ -94,14 +94,6 @@ internal final class D {
 }
 
 internal final enum class H : kotlin.Enum<H> {
-    private constructor H()
-    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
-
     public enum entry I : H {
         private constructor I()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: H): kotlin.Int
@@ -129,6 +121,14 @@ internal final enum class H : kotlin.Enum<H> {
         }
     }
 
+    private constructor H()
+    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 J {
         public constructor J()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean

compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt

@@ -30,14 +30,6 @@ internal object Obj {
     }
 
     internal final enum class NestedEnum : kotlin.Enum<Obj.NestedEnum> {
-        private constructor NestedEnum()
-        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
-
         public enum entry A : Obj.NestedEnum {
             private constructor A()
             public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Obj.NestedEnum): kotlin.Int
@@ -58,6 +50,14 @@ internal object Obj {
             }
         }
 
+        private constructor NestedEnum()
+        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
+
         // Static members
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Obj.NestedEnum
         public final /*synthesized*/ fun values(): kotlin.Array<Obj.NestedEnum>
@@ -118,14 +118,6 @@ internal final class WithClassObject {
     }
 
     internal final enum class NestedEnum : kotlin.Enum<WithClassObject.NestedEnum> {
-        private constructor NestedEnum()
-        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
-
         public enum entry A : WithClassObject.NestedEnum {
             private constructor A()
             public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: WithClassObject.NestedEnum): kotlin.Int
@@ -146,6 +138,14 @@ internal final class WithClassObject {
             }
         }
 
+        private constructor NestedEnum()
+        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
+
         // Static members
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): WithClassObject.NestedEnum
         public final /*synthesized*/ fun values(): kotlin.Array<WithClassObject.NestedEnum>
@@ -199,14 +199,6 @@ internal final class WithoutClassObject {
     }
 
     internal final enum class NestedEnum : kotlin.Enum<WithoutClassObject.NestedEnum> {
-        private constructor NestedEnum()
-        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
-
         public enum entry A : WithoutClassObject.NestedEnum {
             private constructor A()
             public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: WithoutClassObject.NestedEnum): kotlin.Int
@@ -227,6 +219,14 @@ internal final class WithoutClassObject {
             }
         }
 
+        private constructor NestedEnum()
+        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
+
         // Static members
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): WithoutClassObject.NestedEnum
         public final /*synthesized*/ fun values(): kotlin.Array<WithoutClassObject.NestedEnum>

compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.txt

@@ -25,14 +25,6 @@ internal final class A {
 }
 
 internal final enum class E : kotlin.Enum<E> {
-    private constructor E()
-    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 enum entry E1 : E {
         private constructor E1()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
@@ -60,6 +52,14 @@ internal final enum class E : kotlin.Enum<E> {
         }
     }
 
+    private constructor E()
+    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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>

compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.txt

@@ -4,14 +4,6 @@ internal fun bar(): E
 internal fun foo(): E
 
 internal final enum class E : kotlin.Enum<E> {
-    private constructor E()
-    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 enum entry E1 : E {
         private constructor E1()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
@@ -52,6 +44,14 @@ internal final enum class E : kotlin.Enum<E> {
         }
     }
 
+    private constructor E()
+    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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>

compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.txt

@@ -10,14 +10,6 @@ internal final class A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     internal final enum class E : kotlin.Enum<A.E> {
-        private constructor E()
-        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
-
         public enum entry E1 : A.E {
             private constructor E1()
             public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.E): kotlin.Int
@@ -58,6 +50,14 @@ internal final class A {
             }
         }
 
+        private constructor E()
+        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
+
         // Static members
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.E
         public final /*synthesized*/ fun values(): kotlin.Array<A.E>

compiler/testData/diagnostics/tests/j+k/kt2619.txt

@@ -3,13 +3,25 @@ package
 internal fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
 
 public final enum class Type : kotlin.Enum<Type!> {
-    public constructor Type()
+    public enum entry TYPE : Type {
-    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Type!): kotlin.Int
+        private constructor TYPE()
-    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Type!): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public class object <class-object-for-TYPE> : Type.TYPE {
+            private constructor <class-object-for-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
+        }
+    }
 
     public enum entry NO_TYPE : Type {
         private constructor NO_TYPE()
@@ -31,25 +43,13 @@ public final enum class Type : kotlin.Enum<Type!> {
         }
     }
 
-    public enum entry TYPE : Type {
+    public constructor Type()
-        private constructor TYPE()
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Type!): kotlin.Int
-        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 equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final override /*1*/ /*fake_override*/ fun hashCode(): 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 name(): kotlin.String
+    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-        public class object <class-object-for-TYPE> : Type.TYPE {
-            private constructor <class-object-for-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
-        }
-    }
 
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Type

compiler/testData/diagnostics/tests/redeclarations/EnumEntriesAndClassObjectMembers.txt

@@ -1,29 +1,6 @@
 package
 
 internal final enum class E : kotlin.Enum<E> {
-    private constructor E()
-    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 class object <class-object-for-E> {
-        private constructor <class-object-for-E>()
-        internal final val SECOND: E.<class-object-for-E>
-        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 final class FIRST {
-            public constructor FIRST()
-            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 FIRST : E {
         private constructor FIRST()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
@@ -64,6 +41,29 @@ internal final enum class E : kotlin.Enum<E> {
         }
     }
 
+    private constructor E()
+    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 class object <class-object-for-E> {
+        private constructor <class-object-for-E>()
+        internal final val SECOND: E.<class-object-for-E>
+        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 final class FIRST {
+            public constructor FIRST()
+            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
+        }
+    }
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>

compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.txt

@@ -4,16 +4,6 @@ internal fun En(): kotlin.Int
 internal fun Foo(): kotlin.Int
 
 internal final enum class En : kotlin.Enum<En> {
-    private constructor En()
-    internal final fun ENTRY(): kotlin.Int
-    internal final 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
-
     public enum entry ENTRY : En {
         private constructor ENTRY()
         internal final override /*1*/ /*fake_override*/ fun ENTRY(): kotlin.Int
@@ -62,6 +52,16 @@ internal final enum class En : kotlin.Enum<En> {
         }
     }
 
+    private constructor En()
+    internal final fun ENTRY(): kotlin.Int
+    internal final 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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): En
     public final /*synthesized*/ fun values(): kotlin.Array<En>

compiler/testData/diagnostics/tests/redeclarations/kt2418.txt

@@ -3,6 +3,46 @@ 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
+
+            public class object <class-object-for-FOO> : kt2418.A.FOO {
+                private constructor <class-object-for-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
+            }
+        }
+
+        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
+
+            public class object <class-object-for-FOO> : kt2418.A.FOO {
+                private constructor <class-object-for-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
+            }
+        }
+
         private constructor A()
         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
@@ -11,61 +51,12 @@ package kt2418 {
         public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        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
-
-            public class object <class-object-for-FOO> : kt2418.A.FOO {
-                private constructor <class-object-for-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
-            }
-        }
-
-        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
-
-            public class object <class-object-for-FOO> : kt2418.A.FOO {
-                private constructor <class-object-for-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
-            }
-        }
-
         // Static members
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt2418.A
         public final /*synthesized*/ fun values(): kotlin.Array<kt2418.A>
     }
 
     internal final enum class B : kotlin.Enum<kt2418.B> {
-        private constructor B()
-        internal final 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
-
         public enum entry FOO : kt2418.B {
             private constructor FOO()
             internal final override /*1*/ /*fake_override*/ fun FOO(): kotlin.Unit
@@ -88,21 +79,21 @@ package kt2418 {
             }
         }
 
-        // Static members
+        private constructor B()
-        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt2418.B
+        internal final fun FOO(): kotlin.Unit
-        public final /*synthesized*/ fun values(): kotlin.Array<kt2418.B>
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt2418.B): kotlin.Int
-    }
-
-    internal final enum class C : kotlin.Enum<kt2418.C> {
-        private constructor C()
-        internal final val FOO: kotlin.Int = 1
-        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
 
+        // Static members
+        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt2418.B
+        public final /*synthesized*/ fun values(): kotlin.Array<kt2418.B>
+    }
+
+    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
@@ -125,27 +116,21 @@ package kt2418 {
             }
         }
 
-        // Static members
+        private constructor C()
-        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt2418.C
+        internal final val FOO: kotlin.Int = 1
-        public final /*synthesized*/ fun values(): kotlin.Array<kt2418.C>
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt2418.C): kotlin.Int
-    }
-
-    internal final enum class D : kotlin.Enum<kt2418.D> {
-        private constructor D()
-        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
 
-        internal final class FOO {
+        // Static members
-            public constructor FOO()
+        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt2418.C
-            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final /*synthesized*/ fun values(): kotlin.Array<kt2418.C>
-            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    }
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
 
+    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
@@ -166,6 +151,21 @@ package kt2418 {
             }
         }
 
+        private constructor D()
+        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
+
+        internal final class FOO {
+            public constructor FOO()
+            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
+        }
+
         // Static members
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt2418.D
         public final /*synthesized*/ fun values(): kotlin.Array<kt2418.D>

compiler/testData/diagnostics/tests/regressions/Jet183-1.txt

@@ -3,14 +3,27 @@ package
 internal fun box(): kotlin.String
 
 internal final enum class ProtocolState : kotlin.Enum<ProtocolState> {
-    private constructor ProtocolState()
+    public enum entry WAITING : ProtocolState {
-    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: ProtocolState): kotlin.Int
+        private constructor WAITING()
-    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: ProtocolState): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-    internal abstract fun signal(): ProtocolState
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        internal open override /*1*/ fun signal(): ProtocolState
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public class object <class-object-for-WAITING> : ProtocolState.WAITING {
+            private constructor <class-object-for-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*/ /*fake_override*/ fun signal(): ProtocolState
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
 
     public enum entry TALKING : ProtocolState {
         private constructor TALKING()
@@ -34,27 +47,14 @@ internal final enum class ProtocolState : kotlin.Enum<ProtocolState> {
         }
     }
 
-    public enum entry WAITING : ProtocolState {
+    private constructor ProtocolState()
-        private constructor WAITING()
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: ProtocolState): kotlin.Int
-        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 equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final override /*1*/ /*fake_override*/ fun hashCode(): 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 name(): kotlin.String
+    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+    internal abstract fun signal(): ProtocolState
-        internal open override /*1*/ fun signal(): ProtocolState
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-        public class object <class-object-for-WAITING> : ProtocolState.WAITING {
-            private constructor <class-object-for-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*/ /*fake_override*/ fun signal(): ProtocolState
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
-    }
 
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): ProtocolState

compiler/testData/diagnostics/tests/regressions/Jet183.txt

@@ -3,14 +3,27 @@ package
 internal fun box(): kotlin.Unit
 
 internal final enum class ProtocolState : kotlin.Enum<ProtocolState> {
-    private constructor ProtocolState()
+    public enum entry WAITING : ProtocolState {
-    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: ProtocolState): kotlin.Int
+        private constructor WAITING()
-    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: ProtocolState): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-    internal abstract fun signal(): ProtocolState
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        internal open override /*1*/ fun signal(): ProtocolState
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public class object <class-object-for-WAITING> : ProtocolState.WAITING {
+            private constructor <class-object-for-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*/ /*fake_override*/ fun signal(): ProtocolState
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
 
     public enum entry TALKING : ProtocolState {
         private constructor TALKING()
@@ -34,27 +47,14 @@ internal final enum class ProtocolState : kotlin.Enum<ProtocolState> {
         }
     }
 
-    public enum entry WAITING : ProtocolState {
+    private constructor ProtocolState()
-        private constructor WAITING()
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: ProtocolState): kotlin.Int
-        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 equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final override /*1*/ /*fake_override*/ fun hashCode(): 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 name(): kotlin.String
+    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+    internal abstract fun signal(): ProtocolState
-        internal open override /*1*/ fun signal(): ProtocolState
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-        public class object <class-object-for-WAITING> : ProtocolState.WAITING {
-            private constructor <class-object-for-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*/ /*fake_override*/ fun signal(): ProtocolState
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
-    }
 
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): ProtocolState

compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.txt

@@ -3,15 +3,6 @@ package
 internal fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
 
 internal final enum class DOMElementTestClasses : kotlin.Enum<DOMElementTestClasses> {
-    private constructor DOMElementTestClasses()
-    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 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
-
     public enum entry cls1 : DOMElementTestClasses {
         private constructor cls1()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: DOMElementTestClasses): kotlin.Int
@@ -56,6 +47,15 @@ internal final enum class DOMElementTestClasses : kotlin.Enum<DOMElementTestClas
         }
     }
 
+    private constructor DOMElementTestClasses()
+    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 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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): DOMElementTestClasses
     public final /*synthesized*/ fun values(): kotlin.Array<DOMElementTestClasses>
@@ -69,15 +69,6 @@ internal trait EnumStyleClass {
 }
 
 internal final enum class TestClasses : kotlin.Enum<TestClasses>, EnumStyleClass {
-    private constructor TestClasses()
-    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
-    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 /*2*/ /*fake_override*/ fun toString(): kotlin.String
-
     public enum entry cls : TestClasses {
         private constructor cls()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: TestClasses): kotlin.Int
@@ -100,6 +91,15 @@ internal final enum class TestClasses : kotlin.Enum<TestClasses>, EnumStyleClass
         }
     }
 
+    private constructor TestClasses()
+    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
+    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 /*2*/ /*fake_override*/ fun toString(): kotlin.String
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): TestClasses
     public final /*synthesized*/ fun values(): kotlin.Array<TestClasses>

compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.txt

@@ -7,14 +7,6 @@ internal fun withNull(/*0*/ e: E?): kotlin.Int?
 internal fun withNullableNothing(/*0*/ e: E?): kotlin.Int?
 
 internal final enum class E : kotlin.Enum<E> {
-    private constructor E()
-    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 enum entry A : E {
         private constructor A()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
@@ -55,6 +47,14 @@ internal final enum class E : kotlin.Enum<E> {
         }
     }
 
+    private constructor E()
+    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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>

compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.txt

@@ -3,14 +3,6 @@ package
 internal fun foo(/*0*/ e: E, /*1*/ something: kotlin.Any?): kotlin.Int
 
 internal final enum class E : kotlin.Enum<E> {
-    private constructor E()
-    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 enum entry A : E {
         private constructor A()
         public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
@@ -51,6 +43,14 @@ internal final enum class E : kotlin.Enum<E> {
         }
     }
 
+    private constructor E()
+    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
+
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
     public final /*synthesized*/ fun values(): kotlin.Array<E>

compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.lazy.log

@@ -228,7 +228,7 @@ LazyJavaPackageFragment@115['io'] {
     functions('javaClass': Name@134) = EmptyList@38[empty] // through DeserializedPackageMemberScope@135
     functions('javaClass': Name@134) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@133
     memberIndex = computeMemberIndex$1@136 // through LazyPackageFragmentScopeForJavaPackage@133
-    membersProtos = HashMap@137 // through DeserializedPackageMemberScope@135
+    membersProtos = LinkedHashMap@137 // through DeserializedPackageMemberScope@135
     properties('javaClass': Name@134) = EmptyList@38[empty] // through DeserializedPackageMemberScope@135
 }
 
@@ -267,7 +267,7 @@ LazyJavaPackageFragment@11['kotlin'] {
     functions('jvm': Name@154) = EmptyList@38[empty] // through DeserializedPackageMemberScope@150
     functions('jvm': Name@154) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@146
     memberIndex = computeMemberIndex$1@155 // through LazyPackageFragmentScopeForJavaPackage@146
-    membersProtos = HashMap@156 // through DeserializedPackageMemberScope@150
+    membersProtos = LinkedHashMap@156 // through DeserializedPackageMemberScope@150
     properties('io': Name@151) = EmptyList@38[empty] // through DeserializedPackageMemberScope@150
     properties('javaClass': Name@134) = ArrayList@157[1] { DeserializedPropertyDescriptor@158['javaClass'] } // through DeserializedPackageMemberScope@150
     properties('jvm': Name@154) = EmptyList@38[empty] // through DeserializedPackageMemberScope@150
@@ -294,11 +294,11 @@ LazyJavaTypeParameterResolver@164 {
 }
 
 TypeDeserializer@166 {
-    classDescriptors('2': Integer@167) = DeserializedClassDescriptor@168['Any']
+    classDescriptors('27': Integer@167) = LazyJavaClassDescriptor@42['Class']
-    classDescriptors('54': Integer@169) = LazyJavaClassDescriptor@42['Class']
+    classDescriptors('9': Integer@168) = DeserializedClassDescriptor@169['Any']
 }
 
 TypeDeserializer@170 {
-    classDescriptors('2': Integer@167) = DeserializedClassDescriptor@168['Any']
+    classDescriptors('27': Integer@167) = LazyJavaClassDescriptor@42['Class']
-    classDescriptors('54': Integer@169) = LazyJavaClassDescriptor@42['Class']
+    classDescriptors('9': Integer@168) = DeserializedClassDescriptor@169['Any']
 }

compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.lazy.log

@@ -95,7 +95,7 @@ LazyJavaPackageFragment@35['kotlin'] {
     functions('platform': Name@72) = EmptyList@56[empty] // through DeserializedPackageMemberScope@69
     functions('platform': Name@72) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@64
     memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@64
-    membersProtos = HashMap@74 // through DeserializedPackageMemberScope@69
+    membersProtos = LinkedHashMap@74 // through DeserializedPackageMemberScope@69
     properties('io': Name@70) = EmptyList@56[empty] // through DeserializedPackageMemberScope@69
     properties('jvm': Name@71) = EmptyList@56[empty] // through DeserializedPackageMemberScope@69
     properties('platform': Name@72) = EmptyList@56[empty] // through DeserializedPackageMemberScope@69

compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.lazy.log

@@ -207,7 +207,7 @@ LazyJavaPackageFragment@102['kotlin'] {
     functions('platform': Name@148) = EmptyList@132[empty] // through DeserializedPackageMemberScope@145
     functions('platform': Name@148) = EmptyList@132[empty] // through LazyPackageFragmentScopeForJavaPackage@140
     memberIndex = computeMemberIndex$1@149 // through LazyPackageFragmentScopeForJavaPackage@140
-    membersProtos = HashMap@150 // through DeserializedPackageMemberScope@145
+    membersProtos = LinkedHashMap@150 // through DeserializedPackageMemberScope@145
     properties('io': Name@146) = EmptyList@132[empty] // through DeserializedPackageMemberScope@145
     properties('jvm': Name@147) = EmptyList@132[empty] // through DeserializedPackageMemberScope@145
     properties('platform': Name@148) = EmptyList@132[empty] // through DeserializedPackageMemberScope@145

compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.lazy.log

@@ -40,7 +40,7 @@ DeserializedTypeParameterDescriptor@25['T'] {
 }
 
 DeserializedType@29['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@26
+    constructor = AbstractLazyTypeParameterDescriptor$1@22
 }
 
 DeserializedType@30['T in kotlin'] {
@@ -52,7 +52,7 @@ DeserializedType@31['T in kotlin'] {
 }
 
 DeserializedType@32['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@26
+    constructor = AbstractLazyTypeParameterDescriptor$1@22
 }
 
 DeserializedType@33['java.lang.Class'] {
@@ -349,7 +349,7 @@ LazyJavaPackageFragment@167['io'] {
     functions('javaClass': Name@202) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
     functions('javaClass': Name@202) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@208
     memberIndex = computeMemberIndex$1@210 // through LazyPackageFragmentScopeForJavaPackage@208
-    membersProtos = HashMap@211 // through DeserializedPackageMemberScope@209
+    membersProtos = LinkedHashMap@211 // through DeserializedPackageMemberScope@209
     properties('Ann': Name@188) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
     properties('array': Name@194) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
     properties('foo': Name@195) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
@@ -428,7 +428,7 @@ LazyJavaPackageFragment@19['kotlin'] {
     functions('jvm': Name@231) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
     functions('jvm': Name@231) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
     memberIndex = computeMemberIndex$1@232 // through LazyPackageFragmentScopeForJavaPackage@218
-    membersProtos = HashMap@233 // through DeserializedPackageMemberScope@223
+    membersProtos = LinkedHashMap@233 // through DeserializedPackageMemberScope@223
     properties('Ann': Name@188) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
     properties('array': Name@194) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
     properties('foo': Name@195) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
@@ -475,16 +475,16 @@ LazyJavaTypeParameterResolver@241 {
 }
 
 TypeDeserializer@243 {
-    classDescriptors('2': Integer@244) = DeserializedClassDescriptor@245['Any']
+    classDescriptors('22': Integer@244) = DeserializedClassDescriptor@245['Int']
-    classDescriptors('3': Integer@246) = DeserializedClassDescriptor@247['Array']
+    classDescriptors('35': Integer@246) = DeserializedClassDescriptor@247['IntArray']
 }
 
 TypeDeserializer@248 {
-    classDescriptors('2': Integer@244) = DeserializedClassDescriptor@245['Any']
+    classDescriptors('27': Integer@249) = LazyJavaClassDescriptor@88['Class']
-    classDescriptors('54': Integer@249) = LazyJavaClassDescriptor@88['Class']
+    classDescriptors('9': Integer@250) = DeserializedClassDescriptor@251['Any']
 }
 
-TypeDeserializer@250 {
+TypeDeserializer@252 {
-    classDescriptors('20': Integer@251) = DeserializedClassDescriptor@252['Int']
+    classDescriptors('8': Integer@253) = DeserializedClassDescriptor@254['Array']
-    classDescriptors('45': Integer@253) = DeserializedClassDescriptor@254['IntArray']
+    classDescriptors('9': Integer@250) = DeserializedClassDescriptor@251['Any']
 }

compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/classLiteral.lazy.log

@@ -107,7 +107,7 @@ LazyJavaPackageFragment@55['io'] {
     functions('javaClass': Name@69) = EmptyList@71[empty] // through DeserializedPackageMemberScope@76
     functions('javaClass': Name@69) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@75
     memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@75
-    membersProtos = HashMap@78 // through DeserializedPackageMemberScope@76
+    membersProtos = LinkedHashMap@78 // through DeserializedPackageMemberScope@76
     properties('c': Name@68) = EmptyList@71[empty] // through DeserializedPackageMemberScope@76
     properties('javaClass': Name@69) = EmptyList@71[empty] // through DeserializedPackageMemberScope@76
 }
@@ -144,7 +144,7 @@ LazyJavaPackageFragment@11['kotlin'] {
     functions('jvm': Name@94) = EmptyList@71[empty] // through DeserializedPackageMemberScope@90
     functions('jvm': Name@94) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@86
     memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@86
-    membersProtos = HashMap@96 // through DeserializedPackageMemberScope@90
+    membersProtos = LinkedHashMap@96 // through DeserializedPackageMemberScope@90
     properties('c': Name@68) = EmptyList@71[empty] // through DeserializedPackageMemberScope@90
     properties('io': Name@91) = EmptyList@71[empty] // through DeserializedPackageMemberScope@90
     properties('javaClass': Name@69) = ArrayList@97[1] { DeserializedPropertyDescriptor@98['javaClass'] } // through DeserializedPackageMemberScope@90
@@ -171,6 +171,6 @@ LazyJavaTypeParameterResolver@104 {
 }
 
 TypeDeserializer@106 {
-    classDescriptors('2': Integer@107) = DeserializedClassDescriptor@108['Any']
+    classDescriptors('27': Integer@107) = LazyJavaClassDescriptor@31['Class']
-    classDescriptors('54': Integer@109) = LazyJavaClassDescriptor@31['Class']
+    classDescriptors('9': Integer@108) = DeserializedClassDescriptor@109['Any']
 }

compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.lazy.log

@@ -219,7 +219,7 @@ LazyJavaPackageFragment@104['io'] {
     functions('intArray': Name@136) = EmptyList@139[empty] // through DeserializedPackageMemberScope@144
     functions('intArray': Name@136) = EmptyList@139[empty] // through LazyPackageFragmentScopeForJavaPackage@143
     memberIndex = computeMemberIndex$1@145 // through LazyPackageFragmentScopeForJavaPackage@143
-    membersProtos = HashMap@146 // through DeserializedPackageMemberScope@144
+    membersProtos = LinkedHashMap@146 // through DeserializedPackageMemberScope@144
     properties('MyClass': Name@129) = EmptyList@139[empty] // through DeserializedPackageMemberScope@144
     properties('O': Name@147) = EmptyList@139[empty] // through DeserializedPackageMemberScope@144
     properties('array': Name@131) = EmptyList@139[empty] // through DeserializedPackageMemberScope@144
@@ -290,7 +290,7 @@ LazyJavaPackageFragment@18['kotlin'] {
     functions('jvm': Name@165) = EmptyList@139[empty] // through DeserializedPackageMemberScope@159
     functions('jvm': Name@165) = EmptyList@139[empty] // through LazyPackageFragmentScopeForJavaPackage@155
     memberIndex = computeMemberIndex$1@166 // through LazyPackageFragmentScopeForJavaPackage@155
-    membersProtos = HashMap@167 // through DeserializedPackageMemberScope@159
+    membersProtos = LinkedHashMap@167 // through DeserializedPackageMemberScope@159
     properties('MyClass': Name@129) = EmptyList@139[empty] // through DeserializedPackageMemberScope@159
     properties('O': Name@147) = EmptyList@139[empty] // through DeserializedPackageMemberScope@159
     properties('array': Name@131) = EmptyList@139[empty] // through DeserializedPackageMemberScope@159
@@ -322,11 +322,11 @@ LazyJavaPackageFragment@85['lang'] {
 }
 
 TypeDeserializer@170 {
-    classDescriptors('2': Integer@171) = DeserializedClassDescriptor@172['Any']
+    classDescriptors('22': Integer@171) = DeserializedClassDescriptor@172['Int']
-    classDescriptors('3': Integer@173) = DeserializedClassDescriptor@174['Array']
+    classDescriptors('35': Integer@173) = DeserializedClassDescriptor@174['IntArray']
 }
 
 TypeDeserializer@175 {
-    classDescriptors('20': Integer@176) = DeserializedClassDescriptor@177['Int']
+    classDescriptors('8': Integer@176) = DeserializedClassDescriptor@177['Array']
-    classDescriptors('45': Integer@178) = DeserializedClassDescriptor@179['IntArray']
+    classDescriptors('9': Integer@178) = DeserializedClassDescriptor@179['Any']
 }

compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.lazy.log

@@ -60,12 +60,12 @@ DeserializedType@33['java.lang.Class'] {
     memberScope = SubstitutingScope@35
 }
 
-DeserializedType@24['kotlin.Any'] {
+DeserializedType@28['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@36
     memberScope = DeserializedClassMemberScope@37
 }
 
-DeserializedType@28['kotlin.Any'] {
+DeserializedType@24['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@36
     memberScope = DeserializedClassMemberScope@37
 }
@@ -353,7 +353,7 @@ LazyJavaPackageFragment@173['io'] {
     functions('javaClass': Name@202) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
     functions('javaClass': Name@202) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@208
     memberIndex = computeMemberIndex$1@210 // through LazyPackageFragmentScopeForJavaPackage@208
-    membersProtos = HashMap@211 // through DeserializedPackageMemberScope@209
+    membersProtos = LinkedHashMap@211 // through DeserializedPackageMemberScope@209
     properties('Ann': Name@190) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
     properties('array': Name@194) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
     properties('foo': Name@195) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
@@ -430,7 +430,7 @@ LazyJavaPackageFragment@19['kotlin'] {
     functions('jvm': Name@233) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
     functions('jvm': Name@233) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
     memberIndex = computeMemberIndex$1@234 // through LazyPackageFragmentScopeForJavaPackage@218
-    membersProtos = HashMap@235 // through DeserializedPackageMemberScope@225
+    membersProtos = LinkedHashMap@235 // through DeserializedPackageMemberScope@225
     properties('Ann': Name@190) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
     properties('array': Name@194) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
     properties('foo': Name@195) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
@@ -477,16 +477,16 @@ LazyJavaTypeParameterResolver@243 {
 }
 
 TypeDeserializer@245 {
-    classDescriptors('2': Integer@246) = DeserializedClassDescriptor@247['Any']
+    classDescriptors('22': Integer@246) = DeserializedClassDescriptor@247['Int']
-    classDescriptors('3': Integer@248) = DeserializedClassDescriptor@249['Array']
+    classDescriptors('35': Integer@248) = DeserializedClassDescriptor@249['IntArray']
 }
 
 TypeDeserializer@250 {
-    classDescriptors('2': Integer@246) = DeserializedClassDescriptor@247['Any']
+    classDescriptors('27': Integer@251) = LazyJavaClassDescriptor@100['Class']
-    classDescriptors('54': Integer@251) = LazyJavaClassDescriptor@100['Class']
+    classDescriptors('9': Integer@252) = DeserializedClassDescriptor@253['Any']
 }
 
-TypeDeserializer@252 {
+TypeDeserializer@254 {
-    classDescriptors('20': Integer@253) = DeserializedClassDescriptor@254['Int']
+    classDescriptors('8': Integer@255) = DeserializedClassDescriptor@256['Array']
-    classDescriptors('45': Integer@255) = DeserializedClassDescriptor@256['IntArray']
+    classDescriptors('9': Integer@252) = DeserializedClassDescriptor@253['Any']
 }

compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.lazy.log

@@ -100,7 +100,7 @@ LazyJavaPackageFragment@44['kotlin'] {
     functions('platform': Name@73) = EmptyList@60[empty] // through DeserializedPackageMemberScope@70
     functions('platform': Name@73) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@67
     memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@67
-    membersProtos = HashMap@75 // through DeserializedPackageMemberScope@70
+    membersProtos = LinkedHashMap@75 // through DeserializedPackageMemberScope@70
     properties('io': Name@71) = EmptyList@60[empty] // through DeserializedPackageMemberScope@70
     properties('jvm': Name@72) = EmptyList@60[empty] // through DeserializedPackageMemberScope@70
     properties('platform': Name@73) = EmptyList@60[empty] // through DeserializedPackageMemberScope@70

compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.lazy.log

@@ -79,7 +79,7 @@ LazyJavaPackageFragment@21['kotlin'] {
     functions('platform': Name@60) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
     functions('platform': Name@60) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@53
     memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@53
-    membersProtos = HashMap@62 // through DeserializedPackageMemberScope@57
+    membersProtos = LinkedHashMap@62 // through DeserializedPackageMemberScope@57
     properties('io': Name@58) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
     properties('jvm': Name@59) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
     properties('platform': Name@60) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57

compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.lazy.log

@@ -84,7 +84,7 @@ LazyJavaPackageFragment@43['io'] {
     classes('p': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@64
     classes('p1': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@64
     deserializedPackageScope = DeserializedPackageMemberScope@65 // through LazyPackageFragmentScopeForJavaPackage@64
-    membersProtos = HashMap@66 // through DeserializedPackageMemberScope@65
+    membersProtos = LinkedHashMap@66 // through DeserializedPackageMemberScope@65
     properties('p': Name@57) = EmptyList@62[empty] // through DeserializedPackageMemberScope@65
     properties('p1': Name@58) = EmptyList@62[empty] // through DeserializedPackageMemberScope@65
 }
@@ -118,7 +118,7 @@ LazyJavaPackageFragment@40['kotlin'] {
     functions('platform': Name@79) = EmptyList@62[empty] // through DeserializedPackageMemberScope@76
     functions('platform': Name@79) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@72
     memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@72
-    membersProtos = HashMap@81 // through DeserializedPackageMemberScope@76
+    membersProtos = LinkedHashMap@81 // through DeserializedPackageMemberScope@76
     properties('io': Name@77) = EmptyList@62[empty] // through DeserializedPackageMemberScope@76
     properties('jvm': Name@78) = EmptyList@62[empty] // through DeserializedPackageMemberScope@76
     properties('p': Name@57) = EmptyList@62[empty] // through DeserializedPackageMemberScope@76

compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.lazy.log

@@ -46,11 +46,11 @@ DeserializedType@29['T in kotlin'] {
 }
 
 DeserializedType@30['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@22
+    constructor = AbstractLazyTypeParameterDescriptor$1@26
 }
 
 DeserializedType@31['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@22
+    constructor = AbstractLazyTypeParameterDescriptor$1@26
 }
 
 DeserializedType@32['T in kotlin'] {
@@ -62,12 +62,12 @@ DeserializedType@33['java.lang.Class'] {
     memberScope = SubstitutingScope@35
 }
 
-DeserializedType@24['kotlin.Any'] {
+DeserializedType@28['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@36
     memberScope = DeserializedClassMemberScope@37
 }
 
-DeserializedType@28['kotlin.Any'] {
+DeserializedType@24['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@36
     memberScope = DeserializedClassMemberScope@37
 }
@@ -246,7 +246,7 @@ LazyJavaPackageFragment@148['io'] {
     classes('deprecated': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@176
     classes('kotlin': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@176
     deserializedPackageScope = DeserializedPackageMemberScope@182 // through LazyPackageFragmentScopeForJavaPackage@176
-    membersProtos = HashMap@183 // through DeserializedPackageMemberScope@182
+    membersProtos = LinkedHashMap@183 // through DeserializedPackageMemberScope@182
     properties('A': Name@184) = EmptyList@185[empty] // through DeserializedPackageMemberScope@182
     properties('a': Name@186) = EmptyList@185[empty] // through DeserializedPackageMemberScope@182
     properties('kotlin': Name@187) = EmptyList@185[empty] // through DeserializedPackageMemberScope@182
@@ -294,7 +294,7 @@ LazyJavaPackageFragment@17['kotlin'] {
     functions('jvm': Name@208) = EmptyList@185[empty] // through DeserializedPackageMemberScope@201
     functions('jvm': Name@208) = EmptyList@185[empty] // through LazyPackageFragmentScopeForJavaPackage@195
     memberIndex = computeMemberIndex$1@209 // through LazyPackageFragmentScopeForJavaPackage@195
-    membersProtos = HashMap@210 // through DeserializedPackageMemberScope@201
+    membersProtos = LinkedHashMap@210 // through DeserializedPackageMemberScope@201
     properties('A': Name@184) = EmptyList@185[empty] // through DeserializedPackageMemberScope@201
     properties('a': Name@186) = EmptyList@185[empty] // through DeserializedPackageMemberScope@201
     properties('array': Name@196) = EmptyList@185[empty] // through DeserializedPackageMemberScope@201
@@ -328,11 +328,11 @@ TypeDeserializer@219 {
 }
 
 TypeDeserializer@223 {
-    classDescriptors('2': Integer@224) = DeserializedClassDescriptor@225['Any']
+    classDescriptors('27': Integer@224) = LazyJavaClassDescriptor@91['Class']
-    classDescriptors('3': Integer@221) = DeserializedClassDescriptor@226['Array']
+    classDescriptors('9': Integer@225) = DeserializedClassDescriptor@226['Any']
 }
 
 TypeDeserializer@227 {
-    classDescriptors('2': Integer@224) = DeserializedClassDescriptor@225['Any']
+    classDescriptors('8': Integer@228) = DeserializedClassDescriptor@229['Array']
-    classDescriptors('54': Integer@228) = LazyJavaClassDescriptor@91['Class']
+    classDescriptors('9': Integer@225) = DeserializedClassDescriptor@226['Any']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/abstractClassConstructors.lazy.log

@@ -65,7 +65,7 @@ LazyJavaPackageFragment@26['io'] {
     functions('D': Name@34) = EmptyList@36[empty] // through DeserializedPackageMemberScope@39
     functions('D': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@38
     memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
-    membersProtos = HashMap@41 // through DeserializedPackageMemberScope@39
+    membersProtos = LinkedHashMap@41 // through DeserializedPackageMemberScope@39
     properties('A': Name@30) = EmptyList@36[empty] // through DeserializedPackageMemberScope@39
     properties('B': Name@32) = EmptyList@36[empty] // through DeserializedPackageMemberScope@39
     properties('C': Name@33) = EmptyList@36[empty] // through DeserializedPackageMemberScope@39
@@ -115,7 +115,7 @@ LazyJavaPackageFragment@5['kotlin'] {
     functions('jvm': Name@55) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
     functions('jvm': Name@55) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@48
     memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@48
-    membersProtos = HashMap@57 // through DeserializedPackageMemberScope@53
+    membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@53
     properties('A': Name@30) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
     properties('B': Name@32) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
     properties('C': Name@33) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.lazy.log

@@ -54,7 +54,7 @@ LazyJavaPackageFragment@25['io'] {
     functions('foo': Name@38) = EmptyList@40[empty] // through DeserializedPackageMemberScope@43
     functions('foo': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@42
     memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@42
-    membersProtos = HashMap@45 // through DeserializedPackageMemberScope@43
+    membersProtos = LinkedHashMap@45 // through DeserializedPackageMemberScope@43
     properties('foo': Name@38) = EmptyList@40[empty] // through DeserializedPackageMemberScope@43
 }
 
@@ -90,7 +90,7 @@ LazyJavaPackageFragment@6['kotlin'] {
     functions('jvm': Name@57) = EmptyList@40[empty] // through DeserializedPackageMemberScope@55
     functions('jvm': Name@57) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@52
     memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@52
-    membersProtos = HashMap@59 // through DeserializedPackageMemberScope@55
+    membersProtos = LinkedHashMap@59 // through DeserializedPackageMemberScope@55
     properties('foo': Name@38) = EmptyList@40[empty] // through DeserializedPackageMemberScope@55
     properties('io': Name@56) = EmptyList@40[empty] // through DeserializedPackageMemberScope@55
     properties('jvm': Name@57) = EmptyList@40[empty] // through DeserializedPackageMemberScope@55

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/callableRefrenceOnNestedObject.lazy.log

@@ -11,14 +11,14 @@ DeserializedClassDescriptor@2['ExtensionFunction0'] {
     containingDeclaration = LazyJavaPackageFragment@7['kotlin']
     defaultType = JetTypeImpl@8['ExtensionFunction0<2>']
     functions('invoke': Name@9) = ArrayList@10[1] { DeserializedSimpleFunctionDescriptor@11['invoke'] } // through DeserializedClassMemberScope@12
-    membersProtos = HashMap@13 // through DeserializedClassMemberScope@12
+    membersProtos = LinkedHashMap@13 // through DeserializedClassMemberScope@12
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@14['<this>']
 }
 
 DeserializedClassDescriptor@4['KMemberFunction0'] {
     containingDeclaration = LazyJavaPackageFragment@15['reflect']
     functions('invoke': Name@9) = ArrayList@16[1] { DeserializedSimpleFunctionDescriptor@17['invoke'] } // through DeserializedClassMemberScope@18
-    membersProtos = HashMap@19 // through DeserializedClassMemberScope@18
+    membersProtos = LinkedHashMap@19 // through DeserializedClassMemberScope@18
 }
 
 DeserializedTypeParameterDescriptor@20['R'] {
@@ -71,93 +71,97 @@ DeserializedType@39['kotlin.ExtensionFunction0'] {
     memberScope = SubstitutingScope@41
 }
 
-LazyJavaPackageFragmentProvider@42 {
+EnumEntryClassDescriptors@42 {
-    packageFragments('<root>': FqName@43) = LazyJavaPackageFragment@44['<root>']
+    findEnumEntry('invoke': Name@9) = null
-    packageFragments('A': FqName@45) = null
-    packageFragments('java': FqName@46) = LazyJavaPackageFragment@47['java']
-    packageFragments('java.lang': FqName@48) = LazyJavaPackageFragment@49['lang']
-    packageFragments('java.lang.A': FqName@50) = null
-    packageFragments('kotlin': FqName@51) = LazyJavaPackageFragment@7['kotlin']
-    packageFragments('kotlin.A': FqName@52) = null
-    packageFragments('kotlin.io': FqName@53) = LazyJavaPackageFragment@54['io']
-    packageFragments('kotlin.io.A': FqName@55) = null
-    packageFragments('kotlin.jvm': FqName@56) = LazyJavaPackageFragment@57['jvm']
-    packageFragments('kotlin.jvm.A': FqName@58) = null
-    packageFragments('kotlin.reflect': FqName@59) = LazyJavaPackageFragment@15['reflect']
 }
 
-LazyJavaPackageFragment@44['<root>'] {
+LazyJavaPackageFragmentProvider@43 {
-    classes('foo': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    packageFragments('<root>': FqName@44) = LazyJavaPackageFragment@45['<root>']
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@61
+    packageFragments('A': FqName@46) = null
-    functions('foo': Name@60) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+    packageFragments('java': FqName@47) = LazyJavaPackageFragment@48['java']
-    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@61
+    packageFragments('java.lang': FqName@49) = LazyJavaPackageFragment@50['lang']
+    packageFragments('java.lang.A': FqName@51) = null
+    packageFragments('kotlin': FqName@52) = LazyJavaPackageFragment@7['kotlin']
+    packageFragments('kotlin.A': FqName@53) = null
+    packageFragments('kotlin.io': FqName@54) = LazyJavaPackageFragment@55['io']
+    packageFragments('kotlin.io.A': FqName@56) = null
+    packageFragments('kotlin.jvm': FqName@57) = LazyJavaPackageFragment@58['jvm']
+    packageFragments('kotlin.jvm.A': FqName@59) = null
+    packageFragments('kotlin.reflect': FqName@60) = LazyJavaPackageFragment@15['reflect']
 }
 
-LazyJavaPackageFragment@54['io'] {
+LazyJavaPackageFragment@45['<root>'] {
-    classes('foo': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('foo': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = DeserializedPackageMemberScope@66 // through LazyPackageFragmentScopeForJavaPackage@65
+    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('foo': Name@60) = EmptyList@63[empty] // through DeserializedPackageMemberScope@66
+    functions('foo': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('foo': Name@60) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@65
-    membersProtos = HashMap@68 // through DeserializedPackageMemberScope@66
-    properties('A': Name@69) = EmptyList@63[empty] // through DeserializedPackageMemberScope@66
-    properties('foo': Name@60) = EmptyList@63[empty] // through DeserializedPackageMemberScope@66
 }
 
-LazyJavaPackageFragment@47['java'] {
+LazyJavaPackageFragment@55['io'] {
-    classes('lang': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
+    classes('foo': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@71
+    deserializedPackageScope = DeserializedPackageMemberScope@67 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('lang': Name@72) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@71
+    functions('foo': Name@61) = EmptyList@64[empty] // through DeserializedPackageMemberScope@67
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@71
+    functions('foo': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@66
+    memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@66
+    membersProtos = LinkedHashMap@69 // through DeserializedPackageMemberScope@67
+    properties('A': Name@70) = EmptyList@64[empty] // through DeserializedPackageMemberScope@67
+    properties('foo': Name@61) = EmptyList@64[empty] // through DeserializedPackageMemberScope@67
 }
 
-LazyJavaPackageFragment@57['jvm'] {
+LazyJavaPackageFragment@48['java'] {
-    classes('foo': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('lang': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@74
+    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('foo': Name@60) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('lang': Name@73) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@74
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@72
+}
+
+LazyJavaPackageFragment@58['jvm'] {
+    classes('foo': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@75
+    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('foo': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@75
+    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
 }
 
 LazyJavaPackageFragment@7['kotlin'] {
-    classes('Any': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('Any': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('ExtensionFunction0': Name@78) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('ExtensionFunction0': Name@79) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('foo': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('foo': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('io': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('io': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('jvm': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('jvm': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = DeserializedPackageMemberScope@81 // through LazyPackageFragmentScopeForJavaPackage@77
+    deserializedPackageScope = DeserializedPackageMemberScope@82 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('foo': Name@60) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
+    functions('foo': Name@61) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
-    functions('foo': Name@60) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('foo': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('io': Name@82) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
+    functions('io': Name@83) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
-    functions('io': Name@82) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('io': Name@83) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('jvm': Name@83) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
+    functions('jvm': Name@84) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
-    functions('jvm': Name@83) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('jvm': Name@84) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@77
+    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@78
-    membersProtos = HashMap@85 // through DeserializedPackageMemberScope@81
+    membersProtos = LinkedHashMap@86 // through DeserializedPackageMemberScope@82
-    properties('A': Name@69) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
+    properties('A': Name@70) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
-    properties('foo': Name@60) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
+    properties('foo': Name@61) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
-    properties('io': Name@82) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
+    properties('io': Name@83) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
-    properties('jvm': Name@83) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
+    properties('jvm': Name@84) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
 }
 
-LazyJavaPackageFragment@49['lang'] {
+LazyJavaPackageFragment@50['lang'] {
-    classes('foo': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('foo': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@86
+    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('foo': Name@60) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('foo': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@86
+    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
 LazyJavaPackageFragment@15['reflect'] {
-    classes('KMemberFunction0': Name@88) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('KMemberFunction0': Name@89) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@90
 }
 
-NestedClassDescriptors@90 {
+NestedClassDescriptors@91 {
-    findClass('invoke': Name@9) = null
+    findNestedClass('invoke': Name@9) = null
 }
 
-TypeDeserializer@91 {
+TypeDeserializer@92 {
-    classDescriptors('2': Integer@92) = DeserializedClassDescriptor@93['Any']
+    classDescriptors('2': Integer@93) = DeserializedClassDescriptor@94['Any']
 }
 
-TypeDeserializer@94 {
+TypeDeserializer@95 {
-    classDescriptors('4': Integer@95) = DeserializedClassDescriptor@2['ExtensionFunction0']
+    classDescriptors('4': Integer@96) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.lazy.log

@@ -67,7 +67,7 @@ LazyJavaPackageFragment@32['io'] {
     functions('A': Name@41) = EmptyList@46[empty] // through DeserializedPackageMemberScope@50
     functions('A': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@49
     memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@49
-    membersProtos = HashMap@52 // through DeserializedPackageMemberScope@50
+    membersProtos = LinkedHashMap@52 // through DeserializedPackageMemberScope@50
     properties('A': Name@41) = EmptyList@46[empty] // through DeserializedPackageMemberScope@50
     properties('x': Name@53) = EmptyList@46[empty] // through DeserializedPackageMemberScope@50
 }
@@ -103,7 +103,7 @@ LazyJavaPackageFragment@5['kotlin'] {
     functions('reflect': Name@69) = EmptyList@46[empty] // through DeserializedPackageMemberScope@66
     functions('reflect': Name@69) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@60
     memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@60
-    membersProtos = HashMap@71 // through DeserializedPackageMemberScope@66
+    membersProtos = LinkedHashMap@71 // through DeserializedPackageMemberScope@66
     properties('A': Name@41) = EmptyList@46[empty] // through DeserializedPackageMemberScope@66
     properties('io': Name@67) = EmptyList@46[empty] // through DeserializedPackageMemberScope@66
     properties('jvm': Name@68) = EmptyList@46[empty] // through DeserializedPackageMemberScope@66

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.lazy.log

@@ -76,7 +76,7 @@ LazyJavaPackageFragment@34['io'] {
     functions('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
     functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
     memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
-    membersProtos = HashMap@57 // through DeserializedPackageMemberScope@55
+    membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
     properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
     properties('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
     properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
@@ -119,7 +119,7 @@ LazyJavaPackageFragment@5['kotlin'] {
     functions('reflect': Name@75) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
     functions('reflect': Name@75) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
     memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@66
-    membersProtos = HashMap@77 // through DeserializedPackageMemberScope@72
+    membersProtos = LinkedHashMap@77 // through DeserializedPackageMemberScope@72
     properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
     properties('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
     properties('io': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.lazy.log

@@ -76,7 +76,7 @@ LazyJavaPackageFragment@34['io'] {
     functions('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
     functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
     memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
-    membersProtos = HashMap@57 // through DeserializedPackageMemberScope@55
+    membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
     properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
     properties('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
     properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
@@ -119,7 +119,7 @@ LazyJavaPackageFragment@5['kotlin'] {
     functions('reflect': Name@75) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
     functions('reflect': Name@75) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
     memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@66
-    membersProtos = HashMap@77 // through DeserializedPackageMemberScope@72
+    membersProtos = LinkedHashMap@77 // through DeserializedPackageMemberScope@72
     properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
     properties('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
     properties('io': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.lazy.log

@@ -66,7 +66,7 @@ LazyJavaPackageFragment@31['io'] {
     functions('A': Name@40) = EmptyList@45[empty] // through DeserializedPackageMemberScope@49
     functions('A': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
     memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@48
-    membersProtos = HashMap@51 // through DeserializedPackageMemberScope@49
+    membersProtos = LinkedHashMap@51 // through DeserializedPackageMemberScope@49
     properties('A': Name@40) = EmptyList@45[empty] // through DeserializedPackageMemberScope@49
 }
 
@@ -101,7 +101,7 @@ LazyJavaPackageFragment@5['kotlin'] {
     functions('reflect': Name@67) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
     functions('reflect': Name@67) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@58
     memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@58
-    membersProtos = HashMap@69 // through DeserializedPackageMemberScope@64
+    membersProtos = LinkedHashMap@69 // through DeserializedPackageMemberScope@64
     properties('A': Name@40) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
     properties('io': Name@65) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
     properties('jvm': Name@66) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.lazy.log

@@ -58,12 +58,17 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@34['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
+DeserializedType@34['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -73,12 +78,7 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -176,7 +176,7 @@ LazyJavaPackageFragment@74['io'] {
     functions('foo': Name@111) = EmptyList@113[empty] // through DeserializedPackageMemberScope@112
     functions('foo': Name@111) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@105
     memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@105
-    membersProtos = HashMap@115 // through DeserializedPackageMemberScope@112
+    membersProtos = LinkedHashMap@115 // through DeserializedPackageMemberScope@112
     properties('bar': Name@108) = EmptyList@113[empty] // through DeserializedPackageMemberScope@112
     properties('baz': Name@109) = EmptyList@113[empty] // through DeserializedPackageMemberScope@112
     properties('foo': Name@111) = EmptyList@113[empty] // through DeserializedPackageMemberScope@112
@@ -232,7 +232,7 @@ LazyJavaPackageFragment@13['kotlin'] {
     functions('reflect': Name@133) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
     functions('reflect': Name@133) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@124
     memberIndex = computeMemberIndex$1@134 // through LazyPackageFragmentScopeForJavaPackage@124
-    membersProtos = HashMap@135 // through DeserializedPackageMemberScope@130
+    membersProtos = LinkedHashMap@135 // through DeserializedPackageMemberScope@130
     properties('bar': Name@108) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
     properties('baz': Name@109) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
     properties('foo': Name@111) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.lazy.log

@@ -97,7 +97,7 @@ LazyJavaPackageFragment@44['io'] {
     functions('foo': Name@65) = EmptyList@67[empty] // through DeserializedPackageMemberScope@66
     functions('foo': Name@65) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@61
     memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@61
-    membersProtos = HashMap@69 // through DeserializedPackageMemberScope@66
+    membersProtos = LinkedHashMap@69 // through DeserializedPackageMemberScope@66
     properties('bar': Name@62) = EmptyList@67[empty] // through DeserializedPackageMemberScope@66
     properties('baz': Name@63) = EmptyList@67[empty] // through DeserializedPackageMemberScope@66
     properties('foo': Name@65) = EmptyList@67[empty] // through DeserializedPackageMemberScope@66
@@ -148,7 +148,7 @@ LazyJavaPackageFragment@7['kotlin'] {
     functions('reflect': Name@86) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
     functions('reflect': Name@86) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@78
     memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@78
-    membersProtos = HashMap@88 // through DeserializedPackageMemberScope@83
+    membersProtos = LinkedHashMap@88 // through DeserializedPackageMemberScope@83
     properties('bar': Name@62) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
     properties('baz': Name@63) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
     properties('foo': Name@65) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.lazy.log

@@ -147,7 +147,7 @@ LazyJavaPackageFragment@65['io'] {
     functions('foo': Name@96) = EmptyList@98[empty] // through DeserializedPackageMemberScope@97
     functions('foo': Name@96) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@91
     memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@91
-    membersProtos = HashMap@100 // through DeserializedPackageMemberScope@97
+    membersProtos = LinkedHashMap@100 // through DeserializedPackageMemberScope@97
     properties('bar': Name@94) = EmptyList@98[empty] // through DeserializedPackageMemberScope@97
     properties('baz': Name@95) = EmptyList@98[empty] // through DeserializedPackageMemberScope@97
     properties('foo': Name@96) = EmptyList@98[empty] // through DeserializedPackageMemberScope@97
@@ -201,7 +201,7 @@ LazyJavaPackageFragment@13['kotlin'] {
     functions('reflect': Name@118) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
     functions('reflect': Name@118) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@109
     memberIndex = computeMemberIndex$1@119 // through LazyPackageFragmentScopeForJavaPackage@109
-    membersProtos = HashMap@120 // through DeserializedPackageMemberScope@115
+    membersProtos = LinkedHashMap@120 // through DeserializedPackageMemberScope@115
     properties('bar': Name@94) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
     properties('baz': Name@95) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
     properties('foo': Name@96) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/empty.lazy.log

@@ -28,7 +28,7 @@ LazyJavaPackageFragment@10['kotlin'] {
     functions('jvm': Name@29) = EmptyList@22[empty] // through DeserializedPackageMemberScope@27
     functions('jvm': Name@29) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
     memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@25
-    membersProtos = HashMap@31 // through DeserializedPackageMemberScope@27
+    membersProtos = LinkedHashMap@31 // through DeserializedPackageMemberScope@27
     properties('io': Name@28) = EmptyList@22[empty] // through DeserializedPackageMemberScope@27
     properties('jvm': Name@29) = EmptyList@22[empty] // through DeserializedPackageMemberScope@27
 }

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.lazy.log

@@ -63,12 +63,7 @@ DeserializedType@30['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@34['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -78,7 +73,12 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@18['kotlin.Any'] {
+DeserializedType@34['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -182,7 +182,7 @@ LazyJavaPackageFragment@71['io'] {
     functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
     memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
-    membersProtos = HashMap@110 // through DeserializedPackageMemberScope@108
+    membersProtos = LinkedHashMap@110 // through DeserializedPackageMemberScope@108
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
@@ -239,7 +239,7 @@ LazyJavaPackageFragment@13['kotlin'] {
     functions('reflect': Name@130) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
     functions('reflect': Name@130) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
     memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@121
-    membersProtos = HashMap@132 // through DeserializedPackageMemberScope@127
+    membersProtos = LinkedHashMap@132 // through DeserializedPackageMemberScope@127
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.lazy.log

@@ -63,12 +63,12 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@18['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -78,7 +78,7 @@ DeserializedType@34['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -182,7 +182,7 @@ LazyJavaPackageFragment@71['io'] {
     functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
     memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
-    membersProtos = HashMap@110 // through DeserializedPackageMemberScope@108
+    membersProtos = LinkedHashMap@110 // through DeserializedPackageMemberScope@108
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
@@ -239,7 +239,7 @@ LazyJavaPackageFragment@13['kotlin'] {
     functions('reflect': Name@130) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
     functions('reflect': Name@130) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
     memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@121
-    membersProtos = HashMap@132 // through DeserializedPackageMemberScope@127
+    membersProtos = LinkedHashMap@132 // through DeserializedPackageMemberScope@127
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.lazy.log

@@ -63,7 +63,7 @@ DeserializedType@22['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -78,7 +78,7 @@ DeserializedType@34['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -188,7 +188,7 @@ LazyJavaPackageFragment@74['io'] {
     functions('foo': Name@107) = EmptyList@110[empty] // through DeserializedPackageMemberScope@114
     functions('foo': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@113
     memberIndex = computeMemberIndex$1@115 // through LazyPackageFragmentScopeForJavaPackage@113
-    membersProtos = HashMap@116 // through DeserializedPackageMemberScope@114
+    membersProtos = LinkedHashMap@116 // through DeserializedPackageMemberScope@114
     properties('bar': Name@105) = EmptyList@110[empty] // through DeserializedPackageMemberScope@114
     properties('baz': Name@106) = EmptyList@110[empty] // through DeserializedPackageMemberScope@114
     properties('foo': Name@107) = EmptyList@110[empty] // through DeserializedPackageMemberScope@114
@@ -245,7 +245,7 @@ LazyJavaPackageFragment@13['kotlin'] {
     functions('reflect': Name@136) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
     functions('reflect': Name@136) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@127
     memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@127
-    membersProtos = HashMap@138 // through DeserializedPackageMemberScope@133
+    membersProtos = LinkedHashMap@138 // through DeserializedPackageMemberScope@133
     properties('bar': Name@105) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
     properties('baz': Name@106) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
     properties('foo': Name@107) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.lazy.log

@@ -63,26 +63,26 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@34['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
 DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
 
+DeserializedType@34['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
 DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
 
+DeserializedType@18['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
 DeserializedType@37['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
 }
@@ -182,7 +182,7 @@ LazyJavaPackageFragment@71['io'] {
     functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
     memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
-    membersProtos = HashMap@110 // through DeserializedPackageMemberScope@108
+    membersProtos = LinkedHashMap@110 // through DeserializedPackageMemberScope@108
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
@@ -236,7 +236,7 @@ LazyJavaPackageFragment@13['kotlin'] {
     functions('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
     functions('reflect': Name@127) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
     memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@118
-    membersProtos = HashMap@129 // through DeserializedPackageMemberScope@124
+    membersProtos = LinkedHashMap@129 // through DeserializedPackageMemberScope@124
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionInClassDisallowed.lazy.log

@@ -49,7 +49,7 @@ LazyJavaPackageFragment@22['io'] {
     functions('extInt': Name@35) = EmptyList@37[empty] // through DeserializedPackageMemberScope@40
     functions('extInt': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@39
     memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@39
-    membersProtos = HashMap@42 // through DeserializedPackageMemberScope@40
+    membersProtos = LinkedHashMap@42 // through DeserializedPackageMemberScope@40
     properties('extA': Name@34) = EmptyList@37[empty] // through DeserializedPackageMemberScope@40
     properties('extInt': Name@35) = EmptyList@37[empty] // through DeserializedPackageMemberScope@40
     properties('x': Name@43) = EmptyList@37[empty] // through DeserializedPackageMemberScope@40
@@ -90,7 +90,7 @@ LazyJavaPackageFragment@17['kotlin'] {
     functions('jvm': Name@55) = EmptyList@37[empty] // through DeserializedPackageMemberScope@53
     functions('jvm': Name@55) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@50
     memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@50
-    membersProtos = HashMap@57 // through DeserializedPackageMemberScope@53
+    membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@53
     properties('extA': Name@34) = EmptyList@37[empty] // through DeserializedPackageMemberScope@53
     properties('extInt': Name@35) = EmptyList@37[empty] // through DeserializedPackageMemberScope@53
     properties('io': Name@54) = EmptyList@37[empty] // through DeserializedPackageMemberScope@53

compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionOnNullable.lazy.log

@@ -48,11 +48,6 @@ DeserializedTypeParameterDescriptor@26['T'] {
     upperBoundsAsType = DeserializedType@29['kotlin.Any']
 }
 
-DeserializedType@21['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@30
-    memberScope = DeserializedClassMemberScope@31
-}
-
 DeserializedType@29['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@30
     memberScope = DeserializedClassMemberScope@31
@@ -63,6 +58,11 @@ DeserializedType@17['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@31
 }
 
+DeserializedType@21['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@30
+    memberScope = DeserializedClassMemberScope@31
+}
+
 DeserializedType@25['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@30
     memberScope = DeserializedClassMemberScope@31
@@ -139,7 +139,7 @@ LazyJavaPackageFragment@60['io'] {
     functions('foo': Name@80) = EmptyList@83[empty] // through DeserializedPackageMemberScope@87
     functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
     memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
-    membersProtos = HashMap@89 // through DeserializedPackageMemberScope@87
+    membersProtos = LinkedHashMap@89 // through DeserializedPackageMemberScope@87
     properties('foo': Name@80) = EmptyList@83[empty] // through DeserializedPackageMemberScope@87
 }
 
@@ -176,7 +176,7 @@ LazyJavaPackageFragment@12['kotlin'] {
     functions('reflect': Name@105) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
     functions('reflect': Name@105) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@97
     memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@97
-    membersProtos = HashMap@107 // through DeserializedPackageMemberScope@102
+    membersProtos = LinkedHashMap@107 // through DeserializedPackageMemberScope@102
     properties('foo': Name@80) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
     properties('io': Name@103) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
     properties('jvm': Name@104) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102