Drop enum class object hack

Place valueOf() and values() into the static scope of the corresponding enum
class

 #KT-5580 Fixed
 #KT-2410 Fixed

compiler/testData/builtin-classes.txt

@@ -777,12 +777,6 @@ public final enum class InlineOption : kotlin.Enum<kotlin.InlineOption> {
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
 
-    public class object <class-object-for-InlineOption> {
-        /*primary*/ private constructor <class-object-for-InlineOption>()
-        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kotlin.InlineOption
-        public final /*synthesized*/ fun values(): kotlin.Array<kotlin.InlineOption>
-    }
-
     public enum entry LOCAL_CONTINUE_AND_BREAK : kotlin.InlineOption {
         /*primary*/ private constructor LOCAL_CONTINUE_AND_BREAK()
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -806,6 +800,10 @@ public final enum class InlineOption : kotlin.Enum<kotlin.InlineOption> {
             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> {
@@ -813,12 +811,6 @@ public final enum class InlineStrategy : kotlin.Enum<kotlin.InlineStrategy> {
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
     
-    public class object <class-object-for-InlineStrategy> {
-        /*primary*/ private constructor <class-object-for-InlineStrategy>()
-        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kotlin.InlineStrategy
-        public final /*synthesized*/ fun values(): kotlin.Array<kotlin.InlineStrategy>
-    }
-    
     public enum entry AS_FUNCTION : kotlin.InlineStrategy {
         /*primary*/ private constructor AS_FUNCTION()
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -842,6 +834,10 @@ public final enum class InlineStrategy : kotlin.Enum<kotlin.InlineStrategy> {
             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>
 }
 
 public final class Int : kotlin.Number, kotlin.Comparable<kotlin.Int> {

compiler/testData/codegen/box/enum/classObjectInEnum.kt

@@ -0,0 +1,19 @@
+enum class Game {
+    ROCK
+    PAPER
+    SCISSORS
+
+    class object {
+        fun foo() = ROCK
+        val bar = PAPER
+    }
+}
+
+fun box(): String {
+    if (Game.foo() != Game.ROCK) return "Fail 1"
+    // TODO: fix initialization order and uncomment
+    // if (Game.bar != Game.PAPER) return "Fail 2: ${Game.bar}"
+    if (Game.values().size != 3) return "Fail 3"
+    if (Game.valueOf("SCISSORS") != Game.SCISSORS) return "Fail 4"
+    return "OK"
+}

compiler/testData/compileKotlinAgainstKotlin/ClassObjectInEnum.A.kt

@@ -0,0 +1,9 @@
+package library
+
+public enum class EnumClass {
+    ENTRY
+
+    public class object {
+        public fun entry(): EnumClass = ENTRY
+    }
+}

compiler/testData/compileKotlinAgainstKotlin/ClassObjectInEnum.B.kt

@@ -0,0 +1,5 @@
+import library.EnumClass
+
+fun main(args: Array<String>) {
+    if (EnumClass.entry() != EnumClass.ENTRY) throw AssertionError()
+}

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

@@ -0,0 +1,12 @@
+enum class <!CONFLICTING_JVM_DECLARATIONS, CONFLICTING_JVM_DECLARATIONS!>A<!> {
+    A1
+    A2
+
+    <!CONFLICTING_JVM_DECLARATIONS!>fun valueOf(s: String): A<!> = valueOf(s)
+
+    fun valueOf() = "OK"
+
+    <!CONFLICTING_JVM_DECLARATIONS!>fun values(): Array<A><!> = null!!
+
+    fun values(x: String) = x
+}

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

@@ -0,0 +1,9 @@
+enum class E {
+    ENTRY
+
+    class object {
+        fun entry() = ENTRY
+    }
+}
+
+fun bar() = E.entry()

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

@@ -0,0 +1,10 @@
+enum class E {
+    ENTRY
+
+    private class object
+}
+
+fun foo() = E.values()
+fun bar() = E.valueOf("ENTRY")
+fun baz() = E.ENTRY
+fun quux() = <!INVISIBLE_MEMBER!>E<!>

compiler/testData/diagnostics/tests/enum/classObjectOfPrivateEnum.kt

@@ -1,9 +0,0 @@
-// FILE: 1.kt
-package a
-
-private enum class E { ENTRY }
-
-// FILE: 2.kt
-package b
-
-val e = a.<!INVISIBLE_MEMBER!>E<!>

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

@@ -21,4 +21,4 @@ fun f1() = ENTRY
 fun f2() = ANOTHER
 fun f3() = Nested()
 fun f4() = Nested.foo()
-fun f5() = <!UNRESOLVED_REFERENCE!>values<!>()
+fun f5() = values()

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

@@ -0,0 +1,11 @@
+enum class E {
+    <!REDECLARATION!>FIRST<!>
+
+    <!REDECLARATION!>SECOND<!>
+
+    class object {
+        class <!REDECLARATION!>FIRST<!>
+
+        val <!REDECLARATION!>SECOND<!> = this
+    }
+}

compiler/testData/loadJava/compiledJava/EnumMembers.txt

@@ -7,12 +7,6 @@ public final enum class EnumMembers : kotlin.Enum<test.EnumMembers> {
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
 
-    public class object <class-object-for-EnumMembers> {
-        private constructor <class-object-for-EnumMembers>()
-        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumMembers
-        public final /*synthesized*/ fun values(): kotlin.Array<test.EnumMembers>
-    }
-
     public enum entry FIRST : test.EnumMembers {
         private constructor FIRST()
         public final override /*1*/ /*fake_override*/ val isFirst: kotlin.Boolean
@@ -44,4 +38,8 @@ public final enum class EnumMembers : kotlin.Enum<test.EnumMembers> {
             public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
         }
     }
+
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumMembers
+    public final /*synthesized*/ fun values(): kotlin.Array<test.EnumMembers>
 }

compiler/testData/loadJava/compiledJava/JavaEnum.txt

@@ -5,12 +5,6 @@ public final enum class JavaEnum : kotlin.Enum<test.JavaEnum> {
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
 
-    public class object <class-object-for-JavaEnum> {
-        private constructor <class-object-for-JavaEnum>()
-        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.JavaEnum
-        public final /*synthesized*/ fun values(): kotlin.Array<test.JavaEnum>
-    }
-
     public enum entry ANOTHER : test.JavaEnum {
         private constructor ANOTHER()
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -34,4 +28,8 @@ public final enum class JavaEnum : kotlin.Enum<test.JavaEnum> {
             public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
         }
     }
+
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.JavaEnum
+    public final /*synthesized*/ fun values(): kotlin.Array<test.JavaEnum>
 }

compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt

@@ -12,12 +12,6 @@ public trait CustomAnnotation {
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
         public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
 
-        public class object <class-object-for-MyEnum> {
-            private constructor <class-object-for-MyEnum>()
-            public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.CustomAnnotation.MyEnum
-            public final /*synthesized*/ fun values(): kotlin.Array<test.CustomAnnotation.MyEnum>
-        }
-
         public enum entry ONE : test.CustomAnnotation.MyEnum {
             private constructor ONE()
             public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -29,6 +23,10 @@ public trait CustomAnnotation {
                 public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
             }
         }
+
+        // Static members
+        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.CustomAnnotation.MyEnum
+        public final /*synthesized*/ fun values(): kotlin.Array<test.CustomAnnotation.MyEnum>
     }
 
     test.CustomAnnotation.MyAnnotation(value = MyEnum.ONE: test.CustomAnnotation.MyEnum) public open class MyTest {

compiler/testData/loadJava/compiledJava/static/Enum.txt

@@ -5,12 +5,6 @@ public final enum class Enum : kotlin.Enum<test.Enum> {
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
 
-    public class object <class-object-for-Enum> {
-        private constructor <class-object-for-Enum>()
-        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Enum
-        public final /*synthesized*/ fun values(): kotlin.Array<test.Enum>
-    }
-
     public enum entry A : test.Enum {
         private constructor A()
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -58,4 +52,8 @@ public final enum class Enum : kotlin.Enum<test.Enum> {
         public/*package*/ open fun foo(): kotlin.Unit
         public/*package*/ open fun values(): kotlin.Unit
     }
+
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Enum
+    public final /*synthesized*/ fun values(): kotlin.Array<test.Enum>
 }

compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt

@@ -5,12 +5,6 @@ public final enum class StaticMembersInEnum : kotlin.Enum<test.StaticMembersInEn
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
     
-    public class object <class-object-for-StaticMembersInEnum> {
-        private constructor <class-object-for-StaticMembersInEnum>()
-        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.StaticMembersInEnum
-        public final /*synthesized*/ fun values(): kotlin.Array<test.StaticMembersInEnum>
-    }
-    
     public enum entry ENTRY : test.StaticMembersInEnum {
         private constructor ENTRY()
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -28,5 +22,7 @@ public final enum class StaticMembersInEnum : kotlin.Enum<test.StaticMembersInEn
     public final var STATIC_FIELD: kotlin.Int
     public open fun foo(): kotlin.Unit
     public open fun valueOf(/*0*/ p0: kotlin.Int): kotlin.Unit
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.StaticMembersInEnum
+    public final /*synthesized*/ fun values(): kotlin.Array<test.StaticMembersInEnum>
     public open fun values(/*0*/ p0: kotlin.Int): kotlin.Unit
 }

compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.txt

@@ -17,9 +17,7 @@ internal final enum class E : kotlin.Enum<test.E> {
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
     
-    public class object <class-object-for-E> {
-        /*primary*/ private constructor <class-object-for-E>()
-        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E
-        public final /*synthesized*/ fun values(): kotlin.Array<test.E>
-    }
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.E
+    public final /*synthesized*/ fun values(): kotlin.Array<test.E>
 }

compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt

@@ -5,9 +5,7 @@ internal final enum class EnumWithGenericConstructorParameter : kotlin.Enum<test
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
     
-    public class object <class-object-for-EnumWithGenericConstructorParameter> {
-        /*primary*/ private constructor <class-object-for-EnumWithGenericConstructorParameter>()
-        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumWithGenericConstructorParameter
-        public final /*synthesized*/ fun values(): kotlin.Array<test.EnumWithGenericConstructorParameter>
-    }
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumWithGenericConstructorParameter
+    public final /*synthesized*/ fun values(): kotlin.Array<test.EnumWithGenericConstructorParameter>
 }

compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt

@@ -5,9 +5,7 @@ internal final enum class EnumWithPrimitiveConstructorParameter : kotlin.Enum<te
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
     
-    public class object <class-object-for-EnumWithPrimitiveConstructorParameter> {
-        /*primary*/ private constructor <class-object-for-EnumWithPrimitiveConstructorParameter>()
-        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumWithPrimitiveConstructorParameter
-        public final /*synthesized*/ fun values(): kotlin.Array<test.EnumWithPrimitiveConstructorParameter>
-    }
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumWithPrimitiveConstructorParameter
+    public final /*synthesized*/ fun values(): kotlin.Array<test.EnumWithPrimitiveConstructorParameter>
 }

compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.txt

@@ -5,12 +5,6 @@ internal final enum class In : kotlin.Enum<test.In> {
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
     
-    public class object <class-object-for-In> {
-        /*primary*/ private constructor <class-object-for-In>()
-        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.In
-        public final /*synthesized*/ fun values(): kotlin.Array<test.In>
-    }
-    
     public enum entry A : test.In {
         /*primary*/ private constructor A()
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -22,6 +16,10 @@ internal final enum class In : kotlin.Enum<test.In> {
             public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
         }
     }
+
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.In
+    public final /*synthesized*/ fun values(): kotlin.Array<test.In>
 }
 
 private final enum class Pr : kotlin.Enum<test.Pr> {
@@ -29,12 +27,6 @@ private final enum class Pr : kotlin.Enum<test.Pr> {
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
     
-    public class object <class-object-for-Pr> {
-        /*primary*/ private constructor <class-object-for-Pr>()
-        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Pr
-        public final /*synthesized*/ fun values(): kotlin.Array<test.Pr>
-    }
-    
     public enum entry A : test.Pr {
         /*primary*/ private constructor A()
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -46,6 +38,10 @@ private final enum class Pr : kotlin.Enum<test.Pr> {
             public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
         }
     }
+
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Pr
+    public final /*synthesized*/ fun values(): kotlin.Array<test.Pr>
 }
 
 public final enum class Pu : kotlin.Enum<test.Pu> {
@@ -53,12 +49,6 @@ public final enum class Pu : kotlin.Enum<test.Pu> {
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
     
-    public class object <class-object-for-Pu> {
-        /*primary*/ private constructor <class-object-for-Pu>()
-        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Pu
-        public final /*synthesized*/ fun values(): kotlin.Array<test.Pu>
-    }
-    
     public enum entry A : test.Pu {
         /*primary*/ private constructor A()
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -70,4 +60,8 @@ public final enum class Pu : kotlin.Enum<test.Pu> {
             public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
         }
     }
+
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Pu
+    public final /*synthesized*/ fun values(): kotlin.Array<test.Pu>
 }

compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.txt

@@ -9,12 +9,6 @@ internal final enum class En : kotlin.Enum<test.En> {
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
     
-    public class object <class-object-for-En> {
-        /*primary*/ private constructor <class-object-for-En>()
-        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.En
-        public final /*synthesized*/ fun values(): kotlin.Array<test.En>
-    }
-    
     public enum entry E1 : test.En {
         /*primary*/ private constructor E1()
         internal final override /*1*/ /*fake_override*/ val b: kotlin.Boolean
@@ -74,4 +68,8 @@ internal final enum class En : kotlin.Enum<test.En> {
             public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
         }
     }
+
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.En
+    public final /*synthesized*/ fun values(): kotlin.Array<test.En>
 }

compiler/testData/loadJava/compiledKotlin/enum/innerEnum.txt

@@ -8,12 +8,6 @@ internal final class A {
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
         public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
         
-        public class object <class-object-for-E> {
-            /*primary*/ private constructor <class-object-for-E>()
-            public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.A.E
-            public final /*synthesized*/ fun values(): kotlin.Array<test.A.E>
-        }
-        
         public enum entry ENTRY : test.A.E {
             /*primary*/ private constructor ENTRY()
             public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -25,5 +19,9 @@ internal final class A {
                 public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
             }
         }
+
+        // Static members
+        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.A.E
+        public final /*synthesized*/ fun values(): kotlin.Array<test.A.E>
     }
 }

compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt

@@ -12,12 +12,6 @@ internal final class A {
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
         public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
         
-        public class object <class-object-for-E> {
-            /*primary*/ private constructor <class-object-for-E>()
-            public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.A.E
-            public final /*synthesized*/ fun values(): kotlin.Array<test.A.E>
-        }
-        
         public enum entry ENTRY : test.A.E {
             /*primary*/ private constructor ENTRY()
             public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -29,5 +23,9 @@ internal final class A {
                 public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
             }
         }
+
+        // Static members
+        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.A.E
+        public final /*synthesized*/ fun values(): kotlin.Array<test.A.E>
     }
 }

compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.txt

@@ -5,12 +5,6 @@ internal final enum class MyEnum : kotlin.Enum<test.MyEnum> {
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
     
-    public class object <class-object-for-MyEnum> {
-        /*primary*/ private constructor <class-object-for-MyEnum>()
-        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.MyEnum
-        public final /*synthesized*/ fun values(): kotlin.Array<test.MyEnum>
-    }
-    
     public enum entry ENTRY : test.MyEnum {
         /*primary*/ private constructor ENTRY()
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -22,4 +16,8 @@ internal final enum class MyEnum : kotlin.Enum<test.MyEnum> {
             public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
         }
     }
+
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.MyEnum
+    public final /*synthesized*/ fun values(): kotlin.Array<test.MyEnum>
 }

compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.txt

@@ -5,12 +5,6 @@ internal final enum class Test : kotlin.Enum<test.Test> {
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
     
-    public class object <class-object-for-Test> {
-        /*primary*/ private constructor <class-object-for-Test>()
-        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Test
-        public final /*synthesized*/ fun values(): kotlin.Array<test.Test>
-    }
-    
     public enum entry A : test.Test {
         /*primary*/ private constructor A()
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -34,4 +28,8 @@ internal final enum class Test : kotlin.Enum<test.Test> {
             public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
         }
     }
+
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Test
+    public final /*synthesized*/ fun values(): kotlin.Array<test.Test>
 }