[Tests] Use stable order for ir/kotlinLike dumps

^KT-65406

compiler/testData/codegen/box/annotations/instances/AnnotationInstantiationWithArray.ir.txt

@@ -2,6 +2,50 @@ Module: lib
 FILE fqName:a fileName:/AnnotationInstantiationWithArrayLib.kt
   CLASS ANNOTATION_CLASS name:Outer modality:OPEN visibility:public superTypes:[kotlin.Annotation]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:a.Outer
+    PROPERTY name:array visibility:public modality:FINAL [val]
+      FIELD PROPERTY_BACKING_FIELD name:array type:kotlin.Array<a.Outer.Inner> visibility:private [final]
+        EXPRESSION_BODY
+          GET_VAR 'array: kotlin.Array<a.Outer.Inner> declared in a.Outer.<init>' type=kotlin.Array<a.Outer.Inner> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-array> visibility:public modality:FINAL <> ($this:a.Outer) returnType:kotlin.Array<a.Outer.Inner>
+        correspondingProperty: PROPERTY name:array visibility:public modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:a.Outer
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-array> (): kotlin.Array<a.Outer.Inner> declared in a.Outer'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:array type:kotlin.Array<a.Outer.Inner> visibility:private [final]' type=kotlin.Array<a.Outer.Inner> origin=null
+              receiver: GET_VAR '<this>: a.Outer declared in a.Outer.<get-array>' type=a.Outer origin=null
+    CLASS ANNOTATION_CLASS name:Inner modality:OPEN visibility:public superTypes:[kotlin.Annotation]
+      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:a.Outer.Inner
+      PROPERTY name:v visibility:public modality:FINAL [val]
+        FIELD PROPERTY_BACKING_FIELD name:v type:kotlin.IntArray visibility:private [final]
+          EXPRESSION_BODY
+            GET_VAR 'v: kotlin.IntArray declared in a.Outer.Inner.<init>' type=kotlin.IntArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+        FUN DEFAULT_PROPERTY_ACCESSOR name:<get-v> visibility:public modality:FINAL <> ($this:a.Outer.Inner) returnType:kotlin.IntArray
+          correspondingProperty: PROPERTY name:v visibility:public modality:FINAL [val]
+          $this: VALUE_PARAMETER name:<this> type:a.Outer.Inner
+          BLOCK_BODY
+            RETURN type=kotlin.Nothing from='public final fun <get-v> (): kotlin.IntArray declared in a.Outer.Inner'
+              GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:v type:kotlin.IntArray visibility:private [final]' type=kotlin.IntArray origin=null
+                receiver: GET_VAR '<this>: a.Outer.Inner declared in a.Outer.Inner.<get-v>' type=a.Outer.Inner origin=null
+      CONSTRUCTOR visibility:public <> (v:kotlin.IntArray) returnType:a.Outer.Inner [primary]
+        VALUE_PARAMETER name:v index:0 type:kotlin.IntArray
+          EXPRESSION_BODY
+            VARARG type=kotlin.IntArray varargElementType=kotlin.Int
+        BLOCK_BODY
+          DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:Inner modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
+      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.Annotation
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+        VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+      FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+        overridden:
+          public open fun hashCode (): kotlin.Int declared in kotlin.Annotation
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+        overridden:
+          public open fun toString (): kotlin.String declared in kotlin.Annotation
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     CONSTRUCTOR visibility:public <> (array:kotlin.Array<a.Outer.Inner>) returnType:a.Outer [primary]
       VALUE_PARAMETER name:array index:0 type:kotlin.Array<a.Outer.Inner>
         EXPRESSION_BODY
@@ -17,50 +61,6 @@ FILE fqName:a fileName:/AnnotationInstantiationWithArrayLib.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:Outer modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
-    PROPERTY name:array visibility:public modality:FINAL [val]
-      FIELD PROPERTY_BACKING_FIELD name:array type:kotlin.Array<a.Outer.Inner> visibility:private [final]
-        EXPRESSION_BODY
-          GET_VAR 'array: kotlin.Array<a.Outer.Inner> declared in a.Outer.<init>' type=kotlin.Array<a.Outer.Inner> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-array> visibility:public modality:FINAL <> ($this:a.Outer) returnType:kotlin.Array<a.Outer.Inner>
-        correspondingProperty: PROPERTY name:array visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:a.Outer
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-array> (): kotlin.Array<a.Outer.Inner> declared in a.Outer'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:array type:kotlin.Array<a.Outer.Inner> visibility:private [final]' type=kotlin.Array<a.Outer.Inner> origin=null
-              receiver: GET_VAR '<this>: a.Outer declared in a.Outer.<get-array>' type=a.Outer origin=null
-    CLASS ANNOTATION_CLASS name:Inner modality:OPEN visibility:public superTypes:[kotlin.Annotation]
-      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:a.Outer.Inner
-      CONSTRUCTOR visibility:public <> (v:kotlin.IntArray) returnType:a.Outer.Inner [primary]
-        VALUE_PARAMETER name:v index:0 type:kotlin.IntArray
-          EXPRESSION_BODY
-            VARARG type=kotlin.IntArray varargElementType=kotlin.Int
-        BLOCK_BODY
-          DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:Inner modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
-      PROPERTY name:v visibility:public modality:FINAL [val]
-        FIELD PROPERTY_BACKING_FIELD name:v type:kotlin.IntArray visibility:private [final]
-          EXPRESSION_BODY
-            GET_VAR 'v: kotlin.IntArray declared in a.Outer.Inner.<init>' type=kotlin.IntArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-        FUN DEFAULT_PROPERTY_ACCESSOR name:<get-v> visibility:public modality:FINAL <> ($this:a.Outer.Inner) returnType:kotlin.IntArray
-          correspondingProperty: PROPERTY name:v visibility:public modality:FINAL [val]
-          $this: VALUE_PARAMETER name:<this> type:a.Outer.Inner
-          BLOCK_BODY
-            RETURN type=kotlin.Nothing from='public final fun <get-v> (): kotlin.IntArray declared in a.Outer.Inner'
-              GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:v type:kotlin.IntArray visibility:private [final]' type=kotlin.IntArray origin=null
-                receiver: GET_VAR '<this>: a.Outer.Inner declared in a.Outer.Inner.<get-v>' type=a.Outer.Inner 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.Annotation
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-        VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-        overridden:
-          public open fun hashCode (): kotlin.Int declared in kotlin.Annotation
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-        overridden:
-          public open fun toString (): kotlin.String declared in kotlin.Annotation
-        $this: VALUE_PARAMETER name:<this> type: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.Annotation
@@ -82,11 +82,6 @@ FILE fqName:test fileName:/AnnotationInstantiationWithArrayApp.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[kotlin.Any]'
-    FUN name:six visibility:public modality:FINAL <> ($this:test.C) returnType:a.Outer
-      $this: VALUE_PARAMETER name:<this> type:test.C
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun six (): a.Outer declared in test.C'
-          CONSTRUCTOR_CALL 'public constructor <init> (array: kotlin.Array<a.Outer.Inner>) declared in a.Outer' type=a.Outer 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
@@ -100,6 +95,11 @@ FILE fqName:test fileName:/AnnotationInstantiationWithArrayApp.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:six visibility:public modality:FINAL <> ($this:test.C) returnType:a.Outer
+      $this: VALUE_PARAMETER name:<this> type:test.C
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun six (): a.Outer declared in test.C'
+          CONSTRUCTOR_CALL 'public constructor <init> (array: kotlin.Array<a.Outer.Inner>) declared in a.Outer' type=a.Outer origin=null
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
       TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit

compiler/testData/codegen/box/annotations/javaTargetOnPrimaryCtorParameter.fir.ir.txt

@@ -1,15 +1,6 @@
 FILE fqName:<root> fileName:/test.kt
   CLASS CLASS name:Foo modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Foo
-    CONSTRUCTOR visibility:public <> (param:kotlin.Int) returnType:<root>.Foo [primary]
-      VALUE_PARAMETER name:param index:0 type:kotlin.Int
-        annotations:
-          NoTarget
-          PropValueField
-          ParameterOnly
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Foo modality:FINAL visibility:public superTypes:[kotlin.Any]'
     PROPERTY name:param visibility:public modality:FINAL [var]
       FIELD PROPERTY_BACKING_FIELD name:param type:kotlin.Int visibility:private
         annotations:
@@ -31,6 +22,15 @@ FILE fqName:<root> fileName:/test.kt
           SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:param type:kotlin.Int visibility:private' type=kotlin.Unit origin=null
             receiver: GET_VAR '<this>: <root>.Foo declared in <root>.Foo.<set-param>' type=<root>.Foo origin=null
             value: GET_VAR '<set-?>: kotlin.Int declared in <root>.Foo.<set-param>' type=kotlin.Int origin=null
+    CONSTRUCTOR visibility:public <> (param:kotlin.Int) returnType:<root>.Foo [primary]
+      VALUE_PARAMETER name:param index:0 type:kotlin.Int
+        annotations:
+          NoTarget
+          PropValueField
+          ParameterOnly
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Foo 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

compiler/testData/codegen/box/annotations/javaTargetOnPrimaryCtorParameter.ir.txt

@@ -1,15 +1,6 @@
 FILE fqName:<root> fileName:/test.kt
   CLASS CLASS name:Foo modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Foo
-    CONSTRUCTOR visibility:public <> (param:kotlin.Int) returnType:<root>.Foo [primary]
-      VALUE_PARAMETER name:param index:0 type:kotlin.Int
-        annotations:
-          NoTarget
-          PropValueField
-          ParameterOnly
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Foo modality:FINAL visibility:public superTypes:[kotlin.Any]'
     PROPERTY name:param visibility:public modality:FINAL [var]
       FIELD PROPERTY_BACKING_FIELD name:param type:kotlin.Int visibility:private
         annotations:
@@ -31,6 +22,15 @@ FILE fqName:<root> fileName:/test.kt
           SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:param type:kotlin.Int visibility:private' type=kotlin.Unit origin=null
             receiver: GET_VAR '<this>: <root>.Foo declared in <root>.Foo.<set-param>' type=<root>.Foo origin=null
             value: GET_VAR '<set-?>: kotlin.Int declared in <root>.Foo.<set-param>' type=kotlin.Int origin=null
+    CONSTRUCTOR visibility:public <> (param:kotlin.Int) returnType:<root>.Foo [primary]
+      VALUE_PARAMETER name:param index:0 type:kotlin.Int
+        annotations:
+          NoTarget
+          PropValueField
+          ParameterOnly
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Foo 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

compiler/testData/codegen/box/annotations/selfReferentialAnnotation.fir.ir.txt

@@ -1,13 +1,6 @@
 FILE fqName:<root> fileName:/selfReferentialAnnotation.kt
   CLASS ANNOTATION_CLASS name:Ann modality:OPEN visibility:public superTypes:[kotlin.Annotation]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Ann
-    CONSTRUCTOR visibility:public <> (e:kotlin.Int) returnType:<root>.Ann [primary]
-      VALUE_PARAMETER name:e index:0 type:kotlin.Int
-        annotations:
-          Ann(e = 1)
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:Ann modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
     PROPERTY name:e visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:e type:kotlin.Int visibility:private [final]
         EXPRESSION_BODY
@@ -19,6 +12,13 @@ FILE fqName:<root> fileName:/selfReferentialAnnotation.kt
           RETURN type=kotlin.Nothing from='public final fun <get-e> (): kotlin.Int declared in <root>.Ann'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:e type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null
               receiver: GET_VAR '<this>: <root>.Ann declared in <root>.Ann.<get-e>' type=<root>.Ann origin=null
+    CONSTRUCTOR visibility:public <> (e:kotlin.Int) returnType:<root>.Ann [primary]
+      VALUE_PARAMETER name:e index:0 type:kotlin.Int
+        annotations:
+          Ann(e = 1)
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:Ann modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
     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.Annotation
@@ -36,18 +36,6 @@ FILE fqName:<root> fileName:/selfReferentialAnnotation.kt
     annotations:
       MyRequiresOptIn(a = "", b = GET_ENUM 'ENUM_ENTRY name:ERROR' type=<root>.MyRequiresOptIn.MyLevel)
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyRequiresOptIn
-    CONSTRUCTOR visibility:public <> (a:kotlin.String, b:<root>.MyRequiresOptIn.MyLevel) returnType:<root>.MyRequiresOptIn [primary]
-      VALUE_PARAMETER name:a index:0 type:kotlin.String
-        EXPRESSION_BODY
-          CONST String type=kotlin.String value=""
-      VALUE_PARAMETER name:b index:1 type:<root>.MyRequiresOptIn.MyLevel
-        annotations:
-          MyRequiresOptIn(a = "", b = GET_ENUM 'ENUM_ENTRY name:WARNING' type=<root>.MyRequiresOptIn.MyLevel)
-        EXPRESSION_BODY
-          GET_ENUM 'ENUM_ENTRY name:ERROR' type=<root>.MyRequiresOptIn.MyLevel
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:MyRequiresOptIn modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
     PROPERTY name:a visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:a type:kotlin.String visibility:private [final]
         EXPRESSION_BODY
@@ -83,15 +71,11 @@ FILE fqName:<root> fileName:/selfReferentialAnnotation.kt
           ENUM_CONSTRUCTOR_CALL 'public constructor <init> (name: kotlin.String, ordinal: kotlin.Int) declared in kotlin.Enum'
             <E>: <root>.MyRequiresOptIn.MyLevel
           INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:MyLevel modality:FINAL visibility:public superTypes:[kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>]'
-      FUN ENUM_CLASS_SPECIAL_MEMBER name:values visibility:public modality:FINAL <> () returnType:kotlin.Array<<root>.MyRequiresOptIn.MyLevel>
-        SYNTHETIC_BODY kind=ENUM_VALUES
       FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.MyRequiresOptIn.MyLevel
         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>.MyRequiresOptIn.MyLevel>
-          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>.MyRequiresOptIn.MyLevel>
+        SYNTHETIC_BODY kind=ENUM_VALUES
       FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>, other:<root>.MyRequiresOptIn.MyLevel) returnType:kotlin.Int [fake_override,operator]
         overridden:
           public final fun compareTo (other: E of kotlin.Enum): kotlin.Int declared in kotlin.Enum
@@ -110,6 +94,10 @@ FILE fqName:<root> fileName:/selfReferentialAnnotation.kt
         overridden:
           public open fun toString (): kotlin.String declared in kotlin.Enum
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>
+      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>.MyRequiresOptIn.MyLevel>
+          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
@@ -128,6 +116,18 @@ FILE fqName:<root> fileName:/selfReferentialAnnotation.kt
           overridden:
             public final fun <get-ordinal> (): kotlin.Int declared in kotlin.Enum
           $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>
+    CONSTRUCTOR visibility:public <> (a:kotlin.String, b:<root>.MyRequiresOptIn.MyLevel) returnType:<root>.MyRequiresOptIn [primary]
+      VALUE_PARAMETER name:a index:0 type:kotlin.String
+        EXPRESSION_BODY
+          CONST String type=kotlin.String value=""
+      VALUE_PARAMETER name:b index:1 type:<root>.MyRequiresOptIn.MyLevel
+        annotations:
+          MyRequiresOptIn(a = "", b = GET_ENUM 'ENUM_ENTRY name:WARNING' type=<root>.MyRequiresOptIn.MyLevel)
+        EXPRESSION_BODY
+          GET_ENUM 'ENUM_ENTRY name:ERROR' type=<root>.MyRequiresOptIn.MyLevel
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:MyRequiresOptIn modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
     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.Annotation

compiler/testData/codegen/box/annotations/selfReferentialAnnotation.ir.txt

@@ -1,13 +1,6 @@
 FILE fqName:<root> fileName:/selfReferentialAnnotation.kt
   CLASS ANNOTATION_CLASS name:Ann modality:OPEN visibility:public superTypes:[kotlin.Annotation]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Ann
-    CONSTRUCTOR visibility:public <> (e:kotlin.Int) returnType:<root>.Ann [primary]
-      VALUE_PARAMETER name:e index:0 type:kotlin.Int
-        annotations:
-          Ann(e = 1)
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:Ann modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
     PROPERTY name:e visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:e type:kotlin.Int visibility:private [final]
         EXPRESSION_BODY
@@ -19,6 +12,13 @@ FILE fqName:<root> fileName:/selfReferentialAnnotation.kt
           RETURN type=kotlin.Nothing from='public final fun <get-e> (): kotlin.Int declared in <root>.Ann'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:e type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null
               receiver: GET_VAR '<this>: <root>.Ann declared in <root>.Ann.<get-e>' type=<root>.Ann origin=null
+    CONSTRUCTOR visibility:public <> (e:kotlin.Int) returnType:<root>.Ann [primary]
+      VALUE_PARAMETER name:e index:0 type:kotlin.Int
+        annotations:
+          Ann(e = 1)
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:Ann modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
     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.Annotation
@@ -36,18 +36,6 @@ FILE fqName:<root> fileName:/selfReferentialAnnotation.kt
     annotations:
       MyRequiresOptIn(a = "", b = GET_ENUM 'ENUM_ENTRY name:ERROR' type=<root>.MyRequiresOptIn.MyLevel)
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyRequiresOptIn
-    CONSTRUCTOR visibility:public <> (a:kotlin.String, b:<root>.MyRequiresOptIn.MyLevel) returnType:<root>.MyRequiresOptIn [primary]
-      VALUE_PARAMETER name:a index:0 type:kotlin.String
-        EXPRESSION_BODY
-          CONST String type=kotlin.String value=""
-      VALUE_PARAMETER name:b index:1 type:<root>.MyRequiresOptIn.MyLevel
-        annotations:
-          MyRequiresOptIn(a = "", b = GET_ENUM 'ENUM_ENTRY name:WARNING' type=<root>.MyRequiresOptIn.MyLevel)
-        EXPRESSION_BODY
-          GET_ENUM 'ENUM_ENTRY name:ERROR' type=<root>.MyRequiresOptIn.MyLevel
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:MyRequiresOptIn modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
     PROPERTY name:a visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:a type:kotlin.String visibility:private [final]
         EXPRESSION_BODY
@@ -72,35 +60,22 @@ FILE fqName:<root> fileName:/selfReferentialAnnotation.kt
               receiver: GET_VAR '<this>: <root>.MyRequiresOptIn declared in <root>.MyRequiresOptIn.<get-b>' type=<root>.MyRequiresOptIn origin=null
     CLASS ENUM_CLASS name:MyLevel modality:FINAL visibility:public superTypes:[kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>]
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyRequiresOptIn.MyLevel
-      CONSTRUCTOR visibility:private <> () returnType:<root>.MyRequiresOptIn.MyLevel [primary]
-        BLOCK_BODY
-          ENUM_CONSTRUCTOR_CALL 'public constructor <init> (name: kotlin.String, ordinal: kotlin.Int) declared in kotlin.Enum'
-            <E>: <root>.MyRequiresOptIn.MyLevel
-          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:MyLevel modality:FINAL visibility:public superTypes:[kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>]'
       ENUM_ENTRY name:WARNING
         init: EXPRESSION_BODY
           ENUM_CONSTRUCTOR_CALL 'private constructor <init> () declared in <root>.MyRequiresOptIn.MyLevel'
       ENUM_ENTRY name:ERROR
         init: EXPRESSION_BODY
           ENUM_CONSTRUCTOR_CALL 'private constructor <init> () declared in <root>.MyRequiresOptIn.MyLevel'
-      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>.MyRequiresOptIn.MyLevel>) 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>.MyRequiresOptIn.MyLevel>
-      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>.MyRequiresOptIn.MyLevel>) 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>.MyRequiresOptIn.MyLevel>
+      CONSTRUCTOR visibility:private <> () returnType:<root>.MyRequiresOptIn.MyLevel [primary]
+        BLOCK_BODY
+          ENUM_CONSTRUCTOR_CALL 'public constructor <init> (name: kotlin.String, ordinal: kotlin.Int) declared in kotlin.Enum'
+            <E>: <root>.MyRequiresOptIn.MyLevel
+          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:MyLevel modality:FINAL visibility:public superTypes:[kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>]'
+      FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.MyRequiresOptIn.MyLevel
+        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>.MyRequiresOptIn.MyLevel>
+        SYNTHETIC_BODY kind=ENUM_VALUES
       FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>, other:<root>.MyRequiresOptIn.MyLevel) returnType:kotlin.Int [fake_override,operator]
         overridden:
           public final fun compareTo (other: E of kotlin.Enum): kotlin.Int declared in kotlin.Enum
@@ -119,15 +94,40 @@ FILE fqName:<root> fileName:/selfReferentialAnnotation.kt
         overridden:
           public open fun toString (): kotlin.String declared in kotlin.Enum
         $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.MyRequiresOptIn.MyLevel>
-      FUN ENUM_CLASS_SPECIAL_MEMBER name:values visibility:public modality:FINAL <> () returnType:kotlin.Array<<root>.MyRequiresOptIn.MyLevel>
-        SYNTHETIC_BODY kind=ENUM_VALUES
-      FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.MyRequiresOptIn.MyLevel
-        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>.MyRequiresOptIn.MyLevel>
           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>.MyRequiresOptIn.MyLevel>) 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>.MyRequiresOptIn.MyLevel>
+      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>.MyRequiresOptIn.MyLevel>) 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>.MyRequiresOptIn.MyLevel>
+    CONSTRUCTOR visibility:public <> (a:kotlin.String, b:<root>.MyRequiresOptIn.MyLevel) returnType:<root>.MyRequiresOptIn [primary]
+      VALUE_PARAMETER name:a index:0 type:kotlin.String
+        EXPRESSION_BODY
+          CONST String type=kotlin.String value=""
+      VALUE_PARAMETER name:b index:1 type:<root>.MyRequiresOptIn.MyLevel
+        annotations:
+          MyRequiresOptIn(a = "", b = GET_ENUM 'ENUM_ENTRY name:WARNING' type=<root>.MyRequiresOptIn.MyLevel)
+        EXPRESSION_BODY
+          GET_ENUM 'ENUM_ENTRY name:ERROR' type=<root>.MyRequiresOptIn.MyLevel
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:MyRequiresOptIn modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
     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.Annotation

compiler/testData/codegen/box/annotations/targetOnPrimaryCtorParameter.fir.ir.txt

@@ -1,4 +1,25 @@
 FILE fqName:<root> fileName:/targetOnPrimaryCtorParameter.kt
+  CLASS ANNOTATION_CLASS name:FieldOnly modality:OPEN visibility:public superTypes:[kotlin.Annotation]
+    annotations:
+      Target(allowedTargets = [GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:FIELD' type=kotlin.annotation.AnnotationTarget])
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FieldOnly
+    CONSTRUCTOR visibility:public <> () returnType:<root>.FieldOnly [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:FieldOnly modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
+    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.Annotation
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Annotation
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Annotation
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS ANNOTATION_CLASS name:NoTarget modality:OPEN visibility:public superTypes:[kotlin.Annotation]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.NoTarget
     CONSTRUCTOR visibility:public <> () returnType:<root>.NoTarget [primary]
@@ -18,6 +39,27 @@ FILE fqName:<root> fileName:/targetOnPrimaryCtorParameter.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Annotation
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS ANNOTATION_CLASS name:ParameterOnly modality:OPEN visibility:public superTypes:[kotlin.Annotation]
+    annotations:
+      Target(allowedTargets = [GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:VALUE_PARAMETER' type=kotlin.annotation.AnnotationTarget])
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.ParameterOnly
+    CONSTRUCTOR visibility:public <> () returnType:<root>.ParameterOnly [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:ParameterOnly modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
+    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.Annotation
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Annotation
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Annotation
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS ANNOTATION_CLASS name:PropValueField modality:OPEN visibility:public superTypes:[kotlin.Annotation]
     annotations:
       Target(allowedTargets = [GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:PROPERTY' type=kotlin.annotation.AnnotationTarget, GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:VALUE_PARAMETER' type=kotlin.annotation.AnnotationTarget, GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:FIELD' type=kotlin.annotation.AnnotationTarget])
@@ -60,48 +102,6 @@ FILE fqName:<root> fileName:/targetOnPrimaryCtorParameter.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Annotation
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS ANNOTATION_CLASS name:ParameterOnly modality:OPEN visibility:public superTypes:[kotlin.Annotation]
-    annotations:
-      Target(allowedTargets = [GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:VALUE_PARAMETER' type=kotlin.annotation.AnnotationTarget])
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.ParameterOnly
-    CONSTRUCTOR visibility:public <> () returnType:<root>.ParameterOnly [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:ParameterOnly modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
-    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.Annotation
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Annotation
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Annotation
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS ANNOTATION_CLASS name:FieldOnly modality:OPEN visibility:public superTypes:[kotlin.Annotation]
-    annotations:
-      Target(allowedTargets = [GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:FIELD' type=kotlin.annotation.AnnotationTarget])
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FieldOnly
-    CONSTRUCTOR visibility:public <> () returnType:<root>.FieldOnly [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:FieldOnly modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
-    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.Annotation
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Annotation
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Annotation
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS ANNOTATION_CLASS name:PropertyOnly2 modality:OPEN visibility:public superTypes:[kotlin.Annotation]
     annotations:
       Target(allowedTargets = [GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:PROPERTY' type=kotlin.annotation.AnnotationTarget])
@@ -125,15 +125,6 @@ FILE fqName:<root> fileName:/targetOnPrimaryCtorParameter.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:Foo modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Foo
-    CONSTRUCTOR visibility:public <> (param:kotlin.Int) returnType:<root>.Foo [primary]
-      VALUE_PARAMETER name:param index:0 type:kotlin.Int
-        annotations:
-          NoTarget
-          PropValueField
-          ParameterOnly
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Foo modality:FINAL visibility:public superTypes:[kotlin.Any]'
     PROPERTY name:param visibility:public modality:FINAL [var]
       annotations:
         PropertyOnly
@@ -158,6 +149,15 @@ FILE fqName:<root> fileName:/targetOnPrimaryCtorParameter.kt
           SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:param type:kotlin.Int visibility:private' type=kotlin.Unit origin=null
             receiver: GET_VAR '<this>: <root>.Foo declared in <root>.Foo.<set-param>' type=<root>.Foo origin=null
             value: GET_VAR '<set-?>: kotlin.Int declared in <root>.Foo.<set-param>' type=kotlin.Int origin=null
+    CONSTRUCTOR visibility:public <> (param:kotlin.Int) returnType:<root>.Foo [primary]
+      VALUE_PARAMETER name:param index:0 type:kotlin.Int
+        annotations:
+          NoTarget
+          PropValueField
+          ParameterOnly
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Foo 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

compiler/testData/codegen/box/annotations/targetOnPrimaryCtorParameter.ir.txt

@@ -1,4 +1,25 @@
 FILE fqName:<root> fileName:/targetOnPrimaryCtorParameter.kt
+  CLASS ANNOTATION_CLASS name:FieldOnly modality:OPEN visibility:public superTypes:[kotlin.Annotation]
+    annotations:
+      Target(allowedTargets = [GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:FIELD' type=kotlin.annotation.AnnotationTarget])
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FieldOnly
+    CONSTRUCTOR visibility:public <> () returnType:<root>.FieldOnly [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:FieldOnly modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
+    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.Annotation
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Annotation
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Annotation
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS ANNOTATION_CLASS name:NoTarget modality:OPEN visibility:public superTypes:[kotlin.Annotation]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.NoTarget
     CONSTRUCTOR visibility:public <> () returnType:<root>.NoTarget [primary]
@@ -18,6 +39,27 @@ FILE fqName:<root> fileName:/targetOnPrimaryCtorParameter.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Annotation
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS ANNOTATION_CLASS name:ParameterOnly modality:OPEN visibility:public superTypes:[kotlin.Annotation]
+    annotations:
+      Target(allowedTargets = [GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:VALUE_PARAMETER' type=kotlin.annotation.AnnotationTarget])
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.ParameterOnly
+    CONSTRUCTOR visibility:public <> () returnType:<root>.ParameterOnly [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:ParameterOnly modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
+    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.Annotation
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Annotation
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Annotation
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS ANNOTATION_CLASS name:PropValueField modality:OPEN visibility:public superTypes:[kotlin.Annotation]
     annotations:
       Target(allowedTargets = [GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:PROPERTY' type=kotlin.annotation.AnnotationTarget, GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:VALUE_PARAMETER' type=kotlin.annotation.AnnotationTarget, GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:FIELD' type=kotlin.annotation.AnnotationTarget])
@@ -60,48 +102,6 @@ FILE fqName:<root> fileName:/targetOnPrimaryCtorParameter.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Annotation
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS ANNOTATION_CLASS name:ParameterOnly modality:OPEN visibility:public superTypes:[kotlin.Annotation]
-    annotations:
-      Target(allowedTargets = [GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:VALUE_PARAMETER' type=kotlin.annotation.AnnotationTarget])
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.ParameterOnly
-    CONSTRUCTOR visibility:public <> () returnType:<root>.ParameterOnly [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:ParameterOnly modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
-    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.Annotation
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Annotation
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Annotation
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS ANNOTATION_CLASS name:FieldOnly modality:OPEN visibility:public superTypes:[kotlin.Annotation]
-    annotations:
-      Target(allowedTargets = [GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:FIELD' type=kotlin.annotation.AnnotationTarget])
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FieldOnly
-    CONSTRUCTOR visibility:public <> () returnType:<root>.FieldOnly [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:FieldOnly modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
-    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.Annotation
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Annotation
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Annotation
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS ANNOTATION_CLASS name:PropertyOnly2 modality:OPEN visibility:public superTypes:[kotlin.Annotation]
     annotations:
       Target(allowedTargets = [GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:PROPERTY' type=kotlin.annotation.AnnotationTarget])
@@ -125,15 +125,6 @@ FILE fqName:<root> fileName:/targetOnPrimaryCtorParameter.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:Foo modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Foo
-    CONSTRUCTOR visibility:public <> (param:kotlin.Int) returnType:<root>.Foo [primary]
-      VALUE_PARAMETER name:param index:0 type:kotlin.Int
-        annotations:
-          NoTarget
-          PropValueField
-          ParameterOnly
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Foo modality:FINAL visibility:public superTypes:[kotlin.Any]'
     PROPERTY name:param visibility:public modality:FINAL [var]
       annotations:
         PropertyOnly
@@ -158,6 +149,15 @@ FILE fqName:<root> fileName:/targetOnPrimaryCtorParameter.kt
           SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:param type:kotlin.Int visibility:private' type=kotlin.Unit origin=null
             receiver: GET_VAR '<this>: <root>.Foo declared in <root>.Foo.<set-param>' type=<root>.Foo origin=null
             value: GET_VAR '<set-?>: kotlin.Int declared in <root>.Foo.<set-param>' type=kotlin.Int origin=null
+    CONSTRUCTOR visibility:public <> (param:kotlin.Int) returnType:<root>.Foo [primary]
+      VALUE_PARAMETER name:param index:0 type:kotlin.Int
+        annotations:
+          NoTarget
+          PropValueField
+          ParameterOnly
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Foo 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

compiler/testData/codegen/box/callableReference/serializability/referenceToCompanionFunction.fir.ir.txt

@@ -5,13 +5,6 @@ FILE fqName:<root> fileName:/referenceToCompanionFunction.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]'
-    FUN name:foo visibility:public modality:FINAL <> ($this:<root>.Base) returnType:kotlin.String
-      $this: VALUE_PARAMETER name:<this> type:<root>.Base
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.String declared in <root>.Base'
-          CONST String type=kotlin.String value="A"
-    FUN name:bar visibility:public modality:ABSTRACT <> ($this:<root>.Base) returnType:kotlin.String
-      $this: VALUE_PARAMETER name:<this> type:<root>.Base
     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
@@ -25,34 +18,30 @@ FILE fqName:<root> fileName:/referenceToCompanionFunction.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:bar visibility:public modality:ABSTRACT <> ($this:<root>.Base) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:<root>.Base
+    FUN name:foo visibility:public modality:FINAL <> ($this:<root>.Base) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:<root>.Base
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.String declared in <root>.Base'
+          CONST String type=kotlin.String value="A"
   CLASS CLASS name:Some modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Some
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Some [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Some modality:FINAL visibility:public superTypes:[kotlin.Any]'
     CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[<root>.Base]
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Some.Companion
       CONSTRUCTOR visibility:private <> () returnType:<root>.Some.Companion [primary]
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Base'
           INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[<root>.Base]'
-      FUN name:bar visibility:public modality:OPEN <> ($this:<root>.Some.Companion) returnType:kotlin.String
-        overridden:
-          public abstract fun bar (): kotlin.String declared in <root>.Base
-        $this: VALUE_PARAMETER name:<this> type:<root>.Some.Companion
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun bar (): kotlin.String declared in <root>.Some.Companion'
-            CONST String type=kotlin.String value="B"
-      FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <> ($this:<root>.Base) returnType:kotlin.String [fake_override]
-        overridden:
-          public final fun foo (): kotlin.String declared in <root>.Base
-        $this: VALUE_PARAMETER name:<this> type:<root>.Base
       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 <root>.Base
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
         VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+      FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <> ($this:<root>.Base) returnType:kotlin.String [fake_override]
+        overridden:
+          public final fun foo (): kotlin.String declared in <root>.Base
+        $this: VALUE_PARAMETER name:<this> type:<root>.Base
       FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
         overridden:
           public open fun hashCode (): kotlin.Int declared in <root>.Base
@@ -61,6 +50,17 @@ FILE fqName:<root> fileName:/referenceToCompanionFunction.kt
         overridden:
           public open fun toString (): kotlin.String declared in <root>.Base
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      FUN name:bar visibility:public modality:OPEN <> ($this:<root>.Some.Companion) returnType:kotlin.String
+        overridden:
+          public abstract fun bar (): kotlin.String declared in <root>.Base
+        $this: VALUE_PARAMETER name:<this> type:<root>.Some.Companion
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun bar (): kotlin.String declared in <root>.Some.Companion'
+            CONST String type=kotlin.String value="B"
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Some [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Some 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
@@ -80,22 +80,15 @@ FILE fqName:<root> fileName:/referenceToCompanionFunction.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Base'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:Singleton modality:FINAL visibility:public superTypes:[<root>.Base]'
-    FUN name:bar visibility:public modality:OPEN <> ($this:<root>.Singleton) returnType:kotlin.String
-      overridden:
-        public abstract fun bar (): kotlin.String declared in <root>.Base
-      $this: VALUE_PARAMETER name:<this> type:<root>.Singleton
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun bar (): kotlin.String declared in <root>.Singleton'
-          CONST String type=kotlin.String value="C"
-    FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <> ($this:<root>.Base) returnType:kotlin.String [fake_override]
-      overridden:
-        public final fun foo (): kotlin.String declared in <root>.Base
-      $this: VALUE_PARAMETER name:<this> type:<root>.Base
     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 <root>.Base
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <> ($this:<root>.Base) returnType:kotlin.String [fake_override]
+      overridden:
+        public final fun foo (): kotlin.String declared in <root>.Base
+      $this: VALUE_PARAMETER name:<this> type:<root>.Base
     FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int declared in <root>.Base
@@ -104,6 +97,13 @@ FILE fqName:<root> fileName:/referenceToCompanionFunction.kt
       overridden:
         public open fun toString (): kotlin.String declared in <root>.Base
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:bar visibility:public modality:OPEN <> ($this:<root>.Singleton) returnType:kotlin.String
+      overridden:
+        public abstract fun bar (): kotlin.String declared in <root>.Base
+      $this: VALUE_PARAMETER name:<this> type:<root>.Singleton
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun bar (): kotlin.String declared in <root>.Singleton'
+          CONST String type=kotlin.String value="C"
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
       VAR name:ref1 type:kotlin.reflect.KFunction0<kotlin.String> [val]

compiler/testData/codegen/box/delegatedProperty/typeParameterInDelegatedProperty.fir.ir.txt

@@ -1,24 +1,4 @@
 FILE fqName:<root> fileName:/typeParameterInDelegatedProperty.kt
-  CLASS INTERFACE name:IDelegate modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IDelegate<T of <root>.IDelegate>
-    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false
-    FUN name:getValue visibility:public modality:ABSTRACT <> ($this:<root>.IDelegate<T of <root>.IDelegate>, t:T of <root>.IDelegate, p:kotlin.reflect.KProperty<*>) returnType:T of <root>.IDelegate [operator]
-      $this: VALUE_PARAMETER name:<this> type:<root>.IDelegate<T of <root>.IDelegate>
-      VALUE_PARAMETER name:t index:0 type:T of <root>.IDelegate
-      VALUE_PARAMETER name:p index:1 type:kotlin.reflect.KProperty<*>
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   PROPERTY name:property visibility:public modality:FINAL [delegated,val]
     FIELD PROPERTY_DELEGATE name:property$delegate type:<root>.property$delegate.<no name provided><T of <root>.<get-property>> visibility:private [final,static]
       EXPRESSION_BODY
@@ -29,15 +9,6 @@ FILE fqName:<root> fileName:/typeParameterInDelegatedProperty.kt
               BLOCK_BODY
                 DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
                 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.IDelegate<kotlin.Any?>]'
-            FUN name:getValue visibility:public modality:OPEN <> ($this:<root>.property$delegate.<no name provided><T of <root>.<get-property>>, t:kotlin.Any?, p:kotlin.reflect.KProperty<*>) returnType:kotlin.Any? [operator]
-              overridden:
-                public abstract fun getValue (t: T of <root>.IDelegate, p: kotlin.reflect.KProperty<*>): T of <root>.IDelegate declared in <root>.IDelegate
-              $this: VALUE_PARAMETER name:<this> type:<root>.property$delegate.<no name provided><T of <root>.<get-property>>
-              VALUE_PARAMETER name:t index:0 type:kotlin.Any?
-              VALUE_PARAMETER name:p index:1 type:kotlin.reflect.KProperty<*>
-              BLOCK_BODY
-                RETURN type=kotlin.Nothing from='public open fun getValue (t: kotlin.Any?, p: kotlin.reflect.KProperty<*>): kotlin.Any? declared in <root>.property$delegate.<no name provided>'
-                  GET_VAR 't: kotlin.Any? declared in <root>.property$delegate.<no name provided>.getValue' type=kotlin.Any? 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 <root>.IDelegate
@@ -51,6 +22,15 @@ FILE fqName:<root> fileName:/typeParameterInDelegatedProperty.kt
               overridden:
                 public open fun toString (): kotlin.String declared in <root>.IDelegate
               $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+            FUN name:getValue visibility:public modality:OPEN <> ($this:<root>.property$delegate.<no name provided><T of <root>.<get-property>>, t:kotlin.Any?, p:kotlin.reflect.KProperty<*>) returnType:kotlin.Any? [operator]
+              overridden:
+                public abstract fun getValue (t: T of <root>.IDelegate, p: kotlin.reflect.KProperty<*>): T of <root>.IDelegate declared in <root>.IDelegate
+              $this: VALUE_PARAMETER name:<this> type:<root>.property$delegate.<no name provided><T of <root>.<get-property>>
+              VALUE_PARAMETER name:t index:0 type:kotlin.Any?
+              VALUE_PARAMETER name:p index:1 type:kotlin.reflect.KProperty<*>
+              BLOCK_BODY
+                RETURN type=kotlin.Nothing from='public open fun getValue (t: kotlin.Any?, p: kotlin.reflect.KProperty<*>): kotlin.Any? declared in <root>.property$delegate.<no name provided>'
+                  GET_VAR 't: kotlin.Any? declared in <root>.property$delegate.<no name provided>.getValue' type=kotlin.Any? origin=null
           CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.property$delegate.<no name provided>' type=<root>.property$delegate.<no name provided><T of <root>.<get-property>> origin=OBJECT_LITERAL
     FUN DELEGATED_PROPERTY_ACCESSOR name:<get-property> visibility:public modality:FINAL <T> ($receiver:T of <root>.<get-property>) returnType:T of <root>.<get-property>
       correspondingProperty: PROPERTY name:property visibility:public modality:FINAL [delegated,val]
@@ -84,16 +64,6 @@ FILE fqName:<root> fileName:/typeParameterInDelegatedProperty.kt
                         BLOCK_BODY
                           DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
                           INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.IDelegate<kotlin.Any?>]'
-                      FUN name:getValue visibility:public modality:OPEN <> ($this:<root>.property2$delegate.<anonymous>.<no name provided><T of <root>.<get-property2>>, t:kotlin.Any?, p:kotlin.reflect.KProperty<*>) returnType:kotlin.Any? [operator]
-                        overridden:
-                          public abstract fun getValue (t: T of <root>.IDelegate, p: kotlin.reflect.KProperty<*>): T of <root>.IDelegate declared in <root>.IDelegate
-                        $this: VALUE_PARAMETER name:<this> type:<root>.property2$delegate.<anonymous>.<no name provided><T of <root>.<get-property2>>
-                        VALUE_PARAMETER name:t index:0 type:kotlin.Any?
-                        VALUE_PARAMETER name:p index:1 type:kotlin.reflect.KProperty<*>
-                        BLOCK_BODY
-                          RETURN type=kotlin.Nothing from='public open fun getValue (t: kotlin.Any?, p: kotlin.reflect.KProperty<*>): kotlin.Any? declared in <root>.property2$delegate.<anonymous>.<no name provided>'
-                            CALL 'local final fun test (t: T of <root>.<get-property2>): T of <root>.<get-property2> declared in <root>.property2$delegate.<anonymous>' type=kotlin.Any? origin=null
-                              t: GET_VAR 't: kotlin.Any? declared in <root>.property2$delegate.<anonymous>.<no name provided>.getValue' type=kotlin.Any? 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 <root>.IDelegate
@@ -107,6 +77,16 @@ FILE fqName:<root> fileName:/typeParameterInDelegatedProperty.kt
                         overridden:
                           public open fun toString (): kotlin.String declared in <root>.IDelegate
                         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+                      FUN name:getValue visibility:public modality:OPEN <> ($this:<root>.property2$delegate.<anonymous>.<no name provided><T of <root>.<get-property2>>, t:kotlin.Any?, p:kotlin.reflect.KProperty<*>) returnType:kotlin.Any? [operator]
+                        overridden:
+                          public abstract fun getValue (t: T of <root>.IDelegate, p: kotlin.reflect.KProperty<*>): T of <root>.IDelegate declared in <root>.IDelegate
+                        $this: VALUE_PARAMETER name:<this> type:<root>.property2$delegate.<anonymous>.<no name provided><T of <root>.<get-property2>>
+                        VALUE_PARAMETER name:t index:0 type:kotlin.Any?
+                        VALUE_PARAMETER name:p index:1 type:kotlin.reflect.KProperty<*>
+                        BLOCK_BODY
+                          RETURN type=kotlin.Nothing from='public open fun getValue (t: kotlin.Any?, p: kotlin.reflect.KProperty<*>): kotlin.Any? declared in <root>.property2$delegate.<anonymous>.<no name provided>'
+                            CALL 'local final fun test (t: T of <root>.<get-property2>): T of <root>.<get-property2> declared in <root>.property2$delegate.<anonymous>' type=kotlin.Any? origin=null
+                              t: GET_VAR 't: kotlin.Any? declared in <root>.property2$delegate.<anonymous>.<no name provided>.getValue' type=kotlin.Any? origin=null
                     CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.property2$delegate.<anonymous>.<no name provided>' type=<root>.property2$delegate.<anonymous>.<no name provided><T of <root>.<get-property2>> origin=OBJECT_LITERAL
     FUN DELEGATED_PROPERTY_ACCESSOR name:<get-property2> visibility:public modality:FINAL <T> ($receiver:T of <root>.<get-property2>) returnType:T of <root>.<get-property2>
       correspondingProperty: PROPERTY name:property2 visibility:public modality:FINAL [delegated,val]
@@ -119,6 +99,26 @@ FILE fqName:<root> fileName:/typeParameterInDelegatedProperty.kt
             t: GET_VAR '<this>: T of <root>.<get-property2> declared in <root>.<get-property2>' type=T of <root>.<get-property2> origin=null
             p: PROPERTY_REFERENCE 'public final property2: T of <root>.<get-property2>' field=null getter='public final fun <get-property2> <T> (): T of <root>.<get-property2> declared in <root>' setter=null type=kotlin.reflect.KProperty1<T of <root>.<get-property2>, T of <root>.<get-property2>> origin=PROPERTY_REFERENCE_FOR_DELEGATE
               <1>: T of <root>.<get-property2>
+  CLASS INTERFACE name:IDelegate modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IDelegate<T of <root>.IDelegate>
+    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false
+    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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:getValue visibility:public modality:ABSTRACT <> ($this:<root>.IDelegate<T of <root>.IDelegate>, t:T of <root>.IDelegate, p:kotlin.reflect.KProperty<*>) returnType:T of <root>.IDelegate [operator]
+      $this: VALUE_PARAMETER name:<this> type:<root>.IDelegate<T of <root>.IDelegate>
+      VALUE_PARAMETER name:t index:0 type:T of <root>.IDelegate
+      VALUE_PARAMETER name:p index:1 type:kotlin.reflect.KProperty<*>
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
       VAR name:superInterfaces type:kotlin.Array<java.lang.reflect.Type> [val]

compiler/testData/codegen/box/delegatedProperty/typeParameterInDelegatedProperty.ir.txt

@@ -1,24 +1,4 @@
 FILE fqName:<root> fileName:/typeParameterInDelegatedProperty.kt
-  CLASS INTERFACE name:IDelegate modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IDelegate<T of <root>.IDelegate>
-    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false
-    FUN name:getValue visibility:public modality:ABSTRACT <> ($this:<root>.IDelegate<T of <root>.IDelegate>, t:T of <root>.IDelegate, p:kotlin.reflect.KProperty<*>) returnType:T of <root>.IDelegate [operator]
-      $this: VALUE_PARAMETER name:<this> type:<root>.IDelegate<T of <root>.IDelegate>
-      VALUE_PARAMETER name:t index:0 type:T of <root>.IDelegate
-      VALUE_PARAMETER name:p index:1 type:kotlin.reflect.KProperty<*>
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   PROPERTY name:property visibility:public modality:FINAL [delegated,val]
     FIELD PROPERTY_DELEGATE name:property$delegate type:<root>.property$delegate.<no name provided><kotlin.Any?> visibility:private [final,static]
       EXPRESSION_BODY
@@ -29,16 +9,6 @@ FILE fqName:<root> fileName:/typeParameterInDelegatedProperty.kt
               BLOCK_BODY
                 DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
                 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.IDelegate<kotlin.Any?>]'
-            FUN name:getValue visibility:public modality:OPEN <> ($this:<root>.property$delegate.<no name provided><kotlin.Any?>, t:kotlin.Any?, p:kotlin.reflect.KProperty<*>) returnType:kotlin.Any? [operator]
-              overridden:
-                public abstract fun getValue (t: T of <root>.IDelegate, p: kotlin.reflect.KProperty<*>): T of <root>.IDelegate declared in <root>.IDelegate
-              $this: VALUE_PARAMETER name:<this> type:<root>.property$delegate.<no name provided><kotlin.Any?>
-              VALUE_PARAMETER name:t index:0 type:kotlin.Any?
-              VALUE_PARAMETER name:p index:1 type:kotlin.reflect.KProperty<*>
-              BLOCK_BODY
-                RETURN type=kotlin.Nothing from='public open fun getValue (t: kotlin.Any?, p: kotlin.reflect.KProperty<*>): kotlin.Any? declared in <root>.property$delegate.<no name provided>'
-                  TYPE_OP type=kotlin.Any? origin=IMPLICIT_CAST typeOperand=kotlin.Any?
-                    GET_VAR 't: kotlin.Any? declared in <root>.property$delegate.<no name provided>.getValue' type=kotlin.Any? 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 <root>.IDelegate
@@ -52,6 +22,16 @@ FILE fqName:<root> fileName:/typeParameterInDelegatedProperty.kt
               overridden:
                 public open fun toString (): kotlin.String declared in <root>.IDelegate
               $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+            FUN name:getValue visibility:public modality:OPEN <> ($this:<root>.property$delegate.<no name provided><kotlin.Any?>, t:kotlin.Any?, p:kotlin.reflect.KProperty<*>) returnType:kotlin.Any? [operator]
+              overridden:
+                public abstract fun getValue (t: T of <root>.IDelegate, p: kotlin.reflect.KProperty<*>): T of <root>.IDelegate declared in <root>.IDelegate
+              $this: VALUE_PARAMETER name:<this> type:<root>.property$delegate.<no name provided><kotlin.Any?>
+              VALUE_PARAMETER name:t index:0 type:kotlin.Any?
+              VALUE_PARAMETER name:p index:1 type:kotlin.reflect.KProperty<*>
+              BLOCK_BODY
+                RETURN type=kotlin.Nothing from='public open fun getValue (t: kotlin.Any?, p: kotlin.reflect.KProperty<*>): kotlin.Any? declared in <root>.property$delegate.<no name provided>'
+                  TYPE_OP type=kotlin.Any? origin=IMPLICIT_CAST typeOperand=kotlin.Any?
+                    GET_VAR 't: kotlin.Any? declared in <root>.property$delegate.<no name provided>.getValue' type=kotlin.Any? origin=null
           CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.property$delegate.<no name provided>' type=<root>.property$delegate.<no name provided><kotlin.Any?> origin=OBJECT_LITERAL
     FUN DELEGATED_PROPERTY_ACCESSOR name:<get-property> visibility:public modality:FINAL <T> ($receiver:T of <root>.<get-property>) returnType:T of <root>.<get-property>
       correspondingProperty: PROPERTY name:property visibility:public modality:FINAL [delegated,val]
@@ -86,18 +66,6 @@ FILE fqName:<root> fileName:/typeParameterInDelegatedProperty.kt
                         BLOCK_BODY
                           DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
                           INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.IDelegate<kotlin.Any?>]'
-                      FUN name:getValue visibility:public modality:OPEN <> ($this:<root>.property2$delegate.<anonymous>.<no name provided><kotlin.Any?>, t:kotlin.Any?, p:kotlin.reflect.KProperty<*>) returnType:kotlin.Any? [operator]
-                        overridden:
-                          public abstract fun getValue (t: T of <root>.IDelegate, p: kotlin.reflect.KProperty<*>): T of <root>.IDelegate declared in <root>.IDelegate
-                        $this: VALUE_PARAMETER name:<this> type:<root>.property2$delegate.<anonymous>.<no name provided><kotlin.Any?>
-                        VALUE_PARAMETER name:t index:0 type:kotlin.Any?
-                        VALUE_PARAMETER name:p index:1 type:kotlin.reflect.KProperty<*>
-                        BLOCK_BODY
-                          RETURN type=kotlin.Nothing from='public open fun getValue (t: kotlin.Any?, p: kotlin.reflect.KProperty<*>): kotlin.Any? declared in <root>.property2$delegate.<anonymous>.<no name provided>'
-                            TYPE_OP type=kotlin.Any? origin=IMPLICIT_CAST typeOperand=kotlin.Any?
-                              CALL 'local final fun test (t: kotlin.Any?): kotlin.Any? declared in <root>.property2$delegate.<anonymous>' type=kotlin.Any? origin=null
-                                t: TYPE_OP type=kotlin.Any? origin=IMPLICIT_CAST typeOperand=kotlin.Any?
-                                  GET_VAR 't: kotlin.Any? declared in <root>.property2$delegate.<anonymous>.<no name provided>.getValue' type=kotlin.Any? 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 <root>.IDelegate
@@ -111,6 +79,18 @@ FILE fqName:<root> fileName:/typeParameterInDelegatedProperty.kt
                         overridden:
                           public open fun toString (): kotlin.String declared in <root>.IDelegate
                         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+                      FUN name:getValue visibility:public modality:OPEN <> ($this:<root>.property2$delegate.<anonymous>.<no name provided><kotlin.Any?>, t:kotlin.Any?, p:kotlin.reflect.KProperty<*>) returnType:kotlin.Any? [operator]
+                        overridden:
+                          public abstract fun getValue (t: T of <root>.IDelegate, p: kotlin.reflect.KProperty<*>): T of <root>.IDelegate declared in <root>.IDelegate
+                        $this: VALUE_PARAMETER name:<this> type:<root>.property2$delegate.<anonymous>.<no name provided><kotlin.Any?>
+                        VALUE_PARAMETER name:t index:0 type:kotlin.Any?
+                        VALUE_PARAMETER name:p index:1 type:kotlin.reflect.KProperty<*>
+                        BLOCK_BODY
+                          RETURN type=kotlin.Nothing from='public open fun getValue (t: kotlin.Any?, p: kotlin.reflect.KProperty<*>): kotlin.Any? declared in <root>.property2$delegate.<anonymous>.<no name provided>'
+                            TYPE_OP type=kotlin.Any? origin=IMPLICIT_CAST typeOperand=kotlin.Any?
+                              CALL 'local final fun test (t: kotlin.Any?): kotlin.Any? declared in <root>.property2$delegate.<anonymous>' type=kotlin.Any? origin=null
+                                t: TYPE_OP type=kotlin.Any? origin=IMPLICIT_CAST typeOperand=kotlin.Any?
+                                  GET_VAR 't: kotlin.Any? declared in <root>.property2$delegate.<anonymous>.<no name provided>.getValue' type=kotlin.Any? origin=null
                     CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.property2$delegate.<anonymous>.<no name provided>' type=<root>.property2$delegate.<anonymous>.<no name provided><kotlin.Any?> origin=OBJECT_LITERAL
     FUN DELEGATED_PROPERTY_ACCESSOR name:<get-property2> visibility:public modality:FINAL <T> ($receiver:T of <root>.<get-property2>) returnType:T of <root>.<get-property2>
       correspondingProperty: PROPERTY name:property2 visibility:public modality:FINAL [delegated,val]
@@ -123,6 +103,26 @@ FILE fqName:<root> fileName:/typeParameterInDelegatedProperty.kt
             t: GET_VAR '<this>: T of <root>.<get-property2> declared in <root>.<get-property2>' type=T of <root>.<get-property2> origin=null
             p: PROPERTY_REFERENCE 'public final property2: T of <root>.<get-property2>' field=null getter='public final fun <get-property2> <T> (): T of <root>.<get-property2> declared in <root>' setter=null type=kotlin.reflect.KProperty1<T of <root>.<get-property2>, T of <root>.<get-property2>> origin=PROPERTY_REFERENCE_FOR_DELEGATE
               <1>: T of <root>.<get-property2>
+  CLASS INTERFACE name:IDelegate modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IDelegate<T of <root>.IDelegate>
+    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false
+    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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:getValue visibility:public modality:ABSTRACT <> ($this:<root>.IDelegate<T of <root>.IDelegate>, t:T of <root>.IDelegate, p:kotlin.reflect.KProperty<*>) returnType:T of <root>.IDelegate [operator]
+      $this: VALUE_PARAMETER name:<this> type:<root>.IDelegate<T of <root>.IDelegate>
+      VALUE_PARAMETER name:t index:0 type:T of <root>.IDelegate
+      VALUE_PARAMETER name:p index:1 type:kotlin.reflect.KProperty<*>
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
       VAR name:superInterfaces type:kotlin.Array<java.lang.reflect.Type> [val]

compiler/testData/codegen/box/delegation/delegationToIntersectionType.fir.ir.txt

@@ -1,11 +1,62 @@
 FILE fqName:<root> fileName:/delegationToIntersectionType.kt
-  FUN name:select visibility:public modality:FINAL <T> (a:T of <root>.select, b:T of <root>.select) returnType:T of <root>.select
-    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false
-    VALUE_PARAMETER name:a index:0 type:T of <root>.select
-    VALUE_PARAMETER name:b index:1 type:T of <root>.select
-    BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun select <T> (a: T of <root>.select, b: T of <root>.select): T of <root>.select declared in <root>'
-        GET_VAR 'a: T of <root>.select declared in <root>.select' type=T of <root>.select origin=null
+  CLASS CLASS name:C modality:FINAL visibility:public superTypes:[<root>.A; <root>.B]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C
+    CONSTRUCTOR visibility:public <> () returnType:<root>.C [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[<root>.A; <root>.B]'
+    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 <root>.A
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.B
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.A
+        public open fun hashCode (): kotlin.Int declared in <root>.B
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.A
+        public open fun toString (): kotlin.String declared in <root>.B
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:OPEN <> ($this:<root>.C) returnType:kotlin.String
+      overridden:
+        public abstract fun foo (): kotlin.String declared in <root>.B
+      $this: VALUE_PARAMETER name:<this> type:<root>.C
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in <root>.C'
+          CONST String type=kotlin.String value="OK"
+  CLASS CLASS name:D modality:FINAL visibility:public superTypes:[<root>.A; <root>.B]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.D
+    CONSTRUCTOR visibility:public <> () returnType:<root>.D [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:D modality:FINAL visibility:public superTypes:[<root>.A; <root>.B]'
+    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 <root>.A
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.B
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.A
+        public open fun hashCode (): kotlin.Int declared in <root>.B
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.A
+        public open fun toString (): kotlin.String declared in <root>.B
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:OPEN <> ($this:<root>.D) returnType:kotlin.String
+      overridden:
+        public abstract fun foo (): kotlin.String declared in <root>.B
+      $this: VALUE_PARAMETER name:<this> type:<root>.D
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in <root>.D'
+          CONST String type=kotlin.String value="FAIL"
   CLASS INTERFACE name:A modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
@@ -23,8 +74,6 @@ FILE fqName:<root> fileName:/delegationToIntersectionType.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS INTERFACE name:B modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.B
-    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.B) returnType:kotlin.String
-      $this: VALUE_PARAMETER name:<this> type:<root>.B
     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
@@ -38,64 +87,21 @@ FILE fqName:<root> fileName:/delegationToIntersectionType.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:C modality:FINAL visibility:public superTypes:[<root>.A; <root>.B]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C
-    CONSTRUCTOR visibility:public <> () returnType:<root>.C [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[<root>.A; <root>.B]'
-    FUN name:foo visibility:public modality:OPEN <> ($this:<root>.C) returnType:kotlin.String
-      overridden:
-        public abstract fun foo (): kotlin.String declared in <root>.B
-      $this: VALUE_PARAMETER name:<this> type:<root>.C
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in <root>.C'
-          CONST String type=kotlin.String value="OK"
-    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 <root>.A
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.B
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.A
-        public open fun hashCode (): kotlin.Int declared in <root>.B
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.A
-        public open fun toString (): kotlin.String declared in <root>.B
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:D modality:FINAL visibility:public superTypes:[<root>.A; <root>.B]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.D
-    CONSTRUCTOR visibility:public <> () returnType:<root>.D [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:D modality:FINAL visibility:public superTypes:[<root>.A; <root>.B]'
-    FUN name:foo visibility:public modality:OPEN <> ($this:<root>.D) returnType:kotlin.String
-      overridden:
-        public abstract fun foo (): kotlin.String declared in <root>.B
-      $this: VALUE_PARAMETER name:<this> type:<root>.D
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in <root>.D'
-          CONST String type=kotlin.String value="FAIL"
-    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 <root>.A
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.B
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.A
-        public open fun hashCode (): kotlin.Int declared in <root>.B
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.A
-        public open fun toString (): kotlin.String declared in <root>.B
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.B) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:<root>.B
+  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
+    BLOCK_BODY
+      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
+        CALL 'public final fun test (c: <root>.C, d: <root>.D): kotlin.String declared in <root>' type=kotlin.String origin=null
+          c: CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.C' type=<root>.C origin=null
+          d: CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.D' type=<root>.D origin=null
+  FUN name:select visibility:public modality:FINAL <T> (a:T of <root>.select, b:T of <root>.select) returnType:T of <root>.select
+    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false
+    VALUE_PARAMETER name:a index:0 type:T of <root>.select
+    VALUE_PARAMETER name:b index:1 type:T of <root>.select
+    BLOCK_BODY
+      RETURN type=kotlin.Nothing from='public final fun select <T> (a: T of <root>.select, b: T of <root>.select): T of <root>.select declared in <root>'
+        GET_VAR 'a: T of <root>.select declared in <root>.select' type=T of <root>.select origin=null
   FUN name:test visibility:public modality:FINAL <> (c:<root>.C, d:<root>.D) returnType:kotlin.String
     VALUE_PARAMETER name:c index:0 type:<root>.C
     VALUE_PARAMETER name:d index:1 type:<root>.D
@@ -110,13 +116,13 @@ FILE fqName:<root> fileName:/delegationToIntersectionType.kt
           $this: BLOCK type=<root>.test.<no name provided> origin=OBJECT_LITERAL
             CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.B]
               $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.test.<no name provided>
+              FIELD DELEGATE name:$$delegate_0 type:kotlin.Any visibility:private [final]
+                EXPRESSION_BODY
+                  GET_VAR 'val intersection: kotlin.Any declared in <root>.test' type=kotlin.Any origin=null
               CONSTRUCTOR visibility:public <> () returnType:<root>.test.<no name provided> [primary]
                 BLOCK_BODY
                   DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
                   INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.B]'
-              FIELD DELEGATE name:$$delegate_0 type:kotlin.Any visibility:private [final]
-                EXPRESSION_BODY
-                  GET_VAR 'val intersection: kotlin.Any declared in <root>.test' type=kotlin.Any origin=null
               FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:<root>.test.<no name provided>) returnType:kotlin.String
                 overridden:
                   public abstract fun foo (): kotlin.String declared in <root>.B
@@ -141,9 +147,3 @@ FILE fqName:<root> fileName:/delegationToIntersectionType.kt
                   public open fun toString (): kotlin.String declared in <root>.B
                 $this: VALUE_PARAMETER name:<this> type:kotlin.Any
             CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.test.<no name provided>' type=<root>.test.<no name provided> origin=OBJECT_LITERAL
-  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
-    BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
-        CALL 'public final fun test (c: <root>.C, d: <root>.D): kotlin.String declared in <root>' type=kotlin.String origin=null
-          c: CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.C' type=<root>.C origin=null
-          d: CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.D' type=<root>.D origin=null

compiler/testData/codegen/box/delegation/delegationToIntersectionType.ir.txt

@@ -1,11 +1,62 @@
 FILE fqName:<root> fileName:/delegationToIntersectionType.kt
-  FUN name:select visibility:public modality:FINAL <T> (a:T of <root>.select, b:T of <root>.select) returnType:T of <root>.select
-    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false
-    VALUE_PARAMETER name:a index:0 type:T of <root>.select
-    VALUE_PARAMETER name:b index:1 type:T of <root>.select
-    BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun select <T> (a: T of <root>.select, b: T of <root>.select): T of <root>.select declared in <root>'
-        GET_VAR 'a: T of <root>.select declared in <root>.select' type=T of <root>.select origin=null
+  CLASS CLASS name:C modality:FINAL visibility:public superTypes:[<root>.A; <root>.B]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C
+    CONSTRUCTOR visibility:public <> () returnType:<root>.C [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[<root>.A; <root>.B]'
+    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 <root>.A
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.B
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.A
+        public open fun hashCode (): kotlin.Int declared in <root>.B
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.A
+        public open fun toString (): kotlin.String declared in <root>.B
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:OPEN <> ($this:<root>.C) returnType:kotlin.String
+      overridden:
+        public abstract fun foo (): kotlin.String declared in <root>.B
+      $this: VALUE_PARAMETER name:<this> type:<root>.C
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in <root>.C'
+          CONST String type=kotlin.String value="OK"
+  CLASS CLASS name:D modality:FINAL visibility:public superTypes:[<root>.A; <root>.B]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.D
+    CONSTRUCTOR visibility:public <> () returnType:<root>.D [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:D modality:FINAL visibility:public superTypes:[<root>.A; <root>.B]'
+    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 <root>.A
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.B
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.A
+        public open fun hashCode (): kotlin.Int declared in <root>.B
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.A
+        public open fun toString (): kotlin.String declared in <root>.B
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:OPEN <> ($this:<root>.D) returnType:kotlin.String
+      overridden:
+        public abstract fun foo (): kotlin.String declared in <root>.B
+      $this: VALUE_PARAMETER name:<this> type:<root>.D
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in <root>.D'
+          CONST String type=kotlin.String value="FAIL"
   CLASS INTERFACE name:A modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
@@ -23,8 +74,6 @@ FILE fqName:<root> fileName:/delegationToIntersectionType.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS INTERFACE name:B modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.B
-    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.B) returnType:kotlin.String
-      $this: VALUE_PARAMETER name:<this> type:<root>.B
     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
@@ -38,64 +87,21 @@ FILE fqName:<root> fileName:/delegationToIntersectionType.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:C modality:FINAL visibility:public superTypes:[<root>.A; <root>.B]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C
-    CONSTRUCTOR visibility:public <> () returnType:<root>.C [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[<root>.A; <root>.B]'
-    FUN name:foo visibility:public modality:OPEN <> ($this:<root>.C) returnType:kotlin.String
-      overridden:
-        public abstract fun foo (): kotlin.String declared in <root>.B
-      $this: VALUE_PARAMETER name:<this> type:<root>.C
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in <root>.C'
-          CONST String type=kotlin.String value="OK"
-    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 <root>.A
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.B
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.A
-        public open fun hashCode (): kotlin.Int declared in <root>.B
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.A
-        public open fun toString (): kotlin.String declared in <root>.B
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:D modality:FINAL visibility:public superTypes:[<root>.A; <root>.B]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.D
-    CONSTRUCTOR visibility:public <> () returnType:<root>.D [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:D modality:FINAL visibility:public superTypes:[<root>.A; <root>.B]'
-    FUN name:foo visibility:public modality:OPEN <> ($this:<root>.D) returnType:kotlin.String
-      overridden:
-        public abstract fun foo (): kotlin.String declared in <root>.B
-      $this: VALUE_PARAMETER name:<this> type:<root>.D
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in <root>.D'
-          CONST String type=kotlin.String value="FAIL"
-    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 <root>.A
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.B
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.A
-        public open fun hashCode (): kotlin.Int declared in <root>.B
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.A
-        public open fun toString (): kotlin.String declared in <root>.B
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.B) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:<root>.B
+  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
+    BLOCK_BODY
+      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
+        CALL 'public final fun test (c: <root>.C, d: <root>.D): kotlin.String declared in <root>' type=kotlin.String origin=null
+          c: CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.C' type=<root>.C origin=null
+          d: CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.D' type=<root>.D origin=null
+  FUN name:select visibility:public modality:FINAL <T> (a:T of <root>.select, b:T of <root>.select) returnType:T of <root>.select
+    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false
+    VALUE_PARAMETER name:a index:0 type:T of <root>.select
+    VALUE_PARAMETER name:b index:1 type:T of <root>.select
+    BLOCK_BODY
+      RETURN type=kotlin.Nothing from='public final fun select <T> (a: T of <root>.select, b: T of <root>.select): T of <root>.select declared in <root>'
+        GET_VAR 'a: T of <root>.select declared in <root>.select' type=T of <root>.select origin=null
   FUN name:test visibility:public modality:FINAL <> (c:<root>.C, d:<root>.D) returnType:kotlin.String
     VALUE_PARAMETER name:c index:0 type:<root>.C
     VALUE_PARAMETER name:d index:1 type:<root>.D
@@ -110,13 +116,13 @@ FILE fqName:<root> fileName:/delegationToIntersectionType.kt
           $this: BLOCK type=<root>.test.<no name provided> origin=OBJECT_LITERAL
             CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.B]
               $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.test.<no name provided>
+              FIELD DELEGATE name:$$delegate_0 type:kotlin.Any visibility:private [final]
+                EXPRESSION_BODY
+                  GET_VAR 'val intersection: kotlin.Any declared in <root>.test' type=kotlin.Any origin=null
               CONSTRUCTOR visibility:public <> () returnType:<root>.test.<no name provided> [primary]
                 BLOCK_BODY
                   DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
                   INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.B]'
-              FIELD DELEGATE name:$$delegate_0 type:kotlin.Any visibility:private [final]
-                EXPRESSION_BODY
-                  GET_VAR 'val intersection: kotlin.Any declared in <root>.test' type=kotlin.Any origin=null
               FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:<root>.test.<no name provided>) returnType:kotlin.String
                 overridden:
                   public abstract fun foo (): kotlin.String declared in <root>.B
@@ -141,9 +147,3 @@ FILE fqName:<root> fileName:/delegationToIntersectionType.kt
                   public open fun toString (): kotlin.String declared in <root>.B
                 $this: VALUE_PARAMETER name:<this> type:kotlin.Any
             CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.test.<no name provided>' type=<root>.test.<no name provided> origin=OBJECT_LITERAL
-  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
-    BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
-        CALL 'public final fun test (c: <root>.C, d: <root>.D): kotlin.String declared in <root>' type=kotlin.String origin=null
-          c: CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.C' type=<root>.C origin=null
-          d: CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.D' type=<root>.D origin=null

compiler/testData/codegen/box/delegation/delegationToIntersectionType2.fir.ir.txt

@@ -1,51 +1,26 @@
 FILE fqName:<root> fileName:/delegationToIntersectionType2.kt
-  FUN name:select visibility:public modality:FINAL <T> (a:T of <root>.select, b:T of <root>.select) returnType:T of <root>.select
-    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false
-    VALUE_PARAMETER name:a index:0 type:T of <root>.select
-    VALUE_PARAMETER name:b index:1 type:T of <root>.select
-    BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun select <T> (a: T of <root>.select, b: T of <root>.select): T of <root>.select declared in <root>'
-        GET_VAR 'a: T of <root>.select declared in <root>.select' type=T of <root>.select origin=null
-  CLASS INTERFACE name:A modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A
-    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.A) returnType:kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.A
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS INTERFACE name:B modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.B
-    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.B) returnType:kotlin.String
-      $this: VALUE_PARAMETER name:<this> type:<root>.B
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:C modality:FINAL visibility:public superTypes:[<root>.A; <root>.B]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C
     CONSTRUCTOR visibility:public <> () returnType:<root>.C [primary]
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[<root>.A; <root>.B]'
+    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 <root>.A
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.B
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.A
+        public open fun hashCode (): kotlin.Int declared in <root>.B
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.A
+        public open fun toString (): kotlin.String declared in <root>.B
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     FUN name:foo visibility:public modality:OPEN <> ($this:<root>.C) returnType:kotlin.String
       overridden:
         public abstract fun foo (): kotlin.Any declared in <root>.A
@@ -54,6 +29,12 @@ FILE fqName:<root> fileName:/delegationToIntersectionType2.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in <root>.C'
           CONST String type=kotlin.String value="OK"
+  CLASS CLASS name:D modality:FINAL visibility:public superTypes:[<root>.A; <root>.B]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.D
+    CONSTRUCTOR visibility:public <> () returnType:<root>.D [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:D modality:FINAL visibility:public superTypes:[<root>.A; <root>.B]'
     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 <root>.A
@@ -70,12 +51,6 @@ FILE fqName:<root> fileName:/delegationToIntersectionType2.kt
         public open fun toString (): kotlin.String declared in <root>.A
         public open fun toString (): kotlin.String declared in <root>.B
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:D modality:FINAL visibility:public superTypes:[<root>.A; <root>.B]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.D
-    CONSTRUCTOR visibility:public <> () returnType:<root>.D [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:D modality:FINAL visibility:public superTypes:[<root>.A; <root>.B]'
     FUN name:foo visibility:public modality:OPEN <> ($this:<root>.D) returnType:kotlin.String
       overridden:
         public abstract fun foo (): kotlin.Any declared in <root>.A
@@ -84,22 +59,53 @@ FILE fqName:<root> fileName:/delegationToIntersectionType2.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in <root>.D'
           CONST String type=kotlin.String value="FAIL"
+  CLASS INTERFACE name:A modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A
     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 <root>.A
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.B
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
     FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.A
-        public open fun hashCode (): kotlin.Int declared in <root>.B
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
-        public open fun toString (): kotlin.String declared in <root>.A
-        public open fun toString (): kotlin.String declared in <root>.B
+        public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.A) returnType:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.A
+  CLASS INTERFACE name:B modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.B
+    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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.B) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:<root>.B
+  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
+    BLOCK_BODY
+      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
+        CALL 'public final fun test (c: <root>.C, d: <root>.D): kotlin.String declared in <root>' type=kotlin.String origin=null
+          c: CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.C' type=<root>.C origin=null
+          d: CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.D' type=<root>.D origin=null
+  FUN name:select visibility:public modality:FINAL <T> (a:T of <root>.select, b:T of <root>.select) returnType:T of <root>.select
+    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false
+    VALUE_PARAMETER name:a index:0 type:T of <root>.select
+    VALUE_PARAMETER name:b index:1 type:T of <root>.select
+    BLOCK_BODY
+      RETURN type=kotlin.Nothing from='public final fun select <T> (a: T of <root>.select, b: T of <root>.select): T of <root>.select declared in <root>'
+        GET_VAR 'a: T of <root>.select declared in <root>.select' type=T of <root>.select origin=null
   FUN name:test visibility:public modality:FINAL <> (c:<root>.C, d:<root>.D) returnType:kotlin.String
     VALUE_PARAMETER name:c index:0 type:<root>.C
     VALUE_PARAMETER name:d index:1 type:<root>.D
@@ -115,13 +121,13 @@ FILE fqName:<root> fileName:/delegationToIntersectionType2.kt
             $this: BLOCK type=<root>.test.<no name provided> origin=OBJECT_LITERAL
               CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.A]
                 $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.test.<no name provided>
+                FIELD DELEGATE name:$$delegate_0 type:kotlin.Any visibility:private [final]
+                  EXPRESSION_BODY
+                    GET_VAR 'val intersection: kotlin.Any declared in <root>.test' type=kotlin.Any origin=null
                 CONSTRUCTOR visibility:public <> () returnType:<root>.test.<no name provided> [primary]
                   BLOCK_BODY
                     DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
                     INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.A]'
-                FIELD DELEGATE name:$$delegate_0 type:kotlin.Any visibility:private [final]
-                  EXPRESSION_BODY
-                    GET_VAR 'val intersection: kotlin.Any declared in <root>.test' type=kotlin.Any origin=null
                 FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:<root>.test.<no name provided>) returnType:kotlin.Any
                   overridden:
                     public abstract fun foo (): kotlin.Any declared in <root>.A
@@ -146,9 +152,3 @@ FILE fqName:<root> fileName:/delegationToIntersectionType2.kt
                     public open fun toString (): kotlin.String declared in <root>.A
                   $this: VALUE_PARAMETER name:<this> type:kotlin.Any
               CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.test.<no name provided>' type=<root>.test.<no name provided> origin=OBJECT_LITERAL
-  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
-    BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
-        CALL 'public final fun test (c: <root>.C, d: <root>.D): kotlin.String declared in <root>' type=kotlin.String origin=null
-          c: CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.C' type=<root>.C origin=null
-          d: CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.D' type=<root>.D origin=null

compiler/testData/codegen/box/delegation/nestedNameClash.fir.ir.txt

@@ -1,64 +1,6 @@
 FILE fqName:second fileName:/nestedNameClash.kt
-  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
-    BLOCK_BODY
-      VAR name:data type:second.MyClass [val]
-        CONSTRUCTOR_CALL 'public constructor <init> (prop: second.Base<second.Base<kotlin.Int>>) declared in second.MyClass' type=second.MyClass origin=null
-          prop: BLOCK type=second.box.<no name provided> origin=OBJECT_LITERAL
-            CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[second.Base<second.Base<kotlin.Int>>]
-              $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:second.box.<no name provided>
-              CONSTRUCTOR visibility:public <> () returnType:second.box.<no name provided> [primary]
-                BLOCK_BODY
-                  DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-                  INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[second.Base<second.Base<kotlin.Int>>]'
-              FUN FAKE_OVERRIDE name:foo visibility:public modality:OPEN <> ($this:second.Base<second.Base<kotlin.Int>>) returnType:kotlin.String [fake_override]
-                overridden:
-                  public open fun foo (): kotlin.String declared in second.Base
-                $this: VALUE_PARAMETER name:<this> type:second.Base<second.Base<kotlin.Int>>
-              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 second.Base
-                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-                VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-              FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-                overridden:
-                  public open fun hashCode (): kotlin.Int declared in second.Base
-                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-              FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-                overridden:
-                  public open fun toString (): kotlin.String declared in second.Base
-                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-            CONSTRUCTOR_CALL 'public constructor <init> () declared in second.box.<no name provided>' type=second.box.<no name provided> origin=OBJECT_LITERAL
-      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in second'
-        CALL 'public open fun foo (): kotlin.String declared in second.MyClass' type=kotlin.String origin=null
-          $this: GET_VAR 'val data: second.MyClass declared in second.box' type=second.MyClass origin=null
-  CLASS INTERFACE name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:second.Base<A of second.Base>
-    TYPE_PARAMETER name:A index:0 variance: superTypes:[kotlin.Any?] reified:false
-    FUN name:foo visibility:public modality:OPEN <> ($this:second.Base<A of second.Base>) returnType:kotlin.String
-      $this: VALUE_PARAMETER name:<this> type:second.Base<A of second.Base>
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in second.Base'
-          CONST String type=kotlin.String value="OK"
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:MyClass modality:FINAL visibility:public superTypes:[second.Base<second.Base<kotlin.Int>>]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:second.MyClass
-    CONSTRUCTOR visibility:public <> (prop:second.Base<second.Base<kotlin.Int>>) returnType:second.MyClass [primary]
-      VALUE_PARAMETER name:prop index:0 type:second.Base<second.Base<kotlin.Int>>
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MyClass modality:FINAL visibility:public superTypes:[second.Base<second.Base<kotlin.Int>>]'
     PROPERTY name:prop visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:prop type:second.Base<second.Base<kotlin.Int>> visibility:private [final]
         EXPRESSION_BODY
@@ -70,15 +12,6 @@ FILE fqName:second fileName:/nestedNameClash.kt
           RETURN type=kotlin.Nothing from='public final fun <get-prop> (): second.Base<second.Base<kotlin.Int>> declared in second.MyClass'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:prop type:second.Base<second.Base<kotlin.Int>> visibility:private [final]' type=second.Base<second.Base<kotlin.Int>> origin=null
               receiver: GET_VAR '<this>: second.MyClass declared in second.MyClass.<get-prop>' type=second.MyClass origin=null
-    FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:second.MyClass) returnType:kotlin.String
-      overridden:
-        public open fun foo (): kotlin.String declared in second.Base
-      $this: VALUE_PARAMETER name:<this> type:second.MyClass
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in second.MyClass'
-          CALL 'public open fun foo (): kotlin.String declared in second.Base' type=kotlin.String origin=null
-            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:prop type:second.Base<second.Base<kotlin.Int>> visibility:private [final]' type=second.Base<second.Base<kotlin.Int>> origin=null
-              receiver: GET_VAR '<this>: second.MyClass declared in second.MyClass.foo' type=second.MyClass origin=null
     CLASS INTERFACE name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:second.MyClass.Base
       FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
@@ -94,6 +27,20 @@ FILE fqName:second fileName:/nestedNameClash.kt
         overridden:
           public open fun toString (): kotlin.String declared in kotlin.Any
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    CONSTRUCTOR visibility:public <> (prop:second.Base<second.Base<kotlin.Int>>) returnType:second.MyClass [primary]
+      VALUE_PARAMETER name:prop index:0 type:second.Base<second.Base<kotlin.Int>>
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MyClass modality:FINAL visibility:public superTypes:[second.Base<second.Base<kotlin.Int>>]'
+    FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:second.MyClass) returnType:kotlin.String
+      overridden:
+        public open fun foo (): kotlin.String declared in second.Base
+      $this: VALUE_PARAMETER name:<this> type:second.MyClass
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in second.MyClass'
+          CALL 'public open fun foo (): kotlin.String declared in second.Base' type=kotlin.String origin=null
+            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:prop type:second.Base<second.Base<kotlin.Int>> visibility:private [final]' type=second.Base<second.Base<kotlin.Int>> origin=null
+              receiver: GET_VAR '<this>: second.MyClass declared in second.MyClass.foo' type=second.MyClass 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 second.Base
@@ -107,3 +54,56 @@ FILE fqName:second fileName:/nestedNameClash.kt
       overridden:
         public open fun toString (): kotlin.String declared in second.Base
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS INTERFACE name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:second.Base<A of second.Base>
+    TYPE_PARAMETER name:A index:0 variance: superTypes:[kotlin.Any?] reified:false
+    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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:OPEN <> ($this:second.Base<A of second.Base>) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:second.Base<A of second.Base>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in second.Base'
+          CONST String type=kotlin.String value="OK"
+  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
+    BLOCK_BODY
+      VAR name:data type:second.MyClass [val]
+        CONSTRUCTOR_CALL 'public constructor <init> (prop: second.Base<second.Base<kotlin.Int>>) declared in second.MyClass' type=second.MyClass origin=null
+          prop: BLOCK type=second.box.<no name provided> origin=OBJECT_LITERAL
+            CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[second.Base<second.Base<kotlin.Int>>]
+              $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:second.box.<no name provided>
+              CONSTRUCTOR visibility:public <> () returnType:second.box.<no name provided> [primary]
+                BLOCK_BODY
+                  DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+                  INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[second.Base<second.Base<kotlin.Int>>]'
+              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 second.Base
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+                VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+              FUN FAKE_OVERRIDE name:foo visibility:public modality:OPEN <> ($this:second.Base<second.Base<kotlin.Int>>) returnType:kotlin.String [fake_override]
+                overridden:
+                  public open fun foo (): kotlin.String declared in second.Base
+                $this: VALUE_PARAMETER name:<this> type:second.Base<second.Base<kotlin.Int>>
+              FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+                overridden:
+                  public open fun hashCode (): kotlin.Int declared in second.Base
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+              FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+                overridden:
+                  public open fun toString (): kotlin.String declared in second.Base
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+            CONSTRUCTOR_CALL 'public constructor <init> () declared in second.box.<no name provided>' type=second.box.<no name provided> origin=OBJECT_LITERAL
+      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in second'
+        CALL 'public open fun foo (): kotlin.String declared in second.MyClass' type=kotlin.String origin=null
+          $this: GET_VAR 'val data: second.MyClass declared in second.box' type=second.MyClass origin=null

compiler/testData/codegen/box/delegation/nestedNameClash.ir.txt

@@ -1,64 +1,6 @@
 FILE fqName:second fileName:/nestedNameClash.kt
-  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
-    BLOCK_BODY
-      VAR name:data type:second.MyClass [val]
-        CONSTRUCTOR_CALL 'public constructor <init> (prop: second.Base<second.Base<kotlin.Int>>) declared in second.MyClass' type=second.MyClass origin=null
-          prop: BLOCK type=second.box.<no name provided> origin=OBJECT_LITERAL
-            CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[second.Base<second.Base<kotlin.Int>>]
-              $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:second.box.<no name provided>
-              CONSTRUCTOR visibility:public <> () returnType:second.box.<no name provided> [primary]
-                BLOCK_BODY
-                  DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-                  INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[second.Base<second.Base<kotlin.Int>>]'
-              FUN FAKE_OVERRIDE name:foo visibility:public modality:OPEN <> ($this:second.Base<second.Base<kotlin.Int>>) returnType:kotlin.String [fake_override]
-                overridden:
-                  public open fun foo (): kotlin.String declared in second.Base
-                $this: VALUE_PARAMETER name:<this> type:second.Base<second.Base<kotlin.Int>>
-              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 second.Base
-                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-                VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-              FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-                overridden:
-                  public open fun hashCode (): kotlin.Int declared in second.Base
-                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-              FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-                overridden:
-                  public open fun toString (): kotlin.String declared in second.Base
-                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-            CONSTRUCTOR_CALL 'public constructor <init> () declared in second.box.<no name provided>' type=second.box.<no name provided> origin=OBJECT_LITERAL
-      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in second'
-        CALL 'public open fun foo (): kotlin.String declared in second.MyClass' type=kotlin.String origin=null
-          $this: GET_VAR 'val data: second.MyClass declared in second.box' type=second.MyClass origin=null
-  CLASS INTERFACE name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:second.Base<A of second.Base>
-    TYPE_PARAMETER name:A index:0 variance: superTypes:[kotlin.Any?] reified:false
-    FUN name:foo visibility:public modality:OPEN <> ($this:second.Base<A of second.Base>) returnType:kotlin.String
-      $this: VALUE_PARAMETER name:<this> type:second.Base<A of second.Base>
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in second.Base'
-          CONST String type=kotlin.String value="OK"
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:MyClass modality:FINAL visibility:public superTypes:[second.Base<second.Base<kotlin.Int>>]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:second.MyClass
-    CONSTRUCTOR visibility:public <> (prop:second.Base<second.Base<kotlin.Int>>) returnType:second.MyClass [primary]
-      VALUE_PARAMETER name:prop index:0 type:second.Base<second.Base<kotlin.Int>>
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MyClass modality:FINAL visibility:public superTypes:[second.Base<second.Base<kotlin.Int>>]'
     PROPERTY name:prop visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:prop type:second.Base<second.Base<kotlin.Int>> visibility:private [final]
         EXPRESSION_BODY
@@ -70,15 +12,6 @@ FILE fqName:second fileName:/nestedNameClash.kt
           RETURN type=kotlin.Nothing from='public final fun <get-prop> (): second.Base<second.Base<kotlin.Int>> declared in second.MyClass'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:prop type:second.Base<second.Base<kotlin.Int>> visibility:private [final]' type=second.Base<second.Base<kotlin.Int>> origin=null
               receiver: GET_VAR '<this>: second.MyClass declared in second.MyClass.<get-prop>' type=second.MyClass origin=null
-    FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:second.MyClass) returnType:kotlin.String
-      overridden:
-        public open fun foo (): kotlin.String declared in second.Base
-      $this: VALUE_PARAMETER name:<this> type:second.MyClass
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in second.MyClass'
-          CALL 'public open fun foo (): kotlin.String declared in second.Base' type=kotlin.String origin=null
-            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:prop type:second.Base<second.Base<kotlin.Int>> visibility:private [final]' type=second.Base<second.Base<kotlin.Int>> origin=null
-              receiver: GET_VAR '<this>: second.MyClass declared in second.MyClass.foo' type=second.MyClass origin=null
     CLASS INTERFACE name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:second.MyClass.Base
       FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
@@ -94,6 +27,20 @@ FILE fqName:second fileName:/nestedNameClash.kt
         overridden:
           public open fun toString (): kotlin.String declared in kotlin.Any
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    CONSTRUCTOR visibility:public <> (prop:second.Base<second.Base<kotlin.Int>>) returnType:second.MyClass [primary]
+      VALUE_PARAMETER name:prop index:0 type:second.Base<second.Base<kotlin.Int>>
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MyClass modality:FINAL visibility:public superTypes:[second.Base<second.Base<kotlin.Int>>]'
+    FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:second.MyClass) returnType:kotlin.String
+      overridden:
+        public open fun foo (): kotlin.String declared in second.Base
+      $this: VALUE_PARAMETER name:<this> type:second.MyClass
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in second.MyClass'
+          CALL 'public open fun foo (): kotlin.String declared in second.Base' type=kotlin.String origin=null
+            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:prop type:second.Base<second.Base<kotlin.Int>> visibility:private [final]' type=second.Base<second.Base<kotlin.Int>> origin=null
+              receiver: GET_VAR '<this>: second.MyClass declared in second.MyClass.foo' type=second.MyClass 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 second.Base
@@ -107,3 +54,56 @@ FILE fqName:second fileName:/nestedNameClash.kt
       overridden:
         public open fun toString (): kotlin.String declared in second.Base
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS INTERFACE name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:second.Base<A of second.Base>
+    TYPE_PARAMETER name:A index:0 variance: superTypes:[kotlin.Any?] reified:false
+    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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:OPEN <> ($this:second.Base<A of second.Base>) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:second.Base<A of second.Base>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in second.Base'
+          CONST String type=kotlin.String value="OK"
+  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
+    BLOCK_BODY
+      VAR name:data type:second.MyClass [val]
+        CONSTRUCTOR_CALL 'public constructor <init> (prop: second.Base<second.Base<kotlin.Int>>) declared in second.MyClass' type=second.MyClass origin=null
+          prop: BLOCK type=second.box.<no name provided> origin=OBJECT_LITERAL
+            CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[second.Base<second.Base<kotlin.Int>>]
+              $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:second.box.<no name provided>
+              CONSTRUCTOR visibility:public <> () returnType:second.box.<no name provided> [primary]
+                BLOCK_BODY
+                  DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+                  INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[second.Base<second.Base<kotlin.Int>>]'
+              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 second.Base
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+                VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+              FUN FAKE_OVERRIDE name:foo visibility:public modality:OPEN <> ($this:second.Base<second.Base<kotlin.Int>>) returnType:kotlin.String [fake_override]
+                overridden:
+                  public open fun foo (): kotlin.String declared in second.Base
+                $this: VALUE_PARAMETER name:<this> type:second.Base<second.Base<kotlin.Int>>
+              FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+                overridden:
+                  public open fun hashCode (): kotlin.Int declared in second.Base
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+              FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+                overridden:
+                  public open fun toString (): kotlin.String declared in second.Base
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+            CONSTRUCTOR_CALL 'public constructor <init> () declared in second.box.<no name provided>' type=second.box.<no name provided> origin=OBJECT_LITERAL
+      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in second'
+        CALL 'public open fun foo (): kotlin.String declared in second.MyClass' type=kotlin.String origin=null
+          $this: GET_VAR 'val data: second.MyClass declared in second.box' type=second.MyClass origin=null

compiler/testData/codegen/box/delegation/nestedNameClash2.fir.ir.txt

@@ -1,63 +1,6 @@
 FILE fqName:second fileName:/nestedNameClash2.kt
-  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
-    BLOCK_BODY
-      VAR name:data type:second.MyClass [val]
-        CONSTRUCTOR_CALL 'public constructor <init> (prop: second.Base) declared in second.MyClass' type=second.MyClass origin=null
-          prop: BLOCK type=second.box.<no name provided> origin=OBJECT_LITERAL
-            CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[second.Base]
-              $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:second.box.<no name provided>
-              CONSTRUCTOR visibility:public <> () returnType:second.box.<no name provided> [primary]
-                BLOCK_BODY
-                  DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-                  INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[second.Base]'
-              FUN FAKE_OVERRIDE name:foo visibility:public modality:OPEN <> ($this:second.Base) returnType:kotlin.String [fake_override]
-                overridden:
-                  public open fun foo (): kotlin.String declared in second.Base
-                $this: VALUE_PARAMETER name:<this> type:second.Base
-              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 second.Base
-                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-                VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-              FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-                overridden:
-                  public open fun hashCode (): kotlin.Int declared in second.Base
-                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-              FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-                overridden:
-                  public open fun toString (): kotlin.String declared in second.Base
-                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-            CONSTRUCTOR_CALL 'public constructor <init> () declared in second.box.<no name provided>' type=second.box.<no name provided> origin=OBJECT_LITERAL
-      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in second'
-        CALL 'public open fun foo (): kotlin.String declared in second.MyClass' type=kotlin.String origin=null
-          $this: GET_VAR 'val data: second.MyClass declared in second.box' type=second.MyClass origin=null
-  CLASS INTERFACE name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:second.Base
-    FUN name:foo visibility:public modality:OPEN <> ($this:second.Base) returnType:kotlin.String
-      $this: VALUE_PARAMETER name:<this> type:second.Base
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in second.Base'
-          CONST String type=kotlin.String value="OK"
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:MyClass modality:FINAL visibility:public superTypes:[second.Base]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:second.MyClass
-    CONSTRUCTOR visibility:public <> (prop:second.Base) returnType:second.MyClass [primary]
-      VALUE_PARAMETER name:prop index:0 type:second.Base
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MyClass modality:FINAL visibility:public superTypes:[second.Base]'
     PROPERTY name:prop visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:prop type:second.Base visibility:private [final]
         EXPRESSION_BODY
@@ -69,15 +12,6 @@ FILE fqName:second fileName:/nestedNameClash2.kt
           RETURN type=kotlin.Nothing from='public final fun <get-prop> (): second.Base declared in second.MyClass'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:prop type:second.Base visibility:private [final]' type=second.Base origin=null
               receiver: GET_VAR '<this>: second.MyClass declared in second.MyClass.<get-prop>' type=second.MyClass origin=null
-    FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:second.MyClass) returnType:kotlin.String
-      overridden:
-        public open fun foo (): kotlin.String declared in second.Base
-      $this: VALUE_PARAMETER name:<this> type:second.MyClass
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in second.MyClass'
-          CALL 'public open fun foo (): kotlin.String declared in second.Base' type=kotlin.String origin=null
-            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:prop type:second.Base visibility:private [final]' type=second.Base origin=null
-              receiver: GET_VAR '<this>: second.MyClass declared in second.MyClass.foo' type=second.MyClass origin=null
     CLASS INTERFACE name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:second.MyClass.Base
       FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
@@ -93,6 +27,20 @@ FILE fqName:second fileName:/nestedNameClash2.kt
         overridden:
           public open fun toString (): kotlin.String declared in kotlin.Any
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    CONSTRUCTOR visibility:public <> (prop:second.Base) returnType:second.MyClass [primary]
+      VALUE_PARAMETER name:prop index:0 type:second.Base
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MyClass modality:FINAL visibility:public superTypes:[second.Base]'
+    FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:second.MyClass) returnType:kotlin.String
+      overridden:
+        public open fun foo (): kotlin.String declared in second.Base
+      $this: VALUE_PARAMETER name:<this> type:second.MyClass
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in second.MyClass'
+          CALL 'public open fun foo (): kotlin.String declared in second.Base' type=kotlin.String origin=null
+            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:prop type:second.Base visibility:private [final]' type=second.Base origin=null
+              receiver: GET_VAR '<this>: second.MyClass declared in second.MyClass.foo' type=second.MyClass 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 second.Base
@@ -106,3 +54,55 @@ FILE fqName:second fileName:/nestedNameClash2.kt
       overridden:
         public open fun toString (): kotlin.String declared in second.Base
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS INTERFACE name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:second.Base
+    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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:OPEN <> ($this:second.Base) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:second.Base
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in second.Base'
+          CONST String type=kotlin.String value="OK"
+  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
+    BLOCK_BODY
+      VAR name:data type:second.MyClass [val]
+        CONSTRUCTOR_CALL 'public constructor <init> (prop: second.Base) declared in second.MyClass' type=second.MyClass origin=null
+          prop: BLOCK type=second.box.<no name provided> origin=OBJECT_LITERAL
+            CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[second.Base]
+              $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:second.box.<no name provided>
+              CONSTRUCTOR visibility:public <> () returnType:second.box.<no name provided> [primary]
+                BLOCK_BODY
+                  DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+                  INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[second.Base]'
+              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 second.Base
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+                VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+              FUN FAKE_OVERRIDE name:foo visibility:public modality:OPEN <> ($this:second.Base) returnType:kotlin.String [fake_override]
+                overridden:
+                  public open fun foo (): kotlin.String declared in second.Base
+                $this: VALUE_PARAMETER name:<this> type:second.Base
+              FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+                overridden:
+                  public open fun hashCode (): kotlin.Int declared in second.Base
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+              FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+                overridden:
+                  public open fun toString (): kotlin.String declared in second.Base
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+            CONSTRUCTOR_CALL 'public constructor <init> () declared in second.box.<no name provided>' type=second.box.<no name provided> origin=OBJECT_LITERAL
+      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in second'
+        CALL 'public open fun foo (): kotlin.String declared in second.MyClass' type=kotlin.String origin=null
+          $this: GET_VAR 'val data: second.MyClass declared in second.box' type=second.MyClass origin=null

compiler/testData/codegen/box/delegation/nestedNameClash2.ir.txt

@@ -1,63 +1,6 @@
 FILE fqName:second fileName:/nestedNameClash2.kt
-  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
-    BLOCK_BODY
-      VAR name:data type:second.MyClass [val]
-        CONSTRUCTOR_CALL 'public constructor <init> (prop: second.Base) declared in second.MyClass' type=second.MyClass origin=null
-          prop: BLOCK type=second.box.<no name provided> origin=OBJECT_LITERAL
-            CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[second.Base]
-              $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:second.box.<no name provided>
-              CONSTRUCTOR visibility:public <> () returnType:second.box.<no name provided> [primary]
-                BLOCK_BODY
-                  DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-                  INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[second.Base]'
-              FUN FAKE_OVERRIDE name:foo visibility:public modality:OPEN <> ($this:second.Base) returnType:kotlin.String [fake_override]
-                overridden:
-                  public open fun foo (): kotlin.String declared in second.Base
-                $this: VALUE_PARAMETER name:<this> type:second.Base
-              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 second.Base
-                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-                VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-              FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-                overridden:
-                  public open fun hashCode (): kotlin.Int declared in second.Base
-                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-              FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-                overridden:
-                  public open fun toString (): kotlin.String declared in second.Base
-                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-            CONSTRUCTOR_CALL 'public constructor <init> () declared in second.box.<no name provided>' type=second.box.<no name provided> origin=OBJECT_LITERAL
-      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in second'
-        CALL 'public open fun foo (): kotlin.String declared in second.MyClass' type=kotlin.String origin=null
-          $this: GET_VAR 'val data: second.MyClass declared in second.box' type=second.MyClass origin=null
-  CLASS INTERFACE name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:second.Base
-    FUN name:foo visibility:public modality:OPEN <> ($this:second.Base) returnType:kotlin.String
-      $this: VALUE_PARAMETER name:<this> type:second.Base
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in second.Base'
-          CONST String type=kotlin.String value="OK"
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:MyClass modality:FINAL visibility:public superTypes:[second.Base]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:second.MyClass
-    CONSTRUCTOR visibility:public <> (prop:second.Base) returnType:second.MyClass [primary]
-      VALUE_PARAMETER name:prop index:0 type:second.Base
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MyClass modality:FINAL visibility:public superTypes:[second.Base]'
     PROPERTY name:prop visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:prop type:second.Base visibility:private [final]
         EXPRESSION_BODY
@@ -69,15 +12,6 @@ FILE fqName:second fileName:/nestedNameClash2.kt
           RETURN type=kotlin.Nothing from='public final fun <get-prop> (): second.Base declared in second.MyClass'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:prop type:second.Base visibility:private [final]' type=second.Base origin=null
               receiver: GET_VAR '<this>: second.MyClass declared in second.MyClass.<get-prop>' type=second.MyClass origin=null
-    FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:second.MyClass) returnType:kotlin.String
-      overridden:
-        public open fun foo (): kotlin.String declared in second.Base
-      $this: VALUE_PARAMETER name:<this> type:second.MyClass
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in second.MyClass'
-          CALL 'public open fun foo (): kotlin.String declared in second.Base' type=kotlin.String origin=null
-            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:prop type:second.Base visibility:private [final]' type=second.Base origin=null
-              receiver: GET_VAR '<this>: second.MyClass declared in second.MyClass.foo' type=second.MyClass origin=null
     CLASS INTERFACE name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:second.MyClass.Base
       FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
@@ -93,6 +27,20 @@ FILE fqName:second fileName:/nestedNameClash2.kt
         overridden:
           public open fun toString (): kotlin.String declared in kotlin.Any
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    CONSTRUCTOR visibility:public <> (prop:second.Base) returnType:second.MyClass [primary]
+      VALUE_PARAMETER name:prop index:0 type:second.Base
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MyClass modality:FINAL visibility:public superTypes:[second.Base]'
+    FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:second.MyClass) returnType:kotlin.String
+      overridden:
+        public open fun foo (): kotlin.String declared in second.Base
+      $this: VALUE_PARAMETER name:<this> type:second.MyClass
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in second.MyClass'
+          CALL 'public open fun foo (): kotlin.String declared in second.Base' type=kotlin.String origin=null
+            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:prop type:second.Base visibility:private [final]' type=second.Base origin=null
+              receiver: GET_VAR '<this>: second.MyClass declared in second.MyClass.foo' type=second.MyClass 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 second.Base
@@ -106,3 +54,55 @@ FILE fqName:second fileName:/nestedNameClash2.kt
       overridden:
         public open fun toString (): kotlin.String declared in second.Base
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS INTERFACE name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:second.Base
+    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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:OPEN <> ($this:second.Base) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:second.Base
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in second.Base'
+          CONST String type=kotlin.String value="OK"
+  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
+    BLOCK_BODY
+      VAR name:data type:second.MyClass [val]
+        CONSTRUCTOR_CALL 'public constructor <init> (prop: second.Base) declared in second.MyClass' type=second.MyClass origin=null
+          prop: BLOCK type=second.box.<no name provided> origin=OBJECT_LITERAL
+            CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[second.Base]
+              $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:second.box.<no name provided>
+              CONSTRUCTOR visibility:public <> () returnType:second.box.<no name provided> [primary]
+                BLOCK_BODY
+                  DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+                  INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[second.Base]'
+              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 second.Base
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+                VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+              FUN FAKE_OVERRIDE name:foo visibility:public modality:OPEN <> ($this:second.Base) returnType:kotlin.String [fake_override]
+                overridden:
+                  public open fun foo (): kotlin.String declared in second.Base
+                $this: VALUE_PARAMETER name:<this> type:second.Base
+              FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+                overridden:
+                  public open fun hashCode (): kotlin.Int declared in second.Base
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+              FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+                overridden:
+                  public open fun toString (): kotlin.String declared in second.Base
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+            CONSTRUCTOR_CALL 'public constructor <init> () declared in second.box.<no name provided>' type=second.box.<no name provided> origin=OBJECT_LITERAL
+      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in second'
+        CALL 'public open fun foo (): kotlin.String declared in second.MyClass' type=kotlin.String origin=null
+          $this: GET_VAR 'val data: second.MyClass declared in second.box' type=second.MyClass origin=null

compiler/testData/codegen/box/fakeOverride/complexOverriddensInLazyFunctions.fir.ir.txt

@@ -1,10 +1,6 @@
 FILE fqName:<root> fileName:/base.kt
   CLASS INTERFACE name:A modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A
-    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.A) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:<root>.A
-    FUN name:bar visibility:public modality:ABSTRACT <> ($this:<root>.A) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:<root>.A
     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
@@ -18,12 +14,12 @@ FILE fqName:<root> fileName:/base.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:bar visibility:public modality:ABSTRACT <> ($this:<root>.A) returnType:kotlin.Unit
+      $this: VALUE_PARAMETER name:<this> type:<root>.A
+    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.A) returnType:kotlin.Unit
+      $this: VALUE_PARAMETER name:<this> type:<root>.A
   CLASS INTERFACE name:B modality:ABSTRACT visibility:public superTypes:[<root>.A]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.B
-    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.A) returnType:kotlin.Unit [fake_override]
-      overridden:
-        public abstract fun foo (): kotlin.Unit declared in <root>.A
-      $this: VALUE_PARAMETER name:<this> type:<root>.A
     FUN FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT <> ($this:<root>.A) returnType:kotlin.Unit [fake_override]
       overridden:
         public abstract fun bar (): kotlin.Unit declared in <root>.A
@@ -33,6 +29,10 @@ FILE fqName:<root> fileName:/base.kt
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.A
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.A) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public abstract fun foo (): kotlin.Unit declared in <root>.A
+      $this: VALUE_PARAMETER name:<this> type:<root>.A
     FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int declared in <root>.A
@@ -43,10 +43,6 @@ FILE fqName:<root> fileName:/base.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS INTERFACE name:C modality:ABSTRACT visibility:public superTypes:[<root>.A]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C
-    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.A) returnType:kotlin.Unit [fake_override]
-      overridden:
-        public abstract fun foo (): kotlin.Unit declared in <root>.A
-      $this: VALUE_PARAMETER name:<this> type:<root>.A
     FUN FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT <> ($this:<root>.A) returnType:kotlin.Unit [fake_override]
       overridden:
         public abstract fun bar (): kotlin.Unit declared in <root>.A
@@ -56,6 +52,10 @@ FILE fqName:<root> fileName:/base.kt
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.A
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.A) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public abstract fun foo (): kotlin.Unit declared in <root>.A
+      $this: VALUE_PARAMETER name:<this> type:<root>.A
     FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int declared in <root>.A
@@ -66,8 +66,6 @@ FILE fqName:<root> fileName:/base.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS INTERFACE name:D modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.D
-    FUN name:bar visibility:public modality:ABSTRACT <> ($this:<root>.D) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:<root>.D
     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
@@ -81,7 +79,13 @@ FILE fqName:<root> fileName:/base.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:bar visibility:public modality:ABSTRACT <> ($this:<root>.D) returnType:kotlin.Unit
+      $this: VALUE_PARAMETER name:<this> type:<root>.D
 FILE fqName:<root> fileName:/main.kt
+  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
+    BLOCK_BODY
+      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
+        CONST String type=kotlin.String value="OK"
   FUN name:test visibility:public modality:FINAL <> (x:<root>.JavaInterface) returnType:kotlin.Unit
     VALUE_PARAMETER name:x index:0 type:<root>.JavaInterface
     BLOCK_BODY
@@ -89,7 +93,3 @@ FILE fqName:<root> fileName:/main.kt
         $this: GET_VAR 'x: <root>.JavaInterface declared in <root>.test' type=<root>.JavaInterface origin=null
       CALL 'public abstract fun bar (): kotlin.Unit declared in <root>.JavaInterface' type=kotlin.Unit origin=null
         $this: GET_VAR 'x: <root>.JavaInterface declared in <root>.test' type=<root>.JavaInterface origin=null
-  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
-    BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
-        CONST String type=kotlin.String value="OK"

compiler/testData/codegen/box/fakeOverride/complexOverriddensInLazyFunctions.ir.txt

@@ -1,10 +1,6 @@
 FILE fqName:<root> fileName:/base.kt
   CLASS INTERFACE name:A modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A
-    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.A) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:<root>.A
-    FUN name:bar visibility:public modality:ABSTRACT <> ($this:<root>.A) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:<root>.A
     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
@@ -18,12 +14,12 @@ FILE fqName:<root> fileName:/base.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:bar visibility:public modality:ABSTRACT <> ($this:<root>.A) returnType:kotlin.Unit
+      $this: VALUE_PARAMETER name:<this> type:<root>.A
+    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.A) returnType:kotlin.Unit
+      $this: VALUE_PARAMETER name:<this> type:<root>.A
   CLASS INTERFACE name:B modality:ABSTRACT visibility:public superTypes:[<root>.A]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.B
-    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.A) returnType:kotlin.Unit [fake_override]
-      overridden:
-        public abstract fun foo (): kotlin.Unit declared in <root>.A
-      $this: VALUE_PARAMETER name:<this> type:<root>.A
     FUN FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT <> ($this:<root>.A) returnType:kotlin.Unit [fake_override]
       overridden:
         public abstract fun bar (): kotlin.Unit declared in <root>.A
@@ -33,6 +29,10 @@ FILE fqName:<root> fileName:/base.kt
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.A
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.A) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public abstract fun foo (): kotlin.Unit declared in <root>.A
+      $this: VALUE_PARAMETER name:<this> type:<root>.A
     FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int declared in <root>.A
@@ -43,10 +43,6 @@ FILE fqName:<root> fileName:/base.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS INTERFACE name:C modality:ABSTRACT visibility:public superTypes:[<root>.A]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C
-    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.A) returnType:kotlin.Unit [fake_override]
-      overridden:
-        public abstract fun foo (): kotlin.Unit declared in <root>.A
-      $this: VALUE_PARAMETER name:<this> type:<root>.A
     FUN FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT <> ($this:<root>.A) returnType:kotlin.Unit [fake_override]
       overridden:
         public abstract fun bar (): kotlin.Unit declared in <root>.A
@@ -56,6 +52,10 @@ FILE fqName:<root> fileName:/base.kt
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.A
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.A) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public abstract fun foo (): kotlin.Unit declared in <root>.A
+      $this: VALUE_PARAMETER name:<this> type:<root>.A
     FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int declared in <root>.A
@@ -66,8 +66,6 @@ FILE fqName:<root> fileName:/base.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS INTERFACE name:D modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.D
-    FUN name:bar visibility:public modality:ABSTRACT <> ($this:<root>.D) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:<root>.D
     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
@@ -81,7 +79,13 @@ FILE fqName:<root> fileName:/base.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:bar visibility:public modality:ABSTRACT <> ($this:<root>.D) returnType:kotlin.Unit
+      $this: VALUE_PARAMETER name:<this> type:<root>.D
 FILE fqName:<root> fileName:/main.kt
+  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
+    BLOCK_BODY
+      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
+        CONST String type=kotlin.String value="OK"
   FUN name:test visibility:public modality:FINAL <> (x:<root>.JavaInterface) returnType:kotlin.Unit
     VALUE_PARAMETER name:x index:0 type:<root>.JavaInterface
     BLOCK_BODY
@@ -89,7 +93,3 @@ FILE fqName:<root> fileName:/main.kt
         $this: GET_VAR 'x: <root>.JavaInterface declared in <root>.test' type=<root>.JavaInterface origin=null
       CALL 'public abstract fun bar (): kotlin.Unit declared in <root>.JavaInterface' type=kotlin.Unit origin=null
         $this: GET_VAR 'x: <root>.JavaInterface declared in <root>.test' type=<root>.JavaInterface origin=null
-  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
-    BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
-        CONST String type=kotlin.String value="OK"

compiler/testData/codegen/box/fakeOverride/intersectionOverrideBetweenValAndVar.ir.txt

@@ -5,68 +5,29 @@ FILE fqName:<root> fileName:/intersectionOverrideBetweenValAndVar.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:ABSTRACT 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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     PROPERTY name:x visibility:public modality:ABSTRACT [val]
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:ABSTRACT <> ($this:<root>.A) returnType:kotlin.String
         correspondingProperty: PROPERTY name:x visibility:public modality:ABSTRACT [val]
         $this: VALUE_PARAMETER name:<this> type:<root>.A
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS INTERFACE name:B modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.B
-    PROPERTY name:x visibility:public modality:ABSTRACT [var]
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:ABSTRACT <> ($this:<root>.B) returnType:kotlin.String
-        correspondingProperty: PROPERTY name:x visibility:public modality:ABSTRACT [var]
-        $this: VALUE_PARAMETER name:<this> type:<root>.B
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<set-x> visibility:public modality:ABSTRACT <> ($this:<root>.B, <set-?>:kotlin.String) returnType:kotlin.Unit
-        correspondingProperty: PROPERTY name:x visibility:public modality:ABSTRACT [var]
-        $this: VALUE_PARAMETER name:<this> type:<root>.B
-        VALUE_PARAMETER name:<set-?> index:0 type:kotlin.String
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:C modality:ABSTRACT visibility:public superTypes:[<root>.A; <root>.B]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C
     CONSTRUCTOR visibility:public <> () returnType:<root>.C [primary]
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.A'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:ABSTRACT visibility:public superTypes:[<root>.A; <root>.B]'
-    PROPERTY FAKE_OVERRIDE name:x visibility:public modality:ABSTRACT [fake_override,var]
-      overridden:
-        public abstract x: kotlin.String
-        public abstract x: kotlin.String
-      FUN FAKE_OVERRIDE name:<get-x> visibility:public modality:ABSTRACT <> ($this:<root>.B) returnType:kotlin.String [fake_override]
-        correspondingProperty: PROPERTY FAKE_OVERRIDE name:x visibility:public modality:ABSTRACT [fake_override,var]
-        overridden:
-          public abstract fun <get-x> (): kotlin.String declared in <root>.A
-          public abstract fun <get-x> (): kotlin.String declared in <root>.B
-        $this: VALUE_PARAMETER name:<this> type:<root>.B
-      FUN FAKE_OVERRIDE name:<set-x> visibility:public modality:ABSTRACT <> ($this:<root>.B, <set-?>:kotlin.String) returnType:kotlin.Unit [fake_override]
-        correspondingProperty: PROPERTY FAKE_OVERRIDE name:x visibility:public modality:ABSTRACT [fake_override,var]
-        overridden:
-          public abstract fun <set-x> (<set-?>: kotlin.String): kotlin.Unit declared in <root>.B
-        $this: VALUE_PARAMETER name:<this> type:<root>.B
-        VALUE_PARAMETER name:<set-?> index:0 type:kotlin.String
     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 <root>.A
@@ -83,13 +44,24 @@ FILE fqName:<root> fileName:/intersectionOverrideBetweenValAndVar.kt
         public open fun toString (): kotlin.String declared in <root>.A
         public open fun toString (): kotlin.String declared in <root>.B
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    PROPERTY FAKE_OVERRIDE name:x visibility:public modality:ABSTRACT [fake_override,var]
+      overridden:
+        public abstract x: kotlin.String
+        public abstract x: kotlin.String
+      FUN FAKE_OVERRIDE name:<get-x> visibility:public modality:ABSTRACT <> ($this:<root>.B) returnType:kotlin.String [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:x visibility:public modality:ABSTRACT [fake_override,var]
+        overridden:
+          public abstract fun <get-x> (): kotlin.String declared in <root>.A
+          public abstract fun <get-x> (): kotlin.String declared in <root>.B
+        $this: VALUE_PARAMETER name:<this> type:<root>.B
+      FUN FAKE_OVERRIDE name:<set-x> visibility:public modality:ABSTRACT <> ($this:<root>.B, <set-?>:kotlin.String) returnType:kotlin.Unit [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:x visibility:public modality:ABSTRACT [fake_override,var]
+        overridden:
+          public abstract fun <set-x> (<set-?>: kotlin.String): kotlin.Unit declared in <root>.B
+        $this: VALUE_PARAMETER name:<this> type:<root>.B
+        VALUE_PARAMETER name:<set-?> index:0 type:kotlin.String
   CLASS CLASS name:D modality:FINAL visibility:public superTypes:[<root>.C]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.D
-    CONSTRUCTOR visibility:public <> (x:kotlin.String) returnType:<root>.D [primary]
-      VALUE_PARAMETER name:x index:0 type:kotlin.String
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.C'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:D modality:FINAL visibility:public superTypes:[<root>.C]'
     PROPERTY name:x visibility:public modality:OPEN [var]
       overridden:
         public abstract x: kotlin.String
@@ -115,6 +87,11 @@ FILE fqName:<root> fileName:/intersectionOverrideBetweenValAndVar.kt
           SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:private' type=kotlin.Unit origin=null
             receiver: GET_VAR '<this>: <root>.D declared in <root>.D.<set-x>' type=<root>.D origin=null
             value: GET_VAR '<set-?>: kotlin.String declared in <root>.D.<set-x>' type=kotlin.String origin=null
+    CONSTRUCTOR visibility:public <> (x:kotlin.String) returnType:<root>.D [primary]
+      VALUE_PARAMETER name:x index:0 type:kotlin.String
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.C'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:D modality:FINAL visibility:public superTypes:[<root>.C]'
     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 <root>.C
@@ -128,12 +105,29 @@ FILE fqName:<root> fileName:/intersectionOverrideBetweenValAndVar.kt
       overridden:
         public open fun toString (): kotlin.String declared in <root>.C
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  FUN name:test visibility:public modality:FINAL <> (c:<root>.C) returnType:kotlin.Unit
-    VALUE_PARAMETER name:c index:0 type:<root>.C
-    BLOCK_BODY
-      CALL 'public abstract fun <set-x> (<set-?>: kotlin.String): kotlin.Unit declared in <root>.C' type=kotlin.Unit origin=EQ
-        $this: GET_VAR 'c: <root>.C declared in <root>.test' type=<root>.C origin=null
-        <set-?>: CONST String type=kotlin.String value="OK"
+  CLASS INTERFACE name:B modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.B
+    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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    PROPERTY name:x visibility:public modality:ABSTRACT [var]
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:ABSTRACT <> ($this:<root>.B) returnType:kotlin.String
+        correspondingProperty: PROPERTY name:x visibility:public modality:ABSTRACT [var]
+        $this: VALUE_PARAMETER name:<this> type:<root>.B
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<set-x> visibility:public modality:ABSTRACT <> ($this:<root>.B, <set-?>:kotlin.String) returnType:kotlin.Unit
+        correspondingProperty: PROPERTY name:x visibility:public modality:ABSTRACT [var]
+        $this: VALUE_PARAMETER name:<this> type:<root>.B
+        VALUE_PARAMETER name:<set-?> index:0 type:kotlin.String
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
       VAR name:d type:<root>.D [val]
@@ -144,3 +138,9 @@ FILE fqName:<root> fileName:/intersectionOverrideBetweenValAndVar.kt
       RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
         CALL 'public open fun <get-x> (): kotlin.String declared in <root>.D' type=kotlin.String origin=GET_PROPERTY
           $this: GET_VAR 'val d: <root>.D declared in <root>.box' type=<root>.D origin=null
+  FUN name:test visibility:public modality:FINAL <> (c:<root>.C) returnType:kotlin.Unit
+    VALUE_PARAMETER name:c index:0 type:<root>.C
+    BLOCK_BODY
+      CALL 'public abstract fun <set-x> (<set-?>: kotlin.String): kotlin.Unit declared in <root>.C' type=kotlin.Unit origin=EQ
+        $this: GET_VAR 'c: <root>.C declared in <root>.test' type=<root>.C origin=null
+        <set-?>: CONST String type=kotlin.String value="OK"

compiler/testData/codegen/box/fir/callableReferenceToJavaField.fir.ir.txt

@@ -1,11 +1,6 @@
 FILE fqName:foo fileName:/main.kt
   CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:foo.A
-    CONSTRUCTOR visibility:public <> (s:kotlin.String) returnType:foo.A [primary]
-      VALUE_PARAMETER name:s index:0 type:kotlin.String
-      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]'
     PROPERTY name:s visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.String visibility:private [final]
         EXPRESSION_BODY
@@ -17,6 +12,11 @@ FILE fqName:foo fileName:/main.kt
           RETURN type=kotlin.Nothing from='public final fun <get-s> (): kotlin.String declared in foo.A'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.String visibility:private [final]' type=kotlin.String origin=null
               receiver: GET_VAR '<this>: foo.A declared in foo.A.<get-s>' type=foo.A origin=null
+    CONSTRUCTOR visibility:public <> (s:kotlin.String) returnType:foo.A [primary]
+      VALUE_PARAMETER name:s index:0 type:kotlin.String
+      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 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
@@ -36,28 +36,6 @@ FILE fqName:foo fileName:/main.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in bar.Base'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Derived modality:FINAL visibility:public superTypes:[bar.Base]'
-    FUN name:foo visibility:protected modality:OPEN <> ($this:foo.Derived) returnType:kotlin.Unit
-      overridden:
-        protected/*protected and package*/ open fun foo (): kotlin.Unit declared in bar.Base
-      $this: VALUE_PARAMETER name:<this> type:foo.Derived
-      BLOCK_BODY
-        CALL 'public open fun set (p0: @[FlexibleNullability] kotlin.Any?, p1: @[FlexibleNullability] kotlin.Any?): kotlin.Unit declared in java.lang.reflect.Field' type=kotlin.Unit origin=null
-          $this: CALL 'public final fun CHECK_NOT_NULL <T0> (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): {T0 of kotlin.internal.ir.CHECK_NOT_NULL & Any} declared in kotlin.internal.ir' type=java.lang.reflect.Field origin=EXCLEXCL
-            <T0>: java.lang.reflect.Field
-            arg0: CALL 'public final fun <get-javaField> (): java.lang.reflect.Field? declared in kotlin.reflect.jvm' type=java.lang.reflect.Field? origin=GET_PROPERTY
-              $receiver: PROPERTY_REFERENCE 'protected/*protected and package*/ open a: @[FlexibleNullability] foo.A?' field='FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:a type:@[FlexibleNullability] foo.A? visibility:protected/*protected and package*/' getter='protected/*protected and package*/ open fun <get-a> (): @[FlexibleNullability] foo.A? declared in bar.Base' setter='protected/*protected and package*/ open fun <set-a> (<set-?>: @[FlexibleNullability] foo.A?): kotlin.Unit declared in bar.Base' type=kotlin.reflect.KMutableProperty1<foo.Derived, @[FlexibleNullability] foo.A?> origin=null
-          p0: GET_VAR '<this>: foo.Derived declared in foo.Derived.foo' type=foo.Derived origin=null
-          p1: CONSTRUCTOR_CALL 'public constructor <init> (s: kotlin.String) declared in foo.A' type=foo.A origin=null
-            s: CONST String type=kotlin.String value="OK"
-    FUN name:box visibility:public modality:FINAL <> ($this:foo.Derived) returnType:kotlin.String
-      $this: VALUE_PARAMETER name:<this> type:foo.Derived
-      BLOCK_BODY
-        CALL 'protected open fun foo (): kotlin.Unit declared in foo.Derived' type=kotlin.Unit origin=null
-          $this: GET_VAR '<this>: foo.Derived declared in foo.Derived.box' type=foo.Derived origin=null
-        RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in foo.Derived'
-          CALL 'public final fun <get-s> (): kotlin.String declared in foo.A' type=kotlin.String origin=GET_PROPERTY
-            $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:a type:@[FlexibleNullability] foo.A? visibility:protected/*protected and package*/' type=@[FlexibleNullability] foo.A? origin=null
-              receiver: GET_VAR '<this>: foo.Derived declared in foo.Derived.box' type=foo.Derived 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 bar.Base
@@ -71,6 +49,28 @@ FILE fqName:foo fileName:/main.kt
       overridden:
         public open fun toString (): kotlin.String declared in bar.Base
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:box visibility:public modality:FINAL <> ($this:foo.Derived) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:foo.Derived
+      BLOCK_BODY
+        CALL 'protected open fun foo (): kotlin.Unit declared in foo.Derived' type=kotlin.Unit origin=null
+          $this: GET_VAR '<this>: foo.Derived declared in foo.Derived.box' type=foo.Derived origin=null
+        RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in foo.Derived'
+          CALL 'public final fun <get-s> (): kotlin.String declared in foo.A' type=kotlin.String origin=GET_PROPERTY
+            $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:a type:@[FlexibleNullability] foo.A? visibility:protected/*protected and package*/' type=@[FlexibleNullability] foo.A? origin=null
+              receiver: GET_VAR '<this>: foo.Derived declared in foo.Derived.box' type=foo.Derived origin=null
+    FUN name:foo visibility:protected modality:OPEN <> ($this:foo.Derived) returnType:kotlin.Unit
+      overridden:
+        protected/*protected and package*/ open fun foo (): kotlin.Unit declared in bar.Base
+      $this: VALUE_PARAMETER name:<this> type:foo.Derived
+      BLOCK_BODY
+        CALL 'public open fun set (p0: @[FlexibleNullability] kotlin.Any?, p1: @[FlexibleNullability] kotlin.Any?): kotlin.Unit declared in java.lang.reflect.Field' type=kotlin.Unit origin=null
+          $this: CALL 'public final fun CHECK_NOT_NULL <T0> (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): {T0 of kotlin.internal.ir.CHECK_NOT_NULL & Any} declared in kotlin.internal.ir' type=java.lang.reflect.Field origin=EXCLEXCL
+            <T0>: java.lang.reflect.Field
+            arg0: CALL 'public final fun <get-javaField> (): java.lang.reflect.Field? declared in kotlin.reflect.jvm' type=java.lang.reflect.Field? origin=GET_PROPERTY
+              $receiver: PROPERTY_REFERENCE 'protected/*protected and package*/ open a: @[FlexibleNullability] foo.A?' field='FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:a type:@[FlexibleNullability] foo.A? visibility:protected/*protected and package*/' getter='protected/*protected and package*/ open fun <get-a> (): @[FlexibleNullability] foo.A? declared in bar.Base' setter='protected/*protected and package*/ open fun <set-a> (<set-?>: @[FlexibleNullability] foo.A?): kotlin.Unit declared in bar.Base' type=kotlin.reflect.KMutableProperty1<foo.Derived, @[FlexibleNullability] foo.A?> origin=null
+          p0: GET_VAR '<this>: foo.Derived declared in foo.Derived.foo' type=foo.Derived origin=null
+          p1: CONSTRUCTOR_CALL 'public constructor <init> (s: kotlin.String) declared in foo.A' type=foo.A origin=null
+            s: CONST String type=kotlin.String value="OK"
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in foo'

compiler/testData/codegen/box/fir/callableReferenceToJavaField.ir.txt

@@ -1,11 +1,6 @@
 FILE fqName:foo fileName:/main.kt
   CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:foo.A
-    CONSTRUCTOR visibility:public <> (s:kotlin.String) returnType:foo.A [primary]
-      VALUE_PARAMETER name:s index:0 type:kotlin.String
-      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]'
     PROPERTY name:s visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.String visibility:private [final]
         EXPRESSION_BODY
@@ -17,6 +12,11 @@ FILE fqName:foo fileName:/main.kt
           RETURN type=kotlin.Nothing from='public final fun <get-s> (): kotlin.String declared in foo.A'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.String visibility:private [final]' type=kotlin.String origin=null
               receiver: GET_VAR '<this>: foo.A declared in foo.A.<get-s>' type=foo.A origin=null
+    CONSTRUCTOR visibility:public <> (s:kotlin.String) returnType:foo.A [primary]
+      VALUE_PARAMETER name:s index:0 type:kotlin.String
+      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 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
@@ -36,29 +36,6 @@ FILE fqName:foo fileName:/main.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in bar.Base'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Derived modality:FINAL visibility:public superTypes:[bar.Base]'
-    FUN name:foo visibility:protected modality:OPEN <> ($this:foo.Derived) returnType:kotlin.Unit
-      overridden:
-        protected/*protected and package*/ open fun foo (): kotlin.Unit declared in bar.Base
-      $this: VALUE_PARAMETER name:<this> type:foo.Derived
-      BLOCK_BODY
-        CALL 'public open fun set (p0: @[FlexibleNullability] kotlin.Any?, p1: @[FlexibleNullability] kotlin.Any?): kotlin.Unit declared in java.lang.reflect.Field' type=kotlin.Unit origin=EQ
-          $this: CALL 'public final fun CHECK_NOT_NULL <T0> (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): {T0 of kotlin.internal.ir.CHECK_NOT_NULL & Any} declared in kotlin.internal.ir' type=java.lang.reflect.Field origin=EXCLEXCL
-            <T0>: java.lang.reflect.Field
-            arg0: CALL 'public final fun <get-javaField> (): java.lang.reflect.Field? declared in kotlin.reflect.jvm' type=java.lang.reflect.Field? origin=GET_PROPERTY
-              $receiver: PROPERTY_REFERENCE 'protected/*protected and package*/ final a' field='FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:a type:@[FlexibleNullability] foo.A? visibility:protected/*protected and package*/' getter=null setter=null type=kotlin.reflect.KMutableProperty1<foo.Derived, @[FlexibleNullability] foo.A?> origin=null
-          p0: GET_VAR '<this>: foo.Derived declared in foo.Derived.foo' type=foo.Derived origin=null
-          p1: CONSTRUCTOR_CALL 'public constructor <init> (s: kotlin.String) declared in foo.A' type=foo.A origin=null
-            s: CONST String type=kotlin.String value="OK"
-    FUN name:box visibility:public modality:FINAL <> ($this:foo.Derived) returnType:kotlin.String
-      $this: VALUE_PARAMETER name:<this> type:foo.Derived
-      BLOCK_BODY
-        CALL 'protected open fun foo (): kotlin.Unit declared in foo.Derived' type=kotlin.Unit origin=null
-          $this: GET_VAR '<this>: foo.Derived declared in foo.Derived.box' type=foo.Derived origin=null
-        RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in foo.Derived'
-          CALL 'public final fun <get-s> (): kotlin.String declared in foo.A' type=kotlin.String origin=GET_PROPERTY
-            $this: TYPE_OP type=foo.A origin=IMPLICIT_NOTNULL typeOperand=foo.A
-              GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:a type:@[FlexibleNullability] foo.A? visibility:protected/*protected and package*/' type=@[FlexibleNullability] foo.A? origin=null
-                receiver: GET_VAR '<this>: foo.Derived declared in foo.Derived.box' type=foo.Derived 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 bar.Base
@@ -72,6 +49,29 @@ FILE fqName:foo fileName:/main.kt
       overridden:
         public open fun toString (): kotlin.String declared in bar.Base
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:box visibility:public modality:FINAL <> ($this:foo.Derived) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:foo.Derived
+      BLOCK_BODY
+        CALL 'protected open fun foo (): kotlin.Unit declared in foo.Derived' type=kotlin.Unit origin=null
+          $this: GET_VAR '<this>: foo.Derived declared in foo.Derived.box' type=foo.Derived origin=null
+        RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in foo.Derived'
+          CALL 'public final fun <get-s> (): kotlin.String declared in foo.A' type=kotlin.String origin=GET_PROPERTY
+            $this: TYPE_OP type=foo.A origin=IMPLICIT_NOTNULL typeOperand=foo.A
+              GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:a type:@[FlexibleNullability] foo.A? visibility:protected/*protected and package*/' type=@[FlexibleNullability] foo.A? origin=null
+                receiver: GET_VAR '<this>: foo.Derived declared in foo.Derived.box' type=foo.Derived origin=null
+    FUN name:foo visibility:protected modality:OPEN <> ($this:foo.Derived) returnType:kotlin.Unit
+      overridden:
+        protected/*protected and package*/ open fun foo (): kotlin.Unit declared in bar.Base
+      $this: VALUE_PARAMETER name:<this> type:foo.Derived
+      BLOCK_BODY
+        CALL 'public open fun set (p0: @[FlexibleNullability] kotlin.Any?, p1: @[FlexibleNullability] kotlin.Any?): kotlin.Unit declared in java.lang.reflect.Field' type=kotlin.Unit origin=EQ
+          $this: CALL 'public final fun CHECK_NOT_NULL <T0> (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): {T0 of kotlin.internal.ir.CHECK_NOT_NULL & Any} declared in kotlin.internal.ir' type=java.lang.reflect.Field origin=EXCLEXCL
+            <T0>: java.lang.reflect.Field
+            arg0: CALL 'public final fun <get-javaField> (): java.lang.reflect.Field? declared in kotlin.reflect.jvm' type=java.lang.reflect.Field? origin=GET_PROPERTY
+              $receiver: PROPERTY_REFERENCE 'protected/*protected and package*/ final a' field='FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:a type:@[FlexibleNullability] foo.A? visibility:protected/*protected and package*/' getter=null setter=null type=kotlin.reflect.KMutableProperty1<foo.Derived, @[FlexibleNullability] foo.A?> origin=null
+          p0: GET_VAR '<this>: foo.Derived declared in foo.Derived.foo' type=foo.Derived origin=null
+          p1: CONSTRUCTOR_CALL 'public constructor <init> (s: kotlin.String) declared in foo.A' type=foo.A origin=null
+            s: CONST String type=kotlin.String value="OK"
     PROPERTY FAKE_OVERRIDE name:a visibility:protected/*protected and package*/ modality:FINAL [fake_override,var]
       overridden:
         protected/*protected and package*/ final a: @[FlexibleNullability] foo.A?

compiler/testData/codegen/box/fir/functionsDifferInTypeParameterBounds.fir.ir.txt

@@ -1,19 +1,4 @@
 FILE fqName:<root> fileName:/functionsDifferInTypeParameterBounds.kt
-  CLASS INTERFACE name:A modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:B modality:OPEN visibility:public superTypes:[<root>.A]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.B
     CONSTRUCTOR visibility:public <> () returnType:<root>.B [primary]
@@ -58,6 +43,27 @@ FILE fqName:<root> fileName:/functionsDifferInTypeParameterBounds.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:X modality:ABSTRACT 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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:ABSTRACT <S2> ($this:<root>.X, s:S2 of <root>.X.foo) returnType:kotlin.String
+      TYPE_PARAMETER name:S2 index:0 variance: superTypes:[<root>.B] reified:false
+      $this: VALUE_PARAMETER name:<this> type:<root>.X
+      VALUE_PARAMETER name:s index:0 type:S2 of <root>.X.foo
+    FUN name:foo visibility:public modality:ABSTRACT <S3> ($this:<root>.X, s:S3 of <root>.X.foo) returnType:kotlin.String
+      TYPE_PARAMETER name:S3 index:0 variance: superTypes:[<root>.C] reified:false
+      $this: VALUE_PARAMETER name:<this> type:<root>.X
+      VALUE_PARAMETER name:s index:0 type:S3 of <root>.X.foo
     FUN name:foo visibility:public modality:FINAL <S1> ($this:<root>.X, s:S1 of <root>.X.foo) returnType:kotlin.String
       TYPE_PARAMETER name:S1 index:0 variance: superTypes:[<root>.A] reified:false
       $this: VALUE_PARAMETER name:<this> type:<root>.X
@@ -87,33 +93,31 @@ FILE fqName:<root> fileName:/functionsDifferInTypeParameterBounds.kt
                 then: THROW type=kotlin.Nothing
                   CONSTRUCTOR_CALL 'public constructor <init> (p0: @[FlexibleNullability] kotlin.Any?) declared in java.lang.AssertionError' type=java.lang.AssertionError origin=null
                     p0: GET_VAR 's: S1 of <root>.X.foo declared in <root>.X.foo' type=S1 of <root>.X.foo origin=null
-    FUN name:foo visibility:public modality:ABSTRACT <S2> ($this:<root>.X, s:S2 of <root>.X.foo) returnType:kotlin.String
-      TYPE_PARAMETER name:S2 index:0 variance: superTypes:[<root>.B] reified:false
-      $this: VALUE_PARAMETER name:<this> type:<root>.X
-      VALUE_PARAMETER name:s index:0 type:S2 of <root>.X.foo
-    FUN name:foo visibility:public modality:ABSTRACT <S3> ($this:<root>.X, s:S3 of <root>.X.foo) returnType:kotlin.String
-      TYPE_PARAMETER name:S3 index:0 variance: superTypes:[<root>.C] reified:false
-      $this: VALUE_PARAMETER name:<this> type:<root>.X
-      VALUE_PARAMETER name:s index:0 type:S3 of <root>.X.foo
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:Y modality:FINAL visibility:public superTypes:[<root>.X]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Y
     CONSTRUCTOR visibility:public <> () returnType:<root>.Y [primary]
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.X'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Y modality:FINAL visibility:public superTypes:[<root>.X]'
+    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 <root>.X
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <S1> ($this:<root>.X, s:S1 of <root>.Y.foo) returnType:kotlin.String [fake_override]
+      overridden:
+        public final fun foo <S1> (s: S1 of <root>.X.foo): kotlin.String declared in <root>.X
+      TYPE_PARAMETER name:S1 index:0 variance: superTypes:[<root>.A] reified:false
+      $this: VALUE_PARAMETER name:<this> type:<root>.X
+      VALUE_PARAMETER name:s index:0 type:S1 of <root>.Y.foo
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.X
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.X
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     FUN name:foo visibility:public modality:OPEN <S4> ($this:<root>.Y, s:S4 of <root>.Y.foo) returnType:kotlin.String
       overridden:
         public abstract fun foo <S2> (s: S2 of <root>.X.foo): kotlin.String declared in <root>.X
@@ -132,24 +136,20 @@ FILE fqName:<root> fileName:/functionsDifferInTypeParameterBounds.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public open fun foo <S5> (s: S5 of <root>.Y.foo): kotlin.String declared in <root>.Y'
           CONST String type=kotlin.String value="K"
-    FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <S1> ($this:<root>.X, s:S1 of <root>.Y.foo) returnType:kotlin.String [fake_override]
-      overridden:
-        public final fun foo <S1> (s: S1 of <root>.X.foo): kotlin.String declared in <root>.X
-      TYPE_PARAMETER name:S1 index:0 variance: superTypes:[<root>.A] reified:false
-      $this: VALUE_PARAMETER name:<this> type:<root>.X
-      VALUE_PARAMETER name:s index:0 type:S1 of <root>.Y.foo
+  CLASS INTERFACE name:A modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A
     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 <root>.X
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
     FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.X
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
-        public open fun toString (): kotlin.String declared in <root>.X
+        public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY

compiler/testData/codegen/box/fir/functionsDifferInTypeParameterBounds.ir.txt

@@ -1,19 +1,4 @@
 FILE fqName:<root> fileName:/functionsDifferInTypeParameterBounds.kt
-  CLASS INTERFACE name:A modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:B modality:OPEN visibility:public superTypes:[<root>.A]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.B
     CONSTRUCTOR visibility:public <> () returnType:<root>.B [primary]
@@ -58,6 +43,27 @@ FILE fqName:<root> fileName:/functionsDifferInTypeParameterBounds.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:X modality:ABSTRACT 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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:ABSTRACT <S2> ($this:<root>.X, s:S2 of <root>.X.foo) returnType:kotlin.String
+      TYPE_PARAMETER name:S2 index:0 variance: superTypes:[<root>.B] reified:false
+      $this: VALUE_PARAMETER name:<this> type:<root>.X
+      VALUE_PARAMETER name:s index:0 type:S2 of <root>.X.foo
+    FUN name:foo visibility:public modality:ABSTRACT <S3> ($this:<root>.X, s:S3 of <root>.X.foo) returnType:kotlin.String
+      TYPE_PARAMETER name:S3 index:0 variance: superTypes:[<root>.C] reified:false
+      $this: VALUE_PARAMETER name:<this> type:<root>.X
+      VALUE_PARAMETER name:s index:0 type:S3 of <root>.X.foo
     FUN name:foo visibility:public modality:FINAL <S1> ($this:<root>.X, s:S1 of <root>.X.foo) returnType:kotlin.String
       TYPE_PARAMETER name:S1 index:0 variance: superTypes:[<root>.A] reified:false
       $this: VALUE_PARAMETER name:<this> type:<root>.X
@@ -89,33 +95,31 @@ FILE fqName:<root> fileName:/functionsDifferInTypeParameterBounds.kt
                 then: THROW type=kotlin.Nothing
                   CONSTRUCTOR_CALL 'public constructor <init> (p0: @[FlexibleNullability] kotlin.Any?) declared in java.lang.AssertionError' type=java.lang.AssertionError origin=null
                     p0: GET_VAR 's: S1 of <root>.X.foo declared in <root>.X.foo' type=S1 of <root>.X.foo origin=null
-    FUN name:foo visibility:public modality:ABSTRACT <S2> ($this:<root>.X, s:S2 of <root>.X.foo) returnType:kotlin.String
-      TYPE_PARAMETER name:S2 index:0 variance: superTypes:[<root>.B] reified:false
-      $this: VALUE_PARAMETER name:<this> type:<root>.X
-      VALUE_PARAMETER name:s index:0 type:S2 of <root>.X.foo
-    FUN name:foo visibility:public modality:ABSTRACT <S3> ($this:<root>.X, s:S3 of <root>.X.foo) returnType:kotlin.String
-      TYPE_PARAMETER name:S3 index:0 variance: superTypes:[<root>.C] reified:false
-      $this: VALUE_PARAMETER name:<this> type:<root>.X
-      VALUE_PARAMETER name:s index:0 type:S3 of <root>.X.foo
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:Y modality:FINAL visibility:public superTypes:[<root>.X]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Y
     CONSTRUCTOR visibility:public <> () returnType:<root>.Y [primary]
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.X'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Y modality:FINAL visibility:public superTypes:[<root>.X]'
+    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 <root>.X
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <S1> ($this:<root>.X, s:S1 of <root>.Y.foo) returnType:kotlin.String [fake_override]
+      overridden:
+        public final fun foo <S1> (s: S1 of <root>.X.foo): kotlin.String declared in <root>.X
+      TYPE_PARAMETER name:S1 index:0 variance: superTypes:[<root>.A] reified:false
+      $this: VALUE_PARAMETER name:<this> type:<root>.X
+      VALUE_PARAMETER name:s index:0 type:S1 of <root>.Y.foo
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.X
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.X
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     FUN name:foo visibility:public modality:OPEN <S4> ($this:<root>.Y, s:S4 of <root>.Y.foo) returnType:kotlin.String
       overridden:
         public abstract fun foo <S2> (s: S2 of <root>.X.foo): kotlin.String declared in <root>.X
@@ -134,24 +138,20 @@ FILE fqName:<root> fileName:/functionsDifferInTypeParameterBounds.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public open fun foo <S5> (s: S5 of <root>.Y.foo): kotlin.String declared in <root>.Y'
           CONST String type=kotlin.String value="K"
-    FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <S1> ($this:<root>.X, s:S1 of <root>.Y.foo) returnType:kotlin.String [fake_override]
-      overridden:
-        public final fun foo <S1> (s: S1 of <root>.X.foo): kotlin.String declared in <root>.X
-      TYPE_PARAMETER name:S1 index:0 variance: superTypes:[<root>.A] reified:false
-      $this: VALUE_PARAMETER name:<this> type:<root>.X
-      VALUE_PARAMETER name:s index:0 type:S1 of <root>.Y.foo
+  CLASS INTERFACE name:A modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A
     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 <root>.X
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
     FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.X
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
-        public open fun toString (): kotlin.String declared in <root>.X
+        public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY

compiler/testData/codegen/box/fir/listAssignmentInWhen.fir.ir.txt

@@ -1,21 +1,4 @@
 FILE fqName:<root> fileName:/listAssignmentInWhen.kt
-  FUN name:foo visibility:public modality:FINAL <> (list:kotlin.collections.MutableList<kotlin.Any?>, condition:kotlin.Boolean) returnType:kotlin.Unit
-    VALUE_PARAMETER name:list index:0 type:kotlin.collections.MutableList<kotlin.Any?>
-    VALUE_PARAMETER name:condition index:1 type:kotlin.Boolean
-    BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun foo (list: kotlin.collections.MutableList<kotlin.Any?>, condition: kotlin.Boolean): kotlin.Unit declared in <root>'
-        WHEN type=kotlin.Unit origin=WHEN
-          BRANCH
-            if: GET_VAR 'condition: kotlin.Boolean declared in <root>.foo' type=kotlin.Boolean origin=null
-            then: BLOCK type=kotlin.Unit origin=null
-              TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
-                CALL 'public abstract fun set (index: kotlin.Int, element: E of kotlin.collections.MutableList): E of kotlin.collections.MutableList declared in kotlin.collections.MutableList' type=kotlin.Any? origin=null
-                  $this: GET_VAR 'list: kotlin.collections.MutableList<kotlin.Any?> declared in <root>.foo' type=kotlin.collections.MutableList<kotlin.Any?> origin=null
-                  index: CONST Int type=kotlin.Int value=0
-                  element: CONST String type=kotlin.String value="OK"
-          BRANCH
-            if: CONST Boolean type=kotlin.Boolean value=true
-            then: GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
       VAR name:list type:kotlin.collections.MutableList<kotlin.Any?> [val]
@@ -34,3 +17,20 @@ FILE fqName:<root> fileName:/listAssignmentInWhen.kt
           CALL 'public abstract fun get (index: kotlin.Int): E of kotlin.collections.MutableList declared in kotlin.collections.MutableList' type=kotlin.Any? origin=GET_ARRAY_ELEMENT
             $this: GET_VAR 'val list: kotlin.collections.MutableList<kotlin.Any?> declared in <root>.box' type=kotlin.collections.MutableList<kotlin.Any?> origin=null
             index: CONST Int type=kotlin.Int value=0
+  FUN name:foo visibility:public modality:FINAL <> (list:kotlin.collections.MutableList<kotlin.Any?>, condition:kotlin.Boolean) returnType:kotlin.Unit
+    VALUE_PARAMETER name:list index:0 type:kotlin.collections.MutableList<kotlin.Any?>
+    VALUE_PARAMETER name:condition index:1 type:kotlin.Boolean
+    BLOCK_BODY
+      RETURN type=kotlin.Nothing from='public final fun foo (list: kotlin.collections.MutableList<kotlin.Any?>, condition: kotlin.Boolean): kotlin.Unit declared in <root>'
+        WHEN type=kotlin.Unit origin=WHEN
+          BRANCH
+            if: GET_VAR 'condition: kotlin.Boolean declared in <root>.foo' type=kotlin.Boolean origin=null
+            then: BLOCK type=kotlin.Unit origin=null
+              TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
+                CALL 'public abstract fun set (index: kotlin.Int, element: E of kotlin.collections.MutableList): E of kotlin.collections.MutableList declared in kotlin.collections.MutableList' type=kotlin.Any? origin=null
+                  $this: GET_VAR 'list: kotlin.collections.MutableList<kotlin.Any?> declared in <root>.foo' type=kotlin.collections.MutableList<kotlin.Any?> origin=null
+                  index: CONST Int type=kotlin.Int value=0
+                  element: CONST String type=kotlin.String value="OK"
+          BRANCH
+            if: CONST Boolean type=kotlin.Boolean value=true
+            then: GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit

compiler/testData/codegen/box/fir/listAssignmentInWhen.ir.txt

@@ -1,20 +1,4 @@
 FILE fqName:<root> fileName:/listAssignmentInWhen.kt
-  FUN name:foo visibility:public modality:FINAL <> (list:kotlin.collections.MutableList<kotlin.Any?>, condition:kotlin.Boolean) returnType:kotlin.Unit
-    VALUE_PARAMETER name:list index:0 type:kotlin.collections.MutableList<kotlin.Any?>
-    VALUE_PARAMETER name:condition index:1 type:kotlin.Boolean
-    BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun foo (list: kotlin.collections.MutableList<kotlin.Any?>, condition: kotlin.Boolean): kotlin.Unit declared in <root>'
-        WHEN type=kotlin.Unit origin=WHEN
-          BRANCH
-            if: GET_VAR 'condition: kotlin.Boolean declared in <root>.foo' type=kotlin.Boolean origin=null
-            then: TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
-              CALL 'public abstract fun set (index: kotlin.Int, element: E of kotlin.collections.MutableList): E of kotlin.collections.MutableList declared in kotlin.collections.MutableList' type=kotlin.Any? origin=EQ
-                $this: GET_VAR 'list: kotlin.collections.MutableList<kotlin.Any?> declared in <root>.foo' type=kotlin.collections.MutableList<kotlin.Any?> origin=null
-                index: CONST Int type=kotlin.Int value=0
-                element: CONST String type=kotlin.String value="OK"
-          BRANCH
-            if: CONST Boolean type=kotlin.Boolean value=true
-            then: GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
       VAR name:list type:kotlin.collections.MutableList<kotlin.Any?> [val]
@@ -33,3 +17,19 @@ FILE fqName:<root> fileName:/listAssignmentInWhen.kt
           CALL 'public abstract fun get (index: kotlin.Int): E of kotlin.collections.MutableList declared in kotlin.collections.MutableList' type=kotlin.Any? origin=GET_ARRAY_ELEMENT
             $this: GET_VAR 'val list: kotlin.collections.MutableList<kotlin.Any?> declared in <root>.box' type=kotlin.collections.MutableList<kotlin.Any?> origin=null
             index: CONST Int type=kotlin.Int value=0
+  FUN name:foo visibility:public modality:FINAL <> (list:kotlin.collections.MutableList<kotlin.Any?>, condition:kotlin.Boolean) returnType:kotlin.Unit
+    VALUE_PARAMETER name:list index:0 type:kotlin.collections.MutableList<kotlin.Any?>
+    VALUE_PARAMETER name:condition index:1 type:kotlin.Boolean
+    BLOCK_BODY
+      RETURN type=kotlin.Nothing from='public final fun foo (list: kotlin.collections.MutableList<kotlin.Any?>, condition: kotlin.Boolean): kotlin.Unit declared in <root>'
+        WHEN type=kotlin.Unit origin=WHEN
+          BRANCH
+            if: GET_VAR 'condition: kotlin.Boolean declared in <root>.foo' type=kotlin.Boolean origin=null
+            then: TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
+              CALL 'public abstract fun set (index: kotlin.Int, element: E of kotlin.collections.MutableList): E of kotlin.collections.MutableList declared in kotlin.collections.MutableList' type=kotlin.Any? origin=EQ
+                $this: GET_VAR 'list: kotlin.collections.MutableList<kotlin.Any?> declared in <root>.foo' type=kotlin.collections.MutableList<kotlin.Any?> origin=null
+                index: CONST Int type=kotlin.Int value=0
+                element: CONST String type=kotlin.String value="OK"
+          BRANCH
+            if: CONST Boolean type=kotlin.Boolean value=true
+            then: GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit

compiler/testData/codegen/box/fir/noSymbolForIntRangeIterator.fir.ir.txt

@@ -14,6 +14,21 @@ FILE fqName:<root> fileName:/noSymbolForIntRangeIterator.kt
       BLOCK_BODY
         SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:result type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=null
           value: GET_VAR '<set-?>: kotlin.Int declared in <root>.<set-result>' type=kotlin.Int origin=null
+  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
+    BLOCK_BODY
+      CALL 'public final fun test (): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
+      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
+        WHEN type=kotlin.String origin=IF
+          BRANCH
+            if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
+              arg0: CALL 'public final fun <get-result> (): kotlin.Int declared in <root>' type=kotlin.Int origin=GET_PROPERTY
+              arg1: CONST Int type=kotlin.Int value=3025
+            then: CONST String type=kotlin.String value="OK"
+          BRANCH
+            if: CONST Boolean type=kotlin.Boolean value=true
+            then: STRING_CONCATENATION type=kotlin.String
+              CONST String type=kotlin.String value="Fail: "
+              CALL 'public final fun <get-result> (): kotlin.Int declared in <root>' type=kotlin.Int origin=GET_PROPERTY
   FUN name:takeString visibility:public modality:FINAL <> (s:kotlin.String) returnType:kotlin.Unit
     VALUE_PARAMETER name:s index:0 type:kotlin.String
     BLOCK_BODY
@@ -95,18 +110,3 @@ FILE fqName:<root> fileName:/noSymbolForIntRangeIterator.kt
                   CALL 'public final fun takeString (s: kotlin.String): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
                     s: GET_VAR 'val s: kotlin.String declared in <root>.test.localFunc' type=kotlin.String origin=null
       CALL 'local final fun localFunc (): kotlin.Unit declared in <root>.test' type=kotlin.Unit origin=null
-  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
-    BLOCK_BODY
-      CALL 'public final fun test (): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
-        WHEN type=kotlin.String origin=IF
-          BRANCH
-            if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
-              arg0: CALL 'public final fun <get-result> (): kotlin.Int declared in <root>' type=kotlin.Int origin=GET_PROPERTY
-              arg1: CONST Int type=kotlin.Int value=3025
-            then: CONST String type=kotlin.String value="OK"
-          BRANCH
-            if: CONST Boolean type=kotlin.Boolean value=true
-            then: STRING_CONCATENATION type=kotlin.String
-              CONST String type=kotlin.String value="Fail: "
-              CALL 'public final fun <get-result> (): kotlin.Int declared in <root>' type=kotlin.Int origin=GET_PROPERTY

compiler/testData/codegen/box/fir/noSymbolForIntRangeIterator.ir.txt

@@ -14,6 +14,21 @@ FILE fqName:<root> fileName:/noSymbolForIntRangeIterator.kt
       BLOCK_BODY
         SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:result type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=null
           value: GET_VAR '<set-?>: kotlin.Int declared in <root>.<set-result>' type=kotlin.Int origin=null
+  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
+    BLOCK_BODY
+      CALL 'public final fun test (): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
+      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
+        WHEN type=kotlin.String origin=IF
+          BRANCH
+            if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
+              arg0: CALL 'public final fun <get-result> (): kotlin.Int declared in <root>' type=kotlin.Int origin=GET_PROPERTY
+              arg1: CONST Int type=kotlin.Int value=3025
+            then: CONST String type=kotlin.String value="OK"
+          BRANCH
+            if: CONST Boolean type=kotlin.Boolean value=true
+            then: STRING_CONCATENATION type=kotlin.String
+              CONST String type=kotlin.String value="Fail: "
+              CALL 'public final fun <get-result> (): kotlin.Int declared in <root>' type=kotlin.Int origin=GET_PROPERTY
   FUN name:takeString visibility:public modality:FINAL <> (s:kotlin.String) returnType:kotlin.Unit
     VALUE_PARAMETER name:s index:0 type:kotlin.String
     BLOCK_BODY
@@ -96,18 +111,3 @@ FILE fqName:<root> fileName:/noSymbolForIntRangeIterator.kt
                   CALL 'public final fun takeString (s: kotlin.String): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
                     s: GET_VAR 'val s: kotlin.String declared in <root>.test.localFunc' type=kotlin.String origin=null
       CALL 'local final fun localFunc (): kotlin.Unit declared in <root>.test' type=kotlin.Unit origin=null
-  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
-    BLOCK_BODY
-      CALL 'public final fun test (): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
-        WHEN type=kotlin.String origin=IF
-          BRANCH
-            if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
-              arg0: CALL 'public final fun <get-result> (): kotlin.Int declared in <root>' type=kotlin.Int origin=GET_PROPERTY
-              arg1: CONST Int type=kotlin.Int value=3025
-            then: CONST String type=kotlin.String value="OK"
-          BRANCH
-            if: CONST Boolean type=kotlin.Boolean value=true
-            then: STRING_CONCATENATION type=kotlin.String
-              CONST String type=kotlin.String value="Fail: "
-              CALL 'public final fun <get-result> (): kotlin.Int declared in <root>' type=kotlin.Int origin=GET_PROPERTY

compiler/testData/codegen/box/fir/smartCastToInvisibleClassMember.ir.txt

@@ -1,11 +1,16 @@
 Module: m1
 FILE fqName:<root> fileName:/info.kt
+  PROPERTY name:info visibility:public modality:FINAL [val]
+    FIELD PROPERTY_BACKING_FIELD name:info type:kotlin.Any? visibility:private [final,static]
+      EXPRESSION_BODY
+        CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Info' type=<root>.Info origin=null
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-info> visibility:public modality:FINAL <> () returnType:kotlin.Any?
+      correspondingProperty: PROPERTY name:info visibility:public modality:FINAL [val]
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun <get-info> (): kotlin.Any? declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:info type:kotlin.Any? visibility:private [final,static]' type=kotlin.Any? origin=null
   CLASS CLASS name:Info modality:FINAL visibility:internal superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Info
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Info [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Info modality:FINAL visibility:internal superTypes:[kotlin.Any]'
     PROPERTY name:status visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:status type:kotlin.String visibility:private [final]
         EXPRESSION_BODY
@@ -17,6 +22,10 @@ FILE fqName:<root> fileName:/info.kt
           RETURN type=kotlin.Nothing from='public final fun <get-status> (): kotlin.String declared in <root>.Info'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:status type:kotlin.String visibility:private [final]' type=kotlin.String origin=null
               receiver: GET_VAR '<this>: <root>.Info declared in <root>.Info.<get-status>' type=<root>.Info origin=null
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Info [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Info modality:FINAL visibility:internal 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
@@ -30,17 +39,13 @@ FILE fqName:<root> fileName:/info.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  PROPERTY name:info visibility:public modality:FINAL [val]
-    FIELD PROPERTY_BACKING_FIELD name:info type:kotlin.Any? visibility:private [final,static]
-      EXPRESSION_BODY
-        CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Info' type=<root>.Info origin=null
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-info> visibility:public modality:FINAL <> () returnType:kotlin.Any?
-      correspondingProperty: PROPERTY name:info visibility:public modality:FINAL [val]
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-info> (): kotlin.Any? declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:info type:kotlin.Any? visibility:private [final,static]' type=kotlin.Any? origin=null
 Module: m2
 FILE fqName:<root> fileName:/box.kt
+  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
+    BLOCK_BODY
+      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
+        CALL 'public final fun getStatus (param: kotlin.Any?): kotlin.String declared in <root>' type=kotlin.String origin=null
+          param: CALL 'public final fun <get-info> (): kotlin.Any? declared in <root>' type=kotlin.Any? origin=GET_PROPERTY
   FUN name:getStatus visibility:public modality:FINAL <> (param:kotlin.Any?) returnType:kotlin.String
     VALUE_PARAMETER name:param index:0 type:kotlin.Any?
     BLOCK_BODY
@@ -55,8 +60,3 @@ FILE fqName:<root> fileName:/box.kt
                   GET_VAR 'param: kotlin.Any? declared in <root>.getStatus' type=kotlin.Any? origin=null
       RETURN type=kotlin.Nothing from='public final fun getStatus (param: kotlin.Any?): kotlin.String declared in <root>'
         CONST String type=kotlin.String value="NO STATUS"
-  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
-    BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
-        CALL 'public final fun getStatus (param: kotlin.Any?): kotlin.String declared in <root>' type=kotlin.String origin=null
-          param: CALL 'public final fun <get-info> (): kotlin.Any? declared in <root>' type=kotlin.Any? origin=GET_PROPERTY

compiler/testData/codegen/box/fir/starProjectionLambdaNullReturn.fir.ir.txt

@@ -1,23 +1,4 @@
 FILE fqName:<root> fileName:/starProjectionLambdaNullReturn.kt
-  CLASS INTERFACE name:I modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.I<T of <root>.I>
-    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any] reified:false
-    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.I<T of <root>.I>, func:kotlin.Function0<T of <root>.I?>) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:<root>.I<T of <root>.I>
-      VALUE_PARAMETER name:func index:0 type:kotlin.Function0<T of <root>.I?>
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:Impl modality:FINAL visibility:public superTypes:[<root>.I<T of <root>.Impl>]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Impl<T of <root>.Impl>
     TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any] reified:false
@@ -25,15 +6,6 @@ FILE fqName:<root> fileName:/starProjectionLambdaNullReturn.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Impl modality:FINAL visibility:public superTypes:[<root>.I<T of <root>.Impl>]'
-    FUN name:foo visibility:public modality:OPEN <> ($this:<root>.Impl<T of <root>.Impl>, func:kotlin.Function0<T of <root>.Impl?>) returnType:kotlin.Unit
-      overridden:
-        public abstract fun foo (func: kotlin.Function0<T of <root>.I?>): kotlin.Unit declared in <root>.I
-      $this: VALUE_PARAMETER name:<this> type:<root>.Impl<T of <root>.Impl>
-      VALUE_PARAMETER name:func index:0 type:kotlin.Function0<T of <root>.Impl?>
-      BLOCK_BODY
-        TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
-          CALL 'public abstract fun invoke (): R of kotlin.Function0 declared in kotlin.Function0' type=T of <root>.Impl? origin=INVOKE
-            $this: GET_VAR 'func: kotlin.Function0<T of <root>.Impl?> declared in <root>.Impl.foo' type=kotlin.Function0<T of <root>.Impl?> origin=VARIABLE_AS_FUNCTION
     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 <root>.I
@@ -47,6 +19,43 @@ FILE fqName:<root> fileName:/starProjectionLambdaNullReturn.kt
       overridden:
         public open fun toString (): kotlin.String declared in <root>.I
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:OPEN <> ($this:<root>.Impl<T of <root>.Impl>, func:kotlin.Function0<T of <root>.Impl?>) returnType:kotlin.Unit
+      overridden:
+        public abstract fun foo (func: kotlin.Function0<T of <root>.I?>): kotlin.Unit declared in <root>.I
+      $this: VALUE_PARAMETER name:<this> type:<root>.Impl<T of <root>.Impl>
+      VALUE_PARAMETER name:func index:0 type:kotlin.Function0<T of <root>.Impl?>
+      BLOCK_BODY
+        TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
+          CALL 'public abstract fun invoke (): R of kotlin.Function0 declared in kotlin.Function0' type=T of <root>.Impl? origin=INVOKE
+            $this: GET_VAR 'func: kotlin.Function0<T of <root>.Impl?> declared in <root>.Impl.foo' type=kotlin.Function0<T of <root>.Impl?> origin=VARIABLE_AS_FUNCTION
+  CLASS INTERFACE name:I modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.I<T of <root>.I>
+    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any] reified:false
+    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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.I<T of <root>.I>, func:kotlin.Function0<T of <root>.I?>) returnType:kotlin.Unit
+      $this: VALUE_PARAMETER name:<this> type:<root>.I<T of <root>.I>
+      VALUE_PARAMETER name:func index:0 type:kotlin.Function0<T of <root>.I?>
+  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
+    BLOCK_BODY
+      VAR name:foo type:<root>.Impl<kotlin.String> [val]
+        CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Impl' type=<root>.Impl<kotlin.String> origin=null
+          <class: T>: kotlin.String
+      CALL 'public final fun foo (): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
+        $receiver: GET_VAR 'val foo: <root>.Impl<kotlin.String> declared in <root>.box' type=<root>.Impl<kotlin.String> origin=null
+      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
+        CONST String type=kotlin.String value="OK"
   FUN name:foo visibility:public modality:FINAL <> ($receiver:<root>.I<*>) returnType:kotlin.Unit
     $receiver: VALUE_PARAMETER name:<this> type:<root>.I<*>
     BLOCK_BODY
@@ -57,12 +66,3 @@ FILE fqName:<root> fileName:/starProjectionLambdaNullReturn.kt
             BLOCK_BODY
               RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Any? declared in <root>.foo'
                 CONST Null type=kotlin.Nothing? value=null
-  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
-    BLOCK_BODY
-      VAR name:foo type:<root>.Impl<kotlin.String> [val]
-        CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Impl' type=<root>.Impl<kotlin.String> origin=null
-          <class: T>: kotlin.String
-      CALL 'public final fun foo (): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-        $receiver: GET_VAR 'val foo: <root>.Impl<kotlin.String> declared in <root>.box' type=<root>.Impl<kotlin.String> origin=null
-      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
-        CONST String type=kotlin.String value="OK"

compiler/testData/codegen/box/fir/starProjectionLambdaNullReturn.ir.txt

@@ -1,23 +1,4 @@
 FILE fqName:<root> fileName:/starProjectionLambdaNullReturn.kt
-  CLASS INTERFACE name:I modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.I<T of <root>.I>
-    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any] reified:false
-    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.I<T of <root>.I>, func:kotlin.Function0<T of <root>.I?>) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:<root>.I<T of <root>.I>
-      VALUE_PARAMETER name:func index:0 type:kotlin.Function0<T of <root>.I?>
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:Impl modality:FINAL visibility:public superTypes:[<root>.I<T of <root>.Impl>]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Impl<T of <root>.Impl>
     TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any] reified:false
@@ -25,15 +6,6 @@ FILE fqName:<root> fileName:/starProjectionLambdaNullReturn.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Impl modality:FINAL visibility:public superTypes:[<root>.I<T of <root>.Impl>]'
-    FUN name:foo visibility:public modality:OPEN <> ($this:<root>.Impl<T of <root>.Impl>, func:kotlin.Function0<T of <root>.Impl?>) returnType:kotlin.Unit
-      overridden:
-        public abstract fun foo (func: kotlin.Function0<T of <root>.I?>): kotlin.Unit declared in <root>.I
-      $this: VALUE_PARAMETER name:<this> type:<root>.Impl<T of <root>.Impl>
-      VALUE_PARAMETER name:func index:0 type:kotlin.Function0<T of <root>.Impl?>
-      BLOCK_BODY
-        TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
-          CALL 'public abstract fun invoke (): R of kotlin.Function0 declared in kotlin.Function0' type=T of <root>.Impl? origin=INVOKE
-            $this: GET_VAR 'func: kotlin.Function0<T of <root>.Impl?> declared in <root>.Impl.foo' type=kotlin.Function0<T of <root>.Impl?> origin=VARIABLE_AS_FUNCTION
     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 <root>.I
@@ -47,6 +19,43 @@ FILE fqName:<root> fileName:/starProjectionLambdaNullReturn.kt
       overridden:
         public open fun toString (): kotlin.String declared in <root>.I
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:OPEN <> ($this:<root>.Impl<T of <root>.Impl>, func:kotlin.Function0<T of <root>.Impl?>) returnType:kotlin.Unit
+      overridden:
+        public abstract fun foo (func: kotlin.Function0<T of <root>.I?>): kotlin.Unit declared in <root>.I
+      $this: VALUE_PARAMETER name:<this> type:<root>.Impl<T of <root>.Impl>
+      VALUE_PARAMETER name:func index:0 type:kotlin.Function0<T of <root>.Impl?>
+      BLOCK_BODY
+        TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
+          CALL 'public abstract fun invoke (): R of kotlin.Function0 declared in kotlin.Function0' type=T of <root>.Impl? origin=INVOKE
+            $this: GET_VAR 'func: kotlin.Function0<T of <root>.Impl?> declared in <root>.Impl.foo' type=kotlin.Function0<T of <root>.Impl?> origin=VARIABLE_AS_FUNCTION
+  CLASS INTERFACE name:I modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.I<T of <root>.I>
+    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any] reified:false
+    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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.I<T of <root>.I>, func:kotlin.Function0<T of <root>.I?>) returnType:kotlin.Unit
+      $this: VALUE_PARAMETER name:<this> type:<root>.I<T of <root>.I>
+      VALUE_PARAMETER name:func index:0 type:kotlin.Function0<T of <root>.I?>
+  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
+    BLOCK_BODY
+      VAR name:foo type:<root>.Impl<kotlin.String> [val]
+        CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Impl' type=<root>.Impl<kotlin.String> origin=null
+          <class: T>: kotlin.String
+      CALL 'public final fun foo (): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
+        $receiver: GET_VAR 'val foo: <root>.Impl<kotlin.String> declared in <root>.box' type=<root>.Impl<kotlin.String> origin=null
+      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
+        CONST String type=kotlin.String value="OK"
   FUN name:foo visibility:public modality:FINAL <> ($receiver:<root>.I<*>) returnType:kotlin.Unit
     $receiver: VALUE_PARAMETER name:<this> type:<root>.I<*>
     BLOCK_BODY
@@ -57,12 +66,3 @@ FILE fqName:<root> fileName:/starProjectionLambdaNullReturn.kt
             BLOCK_BODY
               RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Nothing? declared in <root>.foo'
                 CONST Null type=kotlin.Nothing? value=null
-  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
-    BLOCK_BODY
-      VAR name:foo type:<root>.Impl<kotlin.String> [val]
-        CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Impl' type=<root>.Impl<kotlin.String> origin=null
-          <class: T>: kotlin.String
-      CALL 'public final fun foo (): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-        $receiver: GET_VAR 'val foo: <root>.Impl<kotlin.String> declared in <root>.box' type=<root>.Impl<kotlin.String> origin=null
-      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
-        CONST String type=kotlin.String value="OK"

compiler/testData/codegen/box/functions/delegatedPropertyWithMultipleOverriddens_generics.fir.ir.txt

@@ -1,116 +1,49 @@
 FILE fqName:<root> fileName:/delegatedPropertyWithMultipleOverriddens_generics.kt
-  CLASS INTERFACE name:MyCollection modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyCollection<E1 of <root>.MyCollection>
-    TYPE_PARAMETER name:E1 index:0 variance:out superTypes:[kotlin.Any?] reified:false
-    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection<E1 of <root>.MyCollection>) returnType:E1 of <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection<E1 of <root>.MyCollection>
-    PROPERTY name:bar visibility:public modality:ABSTRACT [val]
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection<E1 of <root>.MyCollection>) returnType:E1 of <root>.MyCollection
-        correspondingProperty: PROPERTY name:bar visibility:public modality:ABSTRACT [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection<E1 of <root>.MyCollection>
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+  CLASS CLASS name:MC modality:FINAL visibility:public superTypes:[<root>.MyMutableCollection<kotlin.String>]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MC
+    FIELD DELEGATE name:$$delegate_0 type:<root>.MyArrayList<kotlin.String> visibility:private [final]
+      EXPRESSION_BODY
+        CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.MyArrayList' type=<root>.MyArrayList<kotlin.String> origin=null
+          <class: E6>: kotlin.String
+    CONSTRUCTOR visibility:public <> () returnType:<root>.MC [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MC modality:FINAL visibility:public superTypes:[<root>.MyMutableCollection<kotlin.String>]'
+    FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:<root>.MC) returnType:kotlin.String
       overridden:
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS INTERFACE name:MyList modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection<E2 of <root>.MyList>]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyList<E2 of <root>.MyList>
-    TYPE_PARAMETER name:E2 index:0 variance:out superTypes:[kotlin.Any?] reified:false
-    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyList<E2 of <root>.MyList>) returnType:E2 of <root>.MyList
-      overridden:
-        public abstract fun foo (): E1 of <root>.MyCollection declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:<root>.MyList<E2 of <root>.MyList>
-    PROPERTY name:bar visibility:public modality:ABSTRACT [val]
-      overridden:
-        public abstract bar: E1 of <root>.MyCollection
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyList<E2 of <root>.MyList>) returnType:E2 of <root>.MyList
-        correspondingProperty: PROPERTY name:bar visibility:public modality:ABSTRACT [val]
-        overridden:
-          public abstract fun <get-bar> (): E1 of <root>.MyCollection declared in <root>.MyCollection
-        $this: VALUE_PARAMETER name:<this> type:<root>.MyList<E2 of <root>.MyList>
-    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 <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS INTERFACE name:MyMutableCollection modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection<E3 of <root>.MyMutableCollection>]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyMutableCollection<E3 of <root>.MyMutableCollection>
-    TYPE_PARAMETER name:E3 index:0 variance: superTypes:[kotlin.Any?] reified:false
-    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection<E3 of <root>.MyMutableCollection>) returnType:E3 of <root>.MyMutableCollection [fake_override]
-      overridden:
-        public abstract fun foo (): E1 of <root>.MyCollection declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection<E3 of <root>.MyMutableCollection>
-    PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
-      overridden:
-        public abstract bar: E1 of <root>.MyCollection
-      FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection<E3 of <root>.MyMutableCollection>) returnType:E3 of <root>.MyMutableCollection [fake_override]
-        correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
-        overridden:
-          public abstract fun <get-bar> (): E1 of <root>.MyCollection declared in <root>.MyCollection
-        $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection<E3 of <root>.MyMutableCollection>
-    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 <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS INTERFACE name:MyMutableList modality:ABSTRACT visibility:public superTypes:[<root>.MyList<E4 of <root>.MyMutableList>; <root>.MyMutableCollection<E4 of <root>.MyMutableList>]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyMutableList<E4 of <root>.MyMutableList>
-    TYPE_PARAMETER name:E4 index:0 variance: superTypes:[kotlin.Any?] reified:false
-    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyList<E4 of <root>.MyMutableList>) returnType:E4 of <root>.MyMutableList [fake_override]
-      overridden:
-        public abstract fun foo (): E2 of <root>.MyList declared in <root>.MyList
         public abstract fun foo (): E3 of <root>.MyMutableCollection declared in <root>.MyMutableCollection
-      $this: VALUE_PARAMETER name:<this> type:<root>.MyList<E4 of <root>.MyMutableList>
-    PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
-      overridden:
-        public abstract bar: E2 of <root>.MyList
-        public abstract bar: E3 of <root>.MyMutableCollection
-      FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyList<E4 of <root>.MyMutableList>) returnType:E4 of <root>.MyMutableList [fake_override]
-        correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
-        overridden:
-          public abstract fun <get-bar> (): E2 of <root>.MyList declared in <root>.MyList
-          public abstract fun <get-bar> (): E3 of <root>.MyMutableCollection declared in <root>.MyMutableCollection
-        $this: VALUE_PARAMETER name:<this> type:<root>.MyList<E4 of <root>.MyMutableList>
+      $this: VALUE_PARAMETER name:<this> type:<root>.MC
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in <root>.MC'
+          CALL 'public open fun foo (): E6 of <root>.MyArrayList declared in <root>.MyArrayList' type=kotlin.String origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.MyArrayList<kotlin.String> visibility:private [final]' type=<root>.MyArrayList<kotlin.String> origin=null
+              receiver: GET_VAR '<this>: <root>.MC declared in <root>.MC.foo' type=<root>.MC 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 <root>.MyList
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.MyMutableCollection
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
     FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.MyList
         public open fun hashCode (): kotlin.Int declared in <root>.MyMutableCollection
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
-        public open fun toString (): kotlin.String declared in <root>.MyList
         public open fun toString (): kotlin.String declared in <root>.MyMutableCollection
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN [val]
+      overridden:
+        public abstract bar: E3 of <root>.MyMutableCollection
+      FUN DELEGATED_MEMBER name:<get-bar> visibility:public modality:OPEN <> ($this:<root>.MC) returnType:kotlin.String
+        correspondingProperty: PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN [val]
+        overridden:
+          public abstract fun <get-bar> (): E3 of <root>.MyMutableCollection declared in <root>.MyMutableCollection
+        $this: VALUE_PARAMETER name:<this> type:<root>.MC
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-bar> (): kotlin.String declared in <root>.MC'
+            CALL 'public open fun <get-bar> (): E6 of <root>.MyArrayList declared in <root>.MyArrayList' type=kotlin.String origin=null
+              $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.MyArrayList<kotlin.String> visibility:private [final]' type=<root>.MyArrayList<kotlin.String> origin=null
+                receiver: GET_VAR '<this>: <root>.MC declared in <root>.MC.<get-bar>' type=<root>.MC origin=null
   CLASS CLASS name:MyAbstractCollection modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection<E5 of <root>.MyAbstractCollection>]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyAbstractCollection<E5 of <root>.MyAbstractCollection>
     TYPE_PARAMETER name:E5 index:0 variance:out superTypes:[kotlin.Any?] reified:false
@@ -118,6 +51,19 @@ FILE fqName:<root> fileName:/delegatedPropertyWithMultipleOverriddens_generics.k
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MyAbstractCollection modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection<E5 of <root>.MyAbstractCollection>]'
+    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 <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyAbstractCollection<E5 of <root>.MyAbstractCollection>) returnType:E5 of <root>.MyAbstractCollection
       overridden:
         public abstract fun foo (): E1 of <root>.MyCollection declared in <root>.MyCollection
@@ -130,36 +76,9 @@ FILE fqName:<root> fileName:/delegatedPropertyWithMultipleOverriddens_generics.k
         overridden:
           public abstract fun <get-bar> (): E1 of <root>.MyCollection declared in <root>.MyCollection
         $this: VALUE_PARAMETER name:<this> type:<root>.MyAbstractCollection<E5 of <root>.MyAbstractCollection>
-    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 <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:MyArrayList modality:FINAL visibility:public superTypes:[<root>.MyMutableList<E6 of <root>.MyArrayList>; <root>.MyAbstractCollection<E6 of <root>.MyArrayList>]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyArrayList<E6 of <root>.MyArrayList>
     TYPE_PARAMETER name:E6 index:0 variance: superTypes:[kotlin.Any?] reified:false
-    CONSTRUCTOR visibility:public <> () returnType:<root>.MyArrayList<E6 of <root>.MyArrayList> [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.MyAbstractCollection'
-          <E5>: E6 of <root>.MyArrayList
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MyArrayList modality:FINAL visibility:public superTypes:[<root>.MyMutableList<E6 of <root>.MyArrayList>; <root>.MyAbstractCollection<E6 of <root>.MyArrayList>]'
-    FUN name:foo visibility:public modality:OPEN <> ($this:<root>.MyArrayList<E6 of <root>.MyArrayList>) returnType:E6 of <root>.MyArrayList
-      overridden:
-        public abstract fun foo (): E4 of <root>.MyMutableList declared in <root>.MyMutableList
-        public abstract fun foo (): E5 of <root>.MyAbstractCollection declared in <root>.MyAbstractCollection
-      $this: VALUE_PARAMETER name:<this> type:<root>.MyArrayList<E6 of <root>.MyArrayList>
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun foo (): E6 of <root>.MyArrayList declared in <root>.MyArrayList'
-          TYPE_OP type=E6 of <root>.MyArrayList origin=CAST typeOperand=E6 of <root>.MyArrayList
-            CONST String type=kotlin.String value="O"
     PROPERTY name:bar visibility:public modality:OPEN [val]
       overridden:
         public abstract bar: E4 of <root>.MyMutableList
@@ -178,6 +97,11 @@ FILE fqName:<root> fileName:/delegatedPropertyWithMultipleOverriddens_generics.k
           RETURN type=kotlin.Nothing from='public open fun <get-bar> (): E6 of <root>.MyArrayList declared in <root>.MyArrayList'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:E6 of <root>.MyArrayList visibility:private [final]' type=E6 of <root>.MyArrayList origin=null
               receiver: GET_VAR '<this>: <root>.MyArrayList<E6 of <root>.MyArrayList> declared in <root>.MyArrayList.<get-bar>' type=<root>.MyArrayList<E6 of <root>.MyArrayList> origin=null
+    CONSTRUCTOR visibility:public <> () returnType:<root>.MyArrayList<E6 of <root>.MyArrayList> [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.MyAbstractCollection'
+          <E5>: E6 of <root>.MyArrayList
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MyArrayList modality:FINAL visibility:public superTypes:[<root>.MyMutableList<E6 of <root>.MyArrayList>; <root>.MyAbstractCollection<E6 of <root>.MyArrayList>]'
     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 <root>.MyMutableList
@@ -194,51 +118,127 @@ FILE fqName:<root> fileName:/delegatedPropertyWithMultipleOverriddens_generics.k
         public open fun toString (): kotlin.String declared in <root>.MyMutableList
         public open fun toString (): kotlin.String declared in <root>.MyAbstractCollection
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:MC modality:FINAL visibility:public superTypes:[<root>.MyMutableCollection<kotlin.String>]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MC
-    CONSTRUCTOR visibility:public <> () returnType:<root>.MC [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MC modality:FINAL visibility:public superTypes:[<root>.MyMutableCollection<kotlin.String>]'
-    FIELD DELEGATE name:$$delegate_0 type:<root>.MyArrayList<kotlin.String> visibility:private [final]
-      EXPRESSION_BODY
-        CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.MyArrayList' type=<root>.MyArrayList<kotlin.String> origin=null
-          <class: E6>: kotlin.String
-    FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:<root>.MC) returnType:kotlin.String
+    FUN name:foo visibility:public modality:OPEN <> ($this:<root>.MyArrayList<E6 of <root>.MyArrayList>) returnType:E6 of <root>.MyArrayList
       overridden:
-        public abstract fun foo (): E3 of <root>.MyMutableCollection declared in <root>.MyMutableCollection
-      $this: VALUE_PARAMETER name:<this> type:<root>.MC
+        public abstract fun foo (): E4 of <root>.MyMutableList declared in <root>.MyMutableList
+        public abstract fun foo (): E5 of <root>.MyAbstractCollection declared in <root>.MyAbstractCollection
+      $this: VALUE_PARAMETER name:<this> type:<root>.MyArrayList<E6 of <root>.MyArrayList>
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in <root>.MC'
-          CALL 'public open fun foo (): E6 of <root>.MyArrayList declared in <root>.MyArrayList' type=kotlin.String origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.MyArrayList<kotlin.String> visibility:private [final]' type=<root>.MyArrayList<kotlin.String> origin=null
-              receiver: GET_VAR '<this>: <root>.MC declared in <root>.MC.foo' type=<root>.MC origin=null
-    PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN [val]
-      overridden:
-        public abstract bar: E3 of <root>.MyMutableCollection
-      FUN DELEGATED_MEMBER name:<get-bar> visibility:public modality:OPEN <> ($this:<root>.MC) returnType:kotlin.String
-        correspondingProperty: PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN [val]
-        overridden:
-          public abstract fun <get-bar> (): E3 of <root>.MyMutableCollection declared in <root>.MyMutableCollection
-        $this: VALUE_PARAMETER name:<this> type:<root>.MC
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun <get-bar> (): kotlin.String declared in <root>.MC'
-            CALL 'public open fun <get-bar> (): E6 of <root>.MyArrayList declared in <root>.MyArrayList' type=kotlin.String origin=null
-              $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.MyArrayList<kotlin.String> visibility:private [final]' type=<root>.MyArrayList<kotlin.String> origin=null
-                receiver: GET_VAR '<this>: <root>.MC declared in <root>.MC.<get-bar>' type=<root>.MC origin=null
+        RETURN type=kotlin.Nothing from='public open fun foo (): E6 of <root>.MyArrayList declared in <root>.MyArrayList'
+          TYPE_OP type=E6 of <root>.MyArrayList origin=CAST typeOperand=E6 of <root>.MyArrayList
+            CONST String type=kotlin.String value="O"
+  CLASS INTERFACE name:MyCollection modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyCollection<E1 of <root>.MyCollection>
+    TYPE_PARAMETER name:E1 index:0 variance:out superTypes:[kotlin.Any?] reified:false
     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 <root>.MyMutableCollection
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
     FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection<E1 of <root>.MyCollection>) returnType:E1 of <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection<E1 of <root>.MyCollection>
+    PROPERTY name:bar visibility:public modality:ABSTRACT [val]
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection<E1 of <root>.MyCollection>) returnType:E1 of <root>.MyCollection
+        correspondingProperty: PROPERTY name:bar visibility:public modality:ABSTRACT [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection<E1 of <root>.MyCollection>
+  CLASS INTERFACE name:MyList modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection<E2 of <root>.MyList>]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyList<E2 of <root>.MyList>
+    TYPE_PARAMETER name:E2 index:0 variance:out superTypes:[kotlin.Any?] reified:false
+    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 <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyList<E2 of <root>.MyList>) returnType:E2 of <root>.MyList
+      overridden:
+        public abstract fun foo (): E1 of <root>.MyCollection declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:<root>.MyList<E2 of <root>.MyList>
+    PROPERTY name:bar visibility:public modality:ABSTRACT [val]
+      overridden:
+        public abstract bar: E1 of <root>.MyCollection
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyList<E2 of <root>.MyList>) returnType:E2 of <root>.MyList
+        correspondingProperty: PROPERTY name:bar visibility:public modality:ABSTRACT [val]
+        overridden:
+          public abstract fun <get-bar> (): E1 of <root>.MyCollection declared in <root>.MyCollection
+        $this: VALUE_PARAMETER name:<this> type:<root>.MyList<E2 of <root>.MyList>
+  CLASS INTERFACE name:MyMutableCollection modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection<E3 of <root>.MyMutableCollection>]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyMutableCollection<E3 of <root>.MyMutableCollection>
+    TYPE_PARAMETER name:E3 index:0 variance: superTypes:[kotlin.Any?] reified:false
+    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 <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection<E3 of <root>.MyMutableCollection>) returnType:E3 of <root>.MyMutableCollection [fake_override]
+      overridden:
+        public abstract fun foo (): E1 of <root>.MyCollection declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection<E3 of <root>.MyMutableCollection>
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
+      overridden:
+        public abstract bar: E1 of <root>.MyCollection
+      FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection<E3 of <root>.MyMutableCollection>) returnType:E3 of <root>.MyMutableCollection [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
+        overridden:
+          public abstract fun <get-bar> (): E1 of <root>.MyCollection declared in <root>.MyCollection
+        $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection<E3 of <root>.MyMutableCollection>
+  CLASS INTERFACE name:MyMutableList modality:ABSTRACT visibility:public superTypes:[<root>.MyList<E4 of <root>.MyMutableList>; <root>.MyMutableCollection<E4 of <root>.MyMutableList>]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyMutableList<E4 of <root>.MyMutableList>
+    TYPE_PARAMETER name:E4 index:0 variance: superTypes:[kotlin.Any?] reified:false
+    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 <root>.MyList
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.MyMutableCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyList<E4 of <root>.MyMutableList>) returnType:E4 of <root>.MyMutableList [fake_override]
+      overridden:
+        public abstract fun foo (): E2 of <root>.MyList declared in <root>.MyList
+        public abstract fun foo (): E3 of <root>.MyMutableCollection declared in <root>.MyMutableCollection
+      $this: VALUE_PARAMETER name:<this> type:<root>.MyList<E4 of <root>.MyMutableList>
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.MyList
         public open fun hashCode (): kotlin.Int declared in <root>.MyMutableCollection
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
+        public open fun toString (): kotlin.String declared in <root>.MyList
         public open fun toString (): kotlin.String declared in <root>.MyMutableCollection
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
+      overridden:
+        public abstract bar: E2 of <root>.MyList
+        public abstract bar: E3 of <root>.MyMutableCollection
+      FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyList<E4 of <root>.MyMutableList>) returnType:E4 of <root>.MyMutableList [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
+        overridden:
+          public abstract fun <get-bar> (): E2 of <root>.MyList declared in <root>.MyList
+          public abstract fun <get-bar> (): E3 of <root>.MyMutableCollection declared in <root>.MyMutableCollection
+        $this: VALUE_PARAMETER name:<this> type:<root>.MyList<E4 of <root>.MyMutableList>
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
       VAR name:x type:<root>.MC [val]

compiler/testData/codegen/box/functions/delegatedPropertyWithMultipleOverriddens_generics.ir.txt

@@ -1,222 +1,14 @@
 FILE fqName:<root> fileName:/delegatedPropertyWithMultipleOverriddens_generics.kt
-  CLASS INTERFACE name:MyCollection modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyCollection<E1 of <root>.MyCollection>
-    TYPE_PARAMETER name:E1 index:0 variance:out superTypes:[kotlin.Any?] reified:false
-    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection<E1 of <root>.MyCollection>) returnType:E1 of <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection<E1 of <root>.MyCollection>
-    PROPERTY name:bar visibility:public modality:ABSTRACT [val]
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection<E1 of <root>.MyCollection>) returnType:E1 of <root>.MyCollection
-        correspondingProperty: PROPERTY name:bar visibility:public modality:ABSTRACT [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection<E1 of <root>.MyCollection>
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS INTERFACE name:MyList modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection<E2 of <root>.MyList>]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyList<E2 of <root>.MyList>
-    TYPE_PARAMETER name:E2 index:0 variance:out superTypes:[kotlin.Any?] reified:false
-    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyList<E2 of <root>.MyList>) returnType:E2 of <root>.MyList
-      overridden:
-        public abstract fun foo (): E1 of <root>.MyCollection declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:<root>.MyList<E2 of <root>.MyList>
-    PROPERTY name:bar visibility:public modality:ABSTRACT [val]
-      overridden:
-        public abstract bar: E1 of <root>.MyCollection
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyList<E2 of <root>.MyList>) returnType:E2 of <root>.MyList
-        correspondingProperty: PROPERTY name:bar visibility:public modality:ABSTRACT [val]
-        overridden:
-          public abstract fun <get-bar> (): E1 of <root>.MyCollection declared in <root>.MyCollection
-        $this: VALUE_PARAMETER name:<this> type:<root>.MyList<E2 of <root>.MyList>
-    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 <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS INTERFACE name:MyMutableCollection modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection<E3 of <root>.MyMutableCollection>]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyMutableCollection<E3 of <root>.MyMutableCollection>
-    TYPE_PARAMETER name:E3 index:0 variance: superTypes:[kotlin.Any?] reified:false
-    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection<E3 of <root>.MyMutableCollection>) returnType:E3 of <root>.MyMutableCollection [fake_override]
-      overridden:
-        public abstract fun foo (): E1 of <root>.MyCollection declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection<E3 of <root>.MyMutableCollection>
-    PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
-      overridden:
-        public abstract bar: E1 of <root>.MyCollection
-      FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection<E3 of <root>.MyMutableCollection>) returnType:E3 of <root>.MyMutableCollection [fake_override]
-        correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
-        overridden:
-          public abstract fun <get-bar> (): E1 of <root>.MyCollection declared in <root>.MyCollection
-        $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection<E3 of <root>.MyMutableCollection>
-    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 <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS INTERFACE name:MyMutableList modality:ABSTRACT visibility:public superTypes:[<root>.MyList<E4 of <root>.MyMutableList>; <root>.MyMutableCollection<E4 of <root>.MyMutableList>]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyMutableList<E4 of <root>.MyMutableList>
-    TYPE_PARAMETER name:E4 index:0 variance: superTypes:[kotlin.Any?] reified:false
-    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyList<E4 of <root>.MyMutableList>) returnType:E4 of <root>.MyMutableList [fake_override]
-      overridden:
-        public abstract fun foo (): E2 of <root>.MyList declared in <root>.MyList
-        public abstract fun foo (): E3 of <root>.MyMutableCollection declared in <root>.MyMutableCollection
-      $this: VALUE_PARAMETER name:<this> type:<root>.MyList<E4 of <root>.MyMutableList>
-    PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
-      overridden:
-        public abstract bar: E2 of <root>.MyList
-        public abstract bar: E3 of <root>.MyMutableCollection
-      FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyList<E4 of <root>.MyMutableList>) returnType:E4 of <root>.MyMutableList [fake_override]
-        correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
-        overridden:
-          public abstract fun <get-bar> (): E2 of <root>.MyList declared in <root>.MyList
-          public abstract fun <get-bar> (): E3 of <root>.MyMutableCollection declared in <root>.MyMutableCollection
-        $this: VALUE_PARAMETER name:<this> type:<root>.MyList<E4 of <root>.MyMutableList>
-    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 <root>.MyList
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.MyMutableCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.MyList
-        public open fun hashCode (): kotlin.Int declared in <root>.MyMutableCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.MyList
-        public open fun toString (): kotlin.String declared in <root>.MyMutableCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:MyAbstractCollection modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection<E5 of <root>.MyAbstractCollection>]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyAbstractCollection<E5 of <root>.MyAbstractCollection>
-    TYPE_PARAMETER name:E5 index:0 variance:out superTypes:[kotlin.Any?] reified:false
-    CONSTRUCTOR visibility:protected <> () returnType:<root>.MyAbstractCollection<E5 of <root>.MyAbstractCollection> [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MyAbstractCollection modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection<E5 of <root>.MyAbstractCollection>]'
-    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyAbstractCollection<E5 of <root>.MyAbstractCollection>) returnType:E5 of <root>.MyAbstractCollection
-      overridden:
-        public abstract fun foo (): E1 of <root>.MyCollection declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:<root>.MyAbstractCollection<E5 of <root>.MyAbstractCollection>
-    PROPERTY name:bar visibility:public modality:ABSTRACT [val]
-      overridden:
-        public abstract bar: E1 of <root>.MyCollection
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyAbstractCollection<E5 of <root>.MyAbstractCollection>) returnType:E5 of <root>.MyAbstractCollection
-        correspondingProperty: PROPERTY name:bar visibility:public modality:ABSTRACT [val]
-        overridden:
-          public abstract fun <get-bar> (): E1 of <root>.MyCollection declared in <root>.MyCollection
-        $this: VALUE_PARAMETER name:<this> type:<root>.MyAbstractCollection<E5 of <root>.MyAbstractCollection>
-    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 <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:MyArrayList modality:FINAL visibility:public superTypes:[<root>.MyMutableList<E6 of <root>.MyArrayList>; <root>.MyAbstractCollection<E6 of <root>.MyArrayList>]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyArrayList<E6 of <root>.MyArrayList>
-    TYPE_PARAMETER name:E6 index:0 variance: superTypes:[kotlin.Any?] reified:false
-    CONSTRUCTOR visibility:public <> () returnType:<root>.MyArrayList<E6 of <root>.MyArrayList> [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.MyAbstractCollection'
-          <E5>: E6 of <root>.MyArrayList
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MyArrayList modality:FINAL visibility:public superTypes:[<root>.MyMutableList<E6 of <root>.MyArrayList>; <root>.MyAbstractCollection<E6 of <root>.MyArrayList>]'
-    FUN name:foo visibility:public modality:OPEN <> ($this:<root>.MyArrayList<E6 of <root>.MyArrayList>) returnType:E6 of <root>.MyArrayList
-      overridden:
-        public abstract fun foo (): E4 of <root>.MyMutableList declared in <root>.MyMutableList
-        public abstract fun foo (): E5 of <root>.MyAbstractCollection declared in <root>.MyAbstractCollection
-      $this: VALUE_PARAMETER name:<this> type:<root>.MyArrayList<E6 of <root>.MyArrayList>
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun foo (): E6 of <root>.MyArrayList declared in <root>.MyArrayList'
-          TYPE_OP type=E6 of <root>.MyArrayList origin=CAST typeOperand=E6 of <root>.MyArrayList
-            CONST String type=kotlin.String value="O"
-    PROPERTY name:bar visibility:public modality:OPEN [val]
-      overridden:
-        public abstract bar: E4 of <root>.MyMutableList
-        public abstract bar: E5 of <root>.MyAbstractCollection
-      FIELD PROPERTY_BACKING_FIELD name:bar type:E6 of <root>.MyArrayList visibility:private [final]
-        EXPRESSION_BODY
-          TYPE_OP type=E6 of <root>.MyArrayList origin=CAST typeOperand=E6 of <root>.MyArrayList
-            CONST String type=kotlin.String value="K"
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:OPEN <> ($this:<root>.MyArrayList<E6 of <root>.MyArrayList>) returnType:E6 of <root>.MyArrayList
-        correspondingProperty: PROPERTY name:bar visibility:public modality:OPEN [val]
-        overridden:
-          public abstract fun <get-bar> (): E4 of <root>.MyMutableList declared in <root>.MyMutableList
-          public abstract fun <get-bar> (): E5 of <root>.MyAbstractCollection declared in <root>.MyAbstractCollection
-        $this: VALUE_PARAMETER name:<this> type:<root>.MyArrayList<E6 of <root>.MyArrayList>
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun <get-bar> (): E6 of <root>.MyArrayList declared in <root>.MyArrayList'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:E6 of <root>.MyArrayList visibility:private [final]' type=E6 of <root>.MyArrayList origin=null
-              receiver: GET_VAR '<this>: <root>.MyArrayList<E6 of <root>.MyArrayList> declared in <root>.MyArrayList.<get-bar>' type=<root>.MyArrayList<E6 of <root>.MyArrayList> 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 <root>.MyMutableList
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.MyAbstractCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.MyMutableList
-        public open fun hashCode (): kotlin.Int declared in <root>.MyAbstractCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.MyMutableList
-        public open fun toString (): kotlin.String declared in <root>.MyAbstractCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:MC modality:FINAL visibility:public superTypes:[<root>.MyMutableCollection<kotlin.String>]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MC
-    CONSTRUCTOR visibility:public <> () returnType:<root>.MC [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MC modality:FINAL visibility:public superTypes:[<root>.MyMutableCollection<kotlin.String>]'
     FIELD DELEGATE name:$$delegate_0 type:<root>.MyArrayList<kotlin.String> visibility:private [final]
       EXPRESSION_BODY
         CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.MyArrayList' type=<root>.MyArrayList<kotlin.String> origin=null
           <class: E6>: kotlin.String
-    PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN [val]
-      overridden:
-        public abstract bar: E3 of <root>.MyMutableCollection
-      FUN DELEGATED_MEMBER name:<get-bar> visibility:public modality:OPEN <> ($this:<root>.MC) returnType:kotlin.String
-        correspondingProperty: PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN [val]
-        overridden:
-          public abstract fun <get-bar> (): E3 of <root>.MyMutableCollection declared in <root>.MyMutableCollection
-        $this: VALUE_PARAMETER name:<this> type:<root>.MC
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun <get-bar> (): kotlin.String declared in <root>.MC'
-            CALL 'public open fun <get-bar> (): E6 of <root>.MyArrayList declared in <root>.MyArrayList' type=kotlin.String origin=null
-              $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.MyArrayList<kotlin.String> visibility:private [final]' type=<root>.MyArrayList<kotlin.String> origin=null
-                receiver: GET_VAR '<this>: <root>.MC declared in <root>.MC.<get-bar>' type=<root>.MC origin=null
+    CONSTRUCTOR visibility:public <> () returnType:<root>.MC [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MC modality:FINAL visibility:public superTypes:[<root>.MyMutableCollection<kotlin.String>]'
     FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:<root>.MC) returnType:kotlin.String
       overridden:
         public abstract fun foo (): E3 of <root>.MyMutableCollection declared in <root>.MyMutableCollection
@@ -239,6 +31,214 @@ FILE fqName:<root> fileName:/delegatedPropertyWithMultipleOverriddens_generics.k
       overridden:
         public open fun toString (): kotlin.String declared in <root>.MyMutableCollection
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN [val]
+      overridden:
+        public abstract bar: E3 of <root>.MyMutableCollection
+      FUN DELEGATED_MEMBER name:<get-bar> visibility:public modality:OPEN <> ($this:<root>.MC) returnType:kotlin.String
+        correspondingProperty: PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN [val]
+        overridden:
+          public abstract fun <get-bar> (): E3 of <root>.MyMutableCollection declared in <root>.MyMutableCollection
+        $this: VALUE_PARAMETER name:<this> type:<root>.MC
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-bar> (): kotlin.String declared in <root>.MC'
+            CALL 'public open fun <get-bar> (): E6 of <root>.MyArrayList declared in <root>.MyArrayList' type=kotlin.String origin=null
+              $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.MyArrayList<kotlin.String> visibility:private [final]' type=<root>.MyArrayList<kotlin.String> origin=null
+                receiver: GET_VAR '<this>: <root>.MC declared in <root>.MC.<get-bar>' type=<root>.MC origin=null
+  CLASS CLASS name:MyAbstractCollection modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection<E5 of <root>.MyAbstractCollection>]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyAbstractCollection<E5 of <root>.MyAbstractCollection>
+    TYPE_PARAMETER name:E5 index:0 variance:out superTypes:[kotlin.Any?] reified:false
+    CONSTRUCTOR visibility:protected <> () returnType:<root>.MyAbstractCollection<E5 of <root>.MyAbstractCollection> [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MyAbstractCollection modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection<E5 of <root>.MyAbstractCollection>]'
+    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 <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyAbstractCollection<E5 of <root>.MyAbstractCollection>) returnType:E5 of <root>.MyAbstractCollection
+      overridden:
+        public abstract fun foo (): E1 of <root>.MyCollection declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:<root>.MyAbstractCollection<E5 of <root>.MyAbstractCollection>
+    PROPERTY name:bar visibility:public modality:ABSTRACT [val]
+      overridden:
+        public abstract bar: E1 of <root>.MyCollection
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyAbstractCollection<E5 of <root>.MyAbstractCollection>) returnType:E5 of <root>.MyAbstractCollection
+        correspondingProperty: PROPERTY name:bar visibility:public modality:ABSTRACT [val]
+        overridden:
+          public abstract fun <get-bar> (): E1 of <root>.MyCollection declared in <root>.MyCollection
+        $this: VALUE_PARAMETER name:<this> type:<root>.MyAbstractCollection<E5 of <root>.MyAbstractCollection>
+  CLASS CLASS name:MyArrayList modality:FINAL visibility:public superTypes:[<root>.MyMutableList<E6 of <root>.MyArrayList>; <root>.MyAbstractCollection<E6 of <root>.MyArrayList>]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyArrayList<E6 of <root>.MyArrayList>
+    TYPE_PARAMETER name:E6 index:0 variance: superTypes:[kotlin.Any?] reified:false
+    PROPERTY name:bar visibility:public modality:OPEN [val]
+      overridden:
+        public abstract bar: E4 of <root>.MyMutableList
+        public abstract bar: E5 of <root>.MyAbstractCollection
+      FIELD PROPERTY_BACKING_FIELD name:bar type:E6 of <root>.MyArrayList visibility:private [final]
+        EXPRESSION_BODY
+          TYPE_OP type=E6 of <root>.MyArrayList origin=CAST typeOperand=E6 of <root>.MyArrayList
+            CONST String type=kotlin.String value="K"
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:OPEN <> ($this:<root>.MyArrayList<E6 of <root>.MyArrayList>) returnType:E6 of <root>.MyArrayList
+        correspondingProperty: PROPERTY name:bar visibility:public modality:OPEN [val]
+        overridden:
+          public abstract fun <get-bar> (): E4 of <root>.MyMutableList declared in <root>.MyMutableList
+          public abstract fun <get-bar> (): E5 of <root>.MyAbstractCollection declared in <root>.MyAbstractCollection
+        $this: VALUE_PARAMETER name:<this> type:<root>.MyArrayList<E6 of <root>.MyArrayList>
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-bar> (): E6 of <root>.MyArrayList declared in <root>.MyArrayList'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:E6 of <root>.MyArrayList visibility:private [final]' type=E6 of <root>.MyArrayList origin=null
+              receiver: GET_VAR '<this>: <root>.MyArrayList<E6 of <root>.MyArrayList> declared in <root>.MyArrayList.<get-bar>' type=<root>.MyArrayList<E6 of <root>.MyArrayList> origin=null
+    CONSTRUCTOR visibility:public <> () returnType:<root>.MyArrayList<E6 of <root>.MyArrayList> [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.MyAbstractCollection'
+          <E5>: E6 of <root>.MyArrayList
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MyArrayList modality:FINAL visibility:public superTypes:[<root>.MyMutableList<E6 of <root>.MyArrayList>; <root>.MyAbstractCollection<E6 of <root>.MyArrayList>]'
+    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 <root>.MyMutableList
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.MyAbstractCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.MyMutableList
+        public open fun hashCode (): kotlin.Int declared in <root>.MyAbstractCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.MyMutableList
+        public open fun toString (): kotlin.String declared in <root>.MyAbstractCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:OPEN <> ($this:<root>.MyArrayList<E6 of <root>.MyArrayList>) returnType:E6 of <root>.MyArrayList
+      overridden:
+        public abstract fun foo (): E4 of <root>.MyMutableList declared in <root>.MyMutableList
+        public abstract fun foo (): E5 of <root>.MyAbstractCollection declared in <root>.MyAbstractCollection
+      $this: VALUE_PARAMETER name:<this> type:<root>.MyArrayList<E6 of <root>.MyArrayList>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun foo (): E6 of <root>.MyArrayList declared in <root>.MyArrayList'
+          TYPE_OP type=E6 of <root>.MyArrayList origin=CAST typeOperand=E6 of <root>.MyArrayList
+            CONST String type=kotlin.String value="O"
+  CLASS INTERFACE name:MyCollection modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyCollection<E1 of <root>.MyCollection>
+    TYPE_PARAMETER name:E1 index:0 variance:out superTypes:[kotlin.Any?] reified:false
+    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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection<E1 of <root>.MyCollection>) returnType:E1 of <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection<E1 of <root>.MyCollection>
+    PROPERTY name:bar visibility:public modality:ABSTRACT [val]
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection<E1 of <root>.MyCollection>) returnType:E1 of <root>.MyCollection
+        correspondingProperty: PROPERTY name:bar visibility:public modality:ABSTRACT [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection<E1 of <root>.MyCollection>
+  CLASS INTERFACE name:MyList modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection<E2 of <root>.MyList>]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyList<E2 of <root>.MyList>
+    TYPE_PARAMETER name:E2 index:0 variance:out superTypes:[kotlin.Any?] reified:false
+    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 <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyList<E2 of <root>.MyList>) returnType:E2 of <root>.MyList
+      overridden:
+        public abstract fun foo (): E1 of <root>.MyCollection declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:<root>.MyList<E2 of <root>.MyList>
+    PROPERTY name:bar visibility:public modality:ABSTRACT [val]
+      overridden:
+        public abstract bar: E1 of <root>.MyCollection
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyList<E2 of <root>.MyList>) returnType:E2 of <root>.MyList
+        correspondingProperty: PROPERTY name:bar visibility:public modality:ABSTRACT [val]
+        overridden:
+          public abstract fun <get-bar> (): E1 of <root>.MyCollection declared in <root>.MyCollection
+        $this: VALUE_PARAMETER name:<this> type:<root>.MyList<E2 of <root>.MyList>
+  CLASS INTERFACE name:MyMutableCollection modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection<E3 of <root>.MyMutableCollection>]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyMutableCollection<E3 of <root>.MyMutableCollection>
+    TYPE_PARAMETER name:E3 index:0 variance: superTypes:[kotlin.Any?] reified:false
+    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 <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection<E3 of <root>.MyMutableCollection>) returnType:E3 of <root>.MyMutableCollection [fake_override]
+      overridden:
+        public abstract fun foo (): E1 of <root>.MyCollection declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection<E3 of <root>.MyMutableCollection>
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
+      overridden:
+        public abstract bar: E1 of <root>.MyCollection
+      FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection<E3 of <root>.MyMutableCollection>) returnType:E3 of <root>.MyMutableCollection [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
+        overridden:
+          public abstract fun <get-bar> (): E1 of <root>.MyCollection declared in <root>.MyCollection
+        $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection<E3 of <root>.MyMutableCollection>
+  CLASS INTERFACE name:MyMutableList modality:ABSTRACT visibility:public superTypes:[<root>.MyList<E4 of <root>.MyMutableList>; <root>.MyMutableCollection<E4 of <root>.MyMutableList>]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyMutableList<E4 of <root>.MyMutableList>
+    TYPE_PARAMETER name:E4 index:0 variance: superTypes:[kotlin.Any?] reified:false
+    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 <root>.MyList
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.MyMutableCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyList<E4 of <root>.MyMutableList>) returnType:E4 of <root>.MyMutableList [fake_override]
+      overridden:
+        public abstract fun foo (): E2 of <root>.MyList declared in <root>.MyList
+        public abstract fun foo (): E3 of <root>.MyMutableCollection declared in <root>.MyMutableCollection
+      $this: VALUE_PARAMETER name:<this> type:<root>.MyList<E4 of <root>.MyMutableList>
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.MyList
+        public open fun hashCode (): kotlin.Int declared in <root>.MyMutableCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.MyList
+        public open fun toString (): kotlin.String declared in <root>.MyMutableCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
+      overridden:
+        public abstract bar: E2 of <root>.MyList
+        public abstract bar: E3 of <root>.MyMutableCollection
+      FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyList<E4 of <root>.MyMutableList>) returnType:E4 of <root>.MyMutableList [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
+        overridden:
+          public abstract fun <get-bar> (): E2 of <root>.MyList declared in <root>.MyList
+          public abstract fun <get-bar> (): E3 of <root>.MyMutableCollection declared in <root>.MyMutableCollection
+        $this: VALUE_PARAMETER name:<this> type:<root>.MyList<E4 of <root>.MyMutableList>
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
       VAR name:x type:<root>.MC [val]

compiler/testData/codegen/box/functions/delegatedPropertyWithMultipleOverriddens_noGenerics.fir.ir.txt

@@ -1,118 +1,67 @@
 FILE fqName:<root> fileName:/delegatedPropertyWithMultipleOverriddens_noGenerics.kt
-  CLASS INTERFACE name:MyCollection modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyCollection
-    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection) returnType:kotlin.String
-      $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection
-    PROPERTY name:bar visibility:public modality:ABSTRACT [val]
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection) returnType:kotlin.String
-        correspondingProperty: PROPERTY name:bar visibility:public modality:ABSTRACT [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+  CLASS CLASS name:MC modality:FINAL visibility:public superTypes:[<root>.MyMutableCollection]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MC
+    FIELD DELEGATE name:$$delegate_0 type:<root>.MyArrayList visibility:private [final]
+      EXPRESSION_BODY
+        CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.MyArrayList' type=<root>.MyArrayList origin=null
+    CONSTRUCTOR visibility:public <> () returnType:<root>.MC [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MC modality:FINAL visibility:public superTypes:[<root>.MyMutableCollection]'
+    FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:<root>.MC) returnType:kotlin.String
       overridden:
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS INTERFACE name:MyList modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyList
-    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyList) returnType:kotlin.String
-      overridden:
-        public abstract fun foo (): kotlin.String declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:<root>.MyList
-    PROPERTY name:bar visibility:public modality:ABSTRACT [val]
-      overridden:
-        public abstract bar: kotlin.String
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyList) returnType:kotlin.String
-        correspondingProperty: PROPERTY name:bar visibility:public modality:ABSTRACT [val]
-        overridden:
-          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyCollection
-        $this: VALUE_PARAMETER name:<this> type:<root>.MyList
-    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 <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS INTERFACE name:MyMutableCollection modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyMutableCollection
-    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection) returnType:kotlin.String [fake_override]
-      overridden:
-        public abstract fun foo (): kotlin.String declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection
-    PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
-      overridden:
-        public abstract bar: kotlin.String
-      FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection) returnType:kotlin.String [fake_override]
-        correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
-        overridden:
-          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyCollection
-        $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection
-    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 <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS INTERFACE name:MyMutableList modality:ABSTRACT visibility:public superTypes:[<root>.MyList; <root>.MyMutableCollection]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyMutableList
-    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyList) returnType:kotlin.String [fake_override]
-      overridden:
-        public abstract fun foo (): kotlin.String declared in <root>.MyList
         public abstract fun foo (): kotlin.String declared in <root>.MyMutableCollection
-      $this: VALUE_PARAMETER name:<this> type:<root>.MyList
-    PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
-      overridden:
-        public abstract bar: kotlin.String
-        public abstract bar: kotlin.String
-      FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyList) returnType:kotlin.String [fake_override]
-        correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
-        overridden:
-          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyList
-          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyMutableCollection
-        $this: VALUE_PARAMETER name:<this> type:<root>.MyList
+      $this: VALUE_PARAMETER name:<this> type:<root>.MC
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in <root>.MC'
+          CALL 'public open fun foo (): kotlin.String declared in <root>.MyArrayList' type=kotlin.String origin=null
+            $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.MyArrayList visibility:private [final]' type=<root>.MyArrayList origin=null
+              receiver: GET_VAR '<this>: <root>.MC declared in <root>.MC.foo' type=<root>.MC 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 <root>.MyList
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.MyMutableCollection
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
     FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.MyList
         public open fun hashCode (): kotlin.Int declared in <root>.MyMutableCollection
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
-        public open fun toString (): kotlin.String declared in <root>.MyList
         public open fun toString (): kotlin.String declared in <root>.MyMutableCollection
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN [val]
+      overridden:
+        public abstract bar: kotlin.String
+      FUN DELEGATED_MEMBER name:<get-bar> visibility:public modality:OPEN <> ($this:<root>.MC) returnType:kotlin.String
+        correspondingProperty: PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN [val]
+        overridden:
+          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyMutableCollection
+        $this: VALUE_PARAMETER name:<this> type:<root>.MC
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-bar> (): kotlin.String declared in <root>.MC'
+            CALL 'public open fun <get-bar> (): kotlin.String declared in <root>.MyArrayList' type=kotlin.String origin=null
+              $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.MyArrayList visibility:private [final]' type=<root>.MyArrayList origin=null
+                receiver: GET_VAR '<this>: <root>.MC declared in <root>.MC.<get-bar>' type=<root>.MC origin=null
   CLASS CLASS name:MyAbstractCollection modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyAbstractCollection
     CONSTRUCTOR visibility:protected <> () returnType:<root>.MyAbstractCollection [primary]
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MyAbstractCollection modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection]'
+    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 <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyAbstractCollection) returnType:kotlin.String
       overridden:
         public abstract fun foo (): kotlin.String declared in <root>.MyCollection
@@ -125,33 +74,8 @@ FILE fqName:<root> fileName:/delegatedPropertyWithMultipleOverriddens_noGenerics
         overridden:
           public abstract fun <get-bar> (): kotlin.String declared in <root>.MyCollection
         $this: VALUE_PARAMETER name:<this> type:<root>.MyAbstractCollection
-    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 <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:MyArrayList modality:FINAL visibility:public superTypes:[<root>.MyMutableList; <root>.MyAbstractCollection]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyArrayList
-    CONSTRUCTOR visibility:public <> () returnType:<root>.MyArrayList [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.MyAbstractCollection'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MyArrayList modality:FINAL visibility:public superTypes:[<root>.MyMutableList; <root>.MyAbstractCollection]'
-    FUN name:foo visibility:public modality:OPEN <> ($this:<root>.MyArrayList) returnType:kotlin.String
-      overridden:
-        public abstract fun foo (): kotlin.String declared in <root>.MyMutableList
-        public abstract fun foo (): kotlin.String declared in <root>.MyAbstractCollection
-      $this: VALUE_PARAMETER name:<this> type:<root>.MyArrayList
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in <root>.MyArrayList'
-          CONST String type=kotlin.String value="O"
     PROPERTY name:bar visibility:public modality:OPEN [val]
       overridden:
         public abstract bar: kotlin.String
@@ -169,6 +93,10 @@ FILE fqName:<root> fileName:/delegatedPropertyWithMultipleOverriddens_noGenerics
           RETURN type=kotlin.Nothing from='public open fun <get-bar> (): kotlin.String declared in <root>.MyArrayList'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.String visibility:private [final]' type=kotlin.String origin=null
               receiver: GET_VAR '<this>: <root>.MyArrayList declared in <root>.MyArrayList.<get-bar>' type=<root>.MyArrayList origin=null
+    CONSTRUCTOR visibility:public <> () returnType:<root>.MyArrayList [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.MyAbstractCollection'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MyArrayList modality:FINAL visibility:public superTypes:[<root>.MyMutableList; <root>.MyAbstractCollection]'
     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 <root>.MyMutableList
@@ -185,50 +113,122 @@ FILE fqName:<root> fileName:/delegatedPropertyWithMultipleOverriddens_noGenerics
         public open fun toString (): kotlin.String declared in <root>.MyMutableList
         public open fun toString (): kotlin.String declared in <root>.MyAbstractCollection
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:MC modality:FINAL visibility:public superTypes:[<root>.MyMutableCollection]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MC
-    CONSTRUCTOR visibility:public <> () returnType:<root>.MC [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MC modality:FINAL visibility:public superTypes:[<root>.MyMutableCollection]'
-    FIELD DELEGATE name:$$delegate_0 type:<root>.MyArrayList visibility:private [final]
-      EXPRESSION_BODY
-        CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.MyArrayList' type=<root>.MyArrayList origin=null
-    FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:<root>.MC) returnType:kotlin.String
+    FUN name:foo visibility:public modality:OPEN <> ($this:<root>.MyArrayList) returnType:kotlin.String
       overridden:
-        public abstract fun foo (): kotlin.String declared in <root>.MyMutableCollection
-      $this: VALUE_PARAMETER name:<this> type:<root>.MC
+        public abstract fun foo (): kotlin.String declared in <root>.MyMutableList
+        public abstract fun foo (): kotlin.String declared in <root>.MyAbstractCollection
+      $this: VALUE_PARAMETER name:<this> type:<root>.MyArrayList
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in <root>.MC'
-          CALL 'public open fun foo (): kotlin.String declared in <root>.MyArrayList' type=kotlin.String origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.MyArrayList visibility:private [final]' type=<root>.MyArrayList origin=null
-              receiver: GET_VAR '<this>: <root>.MC declared in <root>.MC.foo' type=<root>.MC origin=null
-    PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN [val]
-      overridden:
-        public abstract bar: kotlin.String
-      FUN DELEGATED_MEMBER name:<get-bar> visibility:public modality:OPEN <> ($this:<root>.MC) returnType:kotlin.String
-        correspondingProperty: PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN [val]
-        overridden:
-          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyMutableCollection
-        $this: VALUE_PARAMETER name:<this> type:<root>.MC
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun <get-bar> (): kotlin.String declared in <root>.MC'
-            CALL 'public open fun <get-bar> (): kotlin.String declared in <root>.MyArrayList' type=kotlin.String origin=null
-              $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.MyArrayList visibility:private [final]' type=<root>.MyArrayList origin=null
-                receiver: GET_VAR '<this>: <root>.MC declared in <root>.MC.<get-bar>' type=<root>.MC origin=null
+        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in <root>.MyArrayList'
+          CONST String type=kotlin.String value="O"
+  CLASS INTERFACE name:MyCollection modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyCollection
     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 <root>.MyMutableCollection
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
     FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection
+    PROPERTY name:bar visibility:public modality:ABSTRACT [val]
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection) returnType:kotlin.String
+        correspondingProperty: PROPERTY name:bar visibility:public modality:ABSTRACT [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection
+  CLASS INTERFACE name:MyList modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyList
+    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 <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyList) returnType:kotlin.String
+      overridden:
+        public abstract fun foo (): kotlin.String declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:<root>.MyList
+    PROPERTY name:bar visibility:public modality:ABSTRACT [val]
+      overridden:
+        public abstract bar: kotlin.String
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyList) returnType:kotlin.String
+        correspondingProperty: PROPERTY name:bar visibility:public modality:ABSTRACT [val]
+        overridden:
+          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyCollection
+        $this: VALUE_PARAMETER name:<this> type:<root>.MyList
+  CLASS INTERFACE name:MyMutableCollection modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyMutableCollection
+    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 <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection) returnType:kotlin.String [fake_override]
+      overridden:
+        public abstract fun foo (): kotlin.String declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
+      overridden:
+        public abstract bar: kotlin.String
+      FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection) returnType:kotlin.String [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
+        overridden:
+          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyCollection
+        $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection
+  CLASS INTERFACE name:MyMutableList modality:ABSTRACT visibility:public superTypes:[<root>.MyList; <root>.MyMutableCollection]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyMutableList
+    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 <root>.MyList
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.MyMutableCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyList) returnType:kotlin.String [fake_override]
+      overridden:
+        public abstract fun foo (): kotlin.String declared in <root>.MyList
+        public abstract fun foo (): kotlin.String declared in <root>.MyMutableCollection
+      $this: VALUE_PARAMETER name:<this> type:<root>.MyList
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.MyList
         public open fun hashCode (): kotlin.Int declared in <root>.MyMutableCollection
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
+        public open fun toString (): kotlin.String declared in <root>.MyList
         public open fun toString (): kotlin.String declared in <root>.MyMutableCollection
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
+      overridden:
+        public abstract bar: kotlin.String
+        public abstract bar: kotlin.String
+      FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyList) returnType:kotlin.String [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
+        overridden:
+          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyList
+          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyMutableCollection
+        $this: VALUE_PARAMETER name:<this> type:<root>.MyList
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
       VAR name:x type:<root>.MC [val]

compiler/testData/codegen/box/functions/delegatedPropertyWithMultipleOverriddens_noGenerics.ir.txt

@@ -1,212 +1,13 @@
 FILE fqName:<root> fileName:/delegatedPropertyWithMultipleOverriddens_noGenerics.kt
-  CLASS INTERFACE name:MyCollection modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyCollection
-    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection) returnType:kotlin.String
-      $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection
-    PROPERTY name:bar visibility:public modality:ABSTRACT [val]
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection) returnType:kotlin.String
-        correspondingProperty: PROPERTY name:bar visibility:public modality:ABSTRACT [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS INTERFACE name:MyList modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyList
-    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyList) returnType:kotlin.String
-      overridden:
-        public abstract fun foo (): kotlin.String declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:<root>.MyList
-    PROPERTY name:bar visibility:public modality:ABSTRACT [val]
-      overridden:
-        public abstract bar: kotlin.String
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyList) returnType:kotlin.String
-        correspondingProperty: PROPERTY name:bar visibility:public modality:ABSTRACT [val]
-        overridden:
-          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyCollection
-        $this: VALUE_PARAMETER name:<this> type:<root>.MyList
-    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 <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS INTERFACE name:MyMutableCollection modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyMutableCollection
-    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection) returnType:kotlin.String [fake_override]
-      overridden:
-        public abstract fun foo (): kotlin.String declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection
-    PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
-      overridden:
-        public abstract bar: kotlin.String
-      FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection) returnType:kotlin.String [fake_override]
-        correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
-        overridden:
-          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyCollection
-        $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection
-    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 <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS INTERFACE name:MyMutableList modality:ABSTRACT visibility:public superTypes:[<root>.MyList; <root>.MyMutableCollection]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyMutableList
-    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyList) returnType:kotlin.String [fake_override]
-      overridden:
-        public abstract fun foo (): kotlin.String declared in <root>.MyList
-        public abstract fun foo (): kotlin.String declared in <root>.MyMutableCollection
-      $this: VALUE_PARAMETER name:<this> type:<root>.MyList
-    PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
-      overridden:
-        public abstract bar: kotlin.String
-        public abstract bar: kotlin.String
-      FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyList) returnType:kotlin.String [fake_override]
-        correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
-        overridden:
-          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyList
-          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyMutableCollection
-        $this: VALUE_PARAMETER name:<this> type:<root>.MyList
-    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 <root>.MyList
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.MyMutableCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.MyList
-        public open fun hashCode (): kotlin.Int declared in <root>.MyMutableCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.MyList
-        public open fun toString (): kotlin.String declared in <root>.MyMutableCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:MyAbstractCollection modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyAbstractCollection
-    CONSTRUCTOR visibility:protected <> () returnType:<root>.MyAbstractCollection [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MyAbstractCollection modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection]'
-    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyAbstractCollection) returnType:kotlin.String
-      overridden:
-        public abstract fun foo (): kotlin.String declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:<root>.MyAbstractCollection
-    PROPERTY name:bar visibility:public modality:ABSTRACT [val]
-      overridden:
-        public abstract bar: kotlin.String
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyAbstractCollection) returnType:kotlin.String
-        correspondingProperty: PROPERTY name:bar visibility:public modality:ABSTRACT [val]
-        overridden:
-          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyCollection
-        $this: VALUE_PARAMETER name:<this> type:<root>.MyAbstractCollection
-    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 <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.MyCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:MyArrayList modality:FINAL visibility:public superTypes:[<root>.MyMutableList; <root>.MyAbstractCollection]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyArrayList
-    CONSTRUCTOR visibility:public <> () returnType:<root>.MyArrayList [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.MyAbstractCollection'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MyArrayList modality:FINAL visibility:public superTypes:[<root>.MyMutableList; <root>.MyAbstractCollection]'
-    FUN name:foo visibility:public modality:OPEN <> ($this:<root>.MyArrayList) returnType:kotlin.String
-      overridden:
-        public abstract fun foo (): kotlin.String declared in <root>.MyMutableList
-        public abstract fun foo (): kotlin.String declared in <root>.MyAbstractCollection
-      $this: VALUE_PARAMETER name:<this> type:<root>.MyArrayList
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in <root>.MyArrayList'
-          CONST String type=kotlin.String value="O"
-    PROPERTY name:bar visibility:public modality:OPEN [val]
-      overridden:
-        public abstract bar: kotlin.String
-        public abstract bar: kotlin.String
-      FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.String visibility:private [final]
-        EXPRESSION_BODY
-          CONST String type=kotlin.String value="K"
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:OPEN <> ($this:<root>.MyArrayList) returnType:kotlin.String
-        correspondingProperty: PROPERTY name:bar visibility:public modality:OPEN [val]
-        overridden:
-          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyMutableList
-          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyAbstractCollection
-        $this: VALUE_PARAMETER name:<this> type:<root>.MyArrayList
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun <get-bar> (): kotlin.String declared in <root>.MyArrayList'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.String visibility:private [final]' type=kotlin.String origin=null
-              receiver: GET_VAR '<this>: <root>.MyArrayList declared in <root>.MyArrayList.<get-bar>' type=<root>.MyArrayList 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 <root>.MyMutableList
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.MyAbstractCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.MyMutableList
-        public open fun hashCode (): kotlin.Int declared in <root>.MyAbstractCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.MyMutableList
-        public open fun toString (): kotlin.String declared in <root>.MyAbstractCollection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:MC modality:FINAL visibility:public superTypes:[<root>.MyMutableCollection]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MC
+    FIELD DELEGATE name:$$delegate_0 type:<root>.MyArrayList visibility:private [final]
+      EXPRESSION_BODY
+        CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.MyArrayList' type=<root>.MyArrayList origin=null
     CONSTRUCTOR visibility:public <> () returnType:<root>.MC [primary]
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MC modality:FINAL visibility:public superTypes:[<root>.MyMutableCollection]'
-    FIELD DELEGATE name:$$delegate_0 type:<root>.MyArrayList visibility:private [final]
-      EXPRESSION_BODY
-        CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.MyArrayList' type=<root>.MyArrayList origin=null
-    PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN [val]
-      overridden:
-        public abstract bar: kotlin.String
-      FUN DELEGATED_MEMBER name:<get-bar> visibility:public modality:OPEN <> ($this:<root>.MC) returnType:kotlin.String
-        correspondingProperty: PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN [val]
-        overridden:
-          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyMutableCollection
-        $this: VALUE_PARAMETER name:<this> type:<root>.MC
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun <get-bar> (): kotlin.String declared in <root>.MC'
-            CALL 'public open fun <get-bar> (): kotlin.String declared in <root>.MyArrayList' type=kotlin.String origin=null
-              $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.MyArrayList visibility:private [final]' type=<root>.MyArrayList origin=null
-                receiver: GET_VAR '<this>: <root>.MC declared in <root>.MC.<get-bar>' type=<root>.MC origin=null
     FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:<root>.MC) returnType:kotlin.String
       overridden:
         public abstract fun foo (): kotlin.String declared in <root>.MyMutableCollection
@@ -229,6 +30,205 @@ FILE fqName:<root> fileName:/delegatedPropertyWithMultipleOverriddens_noGenerics
       overridden:
         public open fun toString (): kotlin.String declared in <root>.MyMutableCollection
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN [val]
+      overridden:
+        public abstract bar: kotlin.String
+      FUN DELEGATED_MEMBER name:<get-bar> visibility:public modality:OPEN <> ($this:<root>.MC) returnType:kotlin.String
+        correspondingProperty: PROPERTY DELEGATED_MEMBER name:bar visibility:public modality:OPEN [val]
+        overridden:
+          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyMutableCollection
+        $this: VALUE_PARAMETER name:<this> type:<root>.MC
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-bar> (): kotlin.String declared in <root>.MC'
+            CALL 'public open fun <get-bar> (): kotlin.String declared in <root>.MyArrayList' type=kotlin.String origin=null
+              $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.MyArrayList visibility:private [final]' type=<root>.MyArrayList origin=null
+                receiver: GET_VAR '<this>: <root>.MC declared in <root>.MC.<get-bar>' type=<root>.MC origin=null
+  CLASS CLASS name:MyAbstractCollection modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyAbstractCollection
+    CONSTRUCTOR visibility:protected <> () returnType:<root>.MyAbstractCollection [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MyAbstractCollection modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection]'
+    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 <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyAbstractCollection) returnType:kotlin.String
+      overridden:
+        public abstract fun foo (): kotlin.String declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:<root>.MyAbstractCollection
+    PROPERTY name:bar visibility:public modality:ABSTRACT [val]
+      overridden:
+        public abstract bar: kotlin.String
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyAbstractCollection) returnType:kotlin.String
+        correspondingProperty: PROPERTY name:bar visibility:public modality:ABSTRACT [val]
+        overridden:
+          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyCollection
+        $this: VALUE_PARAMETER name:<this> type:<root>.MyAbstractCollection
+  CLASS CLASS name:MyArrayList modality:FINAL visibility:public superTypes:[<root>.MyMutableList; <root>.MyAbstractCollection]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyArrayList
+    PROPERTY name:bar visibility:public modality:OPEN [val]
+      overridden:
+        public abstract bar: kotlin.String
+        public abstract bar: kotlin.String
+      FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.String visibility:private [final]
+        EXPRESSION_BODY
+          CONST String type=kotlin.String value="K"
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:OPEN <> ($this:<root>.MyArrayList) returnType:kotlin.String
+        correspondingProperty: PROPERTY name:bar visibility:public modality:OPEN [val]
+        overridden:
+          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyMutableList
+          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyAbstractCollection
+        $this: VALUE_PARAMETER name:<this> type:<root>.MyArrayList
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-bar> (): kotlin.String declared in <root>.MyArrayList'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.String visibility:private [final]' type=kotlin.String origin=null
+              receiver: GET_VAR '<this>: <root>.MyArrayList declared in <root>.MyArrayList.<get-bar>' type=<root>.MyArrayList origin=null
+    CONSTRUCTOR visibility:public <> () returnType:<root>.MyArrayList [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.MyAbstractCollection'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:MyArrayList modality:FINAL visibility:public superTypes:[<root>.MyMutableList; <root>.MyAbstractCollection]'
+    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 <root>.MyMutableList
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.MyAbstractCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.MyMutableList
+        public open fun hashCode (): kotlin.Int declared in <root>.MyAbstractCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.MyMutableList
+        public open fun toString (): kotlin.String declared in <root>.MyAbstractCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:OPEN <> ($this:<root>.MyArrayList) returnType:kotlin.String
+      overridden:
+        public abstract fun foo (): kotlin.String declared in <root>.MyMutableList
+        public abstract fun foo (): kotlin.String declared in <root>.MyAbstractCollection
+      $this: VALUE_PARAMETER name:<this> type:<root>.MyArrayList
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun foo (): kotlin.String declared in <root>.MyArrayList'
+          CONST String type=kotlin.String value="O"
+  CLASS INTERFACE name:MyCollection modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyCollection
+    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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection
+    PROPERTY name:bar visibility:public modality:ABSTRACT [val]
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection) returnType:kotlin.String
+        correspondingProperty: PROPERTY name:bar visibility:public modality:ABSTRACT [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection
+  CLASS INTERFACE name:MyList modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyList
+    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 <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyList) returnType:kotlin.String
+      overridden:
+        public abstract fun foo (): kotlin.String declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:<root>.MyList
+    PROPERTY name:bar visibility:public modality:ABSTRACT [val]
+      overridden:
+        public abstract bar: kotlin.String
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyList) returnType:kotlin.String
+        correspondingProperty: PROPERTY name:bar visibility:public modality:ABSTRACT [val]
+        overridden:
+          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyCollection
+        $this: VALUE_PARAMETER name:<this> type:<root>.MyList
+  CLASS INTERFACE name:MyMutableCollection modality:ABSTRACT visibility:public superTypes:[<root>.MyCollection]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyMutableCollection
+    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 <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection) returnType:kotlin.String [fake_override]
+      overridden:
+        public abstract fun foo (): kotlin.String declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.MyCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
+      overridden:
+        public abstract bar: kotlin.String
+      FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyCollection) returnType:kotlin.String [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
+        overridden:
+          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyCollection
+        $this: VALUE_PARAMETER name:<this> type:<root>.MyCollection
+  CLASS INTERFACE name:MyMutableList modality:ABSTRACT visibility:public superTypes:[<root>.MyList; <root>.MyMutableCollection]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyMutableList
+    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 <root>.MyList
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.MyMutableCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.MyList) returnType:kotlin.String [fake_override]
+      overridden:
+        public abstract fun foo (): kotlin.String declared in <root>.MyList
+        public abstract fun foo (): kotlin.String declared in <root>.MyMutableCollection
+      $this: VALUE_PARAMETER name:<this> type:<root>.MyList
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.MyList
+        public open fun hashCode (): kotlin.Int declared in <root>.MyMutableCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.MyList
+        public open fun toString (): kotlin.String declared in <root>.MyMutableCollection
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
+      overridden:
+        public abstract bar: kotlin.String
+        public abstract bar: kotlin.String
+      FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.MyList) returnType:kotlin.String [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:ABSTRACT [fake_override,val]
+        overridden:
+          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyList
+          public abstract fun <get-bar> (): kotlin.String declared in <root>.MyMutableCollection
+        $this: VALUE_PARAMETER name:<this> type:<root>.MyList
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
       VAR name:x type:<root>.MC [val]

compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaFieldAndKotlinProperty.fir.ir.txt

@@ -1,10 +1,6 @@
 FILE fqName:<root> fileName:/Derived.kt
   CLASS CLASS name:Derived modality:FINAL visibility:public superTypes:[<root>.BaseJava]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Derived
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Derived [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.BaseJava'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Derived modality:FINAL visibility:public superTypes:[<root>.BaseJava]'
     PROPERTY name:a visibility:public modality:FINAL [var]
       FIELD PROPERTY_BACKING_FIELD name:a type:kotlin.String visibility:private
         EXPRESSION_BODY
@@ -24,6 +20,10 @@ FILE fqName:<root> fileName:/Derived.kt
           SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:a type:kotlin.String visibility:private' type=kotlin.Unit origin=null
             receiver: GET_VAR '<this>: <root>.Derived declared in <root>.Derived.<set-a>' type=<root>.Derived origin=null
             value: GET_VAR '<set-?>: kotlin.String declared in <root>.Derived.<set-a>' type=kotlin.String origin=null
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Derived [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.BaseJava'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Derived modality:FINAL visibility:public superTypes:[<root>.BaseJava]'
     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 <root>.BaseJava

compiler/testData/codegen/box/javaVisibility/package/cannotAccessInterfaceMemberViaReceiver.fir.ir.txt

@@ -5,11 +5,6 @@ FILE fqName:<root> fileName:/Child.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in javapackage.PublicParentClass'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Child modality:FINAL visibility:public superTypes:[javapackage.PublicParentClass]'
-    FUN name:foo visibility:public modality:FINAL <> ($this:<root>.Child) returnType:kotlin.String
-      $this: VALUE_PARAMETER name:<this> type:<root>.Child
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.String declared in <root>.Child'
-          GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:publicStaticField type:kotlin.String visibility:public [final,static]' type=kotlin.String 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 javapackage.PublicParentClass
@@ -23,6 +18,11 @@ FILE fqName:<root> fileName:/Child.kt
       overridden:
         public open fun toString (): kotlin.String declared in javapackage.PublicParentClass
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:FINAL <> ($this:<root>.Child) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:<root>.Child
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.String declared in <root>.Child'
+          GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:publicStaticField type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null
 FILE fqName:<root> fileName:/test.kt
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY

compiler/testData/codegen/box/javaVisibility/package/cannotAccessInterfaceMemberViaReceiver.ir.txt

@@ -5,11 +5,6 @@ FILE fqName:<root> fileName:/Child.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in javapackage.PublicParentClass'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Child modality:FINAL visibility:public superTypes:[javapackage.PublicParentClass]'
-    FUN name:foo visibility:public modality:FINAL <> ($this:<root>.Child) returnType:kotlin.String
-      $this: VALUE_PARAMETER name:<this> type:<root>.Child
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.String declared in <root>.Child'
-          GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:publicStaticField type:kotlin.String visibility:public [final,static]' type=kotlin.String 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 javapackage.PublicParentClass
@@ -23,6 +18,11 @@ FILE fqName:<root> fileName:/Child.kt
       overridden:
         public open fun toString (): kotlin.String declared in javapackage.PublicParentClass
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:FINAL <> ($this:<root>.Child) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:<root>.Child
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.String declared in <root>.Child'
+          GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:publicStaticField type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null
 FILE fqName:<root> fileName:/test.kt
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY

compiler/testData/codegen/box/multiplatform/k2/internalOverride2.fir.ir.txt

@@ -5,6 +5,19 @@ FILE fqName:<root> fileName:/common.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:OPEN 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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     FUN name:foo1 visibility:internal modality:OPEN <> ($this:<root>.A) returnType:kotlin.String
       $this: VALUE_PARAMETER name:<this> type:<root>.A
       BLOCK_BODY
@@ -20,32 +33,17 @@ FILE fqName:<root> fileName:/common.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='internal open fun foo3 (): kotlin.String declared in <root>.A'
           CONST String type=kotlin.String value="A::foo3"
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:C modality:OPEN visibility:public superTypes:[<root>.B]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C
     CONSTRUCTOR visibility:public <> () returnType:<root>.C [primary]
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.B'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:OPEN visibility:public superTypes:[<root>.B]'
-    FUN name:foo1 visibility:internal modality:OPEN <> ($this:<root>.C) returnType:kotlin.String
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
       overridden:
-        internal open fun foo1 (): kotlin.String declared in <root>.B
-      $this: VALUE_PARAMETER name:<this> type:<root>.C
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='internal open fun foo1 (): kotlin.String declared in <root>.C'
-          CONST String type=kotlin.String value="C::foo1"
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.B
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
     FUN FAKE_OVERRIDE name:foo2 visibility:internal modality:OPEN <> ($this:<root>.B) returnType:kotlin.String [fake_override]
       overridden:
         internal open fun foo2 (): kotlin.String declared in <root>.B
@@ -54,11 +52,6 @@ FILE fqName:<root> fileName:/common.kt
       overridden:
         internal open fun foo3 (): kotlin.String declared in <root>.B
       $this: VALUE_PARAMETER name:<this> type:<root>.A
-    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 <root>.B
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
     FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int declared in <root>.B
@@ -67,6 +60,13 @@ FILE fqName:<root> fileName:/common.kt
       overridden:
         public open fun toString (): kotlin.String declared in <root>.B
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo1 visibility:internal modality:OPEN <> ($this:<root>.C) returnType:kotlin.String
+      overridden:
+        internal open fun foo1 (): kotlin.String declared in <root>.B
+      $this: VALUE_PARAMETER name:<this> type:<root>.C
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='internal open fun foo1 (): kotlin.String declared in <root>.C'
+          CONST String type=kotlin.String value="C::foo1"
 FILE fqName:<root> fileName:/main.kt
   CLASS CLASS name:B modality:OPEN visibility:public superTypes:[<root>.A]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.B
@@ -74,6 +74,23 @@ FILE fqName:<root> fileName:/main.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.A'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:B modality:OPEN visibility:public superTypes:[<root>.A]'
+    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 <root>.A
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:foo3 visibility:internal modality:OPEN <> ($this:<root>.A) returnType:kotlin.String [fake_override]
+      overridden:
+        internal open fun foo3 (): kotlin.String declared in <root>.A
+      $this: VALUE_PARAMETER name:<this> type:<root>.A
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.A
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.A
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     FUN name:foo1 visibility:internal modality:OPEN <> ($this:<root>.B) returnType:kotlin.String
       overridden:
         internal open fun foo1 (): kotlin.String declared in <root>.A
@@ -88,23 +105,6 @@ FILE fqName:<root> fileName:/main.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='internal open fun foo2 (): kotlin.String declared in <root>.B'
           CONST String type=kotlin.String value="B::foo2"
-    FUN FAKE_OVERRIDE name:foo3 visibility:internal modality:OPEN <> ($this:<root>.A) returnType:kotlin.String [fake_override]
-      overridden:
-        internal open fun foo3 (): kotlin.String declared in <root>.A
-      $this: VALUE_PARAMETER name:<this> type:<root>.A
-    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 <root>.A
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.A
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.A
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
       VAR name:a type:<root>.A [val]

compiler/testData/codegen/box/primitiveTypes/reassignDestructured.fir.ir.txt

@@ -1,4 +1,10 @@
 FILE fqName:<root> fileName:/reassignDestructured.kt
+  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
+    BLOCK_BODY
+      CALL 'public final fun test1 (): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
+      CALL 'public final fun test2 (): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
+      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
+        CONST String type=kotlin.String value="OK"
   FUN name:getInt visibility:public modality:FINAL <> () returnType:kotlin.Int?
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun getInt (): kotlin.Int? declared in <root>'
@@ -58,9 +64,3 @@ FILE fqName:<root> fileName:/reassignDestructured.kt
           $this: GET_VAR 'val tmp_1: kotlin.Pair<kotlin.Int, kotlin.Int> declared in <root>.test2' type=kotlin.Pair<kotlin.Int, kotlin.Int> origin=null
       SET_VAR 'var int1: kotlin.Int? declared in <root>.test2' type=kotlin.Unit origin=EQ
         CONST Null type=kotlin.Nothing? value=null
-  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
-    BLOCK_BODY
-      CALL 'public final fun test1 (): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-      CALL 'public final fun test2 (): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
-        CONST String type=kotlin.String value="OK"

compiler/testData/codegen/box/smartCasts/kt44814.fir.ir.txt

@@ -1,10 +1,10 @@
 FILE fqName:<root> fileName:/kt44814.kt
-  CLASS CLASS name:FlyweightCapableTreeStructure modality:FINAL visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FlyweightCapableTreeStructure
-    CONSTRUCTOR visibility:public <> () returnType:<root>.FlyweightCapableTreeStructure [primary]
+  CLASS CLASS name:ASTNode modality:FINAL visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.ASTNode
+    CONSTRUCTOR visibility:public <> () returnType:<root>.ASTNode [primary]
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FlyweightCapableTreeStructure modality:FINAL visibility:public superTypes:[kotlin.Any]'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:ASTNode 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
@@ -18,107 +18,8 @@ FILE fqName:<root> fileName:/kt44814.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:FirSourceElement modality:SEALED visibility:public superTypes:[kotlin.Any]
-    sealedSubclasses:
-      CLASS CLASS name:FirLightSourceElement modality:FINAL visibility:public superTypes:[<root>.FirSourceElement]
-      CLASS CLASS name:FirPsiSourceElement modality:FINAL visibility:public superTypes:[<root>.FirSourceElement]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirSourceElement
-    CONSTRUCTOR visibility:protected <> () returnType:<root>.FirSourceElement [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirSourceElement modality:SEALED visibility:public superTypes:[kotlin.Any]'
-    PROPERTY name:lighterASTNode visibility:public modality:ABSTRACT [val]
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-lighterASTNode> visibility:public modality:ABSTRACT <> ($this:<root>.FirSourceElement) returnType:<root>.LighterASTNode
-        correspondingProperty: PROPERTY name:lighterASTNode visibility:public modality:ABSTRACT [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.FirSourceElement
-    PROPERTY name:treeStructure visibility:public modality:ABSTRACT [val]
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-treeStructure> visibility:public modality:ABSTRACT <> ($this:<root>.FirSourceElement) returnType:<root>.FlyweightCapableTreeStructure
-        correspondingProperty: PROPERTY name:treeStructure visibility:public modality:ABSTRACT [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.FirSourceElement
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:FirPsiSourceElement modality:FINAL visibility:public superTypes:[<root>.FirSourceElement]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirPsiSourceElement
-    CONSTRUCTOR visibility:public <> (psi:<root>.PsiElement, lighterASTNode:<root>.LighterASTNode, treeStructure:<root>.FlyweightCapableTreeStructure) returnType:<root>.FirPsiSourceElement [primary]
-      VALUE_PARAMETER name:psi index:0 type:<root>.PsiElement
-      VALUE_PARAMETER name:lighterASTNode index:1 type:<root>.LighterASTNode
-      VALUE_PARAMETER name:treeStructure index:2 type:<root>.FlyweightCapableTreeStructure
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.FirSourceElement'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirPsiSourceElement modality:FINAL visibility:public superTypes:[<root>.FirSourceElement]'
-    PROPERTY name:psi visibility:public modality:FINAL [val]
-      FIELD PROPERTY_BACKING_FIELD name:psi type:<root>.PsiElement visibility:private [final]
-        EXPRESSION_BODY
-          GET_VAR 'psi: <root>.PsiElement declared in <root>.FirPsiSourceElement.<init>' type=<root>.PsiElement origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-psi> visibility:public modality:FINAL <> ($this:<root>.FirPsiSourceElement) returnType:<root>.PsiElement
-        correspondingProperty: PROPERTY name:psi visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.FirPsiSourceElement
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-psi> (): <root>.PsiElement declared in <root>.FirPsiSourceElement'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:psi type:<root>.PsiElement visibility:private [final]' type=<root>.PsiElement origin=null
-              receiver: GET_VAR '<this>: <root>.FirPsiSourceElement declared in <root>.FirPsiSourceElement.<get-psi>' type=<root>.FirPsiSourceElement origin=null
-    PROPERTY name:lighterASTNode visibility:public modality:OPEN [val]
-      overridden:
-        public abstract lighterASTNode: <root>.LighterASTNode
-      FIELD PROPERTY_BACKING_FIELD name:lighterASTNode type:<root>.LighterASTNode visibility:private [final]
-        EXPRESSION_BODY
-          GET_VAR 'lighterASTNode: <root>.LighterASTNode declared in <root>.FirPsiSourceElement.<init>' type=<root>.LighterASTNode origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-lighterASTNode> visibility:public modality:OPEN <> ($this:<root>.FirPsiSourceElement) returnType:<root>.LighterASTNode
-        correspondingProperty: PROPERTY name:lighterASTNode visibility:public modality:OPEN [val]
-        overridden:
-          public abstract fun <get-lighterASTNode> (): <root>.LighterASTNode declared in <root>.FirSourceElement
-        $this: VALUE_PARAMETER name:<this> type:<root>.FirPsiSourceElement
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun <get-lighterASTNode> (): <root>.LighterASTNode declared in <root>.FirPsiSourceElement'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:lighterASTNode type:<root>.LighterASTNode visibility:private [final]' type=<root>.LighterASTNode origin=null
-              receiver: GET_VAR '<this>: <root>.FirPsiSourceElement declared in <root>.FirPsiSourceElement.<get-lighterASTNode>' type=<root>.FirPsiSourceElement origin=null
-    PROPERTY name:treeStructure visibility:public modality:OPEN [val]
-      overridden:
-        public abstract treeStructure: <root>.FlyweightCapableTreeStructure
-      FIELD PROPERTY_BACKING_FIELD name:treeStructure type:<root>.FlyweightCapableTreeStructure visibility:private [final]
-        EXPRESSION_BODY
-          GET_VAR 'treeStructure: <root>.FlyweightCapableTreeStructure declared in <root>.FirPsiSourceElement.<init>' type=<root>.FlyweightCapableTreeStructure origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-treeStructure> visibility:public modality:OPEN <> ($this:<root>.FirPsiSourceElement) returnType:<root>.FlyweightCapableTreeStructure
-        correspondingProperty: PROPERTY name:treeStructure visibility:public modality:OPEN [val]
-        overridden:
-          public abstract fun <get-treeStructure> (): <root>.FlyweightCapableTreeStructure declared in <root>.FirSourceElement
-        $this: VALUE_PARAMETER name:<this> type:<root>.FirPsiSourceElement
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun <get-treeStructure> (): <root>.FlyweightCapableTreeStructure declared in <root>.FirPsiSourceElement'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:treeStructure type:<root>.FlyweightCapableTreeStructure visibility:private [final]' type=<root>.FlyweightCapableTreeStructure origin=null
-              receiver: GET_VAR '<this>: <root>.FirPsiSourceElement declared in <root>.FirPsiSourceElement.<get-treeStructure>' type=<root>.FirPsiSourceElement 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 <root>.FirSourceElement
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.FirSourceElement
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.FirSourceElement
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:FirLightSourceElement modality:FINAL visibility:public superTypes:[<root>.FirSourceElement]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirLightSourceElement
-    CONSTRUCTOR visibility:public <> (lighterASTNode:<root>.LighterASTNode, treeStructure:<root>.FlyweightCapableTreeStructure) returnType:<root>.FirLightSourceElement [primary]
-      VALUE_PARAMETER name:lighterASTNode index:0 type:<root>.LighterASTNode
-      VALUE_PARAMETER name:treeStructure index:1 type:<root>.FlyweightCapableTreeStructure
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.FirSourceElement'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirLightSourceElement modality:FINAL visibility:public superTypes:[<root>.FirSourceElement]'
     PROPERTY name:lighterASTNode visibility:public modality:OPEN [val]
       overridden:
         public abstract lighterASTNode: <root>.LighterASTNode
@@ -149,6 +50,12 @@ FILE fqName:<root> fileName:/kt44814.kt
           RETURN type=kotlin.Nothing from='public open fun <get-treeStructure> (): <root>.FlyweightCapableTreeStructure declared in <root>.FirLightSourceElement'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:treeStructure type:<root>.FlyweightCapableTreeStructure visibility:private [final]' type=<root>.FlyweightCapableTreeStructure origin=null
               receiver: GET_VAR '<this>: <root>.FirLightSourceElement declared in <root>.FirLightSourceElement.<get-treeStructure>' type=<root>.FirLightSourceElement origin=null
+    CONSTRUCTOR visibility:public <> (lighterASTNode:<root>.LighterASTNode, treeStructure:<root>.FlyweightCapableTreeStructure) returnType:<root>.FirLightSourceElement [primary]
+      VALUE_PARAMETER name:lighterASTNode index:0 type:<root>.LighterASTNode
+      VALUE_PARAMETER name:treeStructure index:1 type:<root>.FlyweightCapableTreeStructure
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.FirSourceElement'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirLightSourceElement modality:FINAL visibility:public superTypes:[<root>.FirSourceElement]'
     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 <root>.FirSourceElement
@@ -162,226 +69,12 @@ FILE fqName:<root> fileName:/kt44814.kt
       overridden:
         public open fun toString (): kotlin.String declared in <root>.FirSourceElement
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:PsiElement modality:OPEN visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.PsiElement
-    CONSTRUCTOR visibility:public <> () returnType:<root>.PsiElement [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:PsiElement modality:OPEN 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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:ASTNode modality:FINAL visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.ASTNode
-    CONSTRUCTOR visibility:public <> () returnType:<root>.ASTNode [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:ASTNode 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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:LighterASTNode modality:FINAL visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.LighterASTNode
-    CONSTRUCTOR visibility:public <> (_children:kotlin.collections.List<<root>.LighterASTNode?>) returnType:<root>.LighterASTNode [primary]
-      VALUE_PARAMETER name:_children index:0 type:kotlin.collections.List<<root>.LighterASTNode?>
-        EXPRESSION_BODY
-          CALL 'public final fun emptyList <T> (): kotlin.collections.List<T of kotlin.collections.emptyList> declared in kotlin.collections' type=kotlin.collections.List<<root>.LighterASTNode?> origin=null
-            <T>: <root>.LighterASTNode?
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:LighterASTNode modality:FINAL visibility:public superTypes:[kotlin.Any]'
-    PROPERTY name:_children visibility:public modality:FINAL [val]
-      FIELD PROPERTY_BACKING_FIELD name:_children type:kotlin.collections.List<<root>.LighterASTNode?> visibility:private [final]
-        EXPRESSION_BODY
-          GET_VAR '_children: kotlin.collections.List<<root>.LighterASTNode?> declared in <root>.LighterASTNode.<init>' type=kotlin.collections.List<<root>.LighterASTNode?> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-_children> visibility:public modality:FINAL <> ($this:<root>.LighterASTNode) returnType:kotlin.collections.List<<root>.LighterASTNode?>
-        correspondingProperty: PROPERTY name:_children visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.LighterASTNode
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-_children> (): kotlin.collections.List<<root>.LighterASTNode?> declared in <root>.LighterASTNode'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:_children type:kotlin.collections.List<<root>.LighterASTNode?> visibility:private [final]' type=kotlin.collections.List<<root>.LighterASTNode?> origin=null
-              receiver: GET_VAR '<this>: <root>.LighterASTNode declared in <root>.LighterASTNode.<get-_children>' type=<root>.LighterASTNode origin=null
-    FUN name:getChildren visibility:public modality:FINAL <> ($this:<root>.LighterASTNode, treeStructure:<root>.FlyweightCapableTreeStructure) returnType:kotlin.collections.List<<root>.LighterASTNode?>
-      $this: VALUE_PARAMETER name:<this> type:<root>.LighterASTNode
-      VALUE_PARAMETER name:treeStructure index:0 type:<root>.FlyweightCapableTreeStructure
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun getChildren (treeStructure: <root>.FlyweightCapableTreeStructure): kotlin.collections.List<<root>.LighterASTNode?> declared in <root>.LighterASTNode'
-          CALL 'public final fun <get-_children> (): kotlin.collections.List<<root>.LighterASTNode?> declared in <root>.LighterASTNode' type=kotlin.collections.List<<root>.LighterASTNode?> origin=GET_PROPERTY
-            $this: GET_VAR '<this>: <root>.LighterASTNode declared in <root>.LighterASTNode.getChildren' type=<root>.LighterASTNode origin=null
-    PROPERTY name:tokenType visibility:public modality:FINAL [val]
-      FIELD PROPERTY_BACKING_FIELD name:tokenType type:<root>.TokenType visibility:private [final]
-        EXPRESSION_BODY
-          CALL 'public final fun <get-MODIFIER_LIST> (): <root>.TokenType declared in <root>.TokenType.Companion' type=<root>.TokenType origin=GET_PROPERTY
-            $this: GET_OBJECT 'CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=<root>.TokenType.Companion
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-tokenType> visibility:public modality:FINAL <> ($this:<root>.LighterASTNode) returnType:<root>.TokenType
-        correspondingProperty: PROPERTY name:tokenType visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.LighterASTNode
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-tokenType> (): <root>.TokenType declared in <root>.LighterASTNode'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:tokenType type:<root>.TokenType visibility:private [final]' type=<root>.TokenType origin=null
-              receiver: GET_VAR '<this>: <root>.LighterASTNode declared in <root>.LighterASTNode.<get-tokenType>' type=<root>.LighterASTNode 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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:TokenType modality:FINAL visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TokenType
-    CONSTRUCTOR visibility:public <> () returnType:<root>.TokenType [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TokenType modality:FINAL visibility:public superTypes:[kotlin.Any]'
-    CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]
-      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TokenType.Companion
-      CONSTRUCTOR visibility:private <> () returnType:<root>.TokenType.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]'
-      PROPERTY name:MODIFIER_LIST visibility:public modality:FINAL [val]
-        FIELD PROPERTY_BACKING_FIELD name:MODIFIER_LIST type:<root>.TokenType visibility:private [final]
-          EXPRESSION_BODY
-            CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.TokenType' type=<root>.TokenType origin=null
-        FUN DEFAULT_PROPERTY_ACCESSOR name:<get-MODIFIER_LIST> visibility:public modality:FINAL <> ($this:<root>.TokenType.Companion) returnType:<root>.TokenType
-          correspondingProperty: PROPERTY name:MODIFIER_LIST visibility:public modality:FINAL [val]
-          $this: VALUE_PARAMETER name:<this> type:<root>.TokenType.Companion
-          BLOCK_BODY
-            RETURN type=kotlin.Nothing from='public final fun <get-MODIFIER_LIST> (): <root>.TokenType declared in <root>.TokenType.Companion'
-              GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:MODIFIER_LIST type:<root>.TokenType visibility:private [final]' type=<root>.TokenType origin=null
-                receiver: GET_VAR '<this>: <root>.TokenType.Companion declared in <root>.TokenType.Companion.<get-MODIFIER_LIST>' type=<root>.TokenType.Companion 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
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-        VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-        overridden:
-          public open fun hashCode (): kotlin.Int declared in kotlin.Any
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-        overridden:
-          public open fun toString (): kotlin.String declared in kotlin.Any
-        $this: VALUE_PARAMETER name:<this> type: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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:KtModifierKeywordToken modality:FINAL visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.KtModifierKeywordToken
-    CONSTRUCTOR visibility:public <> () returnType:<root>.KtModifierKeywordToken [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:KtModifierKeywordToken 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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:KtModifierList modality:FINAL visibility:public superTypes:[<root>.PsiElement]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.KtModifierList
-    CONSTRUCTOR visibility:public <> () returnType:<root>.KtModifierList [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.PsiElement'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:KtModifierList modality:FINAL visibility:public superTypes:[<root>.PsiElement]'
-    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 <root>.PsiElement
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.PsiElement
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.PsiElement
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:KtModifierListOwner modality:FINAL visibility:public superTypes:[<root>.PsiElement]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.KtModifierListOwner
-    CONSTRUCTOR visibility:public <> () returnType:<root>.KtModifierListOwner [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.PsiElement'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:KtModifierListOwner modality:FINAL visibility:public superTypes:[<root>.PsiElement]'
-    PROPERTY name:modifierList visibility:public modality:FINAL [val]
-      FIELD PROPERTY_BACKING_FIELD name:modifierList type:<root>.KtModifierList visibility:private [final]
-        EXPRESSION_BODY
-          CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.KtModifierList' type=<root>.KtModifierList origin=null
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-modifierList> visibility:public modality:FINAL <> ($this:<root>.KtModifierListOwner) returnType:<root>.KtModifierList
-        correspondingProperty: PROPERTY name:modifierList visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.KtModifierListOwner
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-modifierList> (): <root>.KtModifierList declared in <root>.KtModifierListOwner'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:modifierList type:<root>.KtModifierList visibility:private [final]' type=<root>.KtModifierList origin=null
-              receiver: GET_VAR '<this>: <root>.KtModifierListOwner declared in <root>.KtModifierListOwner.<get-modifierList>' type=<root>.KtModifierListOwner 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 <root>.PsiElement
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.PsiElement
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.PsiElement
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:FirModifier modality:SEALED visibility:internal superTypes:[kotlin.Any]
     sealedSubclasses:
       CLASS CLASS name:FirLightModifier modality:FINAL visibility:public superTypes:[<root>.FirModifier<<root>.LighterASTNode>]
       CLASS CLASS name:FirPsiModifier modality:FINAL visibility:public superTypes:[<root>.FirModifier<<root>.ASTNode>]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirModifier<Node of <root>.FirModifier>
     TYPE_PARAMETER name:Node index:0 variance: superTypes:[kotlin.Any] reified:false
-    CONSTRUCTOR visibility:protected <> (node:Node of <root>.FirModifier, token:<root>.KtModifierKeywordToken) returnType:<root>.FirModifier<Node of <root>.FirModifier> [primary]
-      VALUE_PARAMETER name:node index:0 type:Node of <root>.FirModifier
-      VALUE_PARAMETER name:token index:1 type:<root>.KtModifierKeywordToken
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirModifier modality:SEALED visibility:internal superTypes:[kotlin.Any]'
     PROPERTY name:node visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:node type:Node of <root>.FirModifier visibility:private [final]
         EXPRESSION_BODY
@@ -404,33 +97,29 @@ FILE fqName:<root> fileName:/kt44814.kt
           RETURN type=kotlin.Nothing from='public final fun <get-token> (): <root>.KtModifierKeywordToken declared in <root>.FirModifier'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:token type:<root>.KtModifierKeywordToken visibility:private [final]' type=<root>.KtModifierKeywordToken origin=null
               receiver: GET_VAR '<this>: <root>.FirModifier<Node of <root>.FirModifier> declared in <root>.FirModifier.<get-token>' type=<root>.FirModifier<Node of <root>.FirModifier> origin=null
-    CLASS CLASS name:FirPsiModifier modality:FINAL visibility:public superTypes:[<root>.FirModifier<<root>.ASTNode>]
-      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirModifier.FirPsiModifier
-      CONSTRUCTOR visibility:public <> (node:<root>.ASTNode, token:<root>.KtModifierKeywordToken) returnType:<root>.FirModifier.FirPsiModifier [primary]
-        VALUE_PARAMETER name:node index:0 type:<root>.ASTNode
+    CLASS CLASS name:FirLightModifier modality:FINAL visibility:public superTypes:[<root>.FirModifier<<root>.LighterASTNode>]
+      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirModifier.FirLightModifier
+      PROPERTY name:tree visibility:public modality:FINAL [val]
+        FIELD PROPERTY_BACKING_FIELD name:tree type:<root>.FlyweightCapableTreeStructure visibility:private [final]
+          EXPRESSION_BODY
+            GET_VAR 'tree: <root>.FlyweightCapableTreeStructure declared in <root>.FirModifier.FirLightModifier.<init>' type=<root>.FlyweightCapableTreeStructure origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+        FUN DEFAULT_PROPERTY_ACCESSOR name:<get-tree> visibility:public modality:FINAL <> ($this:<root>.FirModifier.FirLightModifier) returnType:<root>.FlyweightCapableTreeStructure
+          correspondingProperty: PROPERTY name:tree visibility:public modality:FINAL [val]
+          $this: VALUE_PARAMETER name:<this> type:<root>.FirModifier.FirLightModifier
+          BLOCK_BODY
+            RETURN type=kotlin.Nothing from='public final fun <get-tree> (): <root>.FlyweightCapableTreeStructure declared in <root>.FirModifier.FirLightModifier'
+              GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:tree type:<root>.FlyweightCapableTreeStructure visibility:private [final]' type=<root>.FlyweightCapableTreeStructure origin=null
+                receiver: GET_VAR '<this>: <root>.FirModifier.FirLightModifier declared in <root>.FirModifier.FirLightModifier.<get-tree>' type=<root>.FirModifier.FirLightModifier origin=null
+      CONSTRUCTOR visibility:public <> (node:<root>.LighterASTNode, token:<root>.KtModifierKeywordToken, tree:<root>.FlyweightCapableTreeStructure) returnType:<root>.FirModifier.FirLightModifier [primary]
+        VALUE_PARAMETER name:node index:0 type:<root>.LighterASTNode
         VALUE_PARAMETER name:token index:1 type:<root>.KtModifierKeywordToken
+        VALUE_PARAMETER name:tree index:2 type:<root>.FlyweightCapableTreeStructure
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> (node: Node of <root>.FirModifier, token: <root>.KtModifierKeywordToken) declared in <root>.FirModifier'
-            <Node>: <root>.ASTNode
-            node: GET_VAR 'node: <root>.ASTNode declared in <root>.FirModifier.FirPsiModifier.<init>' type=<root>.ASTNode origin=null
-            token: GET_VAR 'token: <root>.KtModifierKeywordToken declared in <root>.FirModifier.FirPsiModifier.<init>' type=<root>.KtModifierKeywordToken origin=null
-          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirPsiModifier modality:FINAL visibility:public superTypes:[<root>.FirModifier<<root>.ASTNode>]'
-      PROPERTY FAKE_OVERRIDE name:node visibility:public modality:FINAL [fake_override,val]
-        overridden:
-          public final node: Node of <root>.FirModifier
-        FUN FAKE_OVERRIDE name:<get-node> visibility:public modality:FINAL <> ($this:<root>.FirModifier<<root>.ASTNode>) returnType:<root>.ASTNode [fake_override]
-          correspondingProperty: PROPERTY FAKE_OVERRIDE name:node visibility:public modality:FINAL [fake_override,val]
-          overridden:
-            public final fun <get-node> (): Node of <root>.FirModifier declared in <root>.FirModifier
-          $this: VALUE_PARAMETER name:<this> type:<root>.FirModifier<<root>.ASTNode>
-      PROPERTY FAKE_OVERRIDE name:token visibility:public modality:FINAL [fake_override,val]
-        overridden:
-          public final token: <root>.KtModifierKeywordToken
-        FUN FAKE_OVERRIDE name:<get-token> visibility:public modality:FINAL <> ($this:<root>.FirModifier<<root>.ASTNode>) returnType:<root>.KtModifierKeywordToken [fake_override]
-          correspondingProperty: PROPERTY FAKE_OVERRIDE name:token visibility:public modality:FINAL [fake_override,val]
-          overridden:
-            public final fun <get-token> (): <root>.KtModifierKeywordToken declared in <root>.FirModifier
-          $this: VALUE_PARAMETER name:<this> type:<root>.FirModifier<<root>.ASTNode>
+            <Node>: <root>.LighterASTNode
+            node: GET_VAR 'node: <root>.LighterASTNode declared in <root>.FirModifier.FirLightModifier.<init>' type=<root>.LighterASTNode origin=null
+            token: GET_VAR 'token: <root>.KtModifierKeywordToken declared in <root>.FirModifier.FirLightModifier.<init>' type=<root>.KtModifierKeywordToken origin=null
+          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirLightModifier modality:FINAL visibility:public superTypes:[<root>.FirModifier<<root>.LighterASTNode>]'
       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 <root>.FirModifier
@@ -444,29 +133,6 @@ FILE fqName:<root> fileName:/kt44814.kt
         overridden:
           public open fun toString (): kotlin.String declared in <root>.FirModifier
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    CLASS CLASS name:FirLightModifier modality:FINAL visibility:public superTypes:[<root>.FirModifier<<root>.LighterASTNode>]
-      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirModifier.FirLightModifier
-      CONSTRUCTOR visibility:public <> (node:<root>.LighterASTNode, token:<root>.KtModifierKeywordToken, tree:<root>.FlyweightCapableTreeStructure) returnType:<root>.FirModifier.FirLightModifier [primary]
-        VALUE_PARAMETER name:node index:0 type:<root>.LighterASTNode
-        VALUE_PARAMETER name:token index:1 type:<root>.KtModifierKeywordToken
-        VALUE_PARAMETER name:tree index:2 type:<root>.FlyweightCapableTreeStructure
-        BLOCK_BODY
-          DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> (node: Node of <root>.FirModifier, token: <root>.KtModifierKeywordToken) declared in <root>.FirModifier'
-            <Node>: <root>.LighterASTNode
-            node: GET_VAR 'node: <root>.LighterASTNode declared in <root>.FirModifier.FirLightModifier.<init>' type=<root>.LighterASTNode origin=null
-            token: GET_VAR 'token: <root>.KtModifierKeywordToken declared in <root>.FirModifier.FirLightModifier.<init>' type=<root>.KtModifierKeywordToken origin=null
-          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirLightModifier modality:FINAL visibility:public superTypes:[<root>.FirModifier<<root>.LighterASTNode>]'
-      PROPERTY name:tree visibility:public modality:FINAL [val]
-        FIELD PROPERTY_BACKING_FIELD name:tree type:<root>.FlyweightCapableTreeStructure visibility:private [final]
-          EXPRESSION_BODY
-            GET_VAR 'tree: <root>.FlyweightCapableTreeStructure declared in <root>.FirModifier.FirLightModifier.<init>' type=<root>.FlyweightCapableTreeStructure origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-        FUN DEFAULT_PROPERTY_ACCESSOR name:<get-tree> visibility:public modality:FINAL <> ($this:<root>.FirModifier.FirLightModifier) returnType:<root>.FlyweightCapableTreeStructure
-          correspondingProperty: PROPERTY name:tree visibility:public modality:FINAL [val]
-          $this: VALUE_PARAMETER name:<this> type:<root>.FirModifier.FirLightModifier
-          BLOCK_BODY
-            RETURN type=kotlin.Nothing from='public final fun <get-tree> (): <root>.FlyweightCapableTreeStructure declared in <root>.FirModifier.FirLightModifier'
-              GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:tree type:<root>.FlyweightCapableTreeStructure visibility:private [final]' type=<root>.FlyweightCapableTreeStructure origin=null
-                receiver: GET_VAR '<this>: <root>.FirModifier.FirLightModifier declared in <root>.FirModifier.FirLightModifier.<get-tree>' type=<root>.FirModifier.FirLightModifier origin=null
       PROPERTY FAKE_OVERRIDE name:node visibility:public modality:FINAL [fake_override,val]
         overridden:
           public final node: Node of <root>.FirModifier
@@ -483,6 +149,17 @@ FILE fqName:<root> fileName:/kt44814.kt
           overridden:
             public final fun <get-token> (): <root>.KtModifierKeywordToken declared in <root>.FirModifier
           $this: VALUE_PARAMETER name:<this> type:<root>.FirModifier<<root>.LighterASTNode>
+    CLASS CLASS name:FirPsiModifier modality:FINAL visibility:public superTypes:[<root>.FirModifier<<root>.ASTNode>]
+      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirModifier.FirPsiModifier
+      CONSTRUCTOR visibility:public <> (node:<root>.ASTNode, token:<root>.KtModifierKeywordToken) returnType:<root>.FirModifier.FirPsiModifier [primary]
+        VALUE_PARAMETER name:node index:0 type:<root>.ASTNode
+        VALUE_PARAMETER name:token index:1 type:<root>.KtModifierKeywordToken
+        BLOCK_BODY
+          DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> (node: Node of <root>.FirModifier, token: <root>.KtModifierKeywordToken) declared in <root>.FirModifier'
+            <Node>: <root>.ASTNode
+            node: GET_VAR 'node: <root>.ASTNode declared in <root>.FirModifier.FirPsiModifier.<init>' type=<root>.ASTNode origin=null
+            token: GET_VAR 'token: <root>.KtModifierKeywordToken declared in <root>.FirModifier.FirPsiModifier.<init>' type=<root>.KtModifierKeywordToken origin=null
+          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirPsiModifier modality:FINAL visibility:public superTypes:[<root>.FirModifier<<root>.ASTNode>]'
       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 <root>.FirModifier
@@ -496,6 +173,28 @@ FILE fqName:<root> fileName:/kt44814.kt
         overridden:
           public open fun toString (): kotlin.String declared in <root>.FirModifier
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      PROPERTY FAKE_OVERRIDE name:node visibility:public modality:FINAL [fake_override,val]
+        overridden:
+          public final node: Node of <root>.FirModifier
+        FUN FAKE_OVERRIDE name:<get-node> visibility:public modality:FINAL <> ($this:<root>.FirModifier<<root>.ASTNode>) returnType:<root>.ASTNode [fake_override]
+          correspondingProperty: PROPERTY FAKE_OVERRIDE name:node visibility:public modality:FINAL [fake_override,val]
+          overridden:
+            public final fun <get-node> (): Node of <root>.FirModifier declared in <root>.FirModifier
+          $this: VALUE_PARAMETER name:<this> type:<root>.FirModifier<<root>.ASTNode>
+      PROPERTY FAKE_OVERRIDE name:token visibility:public modality:FINAL [fake_override,val]
+        overridden:
+          public final token: <root>.KtModifierKeywordToken
+        FUN FAKE_OVERRIDE name:<get-token> visibility:public modality:FINAL <> ($this:<root>.FirModifier<<root>.ASTNode>) returnType:<root>.KtModifierKeywordToken [fake_override]
+          correspondingProperty: PROPERTY FAKE_OVERRIDE name:token visibility:public modality:FINAL [fake_override,val]
+          overridden:
+            public final fun <get-token> (): <root>.KtModifierKeywordToken declared in <root>.FirModifier
+          $this: VALUE_PARAMETER name:<this> type:<root>.FirModifier<<root>.ASTNode>
+    CONSTRUCTOR visibility:protected <> (node:Node of <root>.FirModifier, token:<root>.KtModifierKeywordToken) returnType:<root>.FirModifier<Node of <root>.FirModifier> [primary]
+      VALUE_PARAMETER name:node index:0 type:Node of <root>.FirModifier
+      VALUE_PARAMETER name:token index:1 type:<root>.KtModifierKeywordToken
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirModifier modality:SEALED visibility:internal 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
@@ -514,10 +213,6 @@ FILE fqName:<root> fileName:/kt44814.kt
       CLASS CLASS name:FirLightModifierList modality:FINAL visibility:public superTypes:[<root>.FirModifierList]
       CLASS CLASS name:FirPsiModifierList modality:FINAL visibility:public superTypes:[<root>.FirModifierList]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirModifierList
-    CONSTRUCTOR visibility:protected <> () returnType:<root>.FirModifierList [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirModifierList modality:SEALED visibility:internal superTypes:[kotlin.Any]'
     PROPERTY name:modifiers visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:modifiers type:kotlin.collections.List<<root>.FirModifier<*>> visibility:private [final]
         EXPRESSION_BODY
@@ -530,53 +225,8 @@ FILE fqName:<root> fileName:/kt44814.kt
           RETURN type=kotlin.Nothing from='public final fun <get-modifiers> (): kotlin.collections.List<<root>.FirModifier<*>> declared in <root>.FirModifierList'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:modifiers type:kotlin.collections.List<<root>.FirModifier<*>> visibility:private [final]' type=kotlin.collections.List<<root>.FirModifier<*>> origin=null
               receiver: GET_VAR '<this>: <root>.FirModifierList declared in <root>.FirModifierList.<get-modifiers>' type=<root>.FirModifierList origin=null
-    CLASS CLASS name:FirPsiModifierList modality:FINAL visibility:public superTypes:[<root>.FirModifierList]
-      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirModifierList.FirPsiModifierList
-      CONSTRUCTOR visibility:public <> (modifierList:<root>.KtModifierList) returnType:<root>.FirModifierList.FirPsiModifierList [primary]
-        VALUE_PARAMETER name:modifierList index:0 type:<root>.KtModifierList
-        BLOCK_BODY
-          DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.FirModifierList'
-          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirPsiModifierList modality:FINAL visibility:public superTypes:[<root>.FirModifierList]'
-      PROPERTY name:modifierList visibility:public modality:FINAL [val]
-        FIELD PROPERTY_BACKING_FIELD name:modifierList type:<root>.KtModifierList visibility:private [final]
-          EXPRESSION_BODY
-            GET_VAR 'modifierList: <root>.KtModifierList declared in <root>.FirModifierList.FirPsiModifierList.<init>' type=<root>.KtModifierList origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-        FUN DEFAULT_PROPERTY_ACCESSOR name:<get-modifierList> visibility:public modality:FINAL <> ($this:<root>.FirModifierList.FirPsiModifierList) returnType:<root>.KtModifierList
-          correspondingProperty: PROPERTY name:modifierList visibility:public modality:FINAL [val]
-          $this: VALUE_PARAMETER name:<this> type:<root>.FirModifierList.FirPsiModifierList
-          BLOCK_BODY
-            RETURN type=kotlin.Nothing from='public final fun <get-modifierList> (): <root>.KtModifierList declared in <root>.FirModifierList.FirPsiModifierList'
-              GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:modifierList type:<root>.KtModifierList visibility:private [final]' type=<root>.KtModifierList origin=null
-                receiver: GET_VAR '<this>: <root>.FirModifierList.FirPsiModifierList declared in <root>.FirModifierList.FirPsiModifierList.<get-modifierList>' type=<root>.FirModifierList.FirPsiModifierList origin=null
-      PROPERTY FAKE_OVERRIDE name:modifiers visibility:public modality:FINAL [fake_override,val]
-        overridden:
-          public final modifiers: kotlin.collections.List<<root>.FirModifier<*>>
-        FUN FAKE_OVERRIDE name:<get-modifiers> visibility:public modality:FINAL <> ($this:<root>.FirModifierList) returnType:kotlin.collections.List<<root>.FirModifier<*>> [fake_override]
-          correspondingProperty: PROPERTY FAKE_OVERRIDE name:modifiers visibility:public modality:FINAL [fake_override,val]
-          overridden:
-            public final fun <get-modifiers> (): kotlin.collections.List<<root>.FirModifier<*>> declared in <root>.FirModifierList
-          $this: VALUE_PARAMETER name:<this> type:<root>.FirModifierList
-      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 <root>.FirModifierList
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-        VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-        overridden:
-          public open fun hashCode (): kotlin.Int declared in <root>.FirModifierList
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-        overridden:
-          public open fun toString (): kotlin.String declared in <root>.FirModifierList
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     CLASS CLASS name:FirLightModifierList modality:FINAL visibility:public superTypes:[<root>.FirModifierList]
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirModifierList.FirLightModifierList
-      CONSTRUCTOR visibility:public <> (modifierList:<root>.LighterASTNode, tree:<root>.FlyweightCapableTreeStructure) returnType:<root>.FirModifierList.FirLightModifierList [primary]
-        VALUE_PARAMETER name:modifierList index:0 type:<root>.LighterASTNode
-        VALUE_PARAMETER name:tree index:1 type:<root>.FlyweightCapableTreeStructure
-        BLOCK_BODY
-          DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.FirModifierList'
-          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirLightModifierList modality:FINAL visibility:public superTypes:[<root>.FirModifierList]'
       PROPERTY name:modifierList visibility:public modality:FINAL [val]
         FIELD PROPERTY_BACKING_FIELD name:modifierList type:<root>.LighterASTNode visibility:private [final]
           EXPRESSION_BODY
@@ -599,14 +249,12 @@ FILE fqName:<root> fileName:/kt44814.kt
             RETURN type=kotlin.Nothing from='public final fun <get-tree> (): <root>.FlyweightCapableTreeStructure declared in <root>.FirModifierList.FirLightModifierList'
               GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:tree type:<root>.FlyweightCapableTreeStructure visibility:private [final]' type=<root>.FlyweightCapableTreeStructure origin=null
                 receiver: GET_VAR '<this>: <root>.FirModifierList.FirLightModifierList declared in <root>.FirModifierList.FirLightModifierList.<get-tree>' type=<root>.FirModifierList.FirLightModifierList origin=null
-      PROPERTY FAKE_OVERRIDE name:modifiers visibility:public modality:FINAL [fake_override,val]
-        overridden:
-          public final modifiers: kotlin.collections.List<<root>.FirModifier<*>>
-        FUN FAKE_OVERRIDE name:<get-modifiers> visibility:public modality:FINAL <> ($this:<root>.FirModifierList) returnType:kotlin.collections.List<<root>.FirModifier<*>> [fake_override]
-          correspondingProperty: PROPERTY FAKE_OVERRIDE name:modifiers visibility:public modality:FINAL [fake_override,val]
-          overridden:
-            public final fun <get-modifiers> (): kotlin.collections.List<<root>.FirModifier<*>> declared in <root>.FirModifierList
-          $this: VALUE_PARAMETER name:<this> type:<root>.FirModifierList
+      CONSTRUCTOR visibility:public <> (modifierList:<root>.LighterASTNode, tree:<root>.FlyweightCapableTreeStructure) returnType:<root>.FirModifierList.FirLightModifierList [primary]
+        VALUE_PARAMETER name:modifierList index:0 type:<root>.LighterASTNode
+        VALUE_PARAMETER name:tree index:1 type:<root>.FlyweightCapableTreeStructure
+        BLOCK_BODY
+          DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.FirModifierList'
+          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirLightModifierList modality:FINAL visibility:public superTypes:[<root>.FirModifierList]'
       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 <root>.FirModifierList
@@ -620,12 +268,95 @@ FILE fqName:<root> fileName:/kt44814.kt
         overridden:
           public open fun toString (): kotlin.String declared in <root>.FirModifierList
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      PROPERTY FAKE_OVERRIDE name:modifiers visibility:public modality:FINAL [fake_override,val]
+        overridden:
+          public final modifiers: kotlin.collections.List<<root>.FirModifier<*>>
+        FUN FAKE_OVERRIDE name:<get-modifiers> visibility:public modality:FINAL <> ($this:<root>.FirModifierList) returnType:kotlin.collections.List<<root>.FirModifier<*>> [fake_override]
+          correspondingProperty: PROPERTY FAKE_OVERRIDE name:modifiers visibility:public modality:FINAL [fake_override,val]
+          overridden:
+            public final fun <get-modifiers> (): kotlin.collections.List<<root>.FirModifier<*>> declared in <root>.FirModifierList
+          $this: VALUE_PARAMETER name:<this> type:<root>.FirModifierList
+    CLASS CLASS name:FirPsiModifierList modality:FINAL visibility:public superTypes:[<root>.FirModifierList]
+      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirModifierList.FirPsiModifierList
+      PROPERTY name:modifierList visibility:public modality:FINAL [val]
+        FIELD PROPERTY_BACKING_FIELD name:modifierList type:<root>.KtModifierList visibility:private [final]
+          EXPRESSION_BODY
+            GET_VAR 'modifierList: <root>.KtModifierList declared in <root>.FirModifierList.FirPsiModifierList.<init>' type=<root>.KtModifierList origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+        FUN DEFAULT_PROPERTY_ACCESSOR name:<get-modifierList> visibility:public modality:FINAL <> ($this:<root>.FirModifierList.FirPsiModifierList) returnType:<root>.KtModifierList
+          correspondingProperty: PROPERTY name:modifierList visibility:public modality:FINAL [val]
+          $this: VALUE_PARAMETER name:<this> type:<root>.FirModifierList.FirPsiModifierList
+          BLOCK_BODY
+            RETURN type=kotlin.Nothing from='public final fun <get-modifierList> (): <root>.KtModifierList declared in <root>.FirModifierList.FirPsiModifierList'
+              GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:modifierList type:<root>.KtModifierList visibility:private [final]' type=<root>.KtModifierList origin=null
+                receiver: GET_VAR '<this>: <root>.FirModifierList.FirPsiModifierList declared in <root>.FirModifierList.FirPsiModifierList.<get-modifierList>' type=<root>.FirModifierList.FirPsiModifierList origin=null
+      CONSTRUCTOR visibility:public <> (modifierList:<root>.KtModifierList) returnType:<root>.FirModifierList.FirPsiModifierList [primary]
+        VALUE_PARAMETER name:modifierList index:0 type:<root>.KtModifierList
+        BLOCK_BODY
+          DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.FirModifierList'
+          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirPsiModifierList modality:FINAL visibility:public superTypes:[<root>.FirModifierList]'
+      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 <root>.FirModifierList
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+        VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+      FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+        overridden:
+          public open fun hashCode (): kotlin.Int declared in <root>.FirModifierList
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+        overridden:
+          public open fun toString (): kotlin.String declared in <root>.FirModifierList
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      PROPERTY FAKE_OVERRIDE name:modifiers visibility:public modality:FINAL [fake_override,val]
+        overridden:
+          public final modifiers: kotlin.collections.List<<root>.FirModifier<*>>
+        FUN FAKE_OVERRIDE name:<get-modifiers> visibility:public modality:FINAL <> ($this:<root>.FirModifierList) returnType:kotlin.collections.List<<root>.FirModifier<*>> [fake_override]
+          correspondingProperty: PROPERTY FAKE_OVERRIDE name:modifiers visibility:public modality:FINAL [fake_override,val]
+          overridden:
+            public final fun <get-modifiers> (): kotlin.collections.List<<root>.FirModifier<*>> declared in <root>.FirModifierList
+          $this: VALUE_PARAMETER name:<this> type:<root>.FirModifierList
     CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirModifierList.Companion
       CONSTRUCTOR visibility:private <> () returnType:<root>.FirModifierList.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 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
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+        VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+      FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+        overridden:
+          public open fun hashCode (): kotlin.Int declared in kotlin.Any
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+        overridden:
+          public open fun toString (): kotlin.String declared in kotlin.Any
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      FUN name:boxImpl visibility:public modality:FINAL <> ($this:<root>.FirModifierList.Companion) returnType:kotlin.String
+        $this: VALUE_PARAMETER name:<this> type:<root>.FirModifierList.Companion
+        BLOCK_BODY
+          VAR name:sourceElement type:<root>.FirSourceElement? [val]
+            CONSTRUCTOR_CALL 'public constructor <init> (lighterASTNode: <root>.LighterASTNode, treeStructure: <root>.FlyweightCapableTreeStructure) declared in <root>.FirLightSourceElement' type=<root>.FirLightSourceElement origin=null
+              lighterASTNode: CONSTRUCTOR_CALL 'public constructor <init> (_children: kotlin.collections.List<<root>.LighterASTNode?>) declared in <root>.LighterASTNode' type=<root>.LighterASTNode origin=null
+                _children: CALL 'public final fun listOf <T> (element: T of kotlin.collections.listOf): kotlin.collections.List<T of kotlin.collections.listOf> declared in kotlin.collections' type=kotlin.collections.List<<root>.LighterASTNode> origin=null
+                  <T>: <root>.LighterASTNode
+                  element: CONSTRUCTOR_CALL 'public constructor <init> (_children: kotlin.collections.List<<root>.LighterASTNode?>) declared in <root>.LighterASTNode' type=<root>.LighterASTNode origin=null
+              treeStructure: CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.FlyweightCapableTreeStructure' type=<root>.FlyweightCapableTreeStructure origin=null
+          VAR name:result type:<root>.FirModifierList? [val]
+            CALL 'public final fun getModifierList (): <root>.FirModifierList? declared in <root>.FirModifierList.Companion' type=<root>.FirModifierList? origin=null
+              $this: GET_VAR '<this>: <root>.FirModifierList.Companion declared in <root>.FirModifierList.Companion.boxImpl' type=<root>.FirModifierList.Companion origin=null
+              $receiver: GET_VAR 'val sourceElement: <root>.FirSourceElement? declared in <root>.FirModifierList.Companion.boxImpl' type=<root>.FirSourceElement? origin=null
+          RETURN type=kotlin.Nothing from='public final fun boxImpl (): kotlin.String declared in <root>.FirModifierList.Companion'
+            WHEN type=kotlin.String origin=IF
+              BRANCH
+                if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=<root>.FirModifierList.FirLightModifierList
+                  GET_VAR 'val result: <root>.FirModifierList? declared in <root>.FirModifierList.Companion.boxImpl' type=<root>.FirModifierList? origin=null
+                then: CONST String type=kotlin.String value="OK"
+              BRANCH
+                if: CONST Boolean type=kotlin.Boolean value=true
+                then: CONST String type=kotlin.String value="Fail"
       FUN name:getModifierList visibility:public modality:FINAL <> ($this:<root>.FirModifierList.Companion, $receiver:<root>.FirSourceElement?) returnType:<root>.FirModifierList?
         $this: VALUE_PARAMETER name:<this> type:<root>.FirModifierList.Companion
         $receiver: VALUE_PARAMETER name:<this> type:<root>.FirSourceElement?
@@ -735,29 +466,294 @@ FILE fqName:<root> fileName:/kt44814.kt
                 BRANCH
                   if: CONST Boolean type=kotlin.Boolean value=true
                   then: CALL 'public final fun noWhenBranchMatchedException (): kotlin.Nothing declared in kotlin.internal.ir' type=kotlin.Nothing origin=null
-      FUN name:boxImpl visibility:public modality:FINAL <> ($this:<root>.FirModifierList.Companion) returnType:kotlin.String
-        $this: VALUE_PARAMETER name:<this> type:<root>.FirModifierList.Companion
+    CONSTRUCTOR visibility:protected <> () returnType:<root>.FirModifierList [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirModifierList modality:SEALED visibility:internal 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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:FirPsiSourceElement modality:FINAL visibility:public superTypes:[<root>.FirSourceElement]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirPsiSourceElement
+    PROPERTY name:psi visibility:public modality:FINAL [val]
+      FIELD PROPERTY_BACKING_FIELD name:psi type:<root>.PsiElement visibility:private [final]
+        EXPRESSION_BODY
+          GET_VAR 'psi: <root>.PsiElement declared in <root>.FirPsiSourceElement.<init>' type=<root>.PsiElement origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-psi> visibility:public modality:FINAL <> ($this:<root>.FirPsiSourceElement) returnType:<root>.PsiElement
+        correspondingProperty: PROPERTY name:psi visibility:public modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.FirPsiSourceElement
         BLOCK_BODY
-          VAR name:sourceElement type:<root>.FirSourceElement? [val]
-            CONSTRUCTOR_CALL 'public constructor <init> (lighterASTNode: <root>.LighterASTNode, treeStructure: <root>.FlyweightCapableTreeStructure) declared in <root>.FirLightSourceElement' type=<root>.FirLightSourceElement origin=null
-              lighterASTNode: CONSTRUCTOR_CALL 'public constructor <init> (_children: kotlin.collections.List<<root>.LighterASTNode?>) declared in <root>.LighterASTNode' type=<root>.LighterASTNode origin=null
-                _children: CALL 'public final fun listOf <T> (element: T of kotlin.collections.listOf): kotlin.collections.List<T of kotlin.collections.listOf> declared in kotlin.collections' type=kotlin.collections.List<<root>.LighterASTNode> origin=null
-                  <T>: <root>.LighterASTNode
-                  element: CONSTRUCTOR_CALL 'public constructor <init> (_children: kotlin.collections.List<<root>.LighterASTNode?>) declared in <root>.LighterASTNode' type=<root>.LighterASTNode origin=null
-              treeStructure: CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.FlyweightCapableTreeStructure' type=<root>.FlyweightCapableTreeStructure origin=null
-          VAR name:result type:<root>.FirModifierList? [val]
-            CALL 'public final fun getModifierList (): <root>.FirModifierList? declared in <root>.FirModifierList.Companion' type=<root>.FirModifierList? origin=null
-              $this: GET_VAR '<this>: <root>.FirModifierList.Companion declared in <root>.FirModifierList.Companion.boxImpl' type=<root>.FirModifierList.Companion origin=null
-              $receiver: GET_VAR 'val sourceElement: <root>.FirSourceElement? declared in <root>.FirModifierList.Companion.boxImpl' type=<root>.FirSourceElement? origin=null
-          RETURN type=kotlin.Nothing from='public final fun boxImpl (): kotlin.String declared in <root>.FirModifierList.Companion'
-            WHEN type=kotlin.String origin=IF
-              BRANCH
-                if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=<root>.FirModifierList.FirLightModifierList
-                  GET_VAR 'val result: <root>.FirModifierList? declared in <root>.FirModifierList.Companion.boxImpl' type=<root>.FirModifierList? origin=null
-                then: CONST String type=kotlin.String value="OK"
-              BRANCH
-                if: CONST Boolean type=kotlin.Boolean value=true
-                then: CONST String type=kotlin.String value="Fail"
+          RETURN type=kotlin.Nothing from='public final fun <get-psi> (): <root>.PsiElement declared in <root>.FirPsiSourceElement'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:psi type:<root>.PsiElement visibility:private [final]' type=<root>.PsiElement origin=null
+              receiver: GET_VAR '<this>: <root>.FirPsiSourceElement declared in <root>.FirPsiSourceElement.<get-psi>' type=<root>.FirPsiSourceElement origin=null
+    PROPERTY name:lighterASTNode visibility:public modality:OPEN [val]
+      overridden:
+        public abstract lighterASTNode: <root>.LighterASTNode
+      FIELD PROPERTY_BACKING_FIELD name:lighterASTNode type:<root>.LighterASTNode visibility:private [final]
+        EXPRESSION_BODY
+          GET_VAR 'lighterASTNode: <root>.LighterASTNode declared in <root>.FirPsiSourceElement.<init>' type=<root>.LighterASTNode origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-lighterASTNode> visibility:public modality:OPEN <> ($this:<root>.FirPsiSourceElement) returnType:<root>.LighterASTNode
+        correspondingProperty: PROPERTY name:lighterASTNode visibility:public modality:OPEN [val]
+        overridden:
+          public abstract fun <get-lighterASTNode> (): <root>.LighterASTNode declared in <root>.FirSourceElement
+        $this: VALUE_PARAMETER name:<this> type:<root>.FirPsiSourceElement
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-lighterASTNode> (): <root>.LighterASTNode declared in <root>.FirPsiSourceElement'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:lighterASTNode type:<root>.LighterASTNode visibility:private [final]' type=<root>.LighterASTNode origin=null
+              receiver: GET_VAR '<this>: <root>.FirPsiSourceElement declared in <root>.FirPsiSourceElement.<get-lighterASTNode>' type=<root>.FirPsiSourceElement origin=null
+    PROPERTY name:treeStructure visibility:public modality:OPEN [val]
+      overridden:
+        public abstract treeStructure: <root>.FlyweightCapableTreeStructure
+      FIELD PROPERTY_BACKING_FIELD name:treeStructure type:<root>.FlyweightCapableTreeStructure visibility:private [final]
+        EXPRESSION_BODY
+          GET_VAR 'treeStructure: <root>.FlyweightCapableTreeStructure declared in <root>.FirPsiSourceElement.<init>' type=<root>.FlyweightCapableTreeStructure origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-treeStructure> visibility:public modality:OPEN <> ($this:<root>.FirPsiSourceElement) returnType:<root>.FlyweightCapableTreeStructure
+        correspondingProperty: PROPERTY name:treeStructure visibility:public modality:OPEN [val]
+        overridden:
+          public abstract fun <get-treeStructure> (): <root>.FlyweightCapableTreeStructure declared in <root>.FirSourceElement
+        $this: VALUE_PARAMETER name:<this> type:<root>.FirPsiSourceElement
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-treeStructure> (): <root>.FlyweightCapableTreeStructure declared in <root>.FirPsiSourceElement'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:treeStructure type:<root>.FlyweightCapableTreeStructure visibility:private [final]' type=<root>.FlyweightCapableTreeStructure origin=null
+              receiver: GET_VAR '<this>: <root>.FirPsiSourceElement declared in <root>.FirPsiSourceElement.<get-treeStructure>' type=<root>.FirPsiSourceElement origin=null
+    CONSTRUCTOR visibility:public <> (psi:<root>.PsiElement, lighterASTNode:<root>.LighterASTNode, treeStructure:<root>.FlyweightCapableTreeStructure) returnType:<root>.FirPsiSourceElement [primary]
+      VALUE_PARAMETER name:psi index:0 type:<root>.PsiElement
+      VALUE_PARAMETER name:lighterASTNode index:1 type:<root>.LighterASTNode
+      VALUE_PARAMETER name:treeStructure index:2 type:<root>.FlyweightCapableTreeStructure
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.FirSourceElement'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirPsiSourceElement modality:FINAL visibility:public superTypes:[<root>.FirSourceElement]'
+    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 <root>.FirSourceElement
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.FirSourceElement
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.FirSourceElement
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:FirSourceElement modality:SEALED visibility:public superTypes:[kotlin.Any]
+    sealedSubclasses:
+      CLASS CLASS name:FirLightSourceElement modality:FINAL visibility:public superTypes:[<root>.FirSourceElement]
+      CLASS CLASS name:FirPsiSourceElement modality:FINAL visibility:public superTypes:[<root>.FirSourceElement]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirSourceElement
+    CONSTRUCTOR visibility:protected <> () returnType:<root>.FirSourceElement [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirSourceElement modality:SEALED 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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    PROPERTY name:lighterASTNode visibility:public modality:ABSTRACT [val]
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-lighterASTNode> visibility:public modality:ABSTRACT <> ($this:<root>.FirSourceElement) returnType:<root>.LighterASTNode
+        correspondingProperty: PROPERTY name:lighterASTNode visibility:public modality:ABSTRACT [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.FirSourceElement
+    PROPERTY name:treeStructure visibility:public modality:ABSTRACT [val]
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-treeStructure> visibility:public modality:ABSTRACT <> ($this:<root>.FirSourceElement) returnType:<root>.FlyweightCapableTreeStructure
+        correspondingProperty: PROPERTY name:treeStructure visibility:public modality:ABSTRACT [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.FirSourceElement
+  CLASS CLASS name:FlyweightCapableTreeStructure modality:FINAL visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FlyweightCapableTreeStructure
+    CONSTRUCTOR visibility:public <> () returnType:<root>.FlyweightCapableTreeStructure [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FlyweightCapableTreeStructure 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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:KtModifierKeywordToken modality:FINAL visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.KtModifierKeywordToken
+    CONSTRUCTOR visibility:public <> () returnType:<root>.KtModifierKeywordToken [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:KtModifierKeywordToken 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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:KtModifierList modality:FINAL visibility:public superTypes:[<root>.PsiElement]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.KtModifierList
+    CONSTRUCTOR visibility:public <> () returnType:<root>.KtModifierList [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.PsiElement'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:KtModifierList modality:FINAL visibility:public superTypes:[<root>.PsiElement]'
+    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 <root>.PsiElement
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.PsiElement
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.PsiElement
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:KtModifierListOwner modality:FINAL visibility:public superTypes:[<root>.PsiElement]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.KtModifierListOwner
+    PROPERTY name:modifierList visibility:public modality:FINAL [val]
+      FIELD PROPERTY_BACKING_FIELD name:modifierList type:<root>.KtModifierList visibility:private [final]
+        EXPRESSION_BODY
+          CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.KtModifierList' type=<root>.KtModifierList origin=null
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-modifierList> visibility:public modality:FINAL <> ($this:<root>.KtModifierListOwner) returnType:<root>.KtModifierList
+        correspondingProperty: PROPERTY name:modifierList visibility:public modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.KtModifierListOwner
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-modifierList> (): <root>.KtModifierList declared in <root>.KtModifierListOwner'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:modifierList type:<root>.KtModifierList visibility:private [final]' type=<root>.KtModifierList origin=null
+              receiver: GET_VAR '<this>: <root>.KtModifierListOwner declared in <root>.KtModifierListOwner.<get-modifierList>' type=<root>.KtModifierListOwner origin=null
+    CONSTRUCTOR visibility:public <> () returnType:<root>.KtModifierListOwner [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.PsiElement'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:KtModifierListOwner modality:FINAL visibility:public superTypes:[<root>.PsiElement]'
+    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 <root>.PsiElement
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.PsiElement
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.PsiElement
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:LighterASTNode modality:FINAL visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.LighterASTNode
+    PROPERTY name:_children visibility:public modality:FINAL [val]
+      FIELD PROPERTY_BACKING_FIELD name:_children type:kotlin.collections.List<<root>.LighterASTNode?> visibility:private [final]
+        EXPRESSION_BODY
+          GET_VAR '_children: kotlin.collections.List<<root>.LighterASTNode?> declared in <root>.LighterASTNode.<init>' type=kotlin.collections.List<<root>.LighterASTNode?> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-_children> visibility:public modality:FINAL <> ($this:<root>.LighterASTNode) returnType:kotlin.collections.List<<root>.LighterASTNode?>
+        correspondingProperty: PROPERTY name:_children visibility:public modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.LighterASTNode
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-_children> (): kotlin.collections.List<<root>.LighterASTNode?> declared in <root>.LighterASTNode'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:_children type:kotlin.collections.List<<root>.LighterASTNode?> visibility:private [final]' type=kotlin.collections.List<<root>.LighterASTNode?> origin=null
+              receiver: GET_VAR '<this>: <root>.LighterASTNode declared in <root>.LighterASTNode.<get-_children>' type=<root>.LighterASTNode origin=null
+    PROPERTY name:tokenType visibility:public modality:FINAL [val]
+      FIELD PROPERTY_BACKING_FIELD name:tokenType type:<root>.TokenType visibility:private [final]
+        EXPRESSION_BODY
+          CALL 'public final fun <get-MODIFIER_LIST> (): <root>.TokenType declared in <root>.TokenType.Companion' type=<root>.TokenType origin=GET_PROPERTY
+            $this: GET_OBJECT 'CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=<root>.TokenType.Companion
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-tokenType> visibility:public modality:FINAL <> ($this:<root>.LighterASTNode) returnType:<root>.TokenType
+        correspondingProperty: PROPERTY name:tokenType visibility:public modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.LighterASTNode
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-tokenType> (): <root>.TokenType declared in <root>.LighterASTNode'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:tokenType type:<root>.TokenType visibility:private [final]' type=<root>.TokenType origin=null
+              receiver: GET_VAR '<this>: <root>.LighterASTNode declared in <root>.LighterASTNode.<get-tokenType>' type=<root>.LighterASTNode origin=null
+    CONSTRUCTOR visibility:public <> (_children:kotlin.collections.List<<root>.LighterASTNode?>) returnType:<root>.LighterASTNode [primary]
+      VALUE_PARAMETER name:_children index:0 type:kotlin.collections.List<<root>.LighterASTNode?>
+        EXPRESSION_BODY
+          CALL 'public final fun emptyList <T> (): kotlin.collections.List<T of kotlin.collections.emptyList> declared in kotlin.collections' type=kotlin.collections.List<<root>.LighterASTNode?> origin=null
+            <T>: <root>.LighterASTNode?
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:LighterASTNode 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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:getChildren visibility:public modality:FINAL <> ($this:<root>.LighterASTNode, treeStructure:<root>.FlyweightCapableTreeStructure) returnType:kotlin.collections.List<<root>.LighterASTNode?>
+      $this: VALUE_PARAMETER name:<this> type:<root>.LighterASTNode
+      VALUE_PARAMETER name:treeStructure index:0 type:<root>.FlyweightCapableTreeStructure
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun getChildren (treeStructure: <root>.FlyweightCapableTreeStructure): kotlin.collections.List<<root>.LighterASTNode?> declared in <root>.LighterASTNode'
+          CALL 'public final fun <get-_children> (): kotlin.collections.List<<root>.LighterASTNode?> declared in <root>.LighterASTNode' type=kotlin.collections.List<<root>.LighterASTNode?> origin=GET_PROPERTY
+            $this: GET_VAR '<this>: <root>.LighterASTNode declared in <root>.LighterASTNode.getChildren' type=<root>.LighterASTNode origin=null
+  CLASS CLASS name:PsiElement modality:OPEN visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.PsiElement
+    CONSTRUCTOR visibility:public <> () returnType:<root>.PsiElement [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:PsiElement modality:OPEN 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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:TokenType modality:FINAL visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TokenType
+    CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]
+      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TokenType.Companion
+      PROPERTY name:MODIFIER_LIST visibility:public modality:FINAL [val]
+        FIELD PROPERTY_BACKING_FIELD name:MODIFIER_LIST type:<root>.TokenType visibility:private [final]
+          EXPRESSION_BODY
+            CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.TokenType' type=<root>.TokenType origin=null
+        FUN DEFAULT_PROPERTY_ACCESSOR name:<get-MODIFIER_LIST> visibility:public modality:FINAL <> ($this:<root>.TokenType.Companion) returnType:<root>.TokenType
+          correspondingProperty: PROPERTY name:MODIFIER_LIST visibility:public modality:FINAL [val]
+          $this: VALUE_PARAMETER name:<this> type:<root>.TokenType.Companion
+          BLOCK_BODY
+            RETURN type=kotlin.Nothing from='public final fun <get-MODIFIER_LIST> (): <root>.TokenType declared in <root>.TokenType.Companion'
+              GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:MODIFIER_LIST type:<root>.TokenType visibility:private [final]' type=<root>.TokenType origin=null
+                receiver: GET_VAR '<this>: <root>.TokenType.Companion declared in <root>.TokenType.Companion.<get-MODIFIER_LIST>' type=<root>.TokenType.Companion origin=null
+      CONSTRUCTOR visibility:private <> () returnType:<root>.TokenType.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 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
@@ -771,6 +767,10 @@ FILE fqName:<root> fileName:/kt44814.kt
         overridden:
           public open fun toString (): kotlin.String declared in kotlin.Any
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    CONSTRUCTOR visibility:public <> () returnType:<root>.TokenType [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TokenType 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

compiler/testData/codegen/box/smartCasts/kt44814.ir.txt

@@ -1,10 +1,10 @@
 FILE fqName:<root> fileName:/kt44814.kt
-  CLASS CLASS name:FlyweightCapableTreeStructure modality:FINAL visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FlyweightCapableTreeStructure
-    CONSTRUCTOR visibility:public <> () returnType:<root>.FlyweightCapableTreeStructure [primary]
+  CLASS CLASS name:ASTNode modality:FINAL visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.ASTNode
+    CONSTRUCTOR visibility:public <> () returnType:<root>.ASTNode [primary]
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FlyweightCapableTreeStructure modality:FINAL visibility:public superTypes:[kotlin.Any]'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:ASTNode 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
@@ -18,107 +18,8 @@ FILE fqName:<root> fileName:/kt44814.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:FirSourceElement modality:SEALED visibility:public superTypes:[kotlin.Any]
-    sealedSubclasses:
-      CLASS CLASS name:FirLightSourceElement modality:FINAL visibility:public superTypes:[<root>.FirSourceElement]
-      CLASS CLASS name:FirPsiSourceElement modality:FINAL visibility:public superTypes:[<root>.FirSourceElement]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirSourceElement
-    CONSTRUCTOR visibility:protected <> () returnType:<root>.FirSourceElement [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirSourceElement modality:SEALED visibility:public superTypes:[kotlin.Any]'
-    PROPERTY name:lighterASTNode visibility:public modality:ABSTRACT [val]
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-lighterASTNode> visibility:public modality:ABSTRACT <> ($this:<root>.FirSourceElement) returnType:<root>.LighterASTNode
-        correspondingProperty: PROPERTY name:lighterASTNode visibility:public modality:ABSTRACT [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.FirSourceElement
-    PROPERTY name:treeStructure visibility:public modality:ABSTRACT [val]
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-treeStructure> visibility:public modality:ABSTRACT <> ($this:<root>.FirSourceElement) returnType:<root>.FlyweightCapableTreeStructure
-        correspondingProperty: PROPERTY name:treeStructure visibility:public modality:ABSTRACT [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.FirSourceElement
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:FirPsiSourceElement modality:FINAL visibility:public superTypes:[<root>.FirSourceElement]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirPsiSourceElement
-    CONSTRUCTOR visibility:public <> (psi:<root>.PsiElement, lighterASTNode:<root>.LighterASTNode, treeStructure:<root>.FlyweightCapableTreeStructure) returnType:<root>.FirPsiSourceElement [primary]
-      VALUE_PARAMETER name:psi index:0 type:<root>.PsiElement
-      VALUE_PARAMETER name:lighterASTNode index:1 type:<root>.LighterASTNode
-      VALUE_PARAMETER name:treeStructure index:2 type:<root>.FlyweightCapableTreeStructure
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.FirSourceElement'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirPsiSourceElement modality:FINAL visibility:public superTypes:[<root>.FirSourceElement]'
-    PROPERTY name:psi visibility:public modality:FINAL [val]
-      FIELD PROPERTY_BACKING_FIELD name:psi type:<root>.PsiElement visibility:private [final]
-        EXPRESSION_BODY
-          GET_VAR 'psi: <root>.PsiElement declared in <root>.FirPsiSourceElement.<init>' type=<root>.PsiElement origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-psi> visibility:public modality:FINAL <> ($this:<root>.FirPsiSourceElement) returnType:<root>.PsiElement
-        correspondingProperty: PROPERTY name:psi visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.FirPsiSourceElement
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-psi> (): <root>.PsiElement declared in <root>.FirPsiSourceElement'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:psi type:<root>.PsiElement visibility:private [final]' type=<root>.PsiElement origin=null
-              receiver: GET_VAR '<this>: <root>.FirPsiSourceElement declared in <root>.FirPsiSourceElement.<get-psi>' type=<root>.FirPsiSourceElement origin=null
-    PROPERTY name:lighterASTNode visibility:public modality:OPEN [val]
-      overridden:
-        public abstract lighterASTNode: <root>.LighterASTNode
-      FIELD PROPERTY_BACKING_FIELD name:lighterASTNode type:<root>.LighterASTNode visibility:private [final]
-        EXPRESSION_BODY
-          GET_VAR 'lighterASTNode: <root>.LighterASTNode declared in <root>.FirPsiSourceElement.<init>' type=<root>.LighterASTNode origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-lighterASTNode> visibility:public modality:OPEN <> ($this:<root>.FirPsiSourceElement) returnType:<root>.LighterASTNode
-        correspondingProperty: PROPERTY name:lighterASTNode visibility:public modality:OPEN [val]
-        overridden:
-          public abstract fun <get-lighterASTNode> (): <root>.LighterASTNode declared in <root>.FirSourceElement
-        $this: VALUE_PARAMETER name:<this> type:<root>.FirPsiSourceElement
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun <get-lighterASTNode> (): <root>.LighterASTNode declared in <root>.FirPsiSourceElement'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:lighterASTNode type:<root>.LighterASTNode visibility:private [final]' type=<root>.LighterASTNode origin=null
-              receiver: GET_VAR '<this>: <root>.FirPsiSourceElement declared in <root>.FirPsiSourceElement.<get-lighterASTNode>' type=<root>.FirPsiSourceElement origin=null
-    PROPERTY name:treeStructure visibility:public modality:OPEN [val]
-      overridden:
-        public abstract treeStructure: <root>.FlyweightCapableTreeStructure
-      FIELD PROPERTY_BACKING_FIELD name:treeStructure type:<root>.FlyweightCapableTreeStructure visibility:private [final]
-        EXPRESSION_BODY
-          GET_VAR 'treeStructure: <root>.FlyweightCapableTreeStructure declared in <root>.FirPsiSourceElement.<init>' type=<root>.FlyweightCapableTreeStructure origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-treeStructure> visibility:public modality:OPEN <> ($this:<root>.FirPsiSourceElement) returnType:<root>.FlyweightCapableTreeStructure
-        correspondingProperty: PROPERTY name:treeStructure visibility:public modality:OPEN [val]
-        overridden:
-          public abstract fun <get-treeStructure> (): <root>.FlyweightCapableTreeStructure declared in <root>.FirSourceElement
-        $this: VALUE_PARAMETER name:<this> type:<root>.FirPsiSourceElement
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun <get-treeStructure> (): <root>.FlyweightCapableTreeStructure declared in <root>.FirPsiSourceElement'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:treeStructure type:<root>.FlyweightCapableTreeStructure visibility:private [final]' type=<root>.FlyweightCapableTreeStructure origin=null
-              receiver: GET_VAR '<this>: <root>.FirPsiSourceElement declared in <root>.FirPsiSourceElement.<get-treeStructure>' type=<root>.FirPsiSourceElement 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 <root>.FirSourceElement
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.FirSourceElement
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.FirSourceElement
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:FirLightSourceElement modality:FINAL visibility:public superTypes:[<root>.FirSourceElement]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirLightSourceElement
-    CONSTRUCTOR visibility:public <> (lighterASTNode:<root>.LighterASTNode, treeStructure:<root>.FlyweightCapableTreeStructure) returnType:<root>.FirLightSourceElement [primary]
-      VALUE_PARAMETER name:lighterASTNode index:0 type:<root>.LighterASTNode
-      VALUE_PARAMETER name:treeStructure index:1 type:<root>.FlyweightCapableTreeStructure
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.FirSourceElement'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirLightSourceElement modality:FINAL visibility:public superTypes:[<root>.FirSourceElement]'
     PROPERTY name:lighterASTNode visibility:public modality:OPEN [val]
       overridden:
         public abstract lighterASTNode: <root>.LighterASTNode
@@ -149,6 +50,12 @@ FILE fqName:<root> fileName:/kt44814.kt
           RETURN type=kotlin.Nothing from='public open fun <get-treeStructure> (): <root>.FlyweightCapableTreeStructure declared in <root>.FirLightSourceElement'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:treeStructure type:<root>.FlyweightCapableTreeStructure visibility:private [final]' type=<root>.FlyweightCapableTreeStructure origin=null
               receiver: GET_VAR '<this>: <root>.FirLightSourceElement declared in <root>.FirLightSourceElement.<get-treeStructure>' type=<root>.FirLightSourceElement origin=null
+    CONSTRUCTOR visibility:public <> (lighterASTNode:<root>.LighterASTNode, treeStructure:<root>.FlyweightCapableTreeStructure) returnType:<root>.FirLightSourceElement [primary]
+      VALUE_PARAMETER name:lighterASTNode index:0 type:<root>.LighterASTNode
+      VALUE_PARAMETER name:treeStructure index:1 type:<root>.FlyweightCapableTreeStructure
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.FirSourceElement'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirLightSourceElement modality:FINAL visibility:public superTypes:[<root>.FirSourceElement]'
     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 <root>.FirSourceElement
@@ -162,226 +69,12 @@ FILE fqName:<root> fileName:/kt44814.kt
       overridden:
         public open fun toString (): kotlin.String declared in <root>.FirSourceElement
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:PsiElement modality:OPEN visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.PsiElement
-    CONSTRUCTOR visibility:public <> () returnType:<root>.PsiElement [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:PsiElement modality:OPEN 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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:ASTNode modality:FINAL visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.ASTNode
-    CONSTRUCTOR visibility:public <> () returnType:<root>.ASTNode [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:ASTNode 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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:LighterASTNode modality:FINAL visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.LighterASTNode
-    CONSTRUCTOR visibility:public <> (_children:kotlin.collections.List<<root>.LighterASTNode?>) returnType:<root>.LighterASTNode [primary]
-      VALUE_PARAMETER name:_children index:0 type:kotlin.collections.List<<root>.LighterASTNode?>
-        EXPRESSION_BODY
-          CALL 'public final fun emptyList <T> (): kotlin.collections.List<T of kotlin.collections.emptyList> declared in kotlin.collections' type=kotlin.collections.List<<root>.LighterASTNode?> origin=null
-            <T>: <root>.LighterASTNode?
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:LighterASTNode modality:FINAL visibility:public superTypes:[kotlin.Any]'
-    PROPERTY name:_children visibility:public modality:FINAL [val]
-      FIELD PROPERTY_BACKING_FIELD name:_children type:kotlin.collections.List<<root>.LighterASTNode?> visibility:private [final]
-        EXPRESSION_BODY
-          GET_VAR '_children: kotlin.collections.List<<root>.LighterASTNode?> declared in <root>.LighterASTNode.<init>' type=kotlin.collections.List<<root>.LighterASTNode?> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-_children> visibility:public modality:FINAL <> ($this:<root>.LighterASTNode) returnType:kotlin.collections.List<<root>.LighterASTNode?>
-        correspondingProperty: PROPERTY name:_children visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.LighterASTNode
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-_children> (): kotlin.collections.List<<root>.LighterASTNode?> declared in <root>.LighterASTNode'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:_children type:kotlin.collections.List<<root>.LighterASTNode?> visibility:private [final]' type=kotlin.collections.List<<root>.LighterASTNode?> origin=null
-              receiver: GET_VAR '<this>: <root>.LighterASTNode declared in <root>.LighterASTNode.<get-_children>' type=<root>.LighterASTNode origin=null
-    FUN name:getChildren visibility:public modality:FINAL <> ($this:<root>.LighterASTNode, treeStructure:<root>.FlyweightCapableTreeStructure) returnType:kotlin.collections.List<<root>.LighterASTNode?>
-      $this: VALUE_PARAMETER name:<this> type:<root>.LighterASTNode
-      VALUE_PARAMETER name:treeStructure index:0 type:<root>.FlyweightCapableTreeStructure
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun getChildren (treeStructure: <root>.FlyweightCapableTreeStructure): kotlin.collections.List<<root>.LighterASTNode?> declared in <root>.LighterASTNode'
-          CALL 'public final fun <get-_children> (): kotlin.collections.List<<root>.LighterASTNode?> declared in <root>.LighterASTNode' type=kotlin.collections.List<<root>.LighterASTNode?> origin=GET_PROPERTY
-            $this: GET_VAR '<this>: <root>.LighterASTNode declared in <root>.LighterASTNode.getChildren' type=<root>.LighterASTNode origin=null
-    PROPERTY name:tokenType visibility:public modality:FINAL [val]
-      FIELD PROPERTY_BACKING_FIELD name:tokenType type:<root>.TokenType visibility:private [final]
-        EXPRESSION_BODY
-          CALL 'public final fun <get-MODIFIER_LIST> (): <root>.TokenType declared in <root>.TokenType.Companion' type=<root>.TokenType origin=GET_PROPERTY
-            $this: GET_OBJECT 'CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=<root>.TokenType.Companion
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-tokenType> visibility:public modality:FINAL <> ($this:<root>.LighterASTNode) returnType:<root>.TokenType
-        correspondingProperty: PROPERTY name:tokenType visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.LighterASTNode
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-tokenType> (): <root>.TokenType declared in <root>.LighterASTNode'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:tokenType type:<root>.TokenType visibility:private [final]' type=<root>.TokenType origin=null
-              receiver: GET_VAR '<this>: <root>.LighterASTNode declared in <root>.LighterASTNode.<get-tokenType>' type=<root>.LighterASTNode 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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:TokenType modality:FINAL visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TokenType
-    CONSTRUCTOR visibility:public <> () returnType:<root>.TokenType [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TokenType modality:FINAL visibility:public superTypes:[kotlin.Any]'
-    CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]
-      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TokenType.Companion
-      CONSTRUCTOR visibility:private <> () returnType:<root>.TokenType.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]'
-      PROPERTY name:MODIFIER_LIST visibility:public modality:FINAL [val]
-        FIELD PROPERTY_BACKING_FIELD name:MODIFIER_LIST type:<root>.TokenType visibility:private [final]
-          EXPRESSION_BODY
-            CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.TokenType' type=<root>.TokenType origin=null
-        FUN DEFAULT_PROPERTY_ACCESSOR name:<get-MODIFIER_LIST> visibility:public modality:FINAL <> ($this:<root>.TokenType.Companion) returnType:<root>.TokenType
-          correspondingProperty: PROPERTY name:MODIFIER_LIST visibility:public modality:FINAL [val]
-          $this: VALUE_PARAMETER name:<this> type:<root>.TokenType.Companion
-          BLOCK_BODY
-            RETURN type=kotlin.Nothing from='public final fun <get-MODIFIER_LIST> (): <root>.TokenType declared in <root>.TokenType.Companion'
-              GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:MODIFIER_LIST type:<root>.TokenType visibility:private [final]' type=<root>.TokenType origin=null
-                receiver: GET_VAR '<this>: <root>.TokenType.Companion declared in <root>.TokenType.Companion.<get-MODIFIER_LIST>' type=<root>.TokenType.Companion 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
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-        VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-        overridden:
-          public open fun hashCode (): kotlin.Int declared in kotlin.Any
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-        overridden:
-          public open fun toString (): kotlin.String declared in kotlin.Any
-        $this: VALUE_PARAMETER name:<this> type: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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:KtModifierKeywordToken modality:FINAL visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.KtModifierKeywordToken
-    CONSTRUCTOR visibility:public <> () returnType:<root>.KtModifierKeywordToken [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:KtModifierKeywordToken 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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:KtModifierList modality:FINAL visibility:public superTypes:[<root>.PsiElement]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.KtModifierList
-    CONSTRUCTOR visibility:public <> () returnType:<root>.KtModifierList [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.PsiElement'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:KtModifierList modality:FINAL visibility:public superTypes:[<root>.PsiElement]'
-    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 <root>.PsiElement
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.PsiElement
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.PsiElement
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:KtModifierListOwner modality:FINAL visibility:public superTypes:[<root>.PsiElement]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.KtModifierListOwner
-    CONSTRUCTOR visibility:public <> () returnType:<root>.KtModifierListOwner [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.PsiElement'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:KtModifierListOwner modality:FINAL visibility:public superTypes:[<root>.PsiElement]'
-    PROPERTY name:modifierList visibility:public modality:FINAL [val]
-      FIELD PROPERTY_BACKING_FIELD name:modifierList type:<root>.KtModifierList visibility:private [final]
-        EXPRESSION_BODY
-          CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.KtModifierList' type=<root>.KtModifierList origin=null
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-modifierList> visibility:public modality:FINAL <> ($this:<root>.KtModifierListOwner) returnType:<root>.KtModifierList
-        correspondingProperty: PROPERTY name:modifierList visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.KtModifierListOwner
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-modifierList> (): <root>.KtModifierList declared in <root>.KtModifierListOwner'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:modifierList type:<root>.KtModifierList visibility:private [final]' type=<root>.KtModifierList origin=null
-              receiver: GET_VAR '<this>: <root>.KtModifierListOwner declared in <root>.KtModifierListOwner.<get-modifierList>' type=<root>.KtModifierListOwner 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 <root>.PsiElement
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.PsiElement
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.PsiElement
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:FirModifier modality:SEALED visibility:internal superTypes:[kotlin.Any]
     sealedSubclasses:
       CLASS CLASS name:FirLightModifier modality:FINAL visibility:public superTypes:[<root>.FirModifier<<root>.LighterASTNode>]
       CLASS CLASS name:FirPsiModifier modality:FINAL visibility:public superTypes:[<root>.FirModifier<<root>.ASTNode>]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirModifier<Node of <root>.FirModifier>
     TYPE_PARAMETER name:Node index:0 variance: superTypes:[kotlin.Any] reified:false
-    CONSTRUCTOR visibility:protected <> (node:Node of <root>.FirModifier, token:<root>.KtModifierKeywordToken) returnType:<root>.FirModifier<Node of <root>.FirModifier> [primary]
-      VALUE_PARAMETER name:node index:0 type:Node of <root>.FirModifier
-      VALUE_PARAMETER name:token index:1 type:<root>.KtModifierKeywordToken
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirModifier modality:SEALED visibility:internal superTypes:[kotlin.Any]'
     PROPERTY name:node visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:node type:Node of <root>.FirModifier visibility:private [final]
         EXPRESSION_BODY
@@ -404,33 +97,29 @@ FILE fqName:<root> fileName:/kt44814.kt
           RETURN type=kotlin.Nothing from='public final fun <get-token> (): <root>.KtModifierKeywordToken declared in <root>.FirModifier'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:token type:<root>.KtModifierKeywordToken visibility:private [final]' type=<root>.KtModifierKeywordToken origin=null
               receiver: GET_VAR '<this>: <root>.FirModifier<Node of <root>.FirModifier> declared in <root>.FirModifier.<get-token>' type=<root>.FirModifier<Node of <root>.FirModifier> origin=null
-    CLASS CLASS name:FirPsiModifier modality:FINAL visibility:public superTypes:[<root>.FirModifier<<root>.ASTNode>]
-      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirModifier.FirPsiModifier
-      CONSTRUCTOR visibility:public <> (node:<root>.ASTNode, token:<root>.KtModifierKeywordToken) returnType:<root>.FirModifier.FirPsiModifier [primary]
-        VALUE_PARAMETER name:node index:0 type:<root>.ASTNode
+    CLASS CLASS name:FirLightModifier modality:FINAL visibility:public superTypes:[<root>.FirModifier<<root>.LighterASTNode>]
+      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirModifier.FirLightModifier
+      PROPERTY name:tree visibility:public modality:FINAL [val]
+        FIELD PROPERTY_BACKING_FIELD name:tree type:<root>.FlyweightCapableTreeStructure visibility:private [final]
+          EXPRESSION_BODY
+            GET_VAR 'tree: <root>.FlyweightCapableTreeStructure declared in <root>.FirModifier.FirLightModifier.<init>' type=<root>.FlyweightCapableTreeStructure origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+        FUN DEFAULT_PROPERTY_ACCESSOR name:<get-tree> visibility:public modality:FINAL <> ($this:<root>.FirModifier.FirLightModifier) returnType:<root>.FlyweightCapableTreeStructure
+          correspondingProperty: PROPERTY name:tree visibility:public modality:FINAL [val]
+          $this: VALUE_PARAMETER name:<this> type:<root>.FirModifier.FirLightModifier
+          BLOCK_BODY
+            RETURN type=kotlin.Nothing from='public final fun <get-tree> (): <root>.FlyweightCapableTreeStructure declared in <root>.FirModifier.FirLightModifier'
+              GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:tree type:<root>.FlyweightCapableTreeStructure visibility:private [final]' type=<root>.FlyweightCapableTreeStructure origin=null
+                receiver: GET_VAR '<this>: <root>.FirModifier.FirLightModifier declared in <root>.FirModifier.FirLightModifier.<get-tree>' type=<root>.FirModifier.FirLightModifier origin=null
+      CONSTRUCTOR visibility:public <> (node:<root>.LighterASTNode, token:<root>.KtModifierKeywordToken, tree:<root>.FlyweightCapableTreeStructure) returnType:<root>.FirModifier.FirLightModifier [primary]
+        VALUE_PARAMETER name:node index:0 type:<root>.LighterASTNode
         VALUE_PARAMETER name:token index:1 type:<root>.KtModifierKeywordToken
+        VALUE_PARAMETER name:tree index:2 type:<root>.FlyweightCapableTreeStructure
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> (node: Node of <root>.FirModifier, token: <root>.KtModifierKeywordToken) declared in <root>.FirModifier'
-            <Node>: <root>.ASTNode
-            node: GET_VAR 'node: <root>.ASTNode declared in <root>.FirModifier.FirPsiModifier.<init>' type=<root>.ASTNode origin=null
-            token: GET_VAR 'token: <root>.KtModifierKeywordToken declared in <root>.FirModifier.FirPsiModifier.<init>' type=<root>.KtModifierKeywordToken origin=null
-          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirPsiModifier modality:FINAL visibility:public superTypes:[<root>.FirModifier<<root>.ASTNode>]'
-      PROPERTY FAKE_OVERRIDE name:node visibility:public modality:FINAL [fake_override,val]
-        overridden:
-          public final node: Node of <root>.FirModifier
-        FUN FAKE_OVERRIDE name:<get-node> visibility:public modality:FINAL <> ($this:<root>.FirModifier<<root>.ASTNode>) returnType:<root>.ASTNode [fake_override]
-          correspondingProperty: PROPERTY FAKE_OVERRIDE name:node visibility:public modality:FINAL [fake_override,val]
-          overridden:
-            public final fun <get-node> (): Node of <root>.FirModifier declared in <root>.FirModifier
-          $this: VALUE_PARAMETER name:<this> type:<root>.FirModifier<<root>.ASTNode>
-      PROPERTY FAKE_OVERRIDE name:token visibility:public modality:FINAL [fake_override,val]
-        overridden:
-          public final token: <root>.KtModifierKeywordToken
-        FUN FAKE_OVERRIDE name:<get-token> visibility:public modality:FINAL <> ($this:<root>.FirModifier<<root>.ASTNode>) returnType:<root>.KtModifierKeywordToken [fake_override]
-          correspondingProperty: PROPERTY FAKE_OVERRIDE name:token visibility:public modality:FINAL [fake_override,val]
-          overridden:
-            public final fun <get-token> (): <root>.KtModifierKeywordToken declared in <root>.FirModifier
-          $this: VALUE_PARAMETER name:<this> type:<root>.FirModifier<<root>.ASTNode>
+            <Node>: <root>.LighterASTNode
+            node: GET_VAR 'node: <root>.LighterASTNode declared in <root>.FirModifier.FirLightModifier.<init>' type=<root>.LighterASTNode origin=null
+            token: GET_VAR 'token: <root>.KtModifierKeywordToken declared in <root>.FirModifier.FirLightModifier.<init>' type=<root>.KtModifierKeywordToken origin=null
+          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirLightModifier modality:FINAL visibility:public superTypes:[<root>.FirModifier<<root>.LighterASTNode>]'
       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 <root>.FirModifier
@@ -444,29 +133,6 @@ FILE fqName:<root> fileName:/kt44814.kt
         overridden:
           public open fun toString (): kotlin.String declared in <root>.FirModifier
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    CLASS CLASS name:FirLightModifier modality:FINAL visibility:public superTypes:[<root>.FirModifier<<root>.LighterASTNode>]
-      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirModifier.FirLightModifier
-      CONSTRUCTOR visibility:public <> (node:<root>.LighterASTNode, token:<root>.KtModifierKeywordToken, tree:<root>.FlyweightCapableTreeStructure) returnType:<root>.FirModifier.FirLightModifier [primary]
-        VALUE_PARAMETER name:node index:0 type:<root>.LighterASTNode
-        VALUE_PARAMETER name:token index:1 type:<root>.KtModifierKeywordToken
-        VALUE_PARAMETER name:tree index:2 type:<root>.FlyweightCapableTreeStructure
-        BLOCK_BODY
-          DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> (node: Node of <root>.FirModifier, token: <root>.KtModifierKeywordToken) declared in <root>.FirModifier'
-            <Node>: <root>.LighterASTNode
-            node: GET_VAR 'node: <root>.LighterASTNode declared in <root>.FirModifier.FirLightModifier.<init>' type=<root>.LighterASTNode origin=null
-            token: GET_VAR 'token: <root>.KtModifierKeywordToken declared in <root>.FirModifier.FirLightModifier.<init>' type=<root>.KtModifierKeywordToken origin=null
-          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirLightModifier modality:FINAL visibility:public superTypes:[<root>.FirModifier<<root>.LighterASTNode>]'
-      PROPERTY name:tree visibility:public modality:FINAL [val]
-        FIELD PROPERTY_BACKING_FIELD name:tree type:<root>.FlyweightCapableTreeStructure visibility:private [final]
-          EXPRESSION_BODY
-            GET_VAR 'tree: <root>.FlyweightCapableTreeStructure declared in <root>.FirModifier.FirLightModifier.<init>' type=<root>.FlyweightCapableTreeStructure origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-        FUN DEFAULT_PROPERTY_ACCESSOR name:<get-tree> visibility:public modality:FINAL <> ($this:<root>.FirModifier.FirLightModifier) returnType:<root>.FlyweightCapableTreeStructure
-          correspondingProperty: PROPERTY name:tree visibility:public modality:FINAL [val]
-          $this: VALUE_PARAMETER name:<this> type:<root>.FirModifier.FirLightModifier
-          BLOCK_BODY
-            RETURN type=kotlin.Nothing from='public final fun <get-tree> (): <root>.FlyweightCapableTreeStructure declared in <root>.FirModifier.FirLightModifier'
-              GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:tree type:<root>.FlyweightCapableTreeStructure visibility:private [final]' type=<root>.FlyweightCapableTreeStructure origin=null
-                receiver: GET_VAR '<this>: <root>.FirModifier.FirLightModifier declared in <root>.FirModifier.FirLightModifier.<get-tree>' type=<root>.FirModifier.FirLightModifier origin=null
       PROPERTY FAKE_OVERRIDE name:node visibility:public modality:FINAL [fake_override,val]
         overridden:
           public final node: Node of <root>.FirModifier
@@ -483,6 +149,17 @@ FILE fqName:<root> fileName:/kt44814.kt
           overridden:
             public final fun <get-token> (): <root>.KtModifierKeywordToken declared in <root>.FirModifier
           $this: VALUE_PARAMETER name:<this> type:<root>.FirModifier<<root>.LighterASTNode>
+    CLASS CLASS name:FirPsiModifier modality:FINAL visibility:public superTypes:[<root>.FirModifier<<root>.ASTNode>]
+      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirModifier.FirPsiModifier
+      CONSTRUCTOR visibility:public <> (node:<root>.ASTNode, token:<root>.KtModifierKeywordToken) returnType:<root>.FirModifier.FirPsiModifier [primary]
+        VALUE_PARAMETER name:node index:0 type:<root>.ASTNode
+        VALUE_PARAMETER name:token index:1 type:<root>.KtModifierKeywordToken
+        BLOCK_BODY
+          DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> (node: Node of <root>.FirModifier, token: <root>.KtModifierKeywordToken) declared in <root>.FirModifier'
+            <Node>: <root>.ASTNode
+            node: GET_VAR 'node: <root>.ASTNode declared in <root>.FirModifier.FirPsiModifier.<init>' type=<root>.ASTNode origin=null
+            token: GET_VAR 'token: <root>.KtModifierKeywordToken declared in <root>.FirModifier.FirPsiModifier.<init>' type=<root>.KtModifierKeywordToken origin=null
+          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirPsiModifier modality:FINAL visibility:public superTypes:[<root>.FirModifier<<root>.ASTNode>]'
       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 <root>.FirModifier
@@ -496,6 +173,28 @@ FILE fqName:<root> fileName:/kt44814.kt
         overridden:
           public open fun toString (): kotlin.String declared in <root>.FirModifier
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      PROPERTY FAKE_OVERRIDE name:node visibility:public modality:FINAL [fake_override,val]
+        overridden:
+          public final node: Node of <root>.FirModifier
+        FUN FAKE_OVERRIDE name:<get-node> visibility:public modality:FINAL <> ($this:<root>.FirModifier<<root>.ASTNode>) returnType:<root>.ASTNode [fake_override]
+          correspondingProperty: PROPERTY FAKE_OVERRIDE name:node visibility:public modality:FINAL [fake_override,val]
+          overridden:
+            public final fun <get-node> (): Node of <root>.FirModifier declared in <root>.FirModifier
+          $this: VALUE_PARAMETER name:<this> type:<root>.FirModifier<<root>.ASTNode>
+      PROPERTY FAKE_OVERRIDE name:token visibility:public modality:FINAL [fake_override,val]
+        overridden:
+          public final token: <root>.KtModifierKeywordToken
+        FUN FAKE_OVERRIDE name:<get-token> visibility:public modality:FINAL <> ($this:<root>.FirModifier<<root>.ASTNode>) returnType:<root>.KtModifierKeywordToken [fake_override]
+          correspondingProperty: PROPERTY FAKE_OVERRIDE name:token visibility:public modality:FINAL [fake_override,val]
+          overridden:
+            public final fun <get-token> (): <root>.KtModifierKeywordToken declared in <root>.FirModifier
+          $this: VALUE_PARAMETER name:<this> type:<root>.FirModifier<<root>.ASTNode>
+    CONSTRUCTOR visibility:protected <> (node:Node of <root>.FirModifier, token:<root>.KtModifierKeywordToken) returnType:<root>.FirModifier<Node of <root>.FirModifier> [primary]
+      VALUE_PARAMETER name:node index:0 type:Node of <root>.FirModifier
+      VALUE_PARAMETER name:token index:1 type:<root>.KtModifierKeywordToken
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirModifier modality:SEALED visibility:internal 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
@@ -514,10 +213,6 @@ FILE fqName:<root> fileName:/kt44814.kt
       CLASS CLASS name:FirLightModifierList modality:FINAL visibility:public superTypes:[<root>.FirModifierList]
       CLASS CLASS name:FirPsiModifierList modality:FINAL visibility:public superTypes:[<root>.FirModifierList]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirModifierList
-    CONSTRUCTOR visibility:protected <> () returnType:<root>.FirModifierList [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirModifierList modality:SEALED visibility:internal superTypes:[kotlin.Any]'
     PROPERTY name:modifiers visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:modifiers type:kotlin.collections.List<<root>.FirModifier<*>> visibility:private [final]
         EXPRESSION_BODY
@@ -530,53 +225,8 @@ FILE fqName:<root> fileName:/kt44814.kt
           RETURN type=kotlin.Nothing from='public final fun <get-modifiers> (): kotlin.collections.List<<root>.FirModifier<*>> declared in <root>.FirModifierList'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:modifiers type:kotlin.collections.List<<root>.FirModifier<*>> visibility:private [final]' type=kotlin.collections.List<<root>.FirModifier<*>> origin=null
               receiver: GET_VAR '<this>: <root>.FirModifierList declared in <root>.FirModifierList.<get-modifiers>' type=<root>.FirModifierList origin=null
-    CLASS CLASS name:FirPsiModifierList modality:FINAL visibility:public superTypes:[<root>.FirModifierList]
-      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirModifierList.FirPsiModifierList
-      CONSTRUCTOR visibility:public <> (modifierList:<root>.KtModifierList) returnType:<root>.FirModifierList.FirPsiModifierList [primary]
-        VALUE_PARAMETER name:modifierList index:0 type:<root>.KtModifierList
-        BLOCK_BODY
-          DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.FirModifierList'
-          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirPsiModifierList modality:FINAL visibility:public superTypes:[<root>.FirModifierList]'
-      PROPERTY name:modifierList visibility:public modality:FINAL [val]
-        FIELD PROPERTY_BACKING_FIELD name:modifierList type:<root>.KtModifierList visibility:private [final]
-          EXPRESSION_BODY
-            GET_VAR 'modifierList: <root>.KtModifierList declared in <root>.FirModifierList.FirPsiModifierList.<init>' type=<root>.KtModifierList origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-        FUN DEFAULT_PROPERTY_ACCESSOR name:<get-modifierList> visibility:public modality:FINAL <> ($this:<root>.FirModifierList.FirPsiModifierList) returnType:<root>.KtModifierList
-          correspondingProperty: PROPERTY name:modifierList visibility:public modality:FINAL [val]
-          $this: VALUE_PARAMETER name:<this> type:<root>.FirModifierList.FirPsiModifierList
-          BLOCK_BODY
-            RETURN type=kotlin.Nothing from='public final fun <get-modifierList> (): <root>.KtModifierList declared in <root>.FirModifierList.FirPsiModifierList'
-              GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:modifierList type:<root>.KtModifierList visibility:private [final]' type=<root>.KtModifierList origin=null
-                receiver: GET_VAR '<this>: <root>.FirModifierList.FirPsiModifierList declared in <root>.FirModifierList.FirPsiModifierList.<get-modifierList>' type=<root>.FirModifierList.FirPsiModifierList origin=null
-      PROPERTY FAKE_OVERRIDE name:modifiers visibility:public modality:FINAL [fake_override,val]
-        overridden:
-          public final modifiers: kotlin.collections.List<<root>.FirModifier<*>>
-        FUN FAKE_OVERRIDE name:<get-modifiers> visibility:public modality:FINAL <> ($this:<root>.FirModifierList) returnType:kotlin.collections.List<<root>.FirModifier<*>> [fake_override]
-          correspondingProperty: PROPERTY FAKE_OVERRIDE name:modifiers visibility:public modality:FINAL [fake_override,val]
-          overridden:
-            public final fun <get-modifiers> (): kotlin.collections.List<<root>.FirModifier<*>> declared in <root>.FirModifierList
-          $this: VALUE_PARAMETER name:<this> type:<root>.FirModifierList
-      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 <root>.FirModifierList
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-        VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-        overridden:
-          public open fun hashCode (): kotlin.Int declared in <root>.FirModifierList
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-        overridden:
-          public open fun toString (): kotlin.String declared in <root>.FirModifierList
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     CLASS CLASS name:FirLightModifierList modality:FINAL visibility:public superTypes:[<root>.FirModifierList]
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirModifierList.FirLightModifierList
-      CONSTRUCTOR visibility:public <> (modifierList:<root>.LighterASTNode, tree:<root>.FlyweightCapableTreeStructure) returnType:<root>.FirModifierList.FirLightModifierList [primary]
-        VALUE_PARAMETER name:modifierList index:0 type:<root>.LighterASTNode
-        VALUE_PARAMETER name:tree index:1 type:<root>.FlyweightCapableTreeStructure
-        BLOCK_BODY
-          DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.FirModifierList'
-          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirLightModifierList modality:FINAL visibility:public superTypes:[<root>.FirModifierList]'
       PROPERTY name:modifierList visibility:public modality:FINAL [val]
         FIELD PROPERTY_BACKING_FIELD name:modifierList type:<root>.LighterASTNode visibility:private [final]
           EXPRESSION_BODY
@@ -599,14 +249,12 @@ FILE fqName:<root> fileName:/kt44814.kt
             RETURN type=kotlin.Nothing from='public final fun <get-tree> (): <root>.FlyweightCapableTreeStructure declared in <root>.FirModifierList.FirLightModifierList'
               GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:tree type:<root>.FlyweightCapableTreeStructure visibility:private [final]' type=<root>.FlyweightCapableTreeStructure origin=null
                 receiver: GET_VAR '<this>: <root>.FirModifierList.FirLightModifierList declared in <root>.FirModifierList.FirLightModifierList.<get-tree>' type=<root>.FirModifierList.FirLightModifierList origin=null
-      PROPERTY FAKE_OVERRIDE name:modifiers visibility:public modality:FINAL [fake_override,val]
-        overridden:
-          public final modifiers: kotlin.collections.List<<root>.FirModifier<*>>
-        FUN FAKE_OVERRIDE name:<get-modifiers> visibility:public modality:FINAL <> ($this:<root>.FirModifierList) returnType:kotlin.collections.List<<root>.FirModifier<*>> [fake_override]
-          correspondingProperty: PROPERTY FAKE_OVERRIDE name:modifiers visibility:public modality:FINAL [fake_override,val]
-          overridden:
-            public final fun <get-modifiers> (): kotlin.collections.List<<root>.FirModifier<*>> declared in <root>.FirModifierList
-          $this: VALUE_PARAMETER name:<this> type:<root>.FirModifierList
+      CONSTRUCTOR visibility:public <> (modifierList:<root>.LighterASTNode, tree:<root>.FlyweightCapableTreeStructure) returnType:<root>.FirModifierList.FirLightModifierList [primary]
+        VALUE_PARAMETER name:modifierList index:0 type:<root>.LighterASTNode
+        VALUE_PARAMETER name:tree index:1 type:<root>.FlyweightCapableTreeStructure
+        BLOCK_BODY
+          DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.FirModifierList'
+          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirLightModifierList modality:FINAL visibility:public superTypes:[<root>.FirModifierList]'
       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 <root>.FirModifierList
@@ -620,12 +268,95 @@ FILE fqName:<root> fileName:/kt44814.kt
         overridden:
           public open fun toString (): kotlin.String declared in <root>.FirModifierList
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      PROPERTY FAKE_OVERRIDE name:modifiers visibility:public modality:FINAL [fake_override,val]
+        overridden:
+          public final modifiers: kotlin.collections.List<<root>.FirModifier<*>>
+        FUN FAKE_OVERRIDE name:<get-modifiers> visibility:public modality:FINAL <> ($this:<root>.FirModifierList) returnType:kotlin.collections.List<<root>.FirModifier<*>> [fake_override]
+          correspondingProperty: PROPERTY FAKE_OVERRIDE name:modifiers visibility:public modality:FINAL [fake_override,val]
+          overridden:
+            public final fun <get-modifiers> (): kotlin.collections.List<<root>.FirModifier<*>> declared in <root>.FirModifierList
+          $this: VALUE_PARAMETER name:<this> type:<root>.FirModifierList
+    CLASS CLASS name:FirPsiModifierList modality:FINAL visibility:public superTypes:[<root>.FirModifierList]
+      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirModifierList.FirPsiModifierList
+      PROPERTY name:modifierList visibility:public modality:FINAL [val]
+        FIELD PROPERTY_BACKING_FIELD name:modifierList type:<root>.KtModifierList visibility:private [final]
+          EXPRESSION_BODY
+            GET_VAR 'modifierList: <root>.KtModifierList declared in <root>.FirModifierList.FirPsiModifierList.<init>' type=<root>.KtModifierList origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+        FUN DEFAULT_PROPERTY_ACCESSOR name:<get-modifierList> visibility:public modality:FINAL <> ($this:<root>.FirModifierList.FirPsiModifierList) returnType:<root>.KtModifierList
+          correspondingProperty: PROPERTY name:modifierList visibility:public modality:FINAL [val]
+          $this: VALUE_PARAMETER name:<this> type:<root>.FirModifierList.FirPsiModifierList
+          BLOCK_BODY
+            RETURN type=kotlin.Nothing from='public final fun <get-modifierList> (): <root>.KtModifierList declared in <root>.FirModifierList.FirPsiModifierList'
+              GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:modifierList type:<root>.KtModifierList visibility:private [final]' type=<root>.KtModifierList origin=null
+                receiver: GET_VAR '<this>: <root>.FirModifierList.FirPsiModifierList declared in <root>.FirModifierList.FirPsiModifierList.<get-modifierList>' type=<root>.FirModifierList.FirPsiModifierList origin=null
+      CONSTRUCTOR visibility:public <> (modifierList:<root>.KtModifierList) returnType:<root>.FirModifierList.FirPsiModifierList [primary]
+        VALUE_PARAMETER name:modifierList index:0 type:<root>.KtModifierList
+        BLOCK_BODY
+          DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.FirModifierList'
+          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirPsiModifierList modality:FINAL visibility:public superTypes:[<root>.FirModifierList]'
+      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 <root>.FirModifierList
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+        VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+      FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+        overridden:
+          public open fun hashCode (): kotlin.Int declared in <root>.FirModifierList
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+        overridden:
+          public open fun toString (): kotlin.String declared in <root>.FirModifierList
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      PROPERTY FAKE_OVERRIDE name:modifiers visibility:public modality:FINAL [fake_override,val]
+        overridden:
+          public final modifiers: kotlin.collections.List<<root>.FirModifier<*>>
+        FUN FAKE_OVERRIDE name:<get-modifiers> visibility:public modality:FINAL <> ($this:<root>.FirModifierList) returnType:kotlin.collections.List<<root>.FirModifier<*>> [fake_override]
+          correspondingProperty: PROPERTY FAKE_OVERRIDE name:modifiers visibility:public modality:FINAL [fake_override,val]
+          overridden:
+            public final fun <get-modifiers> (): kotlin.collections.List<<root>.FirModifier<*>> declared in <root>.FirModifierList
+          $this: VALUE_PARAMETER name:<this> type:<root>.FirModifierList
     CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirModifierList.Companion
       CONSTRUCTOR visibility:private <> () returnType:<root>.FirModifierList.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 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
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+        VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+      FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+        overridden:
+          public open fun hashCode (): kotlin.Int declared in kotlin.Any
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+        overridden:
+          public open fun toString (): kotlin.String declared in kotlin.Any
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      FUN name:boxImpl visibility:public modality:FINAL <> ($this:<root>.FirModifierList.Companion) returnType:kotlin.String
+        $this: VALUE_PARAMETER name:<this> type:<root>.FirModifierList.Companion
+        BLOCK_BODY
+          VAR name:sourceElement type:<root>.FirSourceElement? [val]
+            CONSTRUCTOR_CALL 'public constructor <init> (lighterASTNode: <root>.LighterASTNode, treeStructure: <root>.FlyweightCapableTreeStructure) declared in <root>.FirLightSourceElement' type=<root>.FirLightSourceElement origin=null
+              lighterASTNode: CONSTRUCTOR_CALL 'public constructor <init> (_children: kotlin.collections.List<<root>.LighterASTNode?>) declared in <root>.LighterASTNode' type=<root>.LighterASTNode origin=null
+                _children: CALL 'public final fun listOf <T> (element: T of kotlin.collections.listOf): kotlin.collections.List<T of kotlin.collections.listOf> declared in kotlin.collections' type=kotlin.collections.List<<root>.LighterASTNode> origin=null
+                  <T>: <root>.LighterASTNode
+                  element: CONSTRUCTOR_CALL 'public constructor <init> (_children: kotlin.collections.List<<root>.LighterASTNode?>) declared in <root>.LighterASTNode' type=<root>.LighterASTNode origin=null
+              treeStructure: CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.FlyweightCapableTreeStructure' type=<root>.FlyweightCapableTreeStructure origin=null
+          VAR name:result type:<root>.FirModifierList? [val]
+            CALL 'public final fun getModifierList (): <root>.FirModifierList? declared in <root>.FirModifierList.Companion' type=<root>.FirModifierList? origin=null
+              $this: GET_VAR '<this>: <root>.FirModifierList.Companion declared in <root>.FirModifierList.Companion.boxImpl' type=<root>.FirModifierList.Companion origin=null
+              $receiver: GET_VAR 'val sourceElement: <root>.FirSourceElement? declared in <root>.FirModifierList.Companion.boxImpl' type=<root>.FirSourceElement? origin=null
+          RETURN type=kotlin.Nothing from='public final fun boxImpl (): kotlin.String declared in <root>.FirModifierList.Companion'
+            WHEN type=kotlin.String origin=IF
+              BRANCH
+                if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=<root>.FirModifierList.FirLightModifierList
+                  GET_VAR 'val result: <root>.FirModifierList? declared in <root>.FirModifierList.Companion.boxImpl' type=<root>.FirModifierList? origin=null
+                then: CONST String type=kotlin.String value="OK"
+              BRANCH
+                if: CONST Boolean type=kotlin.Boolean value=true
+                then: CONST String type=kotlin.String value="Fail"
       FUN name:getModifierList visibility:public modality:FINAL <> ($this:<root>.FirModifierList.Companion, $receiver:<root>.FirSourceElement?) returnType:<root>.FirModifierList?
         $this: VALUE_PARAMETER name:<this> type:<root>.FirModifierList.Companion
         $receiver: VALUE_PARAMETER name:<this> type:<root>.FirSourceElement?
@@ -732,29 +463,294 @@ FILE fqName:<root> fileName:/kt44814.kt
                 BRANCH
                   if: CONST Boolean type=kotlin.Boolean value=true
                   then: CALL 'public final fun noWhenBranchMatchedException (): kotlin.Nothing declared in kotlin.internal.ir' type=kotlin.Nothing origin=null
-      FUN name:boxImpl visibility:public modality:FINAL <> ($this:<root>.FirModifierList.Companion) returnType:kotlin.String
-        $this: VALUE_PARAMETER name:<this> type:<root>.FirModifierList.Companion
+    CONSTRUCTOR visibility:protected <> () returnType:<root>.FirModifierList [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirModifierList modality:SEALED visibility:internal 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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:FirPsiSourceElement modality:FINAL visibility:public superTypes:[<root>.FirSourceElement]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirPsiSourceElement
+    PROPERTY name:psi visibility:public modality:FINAL [val]
+      FIELD PROPERTY_BACKING_FIELD name:psi type:<root>.PsiElement visibility:private [final]
+        EXPRESSION_BODY
+          GET_VAR 'psi: <root>.PsiElement declared in <root>.FirPsiSourceElement.<init>' type=<root>.PsiElement origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-psi> visibility:public modality:FINAL <> ($this:<root>.FirPsiSourceElement) returnType:<root>.PsiElement
+        correspondingProperty: PROPERTY name:psi visibility:public modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.FirPsiSourceElement
         BLOCK_BODY
-          VAR name:sourceElement type:<root>.FirSourceElement? [val]
-            CONSTRUCTOR_CALL 'public constructor <init> (lighterASTNode: <root>.LighterASTNode, treeStructure: <root>.FlyweightCapableTreeStructure) declared in <root>.FirLightSourceElement' type=<root>.FirLightSourceElement origin=null
-              lighterASTNode: CONSTRUCTOR_CALL 'public constructor <init> (_children: kotlin.collections.List<<root>.LighterASTNode?>) declared in <root>.LighterASTNode' type=<root>.LighterASTNode origin=null
-                _children: CALL 'public final fun listOf <T> (element: T of kotlin.collections.listOf): kotlin.collections.List<T of kotlin.collections.listOf> declared in kotlin.collections' type=kotlin.collections.List<<root>.LighterASTNode> origin=null
-                  <T>: <root>.LighterASTNode
-                  element: CONSTRUCTOR_CALL 'public constructor <init> (_children: kotlin.collections.List<<root>.LighterASTNode?>) declared in <root>.LighterASTNode' type=<root>.LighterASTNode origin=null
-              treeStructure: CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.FlyweightCapableTreeStructure' type=<root>.FlyweightCapableTreeStructure origin=null
-          VAR name:result type:<root>.FirModifierList? [val]
-            CALL 'public final fun getModifierList (): <root>.FirModifierList? declared in <root>.FirModifierList.Companion' type=<root>.FirModifierList? origin=null
-              $this: GET_VAR '<this>: <root>.FirModifierList.Companion declared in <root>.FirModifierList.Companion.boxImpl' type=<root>.FirModifierList.Companion origin=null
-              $receiver: GET_VAR 'val sourceElement: <root>.FirSourceElement? declared in <root>.FirModifierList.Companion.boxImpl' type=<root>.FirSourceElement? origin=null
-          RETURN type=kotlin.Nothing from='public final fun boxImpl (): kotlin.String declared in <root>.FirModifierList.Companion'
-            WHEN type=kotlin.String origin=IF
-              BRANCH
-                if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=<root>.FirModifierList.FirLightModifierList
-                  GET_VAR 'val result: <root>.FirModifierList? declared in <root>.FirModifierList.Companion.boxImpl' type=<root>.FirModifierList? origin=null
-                then: CONST String type=kotlin.String value="OK"
-              BRANCH
-                if: CONST Boolean type=kotlin.Boolean value=true
-                then: CONST String type=kotlin.String value="Fail"
+          RETURN type=kotlin.Nothing from='public final fun <get-psi> (): <root>.PsiElement declared in <root>.FirPsiSourceElement'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:psi type:<root>.PsiElement visibility:private [final]' type=<root>.PsiElement origin=null
+              receiver: GET_VAR '<this>: <root>.FirPsiSourceElement declared in <root>.FirPsiSourceElement.<get-psi>' type=<root>.FirPsiSourceElement origin=null
+    PROPERTY name:lighterASTNode visibility:public modality:OPEN [val]
+      overridden:
+        public abstract lighterASTNode: <root>.LighterASTNode
+      FIELD PROPERTY_BACKING_FIELD name:lighterASTNode type:<root>.LighterASTNode visibility:private [final]
+        EXPRESSION_BODY
+          GET_VAR 'lighterASTNode: <root>.LighterASTNode declared in <root>.FirPsiSourceElement.<init>' type=<root>.LighterASTNode origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-lighterASTNode> visibility:public modality:OPEN <> ($this:<root>.FirPsiSourceElement) returnType:<root>.LighterASTNode
+        correspondingProperty: PROPERTY name:lighterASTNode visibility:public modality:OPEN [val]
+        overridden:
+          public abstract fun <get-lighterASTNode> (): <root>.LighterASTNode declared in <root>.FirSourceElement
+        $this: VALUE_PARAMETER name:<this> type:<root>.FirPsiSourceElement
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-lighterASTNode> (): <root>.LighterASTNode declared in <root>.FirPsiSourceElement'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:lighterASTNode type:<root>.LighterASTNode visibility:private [final]' type=<root>.LighterASTNode origin=null
+              receiver: GET_VAR '<this>: <root>.FirPsiSourceElement declared in <root>.FirPsiSourceElement.<get-lighterASTNode>' type=<root>.FirPsiSourceElement origin=null
+    PROPERTY name:treeStructure visibility:public modality:OPEN [val]
+      overridden:
+        public abstract treeStructure: <root>.FlyweightCapableTreeStructure
+      FIELD PROPERTY_BACKING_FIELD name:treeStructure type:<root>.FlyweightCapableTreeStructure visibility:private [final]
+        EXPRESSION_BODY
+          GET_VAR 'treeStructure: <root>.FlyweightCapableTreeStructure declared in <root>.FirPsiSourceElement.<init>' type=<root>.FlyweightCapableTreeStructure origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-treeStructure> visibility:public modality:OPEN <> ($this:<root>.FirPsiSourceElement) returnType:<root>.FlyweightCapableTreeStructure
+        correspondingProperty: PROPERTY name:treeStructure visibility:public modality:OPEN [val]
+        overridden:
+          public abstract fun <get-treeStructure> (): <root>.FlyweightCapableTreeStructure declared in <root>.FirSourceElement
+        $this: VALUE_PARAMETER name:<this> type:<root>.FirPsiSourceElement
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-treeStructure> (): <root>.FlyweightCapableTreeStructure declared in <root>.FirPsiSourceElement'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:treeStructure type:<root>.FlyweightCapableTreeStructure visibility:private [final]' type=<root>.FlyweightCapableTreeStructure origin=null
+              receiver: GET_VAR '<this>: <root>.FirPsiSourceElement declared in <root>.FirPsiSourceElement.<get-treeStructure>' type=<root>.FirPsiSourceElement origin=null
+    CONSTRUCTOR visibility:public <> (psi:<root>.PsiElement, lighterASTNode:<root>.LighterASTNode, treeStructure:<root>.FlyweightCapableTreeStructure) returnType:<root>.FirPsiSourceElement [primary]
+      VALUE_PARAMETER name:psi index:0 type:<root>.PsiElement
+      VALUE_PARAMETER name:lighterASTNode index:1 type:<root>.LighterASTNode
+      VALUE_PARAMETER name:treeStructure index:2 type:<root>.FlyweightCapableTreeStructure
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.FirSourceElement'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirPsiSourceElement modality:FINAL visibility:public superTypes:[<root>.FirSourceElement]'
+    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 <root>.FirSourceElement
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.FirSourceElement
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.FirSourceElement
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:FirSourceElement modality:SEALED visibility:public superTypes:[kotlin.Any]
+    sealedSubclasses:
+      CLASS CLASS name:FirLightSourceElement modality:FINAL visibility:public superTypes:[<root>.FirSourceElement]
+      CLASS CLASS name:FirPsiSourceElement modality:FINAL visibility:public superTypes:[<root>.FirSourceElement]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FirSourceElement
+    CONSTRUCTOR visibility:protected <> () returnType:<root>.FirSourceElement [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FirSourceElement modality:SEALED 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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    PROPERTY name:lighterASTNode visibility:public modality:ABSTRACT [val]
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-lighterASTNode> visibility:public modality:ABSTRACT <> ($this:<root>.FirSourceElement) returnType:<root>.LighterASTNode
+        correspondingProperty: PROPERTY name:lighterASTNode visibility:public modality:ABSTRACT [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.FirSourceElement
+    PROPERTY name:treeStructure visibility:public modality:ABSTRACT [val]
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-treeStructure> visibility:public modality:ABSTRACT <> ($this:<root>.FirSourceElement) returnType:<root>.FlyweightCapableTreeStructure
+        correspondingProperty: PROPERTY name:treeStructure visibility:public modality:ABSTRACT [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.FirSourceElement
+  CLASS CLASS name:FlyweightCapableTreeStructure modality:FINAL visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FlyweightCapableTreeStructure
+    CONSTRUCTOR visibility:public <> () returnType:<root>.FlyweightCapableTreeStructure [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:FlyweightCapableTreeStructure 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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:KtModifierKeywordToken modality:FINAL visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.KtModifierKeywordToken
+    CONSTRUCTOR visibility:public <> () returnType:<root>.KtModifierKeywordToken [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:KtModifierKeywordToken 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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:KtModifierList modality:FINAL visibility:public superTypes:[<root>.PsiElement]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.KtModifierList
+    CONSTRUCTOR visibility:public <> () returnType:<root>.KtModifierList [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.PsiElement'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:KtModifierList modality:FINAL visibility:public superTypes:[<root>.PsiElement]'
+    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 <root>.PsiElement
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.PsiElement
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.PsiElement
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:KtModifierListOwner modality:FINAL visibility:public superTypes:[<root>.PsiElement]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.KtModifierListOwner
+    PROPERTY name:modifierList visibility:public modality:FINAL [val]
+      FIELD PROPERTY_BACKING_FIELD name:modifierList type:<root>.KtModifierList visibility:private [final]
+        EXPRESSION_BODY
+          CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.KtModifierList' type=<root>.KtModifierList origin=null
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-modifierList> visibility:public modality:FINAL <> ($this:<root>.KtModifierListOwner) returnType:<root>.KtModifierList
+        correspondingProperty: PROPERTY name:modifierList visibility:public modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.KtModifierListOwner
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-modifierList> (): <root>.KtModifierList declared in <root>.KtModifierListOwner'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:modifierList type:<root>.KtModifierList visibility:private [final]' type=<root>.KtModifierList origin=null
+              receiver: GET_VAR '<this>: <root>.KtModifierListOwner declared in <root>.KtModifierListOwner.<get-modifierList>' type=<root>.KtModifierListOwner origin=null
+    CONSTRUCTOR visibility:public <> () returnType:<root>.KtModifierListOwner [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.PsiElement'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:KtModifierListOwner modality:FINAL visibility:public superTypes:[<root>.PsiElement]'
+    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 <root>.PsiElement
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.PsiElement
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.PsiElement
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:LighterASTNode modality:FINAL visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.LighterASTNode
+    PROPERTY name:_children visibility:public modality:FINAL [val]
+      FIELD PROPERTY_BACKING_FIELD name:_children type:kotlin.collections.List<<root>.LighterASTNode?> visibility:private [final]
+        EXPRESSION_BODY
+          GET_VAR '_children: kotlin.collections.List<<root>.LighterASTNode?> declared in <root>.LighterASTNode.<init>' type=kotlin.collections.List<<root>.LighterASTNode?> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-_children> visibility:public modality:FINAL <> ($this:<root>.LighterASTNode) returnType:kotlin.collections.List<<root>.LighterASTNode?>
+        correspondingProperty: PROPERTY name:_children visibility:public modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.LighterASTNode
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-_children> (): kotlin.collections.List<<root>.LighterASTNode?> declared in <root>.LighterASTNode'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:_children type:kotlin.collections.List<<root>.LighterASTNode?> visibility:private [final]' type=kotlin.collections.List<<root>.LighterASTNode?> origin=null
+              receiver: GET_VAR '<this>: <root>.LighterASTNode declared in <root>.LighterASTNode.<get-_children>' type=<root>.LighterASTNode origin=null
+    PROPERTY name:tokenType visibility:public modality:FINAL [val]
+      FIELD PROPERTY_BACKING_FIELD name:tokenType type:<root>.TokenType visibility:private [final]
+        EXPRESSION_BODY
+          CALL 'public final fun <get-MODIFIER_LIST> (): <root>.TokenType declared in <root>.TokenType.Companion' type=<root>.TokenType origin=GET_PROPERTY
+            $this: GET_OBJECT 'CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]' type=<root>.TokenType.Companion
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-tokenType> visibility:public modality:FINAL <> ($this:<root>.LighterASTNode) returnType:<root>.TokenType
+        correspondingProperty: PROPERTY name:tokenType visibility:public modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.LighterASTNode
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-tokenType> (): <root>.TokenType declared in <root>.LighterASTNode'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:tokenType type:<root>.TokenType visibility:private [final]' type=<root>.TokenType origin=null
+              receiver: GET_VAR '<this>: <root>.LighterASTNode declared in <root>.LighterASTNode.<get-tokenType>' type=<root>.LighterASTNode origin=null
+    CONSTRUCTOR visibility:public <> (_children:kotlin.collections.List<<root>.LighterASTNode?>) returnType:<root>.LighterASTNode [primary]
+      VALUE_PARAMETER name:_children index:0 type:kotlin.collections.List<<root>.LighterASTNode?>
+        EXPRESSION_BODY
+          CALL 'public final fun emptyList <T> (): kotlin.collections.List<T of kotlin.collections.emptyList> declared in kotlin.collections' type=kotlin.collections.List<<root>.LighterASTNode?> origin=null
+            <T>: <root>.LighterASTNode?
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:LighterASTNode 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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:getChildren visibility:public modality:FINAL <> ($this:<root>.LighterASTNode, treeStructure:<root>.FlyweightCapableTreeStructure) returnType:kotlin.collections.List<<root>.LighterASTNode?>
+      $this: VALUE_PARAMETER name:<this> type:<root>.LighterASTNode
+      VALUE_PARAMETER name:treeStructure index:0 type:<root>.FlyweightCapableTreeStructure
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun getChildren (treeStructure: <root>.FlyweightCapableTreeStructure): kotlin.collections.List<<root>.LighterASTNode?> declared in <root>.LighterASTNode'
+          CALL 'public final fun <get-_children> (): kotlin.collections.List<<root>.LighterASTNode?> declared in <root>.LighterASTNode' type=kotlin.collections.List<<root>.LighterASTNode?> origin=GET_PROPERTY
+            $this: GET_VAR '<this>: <root>.LighterASTNode declared in <root>.LighterASTNode.getChildren' type=<root>.LighterASTNode origin=null
+  CLASS CLASS name:PsiElement modality:OPEN visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.PsiElement
+    CONSTRUCTOR visibility:public <> () returnType:<root>.PsiElement [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:PsiElement modality:OPEN 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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:TokenType modality:FINAL visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TokenType
+    CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]
+      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TokenType.Companion
+      PROPERTY name:MODIFIER_LIST visibility:public modality:FINAL [val]
+        FIELD PROPERTY_BACKING_FIELD name:MODIFIER_LIST type:<root>.TokenType visibility:private [final]
+          EXPRESSION_BODY
+            CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.TokenType' type=<root>.TokenType origin=null
+        FUN DEFAULT_PROPERTY_ACCESSOR name:<get-MODIFIER_LIST> visibility:public modality:FINAL <> ($this:<root>.TokenType.Companion) returnType:<root>.TokenType
+          correspondingProperty: PROPERTY name:MODIFIER_LIST visibility:public modality:FINAL [val]
+          $this: VALUE_PARAMETER name:<this> type:<root>.TokenType.Companion
+          BLOCK_BODY
+            RETURN type=kotlin.Nothing from='public final fun <get-MODIFIER_LIST> (): <root>.TokenType declared in <root>.TokenType.Companion'
+              GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:MODIFIER_LIST type:<root>.TokenType visibility:private [final]' type=<root>.TokenType origin=null
+                receiver: GET_VAR '<this>: <root>.TokenType.Companion declared in <root>.TokenType.Companion.<get-MODIFIER_LIST>' type=<root>.TokenType.Companion origin=null
+      CONSTRUCTOR visibility:private <> () returnType:<root>.TokenType.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 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
@@ -768,6 +764,10 @@ FILE fqName:<root> fileName:/kt44814.kt
         overridden:
           public open fun toString (): kotlin.String declared in kotlin.Any
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    CONSTRUCTOR visibility:public <> () returnType:<root>.TokenType [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TokenType 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

compiler/testData/codegen/box/smartCasts/propertyInitializationAfterSmartCast.fir.ir.txt

@@ -1,10 +1,6 @@
 FILE fqName:<root> fileName:/propertyInitializationAfterSmartCast.kt
   CLASS CLASS name:Base_1 modality:OPEN visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Base_1
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Base_1 [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Base_1 modality:OPEN visibility:public superTypes:[kotlin.Any]'
     PROPERTY name:x visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any? visibility:private [final]
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Base_1) returnType:kotlin.Any?
@@ -34,6 +30,10 @@ FILE fqName:<root> fileName:/propertyInitializationAfterSmartCast.kt
         SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Any? visibility:private [final]' type=kotlin.Unit origin=null
           receiver: GET_VAR '<this>: <root>.Base_1 declared in <root>.Base_1' type=<root>.Base_1 origin=null
           value: CONST String type=kotlin.String value="O"
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Base_1 [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Base_1 modality:OPEN 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
@@ -47,47 +47,8 @@ FILE fqName:<root> fileName:/propertyInitializationAfterSmartCast.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:Derived_1 modality:FINAL visibility:public superTypes:[<root>.Base_1]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Derived_1
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Derived_1 [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Base_1'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Derived_1 modality:FINAL visibility:public superTypes:[<root>.Base_1]'
-    PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [fake_override,val]
-      overridden:
-        public final x: kotlin.Any?
-      FUN FAKE_OVERRIDE name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Base_1) returnType:kotlin.Any? [fake_override]
-        correspondingProperty: PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [fake_override,val]
-        overridden:
-          public final fun <get-x> (): kotlin.Any? declared in <root>.Base_1
-        $this: VALUE_PARAMETER name:<this> type:<root>.Base_1
-    PROPERTY FAKE_OVERRIDE name:y visibility:public modality:FINAL [fake_override,val]
-      overridden:
-        public final y: kotlin.Any?
-      FUN FAKE_OVERRIDE name:<get-y> visibility:public modality:FINAL <> ($this:<root>.Base_1) returnType:kotlin.Any? [fake_override]
-        correspondingProperty: PROPERTY FAKE_OVERRIDE name:y visibility:public modality:FINAL [fake_override,val]
-        overridden:
-          public final fun <get-y> (): kotlin.Any? declared in <root>.Base_1
-        $this: VALUE_PARAMETER name:<this> type:<root>.Base_1
-    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 <root>.Base_1
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.Base_1
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.Base_1
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:Base_2 modality:OPEN visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Base_2
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Base_2 [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Base_2 modality:OPEN visibility:public superTypes:[kotlin.Any]'
     PROPERTY name:x visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any? visibility:private [final]
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Base_2) returnType:kotlin.Any?
@@ -117,6 +78,10 @@ FILE fqName:<root> fileName:/propertyInitializationAfterSmartCast.kt
         SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Any? visibility:private [final]' type=kotlin.Unit origin=null
           receiver: GET_VAR '<this>: <root>.Base_2 declared in <root>.Base_2' type=<root>.Base_2 origin=null
           value: CONST String type=kotlin.String value="K"
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Base_2 [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Base_2 modality:OPEN 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
@@ -130,12 +95,60 @@ FILE fqName:<root> fileName:/propertyInitializationAfterSmartCast.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:Derived_1 modality:FINAL visibility:public superTypes:[<root>.Base_1]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Derived_1
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Derived_1 [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Base_1'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Derived_1 modality:FINAL visibility:public superTypes:[<root>.Base_1]'
+    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 <root>.Base_1
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.Base_1
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.Base_1
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [fake_override,val]
+      overridden:
+        public final x: kotlin.Any?
+      FUN FAKE_OVERRIDE name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Base_1) returnType:kotlin.Any? [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [fake_override,val]
+        overridden:
+          public final fun <get-x> (): kotlin.Any? declared in <root>.Base_1
+        $this: VALUE_PARAMETER name:<this> type:<root>.Base_1
+    PROPERTY FAKE_OVERRIDE name:y visibility:public modality:FINAL [fake_override,val]
+      overridden:
+        public final y: kotlin.Any?
+      FUN FAKE_OVERRIDE name:<get-y> visibility:public modality:FINAL <> ($this:<root>.Base_1) returnType:kotlin.Any? [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:y visibility:public modality:FINAL [fake_override,val]
+        overridden:
+          public final fun <get-y> (): kotlin.Any? declared in <root>.Base_1
+        $this: VALUE_PARAMETER name:<this> type:<root>.Base_1
   CLASS CLASS name:Derived_2 modality:OPEN visibility:public superTypes:[<root>.Base_2]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Derived_2
     CONSTRUCTOR visibility:public <> () returnType:<root>.Derived_2 [primary]
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Base_2'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Derived_2 modality:OPEN visibility:public superTypes:[<root>.Base_2]'
+    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 <root>.Base_2
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.Base_2
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.Base_2
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [fake_override,val]
       overridden:
         public final x: kotlin.Any?
@@ -152,25 +165,25 @@ FILE fqName:<root> fileName:/propertyInitializationAfterSmartCast.kt
         overridden:
           public final fun <get-y> (): kotlin.Any? declared in <root>.Base_2
         $this: VALUE_PARAMETER name:<this> type:<root>.Base_2
-    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 <root>.Base_2
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.Base_2
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.Base_2
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:Impl_2 modality:FINAL visibility:public superTypes:[<root>.Derived_2]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Impl_2
     CONSTRUCTOR visibility:public <> () returnType:<root>.Impl_2 [primary]
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Derived_2'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Impl_2 modality:FINAL visibility:public superTypes:[<root>.Derived_2]'
+    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 <root>.Derived_2
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.Derived_2
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.Derived_2
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [fake_override,val]
       overridden:
         public final x: kotlin.Any?
@@ -187,19 +200,6 @@ FILE fqName:<root> fileName:/propertyInitializationAfterSmartCast.kt
         overridden:
           public final fun <get-y> (): kotlin.Any? declared in <root>.Derived_2
         $this: VALUE_PARAMETER name:<this> type:<root>.Base_2
-    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 <root>.Derived_2
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.Derived_2
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.Derived_2
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
       VAR name:a type:<root>.Derived_1 [val]

compiler/testData/codegen/box/smartCasts/propertyInitializationAfterSmartCast.ir.txt

@@ -1,10 +1,6 @@
 FILE fqName:<root> fileName:/propertyInitializationAfterSmartCast.kt
   CLASS CLASS name:Base_1 modality:OPEN visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Base_1
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Base_1 [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Base_1 modality:OPEN visibility:public superTypes:[kotlin.Any]'
     PROPERTY name:x visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any? visibility:private [final]
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Base_1) returnType:kotlin.Any?
@@ -34,6 +30,10 @@ FILE fqName:<root> fileName:/propertyInitializationAfterSmartCast.kt
         SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Any? visibility:private [final]' type=kotlin.Unit origin=null
           receiver: GET_VAR '<this>: <root>.Base_1 declared in <root>.Base_1' type=<root>.Base_1 origin=null
           value: CONST String type=kotlin.String value="O"
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Base_1 [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Base_1 modality:OPEN 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
@@ -47,47 +47,8 @@ FILE fqName:<root> fileName:/propertyInitializationAfterSmartCast.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:Derived_1 modality:FINAL visibility:public superTypes:[<root>.Base_1]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Derived_1
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Derived_1 [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Base_1'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Derived_1 modality:FINAL visibility:public superTypes:[<root>.Base_1]'
-    PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [fake_override,val]
-      overridden:
-        public final x: kotlin.Any?
-      FUN FAKE_OVERRIDE name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Base_1) returnType:kotlin.Any? [fake_override]
-        correspondingProperty: PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [fake_override,val]
-        overridden:
-          public final fun <get-x> (): kotlin.Any? declared in <root>.Base_1
-        $this: VALUE_PARAMETER name:<this> type:<root>.Base_1
-    PROPERTY FAKE_OVERRIDE name:y visibility:public modality:FINAL [fake_override,val]
-      overridden:
-        public final y: kotlin.Any?
-      FUN FAKE_OVERRIDE name:<get-y> visibility:public modality:FINAL <> ($this:<root>.Base_1) returnType:kotlin.Any? [fake_override]
-        correspondingProperty: PROPERTY FAKE_OVERRIDE name:y visibility:public modality:FINAL [fake_override,val]
-        overridden:
-          public final fun <get-y> (): kotlin.Any? declared in <root>.Base_1
-        $this: VALUE_PARAMETER name:<this> type:<root>.Base_1
-    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 <root>.Base_1
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.Base_1
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.Base_1
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:Base_2 modality:OPEN visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Base_2
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Base_2 [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Base_2 modality:OPEN visibility:public superTypes:[kotlin.Any]'
     PROPERTY name:x visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any? visibility:private [final]
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Base_2) returnType:kotlin.Any?
@@ -117,6 +78,10 @@ FILE fqName:<root> fileName:/propertyInitializationAfterSmartCast.kt
         SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Any? visibility:private [final]' type=kotlin.Unit origin=null
           receiver: GET_VAR '<this>: <root>.Base_2 declared in <root>.Base_2' type=<root>.Base_2 origin=null
           value: CONST String type=kotlin.String value="K"
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Base_2 [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Base_2 modality:OPEN 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
@@ -130,12 +95,60 @@ FILE fqName:<root> fileName:/propertyInitializationAfterSmartCast.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:Derived_1 modality:FINAL visibility:public superTypes:[<root>.Base_1]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Derived_1
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Derived_1 [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Base_1'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Derived_1 modality:FINAL visibility:public superTypes:[<root>.Base_1]'
+    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 <root>.Base_1
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.Base_1
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.Base_1
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [fake_override,val]
+      overridden:
+        public final x: kotlin.Any?
+      FUN FAKE_OVERRIDE name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Base_1) returnType:kotlin.Any? [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [fake_override,val]
+        overridden:
+          public final fun <get-x> (): kotlin.Any? declared in <root>.Base_1
+        $this: VALUE_PARAMETER name:<this> type:<root>.Base_1
+    PROPERTY FAKE_OVERRIDE name:y visibility:public modality:FINAL [fake_override,val]
+      overridden:
+        public final y: kotlin.Any?
+      FUN FAKE_OVERRIDE name:<get-y> visibility:public modality:FINAL <> ($this:<root>.Base_1) returnType:kotlin.Any? [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:y visibility:public modality:FINAL [fake_override,val]
+        overridden:
+          public final fun <get-y> (): kotlin.Any? declared in <root>.Base_1
+        $this: VALUE_PARAMETER name:<this> type:<root>.Base_1
   CLASS CLASS name:Derived_2 modality:OPEN visibility:public superTypes:[<root>.Base_2]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Derived_2
     CONSTRUCTOR visibility:public <> () returnType:<root>.Derived_2 [primary]
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Base_2'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Derived_2 modality:OPEN visibility:public superTypes:[<root>.Base_2]'
+    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 <root>.Base_2
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.Base_2
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.Base_2
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [fake_override,val]
       overridden:
         public final x: kotlin.Any?
@@ -152,25 +165,25 @@ FILE fqName:<root> fileName:/propertyInitializationAfterSmartCast.kt
         overridden:
           public final fun <get-y> (): kotlin.Any? declared in <root>.Base_2
         $this: VALUE_PARAMETER name:<this> type:<root>.Base_2
-    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 <root>.Base_2
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.Base_2
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.Base_2
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:Impl_2 modality:FINAL visibility:public superTypes:[<root>.Derived_2]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Impl_2
     CONSTRUCTOR visibility:public <> () returnType:<root>.Impl_2 [primary]
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Derived_2'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Impl_2 modality:FINAL visibility:public superTypes:[<root>.Derived_2]'
+    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 <root>.Derived_2
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.Derived_2
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.Derived_2
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [fake_override,val]
       overridden:
         public final x: kotlin.Any?
@@ -187,19 +200,6 @@ FILE fqName:<root> fileName:/propertyInitializationAfterSmartCast.kt
         overridden:
           public final fun <get-y> (): kotlin.Any? declared in <root>.Derived_2
         $this: VALUE_PARAMETER name:<this> type:<root>.Base_2
-    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 <root>.Derived_2
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.Derived_2
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.Derived_2
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
       VAR name:a type:<root>.Derived_1 [val]

compiler/testData/codegen/box/smartCasts/smartcastFromGenericToString.ir.txt

@@ -2,11 +2,6 @@ FILE fqName:<root> fileName:/smartcastFromGenericToString.kt
   CLASS CLASS name:Some modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Some<V of <root>.Some>
     TYPE_PARAMETER name:V index:0 variance: superTypes:[kotlin.Any] reified:false
-    CONSTRUCTOR visibility:public <> (map:kotlin.collections.Map<kotlin.String, V of <root>.Some>) returnType:<root>.Some<V of <root>.Some> [primary]
-      VALUE_PARAMETER name:map index:0 type:kotlin.collections.Map<kotlin.String, V of <root>.Some>
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Some modality:FINAL visibility:public superTypes:[kotlin.Any]'
     PROPERTY name:map visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:map type:kotlin.collections.Map<kotlin.String, V of <root>.Some> visibility:private [final]
         EXPRESSION_BODY
@@ -18,6 +13,32 @@ FILE fqName:<root> fileName:/smartcastFromGenericToString.kt
           RETURN type=kotlin.Nothing from='public final fun <get-map> (): kotlin.collections.Map<kotlin.String, V of <root>.Some> declared in <root>.Some'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:map type:kotlin.collections.Map<kotlin.String, V of <root>.Some> visibility:private [final]' type=kotlin.collections.Map<kotlin.String, V of <root>.Some> origin=null
               receiver: GET_VAR '<this>: <root>.Some<V of <root>.Some> declared in <root>.Some.<get-map>' type=<root>.Some<V of <root>.Some> origin=null
+    CONSTRUCTOR visibility:public <> (map:kotlin.collections.Map<kotlin.String, V of <root>.Some>) returnType:<root>.Some<V of <root>.Some> [primary]
+      VALUE_PARAMETER name:map index:0 type:kotlin.collections.Map<kotlin.String, V of <root>.Some>
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Some 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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:addK visibility:public modality:FINAL <> ($this:<root>.Some<V of <root>.Some>, s:kotlin.String) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:<root>.Some<V of <root>.Some>
+      VALUE_PARAMETER name:s index:0 type:kotlin.String
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun addK (s: kotlin.String): kotlin.String declared in <root>.Some'
+          CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=PLUS
+            $this: GET_VAR 's: kotlin.String declared in <root>.Some.addK' type=kotlin.String origin=null
+            other: CONST String type=kotlin.String value="K"
     FUN name:test visibility:public modality:FINAL <> ($this:<root>.Some<V of <root>.Some>, key:kotlin.String) returnType:kotlin.String
       $this: VALUE_PARAMETER name:<this> type:<root>.Some<V of <root>.Some>
       VALUE_PARAMETER name:key index:0 type:kotlin.String
@@ -44,27 +65,6 @@ FILE fqName:<root> fileName:/smartcastFromGenericToString.kt
                 then: STRING_CONCATENATION type=kotlin.String
                   CONST String type=kotlin.String value="Fail: "
                   GET_VAR 'val value: V of <root>.Some declared in <root>.Some.test' type=V of <root>.Some origin=null
-    FUN name:addK visibility:public modality:FINAL <> ($this:<root>.Some<V of <root>.Some>, s:kotlin.String) returnType:kotlin.String
-      $this: VALUE_PARAMETER name:<this> type:<root>.Some<V of <root>.Some>
-      VALUE_PARAMETER name:s index:0 type:kotlin.String
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun addK (s: kotlin.String): kotlin.String declared in <root>.Some'
-          CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=PLUS
-            $this: GET_VAR 's: kotlin.String declared in <root>.Some.addK' type=kotlin.String origin=null
-            other: CONST String type=kotlin.String value="K"
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
       VAR name:x type:<root>.Some<kotlin.String> [val]

compiler/testData/codegen/box/smartCasts/smartcastToStarType.ir.txt

@@ -1,22 +1,4 @@
 FILE fqName:<root> fileName:/smartcastToStarType.kt
-  CLASS INTERFACE name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Base<T of <root>.Base>
-    TYPE_PARAMETER name:T index:0 variance:out superTypes:[kotlin.Any?] reified:false
-    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.Base<T of <root>.Base>) returnType:T of <root>.Base
-      $this: VALUE_PARAMETER name:<this> type:<root>.Base<T of <root>.Base>
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:Derived modality:FINAL visibility:public superTypes:[<root>.Base<T of <root>.Derived>]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Derived<T of <root>.Derived>
     TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false
@@ -24,14 +6,6 @@ FILE fqName:<root> fileName:/smartcastToStarType.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Derived modality:FINAL visibility:public superTypes:[<root>.Base<T of <root>.Derived>]'
-    FUN name:foo visibility:public modality:OPEN <> ($this:<root>.Derived<T of <root>.Derived>) returnType:T of <root>.Derived
-      overridden:
-        public abstract fun foo (): T of <root>.Base declared in <root>.Base
-      $this: VALUE_PARAMETER name:<this> type:<root>.Derived<T of <root>.Derived>
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun foo (): T of <root>.Derived declared in <root>.Derived'
-          TYPE_OP type=T of <root>.Derived origin=CAST typeOperand=T of <root>.Derived
-            CONST String type=kotlin.String value="error"
     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 <root>.Base
@@ -45,6 +19,32 @@ FILE fqName:<root> fileName:/smartcastToStarType.kt
       overridden:
         public open fun toString (): kotlin.String declared in <root>.Base
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:OPEN <> ($this:<root>.Derived<T of <root>.Derived>) returnType:T of <root>.Derived
+      overridden:
+        public abstract fun foo (): T of <root>.Base declared in <root>.Base
+      $this: VALUE_PARAMETER name:<this> type:<root>.Derived<T of <root>.Derived>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun foo (): T of <root>.Derived declared in <root>.Derived'
+          TYPE_OP type=T of <root>.Derived origin=CAST typeOperand=T of <root>.Derived
+            CONST String type=kotlin.String value="error"
+  CLASS INTERFACE name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Base<T of <root>.Base>
+    TYPE_PARAMETER name:T index:0 variance:out superTypes:[kotlin.Any?] reified:false
+    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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.Base<T of <root>.Base>) returnType:T of <root>.Base
+      $this: VALUE_PARAMETER name:<this> type:<root>.Base<T of <root>.Base>
   FUN name:bar visibility:public modality:FINAL <T> ($receiver:<root>.Derived<T of <root>.bar>) returnType:<root>.Base<T of <root>.bar>
     TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false
     $receiver: VALUE_PARAMETER name:<this> type:<root>.Derived<T of <root>.bar>
@@ -57,14 +57,6 @@ FILE fqName:<root> fileName:/smartcastToStarType.kt
               BLOCK_BODY
                 DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
                 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.Base<T of <root>.bar>]'
-            FUN name:foo visibility:public modality:OPEN <> ($this:<root>.bar.<no name provided><T of <root>.bar>) returnType:T of <root>.bar
-              overridden:
-                public abstract fun foo (): T of <root>.Base declared in <root>.Base
-              $this: VALUE_PARAMETER name:<this> type:<root>.bar.<no name provided><T of <root>.bar>
-              BLOCK_BODY
-                RETURN type=kotlin.Nothing from='public open fun foo (): T of <root>.bar declared in <root>.bar.<no name provided>'
-                  TYPE_OP type=T of <root>.bar origin=CAST typeOperand=T of <root>.bar
-                    CONST String type=kotlin.String value="OK"
             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 <root>.Base
@@ -78,7 +70,24 @@ FILE fqName:<root> fileName:/smartcastToStarType.kt
               overridden:
                 public open fun toString (): kotlin.String declared in <root>.Base
               $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+            FUN name:foo visibility:public modality:OPEN <> ($this:<root>.bar.<no name provided><T of <root>.bar>) returnType:T of <root>.bar
+              overridden:
+                public abstract fun foo (): T of <root>.Base declared in <root>.Base
+              $this: VALUE_PARAMETER name:<this> type:<root>.bar.<no name provided><T of <root>.bar>
+              BLOCK_BODY
+                RETURN type=kotlin.Nothing from='public open fun foo (): T of <root>.bar declared in <root>.bar.<no name provided>'
+                  TYPE_OP type=T of <root>.bar origin=CAST typeOperand=T of <root>.bar
+                    CONST String type=kotlin.String value="OK"
           CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.bar.<no name provided>' type=<root>.bar.<no name provided><T of <root>.bar> origin=OBJECT_LITERAL
+  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
+    BLOCK_BODY
+      VAR name:x type:<root>.Derived<kotlin.String> [val]
+        CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Derived' type=<root>.Derived<kotlin.String> origin=null
+          <class: T>: kotlin.String
+      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
+        CALL 'public final fun test <T> (x: <root>.Base<T of <root>.test>): T of <root>.test declared in <root>' type=kotlin.String origin=null
+          <T>: kotlin.String
+          x: GET_VAR 'val x: <root>.Derived<kotlin.String> declared in <root>.box' type=<root>.Derived<kotlin.String> origin=null
   FUN name:test visibility:public modality:FINAL <T> (x:<root>.Base<T of <root>.test>) returnType:T of <root>.test
     TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false
     VALUE_PARAMETER name:x index:0 type:<root>.Base<T of <root>.test>
@@ -100,12 +109,3 @@ FILE fqName:<root> fileName:/smartcastToStarType.kt
       RETURN type=kotlin.Nothing from='public final fun test <T> (x: <root>.Base<T of <root>.test>): T of <root>.test declared in <root>'
         CALL 'public abstract fun foo (): T of <root>.Base declared in <root>.Base' type=T of <root>.test origin=null
           $this: GET_VAR 'x: <root>.Base<T of <root>.test> declared in <root>.test' type=<root>.Base<T of <root>.test> origin=null
-  FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
-    BLOCK_BODY
-      VAR name:x type:<root>.Derived<kotlin.String> [val]
-        CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Derived' type=<root>.Derived<kotlin.String> origin=null
-          <class: T>: kotlin.String
-      RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
-        CALL 'public final fun test <T> (x: <root>.Base<T of <root>.test>): T of <root>.test declared in <root>' type=kotlin.String origin=null
-          <T>: kotlin.String
-          x: GET_VAR 'val x: <root>.Derived<kotlin.String> declared in <root>.box' type=<root>.Derived<kotlin.String> origin=null

compiler/testData/codegen/box/unsignedTypes/implicitIntegerCoercionNamedArg.fir.ir.txt

@@ -19,22 +19,6 @@ FILE fqName:kotlin.internal fileName:/annotation.kt
         public open fun toString (): kotlin.String declared in kotlin.Annotation
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
 FILE fqName:<root> fileName:/test.kt
-  FUN name:testInt visibility:public modality:FINAL <> (x:kotlin.UInt) returnType:kotlin.UInt
-    VALUE_PARAMETER name:x index:0 type:kotlin.UInt
-      annotations:
-        ImplicitIntegerCoercion
-    BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun testInt (x: kotlin.UInt): kotlin.UInt declared in <root>'
-        TYPE_OP type=kotlin.UInt origin=CAST typeOperand=kotlin.UInt
-          GET_VAR 'x: kotlin.UInt declared in <root>.testInt' type=kotlin.UInt origin=null
-  FUN name:testLong visibility:public modality:FINAL <> (x:kotlin.ULong) returnType:kotlin.ULong
-    VALUE_PARAMETER name:x index:0 type:kotlin.ULong
-      annotations:
-        ImplicitIntegerCoercion
-    BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun testLong (x: kotlin.ULong): kotlin.ULong declared in <root>'
-        TYPE_OP type=kotlin.ULong origin=CAST typeOperand=kotlin.ULong
-          GET_VAR 'x: kotlin.ULong declared in <root>.testLong' type=kotlin.ULong origin=null
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
@@ -78,3 +62,19 @@ FILE fqName:<root> fileName:/test.kt
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
             then: CONST String type=kotlin.String value="OK"
+  FUN name:testInt visibility:public modality:FINAL <> (x:kotlin.UInt) returnType:kotlin.UInt
+    VALUE_PARAMETER name:x index:0 type:kotlin.UInt
+      annotations:
+        ImplicitIntegerCoercion
+    BLOCK_BODY
+      RETURN type=kotlin.Nothing from='public final fun testInt (x: kotlin.UInt): kotlin.UInt declared in <root>'
+        TYPE_OP type=kotlin.UInt origin=CAST typeOperand=kotlin.UInt
+          GET_VAR 'x: kotlin.UInt declared in <root>.testInt' type=kotlin.UInt origin=null
+  FUN name:testLong visibility:public modality:FINAL <> (x:kotlin.ULong) returnType:kotlin.ULong
+    VALUE_PARAMETER name:x index:0 type:kotlin.ULong
+      annotations:
+        ImplicitIntegerCoercion
+    BLOCK_BODY
+      RETURN type=kotlin.Nothing from='public final fun testLong (x: kotlin.ULong): kotlin.ULong declared in <root>'
+        TYPE_OP type=kotlin.ULong origin=CAST typeOperand=kotlin.ULong
+          GET_VAR 'x: kotlin.ULong declared in <root>.testLong' type=kotlin.ULong origin=null

compiler/testData/codegen/box/unsignedTypes/implicitIntegerCoercionNamedArg.ir.txt

@@ -19,22 +19,6 @@ FILE fqName:kotlin.internal fileName:/annotation.kt
         public open fun toString (): kotlin.String declared in kotlin.Annotation
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
 FILE fqName:<root> fileName:/test.kt
-  FUN name:testInt visibility:public modality:FINAL <> (x:kotlin.UInt) returnType:kotlin.UInt
-    VALUE_PARAMETER name:x index:0 type:kotlin.UInt
-      annotations:
-        ImplicitIntegerCoercion
-    BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun testInt (x: kotlin.UInt): kotlin.UInt declared in <root>'
-        TYPE_OP type=kotlin.UInt origin=CAST typeOperand=kotlin.UInt
-          GET_VAR 'x: kotlin.UInt declared in <root>.testInt' type=kotlin.UInt origin=null
-  FUN name:testLong visibility:public modality:FINAL <> (x:kotlin.ULong) returnType:kotlin.ULong
-    VALUE_PARAMETER name:x index:0 type:kotlin.ULong
-      annotations:
-        ImplicitIntegerCoercion
-    BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun testLong (x: kotlin.ULong): kotlin.ULong declared in <root>'
-        TYPE_OP type=kotlin.ULong origin=CAST typeOperand=kotlin.ULong
-          GET_VAR 'x: kotlin.ULong declared in <root>.testLong' type=kotlin.ULong origin=null
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
@@ -74,3 +58,19 @@ FILE fqName:<root> fileName:/test.kt
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
             then: CONST String type=kotlin.String value="OK"
+  FUN name:testInt visibility:public modality:FINAL <> (x:kotlin.UInt) returnType:kotlin.UInt
+    VALUE_PARAMETER name:x index:0 type:kotlin.UInt
+      annotations:
+        ImplicitIntegerCoercion
+    BLOCK_BODY
+      RETURN type=kotlin.Nothing from='public final fun testInt (x: kotlin.UInt): kotlin.UInt declared in <root>'
+        TYPE_OP type=kotlin.UInt origin=CAST typeOperand=kotlin.UInt
+          GET_VAR 'x: kotlin.UInt declared in <root>.testInt' type=kotlin.UInt origin=null
+  FUN name:testLong visibility:public modality:FINAL <> (x:kotlin.ULong) returnType:kotlin.ULong
+    VALUE_PARAMETER name:x index:0 type:kotlin.ULong
+      annotations:
+        ImplicitIntegerCoercion
+    BLOCK_BODY
+      RETURN type=kotlin.Nothing from='public final fun testLong (x: kotlin.ULong): kotlin.ULong declared in <root>'
+        TYPE_OP type=kotlin.ULong origin=CAST typeOperand=kotlin.ULong
+          GET_VAR 'x: kotlin.ULong declared in <root>.testLong' type=kotlin.ULong origin=null

compiler/testData/codegen/boxModernJdk/testsWithJava17/records/recordWithCompanion.fir.ir.txt

@@ -3,11 +3,6 @@ FILE fqName:<root> fileName:/recordWithCompanion.kt
     annotations:
       JvmRecord
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Tag
-    CONSTRUCTOR visibility:public <> (id:kotlin.String) returnType:<root>.Tag [primary]
-      VALUE_PARAMETER name:id index:0 type:kotlin.String
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'protected/*protected and package*/ constructor <init> () declared in java.lang.Record'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Tag modality:FINAL visibility:public [data] superTypes:[java.lang.Record]'
     PROPERTY name:id visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:id type:kotlin.String visibility:private [final]
         EXPRESSION_BODY
@@ -38,6 +33,11 @@ FILE fqName:<root> fileName:/recordWithCompanion.kt
         overridden:
           public open fun toString (): kotlin.String declared in kotlin.Any
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    CONSTRUCTOR visibility:public <> (id:kotlin.String) returnType:<root>.Tag [primary]
+      VALUE_PARAMETER name:id index:0 type:kotlin.String
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'protected/*protected and package*/ constructor <init> () declared in java.lang.Record'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Tag modality:FINAL visibility:public [data] superTypes:[java.lang.Record]'
     FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:<root>.Tag) returnType:kotlin.String [operator]
       $this: VALUE_PARAMETER name:<this> type:<root>.Tag
       BLOCK_BODY
@@ -54,27 +54,6 @@ FILE fqName:<root> fileName:/recordWithCompanion.kt
         RETURN type=kotlin.Nothing from='public final fun copy (id: kotlin.String): <root>.Tag declared in <root>.Tag'
           CONSTRUCTOR_CALL 'public constructor <init> (id: kotlin.String) declared in <root>.Tag' type=<root>.Tag origin=null
             id: GET_VAR 'id: kotlin.String declared in <root>.Tag.copy' type=kotlin.String origin=null
-    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Tag) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Tag
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Tag'
-          STRING_CONCATENATION type=kotlin.String
-            CONST String type=kotlin.String value="Tag("
-            CONST String type=kotlin.String value="id="
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:id type:kotlin.String visibility:private [final]' type=kotlin.String origin=null
-              receiver: GET_VAR '<this>: <root>.Tag declared in <root>.Tag.toString' type=<root>.Tag origin=null
-            CONST String type=kotlin.String value=")"
-    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Tag) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Tag
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Tag'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:id type:kotlin.String visibility:private [final]' type=kotlin.String origin=null
-              receiver: GET_VAR '<this>: <root>.Tag declared in <root>.Tag.hashCode' type=<root>.Tag origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Tag, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -109,6 +88,27 @@ FILE fqName:<root> fileName:/recordWithCompanion.kt
               CONST Boolean type=kotlin.Boolean value=false
         RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.Tag'
           CONST Boolean type=kotlin.Boolean value=true
+    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Tag) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Tag
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Tag'
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:id type:kotlin.String visibility:private [final]' type=kotlin.String origin=null
+              receiver: GET_VAR '<this>: <root>.Tag declared in <root>.Tag.hashCode' type=<root>.Tag origin=null
+    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Tag) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Tag
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Tag'
+          STRING_CONCATENATION type=kotlin.String
+            CONST String type=kotlin.String value="Tag("
+            CONST String type=kotlin.String value="id="
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:id type:kotlin.String visibility:private [final]' type=kotlin.String origin=null
+              receiver: GET_VAR '<this>: <root>.Tag declared in <root>.Tag.toString' type=<root>.Tag origin=null
+            CONST String type=kotlin.String value=")"
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'

compiler/testData/codegen/boxModernJdk/testsWithJava17/records/recordWithCompanion.ir.txt

@@ -3,11 +3,6 @@ FILE fqName:<root> fileName:/recordWithCompanion.kt
     annotations:
       JvmRecord
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Tag
-    CONSTRUCTOR visibility:public <> (id:kotlin.String) returnType:<root>.Tag [primary]
-      VALUE_PARAMETER name:id index:0 type:kotlin.String
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'protected/*protected and package*/ constructor <init> () declared in java.lang.Record'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Tag modality:FINAL visibility:public [data] superTypes:[java.lang.Record]'
     PROPERTY name:id visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:id type:kotlin.String visibility:private [final]
         EXPRESSION_BODY
@@ -38,6 +33,11 @@ FILE fqName:<root> fileName:/recordWithCompanion.kt
         overridden:
           public open fun toString (): kotlin.String declared in kotlin.Any
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    CONSTRUCTOR visibility:public <> (id:kotlin.String) returnType:<root>.Tag [primary]
+      VALUE_PARAMETER name:id index:0 type:kotlin.String
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'protected/*protected and package*/ constructor <init> () declared in java.lang.Record'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Tag modality:FINAL visibility:public [data] superTypes:[java.lang.Record]'
     FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:<root>.Tag) returnType:kotlin.String [operator]
       $this: VALUE_PARAMETER name:<this> type:<root>.Tag
       BLOCK_BODY
@@ -54,27 +54,6 @@ FILE fqName:<root> fileName:/recordWithCompanion.kt
         RETURN type=kotlin.Nothing from='public final fun copy (id: kotlin.String): <root>.Tag declared in <root>.Tag'
           CONSTRUCTOR_CALL 'public constructor <init> (id: kotlin.String) declared in <root>.Tag' type=<root>.Tag origin=null
             id: GET_VAR 'id: kotlin.String declared in <root>.Tag.copy' type=kotlin.String origin=null
-    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Tag) returnType:kotlin.String
-      overridden:
-        public abstract fun toString (): @[EnhancedNullability] kotlin.String declared in java.lang.Record
-      $this: VALUE_PARAMETER name:<this> type:<root>.Tag
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Tag'
-          STRING_CONCATENATION type=kotlin.String
-            CONST String type=kotlin.String value="Tag("
-            CONST String type=kotlin.String value="id="
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:id type:kotlin.String visibility:private [final]' type=kotlin.String origin=null
-              receiver: GET_VAR '<this>: <root>.Tag declared in <root>.Tag.toString' type=<root>.Tag origin=null
-            CONST String type=kotlin.String value=")"
-    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Tag) returnType:kotlin.Int
-      overridden:
-        public abstract fun hashCode (): kotlin.Int declared in java.lang.Record
-      $this: VALUE_PARAMETER name:<this> type:<root>.Tag
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Tag'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:id type:kotlin.String visibility:private [final]' type=kotlin.String origin=null
-              receiver: GET_VAR '<this>: <root>.Tag declared in <root>.Tag.hashCode' type=<root>.Tag origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Tag, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
       overridden:
         public abstract fun equals (other: @[EnhancedNullability] kotlin.Any?): kotlin.Boolean declared in java.lang.Record
@@ -109,6 +88,27 @@ FILE fqName:<root> fileName:/recordWithCompanion.kt
               CONST Boolean type=kotlin.Boolean value=false
         RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.Tag'
           CONST Boolean type=kotlin.Boolean value=true
+    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Tag) returnType:kotlin.Int
+      overridden:
+        public abstract fun hashCode (): kotlin.Int declared in java.lang.Record
+      $this: VALUE_PARAMETER name:<this> type:<root>.Tag
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Tag'
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:id type:kotlin.String visibility:private [final]' type=kotlin.String origin=null
+              receiver: GET_VAR '<this>: <root>.Tag declared in <root>.Tag.hashCode' type=<root>.Tag origin=null
+    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Tag) returnType:kotlin.String
+      overridden:
+        public abstract fun toString (): @[EnhancedNullability] kotlin.String declared in java.lang.Record
+      $this: VALUE_PARAMETER name:<this> type:<root>.Tag
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Tag'
+          STRING_CONCATENATION type=kotlin.String
+            CONST String type=kotlin.String value="Tag("
+            CONST String type=kotlin.String value="id="
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:id type:kotlin.String visibility:private [final]' type=kotlin.String origin=null
+              receiver: GET_VAR '<this>: <root>.Tag declared in <root>.Tag.toString' type=<root>.Tag origin=null
+            CONST String type=kotlin.String value=")"
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'

compiler/testData/codegen/script/destructuringDeclaration.fir.ir.txt

@@ -40,16 +40,6 @@ FILE fqName:<root> fileName:/destructuringDeclaration.kts
         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:component1 visibility:public modality:FINAL <> ($this:<root>.<script-destructuringDeclaration.kts>.A) returnType:kotlin.Int [operator]
-        $this: VALUE_PARAMETER name:<this> type:<root>.<script-destructuringDeclaration.kts>.A
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Int declared in <root>.<script-destructuringDeclaration.kts>.A'
-            CONST Int type=kotlin.Int value=123
-      FUN name:component2 visibility:public modality:FINAL <> ($this:<root>.<script-destructuringDeclaration.kts>.A) returnType:kotlin.Int [operator]
-        $this: VALUE_PARAMETER name:<this> type:<root>.<script-destructuringDeclaration.kts>.A
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun component2 (): kotlin.Int declared in <root>.<script-destructuringDeclaration.kts>.A'
-            CONST Int type=kotlin.Int value=2
       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
@@ -63,5 +53,15 @@ FILE fqName:<root> fileName:/destructuringDeclaration.kts
         overridden:
           public open fun toString (): kotlin.String declared in kotlin.Any
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      FUN name:component1 visibility:public modality:FINAL <> ($this:<root>.<script-destructuringDeclaration.kts>.A) returnType:kotlin.Int [operator]
+        $this: VALUE_PARAMETER name:<this> type:<root>.<script-destructuringDeclaration.kts>.A
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Int declared in <root>.<script-destructuringDeclaration.kts>.A'
+            CONST Int type=kotlin.Int value=123
+      FUN name:component2 visibility:public modality:FINAL <> ($this:<root>.<script-destructuringDeclaration.kts>.A) returnType:kotlin.Int [operator]
+        $this: VALUE_PARAMETER name:<this> type:<root>.<script-destructuringDeclaration.kts>.A
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun component2 (): kotlin.Int declared in <root>.<script-destructuringDeclaration.kts>.A'
+            CONST Int type=kotlin.Int value=2
     VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:kotlin.script.templates.standard.ScriptTemplateWithArgs
     VAR SCRIPT_CALL_PARAMETER name:args type:kotlin.Array<kotlin.String> [val]

compiler/testData/ir/irText/classes/47424.ir.txt

@@ -64,56 +64,8 @@ FILE fqName:com.example fileName:/47424.kt
         public open fun toString (): kotlin.String declared in com.example.Ab
         public open fun toString (): kotlin.String declared in com.example.Ba
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS INTERFACE name:Ca modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:com.example.Ca
-    PROPERTY name:b visibility:public modality:ABSTRACT [val]
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-b> visibility:public modality:ABSTRACT <> ($this:com.example.Ca) returnType:com.example.Ba
-        correspondingProperty: PROPERTY name:b visibility:public modality:ABSTRACT [val]
-        $this: VALUE_PARAMETER name:<this> type:com.example.Ca
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS INTERFACE name:Cb modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:com.example.Cb
-    PROPERTY name:b visibility:public modality:ABSTRACT [val]
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-b> visibility:public modality:ABSTRACT <> ($this:com.example.Cb) returnType:com.example.Bb<*>
-        correspondingProperty: PROPERTY name:b visibility:public modality:ABSTRACT [val]
-        $this: VALUE_PARAMETER name:<this> type:com.example.Cb
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS INTERFACE name:C modality:ABSTRACT visibility:public superTypes:[com.example.Cb; com.example.Ca]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:com.example.C
-    PROPERTY FAKE_OVERRIDE name:b visibility:public modality:ABSTRACT [fake_override,val]
-      overridden:
-        public abstract b: com.example.Bb<*>
-        public abstract b: com.example.Ba
-      FUN FAKE_OVERRIDE name:<get-b> visibility:public modality:ABSTRACT <> ($this:com.example.Cb) returnType:com.example.Bb<*> [fake_override]
-        correspondingProperty: PROPERTY FAKE_OVERRIDE name:b visibility:public modality:ABSTRACT [fake_override,val]
-        overridden:
-          public abstract fun <get-b> (): com.example.Bb<*> declared in com.example.Cb
-          public abstract fun <get-b> (): com.example.Ba declared in com.example.Ca
-        $this: VALUE_PARAMETER name:<this> type:com.example.Cb
     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 com.example.Cb
@@ -130,3 +82,51 @@ FILE fqName:com.example fileName:/47424.kt
         public open fun toString (): kotlin.String declared in com.example.Cb
         public open fun toString (): kotlin.String declared in com.example.Ca
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    PROPERTY FAKE_OVERRIDE name:b visibility:public modality:ABSTRACT [fake_override,val]
+      overridden:
+        public abstract b: com.example.Bb<*>
+        public abstract b: com.example.Ba
+      FUN FAKE_OVERRIDE name:<get-b> visibility:public modality:ABSTRACT <> ($this:com.example.Cb) returnType:com.example.Bb<*> [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:b visibility:public modality:ABSTRACT [fake_override,val]
+        overridden:
+          public abstract fun <get-b> (): com.example.Bb<*> declared in com.example.Cb
+          public abstract fun <get-b> (): com.example.Ba declared in com.example.Ca
+        $this: VALUE_PARAMETER name:<this> type:com.example.Cb
+  CLASS INTERFACE name:Ca modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:com.example.Ca
+    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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    PROPERTY name:b visibility:public modality:ABSTRACT [val]
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-b> visibility:public modality:ABSTRACT <> ($this:com.example.Ca) returnType:com.example.Ba
+        correspondingProperty: PROPERTY name:b visibility:public modality:ABSTRACT [val]
+        $this: VALUE_PARAMETER name:<this> type:com.example.Ca
+  CLASS INTERFACE name:Cb modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:com.example.Cb
+    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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    PROPERTY name:b visibility:public modality:ABSTRACT [val]
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-b> visibility:public modality:ABSTRACT <> ($this:com.example.Cb) returnType:com.example.Bb<*>
+        correspondingProperty: PROPERTY name:b visibility:public modality:ABSTRACT [val]
+        $this: VALUE_PARAMETER name:<this> type:com.example.Cb

compiler/testData/ir/irText/classes/47424.kt.txt

@@ -12,6 +12,9 @@ interface Ba {
 interface Bb<T : Bb<T>> : Ab<T>, Ba {
 }
 
+interface C : Ca, Cb {
+}
+
 interface Ca {
   abstract val b: Ba
     abstract get
@@ -24,5 +27,3 @@ interface Cb {
 
 }
 
-interface C : Cb, Ca {
-}

compiler/testData/ir/irText/classes/abstractMembers.ir.txt

@@ -5,6 +5,19 @@ FILE fqName:<root> fileName:/abstractMembers.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:AbstractClass modality:ABSTRACT 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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     FUN name:abstractFun visibility:public modality:ABSTRACT <> ($this:<root>.AbstractClass) returnType:kotlin.Unit
       $this: VALUE_PARAMETER name:<this> type:<root>.AbstractClass
     PROPERTY name:abstractVal visibility:public modality:ABSTRACT [val]
@@ -19,6 +32,8 @@ FILE fqName:<root> fileName:/abstractMembers.kt
         correspondingProperty: PROPERTY name:abstractVar visibility:public modality:ABSTRACT [var]
         $this: VALUE_PARAMETER name:<this> type:<root>.AbstractClass
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int
+  CLASS INTERFACE name:Interface modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Interface
     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,8 +47,6 @@ FILE fqName:<root> fileName:/abstractMembers.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS INTERFACE name:Interface modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Interface
     FUN name:abstractFun visibility:public modality:ABSTRACT <> ($this:<root>.Interface) returnType:kotlin.Unit
       $this: VALUE_PARAMETER name:<this> type:<root>.Interface
     PROPERTY name:abstractVal visibility:public modality:ABSTRACT [val]
@@ -48,16 +61,3 @@ FILE fqName:<root> fileName:/abstractMembers.kt
         correspondingProperty: PROPERTY name:abstractVar visibility:public modality:ABSTRACT [var]
         $this: VALUE_PARAMETER name:<this> type:<root>.Interface
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any

compiler/testData/ir/irText/classes/annotationClasses.ir.txt

@@ -1,11 +1,6 @@
 FILE fqName:<root> fileName:/annotationClasses.kt
   CLASS ANNOTATION_CLASS name:Test1 modality:OPEN visibility:public superTypes:[kotlin.Annotation]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test1
-    CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:<root>.Test1 [primary]
-      VALUE_PARAMETER name:x index:0 type:kotlin.Int
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:Test1 modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
     PROPERTY name:x visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]
         EXPRESSION_BODY
@@ -17,6 +12,11 @@ FILE fqName:<root> fileName:/annotationClasses.kt
           RETURN type=kotlin.Nothing from='public final fun <get-x> (): kotlin.Int declared in <root>.Test1'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null
               receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.<get-x>' type=<root>.Test1 origin=null
+    CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:<root>.Test1 [primary]
+      VALUE_PARAMETER name:x index:0 type:kotlin.Int
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:Test1 modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
     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.Annotation
@@ -32,13 +32,6 @@ FILE fqName:<root> fileName:/annotationClasses.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS ANNOTATION_CLASS name:Test2 modality:OPEN visibility:public superTypes:[kotlin.Annotation]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test2
-    CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:<root>.Test2 [primary]
-      VALUE_PARAMETER name:x index:0 type:kotlin.Int
-        EXPRESSION_BODY
-          CONST Int type=kotlin.Int value=0
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:Test2 modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
     PROPERTY name:x visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]
         EXPRESSION_BODY
@@ -50,6 +43,13 @@ FILE fqName:<root> fileName:/annotationClasses.kt
           RETURN type=kotlin.Nothing from='public final fun <get-x> (): kotlin.Int declared in <root>.Test2'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null
               receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.<get-x>' type=<root>.Test2 origin=null
+    CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:<root>.Test2 [primary]
+      VALUE_PARAMETER name:x index:0 type:kotlin.Int
+        EXPRESSION_BODY
+          CONST Int type=kotlin.Int value=0
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:Test2 modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
     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.Annotation
@@ -65,11 +65,6 @@ FILE fqName:<root> fileName:/annotationClasses.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS ANNOTATION_CLASS name:Test3 modality:OPEN visibility:public superTypes:[kotlin.Annotation]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test3
-    CONSTRUCTOR visibility:public <> (x:<root>.Test1) returnType:<root>.Test3 [primary]
-      VALUE_PARAMETER name:x index:0 type:<root>.Test1
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:Test3 modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
     PROPERTY name:x visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:x type:<root>.Test1 visibility:private [final]
         EXPRESSION_BODY
@@ -81,6 +76,11 @@ FILE fqName:<root> fileName:/annotationClasses.kt
           RETURN type=kotlin.Nothing from='public final fun <get-x> (): <root>.Test1 declared in <root>.Test3'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:<root>.Test1 visibility:private [final]' type=<root>.Test1 origin=null
               receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.<get-x>' type=<root>.Test3 origin=null
+    CONSTRUCTOR visibility:public <> (x:<root>.Test1) returnType:<root>.Test3 [primary]
+      VALUE_PARAMETER name:x index:0 type:<root>.Test1
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:Test3 modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
     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.Annotation
@@ -96,11 +96,6 @@ FILE fqName:<root> fileName:/annotationClasses.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS ANNOTATION_CLASS name:Test4 modality:OPEN visibility:public superTypes:[kotlin.Annotation]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test4
-    CONSTRUCTOR visibility:public <> (xs:kotlin.IntArray) returnType:<root>.Test4 [primary]
-      VALUE_PARAMETER name:xs index:0 type:kotlin.IntArray varargElementType:kotlin.Int [vararg]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:Test4 modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
     PROPERTY name:xs visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.IntArray visibility:private [final]
         EXPRESSION_BODY
@@ -112,6 +107,11 @@ FILE fqName:<root> fileName:/annotationClasses.kt
           RETURN type=kotlin.Nothing from='public final fun <get-xs> (): kotlin.IntArray declared in <root>.Test4'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.IntArray visibility:private [final]' type=kotlin.IntArray origin=null
               receiver: GET_VAR '<this>: <root>.Test4 declared in <root>.Test4.<get-xs>' type=<root>.Test4 origin=null
+    CONSTRUCTOR visibility:public <> (xs:kotlin.IntArray) returnType:<root>.Test4 [primary]
+      VALUE_PARAMETER name:xs index:0 type:kotlin.IntArray varargElementType:kotlin.Int [vararg]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:Test4 modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
     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.Annotation

compiler/testData/ir/irText/classes/annotationClasses.kt.txt

@@ -1,51 +1,52 @@
 open annotation class Test1 : Annotation {
+  val x: Int
+    field = x
+    get
+
   constructor(x: Int) /* primary */ {
     super/*Any*/()
     /* <init>() */
 
   }
 
+}
+
+open annotation class Test2 : Annotation {
   val x: Int
     field = x
     get
 
-}
-
-open annotation class Test2 : Annotation {
   constructor(x: Int = 0) /* primary */ {
     super/*Any*/()
     /* <init>() */
 
   }
 
-  val x: Int
-    field = x
-    get
-
 }
 
 open annotation class Test3 : Annotation {
+  val x: Test1
+    field = x
+    get
+
   constructor(x: Test1) /* primary */ {
     super/*Any*/()
     /* <init>() */
 
   }
 
-  val x: Test1
-    field = x
-    get
-
 }
 
 open annotation class Test4 : Annotation {
+  val xs: IntArray
+    field = xs
+    get
+
   constructor(vararg xs: Int) /* primary */ {
     super/*Any*/()
     /* <init>() */
 
   }
 
-  val xs: IntArray
-    field = xs
-    get
-
 }
+

compiler/testData/ir/irText/classes/annotationsOnDelegatedMembers.fir.ir.txt

@@ -1,131 +0,0 @@
-FILE fqName:<root> fileName:/annotationsOnDelegatedMembers.kt
-  CLASS ANNOTATION_CLASS name:Ann modality:OPEN visibility:public superTypes:[kotlin.Annotation]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Ann
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Ann [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:Ann modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
-    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.Annotation
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Annotation
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Annotation
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS INTERFACE name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Base
-    FUN name:func visibility:public modality:ABSTRACT <> ($this:<root>.Base) returnType:kotlin.Unit
-      annotations:
-        Ann
-      $this: VALUE_PARAMETER name:<this> type:<root>.Base
-    PROPERTY name:prop visibility:public modality:ABSTRACT [val]
-      annotations:
-        Ann
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-prop> visibility:public modality:ABSTRACT <> ($this:<root>.Base) returnType:kotlin.Int
-        correspondingProperty: PROPERTY name:prop visibility:public modality:ABSTRACT [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.Base
-    PROPERTY name:propWithAccessors visibility:public modality:ABSTRACT [var]
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-propWithAccessors> visibility:public modality:ABSTRACT <> ($this:<root>.Base) returnType:kotlin.Int
-        annotations:
-          Ann
-        correspondingProperty: PROPERTY name:propWithAccessors visibility:public modality:ABSTRACT [var]
-        $this: VALUE_PARAMETER name:<this> type:<root>.Base
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<set-propWithAccessors> visibility:public modality:ABSTRACT <> ($this:<root>.Base, <set-?>:kotlin.Int) returnType:kotlin.Unit
-        annotations:
-          Ann
-        correspondingProperty: PROPERTY name:propWithAccessors visibility:public modality:ABSTRACT [var]
-        $this: VALUE_PARAMETER name:<this> type:<root>.Base
-        VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:Delegated modality:FINAL visibility:public superTypes:[<root>.Base]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Delegated
-    CONSTRUCTOR visibility:public <> (b:<root>.Base) returnType:<root>.Delegated [primary]
-      VALUE_PARAMETER name:b index:0 type:<root>.Base
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Delegated modality:FINAL visibility:public superTypes:[<root>.Base]'
-    FIELD DELEGATE name:$$delegate_0 type:<root>.Base visibility:private [final]
-      EXPRESSION_BODY
-        GET_VAR 'b: <root>.Base declared in <root>.Delegated.<init>' type=<root>.Base origin=null
-    FUN DELEGATED_MEMBER name:func visibility:public modality:OPEN <> ($this:<root>.Delegated) returnType:kotlin.Unit
-      annotations:
-        Ann
-      overridden:
-        public abstract fun func (): kotlin.Unit declared in <root>.Base
-      $this: VALUE_PARAMETER name:<this> type:<root>.Delegated
-      BLOCK_BODY
-        CALL 'public abstract fun func (): kotlin.Unit declared in <root>.Base' type=kotlin.Unit origin=null
-          $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.Base visibility:private [final]' type=<root>.Base origin=null
-            receiver: GET_VAR '<this>: <root>.Delegated declared in <root>.Delegated.func' type=<root>.Delegated origin=null
-    PROPERTY DELEGATED_MEMBER name:prop visibility:public modality:OPEN [val]
-      overridden:
-        public abstract prop: kotlin.Int
-      FUN DELEGATED_MEMBER name:<get-prop> visibility:public modality:OPEN <> ($this:<root>.Delegated) returnType:kotlin.Int
-        correspondingProperty: PROPERTY DELEGATED_MEMBER name:prop visibility:public modality:OPEN [val]
-        overridden:
-          public abstract fun <get-prop> (): kotlin.Int declared in <root>.Base
-        $this: VALUE_PARAMETER name:<this> type:<root>.Delegated
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun <get-prop> (): kotlin.Int declared in <root>.Delegated'
-            CALL 'public abstract fun <get-prop> (): kotlin.Int declared in <root>.Base' type=kotlin.Int origin=null
-              $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.Base visibility:private [final]' type=<root>.Base origin=null
-                receiver: GET_VAR '<this>: <root>.Delegated declared in <root>.Delegated.<get-prop>' type=<root>.Delegated origin=null
-    PROPERTY DELEGATED_MEMBER name:propWithAccessors visibility:public modality:OPEN [var]
-      overridden:
-        public abstract propWithAccessors: kotlin.Int
-      FUN DELEGATED_MEMBER name:<get-propWithAccessors> visibility:public modality:OPEN <> ($this:<root>.Delegated) returnType:kotlin.Int
-        annotations:
-          Ann
-        correspondingProperty: PROPERTY DELEGATED_MEMBER name:propWithAccessors visibility:public modality:OPEN [var]
-        overridden:
-          public abstract fun <get-propWithAccessors> (): kotlin.Int declared in <root>.Base
-        $this: VALUE_PARAMETER name:<this> type:<root>.Delegated
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun <get-propWithAccessors> (): kotlin.Int declared in <root>.Delegated'
-            CALL 'public abstract fun <get-propWithAccessors> (): kotlin.Int declared in <root>.Base' type=kotlin.Int origin=null
-              $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.Base visibility:private [final]' type=<root>.Base origin=null
-                receiver: GET_VAR '<this>: <root>.Delegated declared in <root>.Delegated.<get-propWithAccessors>' type=<root>.Delegated origin=null
-      FUN DELEGATED_MEMBER name:<set-propWithAccessors> visibility:public modality:OPEN <> ($this:<root>.Delegated, <set-?>:kotlin.Int) returnType:kotlin.Unit
-        annotations:
-          Ann
-        correspondingProperty: PROPERTY DELEGATED_MEMBER name:propWithAccessors visibility:public modality:OPEN [var]
-        overridden:
-          public abstract fun <set-propWithAccessors> (<set-?>: kotlin.Int): kotlin.Unit declared in <root>.Base
-        $this: VALUE_PARAMETER name:<this> type:<root>.Delegated
-        VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int
-        BLOCK_BODY
-          CALL 'public abstract fun <set-propWithAccessors> (<set-?>: kotlin.Int): kotlin.Unit declared in <root>.Base' type=kotlin.Unit origin=null
-            $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.Base visibility:private [final]' type=<root>.Base origin=null
-              receiver: GET_VAR '<this>: <root>.Delegated declared in <root>.Delegated.<set-propWithAccessors>' type=<root>.Delegated origin=null
-            <set-?>: GET_VAR '<set-?>: kotlin.Int declared in <root>.Delegated.<set-propWithAccessors>' type=kotlin.Int 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 <root>.Base
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.Base
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.Base
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any

compiler/testData/ir/irText/classes/annotationsOnDelegatedMembers.fir.kt.txt

@@ -1,54 +0,0 @@
-open annotation class Ann : Annotation {
-  constructor() /* primary */ {
-    super/*Any*/()
-    /* <init>() */
-
-  }
-
-}
-
-interface Base {
-  @Ann
-  abstract fun func()
-
-  @Ann
-  abstract val prop: Int
-    abstract get
-
-  abstract var propWithAccessors: Int
-    @Ann
-    abstract get
-    @Ann
-    abstract set
-
-}
-
-class Delegated : Base {
-  constructor(b: Base) /* primary */ {
-    super/*Any*/()
-    /* <init>() */
-
-  }
-
-  private /* final field */ val $$delegate_0: Base = b
-  @Ann
-  override fun func() {
-    <this>.#$$delegate_0.func()
-  }
-
-  override val prop: Int
-    override get(): Int {
-      return <this>.#$$delegate_0.<get-prop>()
-    }
-
-  override var propWithAccessors: Int
-    @Ann
-    override get(): Int {
-      return <this>.#$$delegate_0.<get-propWithAccessors>()
-    }
-    @Ann
-    override set(<set-?>: Int) {
-      <this>.#$$delegate_0.<set-propWithAccessors>(<set-?> = <set-?>)
-    }
-
-}

compiler/testData/ir/irText/classes/annotationsOnDelegatedMembers.ir.txt

@@ -18,53 +18,39 @@ FILE fqName:<root> fileName:/annotationsOnDelegatedMembers.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Annotation
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS INTERFACE name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Base
-    FUN name:func visibility:public modality:ABSTRACT <> ($this:<root>.Base) returnType:kotlin.Unit
-      annotations:
-        Ann
-      $this: VALUE_PARAMETER name:<this> type:<root>.Base
-    PROPERTY name:prop visibility:public modality:ABSTRACT [val]
-      annotations:
-        Ann
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-prop> visibility:public modality:ABSTRACT <> ($this:<root>.Base) returnType:kotlin.Int
-        correspondingProperty: PROPERTY name:prop visibility:public modality:ABSTRACT [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.Base
-    PROPERTY name:propWithAccessors visibility:public modality:ABSTRACT [var]
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-propWithAccessors> visibility:public modality:ABSTRACT <> ($this:<root>.Base) returnType:kotlin.Int
-        annotations:
-          Ann
-        correspondingProperty: PROPERTY name:propWithAccessors visibility:public modality:ABSTRACT [var]
-        $this: VALUE_PARAMETER name:<this> type:<root>.Base
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<set-propWithAccessors> visibility:public modality:ABSTRACT <> ($this:<root>.Base, <set-?>:kotlin.Int) returnType:kotlin.Unit
-        annotations:
-          Ann
-        correspondingProperty: PROPERTY name:propWithAccessors visibility:public modality:ABSTRACT [var]
-        $this: VALUE_PARAMETER name:<this> type:<root>.Base
-        VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:Delegated modality:FINAL visibility:public superTypes:[<root>.Base]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Delegated
+    FIELD DELEGATE name:$$delegate_0 type:<root>.Base visibility:private [final]
+      EXPRESSION_BODY
+        GET_VAR 'b: <root>.Base declared in <root>.Delegated.<init>' type=<root>.Base origin=null
     CONSTRUCTOR visibility:public <> (b:<root>.Base) returnType:<root>.Delegated [primary]
       VALUE_PARAMETER name:b index:0 type:<root>.Base
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Delegated modality:FINAL visibility:public superTypes:[<root>.Base]'
-    FIELD DELEGATE name:$$delegate_0 type:<root>.Base visibility:private [final]
-      EXPRESSION_BODY
-        GET_VAR 'b: <root>.Base declared in <root>.Delegated.<init>' type=<root>.Base origin=null
+    FUN DELEGATED_MEMBER name:func visibility:public modality:OPEN <> ($this:<root>.Delegated) returnType:kotlin.Unit
+      annotations:
+        Ann
+      overridden:
+        public abstract fun func (): kotlin.Unit declared in <root>.Base
+      $this: VALUE_PARAMETER name:<this> type:<root>.Delegated
+      BLOCK_BODY
+        CALL 'public abstract fun func (): kotlin.Unit declared in <root>.Base' type=kotlin.Unit origin=null
+          $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.Base visibility:private [final]' type=<root>.Base origin=null
+            receiver: GET_VAR '<this>: <root>.Delegated declared in <root>.Delegated.func' type=<root>.Delegated 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 <root>.Base
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.Base
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.Base
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     PROPERTY DELEGATED_MEMBER name:prop visibility:public modality:OPEN [val]
       overridden:
         public abstract prop: kotlin.Int
@@ -106,26 +92,40 @@ FILE fqName:<root> fileName:/annotationsOnDelegatedMembers.kt
             $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.Base visibility:private [final]' type=<root>.Base origin=null
               receiver: GET_VAR '<this>: <root>.Delegated declared in <root>.Delegated.<set-propWithAccessors>' type=<root>.Delegated origin=null
             <set-?>: GET_VAR '<set-?>: kotlin.Int declared in <root>.Delegated.<set-propWithAccessors>' type=kotlin.Int origin=null
-    FUN DELEGATED_MEMBER name:func visibility:public modality:OPEN <> ($this:<root>.Delegated) returnType:kotlin.Unit
-      annotations:
-        Ann
-      overridden:
-        public abstract fun func (): kotlin.Unit declared in <root>.Base
-      $this: VALUE_PARAMETER name:<this> type:<root>.Delegated
-      BLOCK_BODY
-        CALL 'public abstract fun func (): kotlin.Unit declared in <root>.Base' type=kotlin.Unit origin=null
-          $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.Base visibility:private [final]' type=<root>.Base origin=null
-            receiver: GET_VAR '<this>: <root>.Delegated declared in <root>.Delegated.func' type=<root>.Delegated origin=null
+  CLASS INTERFACE name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Base
     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 <root>.Base
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
     FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.Base
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
-        public open fun toString (): kotlin.String declared in <root>.Base
+        public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:func visibility:public modality:ABSTRACT <> ($this:<root>.Base) returnType:kotlin.Unit
+      annotations:
+        Ann
+      $this: VALUE_PARAMETER name:<this> type:<root>.Base
+    PROPERTY name:prop visibility:public modality:ABSTRACT [val]
+      annotations:
+        Ann
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-prop> visibility:public modality:ABSTRACT <> ($this:<root>.Base) returnType:kotlin.Int
+        correspondingProperty: PROPERTY name:prop visibility:public modality:ABSTRACT [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.Base
+    PROPERTY name:propWithAccessors visibility:public modality:ABSTRACT [var]
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-propWithAccessors> visibility:public modality:ABSTRACT <> ($this:<root>.Base) returnType:kotlin.Int
+        annotations:
+          Ann
+        correspondingProperty: PROPERTY name:propWithAccessors visibility:public modality:ABSTRACT [var]
+        $this: VALUE_PARAMETER name:<this> type:<root>.Base
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<set-propWithAccessors> visibility:public modality:ABSTRACT <> ($this:<root>.Base, <set-?>:kotlin.Int) returnType:kotlin.Unit
+        annotations:
+          Ann
+        correspondingProperty: PROPERTY name:propWithAccessors visibility:public modality:ABSTRACT [var]
+        $this: VALUE_PARAMETER name:<this> type:<root>.Base
+        VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int

compiler/testData/ir/irText/classes/annotationsOnDelegatedMembers.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // ISSUE: KT-64466
 
 annotation class Ann

compiler/testData/ir/irText/classes/annotationsOnDelegatedMembers.kt.txt

@@ -7,6 +7,36 @@ open annotation class Ann : Annotation {
 
 }
 
+class Delegated : Base {
+  private /* final field */ val $$delegate_0: Base = b
+  constructor(b: Base) /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
+  }
+
+  @Ann
+  override fun func() {
+    <this>.#$$delegate_0.func()
+  }
+
+  override val prop: Int
+    override get(): Int {
+      return <this>.#$$delegate_0.<get-prop>()
+    }
+
+  override var propWithAccessors: Int
+    @Ann
+    override get(): Int {
+      return <this>.#$$delegate_0.<get-propWithAccessors>()
+    }
+    @Ann
+    override set(<set-?>: Int) {
+      <this>.#$$delegate_0.<set-propWithAccessors>(<set-?> = <set-?>)
+    }
+
+}
+
 interface Base {
   @Ann
   abstract fun func()
@@ -23,32 +53,3 @@ interface Base {
 
 }
 
-class Delegated : Base {
-  constructor(b: Base) /* primary */ {
-    super/*Any*/()
-    /* <init>() */
-
-  }
-
-  private /* final field */ val $$delegate_0: Base = b
-  override val prop: Int
-    override get(): Int {
-      return <this>.#$$delegate_0.<get-prop>()
-    }
-
-  override var propWithAccessors: Int
-    @Ann
-    override get(): Int {
-      return <this>.#$$delegate_0.<get-propWithAccessors>()
-    }
-    @Ann
-    override set(<set-?>: Int) {
-      <this>.#$$delegate_0.<set-propWithAccessors>(<set-?> = <set-?>)
-    }
-
-  @Ann
-  override fun func() {
-    <this>.#$$delegate_0.func()
-  }
-
-}

compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.ir.txt

@@ -1,12 +1,6 @@
 FILE fqName:<root> fileName:/argumentReorderingInDelegatingConstructorCall.kt
   CLASS CLASS name:Base modality:OPEN visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Base
-    CONSTRUCTOR visibility:public <> (x:kotlin.Int, y:kotlin.Int) returnType:<root>.Base [primary]
-      VALUE_PARAMETER name:x index:0 type:kotlin.Int
-      VALUE_PARAMETER name:y index:1 type:kotlin.Int
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Base modality:OPEN visibility:public superTypes:[kotlin.Any]'
     PROPERTY name:x visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]
         EXPRESSION_BODY
@@ -29,6 +23,12 @@ FILE fqName:<root> fileName:/argumentReorderingInDelegatingConstructorCall.kt
           RETURN type=kotlin.Nothing from='public final fun <get-y> (): kotlin.Int declared in <root>.Base'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null
               receiver: GET_VAR '<this>: <root>.Base declared in <root>.Base.<get-y>' type=<root>.Base origin=null
+    CONSTRUCTOR visibility:public <> (x:kotlin.Int, y:kotlin.Int) returnType:<root>.Base [primary]
+      VALUE_PARAMETER name:x index:0 type:kotlin.Int
+      VALUE_PARAMETER name:y index:1 type:kotlin.Int
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Base modality:OPEN 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
@@ -52,6 +52,19 @@ FILE fqName:<root> fileName:/argumentReorderingInDelegatingConstructorCall.kt
           x: GET_VAR 'xx: kotlin.Int declared in <root>.Test1.<init>' type=kotlin.Int origin=null
           y: GET_VAR 'yy: kotlin.Int declared in <root>.Test1.<init>' type=kotlin.Int origin=null
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:FINAL visibility:public superTypes:[<root>.Base]'
+    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 <root>.Base
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.Base
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.Base
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [fake_override,val]
       overridden:
         public final x: kotlin.Int
@@ -68,19 +81,6 @@ FILE fqName:<root> fileName:/argumentReorderingInDelegatingConstructorCall.kt
         overridden:
           public final fun <get-y> (): kotlin.Int declared in <root>.Base
         $this: VALUE_PARAMETER name:<this> type:<root>.Base
-    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 <root>.Base
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.Base
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.Base
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:Test2 modality:FINAL visibility:public superTypes:[<root>.Base]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test2
     CONSTRUCTOR visibility:public <> (xx:kotlin.Int, yy:kotlin.Int) returnType:<root>.Test2
@@ -99,6 +99,19 @@ FILE fqName:<root> fileName:/argumentReorderingInDelegatingConstructorCall.kt
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (xx: kotlin.Int, yy: kotlin.Int) declared in <root>.Test2'
           xx: GET_VAR 'xxx: kotlin.Int declared in <root>.Test2.<init>' type=kotlin.Int origin=null
           yy: GET_VAR 'yyy: kotlin.Int declared in <root>.Test2.<init>' type=kotlin.Int 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 <root>.Base
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.Base
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.Base
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [fake_override,val]
       overridden:
         public final x: kotlin.Int
@@ -115,16 +128,3 @@ FILE fqName:<root> fileName:/argumentReorderingInDelegatingConstructorCall.kt
         overridden:
           public final fun <get-y> (): kotlin.Int declared in <root>.Base
         $this: VALUE_PARAMETER name:<this> type:<root>.Base
-    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 <root>.Base
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.Base
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.Base
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any

compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.kt.txt

@@ -1,10 +1,4 @@
 open class Base {
-  constructor(x: Int, y: Int) /* primary */ {
-    super/*Any*/()
-    /* <init>() */
-
-  }
-
   val x: Int
     field = x
     get
@@ -13,6 +7,12 @@ open class Base {
     field = y
     get
 
+  constructor(x: Int, y: Int) /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
+  }
+
 }
 
 class Test1 : Base {
@@ -36,3 +36,4 @@ class Test2 : Base {
   }
 
 }
+

compiler/testData/ir/irText/classes/clashingFakeOverrideSignatures.ir.txt

@@ -6,6 +6,19 @@ FILE fqName:<root> fileName:/clashingFakeOverrideSignatures.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Base modality:OPEN 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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     FUN name:foo visibility:public modality:FINAL <> ($this:<root>.Base<T of <root>.Base>, x:T of <root>.Base) returnType:kotlin.Unit
       $this: VALUE_PARAMETER name:<this> type:<root>.Base<T of <root>.Base>
       VALUE_PARAMETER name:x index:0 type:T of <root>.Base
@@ -30,6 +43,14 @@ FILE fqName:<root> fileName:/clashingFakeOverrideSignatures.kt
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='public final fun <get-bar> (): kotlin.Int declared in <root>.Base'
             CONST Int type=kotlin.Int value=2
+  CLASS CLASS name:BaseXY modality:OPEN visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.BaseXY<X of <root>.BaseXY, Y of <root>.BaseXY>
+    TYPE_PARAMETER name:X index:0 variance: superTypes:[kotlin.Any?] reified:false
+    TYPE_PARAMETER name:Y index:1 variance: superTypes:[kotlin.Any?] reified:false
+    CONSTRUCTOR visibility:public <> () returnType:<root>.BaseXY<X of <root>.BaseXY, Y of <root>.BaseXY> [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:BaseXY modality:OPEN 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
@@ -43,132 +64,6 @@ FILE fqName:<root> fileName:/clashingFakeOverrideSignatures.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:Derived modality:OPEN visibility:public superTypes:[<root>.Base<kotlin.String>]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Derived
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Derived [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Base'
-          <T>: kotlin.String
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Derived modality:OPEN visibility:public superTypes:[<root>.Base<kotlin.String>]'
-    FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <> ($this:<root>.Base<kotlin.String>, x:kotlin.String) returnType:kotlin.Unit [fake_override]
-      overridden:
-        public final fun foo (x: T of <root>.Base): kotlin.Unit declared in <root>.Base
-      $this: VALUE_PARAMETER name:<this> type:<root>.Base<kotlin.String>
-      VALUE_PARAMETER name:x index:0 type:kotlin.String
-    FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <> ($this:<root>.Base<kotlin.String>, y:kotlin.String) returnType:kotlin.Unit [fake_override]
-      overridden:
-        public final fun foo (y: kotlin.String): kotlin.Unit declared in <root>.Base
-      $this: VALUE_PARAMETER name:<this> type:<root>.Base<kotlin.String>
-      VALUE_PARAMETER name:y index:0 type:kotlin.String
-    PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
-      overridden:
-        public final bar: kotlin.Int
-      FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:FINAL <> ($this:<root>.Base<kotlin.String>, $receiver:kotlin.String) returnType:kotlin.Int [fake_override]
-        correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
-        overridden:
-          public final fun <get-bar> (): kotlin.Int declared in <root>.Base
-        $this: VALUE_PARAMETER name:<this> type:<root>.Base<kotlin.String>
-        $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
-    PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
-      overridden:
-        public final bar: kotlin.Int
-      FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:FINAL <> ($this:<root>.Base<kotlin.String>, $receiver:kotlin.String) returnType:kotlin.Int [fake_override]
-        correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
-        overridden:
-          public final fun <get-bar> (): kotlin.Int declared in <root>.Base
-        $this: VALUE_PARAMETER name:<this> type:<root>.Base<kotlin.String>
-        $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
-    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 <root>.Base
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.Base
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.Base
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:Derived2 modality:FINAL visibility:public superTypes:[<root>.Derived]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Derived2
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Derived2 [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Derived'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Derived2 modality:FINAL visibility:public superTypes:[<root>.Derived]'
-    FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <> ($this:<root>.Base<kotlin.String>, x:kotlin.String) returnType:kotlin.Unit [fake_override]
-      overridden:
-        public final fun foo (x: kotlin.String): kotlin.Unit declared in <root>.Derived
-      $this: VALUE_PARAMETER name:<this> type:<root>.Base<kotlin.String>
-      VALUE_PARAMETER name:x index:0 type:kotlin.String
-    FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <> ($this:<root>.Base<kotlin.String>, y:kotlin.String) returnType:kotlin.Unit [fake_override]
-      overridden:
-        public final fun foo (y: kotlin.String): kotlin.Unit declared in <root>.Derived
-      $this: VALUE_PARAMETER name:<this> type:<root>.Base<kotlin.String>
-      VALUE_PARAMETER name:y index:0 type:kotlin.String
-    PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
-      overridden:
-        public final bar: kotlin.Int
-      FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:FINAL <> ($this:<root>.Base<kotlin.String>, $receiver:kotlin.String) returnType:kotlin.Int [fake_override]
-        correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
-        overridden:
-          public final fun <get-bar> (): kotlin.Int declared in <root>.Derived
-        $this: VALUE_PARAMETER name:<this> type:<root>.Base<kotlin.String>
-        $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
-    PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
-      overridden:
-        public final bar: kotlin.Int
-      FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:FINAL <> ($this:<root>.Base<kotlin.String>, $receiver:kotlin.String) returnType:kotlin.Int [fake_override]
-        correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
-        overridden:
-          public final fun <get-bar> (): kotlin.Int declared in <root>.Derived
-        $this: VALUE_PARAMETER name:<this> type:<root>.Base<kotlin.String>
-        $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
-    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 <root>.Derived
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.Derived
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.Derived
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  FUN name:test visibility:public modality:FINAL <> (b:<root>.Base<kotlin.String>, d:<root>.Derived, d2:<root>.Derived2) returnType:kotlin.Unit
-    VALUE_PARAMETER name:b index:0 type:<root>.Base<kotlin.String>
-    VALUE_PARAMETER name:d index:1 type:<root>.Derived
-    VALUE_PARAMETER name:d2 index:2 type:<root>.Derived2
-    BLOCK_BODY
-      CALL 'public final fun foo (x: T of <root>.Base): kotlin.Unit declared in <root>.Base' type=kotlin.Unit origin=null
-        $this: GET_VAR 'b: <root>.Base<kotlin.String> declared in <root>.test' type=<root>.Base<kotlin.String> origin=null
-        x: CONST String type=kotlin.String value=""
-      CALL 'public final fun foo (y: kotlin.String): kotlin.Unit declared in <root>.Base' type=kotlin.Unit origin=null
-        $this: GET_VAR 'b: <root>.Base<kotlin.String> declared in <root>.test' type=<root>.Base<kotlin.String> origin=null
-        y: CONST String type=kotlin.String value=""
-      CALL 'public final fun foo (x: kotlin.String): kotlin.Unit declared in <root>.Derived' type=kotlin.Unit origin=null
-        $this: GET_VAR 'd: <root>.Derived declared in <root>.test' type=<root>.Derived origin=null
-        x: CONST String type=kotlin.String value=""
-      CALL 'public final fun foo (y: kotlin.String): kotlin.Unit declared in <root>.Derived' type=kotlin.Unit origin=null
-        $this: GET_VAR 'd: <root>.Derived declared in <root>.test' type=<root>.Derived origin=null
-        y: CONST String type=kotlin.String value=""
-      CALL 'public final fun foo (x: kotlin.String): kotlin.Unit declared in <root>.Derived2' type=kotlin.Unit origin=null
-        $this: GET_VAR 'd2: <root>.Derived2 declared in <root>.test' type=<root>.Derived2 origin=null
-        x: CONST String type=kotlin.String value=""
-      CALL 'public final fun foo (y: kotlin.String): kotlin.Unit declared in <root>.Derived2' type=kotlin.Unit origin=null
-        $this: GET_VAR 'd2: <root>.Derived2 declared in <root>.test' type=<root>.Derived2 origin=null
-        y: CONST String type=kotlin.String value=""
-  CLASS CLASS name:BaseXY modality:OPEN visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.BaseXY<X of <root>.BaseXY, Y of <root>.BaseXY>
-    TYPE_PARAMETER name:X index:0 variance: superTypes:[kotlin.Any?] reified:false
-    TYPE_PARAMETER name:Y index:1 variance: superTypes:[kotlin.Any?] reified:false
-    CONSTRUCTOR visibility:public <> () returnType:<root>.BaseXY<X of <root>.BaseXY, Y of <root>.BaseXY> [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:BaseXY modality:OPEN visibility:public superTypes:[kotlin.Any]'
     FUN name:foo visibility:public modality:FINAL <> ($this:<root>.BaseXY<X of <root>.BaseXY, Y of <root>.BaseXY>, x:X of <root>.BaseXY, y:kotlin.String) returnType:kotlin.Unit
       $this: VALUE_PARAMETER name:<this> type:<root>.BaseXY<X of <root>.BaseXY, Y of <root>.BaseXY>
       VALUE_PARAMETER name:x index:0 type:X of <root>.BaseXY
@@ -179,19 +74,101 @@ FILE fqName:<root> fileName:/clashingFakeOverrideSignatures.kt
       VALUE_PARAMETER name:x index:0 type:kotlin.String
       VALUE_PARAMETER name:y index:1 type:Y of <root>.BaseXY
       BLOCK_BODY
+  CLASS CLASS name:Derived modality:OPEN visibility:public superTypes:[<root>.Base<kotlin.String>]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Derived
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Derived [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Base'
+          <T>: kotlin.String
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Derived modality:OPEN visibility:public superTypes:[<root>.Base<kotlin.String>]'
     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
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.Base
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
       VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <> ($this:<root>.Base<kotlin.String>, x:kotlin.String) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public final fun foo (x: T of <root>.Base): kotlin.Unit declared in <root>.Base
+      $this: VALUE_PARAMETER name:<this> type:<root>.Base<kotlin.String>
+      VALUE_PARAMETER name:x index:0 type:kotlin.String
+    FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <> ($this:<root>.Base<kotlin.String>, y:kotlin.String) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public final fun foo (y: kotlin.String): kotlin.Unit declared in <root>.Base
+      $this: VALUE_PARAMETER name:<this> type:<root>.Base<kotlin.String>
+      VALUE_PARAMETER name:y index:0 type:kotlin.String
     FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+        public open fun hashCode (): kotlin.Int declared in <root>.Base
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
     FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
       overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
+        public open fun toString (): kotlin.String declared in <root>.Base
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
+      overridden:
+        public final bar: kotlin.Int
+      FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:FINAL <> ($this:<root>.Base<kotlin.String>, $receiver:kotlin.String) returnType:kotlin.Int [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
+        overridden:
+          public final fun <get-bar> (): kotlin.Int declared in <root>.Base
+        $this: VALUE_PARAMETER name:<this> type:<root>.Base<kotlin.String>
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+    PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
+      overridden:
+        public final bar: kotlin.Int
+      FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:FINAL <> ($this:<root>.Base<kotlin.String>, $receiver:kotlin.String) returnType:kotlin.Int [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
+        overridden:
+          public final fun <get-bar> (): kotlin.Int declared in <root>.Base
+        $this: VALUE_PARAMETER name:<this> type:<root>.Base<kotlin.String>
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+  CLASS CLASS name:Derived2 modality:FINAL visibility:public superTypes:[<root>.Derived]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Derived2
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Derived2 [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Derived'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Derived2 modality:FINAL visibility:public superTypes:[<root>.Derived]'
+    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 <root>.Derived
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <> ($this:<root>.Base<kotlin.String>, x:kotlin.String) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public final fun foo (x: kotlin.String): kotlin.Unit declared in <root>.Derived
+      $this: VALUE_PARAMETER name:<this> type:<root>.Base<kotlin.String>
+      VALUE_PARAMETER name:x index:0 type:kotlin.String
+    FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <> ($this:<root>.Base<kotlin.String>, y:kotlin.String) returnType:kotlin.Unit [fake_override]
+      overridden:
+        public final fun foo (y: kotlin.String): kotlin.Unit declared in <root>.Derived
+      $this: VALUE_PARAMETER name:<this> type:<root>.Base<kotlin.String>
+      VALUE_PARAMETER name:y index:0 type:kotlin.String
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.Derived
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.Derived
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
+      overridden:
+        public final bar: kotlin.Int
+      FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:FINAL <> ($this:<root>.Base<kotlin.String>, $receiver:kotlin.String) returnType:kotlin.Int [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
+        overridden:
+          public final fun <get-bar> (): kotlin.Int declared in <root>.Derived
+        $this: VALUE_PARAMETER name:<this> type:<root>.Base<kotlin.String>
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+    PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
+      overridden:
+        public final bar: kotlin.Int
+      FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:FINAL <> ($this:<root>.Base<kotlin.String>, $receiver:kotlin.String) returnType:kotlin.Int [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
+        overridden:
+          public final fun <get-bar> (): kotlin.Int declared in <root>.Derived
+        $this: VALUE_PARAMETER name:<this> type:<root>.Base<kotlin.String>
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
   CLASS CLASS name:DerivedXY modality:FINAL visibility:public superTypes:[<root>.BaseXY<kotlin.String, kotlin.String>]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.DerivedXY
     CONSTRUCTOR visibility:public <> () returnType:<root>.DerivedXY [primary]
@@ -200,6 +177,11 @@ FILE fqName:<root> fileName:/clashingFakeOverrideSignatures.kt
           <X>: kotlin.String
           <Y>: kotlin.String
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:DerivedXY modality:FINAL visibility:public superTypes:[<root>.BaseXY<kotlin.String, kotlin.String>]'
+    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 <root>.BaseXY
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
     FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <> ($this:<root>.BaseXY<kotlin.String, kotlin.String>, x:kotlin.String, y:kotlin.String) returnType:kotlin.Unit [fake_override]
       overridden:
         public final fun foo (x: X of <root>.BaseXY, y: kotlin.String): kotlin.Unit declared in <root>.BaseXY
@@ -212,11 +194,6 @@ FILE fqName:<root> fileName:/clashingFakeOverrideSignatures.kt
       $this: VALUE_PARAMETER name:<this> type:<root>.BaseXY<kotlin.String, kotlin.String>
       VALUE_PARAMETER name:x index:0 type:kotlin.String
       VALUE_PARAMETER name:y index:1 type:kotlin.String
-    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 <root>.BaseXY
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
     FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
       overridden:
         public open fun hashCode (): kotlin.Int declared in <root>.BaseXY
@@ -225,6 +202,105 @@ FILE fqName:<root> fileName:/clashingFakeOverrideSignatures.kt
       overridden:
         public open fun toString (): kotlin.String declared in <root>.BaseXY
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:Outer modality:OPEN visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Outer<T of <root>.Outer>
+    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false
+    CLASS CLASS name:Inner modality:OPEN visibility:public [inner] superTypes:[kotlin.Any]
+      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Outer.Inner<T of <root>.Outer>
+      CONSTRUCTOR visibility:public <> ($this:<root>.Outer<T of <root>.Outer>) returnType:<root>.Outer.Inner<T of <root>.Outer> [primary]
+        $outer: VALUE_PARAMETER name:<this> type:<root>.Outer<T of <root>.Outer>
+        BLOCK_BODY
+          DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Inner modality:OPEN visibility:public [inner] 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
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+        VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+      FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+        overridden:
+          public open fun hashCode (): kotlin.Int declared in kotlin.Any
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+        overridden:
+          public open fun toString (): kotlin.String declared in kotlin.Any
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      FUN name:foo visibility:public modality:FINAL <> ($this:<root>.Outer.Inner<T of <root>.Outer>, x:T of <root>.Outer) returnType:kotlin.Unit
+        $this: VALUE_PARAMETER name:<this> type:<root>.Outer.Inner<T of <root>.Outer>
+        VALUE_PARAMETER name:x index:0 type:T of <root>.Outer
+        BLOCK_BODY
+      FUN name:foo visibility:public modality:FINAL <> ($this:<root>.Outer.Inner<T of <root>.Outer>, y:kotlin.String) returnType:kotlin.Unit
+        $this: VALUE_PARAMETER name:<this> type:<root>.Outer.Inner<T of <root>.Outer>
+        VALUE_PARAMETER name:y index:0 type:kotlin.String
+        BLOCK_BODY
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Outer<T of <root>.Outer> [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Outer modality:OPEN 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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:OuterDerived modality:FINAL visibility:public superTypes:[<root>.Outer<kotlin.String>]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.OuterDerived
+    CLASS CLASS name:InnerDerived modality:FINAL visibility:public [inner] superTypes:[<root>.Outer.Inner<kotlin.String>]
+      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.OuterDerived.InnerDerived
+      CONSTRUCTOR visibility:public <> ($this:<root>.OuterDerived) returnType:<root>.OuterDerived.InnerDerived [primary]
+        $outer: VALUE_PARAMETER name:<this> type:<root>.OuterDerived
+        BLOCK_BODY
+          DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Outer.Inner'
+            $this: GET_VAR '<this>: <root>.OuterDerived declared in <root>.OuterDerived.InnerDerived.<init>' type=<root>.OuterDerived origin=null
+          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:InnerDerived modality:FINAL visibility:public [inner] superTypes:[<root>.Outer.Inner<kotlin.String>]'
+      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 <root>.Outer.Inner
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+        VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+      FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <> ($this:<root>.Outer.Inner<kotlin.String>, x:kotlin.String) returnType:kotlin.Unit [fake_override]
+        overridden:
+          public final fun foo (x: T of <root>.Outer): kotlin.Unit declared in <root>.Outer.Inner
+        $this: VALUE_PARAMETER name:<this> type:<root>.Outer.Inner<kotlin.String>
+        VALUE_PARAMETER name:x index:0 type:kotlin.String
+      FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <> ($this:<root>.Outer.Inner<kotlin.String>, y:kotlin.String) returnType:kotlin.Unit [fake_override]
+        overridden:
+          public final fun foo (y: kotlin.String): kotlin.Unit declared in <root>.Outer.Inner
+        $this: VALUE_PARAMETER name:<this> type:<root>.Outer.Inner<kotlin.String>
+        VALUE_PARAMETER name:y index:0 type:kotlin.String
+      FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+        overridden:
+          public open fun hashCode (): kotlin.Int declared in <root>.Outer.Inner
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+        overridden:
+          public open fun toString (): kotlin.String declared in <root>.Outer.Inner
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    CONSTRUCTOR visibility:public <> () returnType:<root>.OuterDerived [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Outer'
+          <T>: kotlin.String
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:OuterDerived modality:FINAL visibility:public superTypes:[<root>.Outer<kotlin.String>]'
+    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 <root>.Outer
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in <root>.Outer
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in <root>.Outer
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   FUN name:outerFun visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
       CLASS CLASS name:LocalBase modality:OPEN visibility:local superTypes:[kotlin.Any]
@@ -234,6 +310,19 @@ FILE fqName:<root> fileName:/clashingFakeOverrideSignatures.kt
           BLOCK_BODY
             DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
             INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:LocalBase modality:OPEN visibility:local 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
+          $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+          VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+        FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+          overridden:
+            public open fun hashCode (): kotlin.Int declared in kotlin.Any
+          $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+        FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+          overridden:
+            public open fun toString (): kotlin.String declared in kotlin.Any
+          $this: VALUE_PARAMETER name:<this> type:kotlin.Any
         FUN name:foo visibility:public modality:FINAL <> ($this:<root>.outerFun.LocalBase<T of <root>.outerFun.LocalBase>, x:T of <root>.outerFun.LocalBase) returnType:kotlin.Unit
           $this: VALUE_PARAMETER name:<this> type:<root>.outerFun.LocalBase<T of <root>.outerFun.LocalBase>
           VALUE_PARAMETER name:x index:0 type:T of <root>.outerFun.LocalBase
@@ -258,19 +347,6 @@ FILE fqName:<root> fileName:/clashingFakeOverrideSignatures.kt
             BLOCK_BODY
               RETURN type=kotlin.Nothing from='public final fun <get-bar> (): kotlin.Int declared in <root>.outerFun.LocalBase'
                 CONST Int type=kotlin.Int value=2
-        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
-          $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-          VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-        FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-          overridden:
-            public open fun hashCode (): kotlin.Int declared in kotlin.Any
-          $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-        FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-          overridden:
-            public open fun toString (): kotlin.String declared in kotlin.Any
-          $this: VALUE_PARAMETER name:<this> type:kotlin.Any
       CLASS CLASS name:LocalDerived modality:OPEN visibility:local superTypes:[<root>.outerFun.LocalBase<kotlin.String>]
         $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.outerFun.LocalDerived
         CONSTRUCTOR visibility:public <> () returnType:<root>.outerFun.LocalDerived [primary]
@@ -278,6 +354,11 @@ FILE fqName:<root> fileName:/clashingFakeOverrideSignatures.kt
             DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.outerFun.LocalBase'
               <T>: kotlin.String
             INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:LocalDerived modality:OPEN visibility:local superTypes:[<root>.outerFun.LocalBase<kotlin.String>]'
+        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 <root>.outerFun.LocalBase
+          $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+          VALUE_PARAMETER name:other index:0 type:kotlin.Any?
         FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <> ($this:<root>.outerFun.LocalBase<kotlin.String>, x:kotlin.String) returnType:kotlin.Unit [fake_override]
           overridden:
             public final fun foo (x: T of <root>.outerFun.LocalBase): kotlin.Unit declared in <root>.outerFun.LocalBase
@@ -288,29 +369,6 @@ FILE fqName:<root> fileName:/clashingFakeOverrideSignatures.kt
             public final fun foo (y: kotlin.String): kotlin.Unit declared in <root>.outerFun.LocalBase
           $this: VALUE_PARAMETER name:<this> type:<root>.outerFun.LocalBase<kotlin.String>
           VALUE_PARAMETER name:y index:0 type:kotlin.String
-        PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
-          overridden:
-            public final bar: kotlin.Int
-          FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:FINAL <> ($this:<root>.outerFun.LocalBase<kotlin.String>, $receiver:kotlin.String) returnType:kotlin.Int [fake_override]
-            correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
-            overridden:
-              public final fun <get-bar> (): kotlin.Int declared in <root>.outerFun.LocalBase
-            $this: VALUE_PARAMETER name:<this> type:<root>.outerFun.LocalBase<kotlin.String>
-            $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
-        PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
-          overridden:
-            public final bar: kotlin.Int
-          FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:FINAL <> ($this:<root>.outerFun.LocalBase<kotlin.String>, $receiver:kotlin.String) returnType:kotlin.Int [fake_override]
-            correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
-            overridden:
-              public final fun <get-bar> (): kotlin.Int declared in <root>.outerFun.LocalBase
-            $this: VALUE_PARAMETER name:<this> type:<root>.outerFun.LocalBase<kotlin.String>
-            $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
-        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 <root>.outerFun.LocalBase
-          $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-          VALUE_PARAMETER name:other index:0 type:kotlin.Any?
         FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
           overridden:
             public open fun hashCode (): kotlin.Int declared in <root>.outerFun.LocalBase
@@ -319,12 +377,35 @@ FILE fqName:<root> fileName:/clashingFakeOverrideSignatures.kt
           overridden:
             public open fun toString (): kotlin.String declared in <root>.outerFun.LocalBase
           $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+        PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
+          overridden:
+            public final bar: kotlin.Int
+          FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:FINAL <> ($this:<root>.outerFun.LocalBase<kotlin.String>, $receiver:kotlin.String) returnType:kotlin.Int [fake_override]
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
+            overridden:
+              public final fun <get-bar> (): kotlin.Int declared in <root>.outerFun.LocalBase
+            $this: VALUE_PARAMETER name:<this> type:<root>.outerFun.LocalBase<kotlin.String>
+            $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+        PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
+          overridden:
+            public final bar: kotlin.Int
+          FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:FINAL <> ($this:<root>.outerFun.LocalBase<kotlin.String>, $receiver:kotlin.String) returnType:kotlin.Int [fake_override]
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
+            overridden:
+              public final fun <get-bar> (): kotlin.Int declared in <root>.outerFun.LocalBase
+            $this: VALUE_PARAMETER name:<this> type:<root>.outerFun.LocalBase<kotlin.String>
+            $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
       CLASS CLASS name:LocalDerived2 modality:FINAL visibility:local superTypes:[<root>.outerFun.LocalDerived]
         $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.outerFun.LocalDerived2
         CONSTRUCTOR visibility:public <> () returnType:<root>.outerFun.LocalDerived2 [primary]
           BLOCK_BODY
             DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.outerFun.LocalDerived'
             INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:LocalDerived2 modality:FINAL visibility:local superTypes:[<root>.outerFun.LocalDerived]'
+        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 <root>.outerFun.LocalDerived
+          $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+          VALUE_PARAMETER name:other index:0 type:kotlin.Any?
         FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <> ($this:<root>.outerFun.LocalBase<kotlin.String>, x:kotlin.String) returnType:kotlin.Unit [fake_override]
           overridden:
             public final fun foo (x: kotlin.String): kotlin.Unit declared in <root>.outerFun.LocalDerived
@@ -335,29 +416,6 @@ FILE fqName:<root> fileName:/clashingFakeOverrideSignatures.kt
             public final fun foo (y: kotlin.String): kotlin.Unit declared in <root>.outerFun.LocalDerived
           $this: VALUE_PARAMETER name:<this> type:<root>.outerFun.LocalBase<kotlin.String>
           VALUE_PARAMETER name:y index:0 type:kotlin.String
-        PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
-          overridden:
-            public final bar: kotlin.Int
-          FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:FINAL <> ($this:<root>.outerFun.LocalBase<kotlin.String>, $receiver:kotlin.String) returnType:kotlin.Int [fake_override]
-            correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
-            overridden:
-              public final fun <get-bar> (): kotlin.Int declared in <root>.outerFun.LocalDerived
-            $this: VALUE_PARAMETER name:<this> type:<root>.outerFun.LocalBase<kotlin.String>
-            $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
-        PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
-          overridden:
-            public final bar: kotlin.Int
-          FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:FINAL <> ($this:<root>.outerFun.LocalBase<kotlin.String>, $receiver:kotlin.String) returnType:kotlin.Int [fake_override]
-            correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
-            overridden:
-              public final fun <get-bar> (): kotlin.Int declared in <root>.outerFun.LocalDerived
-            $this: VALUE_PARAMETER name:<this> type:<root>.outerFun.LocalBase<kotlin.String>
-            $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
-        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 <root>.outerFun.LocalDerived
-          $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-          VALUE_PARAMETER name:other index:0 type:kotlin.Any?
         FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
           overridden:
             public open fun hashCode (): kotlin.Int declared in <root>.outerFun.LocalDerived
@@ -366,6 +424,24 @@ FILE fqName:<root> fileName:/clashingFakeOverrideSignatures.kt
           overridden:
             public open fun toString (): kotlin.String declared in <root>.outerFun.LocalDerived
           $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+        PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
+          overridden:
+            public final bar: kotlin.Int
+          FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:FINAL <> ($this:<root>.outerFun.LocalBase<kotlin.String>, $receiver:kotlin.String) returnType:kotlin.Int [fake_override]
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
+            overridden:
+              public final fun <get-bar> (): kotlin.Int declared in <root>.outerFun.LocalDerived
+            $this: VALUE_PARAMETER name:<this> type:<root>.outerFun.LocalBase<kotlin.String>
+            $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+        PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
+          overridden:
+            public final bar: kotlin.Int
+          FUN FAKE_OVERRIDE name:<get-bar> visibility:public modality:FINAL <> ($this:<root>.outerFun.LocalBase<kotlin.String>, $receiver:kotlin.String) returnType:kotlin.Int [fake_override]
+            correspondingProperty: PROPERTY FAKE_OVERRIDE name:bar visibility:public modality:FINAL [fake_override,val]
+            overridden:
+              public final fun <get-bar> (): kotlin.Int declared in <root>.outerFun.LocalDerived
+            $this: VALUE_PARAMETER name:<this> type:<root>.outerFun.LocalBase<kotlin.String>
+            $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
       FUN LOCAL_FUNCTION name:test visibility:local modality:FINAL <> (b:<root>.outerFun.LocalBase<kotlin.String>, d:<root>.outerFun.LocalDerived, d2:<root>.outerFun.LocalDerived2) returnType:kotlin.Unit
         VALUE_PARAMETER name:b index:0 type:<root>.outerFun.LocalBase<kotlin.String>
         VALUE_PARAMETER name:d index:1 type:<root>.outerFun.LocalDerived
@@ -389,102 +465,26 @@ FILE fqName:<root> fileName:/clashingFakeOverrideSignatures.kt
           CALL 'public final fun foo (y: kotlin.String): kotlin.Unit declared in <root>.outerFun.LocalDerived2' type=kotlin.Unit origin=null
             $this: GET_VAR 'd2: <root>.outerFun.LocalDerived2 declared in <root>.outerFun.test' type=<root>.outerFun.LocalDerived2 origin=null
             y: CONST String type=kotlin.String value=""
-  CLASS CLASS name:Outer modality:OPEN visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Outer<T of <root>.Outer>
-    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Outer<T of <root>.Outer> [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Outer modality:OPEN visibility:public superTypes:[kotlin.Any]'
-    CLASS CLASS name:Inner modality:OPEN visibility:public [inner] superTypes:[kotlin.Any]
-      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Outer.Inner<T of <root>.Outer>
-      CONSTRUCTOR visibility:public <> ($this:<root>.Outer<T of <root>.Outer>) returnType:<root>.Outer.Inner<T of <root>.Outer> [primary]
-        $outer: VALUE_PARAMETER name:<this> type:<root>.Outer<T of <root>.Outer>
-        BLOCK_BODY
-          DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Inner modality:OPEN visibility:public [inner] superTypes:[kotlin.Any]'
-      FUN name:foo visibility:public modality:FINAL <> ($this:<root>.Outer.Inner<T of <root>.Outer>, x:T of <root>.Outer) returnType:kotlin.Unit
-        $this: VALUE_PARAMETER name:<this> type:<root>.Outer.Inner<T of <root>.Outer>
-        VALUE_PARAMETER name:x index:0 type:T of <root>.Outer
-        BLOCK_BODY
-      FUN name:foo visibility:public modality:FINAL <> ($this:<root>.Outer.Inner<T of <root>.Outer>, y:kotlin.String) returnType:kotlin.Unit
-        $this: VALUE_PARAMETER name:<this> type:<root>.Outer.Inner<T of <root>.Outer>
-        VALUE_PARAMETER name:y index:0 type:kotlin.String
-        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
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-        VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-        overridden:
-          public open fun hashCode (): kotlin.Int declared in kotlin.Any
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-        overridden:
-          public open fun toString (): kotlin.String declared in kotlin.Any
-        $this: VALUE_PARAMETER name:<this> type: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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS CLASS name:OuterDerived modality:FINAL visibility:public superTypes:[<root>.Outer<kotlin.String>]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.OuterDerived
-    CONSTRUCTOR visibility:public <> () returnType:<root>.OuterDerived [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Outer'
-          <T>: kotlin.String
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:OuterDerived modality:FINAL visibility:public superTypes:[<root>.Outer<kotlin.String>]'
-    CLASS CLASS name:InnerDerived modality:FINAL visibility:public [inner] superTypes:[<root>.Outer.Inner<kotlin.String>]
-      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.OuterDerived.InnerDerived
-      CONSTRUCTOR visibility:public <> ($this:<root>.OuterDerived) returnType:<root>.OuterDerived.InnerDerived [primary]
-        $outer: VALUE_PARAMETER name:<this> type:<root>.OuterDerived
-        BLOCK_BODY
-          DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.Outer.Inner'
-            $this: GET_VAR '<this>: <root>.OuterDerived declared in <root>.OuterDerived.InnerDerived.<init>' type=<root>.OuterDerived origin=null
-          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:InnerDerived modality:FINAL visibility:public [inner] superTypes:[<root>.Outer.Inner<kotlin.String>]'
-      FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <> ($this:<root>.Outer.Inner<kotlin.String>, x:kotlin.String) returnType:kotlin.Unit [fake_override]
-        overridden:
-          public final fun foo (x: T of <root>.Outer): kotlin.Unit declared in <root>.Outer.Inner
-        $this: VALUE_PARAMETER name:<this> type:<root>.Outer.Inner<kotlin.String>
-        VALUE_PARAMETER name:x index:0 type:kotlin.String
-      FUN FAKE_OVERRIDE name:foo visibility:public modality:FINAL <> ($this:<root>.Outer.Inner<kotlin.String>, y:kotlin.String) returnType:kotlin.Unit [fake_override]
-        overridden:
-          public final fun foo (y: kotlin.String): kotlin.Unit declared in <root>.Outer.Inner
-        $this: VALUE_PARAMETER name:<this> type:<root>.Outer.Inner<kotlin.String>
-        VALUE_PARAMETER name:y index:0 type:kotlin.String
-      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 <root>.Outer.Inner
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-        VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-        overridden:
-          public open fun hashCode (): kotlin.Int declared in <root>.Outer.Inner
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-        overridden:
-          public open fun toString (): kotlin.String declared in <root>.Outer.Inner
-        $this: VALUE_PARAMETER name:<this> type: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 <root>.Outer
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in <root>.Outer
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in <root>.Outer
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  FUN name:test visibility:public modality:FINAL <> (b:<root>.Base<kotlin.String>, d:<root>.Derived, d2:<root>.Derived2) returnType:kotlin.Unit
+    VALUE_PARAMETER name:b index:0 type:<root>.Base<kotlin.String>
+    VALUE_PARAMETER name:d index:1 type:<root>.Derived
+    VALUE_PARAMETER name:d2 index:2 type:<root>.Derived2
+    BLOCK_BODY
+      CALL 'public final fun foo (x: T of <root>.Base): kotlin.Unit declared in <root>.Base' type=kotlin.Unit origin=null
+        $this: GET_VAR 'b: <root>.Base<kotlin.String> declared in <root>.test' type=<root>.Base<kotlin.String> origin=null
+        x: CONST String type=kotlin.String value=""
+      CALL 'public final fun foo (y: kotlin.String): kotlin.Unit declared in <root>.Base' type=kotlin.Unit origin=null
+        $this: GET_VAR 'b: <root>.Base<kotlin.String> declared in <root>.test' type=<root>.Base<kotlin.String> origin=null
+        y: CONST String type=kotlin.String value=""
+      CALL 'public final fun foo (x: kotlin.String): kotlin.Unit declared in <root>.Derived' type=kotlin.Unit origin=null
+        $this: GET_VAR 'd: <root>.Derived declared in <root>.test' type=<root>.Derived origin=null
+        x: CONST String type=kotlin.String value=""
+      CALL 'public final fun foo (y: kotlin.String): kotlin.Unit declared in <root>.Derived' type=kotlin.Unit origin=null
+        $this: GET_VAR 'd: <root>.Derived declared in <root>.test' type=<root>.Derived origin=null
+        y: CONST String type=kotlin.String value=""
+      CALL 'public final fun foo (x: kotlin.String): kotlin.Unit declared in <root>.Derived2' type=kotlin.Unit origin=null
+        $this: GET_VAR 'd2: <root>.Derived2 declared in <root>.test' type=<root>.Derived2 origin=null
+        x: CONST String type=kotlin.String value=""
+      CALL 'public final fun foo (y: kotlin.String): kotlin.Unit declared in <root>.Derived2' type=kotlin.Unit origin=null
+        $this: GET_VAR 'd2: <root>.Derived2 declared in <root>.test' type=<root>.Derived2 origin=null
+        y: CONST String type=kotlin.String value=""

compiler/testData/ir/irText/classes/clashingFakeOverrideSignatures.kt.txt

@@ -23,6 +23,21 @@ open class Base<T : Any?> {
 
 }
 
+open class BaseXY<X : Any?, Y : Any?> {
+  constructor() /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
+  }
+
+  fun foo(x: X, y: String) {
+  }
+
+  fun foo(x: String, y: Y) {
+  }
+
+}
+
 open class Derived : Base<String> {
   constructor() /* primary */ {
     super/*Base*/<String>()
@@ -41,33 +56,51 @@ class Derived2 : Derived {
 
 }
 
-fun test(b: Base<String>, d: Derived, d2: Derived2) {
-  b.foo(x = "")
-  b.foo(y = "")
-  d.foo(x = "")
-  d.foo(y = "")
-  d2.foo(x = "")
-  d2.foo(y = "")
+class DerivedXY : BaseXY<String, String> {
+  constructor() /* primary */ {
+    super/*BaseXY*/<String, String>()
+    /* <init>() */
+
+  }
+
 }
 
-open class BaseXY<X : Any?, Y : Any?> {
+open class Outer<T : Any?> {
+  open inner class Inner {
+    constructor() /* primary */ {
+      super/*Any*/()
+      /* <init>() */
+
+    }
+
+    fun foo(x: T) {
+    }
+
+    fun foo(y: String) {
+    }
+
+  }
+
   constructor() /* primary */ {
     super/*Any*/()
     /* <init>() */
 
   }
 
-  fun foo(x: X, y: String) {
-  }
-
-  fun foo(x: String, y: Y) {
-  }
-
 }
 
-class DerivedXY : BaseXY<String, String> {
+class OuterDerived : Outer<String> {
+  inner class InnerDerived : Inner<String> {
+    constructor() /* primary */ {
+      <this>.super/*Inner*/()
+      /* <init>() */
+
+    }
+
+  }
+
   constructor() /* primary */ {
-    super/*BaseXY*/<String, String>()
+    super/*Outer*/<String>()
     /* <init>() */
 
   }
@@ -129,44 +162,12 @@ fun outerFun() {
 
 }
 
-open class Outer<T : Any?> {
-  constructor() /* primary */ {
-    super/*Any*/()
-    /* <init>() */
-
-  }
-
-  open inner class Inner {
-    constructor() /* primary */ {
-      super/*Any*/()
-      /* <init>() */
-
-    }
-
-    fun foo(x: T) {
-    }
-
-    fun foo(y: String) {
-    }
-
-  }
-
+fun test(b: Base<String>, d: Derived, d2: Derived2) {
+  b.foo(x = "")
+  b.foo(y = "")
+  d.foo(x = "")
+  d.foo(y = "")
+  d2.foo(x = "")
+  d2.foo(y = "")
 }
 
-class OuterDerived : Outer<String> {
-  constructor() /* primary */ {
-    super/*Outer*/<String>()
-    /* <init>() */
-
-  }
-
-  inner class InnerDerived : Inner<String> {
-    constructor() /* primary */ {
-      <this>.super/*Inner*/()
-      /* <init>() */
-
-    }
-
-  }
-
-}

compiler/testData/ir/irText/classes/classMembers.ir.txt

@@ -1,15 +1,6 @@
 FILE fqName:<root> fileName:/classMembers.kt
   CLASS CLASS name:C modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C
-    CONSTRUCTOR visibility:public <> (x:kotlin.Int, y:kotlin.Int, z:kotlin.Int) returnType:<root>.C [primary]
-      VALUE_PARAMETER name:x index:0 type:kotlin.Int
-      VALUE_PARAMETER name:y index:1 type:kotlin.Int
-      VALUE_PARAMETER name:z index:2 type:kotlin.Int
-        EXPRESSION_BODY
-          CONST Int type=kotlin.Int value=1
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[kotlin.Any]'
     PROPERTY name:y visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final]
         EXPRESSION_BODY
@@ -40,12 +31,6 @@ FILE fqName:<root> fileName:/classMembers.kt
           SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Int visibility:private' type=kotlin.Unit origin=null
             receiver: GET_VAR '<this>: <root>.C declared in <root>.C.<set-z>' type=<root>.C origin=null
             value: GET_VAR '<set-?>: kotlin.Int declared in <root>.C.<set-z>' type=kotlin.Int origin=null
-    CONSTRUCTOR visibility:public <> () returnType:<root>.C
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (x: kotlin.Int, y: kotlin.Int, z: kotlin.Int) declared in <root>.C'
-          x: CONST Int type=kotlin.Int value=0
-          y: CONST Int type=kotlin.Int value=0
-          z: CONST Int type=kotlin.Int value=0
     PROPERTY name:property visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:property type:kotlin.Int visibility:private [final]
         EXPRESSION_BODY
@@ -57,6 +42,117 @@ FILE fqName:<root> fileName:/classMembers.kt
           RETURN type=kotlin.Nothing from='public final fun <get-property> (): kotlin.Int declared in <root>.C'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:property type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null
               receiver: GET_VAR '<this>: <root>.C declared in <root>.C.<get-property>' type=<root>.C origin=null
+    CLASS CLASS name:NestedClass modality:FINAL visibility:public superTypes:[kotlin.Any]
+      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C.NestedClass
+      CONSTRUCTOR visibility:public <> () returnType:<root>.C.NestedClass [primary]
+        BLOCK_BODY
+          DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:NestedClass 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
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+        VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+      FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+        overridden:
+          public open fun hashCode (): kotlin.Int declared in kotlin.Any
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+        overridden:
+          public open fun toString (): kotlin.String declared in kotlin.Any
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      FUN name:function visibility:public modality:FINAL <> ($this:<root>.C.NestedClass) returnType:kotlin.Unit
+        $this: VALUE_PARAMETER name:<this> type:<root>.C.NestedClass
+        BLOCK_BODY
+          CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit declared in kotlin.io' type=kotlin.Unit origin=null
+            message: CONST String type=kotlin.String value="3"
+      FUN name:memberExtensionFunction visibility:public modality:FINAL <> ($this:<root>.C.NestedClass, $receiver:kotlin.Int) returnType:kotlin.Unit
+        $this: VALUE_PARAMETER name:<this> type:<root>.C.NestedClass
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.Int
+        BLOCK_BODY
+          CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit declared in kotlin.io' type=kotlin.Unit origin=null
+            message: CONST String type=kotlin.String value="4"
+    CLASS INTERFACE name:NestedInterface modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C.NestedInterface
+      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
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+        VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+      FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+        overridden:
+          public open fun hashCode (): kotlin.Int declared in kotlin.Any
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+        overridden:
+          public open fun toString (): kotlin.String declared in kotlin.Any
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      FUN name:bar visibility:public modality:OPEN <> ($this:<root>.C.NestedInterface) returnType:kotlin.Unit
+        $this: VALUE_PARAMETER name:<this> type:<root>.C.NestedInterface
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun bar (): kotlin.Unit declared in <root>.C.NestedInterface'
+            CALL 'public abstract fun foo (): kotlin.Unit declared in <root>.C.NestedInterface' type=kotlin.Unit origin=null
+              $this: GET_VAR '<this>: <root>.C.NestedInterface declared in <root>.C.NestedInterface.bar' type=<root>.C.NestedInterface origin=null
+      FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.C.NestedInterface) returnType:kotlin.Unit
+        $this: VALUE_PARAMETER name:<this> type:<root>.C.NestedInterface
+    CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]
+      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C.Companion
+      CONSTRUCTOR visibility:private <> () returnType:<root>.C.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 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
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+        VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+      FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+        overridden:
+          public open fun hashCode (): kotlin.Int declared in kotlin.Any
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+        overridden:
+          public open fun toString (): kotlin.String declared in kotlin.Any
+        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    CONSTRUCTOR visibility:public <> () returnType:<root>.C
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (x: kotlin.Int, y: kotlin.Int, z: kotlin.Int) declared in <root>.C'
+          x: CONST Int type=kotlin.Int value=0
+          y: CONST Int type=kotlin.Int value=0
+          z: CONST Int type=kotlin.Int value=0
+    CONSTRUCTOR visibility:public <> (x:kotlin.Int, y:kotlin.Int, z:kotlin.Int) returnType:<root>.C [primary]
+      VALUE_PARAMETER name:x index:0 type:kotlin.Int
+      VALUE_PARAMETER name:y index:1 type:kotlin.Int
+      VALUE_PARAMETER name:z index:2 type:kotlin.Int
+        EXPRESSION_BODY
+          CONST Int type=kotlin.Int value=1
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C 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
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:function visibility:public modality:FINAL <> ($this:<root>.C) returnType:kotlin.Unit
+      $this: VALUE_PARAMETER name:<this> type:<root>.C
+      BLOCK_BODY
+        CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit declared in kotlin.io' type=kotlin.Unit origin=null
+          message: CONST String type=kotlin.String value="1"
+    FUN name:memberExtensionFunction visibility:public modality:FINAL <> ($this:<root>.C, $receiver:kotlin.Int) returnType:kotlin.Unit
+      $this: VALUE_PARAMETER name:<this> type:<root>.C
+      $receiver: VALUE_PARAMETER name:<this> type:kotlin.Int
+      BLOCK_BODY
+        CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit declared in kotlin.io' type=kotlin.Unit origin=null
+          message: CONST String type=kotlin.String value="2"
     PROPERTY name:propertyWithGet visibility:public modality:FINAL [val]
       FUN name:<get-propertyWithGet> visibility:public modality:FINAL <> ($this:<root>.C) returnType:kotlin.Int
         correspondingProperty: PROPERTY name:propertyWithGet visibility:public modality:FINAL [val]
@@ -80,99 +176,3 @@ FILE fqName:<root> fileName:/classMembers.kt
           CALL 'public final fun <set-z> (<set-?>: kotlin.Int): kotlin.Unit declared in <root>.C' type=kotlin.Unit origin=EQ
             $this: GET_VAR '<this>: <root>.C declared in <root>.C.<set-propertyWithGetAndSet>' type=<root>.C origin=null
             <set-?>: GET_VAR 'value: kotlin.Int declared in <root>.C.<set-propertyWithGetAndSet>' type=kotlin.Int origin=null
-    FUN name:function visibility:public modality:FINAL <> ($this:<root>.C) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:<root>.C
-      BLOCK_BODY
-        CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit declared in kotlin.io' type=kotlin.Unit origin=null
-          message: CONST String type=kotlin.String value="1"
-    FUN name:memberExtensionFunction visibility:public modality:FINAL <> ($this:<root>.C, $receiver:kotlin.Int) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:<root>.C
-      $receiver: VALUE_PARAMETER name:<this> type:kotlin.Int
-      BLOCK_BODY
-        CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit declared in kotlin.io' type=kotlin.Unit origin=null
-          message: CONST String type=kotlin.String value="2"
-    CLASS CLASS name:NestedClass modality:FINAL visibility:public superTypes:[kotlin.Any]
-      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C.NestedClass
-      CONSTRUCTOR visibility:public <> () returnType:<root>.C.NestedClass [primary]
-        BLOCK_BODY
-          DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:NestedClass modality:FINAL visibility:public superTypes:[kotlin.Any]'
-      FUN name:function visibility:public modality:FINAL <> ($this:<root>.C.NestedClass) returnType:kotlin.Unit
-        $this: VALUE_PARAMETER name:<this> type:<root>.C.NestedClass
-        BLOCK_BODY
-          CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit declared in kotlin.io' type=kotlin.Unit origin=null
-            message: CONST String type=kotlin.String value="3"
-      FUN name:memberExtensionFunction visibility:public modality:FINAL <> ($this:<root>.C.NestedClass, $receiver:kotlin.Int) returnType:kotlin.Unit
-        $this: VALUE_PARAMETER name:<this> type:<root>.C.NestedClass
-        $receiver: VALUE_PARAMETER name:<this> type:kotlin.Int
-        BLOCK_BODY
-          CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit declared in kotlin.io' type=kotlin.Unit origin=null
-            message: CONST String type=kotlin.String value="4"
-      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
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-        VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-        overridden:
-          public open fun hashCode (): kotlin.Int declared in kotlin.Any
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-        overridden:
-          public open fun toString (): kotlin.String declared in kotlin.Any
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    CLASS INTERFACE name:NestedInterface modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C.NestedInterface
-      FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.C.NestedInterface) returnType:kotlin.Unit
-        $this: VALUE_PARAMETER name:<this> type:<root>.C.NestedInterface
-      FUN name:bar visibility:public modality:OPEN <> ($this:<root>.C.NestedInterface) returnType:kotlin.Unit
-        $this: VALUE_PARAMETER name:<this> type:<root>.C.NestedInterface
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun bar (): kotlin.Unit declared in <root>.C.NestedInterface'
-            CALL 'public abstract fun foo (): kotlin.Unit declared in <root>.C.NestedInterface' type=kotlin.Unit origin=null
-              $this: GET_VAR '<this>: <root>.C.NestedInterface declared in <root>.C.NestedInterface.bar' type=<root>.C.NestedInterface 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
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-        VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-        overridden:
-          public open fun hashCode (): kotlin.Int declared in kotlin.Any
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-        overridden:
-          public open fun toString (): kotlin.String declared in kotlin.Any
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]
-      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C.Companion
-      CONSTRUCTOR visibility:private <> () returnType:<root>.C.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 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
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-        VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-      FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-        overridden:
-          public open fun hashCode (): kotlin.Int declared in kotlin.Any
-        $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-        overridden:
-          public open fun toString (): kotlin.String declared in kotlin.Any
-        $this: VALUE_PARAMETER name:<this> type: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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any

compiler/testData/ir/irText/classes/classMembers.kt.txt

@@ -1,10 +1,4 @@
 class C {
-  constructor(x: Int, y: Int, z: Int = 1) /* primary */ {
-    super/*Any*/()
-    /* <init>() */
-
-  }
-
   val y: Int
     field = y
     get
@@ -14,35 +8,10 @@ class C {
     get
     set
 
-  constructor() {
-    this/*C*/(x = 0, y = 0, z = 0)
-  }
-
   val property: Int
     field = 0
     get
 
-  val propertyWithGet: Int
-    get(): Int {
-      return 42
-    }
-
-  var propertyWithGetAndSet: Int
-    get(): Int {
-      return <this>.<get-z>()
-    }
-    set(value: Int) {
-      <this>.<set-z>(<set-?> = value)
-    }
-
-  fun function() {
-    println(message = "1")
-  }
-
-  fun Int.memberExtensionFunction() {
-    println(message = "2")
-  }
-
   class NestedClass {
     constructor() /* primary */ {
       super/*Any*/()
@@ -61,12 +30,12 @@ class C {
   }
 
   interface NestedInterface {
-    abstract fun foo()
-
     fun bar() {
       return <this>.foo()
     }
 
+    abstract fun foo()
+
   }
 
   companion object Companion {
@@ -78,4 +47,36 @@ class C {
 
   }
 
+  constructor() {
+    this/*C*/(x = 0, y = 0, z = 0)
+  }
+
+  constructor(x: Int, y: Int, z: Int = 1) /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
+  }
+
+  fun function() {
+    println(message = "1")
+  }
+
+  fun Int.memberExtensionFunction() {
+    println(message = "2")
+  }
+
+  val propertyWithGet: Int
+    get(): Int {
+      return 42
+    }
+
+  var propertyWithGetAndSet: Int
+    get(): Int {
+      return <this>.<get-z>()
+    }
+    set(value: Int) {
+      <this>.<set-z>(<set-?> = value)
+    }
+
 }
+

compiler/testData/ir/irText/classes/classes.fir.ir.txt

@@ -1,125 +0,0 @@
-FILE fqName:<root> fileName:/classes.kt
-  CLASS CLASS name:TestClass modality:FINAL visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestClass
-    CONSTRUCTOR visibility:public <> () returnType:<root>.TestClass [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestClass 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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS INTERFACE name:TestInterface modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestInterface
-    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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS OBJECT name:TestObject modality:FINAL visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestObject
-    CONSTRUCTOR visibility:private <> () returnType:<root>.TestObject [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:TestObject 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
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS ANNOTATION_CLASS name:TestAnnotationClass modality:OPEN visibility:public superTypes:[kotlin.Annotation]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestAnnotationClass
-    CONSTRUCTOR visibility:public <> () returnType:<root>.TestAnnotationClass [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:TestAnnotationClass modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
-    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.Annotation
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Annotation
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Annotation
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS ENUM_CLASS name:TestEnumClass modality:FINAL visibility:public superTypes:[kotlin.Enum<<root>.TestEnumClass>]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestEnumClass
-    CONSTRUCTOR visibility:private <> () returnType:<root>.TestEnumClass [primary]
-      BLOCK_BODY
-        ENUM_CONSTRUCTOR_CALL 'public constructor <init> (name: kotlin.String, ordinal: kotlin.Int) declared in kotlin.Enum'
-          <E>: <root>.TestEnumClass
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:TestEnumClass modality:FINAL visibility:public superTypes:[kotlin.Enum<<root>.TestEnumClass>]'
-    FUN ENUM_CLASS_SPECIAL_MEMBER name:values visibility:public modality:FINAL <> () returnType:kotlin.Array<<root>.TestEnumClass>
-      SYNTHETIC_BODY kind=ENUM_VALUES
-    FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.TestEnumClass
-      VALUE_PARAMETER name:value index:0 type:kotlin.String
-      SYNTHETIC_BODY kind=ENUM_VALUEOF
-    PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
-      FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.TestEnumClass>
-        correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
-        SYNTHETIC_BODY kind=ENUM_ENTRIES
-    FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.TestEnumClass>, other:<root>.TestEnumClass) returnType:kotlin.Int [fake_override,operator]
-      overridden:
-        public final fun compareTo (other: E of kotlin.Enum): kotlin.Int declared in kotlin.Enum
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.TestEnumClass>
-      VALUE_PARAMETER name:other index:0 type:<root>.TestEnumClass
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.TestEnumClass>, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
-      overridden:
-        public final fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Enum
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.TestEnumClass>
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.TestEnumClass>) returnType:kotlin.Int [fake_override]
-      overridden:
-        public final fun hashCode (): kotlin.Int declared in kotlin.Enum
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.TestEnumClass>
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Enum<<root>.TestEnumClass>) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Enum
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.TestEnumClass>
-    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>.TestEnumClass>) 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>.TestEnumClass>
-    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>.TestEnumClass>) 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>.TestEnumClass>

compiler/testData/ir/irText/classes/classes.fir.kt.txt

@@ -1,45 +0,0 @@
-class TestClass {
-  constructor() /* primary */ {
-    super/*Any*/()
-    /* <init>() */
-
-  }
-
-}
-
-interface TestInterface {
-}
-
-object TestObject {
-  private constructor() /* primary */ {
-    super/*Any*/()
-    /* <init>() */
-
-  }
-
-}
-
-open annotation class TestAnnotationClass : Annotation {
-  constructor() /* primary */ {
-    super/*Any*/()
-    /* <init>() */
-
-  }
-
-}
-
-enum class TestEnumClass : Enum<TestEnumClass> {
-  private constructor() /* primary */ {
-    super/*Enum*/<TestEnumClass>()
-    /* <init>() */
-
-  }
-
-  fun values(): Array<TestEnumClass> /* Synthetic body for ENUM_VALUES */
-
-  fun valueOf(value: String): TestEnumClass /* Synthetic body for ENUM_VALUEOF */
-
-  val entries: EnumEntries<TestEnumClass>
-    get(): EnumEntries<TestEnumClass> /* Synthetic body for ENUM_ENTRIES */
-
-}

compiler/testData/ir/irText/classes/classes.ir.txt

@@ -1,4 +1,23 @@
 FILE fqName:<root> fileName:/classes.kt
+  CLASS ANNOTATION_CLASS name:TestAnnotationClass modality:OPEN visibility:public superTypes:[kotlin.Annotation]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestAnnotationClass
+    CONSTRUCTOR visibility:public <> () returnType:<root>.TestAnnotationClass [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:TestAnnotationClass modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
+    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.Annotation
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Annotation
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Annotation
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:TestClass modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestClass
     CONSTRUCTOR visibility:public <> () returnType:<root>.TestClass [primary]
@@ -18,6 +37,58 @@ FILE fqName:<root> fileName:/classes.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS ENUM_CLASS name:TestEnumClass modality:FINAL visibility:public superTypes:[kotlin.Enum<<root>.TestEnumClass>]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestEnumClass
+    CONSTRUCTOR visibility:private <> () returnType:<root>.TestEnumClass [primary]
+      BLOCK_BODY
+        ENUM_CONSTRUCTOR_CALL 'public constructor <init> (name: kotlin.String, ordinal: kotlin.Int) declared in kotlin.Enum'
+          <E>: <root>.TestEnumClass
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:TestEnumClass modality:FINAL visibility:public superTypes:[kotlin.Enum<<root>.TestEnumClass>]'
+    FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.TestEnumClass
+      VALUE_PARAMETER name:value index:0 type:kotlin.String
+      SYNTHETIC_BODY kind=ENUM_VALUEOF
+    FUN ENUM_CLASS_SPECIAL_MEMBER name:values visibility:public modality:FINAL <> () returnType:kotlin.Array<<root>.TestEnumClass>
+      SYNTHETIC_BODY kind=ENUM_VALUES
+    FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.TestEnumClass>, other:<root>.TestEnumClass) returnType:kotlin.Int [fake_override,operator]
+      overridden:
+        public final fun compareTo (other: E of kotlin.Enum): kotlin.Int declared in kotlin.Enum
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.TestEnumClass>
+      VALUE_PARAMETER name:other index:0 type:<root>.TestEnumClass
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.TestEnumClass>, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public final fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Enum
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.TestEnumClass>
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.TestEnumClass>) returnType:kotlin.Int [fake_override]
+      overridden:
+        public final fun hashCode (): kotlin.Int declared in kotlin.Enum
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.TestEnumClass>
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Enum<<root>.TestEnumClass>) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Enum
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.TestEnumClass>
+    PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
+      FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.TestEnumClass>
+        correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
+        SYNTHETIC_BODY kind=ENUM_ENTRIES
+    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>.TestEnumClass>) 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>.TestEnumClass>
+    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>.TestEnumClass>) 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>.TestEnumClass>
   CLASS INTERFACE name:TestInterface modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestInterface
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
@@ -52,74 +123,3 @@ FILE fqName:<root> fileName:/classes.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS ANNOTATION_CLASS name:TestAnnotationClass modality:OPEN visibility:public superTypes:[kotlin.Annotation]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestAnnotationClass
-    CONSTRUCTOR visibility:public <> () returnType:<root>.TestAnnotationClass [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:TestAnnotationClass modality:OPEN visibility:public superTypes:[kotlin.Annotation]'
-    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.Annotation
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Annotation
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Annotation
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS ENUM_CLASS name:TestEnumClass modality:FINAL visibility:public superTypes:[kotlin.Enum<<root>.TestEnumClass>]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestEnumClass
-    CONSTRUCTOR visibility:private <> () returnType:<root>.TestEnumClass [primary]
-      BLOCK_BODY
-        ENUM_CONSTRUCTOR_CALL 'public constructor <init> (name: kotlin.String, ordinal: kotlin.Int) declared in kotlin.Enum'
-          <E>: <root>.TestEnumClass
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:TestEnumClass modality:FINAL visibility:public superTypes:[kotlin.Enum<<root>.TestEnumClass>]'
-    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>.TestEnumClass>) 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>.TestEnumClass>
-    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>.TestEnumClass>) 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>.TestEnumClass>
-    FUN FAKE_OVERRIDE name:compareTo visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.TestEnumClass>, other:<root>.TestEnumClass) returnType:kotlin.Int [fake_override,operator]
-      overridden:
-        public final fun compareTo (other: E of kotlin.Enum): kotlin.Int declared in kotlin.Enum
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.TestEnumClass>
-      VALUE_PARAMETER name:other index:0 type:<root>.TestEnumClass
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.TestEnumClass>, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
-      overridden:
-        public final fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Enum
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.TestEnumClass>
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:FINAL <> ($this:kotlin.Enum<<root>.TestEnumClass>) returnType:kotlin.Int [fake_override]
-      overridden:
-        public final fun hashCode (): kotlin.Int declared in kotlin.Enum
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.TestEnumClass>
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Enum<<root>.TestEnumClass>) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Enum
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Enum<<root>.TestEnumClass>
-    FUN ENUM_CLASS_SPECIAL_MEMBER name:values visibility:public modality:FINAL <> () returnType:kotlin.Array<<root>.TestEnumClass>
-      SYNTHETIC_BODY kind=ENUM_VALUES
-    FUN ENUM_CLASS_SPECIAL_MEMBER name:valueOf visibility:public modality:FINAL <> (value:kotlin.String) returnType:<root>.TestEnumClass
-      VALUE_PARAMETER name:value index:0 type:kotlin.String
-      SYNTHETIC_BODY kind=ENUM_VALUEOF
-    PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
-      FUN ENUM_CLASS_SPECIAL_MEMBER name:<get-entries> visibility:public modality:FINAL <> () returnType:kotlin.enums.EnumEntries<<root>.TestEnumClass>
-        correspondingProperty: PROPERTY ENUM_CLASS_SPECIAL_MEMBER name:entries visibility:public modality:FINAL [val]
-        SYNTHETIC_BODY kind=ENUM_ENTRIES

compiler/testData/ir/irText/classes/classes.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 class TestClass
 
 interface TestInterface

compiler/testData/ir/irText/classes/classes.kt.txt

@@ -1,4 +1,4 @@
-class TestClass {
+open annotation class TestAnnotationClass : Annotation {
   constructor() /* primary */ {
     super/*Any*/()
     /* <init>() */
@@ -7,19 +7,7 @@ class TestClass {
 
 }
 
-interface TestInterface {
-}
-
-object TestObject {
-  private constructor() /* primary */ {
-    super/*Any*/()
-    /* <init>() */
-
-  }
-
-}
-
-open annotation class TestAnnotationClass : Annotation {
+class TestClass {
   constructor() /* primary */ {
     super/*Any*/()
     /* <init>() */
@@ -35,11 +23,24 @@ enum class TestEnumClass : Enum<TestEnumClass> {
 
   }
 
-  fun values(): Array<TestEnumClass> /* Synthetic body for ENUM_VALUES */
-
   fun valueOf(value: String): TestEnumClass /* Synthetic body for ENUM_VALUEOF */
 
+  fun values(): Array<TestEnumClass> /* Synthetic body for ENUM_VALUES */
+
   val entries: EnumEntries<TestEnumClass>
     get(): EnumEntries<TestEnumClass> /* Synthetic body for ENUM_ENTRIES */
 
 }
+
+interface TestInterface {
+}
+
+object TestObject {
+  private constructor() /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
+  }
+
+}
+

compiler/testData/ir/irText/classes/cloneable.ir.txt

@@ -22,25 +22,6 @@ FILE fqName:<root> fileName:/cloneable.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Cloneable
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  CLASS INTERFACE name:I modality:ABSTRACT visibility:public superTypes:[kotlin.Cloneable]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.I
-    FUN FAKE_OVERRIDE name:clone visibility:protected modality:OPEN <> ($this:kotlin.Cloneable) returnType:kotlin.Any [fake_override]
-      overridden:
-        protected open fun clone (): kotlin.Any declared in kotlin.Cloneable
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Cloneable
-    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.Cloneable
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Cloneable
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Cloneable
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:C modality:FINAL visibility:public superTypes:[<root>.I]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C
     CONSTRUCTOR visibility:public <> () returnType:<root>.C [primary]
@@ -70,13 +51,6 @@ FILE fqName:<root> fileName:/cloneable.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:OC modality:FINAL visibility:public superTypes:[<root>.I]'
-    FUN name:clone visibility:protected modality:OPEN <> ($this:<root>.OC) returnType:<root>.OC
-      overridden:
-        protected open fun clone (): kotlin.Any declared in <root>.I
-      $this: VALUE_PARAMETER name:<this> type:<root>.OC
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='protected open fun clone (): <root>.OC declared in <root>.OC'
-          CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.OC' type=<root>.OC 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 <root>.I
@@ -90,3 +64,29 @@ FILE fqName:<root> fileName:/cloneable.kt
       overridden:
         public open fun toString (): kotlin.String declared in <root>.I
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:clone visibility:protected modality:OPEN <> ($this:<root>.OC) returnType:<root>.OC
+      overridden:
+        protected open fun clone (): kotlin.Any declared in <root>.I
+      $this: VALUE_PARAMETER name:<this> type:<root>.OC
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='protected open fun clone (): <root>.OC declared in <root>.OC'
+          CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.OC' type=<root>.OC origin=null
+  CLASS INTERFACE name:I modality:ABSTRACT visibility:public superTypes:[kotlin.Cloneable]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.I
+    FUN FAKE_OVERRIDE name:clone visibility:protected modality:OPEN <> ($this:kotlin.Cloneable) returnType:kotlin.Any [fake_override]
+      overridden:
+        protected open fun clone (): kotlin.Any declared in kotlin.Cloneable
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Cloneable
+    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.Cloneable
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Cloneable
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Cloneable
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any

compiler/testData/ir/irText/classes/cloneable.kt.txt

@@ -7,9 +7,6 @@ class A : Cloneable {
 
 }
 
-interface I : Cloneable {
-}
-
 class C : I {
   constructor() /* primary */ {
     super/*Any*/()
@@ -31,3 +28,7 @@ class OC : I {
   }
 
 }
+
+interface I : Cloneable {
+}
+

compiler/testData/ir/irText/classes/companionObject.ir.txt

@@ -1,10 +1,6 @@
 FILE fqName:<root> fileName:/companionObject.kt
   CLASS CLASS name:Test1 modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test1
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Test1 [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:FINAL visibility:public superTypes:[kotlin.Any]'
     CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test1.Companion
       CONSTRUCTOR visibility:private <> () returnType:<root>.Test1.Companion [primary]
@@ -24,6 +20,10 @@ FILE fqName:<root> fileName:/companionObject.kt
         overridden:
           public open fun toString (): kotlin.String declared in kotlin.Any
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Test1 [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 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
@@ -39,10 +39,6 @@ FILE fqName:<root> fileName:/companionObject.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
   CLASS CLASS name:Test2 modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test2
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Test2 [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test2 modality:FINAL visibility:public superTypes:[kotlin.Any]'
     CLASS OBJECT name:Named modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test2.Named
       CONSTRUCTOR visibility:private <> () returnType:<root>.Test2.Named [primary]
@@ -62,6 +58,10 @@ FILE fqName:<root> fileName:/companionObject.kt
         overridden:
           public open fun toString (): kotlin.String declared in kotlin.Any
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Test2 [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test2 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

compiler/testData/ir/irText/classes/companionObject.kt.txt

@@ -1,10 +1,4 @@
 class Test1 {
-  constructor() /* primary */ {
-    super/*Any*/()
-    /* <init>() */
-
-  }
-
   companion object Companion {
     private constructor() /* primary */ {
       super/*Any*/()
@@ -14,15 +8,15 @@ class Test1 {
 
   }
 
-}
-
-class Test2 {
   constructor() /* primary */ {
     super/*Any*/()
     /* <init>() */
 
   }
 
+}
+
+class Test2 {
   companion object Named {
     private constructor() /* primary */ {
       super/*Any*/()
@@ -32,4 +26,11 @@ class Test2 {
 
   }
 
+  constructor() /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
+  }
+
 }
+

compiler/testData/ir/irText/classes/dataClasses/dataClassWithArrayMembers.ir.txt

@@ -1,19 +1,6 @@
 FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
   CLASS CLASS name:Test1 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test1
-    CONSTRUCTOR visibility:public <> (stringArray:kotlin.Array<kotlin.String>, charArray:kotlin.CharArray, booleanArray:kotlin.BooleanArray, byteArray:kotlin.ByteArray, shortArray:kotlin.ShortArray, intArray:kotlin.IntArray, longArray:kotlin.LongArray, floatArray:kotlin.FloatArray, doubleArray:kotlin.DoubleArray) returnType:<root>.Test1 [primary]
-      VALUE_PARAMETER name:stringArray index:0 type:kotlin.Array<kotlin.String>
-      VALUE_PARAMETER name:charArray index:1 type:kotlin.CharArray
-      VALUE_PARAMETER name:booleanArray index:2 type:kotlin.BooleanArray
-      VALUE_PARAMETER name:byteArray index:3 type:kotlin.ByteArray
-      VALUE_PARAMETER name:shortArray index:4 type:kotlin.ShortArray
-      VALUE_PARAMETER name:intArray index:5 type:kotlin.IntArray
-      VALUE_PARAMETER name:longArray index:6 type:kotlin.LongArray
-      VALUE_PARAMETER name:floatArray index:7 type:kotlin.FloatArray
-      VALUE_PARAMETER name:doubleArray index:8 type:kotlin.DoubleArray
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     PROPERTY name:stringArray visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:stringArray type:kotlin.Array<kotlin.String> visibility:private [final]
         EXPRESSION_BODY
@@ -113,6 +100,19 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
           RETURN type=kotlin.Nothing from='public final fun <get-doubleArray> (): kotlin.DoubleArray declared in <root>.Test1'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:doubleArray type:kotlin.DoubleArray visibility:private [final]' type=kotlin.DoubleArray origin=null
               receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.<get-doubleArray>' type=<root>.Test1 origin=null
+    CONSTRUCTOR visibility:public <> (stringArray:kotlin.Array<kotlin.String>, charArray:kotlin.CharArray, booleanArray:kotlin.BooleanArray, byteArray:kotlin.ByteArray, shortArray:kotlin.ShortArray, intArray:kotlin.IntArray, longArray:kotlin.LongArray, floatArray:kotlin.FloatArray, doubleArray:kotlin.DoubleArray) returnType:<root>.Test1 [primary]
+      VALUE_PARAMETER name:stringArray index:0 type:kotlin.Array<kotlin.String>
+      VALUE_PARAMETER name:charArray index:1 type:kotlin.CharArray
+      VALUE_PARAMETER name:booleanArray index:2 type:kotlin.BooleanArray
+      VALUE_PARAMETER name:byteArray index:3 type:kotlin.ByteArray
+      VALUE_PARAMETER name:shortArray index:4 type:kotlin.ShortArray
+      VALUE_PARAMETER name:intArray index:5 type:kotlin.IntArray
+      VALUE_PARAMETER name:longArray index:6 type:kotlin.LongArray
+      VALUE_PARAMETER name:floatArray index:7 type:kotlin.FloatArray
+      VALUE_PARAMETER name:doubleArray index:8 type:kotlin.DoubleArray
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:<root>.Test1) returnType:kotlin.Array<kotlin.String> [operator]
       $this: VALUE_PARAMETER name:<this> type:<root>.Test1
       BLOCK_BODY
@@ -217,134 +217,6 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
             longArray: GET_VAR 'longArray: kotlin.LongArray declared in <root>.Test1.copy' type=kotlin.LongArray origin=null
             floatArray: GET_VAR 'floatArray: kotlin.FloatArray declared in <root>.Test1.copy' type=kotlin.FloatArray origin=null
             doubleArray: GET_VAR 'doubleArray: kotlin.DoubleArray declared in <root>.Test1.copy' type=kotlin.DoubleArray origin=null
-    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test1) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test1
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test1'
-          STRING_CONCATENATION type=kotlin.String
-            CONST String type=kotlin.String value="Test1("
-            CONST String type=kotlin.String value="stringArray="
-            CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null
-              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:stringArray type:kotlin.Array<kotlin.String> visibility:private [final]' type=kotlin.Array<kotlin.String> origin=null
-                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
-            CONST String type=kotlin.String value=", "
-            CONST String type=kotlin.String value="charArray="
-            CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null
-              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:charArray type:kotlin.CharArray visibility:private [final]' type=kotlin.CharArray origin=null
-                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
-            CONST String type=kotlin.String value=", "
-            CONST String type=kotlin.String value="booleanArray="
-            CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null
-              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:booleanArray type:kotlin.BooleanArray visibility:private [final]' type=kotlin.BooleanArray origin=null
-                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
-            CONST String type=kotlin.String value=", "
-            CONST String type=kotlin.String value="byteArray="
-            CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null
-              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:byteArray type:kotlin.ByteArray visibility:private [final]' type=kotlin.ByteArray origin=null
-                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
-            CONST String type=kotlin.String value=", "
-            CONST String type=kotlin.String value="shortArray="
-            CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null
-              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:shortArray type:kotlin.ShortArray visibility:private [final]' type=kotlin.ShortArray origin=null
-                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
-            CONST String type=kotlin.String value=", "
-            CONST String type=kotlin.String value="intArray="
-            CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null
-              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:intArray type:kotlin.IntArray visibility:private [final]' type=kotlin.IntArray origin=null
-                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
-            CONST String type=kotlin.String value=", "
-            CONST String type=kotlin.String value="longArray="
-            CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null
-              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:longArray type:kotlin.LongArray visibility:private [final]' type=kotlin.LongArray origin=null
-                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
-            CONST String type=kotlin.String value=", "
-            CONST String type=kotlin.String value="floatArray="
-            CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null
-              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:floatArray type:kotlin.FloatArray visibility:private [final]' type=kotlin.FloatArray origin=null
-                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
-            CONST String type=kotlin.String value=", "
-            CONST String type=kotlin.String value="doubleArray="
-            CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null
-              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:doubleArray type:kotlin.DoubleArray visibility:private [final]' type=kotlin.DoubleArray origin=null
-                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
-            CONST String type=kotlin.String value=")"
-    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test1) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test1
-      BLOCK_BODY
-        VAR name:result type:kotlin.Int [var]
-          CALL 'public final fun dataClassArrayMemberHashCode (arg0: kotlin.Any): kotlin.Int declared in kotlin.internal.ir' type=kotlin.Int origin=null
-            arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:stringArray type:kotlin.Array<kotlin.String> visibility:private [final]' type=kotlin.Array<kotlin.String> origin=null
-              receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
-        SET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Unit origin=EQ
-          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Int origin=null
-              other: CONST Int type=kotlin.Int value=31
-            other: CALL 'public final fun dataClassArrayMemberHashCode (arg0: kotlin.Any): kotlin.Int declared in kotlin.internal.ir' type=kotlin.Int origin=null
-              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:charArray type:kotlin.CharArray visibility:private [final]' type=kotlin.CharArray origin=null
-                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
-        SET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Unit origin=EQ
-          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Int origin=null
-              other: CONST Int type=kotlin.Int value=31
-            other: CALL 'public final fun dataClassArrayMemberHashCode (arg0: kotlin.Any): kotlin.Int declared in kotlin.internal.ir' type=kotlin.Int origin=null
-              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:booleanArray type:kotlin.BooleanArray visibility:private [final]' type=kotlin.BooleanArray origin=null
-                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
-        SET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Unit origin=EQ
-          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Int origin=null
-              other: CONST Int type=kotlin.Int value=31
-            other: CALL 'public final fun dataClassArrayMemberHashCode (arg0: kotlin.Any): kotlin.Int declared in kotlin.internal.ir' type=kotlin.Int origin=null
-              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:byteArray type:kotlin.ByteArray visibility:private [final]' type=kotlin.ByteArray origin=null
-                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
-        SET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Unit origin=EQ
-          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Int origin=null
-              other: CONST Int type=kotlin.Int value=31
-            other: CALL 'public final fun dataClassArrayMemberHashCode (arg0: kotlin.Any): kotlin.Int declared in kotlin.internal.ir' type=kotlin.Int origin=null
-              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:shortArray type:kotlin.ShortArray visibility:private [final]' type=kotlin.ShortArray origin=null
-                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
-        SET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Unit origin=EQ
-          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Int origin=null
-              other: CONST Int type=kotlin.Int value=31
-            other: CALL 'public final fun dataClassArrayMemberHashCode (arg0: kotlin.Any): kotlin.Int declared in kotlin.internal.ir' type=kotlin.Int origin=null
-              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:intArray type:kotlin.IntArray visibility:private [final]' type=kotlin.IntArray origin=null
-                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
-        SET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Unit origin=EQ
-          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Int origin=null
-              other: CONST Int type=kotlin.Int value=31
-            other: CALL 'public final fun dataClassArrayMemberHashCode (arg0: kotlin.Any): kotlin.Int declared in kotlin.internal.ir' type=kotlin.Int origin=null
-              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:longArray type:kotlin.LongArray visibility:private [final]' type=kotlin.LongArray origin=null
-                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
-        SET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Unit origin=EQ
-          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Int origin=null
-              other: CONST Int type=kotlin.Int value=31
-            other: CALL 'public final fun dataClassArrayMemberHashCode (arg0: kotlin.Any): kotlin.Int declared in kotlin.internal.ir' type=kotlin.Int origin=null
-              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:floatArray type:kotlin.FloatArray visibility:private [final]' type=kotlin.FloatArray origin=null
-                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
-        SET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Unit origin=EQ
-          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Int origin=null
-              other: CONST Int type=kotlin.Int value=31
-            other: CALL 'public final fun dataClassArrayMemberHashCode (arg0: kotlin.Any): kotlin.Int declared in kotlin.internal.ir' type=kotlin.Int origin=null
-              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:doubleArray type:kotlin.DoubleArray visibility:private [final]' type=kotlin.DoubleArray origin=null
-                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test1'
-          GET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Int origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test1, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -459,14 +331,137 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
               CONST Boolean type=kotlin.Boolean value=false
         RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.Test1'
           CONST Boolean type=kotlin.Boolean value=true
+    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test1) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1
+      BLOCK_BODY
+        VAR name:result type:kotlin.Int [var]
+          CALL 'public final fun dataClassArrayMemberHashCode (arg0: kotlin.Any): kotlin.Int declared in kotlin.internal.ir' type=kotlin.Int origin=null
+            arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:stringArray type:kotlin.Array<kotlin.String> visibility:private [final]' type=kotlin.Array<kotlin.String> origin=null
+              receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
+        SET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Unit origin=EQ
+          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Int origin=null
+              other: CONST Int type=kotlin.Int value=31
+            other: CALL 'public final fun dataClassArrayMemberHashCode (arg0: kotlin.Any): kotlin.Int declared in kotlin.internal.ir' type=kotlin.Int origin=null
+              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:charArray type:kotlin.CharArray visibility:private [final]' type=kotlin.CharArray origin=null
+                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
+        SET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Unit origin=EQ
+          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Int origin=null
+              other: CONST Int type=kotlin.Int value=31
+            other: CALL 'public final fun dataClassArrayMemberHashCode (arg0: kotlin.Any): kotlin.Int declared in kotlin.internal.ir' type=kotlin.Int origin=null
+              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:booleanArray type:kotlin.BooleanArray visibility:private [final]' type=kotlin.BooleanArray origin=null
+                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
+        SET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Unit origin=EQ
+          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Int origin=null
+              other: CONST Int type=kotlin.Int value=31
+            other: CALL 'public final fun dataClassArrayMemberHashCode (arg0: kotlin.Any): kotlin.Int declared in kotlin.internal.ir' type=kotlin.Int origin=null
+              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:byteArray type:kotlin.ByteArray visibility:private [final]' type=kotlin.ByteArray origin=null
+                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
+        SET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Unit origin=EQ
+          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Int origin=null
+              other: CONST Int type=kotlin.Int value=31
+            other: CALL 'public final fun dataClassArrayMemberHashCode (arg0: kotlin.Any): kotlin.Int declared in kotlin.internal.ir' type=kotlin.Int origin=null
+              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:shortArray type:kotlin.ShortArray visibility:private [final]' type=kotlin.ShortArray origin=null
+                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
+        SET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Unit origin=EQ
+          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Int origin=null
+              other: CONST Int type=kotlin.Int value=31
+            other: CALL 'public final fun dataClassArrayMemberHashCode (arg0: kotlin.Any): kotlin.Int declared in kotlin.internal.ir' type=kotlin.Int origin=null
+              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:intArray type:kotlin.IntArray visibility:private [final]' type=kotlin.IntArray origin=null
+                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
+        SET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Unit origin=EQ
+          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Int origin=null
+              other: CONST Int type=kotlin.Int value=31
+            other: CALL 'public final fun dataClassArrayMemberHashCode (arg0: kotlin.Any): kotlin.Int declared in kotlin.internal.ir' type=kotlin.Int origin=null
+              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:longArray type:kotlin.LongArray visibility:private [final]' type=kotlin.LongArray origin=null
+                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
+        SET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Unit origin=EQ
+          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Int origin=null
+              other: CONST Int type=kotlin.Int value=31
+            other: CALL 'public final fun dataClassArrayMemberHashCode (arg0: kotlin.Any): kotlin.Int declared in kotlin.internal.ir' type=kotlin.Int origin=null
+              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:floatArray type:kotlin.FloatArray visibility:private [final]' type=kotlin.FloatArray origin=null
+                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
+        SET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Unit origin=EQ
+          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Int origin=null
+              other: CONST Int type=kotlin.Int value=31
+            other: CALL 'public final fun dataClassArrayMemberHashCode (arg0: kotlin.Any): kotlin.Int declared in kotlin.internal.ir' type=kotlin.Int origin=null
+              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:doubleArray type:kotlin.DoubleArray visibility:private [final]' type=kotlin.DoubleArray origin=null
+                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test1'
+          GET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Int origin=null
+    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test1) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test1'
+          STRING_CONCATENATION type=kotlin.String
+            CONST String type=kotlin.String value="Test1("
+            CONST String type=kotlin.String value="stringArray="
+            CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null
+              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:stringArray type:kotlin.Array<kotlin.String> visibility:private [final]' type=kotlin.Array<kotlin.String> origin=null
+                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
+            CONST String type=kotlin.String value=", "
+            CONST String type=kotlin.String value="charArray="
+            CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null
+              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:charArray type:kotlin.CharArray visibility:private [final]' type=kotlin.CharArray origin=null
+                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
+            CONST String type=kotlin.String value=", "
+            CONST String type=kotlin.String value="booleanArray="
+            CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null
+              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:booleanArray type:kotlin.BooleanArray visibility:private [final]' type=kotlin.BooleanArray origin=null
+                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
+            CONST String type=kotlin.String value=", "
+            CONST String type=kotlin.String value="byteArray="
+            CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null
+              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:byteArray type:kotlin.ByteArray visibility:private [final]' type=kotlin.ByteArray origin=null
+                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
+            CONST String type=kotlin.String value=", "
+            CONST String type=kotlin.String value="shortArray="
+            CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null
+              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:shortArray type:kotlin.ShortArray visibility:private [final]' type=kotlin.ShortArray origin=null
+                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
+            CONST String type=kotlin.String value=", "
+            CONST String type=kotlin.String value="intArray="
+            CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null
+              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:intArray type:kotlin.IntArray visibility:private [final]' type=kotlin.IntArray origin=null
+                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
+            CONST String type=kotlin.String value=", "
+            CONST String type=kotlin.String value="longArray="
+            CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null
+              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:longArray type:kotlin.LongArray visibility:private [final]' type=kotlin.LongArray origin=null
+                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
+            CONST String type=kotlin.String value=", "
+            CONST String type=kotlin.String value="floatArray="
+            CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null
+              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:floatArray type:kotlin.FloatArray visibility:private [final]' type=kotlin.FloatArray origin=null
+                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
+            CONST String type=kotlin.String value=", "
+            CONST String type=kotlin.String value="doubleArray="
+            CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null
+              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:doubleArray type:kotlin.DoubleArray visibility:private [final]' type=kotlin.DoubleArray origin=null
+                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
+            CONST String type=kotlin.String value=")"
   CLASS CLASS name:Test2 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test2<T of <root>.Test2>
     TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false
-    CONSTRUCTOR visibility:public <> (genericArray:kotlin.Array<T of <root>.Test2>) returnType:<root>.Test2<T of <root>.Test2> [primary]
-      VALUE_PARAMETER name:genericArray index:0 type:kotlin.Array<T of <root>.Test2>
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test2 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     PROPERTY name:genericArray visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:genericArray type:kotlin.Array<T of <root>.Test2> visibility:private [final]
         EXPRESSION_BODY
@@ -478,6 +473,11 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
           RETURN type=kotlin.Nothing from='public final fun <get-genericArray> (): kotlin.Array<T of <root>.Test2> declared in <root>.Test2'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:genericArray type:kotlin.Array<T of <root>.Test2> visibility:private [final]' type=kotlin.Array<T of <root>.Test2> origin=null
               receiver: GET_VAR '<this>: <root>.Test2<T of <root>.Test2> declared in <root>.Test2.<get-genericArray>' type=<root>.Test2<T of <root>.Test2> origin=null
+    CONSTRUCTOR visibility:public <> (genericArray:kotlin.Array<T of <root>.Test2>) returnType:<root>.Test2<T of <root>.Test2> [primary]
+      VALUE_PARAMETER name:genericArray index:0 type:kotlin.Array<T of <root>.Test2>
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test2 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:<root>.Test2<T of <root>.Test2>) returnType:kotlin.Array<T of <root>.Test2> [operator]
       $this: VALUE_PARAMETER name:<this> type:<root>.Test2<T of <root>.Test2>
       BLOCK_BODY
@@ -495,28 +495,6 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
           CONSTRUCTOR_CALL 'public constructor <init> (genericArray: kotlin.Array<T of <root>.Test2>) declared in <root>.Test2' type=<root>.Test2<T of <root>.Test2> origin=null
             <class: T>: T of <root>.Test2
             genericArray: GET_VAR 'genericArray: kotlin.Array<T of <root>.Test2> declared in <root>.Test2.copy' type=kotlin.Array<T of <root>.Test2> origin=null
-    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test2<T of <root>.Test2>) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test2<T of <root>.Test2>
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test2'
-          STRING_CONCATENATION type=kotlin.String
-            CONST String type=kotlin.String value="Test2("
-            CONST String type=kotlin.String value="genericArray="
-            CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null
-              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:genericArray type:kotlin.Array<T of <root>.Test2> visibility:private [final]' type=kotlin.Array<T of <root>.Test2> origin=null
-                receiver: GET_VAR '<this>: <root>.Test2<T of <root>.Test2> declared in <root>.Test2.toString' type=<root>.Test2<T of <root>.Test2> origin=null
-            CONST String type=kotlin.String value=")"
-    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test2<T of <root>.Test2>) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test2<T of <root>.Test2>
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test2'
-          CALL 'public final fun dataClassArrayMemberHashCode (arg0: kotlin.Any): kotlin.Int declared in kotlin.internal.ir' type=kotlin.Int origin=null
-            arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:genericArray type:kotlin.Array<T of <root>.Test2> visibility:private [final]' type=kotlin.Array<T of <root>.Test2> origin=null
-              receiver: GET_VAR '<this>: <root>.Test2<T of <root>.Test2> declared in <root>.Test2.hashCode' type=<root>.Test2<T of <root>.Test2> origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test2<T of <root>.Test2>, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -551,13 +529,30 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
               CONST Boolean type=kotlin.Boolean value=false
         RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.Test2'
           CONST Boolean type=kotlin.Boolean value=true
+    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test2<T of <root>.Test2>) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test2<T of <root>.Test2>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test2'
+          CALL 'public final fun dataClassArrayMemberHashCode (arg0: kotlin.Any): kotlin.Int declared in kotlin.internal.ir' type=kotlin.Int origin=null
+            arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:genericArray type:kotlin.Array<T of <root>.Test2> visibility:private [final]' type=kotlin.Array<T of <root>.Test2> origin=null
+              receiver: GET_VAR '<this>: <root>.Test2<T of <root>.Test2> declared in <root>.Test2.hashCode' type=<root>.Test2<T of <root>.Test2> origin=null
+    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test2<T of <root>.Test2>) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test2<T of <root>.Test2>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test2'
+          STRING_CONCATENATION type=kotlin.String
+            CONST String type=kotlin.String value="Test2("
+            CONST String type=kotlin.String value="genericArray="
+            CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null
+              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:genericArray type:kotlin.Array<T of <root>.Test2> visibility:private [final]' type=kotlin.Array<T of <root>.Test2> origin=null
+                receiver: GET_VAR '<this>: <root>.Test2<T of <root>.Test2> declared in <root>.Test2.toString' type=<root>.Test2<T of <root>.Test2> origin=null
+            CONST String type=kotlin.String value=")"
   CLASS CLASS name:Test3 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test3
-    CONSTRUCTOR visibility:public <> (anyArrayN:kotlin.Array<kotlin.Any>?) returnType:<root>.Test3 [primary]
-      VALUE_PARAMETER name:anyArrayN index:0 type:kotlin.Array<kotlin.Any>?
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test3 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     PROPERTY name:anyArrayN visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:anyArrayN type:kotlin.Array<kotlin.Any>? visibility:private [final]
         EXPRESSION_BODY
@@ -569,6 +564,11 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
           RETURN type=kotlin.Nothing from='public final fun <get-anyArrayN> (): kotlin.Array<kotlin.Any>? declared in <root>.Test3'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:anyArrayN type:kotlin.Array<kotlin.Any>? visibility:private [final]' type=kotlin.Array<kotlin.Any>? origin=null
               receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.<get-anyArrayN>' type=<root>.Test3 origin=null
+    CONSTRUCTOR visibility:public <> (anyArrayN:kotlin.Array<kotlin.Any>?) returnType:<root>.Test3 [primary]
+      VALUE_PARAMETER name:anyArrayN index:0 type:kotlin.Array<kotlin.Any>?
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test3 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:<root>.Test3) returnType:kotlin.Array<kotlin.Any>? [operator]
       $this: VALUE_PARAMETER name:<this> type:<root>.Test3
       BLOCK_BODY
@@ -585,37 +585,6 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
         RETURN type=kotlin.Nothing from='public final fun copy (anyArrayN: kotlin.Array<kotlin.Any>?): <root>.Test3 declared in <root>.Test3'
           CONSTRUCTOR_CALL 'public constructor <init> (anyArrayN: kotlin.Array<kotlin.Any>?) declared in <root>.Test3' type=<root>.Test3 origin=null
             anyArrayN: GET_VAR 'anyArrayN: kotlin.Array<kotlin.Any>? declared in <root>.Test3.copy' type=kotlin.Array<kotlin.Any>? origin=null
-    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test3) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test3
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test3'
-          STRING_CONCATENATION type=kotlin.String
-            CONST String type=kotlin.String value="Test3("
-            CONST String type=kotlin.String value="anyArrayN="
-            CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null
-              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:anyArrayN type:kotlin.Array<kotlin.Any>? visibility:private [final]' type=kotlin.Array<kotlin.Any>? origin=null
-                receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.toString' type=<root>.Test3 origin=null
-            CONST String type=kotlin.String value=")"
-    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test3) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test3
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test3'
-          WHEN type=kotlin.Int origin=null
-            BRANCH
-              if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
-                arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:anyArrayN type:kotlin.Array<kotlin.Any>? visibility:private [final]' type=kotlin.Array<kotlin.Any>? origin=null
-                  receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.hashCode' type=<root>.Test3 origin=null
-                arg1: CONST Null type=kotlin.Nothing? value=null
-              then: CONST Int type=kotlin.Int value=0
-            BRANCH
-              if: CONST Boolean type=kotlin.Boolean value=true
-              then: CALL 'public final fun dataClassArrayMemberHashCode (arg0: kotlin.Any): kotlin.Int declared in kotlin.internal.ir' type=kotlin.Int origin=null
-                arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:anyArrayN type:kotlin.Array<kotlin.Any>? visibility:private [final]' type=kotlin.Array<kotlin.Any>? origin=null
-                  receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.hashCode' type=<root>.Test3 origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test3, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -650,3 +619,34 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
               CONST Boolean type=kotlin.Boolean value=false
         RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.Test3'
           CONST Boolean type=kotlin.Boolean value=true
+    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test3) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test3
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test3'
+          WHEN type=kotlin.Int origin=null
+            BRANCH
+              if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
+                arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:anyArrayN type:kotlin.Array<kotlin.Any>? visibility:private [final]' type=kotlin.Array<kotlin.Any>? origin=null
+                  receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.hashCode' type=<root>.Test3 origin=null
+                arg1: CONST Null type=kotlin.Nothing? value=null
+              then: CONST Int type=kotlin.Int value=0
+            BRANCH
+              if: CONST Boolean type=kotlin.Boolean value=true
+              then: CALL 'public final fun dataClassArrayMemberHashCode (arg0: kotlin.Any): kotlin.Int declared in kotlin.internal.ir' type=kotlin.Int origin=null
+                arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:anyArrayN type:kotlin.Array<kotlin.Any>? visibility:private [final]' type=kotlin.Array<kotlin.Any>? origin=null
+                  receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.hashCode' type=<root>.Test3 origin=null
+    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test3) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test3
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test3'
+          STRING_CONCATENATION type=kotlin.String
+            CONST String type=kotlin.String value="Test3("
+            CONST String type=kotlin.String value="anyArrayN="
+            CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null
+              arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:anyArrayN type:kotlin.Array<kotlin.Any>? visibility:private [final]' type=kotlin.Array<kotlin.Any>? origin=null
+                receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.toString' type=<root>.Test3 origin=null
+            CONST String type=kotlin.String value=")"

compiler/testData/ir/irText/classes/dataClasses/dataClassWithArrayMembers.kt.txt

@@ -1,10 +1,4 @@
 data class Test1 {
-  constructor(stringArray: Array<String>, charArray: CharArray, booleanArray: BooleanArray, byteArray: ByteArray, shortArray: ShortArray, intArray: IntArray, longArray: LongArray, floatArray: FloatArray, doubleArray: DoubleArray) /* primary */ {
-    super/*Any*/()
-    /* <init>() */
-
-  }
-
   val stringArray: Array<String>
     field = stringArray
     get
@@ -41,6 +35,12 @@ data class Test1 {
     field = doubleArray
     get
 
+  constructor(stringArray: Array<String>, charArray: CharArray, booleanArray: BooleanArray, byteArray: ByteArray, shortArray: ShortArray, intArray: IntArray, longArray: LongArray, floatArray: FloatArray, doubleArray: DoubleArray) /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
+  }
+
   operator fun component1(): Array<String> {
     return <this>.#stringArray
   }
@@ -81,23 +81,6 @@ data class Test1 {
     return Test1(stringArray = stringArray, charArray = charArray, booleanArray = booleanArray, byteArray = byteArray, shortArray = shortArray, intArray = intArray, longArray = longArray, floatArray = floatArray, doubleArray = doubleArray)
   }
 
-  override fun toString(): String {
-    return "Test1(" + "stringArray=" + dataClassArrayMemberToString(arg0 = <this>.#stringArray) + ", " + "charArray=" + dataClassArrayMemberToString(arg0 = <this>.#charArray) + ", " + "booleanArray=" + dataClassArrayMemberToString(arg0 = <this>.#booleanArray) + ", " + "byteArray=" + dataClassArrayMemberToString(arg0 = <this>.#byteArray) + ", " + "shortArray=" + dataClassArrayMemberToString(arg0 = <this>.#shortArray) + ", " + "intArray=" + dataClassArrayMemberToString(arg0 = <this>.#intArray) + ", " + "longArray=" + dataClassArrayMemberToString(arg0 = <this>.#longArray) + ", " + "floatArray=" + dataClassArrayMemberToString(arg0 = <this>.#floatArray) + ", " + "doubleArray=" + dataClassArrayMemberToString(arg0 = <this>.#doubleArray) + ")"
-  }
-
-  override fun hashCode(): Int {
-    var result: Int = dataClassArrayMemberHashCode(arg0 = <this>.#stringArray)
-    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = <this>.#charArray))
-    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = <this>.#booleanArray))
-    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = <this>.#byteArray))
-    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = <this>.#shortArray))
-    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = <this>.#intArray))
-    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = <this>.#longArray))
-    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = <this>.#floatArray))
-    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = <this>.#doubleArray))
-    return result
-  }
-
   override operator fun equals(other: Any?): Boolean {
     when {
       EQEQEQ(arg0 = <this>, arg1 = other) -> return true
@@ -136,19 +119,36 @@ data class Test1 {
     return true
   }
 
+  override fun hashCode(): Int {
+    var result: Int = dataClassArrayMemberHashCode(arg0 = <this>.#stringArray)
+    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = <this>.#charArray))
+    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = <this>.#booleanArray))
+    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = <this>.#byteArray))
+    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = <this>.#shortArray))
+    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = <this>.#intArray))
+    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = <this>.#longArray))
+    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = <this>.#floatArray))
+    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = <this>.#doubleArray))
+    return result
+  }
+
+  override fun toString(): String {
+    return "Test1(" + "stringArray=" + dataClassArrayMemberToString(arg0 = <this>.#stringArray) + ", " + "charArray=" + dataClassArrayMemberToString(arg0 = <this>.#charArray) + ", " + "booleanArray=" + dataClassArrayMemberToString(arg0 = <this>.#booleanArray) + ", " + "byteArray=" + dataClassArrayMemberToString(arg0 = <this>.#byteArray) + ", " + "shortArray=" + dataClassArrayMemberToString(arg0 = <this>.#shortArray) + ", " + "intArray=" + dataClassArrayMemberToString(arg0 = <this>.#intArray) + ", " + "longArray=" + dataClassArrayMemberToString(arg0 = <this>.#longArray) + ", " + "floatArray=" + dataClassArrayMemberToString(arg0 = <this>.#floatArray) + ", " + "doubleArray=" + dataClassArrayMemberToString(arg0 = <this>.#doubleArray) + ")"
+  }
+
 }
 
 data class Test2<T : Any?> {
+  val genericArray: Array<T>
+    field = genericArray
+    get
+
   constructor(genericArray: Array<T>) /* primary */ {
     super/*Any*/()
     /* <init>() */
 
   }
 
-  val genericArray: Array<T>
-    field = genericArray
-    get
-
   operator fun component1(): Array<T> {
     return <this>.#genericArray
   }
@@ -157,14 +157,6 @@ data class Test2<T : Any?> {
     return Test2<T>(genericArray = genericArray)
   }
 
-  override fun toString(): String {
-    return "Test2(" + "genericArray=" + dataClassArrayMemberToString(arg0 = <this>.#genericArray) + ")"
-  }
-
-  override fun hashCode(): Int {
-    return dataClassArrayMemberHashCode(arg0 = <this>.#genericArray)
-  }
-
   override operator fun equals(other: Any?): Boolean {
     when {
       EQEQEQ(arg0 = <this>, arg1 = other) -> return true
@@ -179,19 +171,27 @@ data class Test2<T : Any?> {
     return true
   }
 
+  override fun hashCode(): Int {
+    return dataClassArrayMemberHashCode(arg0 = <this>.#genericArray)
+  }
+
+  override fun toString(): String {
+    return "Test2(" + "genericArray=" + dataClassArrayMemberToString(arg0 = <this>.#genericArray) + ")"
+  }
+
 }
 
 data class Test3 {
+  val anyArrayN: Array<Any>?
+    field = anyArrayN
+    get
+
   constructor(anyArrayN: Array<Any>?) /* primary */ {
     super/*Any*/()
     /* <init>() */
 
   }
 
-  val anyArrayN: Array<Any>?
-    field = anyArrayN
-    get
-
   operator fun component1(): Array<Any>? {
     return <this>.#anyArrayN
   }
@@ -200,17 +200,6 @@ data class Test3 {
     return Test3(anyArrayN = anyArrayN)
   }
 
-  override fun toString(): String {
-    return "Test3(" + "anyArrayN=" + dataClassArrayMemberToString(arg0 = <this>.#anyArrayN) + ")"
-  }
-
-  override fun hashCode(): Int {
-    return when {
-      EQEQ(arg0 = <this>.#anyArrayN, arg1 = null) -> 0
-      else -> dataClassArrayMemberHashCode(arg0 = <this>.#anyArrayN)
-    }
-  }
-
   override operator fun equals(other: Any?): Boolean {
     when {
       EQEQEQ(arg0 = <this>, arg1 = other) -> return true
@@ -225,4 +214,16 @@ data class Test3 {
     return true
   }
 
+  override fun hashCode(): Int {
+    return when {
+      EQEQ(arg0 = <this>.#anyArrayN, arg1 = null) -> 0
+      else -> dataClassArrayMemberHashCode(arg0 = <this>.#anyArrayN)
+    }
+  }
+
+  override fun toString(): String {
+    return "Test3(" + "anyArrayN=" + dataClassArrayMemberToString(arg0 = <this>.#anyArrayN) + ")"
+  }
+
 }
+

compiler/testData/ir/irText/classes/dataClasses/dataClasses.ir.txt

@@ -1,13 +1,6 @@
 FILE fqName:<root> fileName:/dataClasses.kt
   CLASS CLASS name:Test1 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test1
-    CONSTRUCTOR visibility:public <> (x:kotlin.Int, y:kotlin.String, z:kotlin.Any) returnType:<root>.Test1 [primary]
-      VALUE_PARAMETER name:x index:0 type:kotlin.Int
-      VALUE_PARAMETER name:y index:1 type:kotlin.String
-      VALUE_PARAMETER name:z index:2 type:kotlin.Any
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     PROPERTY name:x visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]
         EXPRESSION_BODY
@@ -41,6 +34,13 @@ FILE fqName:<root> fileName:/dataClasses.kt
           RETURN type=kotlin.Nothing from='public final fun <get-z> (): kotlin.Any declared in <root>.Test1'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Any visibility:private [final]' type=kotlin.Any origin=null
               receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.<get-z>' type=<root>.Test1 origin=null
+    CONSTRUCTOR visibility:public <> (x:kotlin.Int, y:kotlin.String, z:kotlin.Any) returnType:<root>.Test1 [primary]
+      VALUE_PARAMETER name:x index:0 type:kotlin.Int
+      VALUE_PARAMETER name:y index:1 type:kotlin.String
+      VALUE_PARAMETER name:z index:2 type:kotlin.Any
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:<root>.Test1) returnType:kotlin.Int [operator]
       $this: VALUE_PARAMETER name:<this> type:<root>.Test1
       BLOCK_BODY
@@ -79,53 +79,6 @@ FILE fqName:<root> fileName:/dataClasses.kt
             x: GET_VAR 'x: kotlin.Int declared in <root>.Test1.copy' type=kotlin.Int origin=null
             y: GET_VAR 'y: kotlin.String declared in <root>.Test1.copy' type=kotlin.String origin=null
             z: GET_VAR 'z: kotlin.Any declared in <root>.Test1.copy' type=kotlin.Any origin=null
-    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test1) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test1
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test1'
-          STRING_CONCATENATION type=kotlin.String
-            CONST String type=kotlin.String value="Test1("
-            CONST String type=kotlin.String value="x="
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null
-              receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
-            CONST String type=kotlin.String value=", "
-            CONST String type=kotlin.String value="y="
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:private [final]' type=kotlin.String origin=null
-              receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
-            CONST String type=kotlin.String value=", "
-            CONST String type=kotlin.String value="z="
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Any visibility:private [final]' type=kotlin.Any origin=null
-              receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
-            CONST String type=kotlin.String value=")"
-    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test1) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test1
-      BLOCK_BODY
-        VAR name:result type:kotlin.Int [var]
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null
-              receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
-        SET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Unit origin=EQ
-          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Int origin=null
-              other: CONST Int type=kotlin.Int value=31
-            other: CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=null
-              $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:private [final]' type=kotlin.String origin=null
-                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
-        SET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Unit origin=EQ
-          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Int origin=null
-              other: CONST Int type=kotlin.Int value=31
-            other: CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
-              $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Any visibility:private [final]' type=kotlin.Any origin=null
-                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test1'
-          GET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Int origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test1, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -180,13 +133,55 @@ FILE fqName:<root> fileName:/dataClasses.kt
               CONST Boolean type=kotlin.Boolean value=false
         RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.Test1'
           CONST Boolean type=kotlin.Boolean value=true
+    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test1) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1
+      BLOCK_BODY
+        VAR name:result type:kotlin.Int [var]
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null
+              receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
+        SET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Unit origin=EQ
+          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Int origin=null
+              other: CONST Int type=kotlin.Int value=31
+            other: CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=null
+              $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:private [final]' type=kotlin.String origin=null
+                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
+        SET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Unit origin=EQ
+          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Int origin=null
+              other: CONST Int type=kotlin.Int value=31
+            other: CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+              $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Any visibility:private [final]' type=kotlin.Any origin=null
+                receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.hashCode' type=<root>.Test1 origin=null
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test1'
+          GET_VAR 'var result: kotlin.Int declared in <root>.Test1.hashCode' type=kotlin.Int origin=null
+    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test1) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test1'
+          STRING_CONCATENATION type=kotlin.String
+            CONST String type=kotlin.String value="Test1("
+            CONST String type=kotlin.String value="x="
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null
+              receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
+            CONST String type=kotlin.String value=", "
+            CONST String type=kotlin.String value="y="
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:private [final]' type=kotlin.String origin=null
+              receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
+            CONST String type=kotlin.String value=", "
+            CONST String type=kotlin.String value="z="
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Any visibility:private [final]' type=kotlin.Any origin=null
+              receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.toString' type=<root>.Test1 origin=null
+            CONST String type=kotlin.String value=")"
   CLASS CLASS name:Test2 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test2
-    CONSTRUCTOR visibility:public <> (x:kotlin.Any?) returnType:<root>.Test2 [primary]
-      VALUE_PARAMETER name:x index:0 type:kotlin.Any?
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test2 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     PROPERTY name:x visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any? visibility:private [final]
         EXPRESSION_BODY
@@ -198,6 +193,11 @@ FILE fqName:<root> fileName:/dataClasses.kt
           RETURN type=kotlin.Nothing from='public final fun <get-x> (): kotlin.Any? declared in <root>.Test2'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any? visibility:private [final]' type=kotlin.Any? origin=null
               receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.<get-x>' type=<root>.Test2 origin=null
+    CONSTRUCTOR visibility:public <> (x:kotlin.Any?) returnType:<root>.Test2 [primary]
+      VALUE_PARAMETER name:x index:0 type:kotlin.Any?
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test2 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:<root>.Test2) returnType:kotlin.Any? [operator]
       $this: VALUE_PARAMETER name:<this> type:<root>.Test2
       BLOCK_BODY
@@ -214,36 +214,6 @@ FILE fqName:<root> fileName:/dataClasses.kt
         RETURN type=kotlin.Nothing from='public final fun copy (x: kotlin.Any?): <root>.Test2 declared in <root>.Test2'
           CONSTRUCTOR_CALL 'public constructor <init> (x: kotlin.Any?) declared in <root>.Test2' type=<root>.Test2 origin=null
             x: GET_VAR 'x: kotlin.Any? declared in <root>.Test2.copy' type=kotlin.Any? origin=null
-    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test2) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test2
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test2'
-          STRING_CONCATENATION type=kotlin.String
-            CONST String type=kotlin.String value="Test2("
-            CONST String type=kotlin.String value="x="
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any? visibility:private [final]' type=kotlin.Any? origin=null
-              receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.toString' type=<root>.Test2 origin=null
-            CONST String type=kotlin.String value=")"
-    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test2) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test2
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test2'
-          WHEN type=kotlin.Int origin=null
-            BRANCH
-              if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
-                arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any? visibility:private [final]' type=kotlin.Any? origin=null
-                  receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.hashCode' type=<root>.Test2 origin=null
-                arg1: CONST Null type=kotlin.Nothing? value=null
-              then: CONST Int type=kotlin.Int value=0
-            BRANCH
-              if: CONST Boolean type=kotlin.Boolean value=true
-              then: CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
-                $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any? visibility:private [final]' type=kotlin.Any? origin=null
-                  receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.hashCode' type=<root>.Test2 origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test2, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -278,16 +248,38 @@ FILE fqName:<root> fileName:/dataClasses.kt
               CONST Boolean type=kotlin.Boolean value=false
         RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.Test2'
           CONST Boolean type=kotlin.Boolean value=true
+    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test2) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test2
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test2'
+          WHEN type=kotlin.Int origin=null
+            BRANCH
+              if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
+                arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any? visibility:private [final]' type=kotlin.Any? origin=null
+                  receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.hashCode' type=<root>.Test2 origin=null
+                arg1: CONST Null type=kotlin.Nothing? value=null
+              then: CONST Int type=kotlin.Int value=0
+            BRANCH
+              if: CONST Boolean type=kotlin.Boolean value=true
+              then: CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+                $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any? visibility:private [final]' type=kotlin.Any? origin=null
+                  receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.hashCode' type=<root>.Test2 origin=null
+    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test2) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test2
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test2'
+          STRING_CONCATENATION type=kotlin.String
+            CONST String type=kotlin.String value="Test2("
+            CONST String type=kotlin.String value="x="
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any? visibility:private [final]' type=kotlin.Any? origin=null
+              receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.toString' type=<root>.Test2 origin=null
+            CONST String type=kotlin.String value=")"
   CLASS CLASS name:Test3 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test3
-    CONSTRUCTOR visibility:public <> (d:kotlin.Double, dn:kotlin.Double?, f:kotlin.Float, df:kotlin.Float?) returnType:<root>.Test3 [primary]
-      VALUE_PARAMETER name:d index:0 type:kotlin.Double
-      VALUE_PARAMETER name:dn index:1 type:kotlin.Double?
-      VALUE_PARAMETER name:f index:2 type:kotlin.Float
-      VALUE_PARAMETER name:df index:3 type:kotlin.Float?
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test3 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     PROPERTY name:d visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:d type:kotlin.Double visibility:private [final]
         EXPRESSION_BODY
@@ -332,6 +324,14 @@ FILE fqName:<root> fileName:/dataClasses.kt
           RETURN type=kotlin.Nothing from='public final fun <get-df> (): kotlin.Float? declared in <root>.Test3'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:df type:kotlin.Float? visibility:private [final]' type=kotlin.Float? origin=null
               receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.<get-df>' type=<root>.Test3 origin=null
+    CONSTRUCTOR visibility:public <> (d:kotlin.Double, dn:kotlin.Double?, f:kotlin.Float, df:kotlin.Float?) returnType:<root>.Test3 [primary]
+      VALUE_PARAMETER name:d index:0 type:kotlin.Double
+      VALUE_PARAMETER name:dn index:1 type:kotlin.Double?
+      VALUE_PARAMETER name:f index:2 type:kotlin.Float
+      VALUE_PARAMETER name:df index:3 type:kotlin.Float?
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test3 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:<root>.Test3) returnType:kotlin.Double [operator]
       $this: VALUE_PARAMETER name:<this> type:<root>.Test3
       BLOCK_BODY
@@ -381,83 +381,6 @@ FILE fqName:<root> fileName:/dataClasses.kt
             dn: GET_VAR 'dn: kotlin.Double? declared in <root>.Test3.copy' type=kotlin.Double? origin=null
             f: GET_VAR 'f: kotlin.Float declared in <root>.Test3.copy' type=kotlin.Float origin=null
             df: GET_VAR 'df: kotlin.Float? declared in <root>.Test3.copy' type=kotlin.Float? origin=null
-    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test3) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test3
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test3'
-          STRING_CONCATENATION type=kotlin.String
-            CONST String type=kotlin.String value="Test3("
-            CONST String type=kotlin.String value="d="
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:d type:kotlin.Double visibility:private [final]' type=kotlin.Double origin=null
-              receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.toString' type=<root>.Test3 origin=null
-            CONST String type=kotlin.String value=", "
-            CONST String type=kotlin.String value="dn="
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:dn type:kotlin.Double? visibility:private [final]' type=kotlin.Double? origin=null
-              receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.toString' type=<root>.Test3 origin=null
-            CONST String type=kotlin.String value=", "
-            CONST String type=kotlin.String value="f="
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:f type:kotlin.Float visibility:private [final]' type=kotlin.Float origin=null
-              receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.toString' type=<root>.Test3 origin=null
-            CONST String type=kotlin.String value=", "
-            CONST String type=kotlin.String value="df="
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:df type:kotlin.Float? visibility:private [final]' type=kotlin.Float? origin=null
-              receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.toString' type=<root>.Test3 origin=null
-            CONST String type=kotlin.String value=")"
-    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test3) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test3
-      BLOCK_BODY
-        VAR name:result type:kotlin.Int [var]
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Double' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:d type:kotlin.Double visibility:private [final]' type=kotlin.Double origin=null
-              receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.hashCode' type=<root>.Test3 origin=null
-        SET_VAR 'var result: kotlin.Int declared in <root>.Test3.hashCode' type=kotlin.Unit origin=EQ
-          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test3.hashCode' type=kotlin.Int origin=null
-              other: CONST Int type=kotlin.Int value=31
-            other: WHEN type=kotlin.Int origin=null
-              BRANCH
-                if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
-                  arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:dn type:kotlin.Double? visibility:private [final]' type=kotlin.Double? origin=null
-                    receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.hashCode' type=<root>.Test3 origin=null
-                  arg1: CONST Null type=kotlin.Nothing? value=null
-                then: CONST Int type=kotlin.Int value=0
-              BRANCH
-                if: CONST Boolean type=kotlin.Boolean value=true
-                then: CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Double' type=kotlin.Int origin=null
-                  $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:dn type:kotlin.Double? visibility:private [final]' type=kotlin.Double? origin=null
-                    receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.hashCode' type=<root>.Test3 origin=null
-        SET_VAR 'var result: kotlin.Int declared in <root>.Test3.hashCode' type=kotlin.Unit origin=EQ
-          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test3.hashCode' type=kotlin.Int origin=null
-              other: CONST Int type=kotlin.Int value=31
-            other: CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Float' type=kotlin.Int origin=null
-              $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:f type:kotlin.Float visibility:private [final]' type=kotlin.Float origin=null
-                receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.hashCode' type=<root>.Test3 origin=null
-        SET_VAR 'var result: kotlin.Int declared in <root>.Test3.hashCode' type=kotlin.Unit origin=EQ
-          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test3.hashCode' type=kotlin.Int origin=null
-              other: CONST Int type=kotlin.Int value=31
-            other: WHEN type=kotlin.Int origin=null
-              BRANCH
-                if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
-                  arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:df type:kotlin.Float? visibility:private [final]' type=kotlin.Float? origin=null
-                    receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.hashCode' type=<root>.Test3 origin=null
-                  arg1: CONST Null type=kotlin.Nothing? value=null
-                then: CONST Int type=kotlin.Int value=0
-              BRANCH
-                if: CONST Boolean type=kotlin.Boolean value=true
-                then: CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Float' type=kotlin.Int origin=null
-                  $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:df type:kotlin.Float? visibility:private [final]' type=kotlin.Float? origin=null
-                    receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.hashCode' type=<root>.Test3 origin=null
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test3'
-          GET_VAR 'var result: kotlin.Int declared in <root>.Test3.hashCode' type=kotlin.Int origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test3, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -522,3 +445,80 @@ FILE fqName:<root> fileName:/dataClasses.kt
               CONST Boolean type=kotlin.Boolean value=false
         RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.Test3'
           CONST Boolean type=kotlin.Boolean value=true
+    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test3) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test3
+      BLOCK_BODY
+        VAR name:result type:kotlin.Int [var]
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Double' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:d type:kotlin.Double visibility:private [final]' type=kotlin.Double origin=null
+              receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.hashCode' type=<root>.Test3 origin=null
+        SET_VAR 'var result: kotlin.Int declared in <root>.Test3.hashCode' type=kotlin.Unit origin=EQ
+          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test3.hashCode' type=kotlin.Int origin=null
+              other: CONST Int type=kotlin.Int value=31
+            other: WHEN type=kotlin.Int origin=null
+              BRANCH
+                if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
+                  arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:dn type:kotlin.Double? visibility:private [final]' type=kotlin.Double? origin=null
+                    receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.hashCode' type=<root>.Test3 origin=null
+                  arg1: CONST Null type=kotlin.Nothing? value=null
+                then: CONST Int type=kotlin.Int value=0
+              BRANCH
+                if: CONST Boolean type=kotlin.Boolean value=true
+                then: CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Double' type=kotlin.Int origin=null
+                  $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:dn type:kotlin.Double? visibility:private [final]' type=kotlin.Double? origin=null
+                    receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.hashCode' type=<root>.Test3 origin=null
+        SET_VAR 'var result: kotlin.Int declared in <root>.Test3.hashCode' type=kotlin.Unit origin=EQ
+          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test3.hashCode' type=kotlin.Int origin=null
+              other: CONST Int type=kotlin.Int value=31
+            other: CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Float' type=kotlin.Int origin=null
+              $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:f type:kotlin.Float visibility:private [final]' type=kotlin.Float origin=null
+                receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.hashCode' type=<root>.Test3 origin=null
+        SET_VAR 'var result: kotlin.Int declared in <root>.Test3.hashCode' type=kotlin.Unit origin=EQ
+          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+              $this: GET_VAR 'var result: kotlin.Int declared in <root>.Test3.hashCode' type=kotlin.Int origin=null
+              other: CONST Int type=kotlin.Int value=31
+            other: WHEN type=kotlin.Int origin=null
+              BRANCH
+                if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
+                  arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:df type:kotlin.Float? visibility:private [final]' type=kotlin.Float? origin=null
+                    receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.hashCode' type=<root>.Test3 origin=null
+                  arg1: CONST Null type=kotlin.Nothing? value=null
+                then: CONST Int type=kotlin.Int value=0
+              BRANCH
+                if: CONST Boolean type=kotlin.Boolean value=true
+                then: CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Float' type=kotlin.Int origin=null
+                  $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:df type:kotlin.Float? visibility:private [final]' type=kotlin.Float? origin=null
+                    receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.hashCode' type=<root>.Test3 origin=null
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test3'
+          GET_VAR 'var result: kotlin.Int declared in <root>.Test3.hashCode' type=kotlin.Int origin=null
+    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test3) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test3
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test3'
+          STRING_CONCATENATION type=kotlin.String
+            CONST String type=kotlin.String value="Test3("
+            CONST String type=kotlin.String value="d="
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:d type:kotlin.Double visibility:private [final]' type=kotlin.Double origin=null
+              receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.toString' type=<root>.Test3 origin=null
+            CONST String type=kotlin.String value=", "
+            CONST String type=kotlin.String value="dn="
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:dn type:kotlin.Double? visibility:private [final]' type=kotlin.Double? origin=null
+              receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.toString' type=<root>.Test3 origin=null
+            CONST String type=kotlin.String value=", "
+            CONST String type=kotlin.String value="f="
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:f type:kotlin.Float visibility:private [final]' type=kotlin.Float origin=null
+              receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.toString' type=<root>.Test3 origin=null
+            CONST String type=kotlin.String value=", "
+            CONST String type=kotlin.String value="df="
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:df type:kotlin.Float? visibility:private [final]' type=kotlin.Float? origin=null
+              receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.toString' type=<root>.Test3 origin=null
+            CONST String type=kotlin.String value=")"

compiler/testData/ir/irText/classes/dataClasses/dataClasses.kt.txt

@@ -1,10 +1,4 @@
 data class Test1 {
-  constructor(x: Int, y: String, z: Any) /* primary */ {
-    super/*Any*/()
-    /* <init>() */
-
-  }
-
   val x: Int
     field = x
     get
@@ -17,6 +11,12 @@ data class Test1 {
     field = z
     get
 
+  constructor(x: Int, y: String, z: Any) /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
+  }
+
   operator fun component1(): Int {
     return <this>.#x
   }
@@ -33,17 +33,6 @@ data class Test1 {
     return Test1(x = x, y = y, z = z)
   }
 
-  override fun toString(): String {
-    return "Test1(" + "x=" + <this>.#x + ", " + "y=" + <this>.#y + ", " + "z=" + <this>.#z + ")"
-  }
-
-  override fun hashCode(): Int {
-    var result: Int = <this>.#x.hashCode()
-    result = result.times(other = 31).plus(other = <this>.#y.hashCode())
-    result = result.times(other = 31).plus(other = <this>.#z.hashCode())
-    return result
-  }
-
   override operator fun equals(other: Any?): Boolean {
     when {
       EQEQEQ(arg0 = <this>, arg1 = other) -> return true
@@ -64,19 +53,30 @@ data class Test1 {
     return true
   }
 
+  override fun hashCode(): Int {
+    var result: Int = <this>.#x.hashCode()
+    result = result.times(other = 31).plus(other = <this>.#y.hashCode())
+    result = result.times(other = 31).plus(other = <this>.#z.hashCode())
+    return result
+  }
+
+  override fun toString(): String {
+    return "Test1(" + "x=" + <this>.#x + ", " + "y=" + <this>.#y + ", " + "z=" + <this>.#z + ")"
+  }
+
 }
 
 data class Test2 {
+  val x: Any?
+    field = x
+    get
+
   constructor(x: Any?) /* primary */ {
     super/*Any*/()
     /* <init>() */
 
   }
 
-  val x: Any?
-    field = x
-    get
-
   operator fun component1(): Any? {
     return <this>.#x
   }
@@ -85,17 +85,6 @@ data class Test2 {
     return Test2(x = x)
   }
 
-  override fun toString(): String {
-    return "Test2(" + "x=" + <this>.#x + ")"
-  }
-
-  override fun hashCode(): Int {
-    return when {
-      EQEQ(arg0 = <this>.#x, arg1 = null) -> 0
-      else -> <this>.#x.hashCode()
-    }
-  }
-
   override operator fun equals(other: Any?): Boolean {
     when {
       EQEQEQ(arg0 = <this>, arg1 = other) -> return true
@@ -110,15 +99,20 @@ data class Test2 {
     return true
   }
 
+  override fun hashCode(): Int {
+    return when {
+      EQEQ(arg0 = <this>.#x, arg1 = null) -> 0
+      else -> <this>.#x.hashCode()
+    }
+  }
+
+  override fun toString(): String {
+    return "Test2(" + "x=" + <this>.#x + ")"
+  }
+
 }
 
 data class Test3 {
-  constructor(d: Double, dn: Double?, f: Float, df: Float?) /* primary */ {
-    super/*Any*/()
-    /* <init>() */
-
-  }
-
   val d: Double
     field = d
     get
@@ -135,6 +129,12 @@ data class Test3 {
     field = df
     get
 
+  constructor(d: Double, dn: Double?, f: Float, df: Float?) /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
+  }
+
   operator fun component1(): Double {
     return <this>.#d
   }
@@ -155,24 +155,6 @@ data class Test3 {
     return Test3(d = d, dn = dn, f = f, df = df)
   }
 
-  override fun toString(): String {
-    return "Test3(" + "d=" + <this>.#d + ", " + "dn=" + <this>.#dn + ", " + "f=" + <this>.#f + ", " + "df=" + <this>.#df + ")"
-  }
-
-  override fun hashCode(): Int {
-    var result: Int = <this>.#d.hashCode()
-    result = result.times(other = 31).plus(other = when {
-      EQEQ(arg0 = <this>.#dn, arg1 = null) -> 0
-      else -> <this>.#dn.hashCode()
-    })
-    result = result.times(other = 31).plus(other = <this>.#f.hashCode())
-    result = result.times(other = 31).plus(other = when {
-      EQEQ(arg0 = <this>.#df, arg1 = null) -> 0
-      else -> <this>.#df.hashCode()
-    })
-    return result
-  }
-
   override operator fun equals(other: Any?): Boolean {
     when {
       EQEQEQ(arg0 = <this>, arg1 = other) -> return true
@@ -196,4 +178,23 @@ data class Test3 {
     return true
   }
 
+  override fun hashCode(): Int {
+    var result: Int = <this>.#d.hashCode()
+    result = result.times(other = 31).plus(other = when {
+      EQEQ(arg0 = <this>.#dn, arg1 = null) -> 0
+      else -> <this>.#dn.hashCode()
+    })
+    result = result.times(other = 31).plus(other = <this>.#f.hashCode())
+    result = result.times(other = 31).plus(other = when {
+      EQEQ(arg0 = <this>.#df, arg1 = null) -> 0
+      else -> <this>.#df.hashCode()
+    })
+    return result
+  }
+
+  override fun toString(): String {
+    return "Test3(" + "d=" + <this>.#d + ", " + "dn=" + <this>.#dn + ", " + "f=" + <this>.#f + ", " + "df=" + <this>.#df + ")"
+  }
+
 }
+

compiler/testData/ir/irText/classes/dataClasses/dataClassesGeneric.ir.txt

@@ -2,11 +2,6 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
   CLASS CLASS name:Test1 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test1<T of <root>.Test1>
     TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false
-    CONSTRUCTOR visibility:public <> (x:T of <root>.Test1) returnType:<root>.Test1<T of <root>.Test1> [primary]
-      VALUE_PARAMETER name:x index:0 type:T of <root>.Test1
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     PROPERTY name:x visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:x type:T of <root>.Test1 visibility:private [final]
         EXPRESSION_BODY
@@ -18,6 +13,11 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
           RETURN type=kotlin.Nothing from='public final fun <get-x> (): T of <root>.Test1 declared in <root>.Test1'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of <root>.Test1 visibility:private [final]' type=T of <root>.Test1 origin=null
               receiver: GET_VAR '<this>: <root>.Test1<T of <root>.Test1> declared in <root>.Test1.<get-x>' type=<root>.Test1<T of <root>.Test1> origin=null
+    CONSTRUCTOR visibility:public <> (x:T of <root>.Test1) returnType:<root>.Test1<T of <root>.Test1> [primary]
+      VALUE_PARAMETER name:x index:0 type:T of <root>.Test1
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:<root>.Test1<T of <root>.Test1>) returnType:T of <root>.Test1 [operator]
       $this: VALUE_PARAMETER name:<this> type:<root>.Test1<T of <root>.Test1>
       BLOCK_BODY
@@ -35,36 +35,6 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
           CONSTRUCTOR_CALL 'public constructor <init> (x: T of <root>.Test1) declared in <root>.Test1' type=<root>.Test1<T of <root>.Test1> origin=null
             <class: T>: T of <root>.Test1
             x: GET_VAR 'x: T of <root>.Test1 declared in <root>.Test1.copy' type=T of <root>.Test1 origin=null
-    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test1<T of <root>.Test1>) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test1<T of <root>.Test1>
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test1'
-          STRING_CONCATENATION type=kotlin.String
-            CONST String type=kotlin.String value="Test1("
-            CONST String type=kotlin.String value="x="
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of <root>.Test1 visibility:private [final]' type=T of <root>.Test1 origin=null
-              receiver: GET_VAR '<this>: <root>.Test1<T of <root>.Test1> declared in <root>.Test1.toString' type=<root>.Test1<T of <root>.Test1> origin=null
-            CONST String type=kotlin.String value=")"
-    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test1<T of <root>.Test1>) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test1<T of <root>.Test1>
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test1'
-          WHEN type=kotlin.Int origin=null
-            BRANCH
-              if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
-                arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of <root>.Test1 visibility:private [final]' type=T of <root>.Test1 origin=null
-                  receiver: GET_VAR '<this>: <root>.Test1<T of <root>.Test1> declared in <root>.Test1.hashCode' type=<root>.Test1<T of <root>.Test1> origin=null
-                arg1: CONST Null type=kotlin.Nothing? value=null
-              then: CONST Int type=kotlin.Int value=0
-            BRANCH
-              if: CONST Boolean type=kotlin.Boolean value=true
-              then: CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
-                $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of <root>.Test1 visibility:private [final]' type=T of <root>.Test1 origin=null
-                  receiver: GET_VAR '<this>: <root>.Test1<T of <root>.Test1> declared in <root>.Test1.hashCode' type=<root>.Test1<T of <root>.Test1> origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test1<T of <root>.Test1>, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -99,14 +69,39 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
               CONST Boolean type=kotlin.Boolean value=false
         RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.Test1'
           CONST Boolean type=kotlin.Boolean value=true
+    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test1<T of <root>.Test1>) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1<T of <root>.Test1>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test1'
+          WHEN type=kotlin.Int origin=null
+            BRANCH
+              if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
+                arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of <root>.Test1 visibility:private [final]' type=T of <root>.Test1 origin=null
+                  receiver: GET_VAR '<this>: <root>.Test1<T of <root>.Test1> declared in <root>.Test1.hashCode' type=<root>.Test1<T of <root>.Test1> origin=null
+                arg1: CONST Null type=kotlin.Nothing? value=null
+              then: CONST Int type=kotlin.Int value=0
+            BRANCH
+              if: CONST Boolean type=kotlin.Boolean value=true
+              then: CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+                $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of <root>.Test1 visibility:private [final]' type=T of <root>.Test1 origin=null
+                  receiver: GET_VAR '<this>: <root>.Test1<T of <root>.Test1> declared in <root>.Test1.hashCode' type=<root>.Test1<T of <root>.Test1> origin=null
+    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test1<T of <root>.Test1>) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1<T of <root>.Test1>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test1'
+          STRING_CONCATENATION type=kotlin.String
+            CONST String type=kotlin.String value="Test1("
+            CONST String type=kotlin.String value="x="
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of <root>.Test1 visibility:private [final]' type=T of <root>.Test1 origin=null
+              receiver: GET_VAR '<this>: <root>.Test1<T of <root>.Test1> declared in <root>.Test1.toString' type=<root>.Test1<T of <root>.Test1> origin=null
+            CONST String type=kotlin.String value=")"
   CLASS CLASS name:Test2 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test2<T of <root>.Test2>
     TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Number] reified:false
-    CONSTRUCTOR visibility:public <> (x:T of <root>.Test2) returnType:<root>.Test2<T of <root>.Test2> [primary]
-      VALUE_PARAMETER name:x index:0 type:T of <root>.Test2
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test2 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     PROPERTY name:x visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:x type:T of <root>.Test2 visibility:private [final]
         EXPRESSION_BODY
@@ -118,6 +113,11 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
           RETURN type=kotlin.Nothing from='public final fun <get-x> (): T of <root>.Test2 declared in <root>.Test2'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of <root>.Test2 visibility:private [final]' type=T of <root>.Test2 origin=null
               receiver: GET_VAR '<this>: <root>.Test2<T of <root>.Test2> declared in <root>.Test2.<get-x>' type=<root>.Test2<T of <root>.Test2> origin=null
+    CONSTRUCTOR visibility:public <> (x:T of <root>.Test2) returnType:<root>.Test2<T of <root>.Test2> [primary]
+      VALUE_PARAMETER name:x index:0 type:T of <root>.Test2
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test2 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:<root>.Test2<T of <root>.Test2>) returnType:T of <root>.Test2 [operator]
       $this: VALUE_PARAMETER name:<this> type:<root>.Test2<T of <root>.Test2>
       BLOCK_BODY
@@ -135,27 +135,6 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
           CONSTRUCTOR_CALL 'public constructor <init> (x: T of <root>.Test2) declared in <root>.Test2' type=<root>.Test2<T of <root>.Test2> origin=null
             <class: T>: T of <root>.Test2
             x: GET_VAR 'x: T of <root>.Test2 declared in <root>.Test2.copy' type=T of <root>.Test2 origin=null
-    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test2<T of <root>.Test2>) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test2<T of <root>.Test2>
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test2'
-          STRING_CONCATENATION type=kotlin.String
-            CONST String type=kotlin.String value="Test2("
-            CONST String type=kotlin.String value="x="
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of <root>.Test2 visibility:private [final]' type=T of <root>.Test2 origin=null
-              receiver: GET_VAR '<this>: <root>.Test2<T of <root>.Test2> declared in <root>.Test2.toString' type=<root>.Test2<T of <root>.Test2> origin=null
-            CONST String type=kotlin.String value=")"
-    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test2<T of <root>.Test2>) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test2<T of <root>.Test2>
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test2'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Number' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of <root>.Test2 visibility:private [final]' type=T of <root>.Test2 origin=null
-              receiver: GET_VAR '<this>: <root>.Test2<T of <root>.Test2> declared in <root>.Test2.hashCode' type=<root>.Test2<T of <root>.Test2> origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test2<T of <root>.Test2>, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -190,14 +169,30 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
               CONST Boolean type=kotlin.Boolean value=false
         RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.Test2'
           CONST Boolean type=kotlin.Boolean value=true
+    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test2<T of <root>.Test2>) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test2<T of <root>.Test2>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test2'
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Number' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of <root>.Test2 visibility:private [final]' type=T of <root>.Test2 origin=null
+              receiver: GET_VAR '<this>: <root>.Test2<T of <root>.Test2> declared in <root>.Test2.hashCode' type=<root>.Test2<T of <root>.Test2> origin=null
+    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test2<T of <root>.Test2>) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test2<T of <root>.Test2>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test2'
+          STRING_CONCATENATION type=kotlin.String
+            CONST String type=kotlin.String value="Test2("
+            CONST String type=kotlin.String value="x="
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of <root>.Test2 visibility:private [final]' type=T of <root>.Test2 origin=null
+              receiver: GET_VAR '<this>: <root>.Test2<T of <root>.Test2> declared in <root>.Test2.toString' type=<root>.Test2<T of <root>.Test2> origin=null
+            CONST String type=kotlin.String value=")"
   CLASS CLASS name:Test3 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test3<T of <root>.Test3>
     TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false
-    CONSTRUCTOR visibility:public <> (x:kotlin.collections.List<T of <root>.Test3>) returnType:<root>.Test3<T of <root>.Test3> [primary]
-      VALUE_PARAMETER name:x index:0 type:kotlin.collections.List<T of <root>.Test3>
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test3 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     PROPERTY name:x visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.collections.List<T of <root>.Test3> visibility:private [final]
         EXPRESSION_BODY
@@ -209,6 +204,11 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
           RETURN type=kotlin.Nothing from='public final fun <get-x> (): kotlin.collections.List<T of <root>.Test3> declared in <root>.Test3'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.collections.List<T of <root>.Test3> visibility:private [final]' type=kotlin.collections.List<T of <root>.Test3> origin=null
               receiver: GET_VAR '<this>: <root>.Test3<T of <root>.Test3> declared in <root>.Test3.<get-x>' type=<root>.Test3<T of <root>.Test3> origin=null
+    CONSTRUCTOR visibility:public <> (x:kotlin.collections.List<T of <root>.Test3>) returnType:<root>.Test3<T of <root>.Test3> [primary]
+      VALUE_PARAMETER name:x index:0 type:kotlin.collections.List<T of <root>.Test3>
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test3 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:<root>.Test3<T of <root>.Test3>) returnType:kotlin.collections.List<T of <root>.Test3> [operator]
       $this: VALUE_PARAMETER name:<this> type:<root>.Test3<T of <root>.Test3>
       BLOCK_BODY
@@ -226,27 +226,6 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
           CONSTRUCTOR_CALL 'public constructor <init> (x: kotlin.collections.List<T of <root>.Test3>) declared in <root>.Test3' type=<root>.Test3<T of <root>.Test3> origin=null
             <class: T>: T of <root>.Test3
             x: GET_VAR 'x: kotlin.collections.List<T of <root>.Test3> declared in <root>.Test3.copy' type=kotlin.collections.List<T of <root>.Test3> origin=null
-    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test3<T of <root>.Test3>) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test3<T of <root>.Test3>
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test3'
-          STRING_CONCATENATION type=kotlin.String
-            CONST String type=kotlin.String value="Test3("
-            CONST String type=kotlin.String value="x="
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.collections.List<T of <root>.Test3> visibility:private [final]' type=kotlin.collections.List<T of <root>.Test3> origin=null
-              receiver: GET_VAR '<this>: <root>.Test3<T of <root>.Test3> declared in <root>.Test3.toString' type=<root>.Test3<T of <root>.Test3> origin=null
-            CONST String type=kotlin.String value=")"
-    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test3<T of <root>.Test3>) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test3<T of <root>.Test3>
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test3'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.collections.List' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.collections.List<T of <root>.Test3> visibility:private [final]' type=kotlin.collections.List<T of <root>.Test3> origin=null
-              receiver: GET_VAR '<this>: <root>.Test3<T of <root>.Test3> declared in <root>.Test3.hashCode' type=<root>.Test3<T of <root>.Test3> origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test3<T of <root>.Test3>, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -281,13 +260,29 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
               CONST Boolean type=kotlin.Boolean value=false
         RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.Test3'
           CONST Boolean type=kotlin.Boolean value=true
+    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test3<T of <root>.Test3>) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test3<T of <root>.Test3>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test3'
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.collections.List' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.collections.List<T of <root>.Test3> visibility:private [final]' type=kotlin.collections.List<T of <root>.Test3> origin=null
+              receiver: GET_VAR '<this>: <root>.Test3<T of <root>.Test3> declared in <root>.Test3.hashCode' type=<root>.Test3<T of <root>.Test3> origin=null
+    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test3<T of <root>.Test3>) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test3<T of <root>.Test3>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test3'
+          STRING_CONCATENATION type=kotlin.String
+            CONST String type=kotlin.String value="Test3("
+            CONST String type=kotlin.String value="x="
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.collections.List<T of <root>.Test3> visibility:private [final]' type=kotlin.collections.List<T of <root>.Test3> origin=null
+              receiver: GET_VAR '<this>: <root>.Test3<T of <root>.Test3> declared in <root>.Test3.toString' type=<root>.Test3<T of <root>.Test3> origin=null
+            CONST String type=kotlin.String value=")"
   CLASS CLASS name:Test4 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test4
-    CONSTRUCTOR visibility:public <> (x:kotlin.collections.List<kotlin.String>) returnType:<root>.Test4 [primary]
-      VALUE_PARAMETER name:x index:0 type:kotlin.collections.List<kotlin.String>
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test4 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     PROPERTY name:x visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.collections.List<kotlin.String> visibility:private [final]
         EXPRESSION_BODY
@@ -299,6 +294,11 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
           RETURN type=kotlin.Nothing from='public final fun <get-x> (): kotlin.collections.List<kotlin.String> declared in <root>.Test4'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.collections.List<kotlin.String> visibility:private [final]' type=kotlin.collections.List<kotlin.String> origin=null
               receiver: GET_VAR '<this>: <root>.Test4 declared in <root>.Test4.<get-x>' type=<root>.Test4 origin=null
+    CONSTRUCTOR visibility:public <> (x:kotlin.collections.List<kotlin.String>) returnType:<root>.Test4 [primary]
+      VALUE_PARAMETER name:x index:0 type:kotlin.collections.List<kotlin.String>
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test4 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:<root>.Test4) returnType:kotlin.collections.List<kotlin.String> [operator]
       $this: VALUE_PARAMETER name:<this> type:<root>.Test4
       BLOCK_BODY
@@ -315,27 +315,6 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
         RETURN type=kotlin.Nothing from='public final fun copy (x: kotlin.collections.List<kotlin.String>): <root>.Test4 declared in <root>.Test4'
           CONSTRUCTOR_CALL 'public constructor <init> (x: kotlin.collections.List<kotlin.String>) declared in <root>.Test4' type=<root>.Test4 origin=null
             x: GET_VAR 'x: kotlin.collections.List<kotlin.String> declared in <root>.Test4.copy' type=kotlin.collections.List<kotlin.String> origin=null
-    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test4) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test4
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test4'
-          STRING_CONCATENATION type=kotlin.String
-            CONST String type=kotlin.String value="Test4("
-            CONST String type=kotlin.String value="x="
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.collections.List<kotlin.String> visibility:private [final]' type=kotlin.collections.List<kotlin.String> origin=null
-              receiver: GET_VAR '<this>: <root>.Test4 declared in <root>.Test4.toString' type=<root>.Test4 origin=null
-            CONST String type=kotlin.String value=")"
-    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test4) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.Test4
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test4'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.collections.List' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.collections.List<kotlin.String> visibility:private [final]' type=kotlin.collections.List<kotlin.String> origin=null
-              receiver: GET_VAR '<this>: <root>.Test4 declared in <root>.Test4.hashCode' type=<root>.Test4 origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.Test4, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -370,3 +349,24 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
               CONST Boolean type=kotlin.Boolean value=false
         RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.Test4'
           CONST Boolean type=kotlin.Boolean value=true
+    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.Test4) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test4
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.Test4'
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.collections.List' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.collections.List<kotlin.String> visibility:private [final]' type=kotlin.collections.List<kotlin.String> origin=null
+              receiver: GET_VAR '<this>: <root>.Test4 declared in <root>.Test4.hashCode' type=<root>.Test4 origin=null
+    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.Test4) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test4
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.Test4'
+          STRING_CONCATENATION type=kotlin.String
+            CONST String type=kotlin.String value="Test4("
+            CONST String type=kotlin.String value="x="
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.collections.List<kotlin.String> visibility:private [final]' type=kotlin.collections.List<kotlin.String> origin=null
+              receiver: GET_VAR '<this>: <root>.Test4 declared in <root>.Test4.toString' type=<root>.Test4 origin=null
+            CONST String type=kotlin.String value=")"

compiler/testData/ir/irText/classes/dataClasses/dataClassesGeneric.kt.txt

@@ -1,14 +1,14 @@
 data class Test1<T : Any?> {
+  val x: T
+    field = x
+    get
+
   constructor(x: T) /* primary */ {
     super/*Any*/()
     /* <init>() */
 
   }
 
-  val x: T
-    field = x
-    get
-
   operator fun component1(): T {
     return <this>.#x
   }
@@ -17,17 +17,6 @@ data class Test1<T : Any?> {
     return Test1<T>(x = x)
   }
 
-  override fun toString(): String {
-    return "Test1(" + "x=" + <this>.#x + ")"
-  }
-
-  override fun hashCode(): Int {
-    return when {
-      EQEQ(arg0 = <this>.#x, arg1 = null) -> 0
-      else -> <this>.#x.hashCode()
-    }
-  }
-
   override operator fun equals(other: Any?): Boolean {
     when {
       EQEQEQ(arg0 = <this>, arg1 = other) -> return true
@@ -42,19 +31,30 @@ data class Test1<T : Any?> {
     return true
   }
 
+  override fun hashCode(): Int {
+    return when {
+      EQEQ(arg0 = <this>.#x, arg1 = null) -> 0
+      else -> <this>.#x.hashCode()
+    }
+  }
+
+  override fun toString(): String {
+    return "Test1(" + "x=" + <this>.#x + ")"
+  }
+
 }
 
 data class Test2<T : Number> {
+  val x: T
+    field = x
+    get
+
   constructor(x: T) /* primary */ {
     super/*Any*/()
     /* <init>() */
 
   }
 
-  val x: T
-    field = x
-    get
-
   operator fun component1(): T {
     return <this>.#x
   }
@@ -63,14 +63,6 @@ data class Test2<T : Number> {
     return Test2<T>(x = x)
   }
 
-  override fun toString(): String {
-    return "Test2(" + "x=" + <this>.#x + ")"
-  }
-
-  override fun hashCode(): Int {
-    return <this>.#x.hashCode()
-  }
-
   override operator fun equals(other: Any?): Boolean {
     when {
       EQEQEQ(arg0 = <this>, arg1 = other) -> return true
@@ -85,19 +77,27 @@ data class Test2<T : Number> {
     return true
   }
 
+  override fun hashCode(): Int {
+    return <this>.#x.hashCode()
+  }
+
+  override fun toString(): String {
+    return "Test2(" + "x=" + <this>.#x + ")"
+  }
+
 }
 
 data class Test3<T : Any?> {
+  val x: List<T>
+    field = x
+    get
+
   constructor(x: List<T>) /* primary */ {
     super/*Any*/()
     /* <init>() */
 
   }
 
-  val x: List<T>
-    field = x
-    get
-
   operator fun component1(): List<T> {
     return <this>.#x
   }
@@ -106,14 +106,6 @@ data class Test3<T : Any?> {
     return Test3<T>(x = x)
   }
 
-  override fun toString(): String {
-    return "Test3(" + "x=" + <this>.#x + ")"
-  }
-
-  override fun hashCode(): Int {
-    return <this>.#x.hashCode()
-  }
-
   override operator fun equals(other: Any?): Boolean {
     when {
       EQEQEQ(arg0 = <this>, arg1 = other) -> return true
@@ -128,19 +120,27 @@ data class Test3<T : Any?> {
     return true
   }
 
+  override fun hashCode(): Int {
+    return <this>.#x.hashCode()
+  }
+
+  override fun toString(): String {
+    return "Test3(" + "x=" + <this>.#x + ")"
+  }
+
 }
 
 data class Test4 {
+  val x: List<String>
+    field = x
+    get
+
   constructor(x: List<String>) /* primary */ {
     super/*Any*/()
     /* <init>() */
 
   }
 
-  val x: List<String>
-    field = x
-    get
-
   operator fun component1(): List<String> {
     return <this>.#x
   }
@@ -149,14 +149,6 @@ data class Test4 {
     return Test4(x = x)
   }
 
-  override fun toString(): String {
-    return "Test4(" + "x=" + <this>.#x + ")"
-  }
-
-  override fun hashCode(): Int {
-    return <this>.#x.hashCode()
-  }
-
   override operator fun equals(other: Any?): Boolean {
     when {
       EQEQEQ(arg0 = <this>, arg1 = other) -> return true
@@ -171,4 +163,13 @@ data class Test4 {
     return true
   }
 
+  override fun hashCode(): Int {
+    return <this>.#x.hashCode()
+  }
+
+  override fun toString(): String {
+    return "Test4(" + "x=" + <this>.#x + ")"
+  }
+
 }
+

compiler/testData/ir/irText/classes/dataClasses/dataObject.ir.txt

@@ -5,20 +5,6 @@ FILE fqName:<root> fileName:/dataObject.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:DataObject modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
-    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.DataObject) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.DataObject
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.DataObject'
-          CONST String type=kotlin.String value="DataObject"
-    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.DataObject) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.DataObject
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.DataObject'
-          CONST Int type=kotlin.Int value=-1155894359
     FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.DataObject, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -43,3 +29,17 @@ FILE fqName:<root> fileName:/dataObject.kt
             GET_VAR 'other: kotlin.Any? declared in <root>.DataObject.equals' type=kotlin.Any? origin=null
         RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.DataObject'
           CONST Boolean type=kotlin.Boolean value=true
+    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.DataObject) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.DataObject
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.DataObject'
+          CONST Int type=kotlin.Int value=-1155894359
+    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.DataObject) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.DataObject
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.DataObject'
+          CONST String type=kotlin.String value="DataObject"

compiler/testData/ir/irText/classes/dataClasses/dataObject.kt.txt

@@ -5,14 +5,6 @@ data object DataObject {
 
   }
 
-  override fun toString(): String {
-    return "DataObject"
-  }
-
-  override fun hashCode(): Int {
-    return -1155894359
-  }
-
   override operator fun equals(other: Any?): Boolean {
     when {
       EQEQEQ(arg0 = <this>, arg1 = other) -> return true
@@ -24,4 +16,13 @@ data object DataObject {
     return true
   }
 
+  override fun hashCode(): Int {
+    return -1155894359
+  }
+
+  override fun toString(): String {
+    return "DataObject"
+  }
+
 }
+

compiler/testData/ir/irText/classes/dataClasses/delegationInSealed.fir.ir.txt

@@ -1,174 +0,0 @@
-FILE fqName:<root> fileName:/delegationInSealed.kt
-  CLASS CLASS name:A modality:SEALED visibility:public superTypes:[kotlin.CharSequence]
-    sealedSubclasses:
-      CLASS CLASS name:B modality:FINAL visibility:public [data] superTypes:[<root>.A; kotlin.CharSequence]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A
-    CONSTRUCTOR visibility:protected <> () returnType:<root>.A [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:SEALED visibility:public superTypes:[kotlin.CharSequence]'
-    CLASS CLASS name:B modality:FINAL visibility:public [data] superTypes:[<root>.A; kotlin.CharSequence]
-      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A.B
-      CONSTRUCTOR visibility:public <> (c:kotlin.CharSequence) returnType:<root>.A.B [primary]
-        VALUE_PARAMETER name:c index:0 type:kotlin.CharSequence
-        BLOCK_BODY
-          DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.A'
-          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:B modality:FINAL visibility:public [data] superTypes:[<root>.A; kotlin.CharSequence]'
-      PROPERTY name:c visibility:public modality:FINAL [val]
-        FIELD PROPERTY_BACKING_FIELD name:c type:kotlin.CharSequence visibility:private [final]
-          EXPRESSION_BODY
-            GET_VAR 'c: kotlin.CharSequence declared in <root>.A.B.<init>' type=kotlin.CharSequence origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-        FUN DEFAULT_PROPERTY_ACCESSOR name:<get-c> visibility:public modality:FINAL <> ($this:<root>.A.B) returnType:kotlin.CharSequence
-          correspondingProperty: PROPERTY name:c visibility:public modality:FINAL [val]
-          $this: VALUE_PARAMETER name:<this> type:<root>.A.B
-          BLOCK_BODY
-            RETURN type=kotlin.Nothing from='public final fun <get-c> (): kotlin.CharSequence declared in <root>.A.B'
-              GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:c type:kotlin.CharSequence visibility:private [final]' type=kotlin.CharSequence origin=null
-                receiver: GET_VAR '<this>: <root>.A.B declared in <root>.A.B.<get-c>' type=<root>.A.B origin=null
-      FUN DELEGATED_MEMBER name:get visibility:public modality:OPEN <> ($this:<root>.A.B, index:kotlin.Int) returnType:kotlin.Char [operator]
-        overridden:
-          public abstract fun get (index: kotlin.Int): kotlin.Char declared in <root>.A
-          public abstract fun get (index: kotlin.Int): kotlin.Char declared in kotlin.CharSequence
-        $this: VALUE_PARAMETER name:<this> type:<root>.A.B
-        VALUE_PARAMETER name:index index:0 type:kotlin.Int
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun get (index: kotlin.Int): kotlin.Char declared in <root>.A.B'
-            CALL 'public abstract fun get (index: kotlin.Int): kotlin.Char declared in kotlin.CharSequence' type=kotlin.Char origin=null
-              $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:c type:kotlin.CharSequence visibility:private [final]' type=kotlin.CharSequence origin=null
-                receiver: GET_VAR '<this>: <root>.A.B declared in <root>.A.B.get' type=<root>.A.B origin=null
-              index: GET_VAR 'index: kotlin.Int declared in <root>.A.B.get' type=kotlin.Int origin=null
-      FUN DELEGATED_MEMBER name:subSequence visibility:public modality:OPEN <> ($this:<root>.A.B, startIndex:kotlin.Int, endIndex:kotlin.Int) returnType:kotlin.CharSequence
-        overridden:
-          public abstract fun subSequence (startIndex: kotlin.Int, endIndex: kotlin.Int): kotlin.CharSequence declared in <root>.A
-          public abstract fun subSequence (startIndex: kotlin.Int, endIndex: kotlin.Int): kotlin.CharSequence declared in kotlin.CharSequence
-        $this: VALUE_PARAMETER name:<this> type:<root>.A.B
-        VALUE_PARAMETER name:startIndex index:0 type:kotlin.Int
-        VALUE_PARAMETER name:endIndex index:1 type:kotlin.Int
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun subSequence (startIndex: kotlin.Int, endIndex: kotlin.Int): kotlin.CharSequence declared in <root>.A.B'
-            CALL 'public abstract fun subSequence (startIndex: kotlin.Int, endIndex: kotlin.Int): kotlin.CharSequence declared in kotlin.CharSequence' type=kotlin.CharSequence origin=null
-              $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:c type:kotlin.CharSequence visibility:private [final]' type=kotlin.CharSequence origin=null
-                receiver: GET_VAR '<this>: <root>.A.B declared in <root>.A.B.subSequence' type=<root>.A.B origin=null
-              startIndex: GET_VAR 'startIndex: kotlin.Int declared in <root>.A.B.subSequence' type=kotlin.Int origin=null
-              endIndex: GET_VAR 'endIndex: kotlin.Int declared in <root>.A.B.subSequence' type=kotlin.Int origin=null
-      PROPERTY DELEGATED_MEMBER name:length visibility:public modality:OPEN [val]
-        overridden:
-          public abstract length: kotlin.Int
-          public abstract length: kotlin.Int
-        FUN DELEGATED_MEMBER name:<get-length> visibility:public modality:OPEN <> ($this:<root>.A.B) returnType:kotlin.Int
-          correspondingProperty: PROPERTY DELEGATED_MEMBER name:length visibility:public modality:OPEN [val]
-          overridden:
-            public abstract fun <get-length> (): kotlin.Int declared in <root>.A
-            public abstract fun <get-length> (): kotlin.Int declared in kotlin.CharSequence
-          $this: VALUE_PARAMETER name:<this> type:<root>.A.B
-          BLOCK_BODY
-            RETURN type=kotlin.Nothing from='public open fun <get-length> (): kotlin.Int declared in <root>.A.B'
-              CALL 'public abstract fun <get-length> (): kotlin.Int declared in kotlin.CharSequence' type=kotlin.Int origin=null
-                $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:c type:kotlin.CharSequence visibility:private [final]' type=kotlin.CharSequence origin=null
-                  receiver: GET_VAR '<this>: <root>.A.B declared in <root>.A.B.<get-length>' type=<root>.A.B origin=null
-      FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:<root>.A.B) returnType:kotlin.CharSequence [operator]
-        $this: VALUE_PARAMETER name:<this> type:<root>.A.B
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.CharSequence declared in <root>.A.B'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:c type:kotlin.CharSequence visibility:private [final]' type=kotlin.CharSequence origin=null
-              receiver: GET_VAR '<this>: <root>.A.B declared in <root>.A.B.component1' type=<root>.A.B origin=null
-      FUN GENERATED_DATA_CLASS_MEMBER name:copy visibility:public modality:FINAL <> ($this:<root>.A.B, c:kotlin.CharSequence) returnType:<root>.A.B
-        $this: VALUE_PARAMETER name:<this> type:<root>.A.B
-        VALUE_PARAMETER name:c index:0 type:kotlin.CharSequence
-          EXPRESSION_BODY
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:c type:kotlin.CharSequence visibility:private [final]' type=kotlin.CharSequence origin=null
-              receiver: GET_VAR '<this>: <root>.A.B declared in <root>.A.B.copy' type=<root>.A.B origin=null
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun copy (c: kotlin.CharSequence): <root>.A.B declared in <root>.A.B'
-            CONSTRUCTOR_CALL 'public constructor <init> (c: kotlin.CharSequence) declared in <root>.A.B' type=<root>.A.B origin=null
-              c: GET_VAR 'c: kotlin.CharSequence declared in <root>.A.B.copy' type=kotlin.CharSequence origin=null
-      FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.A.B) returnType:kotlin.String
-        overridden:
-          public open fun toString (): kotlin.String declared in <root>.A
-          public open fun toString (): kotlin.String declared in kotlin.CharSequence
-        $this: VALUE_PARAMETER name:<this> type:<root>.A.B
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.A.B'
-            STRING_CONCATENATION type=kotlin.String
-              CONST String type=kotlin.String value="B("
-              CONST String type=kotlin.String value="c="
-              GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:c type:kotlin.CharSequence visibility:private [final]' type=kotlin.CharSequence origin=null
-                receiver: GET_VAR '<this>: <root>.A.B declared in <root>.A.B.toString' type=<root>.A.B origin=null
-              CONST String type=kotlin.String value=")"
-      FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.A.B) returnType:kotlin.Int
-        overridden:
-          public open fun hashCode (): kotlin.Int declared in <root>.A
-          public open fun hashCode (): kotlin.Int declared in kotlin.CharSequence
-        $this: VALUE_PARAMETER name:<this> type:<root>.A.B
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.A.B'
-            CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.CharSequence' type=kotlin.Int origin=null
-              $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:c type:kotlin.CharSequence visibility:private [final]' type=kotlin.CharSequence origin=null
-                receiver: GET_VAR '<this>: <root>.A.B declared in <root>.A.B.hashCode' type=<root>.A.B origin=null
-      FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.A.B, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
-        overridden:
-          public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.A
-          public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.CharSequence
-        $this: VALUE_PARAMETER name:<this> type:<root>.A.B
-        VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-        BLOCK_BODY
-          WHEN type=kotlin.Unit origin=null
-            BRANCH
-              if: CALL 'public final fun EQEQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQEQ
-                arg0: GET_VAR '<this>: <root>.A.B declared in <root>.A.B.equals' type=<root>.A.B origin=null
-                arg1: GET_VAR 'other: kotlin.Any? declared in <root>.A.B.equals' type=kotlin.Any? origin=null
-              then: RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.A.B'
-                CONST Boolean type=kotlin.Boolean value=true
-          WHEN type=kotlin.Unit origin=null
-            BRANCH
-              if: TYPE_OP type=kotlin.Boolean origin=NOT_INSTANCEOF typeOperand=<root>.A.B
-                GET_VAR 'other: kotlin.Any? declared in <root>.A.B.equals' type=kotlin.Any? origin=null
-              then: RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.A.B'
-                CONST Boolean type=kotlin.Boolean value=false
-          VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:<root>.A.B [val]
-            TYPE_OP type=<root>.A.B origin=CAST typeOperand=<root>.A.B
-              GET_VAR 'other: kotlin.Any? declared in <root>.A.B.equals' type=kotlin.Any? origin=null
-          WHEN type=kotlin.Unit origin=null
-            BRANCH
-              if: CALL 'public final fun not (): kotlin.Boolean declared in kotlin.Boolean' type=kotlin.Boolean origin=EXCLEQ
-                $this: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EXCLEQ
-                  arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:c type:kotlin.CharSequence visibility:private [final]' type=kotlin.CharSequence origin=null
-                    receiver: GET_VAR '<this>: <root>.A.B declared in <root>.A.B.equals' type=<root>.A.B origin=null
-                  arg1: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:c type:kotlin.CharSequence visibility:private [final]' type=kotlin.CharSequence origin=null
-                    receiver: GET_VAR 'val tmp_0: <root>.A.B declared in <root>.A.B.equals' type=<root>.A.B origin=null
-              then: RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.A.B'
-                CONST Boolean type=kotlin.Boolean value=false
-          RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.A.B'
-            CONST Boolean type=kotlin.Boolean value=true
-    FUN FAKE_OVERRIDE name:get visibility:public modality:ABSTRACT <> ($this:kotlin.CharSequence, index:kotlin.Int) returnType:kotlin.Char [fake_override,operator]
-      overridden:
-        public abstract fun get (index: kotlin.Int): kotlin.Char declared in kotlin.CharSequence
-      $this: VALUE_PARAMETER name:<this> type:kotlin.CharSequence
-      VALUE_PARAMETER name:index index:0 type:kotlin.Int
-    FUN FAKE_OVERRIDE name:subSequence visibility:public modality:ABSTRACT <> ($this:kotlin.CharSequence, startIndex:kotlin.Int, endIndex:kotlin.Int) returnType:kotlin.CharSequence [fake_override]
-      overridden:
-        public abstract fun subSequence (startIndex: kotlin.Int, endIndex: kotlin.Int): kotlin.CharSequence declared in kotlin.CharSequence
-      $this: VALUE_PARAMETER name:<this> type:kotlin.CharSequence
-      VALUE_PARAMETER name:startIndex index:0 type:kotlin.Int
-      VALUE_PARAMETER name:endIndex index:1 type:kotlin.Int
-    PROPERTY FAKE_OVERRIDE name:length visibility:public modality:ABSTRACT [fake_override,val]
-      overridden:
-        public abstract length: kotlin.Int
-      FUN FAKE_OVERRIDE name:<get-length> visibility:public modality:ABSTRACT <> ($this:kotlin.CharSequence) returnType:kotlin.Int [fake_override]
-        correspondingProperty: PROPERTY FAKE_OVERRIDE name:length visibility:public modality:ABSTRACT [fake_override,val]
-        overridden:
-          public abstract fun <get-length> (): kotlin.Int declared in kotlin.CharSequence
-        $this: VALUE_PARAMETER name:<this> type:kotlin.CharSequence
-    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.CharSequence
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.CharSequence
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.CharSequence
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any

compiler/testData/ir/irText/classes/dataClasses/delegationInSealed.fir.kt.txt

@@ -1,65 +0,0 @@
-sealed class A : CharSequence {
-  protected constructor() /* primary */ {
-    super/*Any*/()
-    /* <init>() */
-
-  }
-
-  data class B : A, CharSequence {
-    constructor(c: CharSequence) /* primary */ {
-      super/*A*/()
-      /* <init>() */
-
-    }
-
-    val c: CharSequence
-      field = c
-      get
-
-    override operator fun get(index: Int): Char {
-      return <this>.#c.get(index = index)
-    }
-
-    override fun subSequence(startIndex: Int, endIndex: Int): CharSequence {
-      return <this>.#c.subSequence(startIndex = startIndex, endIndex = endIndex)
-    }
-
-    override val length: Int
-      override get(): Int {
-        return <this>.#c.<get-length>()
-      }
-
-    operator fun component1(): CharSequence {
-      return <this>.#c
-    }
-
-    fun copy(c: CharSequence = <this>.#c): B {
-      return B(c = c)
-    }
-
-    override fun toString(): String {
-      return "B(" + "c=" + <this>.#c + ")"
-    }
-
-    override fun hashCode(): Int {
-      return <this>.#c.hashCode()
-    }
-
-    override operator fun equals(other: Any?): Boolean {
-      when {
-        EQEQEQ(arg0 = <this>, arg1 = other) -> return true
-      }
-      when {
-        other !is B -> return false
-      }
-      val tmp_0: B = other as B
-      when {
-        EQEQ(arg0 = <this>.#c, arg1 = tmp_0.#c).not() -> return false
-      }
-      return true
-    }
-
-  }
-
-}
-

compiler/testData/ir/irText/classes/dataClasses/delegationInSealed.ir.txt

@@ -3,17 +3,8 @@ FILE fqName:<root> fileName:/delegationInSealed.kt
     sealedSubclasses:
       CLASS CLASS name:B modality:FINAL visibility:public [data] superTypes:[<root>.A; kotlin.CharSequence]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A
-    CONSTRUCTOR visibility:protected <> () returnType:<root>.A [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:SEALED visibility:public superTypes:[kotlin.CharSequence]'
     CLASS CLASS name:B modality:FINAL visibility:public [data] superTypes:[<root>.A; kotlin.CharSequence]
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A.B
-      CONSTRUCTOR visibility:public <> (c:kotlin.CharSequence) returnType:<root>.A.B [primary]
-        VALUE_PARAMETER name:c index:0 type:kotlin.CharSequence
-        BLOCK_BODY
-          DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.A'
-          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:B modality:FINAL visibility:public [data] superTypes:[<root>.A; kotlin.CharSequence]'
       PROPERTY name:c visibility:public modality:FINAL [val]
         FIELD PROPERTY_BACKING_FIELD name:c type:kotlin.CharSequence visibility:private [final]
           EXPRESSION_BODY
@@ -25,21 +16,11 @@ FILE fqName:<root> fileName:/delegationInSealed.kt
             RETURN type=kotlin.Nothing from='public final fun <get-c> (): kotlin.CharSequence declared in <root>.A.B'
               GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:c type:kotlin.CharSequence visibility:private [final]' type=kotlin.CharSequence origin=null
                 receiver: GET_VAR '<this>: <root>.A.B declared in <root>.A.B.<get-c>' type=<root>.A.B origin=null
-      PROPERTY DELEGATED_MEMBER name:length visibility:public modality:OPEN [val]
-        overridden:
-          public abstract length: kotlin.Int
-          public abstract length: kotlin.Int
-        FUN DELEGATED_MEMBER name:<get-length> visibility:public modality:OPEN <> ($this:<root>.A.B) returnType:kotlin.Int
-          correspondingProperty: PROPERTY DELEGATED_MEMBER name:length visibility:public modality:OPEN [val]
-          overridden:
-            public abstract fun <get-length> (): kotlin.Int declared in <root>.A
-            public abstract fun <get-length> (): kotlin.Int declared in kotlin.CharSequence
-          $this: VALUE_PARAMETER name:<this> type:<root>.A.B
-          BLOCK_BODY
-            RETURN type=kotlin.Nothing from='public open fun <get-length> (): kotlin.Int declared in <root>.A.B'
-              CALL 'public abstract fun <get-length> (): kotlin.Int declared in kotlin.CharSequence' type=kotlin.Int origin=null
-                $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:c type:kotlin.CharSequence visibility:private [final]' type=kotlin.CharSequence origin=null
-                  receiver: GET_VAR '<this>: <root>.A.B declared in <root>.A.B.<get-length>' type=<root>.A.B origin=null
+      CONSTRUCTOR visibility:public <> (c:kotlin.CharSequence) returnType:<root>.A.B [primary]
+        VALUE_PARAMETER name:c index:0 type:kotlin.CharSequence
+        BLOCK_BODY
+          DELEGATING_CONSTRUCTOR_CALL 'protected constructor <init> () declared in <root>.A'
+          INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:B modality:FINAL visibility:public [data] superTypes:[<root>.A; kotlin.CharSequence]'
       FUN DELEGATED_MEMBER name:get visibility:public modality:OPEN <> ($this:<root>.A.B, index:kotlin.Int) returnType:kotlin.Char [operator]
         overridden:
           public abstract fun get (index: kotlin.Int): kotlin.Char declared in <root>.A
@@ -82,29 +63,6 @@ FILE fqName:<root> fileName:/delegationInSealed.kt
           RETURN type=kotlin.Nothing from='public final fun copy (c: kotlin.CharSequence): <root>.A.B declared in <root>.A.B'
             CONSTRUCTOR_CALL 'public constructor <init> (c: kotlin.CharSequence) declared in <root>.A.B' type=<root>.A.B origin=null
               c: GET_VAR 'c: kotlin.CharSequence declared in <root>.A.B.copy' type=kotlin.CharSequence origin=null
-      FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.A.B) returnType:kotlin.String
-        overridden:
-          public open fun toString (): kotlin.String declared in <root>.A
-          public open fun toString (): kotlin.String declared in kotlin.CharSequence
-        $this: VALUE_PARAMETER name:<this> type:<root>.A.B
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.A.B'
-            STRING_CONCATENATION type=kotlin.String
-              CONST String type=kotlin.String value="B("
-              CONST String type=kotlin.String value="c="
-              GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:c type:kotlin.CharSequence visibility:private [final]' type=kotlin.CharSequence origin=null
-                receiver: GET_VAR '<this>: <root>.A.B declared in <root>.A.B.toString' type=<root>.A.B origin=null
-              CONST String type=kotlin.String value=")"
-      FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.A.B) returnType:kotlin.Int
-        overridden:
-          public open fun hashCode (): kotlin.Int declared in <root>.A
-          public open fun hashCode (): kotlin.Int declared in kotlin.CharSequence
-        $this: VALUE_PARAMETER name:<this> type:<root>.A.B
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.A.B'
-            CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.CharSequence' type=kotlin.Int origin=null
-              $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:c type:kotlin.CharSequence visibility:private [final]' type=kotlin.CharSequence origin=null
-                receiver: GET_VAR '<this>: <root>.A.B declared in <root>.A.B.hashCode' type=<root>.A.B origin=null
       FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.A.B, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
         overridden:
           public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.A
@@ -140,14 +98,48 @@ FILE fqName:<root> fileName:/delegationInSealed.kt
                 CONST Boolean type=kotlin.Boolean value=false
           RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.A.B'
             CONST Boolean type=kotlin.Boolean value=true
-    PROPERTY FAKE_OVERRIDE name:length visibility:public modality:ABSTRACT [fake_override,val]
-      overridden:
-        public abstract length: kotlin.Int
-      FUN FAKE_OVERRIDE name:<get-length> visibility:public modality:ABSTRACT <> ($this:kotlin.CharSequence) returnType:kotlin.Int [fake_override]
-        correspondingProperty: PROPERTY FAKE_OVERRIDE name:length visibility:public modality:ABSTRACT [fake_override,val]
+      FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.A.B) returnType:kotlin.Int
         overridden:
-          public abstract fun <get-length> (): kotlin.Int declared in kotlin.CharSequence
-        $this: VALUE_PARAMETER name:<this> type:kotlin.CharSequence
+          public open fun hashCode (): kotlin.Int declared in <root>.A
+          public open fun hashCode (): kotlin.Int declared in kotlin.CharSequence
+        $this: VALUE_PARAMETER name:<this> type:<root>.A.B
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.A.B'
+            CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.CharSequence' type=kotlin.Int origin=null
+              $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:c type:kotlin.CharSequence visibility:private [final]' type=kotlin.CharSequence origin=null
+                receiver: GET_VAR '<this>: <root>.A.B declared in <root>.A.B.hashCode' type=<root>.A.B origin=null
+      FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.A.B) returnType:kotlin.String
+        overridden:
+          public open fun toString (): kotlin.String declared in <root>.A
+          public open fun toString (): kotlin.String declared in kotlin.CharSequence
+        $this: VALUE_PARAMETER name:<this> type:<root>.A.B
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.A.B'
+            STRING_CONCATENATION type=kotlin.String
+              CONST String type=kotlin.String value="B("
+              CONST String type=kotlin.String value="c="
+              GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:c type:kotlin.CharSequence visibility:private [final]' type=kotlin.CharSequence origin=null
+                receiver: GET_VAR '<this>: <root>.A.B declared in <root>.A.B.toString' type=<root>.A.B origin=null
+              CONST String type=kotlin.String value=")"
+      PROPERTY DELEGATED_MEMBER name:length visibility:public modality:OPEN [val]
+        overridden:
+          public abstract length: kotlin.Int
+          public abstract length: kotlin.Int
+        FUN DELEGATED_MEMBER name:<get-length> visibility:public modality:OPEN <> ($this:<root>.A.B) returnType:kotlin.Int
+          correspondingProperty: PROPERTY DELEGATED_MEMBER name:length visibility:public modality:OPEN [val]
+          overridden:
+            public abstract fun <get-length> (): kotlin.Int declared in <root>.A
+            public abstract fun <get-length> (): kotlin.Int declared in kotlin.CharSequence
+          $this: VALUE_PARAMETER name:<this> type:<root>.A.B
+          BLOCK_BODY
+            RETURN type=kotlin.Nothing from='public open fun <get-length> (): kotlin.Int declared in <root>.A.B'
+              CALL 'public abstract fun <get-length> (): kotlin.Int declared in kotlin.CharSequence' type=kotlin.Int origin=null
+                $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:c type:kotlin.CharSequence visibility:private [final]' type=kotlin.CharSequence origin=null
+                  receiver: GET_VAR '<this>: <root>.A.B declared in <root>.A.B.<get-length>' type=<root>.A.B origin=null
+    CONSTRUCTOR visibility:protected <> () returnType:<root>.A [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:SEALED visibility:public superTypes:[kotlin.CharSequence]'
     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.CharSequence
@@ -172,3 +164,11 @@ FILE fqName:<root> fileName:/delegationInSealed.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.CharSequence
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    PROPERTY FAKE_OVERRIDE name:length visibility:public modality:ABSTRACT [fake_override,val]
+      overridden:
+        public abstract length: kotlin.Int
+      FUN FAKE_OVERRIDE name:<get-length> visibility:public modality:ABSTRACT <> ($this:kotlin.CharSequence) returnType:kotlin.Int [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:length visibility:public modality:ABSTRACT [fake_override,val]
+        overridden:
+          public abstract fun <get-length> (): kotlin.Int declared in kotlin.CharSequence
+        $this: VALUE_PARAMETER name:<this> type:kotlin.CharSequence

compiler/testData/ir/irText/classes/dataClasses/delegationInSealed.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // WITH_STDLIB
 // SKIP_KLIB_TEST
 // IGNORE_BACKEND_K1: JS_IR

compiler/testData/ir/irText/classes/dataClasses/delegationInSealed.kt.txt

@@ -1,26 +1,15 @@
 sealed class A : CharSequence {
-  protected constructor() /* primary */ {
-    super/*Any*/()
-    /* <init>() */
-
-  }
-
   data class B : A, CharSequence {
+    val c: CharSequence
+      field = c
+      get
+
     constructor(c: CharSequence) /* primary */ {
       super/*A*/()
       /* <init>() */
 
     }
 
-    val c: CharSequence
-      field = c
-      get
-
-    override val length: Int
-      override get(): Int {
-        return <this>.#c.<get-length>()
-      }
-
     override operator fun get(index: Int): Char {
       return <this>.#c.get(index = index)
     }
@@ -37,14 +26,6 @@ sealed class A : CharSequence {
       return B(c = c)
     }
 
-    override fun toString(): String {
-      return "B(" + "c=" + <this>.#c + ")"
-    }
-
-    override fun hashCode(): Int {
-      return <this>.#c.hashCode()
-    }
-
     override operator fun equals(other: Any?): Boolean {
       when {
         EQEQEQ(arg0 = <this>, arg1 = other) -> return true
@@ -59,6 +40,26 @@ sealed class A : CharSequence {
       return true
     }
 
+    override fun hashCode(): Int {
+      return <this>.#c.hashCode()
+    }
+
+    override fun toString(): String {
+      return "B(" + "c=" + <this>.#c + ")"
+    }
+
+    override val length: Int
+      override get(): Int {
+        return <this>.#c.<get-length>()
+      }
+
+  }
+
+  protected constructor() /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
   }
 
 }
+

compiler/testData/ir/irText/classes/dataClasses/kt31649.ir.txt

@@ -1,11 +1,6 @@
 FILE fqName:<root> fileName:/kt31649.kt
   CLASS CLASS name:TestData modality:FINAL visibility:public [data] superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestData
-    CONSTRUCTOR visibility:public <> (nn:kotlin.Nothing?) returnType:<root>.TestData [primary]
-      VALUE_PARAMETER name:nn index:0 type:kotlin.Nothing?
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestData modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     PROPERTY name:nn visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]
         EXPRESSION_BODY
@@ -17,6 +12,11 @@ FILE fqName:<root> fileName:/kt31649.kt
           RETURN type=kotlin.Nothing from='public final fun <get-nn> (): kotlin.Nothing? declared in <root>.TestData'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null
               receiver: GET_VAR '<this>: <root>.TestData declared in <root>.TestData.<get-nn>' type=<root>.TestData origin=null
+    CONSTRUCTOR visibility:public <> (nn:kotlin.Nothing?) returnType:<root>.TestData [primary]
+      VALUE_PARAMETER name:nn index:0 type:kotlin.Nothing?
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestData modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:<root>.TestData) returnType:kotlin.Nothing? [operator]
       $this: VALUE_PARAMETER name:<this> type:<root>.TestData
       BLOCK_BODY
@@ -33,36 +33,6 @@ FILE fqName:<root> fileName:/kt31649.kt
         RETURN type=kotlin.Nothing from='public final fun copy (nn: kotlin.Nothing?): <root>.TestData declared in <root>.TestData'
           CONSTRUCTOR_CALL 'public constructor <init> (nn: kotlin.Nothing?) declared in <root>.TestData' type=<root>.TestData origin=null
             nn: GET_VAR 'nn: kotlin.Nothing? declared in <root>.TestData.copy' type=kotlin.Nothing? origin=null
-    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.TestData) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.TestData
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.TestData'
-          STRING_CONCATENATION type=kotlin.String
-            CONST String type=kotlin.String value="TestData("
-            CONST String type=kotlin.String value="nn="
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null
-              receiver: GET_VAR '<this>: <root>.TestData declared in <root>.TestData.toString' type=<root>.TestData origin=null
-            CONST String type=kotlin.String value=")"
-    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.TestData) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.TestData
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.TestData'
-          WHEN type=kotlin.Int origin=null
-            BRANCH
-              if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
-                arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null
-                  receiver: GET_VAR '<this>: <root>.TestData declared in <root>.TestData.hashCode' type=<root>.TestData origin=null
-                arg1: CONST Null type=kotlin.Nothing? value=null
-              then: CONST Int type=kotlin.Int value=0
-            BRANCH
-              if: CONST Boolean type=kotlin.Boolean value=true
-              then: CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
-                $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null
-                  receiver: GET_VAR '<this>: <root>.TestData declared in <root>.TestData.hashCode' type=<root>.TestData origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.TestData, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -97,13 +67,38 @@ FILE fqName:<root> fileName:/kt31649.kt
               CONST Boolean type=kotlin.Boolean value=false
         RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.TestData'
           CONST Boolean type=kotlin.Boolean value=true
+    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.TestData) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.TestData
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.TestData'
+          WHEN type=kotlin.Int origin=null
+            BRANCH
+              if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
+                arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null
+                  receiver: GET_VAR '<this>: <root>.TestData declared in <root>.TestData.hashCode' type=<root>.TestData origin=null
+                arg1: CONST Null type=kotlin.Nothing? value=null
+              then: CONST Int type=kotlin.Int value=0
+            BRANCH
+              if: CONST Boolean type=kotlin.Boolean value=true
+              then: CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+                $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null
+                  receiver: GET_VAR '<this>: <root>.TestData declared in <root>.TestData.hashCode' type=<root>.TestData origin=null
+    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.TestData) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.TestData
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.TestData'
+          STRING_CONCATENATION type=kotlin.String
+            CONST String type=kotlin.String value="TestData("
+            CONST String type=kotlin.String value="nn="
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null
+              receiver: GET_VAR '<this>: <root>.TestData declared in <root>.TestData.toString' type=<root>.TestData origin=null
+            CONST String type=kotlin.String value=")"
   CLASS CLASS name:TestInline modality:FINAL visibility:public [value] superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestInline
-    CONSTRUCTOR visibility:public <> (nn:kotlin.Nothing?) returnType:<root>.TestInline [primary]
-      VALUE_PARAMETER name:nn index:0 type:kotlin.Nothing?
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInline modality:FINAL visibility:public [value] superTypes:[kotlin.Any]'
     PROPERTY name:nn visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]
         EXPRESSION_BODY
@@ -115,36 +110,11 @@ FILE fqName:<root> fileName:/kt31649.kt
           RETURN type=kotlin.Nothing from='public final fun <get-nn> (): kotlin.Nothing? declared in <root>.TestInline'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null
               receiver: GET_VAR '<this>: <root>.TestInline declared in <root>.TestInline.<get-nn>' type=<root>.TestInline origin=null
-    FUN GENERATED_SINGLE_FIELD_VALUE_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.TestInline) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.TestInline
+    CONSTRUCTOR visibility:public <> (nn:kotlin.Nothing?) returnType:<root>.TestInline [primary]
+      VALUE_PARAMETER name:nn index:0 type:kotlin.Nothing?
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.TestInline'
-          STRING_CONCATENATION type=kotlin.String
-            CONST String type=kotlin.String value="TestInline("
-            CONST String type=kotlin.String value="nn="
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null
-              receiver: GET_VAR '<this>: <root>.TestInline declared in <root>.TestInline.toString' type=<root>.TestInline origin=null
-            CONST String type=kotlin.String value=")"
-    FUN GENERATED_SINGLE_FIELD_VALUE_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.TestInline) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.TestInline
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.TestInline'
-          WHEN type=kotlin.Int origin=null
-            BRANCH
-              if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
-                arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null
-                  receiver: GET_VAR '<this>: <root>.TestInline declared in <root>.TestInline.hashCode' type=<root>.TestInline origin=null
-                arg1: CONST Null type=kotlin.Nothing? value=null
-              then: CONST Int type=kotlin.Int value=0
-            BRANCH
-              if: CONST Boolean type=kotlin.Boolean value=true
-              then: CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
-                $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null
-                  receiver: GET_VAR '<this>: <root>.TestInline declared in <root>.TestInline.hashCode' type=<root>.TestInline origin=null
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInline modality:FINAL visibility:public [value] superTypes:[kotlin.Any]'
     FUN GENERATED_SINGLE_FIELD_VALUE_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.TestInline, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -172,3 +142,33 @@ FILE fqName:<root> fileName:/kt31649.kt
               CONST Boolean type=kotlin.Boolean value=false
         RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.TestInline'
           CONST Boolean type=kotlin.Boolean value=true
+    FUN GENERATED_SINGLE_FIELD_VALUE_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.TestInline) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.TestInline
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.TestInline'
+          WHEN type=kotlin.Int origin=null
+            BRANCH
+              if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
+                arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null
+                  receiver: GET_VAR '<this>: <root>.TestInline declared in <root>.TestInline.hashCode' type=<root>.TestInline origin=null
+                arg1: CONST Null type=kotlin.Nothing? value=null
+              then: CONST Int type=kotlin.Int value=0
+            BRANCH
+              if: CONST Boolean type=kotlin.Boolean value=true
+              then: CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+                $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null
+                  receiver: GET_VAR '<this>: <root>.TestInline declared in <root>.TestInline.hashCode' type=<root>.TestInline origin=null
+    FUN GENERATED_SINGLE_FIELD_VALUE_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.TestInline) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.TestInline
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.TestInline'
+          STRING_CONCATENATION type=kotlin.String
+            CONST String type=kotlin.String value="TestInline("
+            CONST String type=kotlin.String value="nn="
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null
+              receiver: GET_VAR '<this>: <root>.TestInline declared in <root>.TestInline.toString' type=<root>.TestInline origin=null
+            CONST String type=kotlin.String value=")"

compiler/testData/ir/irText/classes/dataClasses/kt31649.kt.txt

@@ -1,14 +1,14 @@
 data class TestData {
+  val nn: Nothing?
+    field = nn
+    get
+
   constructor(nn: Nothing?) /* primary */ {
     super/*Any*/()
     /* <init>() */
 
   }
 
-  val nn: Nothing?
-    field = nn
-    get
-
   operator fun component1(): Nothing? {
     return <this>.#nn
   }
@@ -17,17 +17,6 @@ data class TestData {
     return TestData(nn = nn)
   }
 
-  override fun toString(): String {
-    return "TestData(" + "nn=" + <this>.#nn + ")"
-  }
-
-  override fun hashCode(): Int {
-    return when {
-      EQEQ(arg0 = <this>.#nn, arg1 = null) -> 0
-      else -> <this>.#nn.hashCode()
-    }
-  }
-
   override operator fun equals(other: Any?): Boolean {
     when {
       EQEQEQ(arg0 = <this>, arg1 = other) -> return true
@@ -42,23 +31,6 @@ data class TestData {
     return true
   }
 
-}
-
-value class TestInline {
-  constructor(nn: Nothing?) /* primary */ {
-    super/*Any*/()
-    /* <init>() */
-
-  }
-
-  val nn: Nothing?
-    field = nn
-    get
-
-  override fun toString(): String {
-    return "TestInline(" + "nn=" + <this>.#nn + ")"
-  }
-
   override fun hashCode(): Int {
     return when {
       EQEQ(arg0 = <this>.#nn, arg1 = null) -> 0
@@ -66,6 +38,23 @@ value class TestInline {
     }
   }
 
+  override fun toString(): String {
+    return "TestData(" + "nn=" + <this>.#nn + ")"
+  }
+
+}
+
+value class TestInline {
+  val nn: Nothing?
+    field = nn
+    get
+
+  constructor(nn: Nothing?) /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
+  }
+
   override operator fun equals(other: Any?): Boolean {
     when {
       other !is TestInline -> return false
@@ -77,4 +66,16 @@ value class TestInline {
     return true
   }
 
+  override fun hashCode(): Int {
+    return when {
+      EQEQ(arg0 = <this>.#nn, arg1 = null) -> 0
+      else -> <this>.#nn.hashCode()
+    }
+  }
+
+  override fun toString(): String {
+    return "TestInline(" + "nn=" + <this>.#nn + ")"
+  }
+
 }
+

compiler/testData/ir/irText/classes/dataClasses/kt49936.ir.txt

@@ -1,11 +1,6 @@
 FILE fqName:<root> fileName:/kt49936.kt
   CLASS CLASS name:A modality:FINAL visibility:public [data] superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A
-    CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:<root>.A [primary]
-      VALUE_PARAMETER name:x index:0 type:kotlin.Int
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     PROPERTY name:x visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]
         EXPRESSION_BODY
@@ -17,14 +12,11 @@ FILE fqName:<root> fileName:/kt49936.kt
           RETURN type=kotlin.Nothing from='public final fun <get-x> (): kotlin.Int declared in <root>.A'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null
               receiver: GET_VAR '<this>: <root>.A declared in <root>.A.<get-x>' type=<root>.A origin=null
-    PROPERTY name:x visibility:public modality:FINAL [val]
-      FUN name:<get-x> visibility:public modality:FINAL <> ($this:<root>.A, $receiver:kotlin.String) returnType:kotlin.String
-        correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.A
-        $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-x> (): kotlin.String declared in <root>.A'
-            GET_VAR '<this>: kotlin.String declared in <root>.A.<get-x>' type=kotlin.String origin=null
+    CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:<root>.A [primary]
+      VALUE_PARAMETER name:x index:0 type:kotlin.Int
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:<root>.A) returnType:kotlin.Int [operator]
       $this: VALUE_PARAMETER name:<this> type:<root>.A
       BLOCK_BODY
@@ -41,27 +33,6 @@ FILE fqName:<root> fileName:/kt49936.kt
         RETURN type=kotlin.Nothing from='public final fun copy (x: kotlin.Int): <root>.A declared in <root>.A'
           CONSTRUCTOR_CALL 'public constructor <init> (x: kotlin.Int) declared in <root>.A' type=<root>.A origin=null
             x: GET_VAR 'x: kotlin.Int declared in <root>.A.copy' type=kotlin.Int origin=null
-    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.A) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.A
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.A'
-          STRING_CONCATENATION type=kotlin.String
-            CONST String type=kotlin.String value="A("
-            CONST String type=kotlin.String value="x="
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null
-              receiver: GET_VAR '<this>: <root>.A declared in <root>.A.toString' type=<root>.A origin=null
-            CONST String type=kotlin.String value=")"
-    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.A) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.A
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.A'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null
-              receiver: GET_VAR '<this>: <root>.A declared in <root>.A.hashCode' type=<root>.A origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.A, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -96,3 +67,32 @@ FILE fqName:<root> fileName:/kt49936.kt
               CONST Boolean type=kotlin.Boolean value=false
         RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.A'
           CONST Boolean type=kotlin.Boolean value=true
+    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.A) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.A
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.A'
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null
+              receiver: GET_VAR '<this>: <root>.A declared in <root>.A.hashCode' type=<root>.A origin=null
+    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.A) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.A
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.A'
+          STRING_CONCATENATION type=kotlin.String
+            CONST String type=kotlin.String value="A("
+            CONST String type=kotlin.String value="x="
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null
+              receiver: GET_VAR '<this>: <root>.A declared in <root>.A.toString' type=<root>.A origin=null
+            CONST String type=kotlin.String value=")"
+    PROPERTY name:x visibility:public modality:FINAL [val]
+      FUN name:<get-x> visibility:public modality:FINAL <> ($this:<root>.A, $receiver:kotlin.String) returnType:kotlin.String
+        correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.A
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-x> (): kotlin.String declared in <root>.A'
+            GET_VAR '<this>: kotlin.String declared in <root>.A.<get-x>' type=kotlin.String origin=null

compiler/testData/ir/irText/classes/dataClasses/lambdaInDataClassDefaultParameter.fir.ir.txt

@@ -1,6 +1,17 @@
 FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.kt
   CLASS CLASS name:A modality:FINAL visibility:public [data] superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A
+    PROPERTY name:runA visibility:public modality:FINAL [val]
+      FIELD PROPERTY_BACKING_FIELD name:runA type:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> visibility:private [final]
+        EXPRESSION_BODY
+          GET_VAR 'runA: @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A.<init>' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-runA> visibility:public modality:FINAL <> ($this:<root>.A) returnType:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit>
+        correspondingProperty: PROPERTY name:runA visibility:public modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.A
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-runA> (): @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:runA type:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> visibility:private [final]' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=null
+              receiver: GET_VAR '<this>: <root>.A declared in <root>.A.<get-runA>' type=<root>.A origin=null
     CONSTRUCTOR visibility:public <> (runA:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit>) returnType:<root>.A [primary]
       VALUE_PARAMETER name:runA index:0 type:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit>
         EXPRESSION_BODY
@@ -14,17 +25,6 @@ FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.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 [data] superTypes:[kotlin.Any]'
-    PROPERTY name:runA visibility:public modality:FINAL [val]
-      FIELD PROPERTY_BACKING_FIELD name:runA type:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> visibility:private [final]
-        EXPRESSION_BODY
-          GET_VAR 'runA: @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A.<init>' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-runA> visibility:public modality:FINAL <> ($this:<root>.A) returnType:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit>
-        correspondingProperty: PROPERTY name:runA visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.A
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-runA> (): @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:runA type:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> visibility:private [final]' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=null
-              receiver: GET_VAR '<this>: <root>.A declared in <root>.A.<get-runA>' type=<root>.A origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:<root>.A) returnType:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> [operator]
       $this: VALUE_PARAMETER name:<this> type:<root>.A
       BLOCK_BODY
@@ -41,27 +41,6 @@ FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.kt
         RETURN type=kotlin.Nothing from='public final fun copy (runA: @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit>): <root>.A declared in <root>.A'
           CONSTRUCTOR_CALL 'public constructor <init> (runA: @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit>) declared in <root>.A' type=<root>.A origin=null
             runA: GET_VAR 'runA: @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A.copy' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=null
-    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.A) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.A
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.A'
-          STRING_CONCATENATION type=kotlin.String
-            CONST String type=kotlin.String value="A("
-            CONST String type=kotlin.String value="runA="
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:runA type:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> visibility:private [final]' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=null
-              receiver: GET_VAR '<this>: <root>.A declared in <root>.A.toString' type=<root>.A origin=null
-            CONST String type=kotlin.String value=")"
-    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.A) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.A
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.A'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Function2' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:runA type:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> visibility:private [final]' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=null
-              receiver: GET_VAR '<this>: <root>.A declared in <root>.A.hashCode' type=<root>.A origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.A, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -96,8 +75,40 @@ FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.kt
               CONST Boolean type=kotlin.Boolean value=false
         RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.A'
           CONST Boolean type=kotlin.Boolean value=true
+    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.A) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.A
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.A'
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Function2' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:runA type:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> visibility:private [final]' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=null
+              receiver: GET_VAR '<this>: <root>.A declared in <root>.A.hashCode' type=<root>.A origin=null
+    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.A) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.A
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.A'
+          STRING_CONCATENATION type=kotlin.String
+            CONST String type=kotlin.String value="A("
+            CONST String type=kotlin.String value="runA="
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:runA type:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> visibility:private [final]' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=null
+              receiver: GET_VAR '<this>: <root>.A declared in <root>.A.toString' type=<root>.A origin=null
+            CONST String type=kotlin.String value=")"
   CLASS CLASS name:B modality:FINAL visibility:public [data] superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.B
+    PROPERTY name:x visibility:public modality:FINAL [val]
+      FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any visibility:private [final]
+        EXPRESSION_BODY
+          GET_VAR 'x: kotlin.Any declared in <root>.B.<init>' type=kotlin.Any origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.B) returnType:kotlin.Any
+        correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.B
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-x> (): kotlin.Any declared in <root>.B'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any visibility:private [final]' type=kotlin.Any origin=null
+              receiver: GET_VAR '<this>: <root>.B declared in <root>.B.<get-x>' type=<root>.B origin=null
     CONSTRUCTOR visibility:public <> (x:kotlin.Any) returnType:<root>.B [primary]
       VALUE_PARAMETER name:x index:0 type:kotlin.Any
         EXPRESSION_BODY
@@ -125,17 +136,6 @@ FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:B modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
-    PROPERTY name:x visibility:public modality:FINAL [val]
-      FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any visibility:private [final]
-        EXPRESSION_BODY
-          GET_VAR 'x: kotlin.Any declared in <root>.B.<init>' type=kotlin.Any origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.B) returnType:kotlin.Any
-        correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.B
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-x> (): kotlin.Any declared in <root>.B'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any visibility:private [final]' type=kotlin.Any origin=null
-              receiver: GET_VAR '<this>: <root>.B declared in <root>.B.<get-x>' type=<root>.B origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:<root>.B) returnType:kotlin.Any [operator]
       $this: VALUE_PARAMETER name:<this> type:<root>.B
       BLOCK_BODY
@@ -152,27 +152,6 @@ FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.kt
         RETURN type=kotlin.Nothing from='public final fun copy (x: kotlin.Any): <root>.B declared in <root>.B'
           CONSTRUCTOR_CALL 'public constructor <init> (x: kotlin.Any) declared in <root>.B' type=<root>.B origin=null
             x: GET_VAR 'x: kotlin.Any declared in <root>.B.copy' type=kotlin.Any origin=null
-    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.B) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.B
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.B'
-          STRING_CONCATENATION type=kotlin.String
-            CONST String type=kotlin.String value="B("
-            CONST String type=kotlin.String value="x="
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any visibility:private [final]' type=kotlin.Any origin=null
-              receiver: GET_VAR '<this>: <root>.B declared in <root>.B.toString' type=<root>.B origin=null
-            CONST String type=kotlin.String value=")"
-    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.B) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.B
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.B'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any visibility:private [final]' type=kotlin.Any origin=null
-              receiver: GET_VAR '<this>: <root>.B declared in <root>.B.hashCode' type=<root>.B origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.B, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -207,3 +186,24 @@ FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.kt
               CONST Boolean type=kotlin.Boolean value=false
         RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.B'
           CONST Boolean type=kotlin.Boolean value=true
+    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.B) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.B
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.B'
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any visibility:private [final]' type=kotlin.Any origin=null
+              receiver: GET_VAR '<this>: <root>.B declared in <root>.B.hashCode' type=<root>.B origin=null
+    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.B) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.B
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.B'
+          STRING_CONCATENATION type=kotlin.String
+            CONST String type=kotlin.String value="B("
+            CONST String type=kotlin.String value="x="
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any visibility:private [final]' type=kotlin.Any origin=null
+              receiver: GET_VAR '<this>: <root>.B declared in <root>.B.toString' type=<root>.B origin=null
+            CONST String type=kotlin.String value=")"

compiler/testData/ir/irText/classes/dataClasses/lambdaInDataClassDefaultParameter.fir.kt.txt

@@ -1,4 +1,8 @@
 data class A {
+  val runA: @ExtensionFunctionType Function2<A, String, Unit>
+    field = runA
+    get
+
   constructor(runA: @ExtensionFunctionType Function2<A, String, Unit> = local fun A.<anonymous>(it: String) {
     return Unit
   }
@@ -8,10 +12,6 @@ data class A {
 
   }
 
-  val runA: @ExtensionFunctionType Function2<A, String, Unit>
-    field = runA
-    get
-
   operator fun component1(): @ExtensionFunctionType Function2<A, String, Unit> {
     return <this>.#runA
   }
@@ -20,14 +20,6 @@ data class A {
     return A(runA = runA)
   }
 
-  override fun toString(): String {
-    return "A(" + "runA=" + <this>.#runA + ")"
-  }
-
-  override fun hashCode(): Int {
-    return <this>.#runA.hashCode()
-  }
-
   override operator fun equals(other: Any?): Boolean {
     when {
       EQEQEQ(arg0 = <this>, arg1 = other) -> return true
@@ -42,9 +34,21 @@ data class A {
     return true
   }
 
+  override fun hashCode(): Int {
+    return <this>.#runA.hashCode()
+  }
+
+  override fun toString(): String {
+    return "A(" + "runA=" + <this>.#runA + ")"
+  }
+
 }
 
 data class B {
+  val x: Any
+    field = x
+    get
+
   constructor(x: Any = { // BLOCK
     local class <no name provided> {
       constructor() /* primary */ {
@@ -62,10 +66,6 @@ data class B {
 
   }
 
-  val x: Any
-    field = x
-    get
-
   operator fun component1(): Any {
     return <this>.#x
   }
@@ -74,14 +74,6 @@ data class B {
     return B(x = x)
   }
 
-  override fun toString(): String {
-    return "B(" + "x=" + <this>.#x + ")"
-  }
-
-  override fun hashCode(): Int {
-    return <this>.#x.hashCode()
-  }
-
   override operator fun equals(other: Any?): Boolean {
     when {
       EQEQEQ(arg0 = <this>, arg1 = other) -> return true
@@ -96,5 +88,13 @@ data class B {
     return true
   }
 
+  override fun hashCode(): Int {
+    return <this>.#x.hashCode()
+  }
+
+  override fun toString(): String {
+    return "B(" + "x=" + <this>.#x + ")"
+  }
+
 }
 

compiler/testData/ir/irText/classes/dataClasses/lambdaInDataClassDefaultParameter.ir.txt

@@ -1,6 +1,17 @@
 FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.kt
   CLASS CLASS name:A modality:FINAL visibility:public [data] superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A
+    PROPERTY name:runA visibility:public modality:FINAL [val]
+      FIELD PROPERTY_BACKING_FIELD name:runA type:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> visibility:private [final]
+        EXPRESSION_BODY
+          GET_VAR 'runA: @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A.<init>' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-runA> visibility:public modality:FINAL <> ($this:<root>.A) returnType:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit>
+        correspondingProperty: PROPERTY name:runA visibility:public modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.A
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-runA> (): @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:runA type:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> visibility:private [final]' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=null
+              receiver: GET_VAR '<this>: <root>.A declared in <root>.A.<get-runA>' type=<root>.A origin=null
     CONSTRUCTOR visibility:public <> (runA:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit>) returnType:<root>.A [primary]
       VALUE_PARAMETER name:runA index:0 type:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit>
         EXPRESSION_BODY
@@ -14,17 +25,6 @@ FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.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 [data] superTypes:[kotlin.Any]'
-    PROPERTY name:runA visibility:public modality:FINAL [val]
-      FIELD PROPERTY_BACKING_FIELD name:runA type:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> visibility:private [final]
-        EXPRESSION_BODY
-          GET_VAR 'runA: @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A.<init>' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-runA> visibility:public modality:FINAL <> ($this:<root>.A) returnType:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit>
-        correspondingProperty: PROPERTY name:runA visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.A
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-runA> (): @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:runA type:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> visibility:private [final]' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=null
-              receiver: GET_VAR '<this>: <root>.A declared in <root>.A.<get-runA>' type=<root>.A origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:<root>.A) returnType:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> [operator]
       $this: VALUE_PARAMETER name:<this> type:<root>.A
       BLOCK_BODY
@@ -41,27 +41,6 @@ FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.kt
         RETURN type=kotlin.Nothing from='public final fun copy (runA: @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit>): <root>.A declared in <root>.A'
           CONSTRUCTOR_CALL 'public constructor <init> (runA: @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit>) declared in <root>.A' type=<root>.A origin=null
             runA: GET_VAR 'runA: @[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A.copy' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=null
-    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.A) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.A
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.A'
-          STRING_CONCATENATION type=kotlin.String
-            CONST String type=kotlin.String value="A("
-            CONST String type=kotlin.String value="runA="
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:runA type:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> visibility:private [final]' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=null
-              receiver: GET_VAR '<this>: <root>.A declared in <root>.A.toString' type=<root>.A origin=null
-            CONST String type=kotlin.String value=")"
-    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.A) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.A
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.A'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Function2' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:runA type:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> visibility:private [final]' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=null
-              receiver: GET_VAR '<this>: <root>.A declared in <root>.A.hashCode' type=<root>.A origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.A, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -96,8 +75,40 @@ FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.kt
               CONST Boolean type=kotlin.Boolean value=false
         RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.A'
           CONST Boolean type=kotlin.Boolean value=true
+    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.A) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.A
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.A'
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Function2' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:runA type:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> visibility:private [final]' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=null
+              receiver: GET_VAR '<this>: <root>.A declared in <root>.A.hashCode' type=<root>.A origin=null
+    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.A) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.A
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.A'
+          STRING_CONCATENATION type=kotlin.String
+            CONST String type=kotlin.String value="A("
+            CONST String type=kotlin.String value="runA="
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:runA type:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> visibility:private [final]' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=null
+              receiver: GET_VAR '<this>: <root>.A declared in <root>.A.toString' type=<root>.A origin=null
+            CONST String type=kotlin.String value=")"
   CLASS CLASS name:B modality:FINAL visibility:public [data] superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.B
+    PROPERTY name:x visibility:public modality:FINAL [val]
+      FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any visibility:private [final]
+        EXPRESSION_BODY
+          GET_VAR 'x: kotlin.Any declared in <root>.B.<init>' type=kotlin.Any origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.B) returnType:kotlin.Any
+        correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.B
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-x> (): kotlin.Any declared in <root>.B'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any visibility:private [final]' type=kotlin.Any origin=null
+              receiver: GET_VAR '<this>: <root>.B declared in <root>.B.<get-x>' type=<root>.B origin=null
     CONSTRUCTOR visibility:public <> (x:kotlin.Any) returnType:<root>.B [primary]
       VALUE_PARAMETER name:x index:0 type:kotlin.Any
         EXPRESSION_BODY
@@ -125,17 +136,6 @@ FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:B modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
-    PROPERTY name:x visibility:public modality:FINAL [val]
-      FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any visibility:private [final]
-        EXPRESSION_BODY
-          GET_VAR 'x: kotlin.Any declared in <root>.B.<init>' type=kotlin.Any origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.B) returnType:kotlin.Any
-        correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.B
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-x> (): kotlin.Any declared in <root>.B'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any visibility:private [final]' type=kotlin.Any origin=null
-              receiver: GET_VAR '<this>: <root>.B declared in <root>.B.<get-x>' type=<root>.B origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:<root>.B) returnType:kotlin.Any [operator]
       $this: VALUE_PARAMETER name:<this> type:<root>.B
       BLOCK_BODY
@@ -152,27 +152,6 @@ FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.kt
         RETURN type=kotlin.Nothing from='public final fun copy (x: kotlin.Any): <root>.B declared in <root>.B'
           CONSTRUCTOR_CALL 'public constructor <init> (x: kotlin.Any) declared in <root>.B' type=<root>.B origin=null
             x: GET_VAR 'x: kotlin.Any declared in <root>.B.copy' type=kotlin.Any origin=null
-    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.B) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.B
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.B'
-          STRING_CONCATENATION type=kotlin.String
-            CONST String type=kotlin.String value="B("
-            CONST String type=kotlin.String value="x="
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any visibility:private [final]' type=kotlin.Any origin=null
-              receiver: GET_VAR '<this>: <root>.B declared in <root>.B.toString' type=<root>.B origin=null
-            CONST String type=kotlin.String value=")"
-    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.B) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.B
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.B'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
-            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any visibility:private [final]' type=kotlin.Any origin=null
-              receiver: GET_VAR '<this>: <root>.B declared in <root>.B.hashCode' type=<root>.B origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.B, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -207,3 +186,24 @@ FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.kt
               CONST Boolean type=kotlin.Boolean value=false
         RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.B'
           CONST Boolean type=kotlin.Boolean value=true
+    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.B) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.B
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.B'
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+            $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any visibility:private [final]' type=kotlin.Any origin=null
+              receiver: GET_VAR '<this>: <root>.B declared in <root>.B.hashCode' type=<root>.B origin=null
+    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.B) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.B
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.B'
+          STRING_CONCATENATION type=kotlin.String
+            CONST String type=kotlin.String value="B("
+            CONST String type=kotlin.String value="x="
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any visibility:private [final]' type=kotlin.Any origin=null
+              receiver: GET_VAR '<this>: <root>.B declared in <root>.B.toString' type=<root>.B origin=null
+            CONST String type=kotlin.String value=")"

compiler/testData/ir/irText/classes/dataClasses/lambdaInDataClassDefaultParameter.kt.txt

@@ -1,4 +1,8 @@
 data class A {
+  val runA: @ExtensionFunctionType Function2<A, String, Unit>
+    field = runA
+    get
+
   constructor(runA: @ExtensionFunctionType Function2<A, String, Unit> = local fun A.<anonymous>(it: String) {
     return Unit
   }
@@ -8,10 +12,6 @@ data class A {
 
   }
 
-  val runA: @ExtensionFunctionType Function2<A, String, Unit>
-    field = runA
-    get
-
   operator fun component1(): @ExtensionFunctionType Function2<A, String, Unit> {
     return <this>.#runA
   }
@@ -20,14 +20,6 @@ data class A {
     return A(runA = runA)
   }
 
-  override fun toString(): String {
-    return "A(" + "runA=" + <this>.#runA + ")"
-  }
-
-  override fun hashCode(): Int {
-    return <this>.#runA.hashCode()
-  }
-
   override operator fun equals(other: Any?): Boolean {
     when {
       EQEQEQ(arg0 = <this>, arg1 = other) -> return true
@@ -42,9 +34,21 @@ data class A {
     return true
   }
 
+  override fun hashCode(): Int {
+    return <this>.#runA.hashCode()
+  }
+
+  override fun toString(): String {
+    return "A(" + "runA=" + <this>.#runA + ")"
+  }
+
 }
 
 data class B {
+  val x: Any
+    field = x
+    get
+
   constructor(x: Any = { // BLOCK
     local class <no name provided> {
       constructor() /* primary */ {
@@ -62,10 +66,6 @@ data class B {
 
   }
 
-  val x: Any
-    field = x
-    get
-
   operator fun component1(): Any {
     return <this>.#x
   }
@@ -74,14 +74,6 @@ data class B {
     return B(x = x)
   }
 
-  override fun toString(): String {
-    return "B(" + "x=" + <this>.#x + ")"
-  }
-
-  override fun hashCode(): Int {
-    return <this>.#x.hashCode()
-  }
-
   override operator fun equals(other: Any?): Boolean {
     when {
       EQEQEQ(arg0 = <this>, arg1 = other) -> return true
@@ -96,4 +88,13 @@ data class B {
     return true
   }
 
+  override fun hashCode(): Int {
+    return <this>.#x.hashCode()
+  }
+
+  override fun toString(): String {
+    return "B(" + "x=" + <this>.#x + ")"
+  }
+
 }
+

compiler/testData/ir/irText/classes/dataClasses/openDataClass.ir.txt

@@ -3,12 +3,6 @@ FILE fqName:<root> fileName:/openDataClass.kt
     annotations:
       Suppress(names = ["INCOMPATIBLE_MODIFIERS"])
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.ValidatedProperties
-    CONSTRUCTOR visibility:public <> (test1:kotlin.String, test2:kotlin.String) returnType:<root>.ValidatedProperties [primary]
-      VALUE_PARAMETER name:test1 index:0 type:kotlin.String
-      VALUE_PARAMETER name:test2 index:1 type:kotlin.String
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:ValidatedProperties modality:OPEN visibility:public [data] superTypes:[kotlin.Any]'
     PROPERTY name:test1 visibility:public modality:OPEN [val]
       FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.String visibility:private [final]
         EXPRESSION_BODY
@@ -31,6 +25,12 @@ FILE fqName:<root> fileName:/openDataClass.kt
           RETURN type=kotlin.Nothing from='public open fun <get-test2> (): kotlin.String declared in <root>.ValidatedProperties'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.String visibility:private [final]' type=kotlin.String origin=null
               receiver: GET_VAR '<this>: <root>.ValidatedProperties declared in <root>.ValidatedProperties.<get-test2>' type=<root>.ValidatedProperties origin=null
+    CONSTRUCTOR visibility:public <> (test1:kotlin.String, test2:kotlin.String) returnType:<root>.ValidatedProperties [primary]
+      VALUE_PARAMETER name:test1 index:0 type:kotlin.String
+      VALUE_PARAMETER name:test2 index:1 type:kotlin.String
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:ValidatedProperties modality:OPEN visibility:public [data] superTypes:[kotlin.Any]'
     FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:<root>.ValidatedProperties) returnType:kotlin.String [operator]
       $this: VALUE_PARAMETER name:<this> type:<root>.ValidatedProperties
       BLOCK_BODY
@@ -58,41 +58,6 @@ FILE fqName:<root> fileName:/openDataClass.kt
           CONSTRUCTOR_CALL 'public constructor <init> (test1: kotlin.String, test2: kotlin.String) declared in <root>.ValidatedProperties' type=<root>.ValidatedProperties origin=null
             test1: GET_VAR 'test1: kotlin.String declared in <root>.ValidatedProperties.copy' type=kotlin.String origin=null
             test2: GET_VAR 'test2: kotlin.String declared in <root>.ValidatedProperties.copy' type=kotlin.String origin=null
-    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.ValidatedProperties) returnType:kotlin.String
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.ValidatedProperties
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.ValidatedProperties'
-          STRING_CONCATENATION type=kotlin.String
-            CONST String type=kotlin.String value="ValidatedProperties("
-            CONST String type=kotlin.String value="test1="
-            CALL 'public open fun <get-test1> (): kotlin.String declared in <root>.ValidatedProperties' type=kotlin.String origin=null
-              $this: GET_VAR '<this>: <root>.ValidatedProperties declared in <root>.ValidatedProperties.toString' type=<root>.ValidatedProperties origin=null
-            CONST String type=kotlin.String value=", "
-            CONST String type=kotlin.String value="test2="
-            CALL 'public open fun <get-test2> (): kotlin.String declared in <root>.ValidatedProperties' type=kotlin.String origin=null
-              $this: GET_VAR '<this>: <root>.ValidatedProperties declared in <root>.ValidatedProperties.toString' type=<root>.ValidatedProperties origin=null
-            CONST String type=kotlin.String value=")"
-    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.ValidatedProperties) returnType:kotlin.Int
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:<root>.ValidatedProperties
-      BLOCK_BODY
-        VAR name:result type:kotlin.Int [var]
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=null
-            $this: CALL 'public open fun <get-test1> (): kotlin.String declared in <root>.ValidatedProperties' type=kotlin.String origin=null
-              $this: GET_VAR '<this>: <root>.ValidatedProperties declared in <root>.ValidatedProperties.hashCode' type=<root>.ValidatedProperties origin=null
-        SET_VAR 'var result: kotlin.Int declared in <root>.ValidatedProperties.hashCode' type=kotlin.Unit origin=EQ
-          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-              $this: GET_VAR 'var result: kotlin.Int declared in <root>.ValidatedProperties.hashCode' type=kotlin.Int origin=null
-              other: CONST Int type=kotlin.Int value=31
-            other: CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=null
-              $this: CALL 'public open fun <get-test2> (): kotlin.String declared in <root>.ValidatedProperties' type=kotlin.String origin=null
-                $this: GET_VAR '<this>: <root>.ValidatedProperties declared in <root>.ValidatedProperties.hashCode' type=<root>.ValidatedProperties origin=null
-        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.ValidatedProperties'
-          GET_VAR 'var result: kotlin.Int declared in <root>.ValidatedProperties.hashCode' type=kotlin.Int origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:<root>.ValidatedProperties, other:kotlin.Any?) returnType:kotlin.Boolean [operator]
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -137,3 +102,38 @@ FILE fqName:<root> fileName:/openDataClass.kt
               CONST Boolean type=kotlin.Boolean value=false
         RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in <root>.ValidatedProperties'
           CONST Boolean type=kotlin.Boolean value=true
+    FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:<root>.ValidatedProperties) returnType:kotlin.Int
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.ValidatedProperties
+      BLOCK_BODY
+        VAR name:result type:kotlin.Int [var]
+          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=null
+            $this: CALL 'public open fun <get-test1> (): kotlin.String declared in <root>.ValidatedProperties' type=kotlin.String origin=null
+              $this: GET_VAR '<this>: <root>.ValidatedProperties declared in <root>.ValidatedProperties.hashCode' type=<root>.ValidatedProperties origin=null
+        SET_VAR 'var result: kotlin.Int declared in <root>.ValidatedProperties.hashCode' type=kotlin.Unit origin=EQ
+          CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+            $this: CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+              $this: GET_VAR 'var result: kotlin.Int declared in <root>.ValidatedProperties.hashCode' type=kotlin.Int origin=null
+              other: CONST Int type=kotlin.Int value=31
+            other: CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=null
+              $this: CALL 'public open fun <get-test2> (): kotlin.String declared in <root>.ValidatedProperties' type=kotlin.String origin=null
+                $this: GET_VAR '<this>: <root>.ValidatedProperties declared in <root>.ValidatedProperties.hashCode' type=<root>.ValidatedProperties origin=null
+        RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.ValidatedProperties'
+          GET_VAR 'var result: kotlin.Int declared in <root>.ValidatedProperties.hashCode' type=kotlin.Int origin=null
+    FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.ValidatedProperties) returnType:kotlin.String
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:<root>.ValidatedProperties
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in <root>.ValidatedProperties'
+          STRING_CONCATENATION type=kotlin.String
+            CONST String type=kotlin.String value="ValidatedProperties("
+            CONST String type=kotlin.String value="test1="
+            CALL 'public open fun <get-test1> (): kotlin.String declared in <root>.ValidatedProperties' type=kotlin.String origin=null
+              $this: GET_VAR '<this>: <root>.ValidatedProperties declared in <root>.ValidatedProperties.toString' type=<root>.ValidatedProperties origin=null
+            CONST String type=kotlin.String value=", "
+            CONST String type=kotlin.String value="test2="
+            CALL 'public open fun <get-test2> (): kotlin.String declared in <root>.ValidatedProperties' type=kotlin.String origin=null
+              $this: GET_VAR '<this>: <root>.ValidatedProperties declared in <root>.ValidatedProperties.toString' type=<root>.ValidatedProperties origin=null
+            CONST String type=kotlin.String value=")"

compiler/testData/ir/irText/classes/dataClasses/openDataClass.kt.txt

@@ -1,11 +1,5 @@
 @Suppress(names = ["INCOMPATIBLE_MODIFIERS"])
 open data class ValidatedProperties {
-  constructor(test1: String, test2: String) /* primary */ {
-    super/*Any*/()
-    /* <init>() */
-
-  }
-
   open val test1: String
     field = test1
     open get
@@ -14,6 +8,12 @@ open data class ValidatedProperties {
     field = test2
     open get
 
+  constructor(test1: String, test2: String) /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
+  }
+
   operator fun component1(): String {
     return <this>.<get-test1>()
   }
@@ -26,16 +26,6 @@ open data class ValidatedProperties {
     return ValidatedProperties(test1 = test1, test2 = test2)
   }
 
-  override fun toString(): String {
-    return "ValidatedProperties(" + "test1=" + <this>.<get-test1>() + ", " + "test2=" + <this>.<get-test2>() + ")"
-  }
-
-  override fun hashCode(): Int {
-    var result: Int = <this>.<get-test1>().hashCode()
-    result = result.times(other = 31).plus(other = <this>.<get-test2>().hashCode())
-    return result
-  }
-
   override operator fun equals(other: Any?): Boolean {
     when {
       EQEQEQ(arg0 = <this>, arg1 = other) -> return true
@@ -53,4 +43,15 @@ open data class ValidatedProperties {
     return true
   }
 
+  override fun hashCode(): Int {
+    var result: Int = <this>.<get-test1>().hashCode()
+    result = result.times(other = 31).plus(other = <this>.<get-test2>().hashCode())
+    return result
+  }
+
+  override fun toString(): String {
+    return "ValidatedProperties(" + "test1=" + <this>.<get-test1>() + ", " + "test2=" + <this>.<get-test2>() + ")"
+  }
+
 }
+

compiler/testData/ir/irText/classes/declarationOrder.ir.txt

@@ -1,20 +1,6 @@
 FILE fqName:test fileName:/declarationOrder.kt
   CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:test.A
-    CONSTRUCTOR visibility:public <> () returnType:test.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]'
-    CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:test.A
-      VALUE_PARAMETER name:x index:0 type:kotlin.Int
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in test.A'
-    FUN name:b visibility:public modality:FINAL <> ($this:test.A) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:test.A
-      BLOCK_BODY
-    FUN name:a visibility:public modality:FINAL <> ($this:test.A) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:test.A
-      BLOCK_BODY
     PROPERTY name:b visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:b type:kotlin.Int visibility:private [final]
         EXPRESSION_BODY
@@ -37,38 +23,22 @@ FILE fqName:test fileName:/declarationOrder.kt
           RETURN type=kotlin.Nothing from='public final fun <get-a> (): kotlin.Int declared in test.A'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:a type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null
               receiver: GET_VAR '<this>: test.A declared in test.A.<get-a>' type=test.A origin=null
-    CONSTRUCTOR visibility:public <> (x:kotlin.String) returnType:test.A
-      VALUE_PARAMETER name:x index:0 type:kotlin.String
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in test.A'
-    PROPERTY name:b visibility:public modality:FINAL [val]
-      FUN name:<get-b> visibility:public modality:FINAL <> ($this:test.A, $receiver:kotlin.Int) returnType:kotlin.String
-        correspondingProperty: PROPERTY name:b visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:test.A
-        $receiver: VALUE_PARAMETER name:<this> type:kotlin.Int
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-b> (): kotlin.String declared in test.A'
-            CONST String type=kotlin.String value="b"
-    FUN name:b visibility:public modality:FINAL <> ($this:test.A, $receiver:kotlin.String) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:test.A
-      $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
-      BLOCK_BODY
-    PROPERTY name:a visibility:public modality:FINAL [val]
-      FUN name:<get-a> visibility:public modality:FINAL <> ($this:test.A, $receiver:kotlin.Int) returnType:kotlin.String
-        correspondingProperty: PROPERTY name:a visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:test.A
-        $receiver: VALUE_PARAMETER name:<this> type:kotlin.Int
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-a> (): kotlin.String declared in test.A'
-            CONST String type=kotlin.String value="a"
-    FUN name:a visibility:public modality:FINAL <> ($this:test.A, $receiver:kotlin.String) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:test.A
-      $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+    CONSTRUCTOR visibility:public <> () returnType:test.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]'
     CONSTRUCTOR visibility:public <> (x:kotlin.Double) returnType:test.A
       VALUE_PARAMETER name:x index:0 type:kotlin.Double
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in test.A'
+    CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:test.A
+      VALUE_PARAMETER name:x index:0 type:kotlin.Int
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in test.A'
+    CONSTRUCTOR visibility:public <> (x:kotlin.String) returnType:test.A
+      VALUE_PARAMETER name:x index:0 type:kotlin.String
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () declared in test.A'
     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
@@ -82,3 +52,33 @@ FILE fqName:test fileName:/declarationOrder.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN name:a visibility:public modality:FINAL <> ($this:test.A) returnType:kotlin.Unit
+      $this: VALUE_PARAMETER name:<this> type:test.A
+      BLOCK_BODY
+    FUN name:a visibility:public modality:FINAL <> ($this:test.A, $receiver:kotlin.String) returnType:kotlin.Unit
+      $this: VALUE_PARAMETER name:<this> type:test.A
+      $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+      BLOCK_BODY
+    FUN name:b visibility:public modality:FINAL <> ($this:test.A) returnType:kotlin.Unit
+      $this: VALUE_PARAMETER name:<this> type:test.A
+      BLOCK_BODY
+    FUN name:b visibility:public modality:FINAL <> ($this:test.A, $receiver:kotlin.String) returnType:kotlin.Unit
+      $this: VALUE_PARAMETER name:<this> type:test.A
+      $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
+      BLOCK_BODY
+    PROPERTY name:a visibility:public modality:FINAL [val]
+      FUN name:<get-a> visibility:public modality:FINAL <> ($this:test.A, $receiver:kotlin.Int) returnType:kotlin.String
+        correspondingProperty: PROPERTY name:a visibility:public modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:test.A
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.Int
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-a> (): kotlin.String declared in test.A'
+            CONST String type=kotlin.String value="a"
+    PROPERTY name:b visibility:public modality:FINAL [val]
+      FUN name:<get-b> visibility:public modality:FINAL <> ($this:test.A, $receiver:kotlin.Int) returnType:kotlin.String
+        correspondingProperty: PROPERTY name:b visibility:public modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:test.A
+        $receiver: VALUE_PARAMETER name:<this> type:kotlin.Int
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-b> (): kotlin.String declared in test.A'
+            CONST String type=kotlin.String value="b"

compiler/testData/ir/irText/classes/declarationOrder.kt.txt

@@ -1,22 +1,6 @@
 package test
 
 class A {
-  constructor() /* primary */ {
-    super/*Any*/()
-    /* <init>() */
-
-  }
-
-  constructor(x: Int) {
-    this/*A*/()
-  }
-
-  fun b() {
-  }
-
-  fun a() {
-  }
-
   val b: Int
     field = 1
     get
@@ -25,14 +9,32 @@ class A {
     field = 2
     get
 
+  constructor() /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
+  }
+
+  constructor(x: Double) {
+    this/*A*/()
+  }
+
+  constructor(x: Int) {
+    this/*A*/()
+  }
+
   constructor(x: String) {
     this/*A*/()
   }
 
-  val Int.b: String
-    get(): String {
-      return "b"
-    }
+  fun a() {
+  }
+
+  fun String.a() {
+  }
+
+  fun b() {
+  }
 
   fun String.b() {
   }
@@ -42,12 +44,10 @@ class A {
       return "a"
     }
 
-  fun String.a() {
-  }
-
-  constructor(x: Double) {
-    this/*A*/()
-  }
+  val Int.b: String
+    get(): String {
+      return "b"
+    }
 
 }