[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