[Tests] Use stable order for ir/kotlinLike dumps

^KT-65406

compiler/testData/ir/irText/singletons/companion.ir.txt

@@ -1,24 +1,12 @@
 FILE fqName:<root> fileName:/companion.kt
   CLASS CLASS name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Z
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Z [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]'
-    FUN name:test2 visibility:public modality:FINAL <> ($this:<root>.Z) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:<root>.Z
-      BLOCK_BODY
-        CALL 'public final fun test (): kotlin.Unit declared in <root>.Z.Companion' type=kotlin.Unit origin=null
-          $this: GET_OBJECT 'CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=<root>.Z.Companion
     CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Z.Companion
       CONSTRUCTOR visibility:private <> () returnType:<root>.Z.Companion [primary]
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
           INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]'
-      FUN name:test visibility:public modality:FINAL <> ($this:<root>.Z.Companion) returnType:kotlin.Unit
-        $this: VALUE_PARAMETER name:<this> type:<root>.Z.Companion
-        BLOCK_BODY
       FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
         overridden:
           public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -32,6 +20,13 @@ FILE fqName:<root> fileName:/companion.kt
         overridden:
           public open fun toString (): kotlin.String declared in kotlin.Any
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      FUN name:test visibility:public modality:FINAL <> ($this:<root>.Z.Companion) returnType:kotlin.Unit
+        $this: VALUE_PARAMETER name:<this> type:<root>.Z.Companion
+        BLOCK_BODY
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Z [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]'
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -45,3 +40,8 @@ FILE fqName:<root> fileName:/companion.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:test2 visibility:public modality:FINAL <> ($this:<root>.Z) returnType:kotlin.Unit
+      $this: VALUE_PARAMETER name:<this> type:<root>.Z
+      BLOCK_BODY
+        CALL 'public final fun test (): kotlin.Unit declared in <root>.Z.Companion' type=kotlin.Unit origin=null
+          $this: GET_OBJECT 'CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=<root>.Z.Companion

compiler/testData/ir/irText/singletons/companion.kt.txt

@@ -1,14 +1,4 @@
 class Z {
-  constructor() /* primary */ {
-    super/*Any*/()
-    /* <init>() */
-
-  }
-
-  fun test2() {
-    Companion.test()
-  }
-
   companion object Companion {
     private constructor() /* primary */ {
       super/*Any*/()
@@ -21,4 +11,15 @@ class Z {
 
   }
 
+  constructor() /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
+  }
+
+  fun test2() {
+    Companion.test()
+  }
+
 }
+

compiler/testData/ir/irText/singletons/enumEntry.fir.ir.txt

@@ -1,23 +1,11 @@
 FILE fqName:<root> fileName:/enumEntry.kt
   CLASS ENUM_CLASS name:Z modality:OPEN visibility:public superTypes:[kotlin.Enum<<root>.Z>]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Z
-    CONSTRUCTOR visibility:private <> () returnType:<root>.Z [primary]
-      BLOCK_BODY
-        ENUM_CONSTRUCTOR_CALL 'public constructor <init> (name: kotlin.String, ordinal: kotlin.Int) declared in kotlin.Enum'
-          <E>: <root>.Z
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:Z modality:OPEN visibility:public superTypes:[kotlin.Enum<<root>.Z>]'
     ENUM_ENTRY name:ENTRY
       init: EXPRESSION_BODY
         ENUM_CONSTRUCTOR_CALL 'private constructor <init> () declared in <root>.Z.ENTRY'
       class: CLASS ENUM_ENTRY name:ENTRY modality:FINAL visibility:private superTypes:[<root>.Z]
         $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Z.ENTRY
-        CONSTRUCTOR visibility:private <> () returnType:<root>.Z.ENTRY [primary]
-          BLOCK_BODY
-            ENUM_CONSTRUCTOR_CALL 'private constructor <init> () declared in <root>.Z'
-            INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ENTRY modality:FINAL visibility:private superTypes:[<root>.Z]'
-        FUN name:test visibility:public modality:FINAL <> ($this:<root>.Z.ENTRY) returnType:kotlin.Unit
-          $this: VALUE_PARAMETER name:<this> type:<root>.Z.ENTRY
-          BLOCK_BODY
         CLASS CLASS name:A modality:FINAL visibility:local [inner] superTypes:[kotlin.Any]
           $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Z.ENTRY.A
           CONSTRUCTOR visibility:public <> ($this:<root>.Z.ENTRY) returnType:<root>.Z.ENTRY.A [primary]
@@ -25,11 +13,6 @@ FILE fqName:<root> fileName:/enumEntry.kt
             BLOCK_BODY
               DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
               INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:FINAL visibility:local [inner] superTypes:[kotlin.Any]'
-          FUN name:test2 visibility:public modality:FINAL <> ($this:<root>.Z.ENTRY.A) returnType:kotlin.Unit
-            $this: VALUE_PARAMETER name:<this> type:<root>.Z.ENTRY.A
-            BLOCK_BODY
-              CALL 'public final fun test (): kotlin.Unit declared in <root>.Z.ENTRY' type=kotlin.Unit origin=null
-                $this: GET_VAR '<this>: <root>.Z.ENTRY declared in <root>.Z.ENTRY' type=<root>.Z.ENTRY origin=null
           FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
             overridden:
               public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -43,6 +26,15 @@ FILE fqName:<root> fileName:/enumEntry.kt
             overridden:
               public open fun toString (): kotlin.String declared in kotlin.Any
             $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+          FUN name:test2 visibility:public modality:FINAL <> ($this:<root>.Z.ENTRY.A) returnType:kotlin.Unit
+            $this: VALUE_PARAMETER name:<this> type:<root>.Z.ENTRY.A
+            BLOCK_BODY
+              CALL 'public final fun test (): kotlin.Unit declared in <root>.Z.ENTRY' type=kotlin.Unit origin=null
+                $this: GET_VAR '<this>: <root>.Z.ENTRY declared in <root>.Z.ENTRY' type=<root>.Z.ENTRY origin=null
+        CONSTRUCTOR visibility:private <> () returnType:<root>.Z.ENTRY [primary]
+          BLOCK_BODY
+            ENUM_CONSTRUCTOR_CALL 'private constructor <init> () declared in <root>.Z'
+            INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ENTRY modality:FINAL visibility:private superTypes:[<root>.Z]'
         FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.Z>, other:<root>.Z) returnType:kotlin.Int [fake_override,operator]
           overridden:
             public final fun compareTo (other: <root>.Z): kotlin.Int declared in <root>.Z
@@ -61,6 +53,9 @@ FILE fqName:<root> fileName:/enumEntry.kt
           overridden:
             public open fun toString (): kotlin.String declared in <root>.Z
           $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
+        FUN name:test visibility:public modality:FINAL <> ($this:<root>.Z.ENTRY) returnType:kotlin.Unit
+          $this: VALUE_PARAMETER name:<this> type:<root>.Z.ENTRY
+          BLOCK_BODY
         PROPERTY FAKE_OVERRIDE name:name visibility:public modality:FINAL [fake_override,val]
           annotations:
             IntrinsicConstEvaluation
@@ -79,15 +74,16 @@ FILE fqName:<root> fileName:/enumEntry.kt
             overridden:
               public final fun <get-ordinal> (): kotlin.Int declared in <root>.Z
             $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
-    FUN ENUM_CLASS_SPECIAL_MEMBER name:values visibility:public modality:FINAL <> () returnType:kotlin.Array<<root>.Z>
-      SYNTHETIC_BODY kind=ENUM_VALUES
+    CONSTRUCTOR visibility:private <> () returnType:<root>.Z [primary]
+      BLOCK_BODY
+        ENUM_CONSTRUCTOR_CALL 'public constructor <init> (name: kotlin.String, ordinal: kotlin.Int) declared in kotlin.Enum'
+          <E>: <root>.Z
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:Z modality:OPEN visibility:public superTypes:[kotlin.Enum<<root>.Z>]'
     FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.Z
       VALUE_PARAMETER name:value index:0 type:kotlin.String
       SYNTHETIC_BODY kind=ENUM_VALUEOF
-    PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
-      FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.Z>
-        correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
-        SYNTHETIC_BODY kind=ENUM_ENTRIES
+    FUN ENUM_CLASS_SPECIAL_MEMBER name:values visibility:public modality:FINAL <> () returnType:kotlin.Array<<root>.Z>
+      SYNTHETIC_BODY kind=ENUM_VALUES
     FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.Z>, other:<root>.Z) returnType:kotlin.Int [fake_override,operator]
       overridden:
         public final fun compareTo (other: E of kotlin.Enum): kotlin.Int declared in kotlin.Enum
@@ -106,6 +102,10 @@ FILE fqName:<root> fileName:/enumEntry.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Enum
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
+    PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
+      FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.Z>
+        correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
+        SYNTHETIC_BODY kind=ENUM_ENTRIES
     PROPERTY FAKE_OVERRIDE name:name visibility:public modality:FINAL [fake_override,val]
       annotations:
         IntrinsicConstEvaluation

compiler/testData/ir/irText/singletons/enumEntry.fir.kt.txt

@@ -1,21 +1,7 @@
 open enum class Z : Enum<Z> {
-  private constructor() /* primary */ {
-    super/*Enum*/<Z>()
-    /* <init>() */
-
-  }
 
   ENTRY = ENTRY()
   private enum entry class ENTRY : Z {
-    private constructor() /* primary */ {
-      super/*Z*/()
-      /* <init>() */
-
-    }
-
-    fun test() {
-    }
-
     local inner class A {
       constructor() /* primary */ {
         super/*Any*/()
@@ -29,12 +15,27 @@ open enum class Z : Enum<Z> {
 
     }
 
+    private constructor() /* primary */ {
+      super/*Z*/()
+      /* <init>() */
+
+    }
+
+    fun test() {
+    }
+
   }
 
-  fun values(): Array<Z> /* Synthetic body for ENUM_VALUES */
+  private constructor() /* primary */ {
+    super/*Enum*/<Z>()
+    /* <init>() */
+
+  }
 
   fun valueOf(value: String): Z /* Synthetic body for ENUM_VALUEOF */
 
+  fun values(): Array<Z> /* Synthetic body for ENUM_VALUES */
+
   val entries: EnumEntries<Z>
     get(): EnumEntries<Z> /* Synthetic body for ENUM_ENTRIES */
 

compiler/testData/ir/irText/singletons/enumEntry.ir.txt

@@ -1,24 +1,11 @@
 FILE fqName:<root> fileName:/enumEntry.kt
   CLASS ENUM_CLASS name:Z modality:OPEN visibility:public superTypes:[kotlin.Enum<<root>.Z>]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Z
-    CONSTRUCTOR visibility:private <> () returnType:<root>.Z [primary]
-      BLOCK_BODY
-        ENUM_CONSTRUCTOR_CALL 'public constructor <init> (name: kotlin.String, ordinal: kotlin.Int) declared in kotlin.Enum'
-          <E>: <root>.Z
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:Z modality:OPEN visibility:public superTypes:[kotlin.Enum<<root>.Z>]'
     ENUM_ENTRY name:ENTRY
       init: EXPRESSION_BODY
         ENUM_CONSTRUCTOR_CALL 'private constructor <init> () declared in <root>.Z.ENTRY'
       class: CLASS ENUM_ENTRY name:ENTRY modality:FINAL visibility:private superTypes:[<root>.Z]
         $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Z.ENTRY
-        CONSTRUCTOR visibility:private <> () returnType:<root>.Z.ENTRY [primary]
-          BLOCK_BODY
-            TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
-              ENUM_CONSTRUCTOR_CALL 'private constructor <init> () declared in <root>.Z'
-            INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ENTRY modality:FINAL visibility:private superTypes:[<root>.Z]'
-        FUN name:test visibility:public modality:FINAL <> ($this:<root>.Z.ENTRY) returnType:kotlin.Unit
-          $this: VALUE_PARAMETER name:<this> type:<root>.Z.ENTRY
-          BLOCK_BODY
         CLASS CLASS name:A modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]
           $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Z.ENTRY.A
           CONSTRUCTOR visibility:public <> ($this:<root>.Z.ENTRY) returnType:<root>.Z.ENTRY.A [primary]
@@ -26,11 +13,6 @@ FILE fqName:<root> fileName:/enumEntry.kt
             BLOCK_BODY
               DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
               INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]'
-          FUN name:test2 visibility:public modality:FINAL <> ($this:<root>.Z.ENTRY.A) returnType:kotlin.Unit
-            $this: VALUE_PARAMETER name:<this> type:<root>.Z.ENTRY.A
-            BLOCK_BODY
-              CALL 'public final fun test (): kotlin.Unit declared in <root>.Z.ENTRY' type=kotlin.Unit origin=null
-                $this: GET_ENUM 'ENUM_ENTRY name:ENTRY' type=<root>.Z.ENTRY
           FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
             overridden:
               public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -44,24 +26,16 @@ FILE fqName:<root> fileName:/enumEntry.kt
             overridden:
               public open fun toString (): kotlin.String declared in kotlin.Any
             $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-        PROPERTY FAKE_OVERRIDE name:name visibility:public modality:FINAL [fake_override,val]
-          annotations:
-            IntrinsicConstEvaluation
-          overridden:
-            public final name: kotlin.String
-          FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.Z>) returnType:kotlin.String [fake_override]
-            correspondingProperty: PROPERTY FAKE_OVERRIDE name:name visibility:public modality:FINAL [fake_override,val]
-            overridden:
-              public final fun <get-name> (): kotlin.String declared in <root>.Z
-            $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
-        PROPERTY FAKE_OVERRIDE name:ordinal visibility:public modality:FINAL [fake_override,val]
-          overridden:
-            public final ordinal: kotlin.Int
-          FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.Z>) returnType:kotlin.Int [fake_override]
-            correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal visibility:public modality:FINAL [fake_override,val]
-            overridden:
-              public final fun <get-ordinal> (): kotlin.Int declared in <root>.Z
-            $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
+          FUN name:test2 visibility:public modality:FINAL <> ($this:<root>.Z.ENTRY.A) returnType:kotlin.Unit
+            $this: VALUE_PARAMETER name:<this> type:<root>.Z.ENTRY.A
+            BLOCK_BODY
+              CALL 'public final fun test (): kotlin.Unit declared in <root>.Z.ENTRY' type=kotlin.Unit origin=null
+                $this: GET_ENUM 'ENUM_ENTRY name:ENTRY' type=<root>.Z.ENTRY
+        CONSTRUCTOR visibility:private <> () returnType:<root>.Z.ENTRY [primary]
+          BLOCK_BODY
+            TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
+              ENUM_CONSTRUCTOR_CALL 'private constructor <init> () declared in <root>.Z'
+            INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ENTRY modality:FINAL visibility:private superTypes:[<root>.Z]'
         FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.Z>, other:<root>.Z) returnType:kotlin.Int [fake_override,operator]
           overridden:
             public final fun compareTo (other: <root>.Z): kotlin.Int declared in <root>.Z
@@ -80,24 +54,37 @@ FILE fqName:<root> fileName:/enumEntry.kt
           overridden:
             public open fun toString (): kotlin.String declared in <root>.Z
           $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
-    PROPERTY FAKE_OVERRIDE name:name visibility:public modality:FINAL [fake_override,val]
-      annotations:
-        IntrinsicConstEvaluation
-      overridden:
-        public final name: kotlin.String
-      FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.Z>) returnType:kotlin.String [fake_override]
-        correspondingProperty: PROPERTY FAKE_OVERRIDE name:name visibility:public modality:FINAL [fake_override,val]
-        overridden:
-          public final fun <get-name> (): kotlin.String declared in kotlin.Enum
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
-    PROPERTY FAKE_OVERRIDE name:ordinal visibility:public modality:FINAL [fake_override,val]
-      overridden:
-        public final ordinal: kotlin.Int
-      FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.Z>) returnType:kotlin.Int [fake_override]
-        correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal visibility:public modality:FINAL [fake_override,val]
-        overridden:
-          public final fun <get-ordinal> (): kotlin.Int declared in kotlin.Enum
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
+        FUN name:test visibility:public modality:FINAL <> ($this:<root>.Z.ENTRY) returnType:kotlin.Unit
+          $this: VALUE_PARAMETER name:<this> type:<root>.Z.ENTRY
+          BLOCK_BODY
+        PROPERTY FAKE_OVERRIDE name:name visibility:public modality:FINAL [fake_override,val]
+          annotations:
+            IntrinsicConstEvaluation
+          overridden:
+            public final name: kotlin.String
+          FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.Z>) returnType:kotlin.String [fake_override]
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:name visibility:public modality:FINAL [fake_override,val]
+            overridden:
+              public final fun <get-name> (): kotlin.String declared in <root>.Z
+            $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
+        PROPERTY FAKE_OVERRIDE name:ordinal visibility:public modality:FINAL [fake_override,val]
+          overridden:
+            public final ordinal: kotlin.Int
+          FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.Z>) returnType:kotlin.Int [fake_override]
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal visibility:public modality:FINAL [fake_override,val]
+            overridden:
+              public final fun <get-ordinal> (): kotlin.Int declared in <root>.Z
+            $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
+    CONSTRUCTOR visibility:private <> () returnType:<root>.Z [primary]
+      BLOCK_BODY
+        ENUM_CONSTRUCTOR_CALL 'public constructor <init> (name: kotlin.String, ordinal: kotlin.Int) declared in kotlin.Enum'
+          <E>: <root>.Z
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:Z modality:OPEN visibility:public superTypes:[kotlin.Enum<<root>.Z>]'
+    FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.Z
+      VALUE_PARAMETER name:value index:0 type:kotlin.String
+      SYNTHETIC_BODY kind=ENUM_VALUEOF
+    FUN ENUM_CLASS_SPECIAL_MEMBER name:values visibility:public modality:FINAL <> () returnType:kotlin.Array<<root>.Z>
+      SYNTHETIC_BODY kind=ENUM_VALUES
     FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.Z>, other:<root>.Z) returnType:kotlin.Int [fake_override,operator]
       overridden:
         public final fun compareTo (other: E of kotlin.Enum): kotlin.Int declared in kotlin.Enum
@@ -116,12 +103,25 @@ FILE fqName:<root> fileName:/enumEntry.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Enum
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
-    FUN ENUM_CLASS_SPECIAL_MEMBER name:values visibility:public modality:FINAL <> () returnType:kotlin.Array<<root>.Z>
-      SYNTHETIC_BODY kind=ENUM_VALUES
-    FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.Z
-      VALUE_PARAMETER name:value index:0 type:kotlin.String
-      SYNTHETIC_BODY kind=ENUM_VALUEOF
     PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
       FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.Z>
         correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
         SYNTHETIC_BODY kind=ENUM_ENTRIES
+    PROPERTY FAKE_OVERRIDE name:name visibility:public modality:FINAL [fake_override,val]
+      annotations:
+        IntrinsicConstEvaluation
+      overridden:
+        public final name: kotlin.String
+      FUN FAKE_OVERRIDE name:<get-name> visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.Z>) returnType:kotlin.String [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:name visibility:public modality:FINAL [fake_override,val]
+        overridden:
+          public final fun <get-name> (): kotlin.String declared in kotlin.Enum
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>
+    PROPERTY FAKE_OVERRIDE name:ordinal visibility:public modality:FINAL [fake_override,val]
+      overridden:
+        public final ordinal: kotlin.Int
+      FUN FAKE_OVERRIDE name:<get-ordinal> visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.Z>) returnType:kotlin.Int [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:ordinal visibility:public modality:FINAL [fake_override,val]
+        overridden:
+          public final fun <get-ordinal> (): kotlin.Int declared in kotlin.Enum
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.Z>

compiler/testData/ir/irText/singletons/enumEntry.kt.txt

@@ -1,21 +1,7 @@
 open enum class Z : Enum<Z> {
-  private constructor() /* primary */ {
-    super/*Enum*/<Z>()
-    /* <init>() */
-
-  }
 
   ENTRY = ENTRY()
   private enum entry class ENTRY : Z {
-    private constructor() /* primary */ {
-      super/*Z*/() /*~> Unit */
-      /* <init>() */
-
-    }
-
-    fun test() {
-    }
-
     inner class A {
       constructor() /* primary */ {
         super/*Any*/()
@@ -29,13 +15,29 @@ open enum class Z : Enum<Z> {
 
     }
 
+    private constructor() /* primary */ {
+      super/*Z*/() /*~> Unit */
+      /* <init>() */
+
+    }
+
+    fun test() {
+    }
+
   }
 
-  fun values(): Array<Z> /* Synthetic body for ENUM_VALUES */
+  private constructor() /* primary */ {
+    super/*Enum*/<Z>()
+    /* <init>() */
+
+  }
 
   fun valueOf(value: String): Z /* Synthetic body for ENUM_VALUEOF */
 
+  fun values(): Array<Z> /* Synthetic body for ENUM_VALUES */
+
   val entries: EnumEntries<Z>
     get(): EnumEntries<Z> /* Synthetic body for ENUM_ENTRIES */
 
 }
+

compiler/testData/ir/irText/singletons/object.ir.txt

@@ -1,24 +1,12 @@
 FILE fqName:<root> fileName:/object.kt
   CLASS OBJECT name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Z
-    CONSTRUCTOR visibility:private <> () returnType:<root>.Z [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]'
-    FUN name:test visibility:public modality:FINAL <> ($this:<root>.Z) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:<root>.Z
-      BLOCK_BODY
     CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any]
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Z.A
       CONSTRUCTOR visibility:public <> () returnType:<root>.Z.A [primary]
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
           INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any]'
-      FUN name:test2 visibility:public modality:FINAL <> ($this:<root>.Z.A) returnType:kotlin.Unit
-        $this: VALUE_PARAMETER name:<this> type:<root>.Z.A
-        BLOCK_BODY
-          CALL 'public final fun test (): kotlin.Unit declared in <root>.Z' type=kotlin.Unit origin=null
-            $this: GET_OBJECT 'CLASS OBJECT name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.Z
       FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
         overridden:
           public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -32,6 +20,15 @@ FILE fqName:<root> fileName:/object.kt
         overridden:
           public open fun toString (): kotlin.String declared in kotlin.Any
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      FUN name:test2 visibility:public modality:FINAL <> ($this:<root>.Z.A) returnType:kotlin.Unit
+        $this: VALUE_PARAMETER name:<this> type:<root>.Z.A
+        BLOCK_BODY
+          CALL 'public final fun test (): kotlin.Unit declared in <root>.Z' type=kotlin.Unit origin=null
+            $this: GET_OBJECT 'CLASS OBJECT name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]' type=<root>.Z
+    CONSTRUCTOR visibility:private <> () returnType:<root>.Z [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]'
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -45,3 +42,6 @@ FILE fqName:<root> fileName:/object.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:test visibility:public modality:FINAL <> ($this:<root>.Z) returnType:kotlin.Unit
+      $this: VALUE_PARAMETER name:<this> type:<root>.Z
+      BLOCK_BODY

compiler/testData/ir/irText/singletons/object.kt.txt

@@ -1,13 +1,4 @@
 object Z {
-  private constructor() /* primary */ {
-    super/*Any*/()
-    /* <init>() */
-
-  }
-
-  fun test() {
-  }
-
   class A {
     constructor() /* primary */ {
       super/*Any*/()
@@ -21,4 +12,14 @@ object Z {
 
   }
 
+  private constructor() /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
+  }
+
+  fun test() {
+  }
+
 }
+