FIR2IR: bind fake overrides for classes on the fly right after member processing

#KT-57441 Fixed
2023-03-22 14:57:59 +01:00
parent d3f1571d35
commit 9af944669a
3 changed files with 194 additions and 2 deletions
@@ -259,9 +259,19 @@ class Fir2IrClassifierStorage(
        processMembersOfClassesOnTheFlyImmediately = true
        for ((klass, irClass) in localClassesCreatedOnTheFly) {
            processMembersOfClassCreatedOnTheFly(klass, irClass)
+            // See the problem from KT-57441
+//            class Wrapper {
+//                private val dummy = object: Bar {}
+//                private val bar = object: Bar by dummy {}
+//            }
+//            interface Bar {
+//                val foo: String
+//                    get() = ""
+//            }
+            // When we are building bar.foo fake override, we should call dummy.foo,
+            // so we should have object : Bar.foo fake override to be built and bound.
+            converter.bindFakeOverridesInClass(irClass)
        }
-        // Note: it's better to bind everything AFTER members are built, in case local classes are dependent on each other
-        localClassesCreatedOnTheFly.values.forEach(converter::bindFakeOverridesInClass)
        localClassesCreatedOnTheFly.clear()
    }

@@ -0,0 +1,129 @@
+FILE fqName:<root> fileName:/FakeOverrideInAnonymousWithDelegation.kt
+  CLASS CLASS name:Wrapper modality:FINAL visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Wrapper
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Wrapper [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Wrapper modality:FINAL visibility:public superTypes:[kotlin.Any]'
+    PROPERTY name:dummy visibility:private modality:FINAL [val]
+      FIELD PROPERTY_BACKING_FIELD name:dummy type:<root>.Wrapper.dummy.<no name provided> visibility:private [final]
+        EXPRESSION_BODY
+          BLOCK type=<root>.Wrapper.dummy.<no name provided> origin=OBJECT_LITERAL
+            CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.Bar]
+              $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Wrapper.dummy.<no name provided>
+              CONSTRUCTOR visibility:public <> () returnType:<root>.Wrapper.dummy.<no name provided> [primary]
+                BLOCK_BODY
+                  DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+                  INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.Bar]'
+              PROPERTY FAKE_OVERRIDE name:foo visibility:public modality:OPEN [fake_override,val]
+                overridden:
+                  public open foo: kotlin.String [val]
+                FUN FAKE_OVERRIDE name:<get-foo> visibility:public modality:OPEN <> ($this:<root>.Bar) returnType:kotlin.String [fake_override]
+                  correspondingProperty: PROPERTY FAKE_OVERRIDE name:foo visibility:public modality:OPEN [fake_override,val]
+                  overridden:
+                    public open fun <get-foo> (): kotlin.String declared in <root>.Bar
+                  $this: VALUE_PARAMETER name:<this> type:<root>.Bar
+              FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+                overridden:
+                  public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in <root>.Bar
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+                VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+              FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+                overridden:
+                  public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.Bar
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+              FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+                overridden:
+                  public open fun toString (): kotlin.String [fake_override] declared in <root>.Bar
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+            CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.Wrapper.dummy.<no name provided>' type=<root>.Wrapper.dummy.<no name provided> origin=OBJECT_LITERAL
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-dummy> visibility:private modality:FINAL <> ($this:<root>.Wrapper) returnType:<root>.Wrapper.dummy.<no name provided>
+        correspondingProperty: PROPERTY name:dummy visibility:private modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.Wrapper
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='private final fun <get-dummy> (): <root>.Wrapper.dummy.<no name provided> declared in <root>.Wrapper'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:dummy type:<root>.Wrapper.dummy.<no name provided> visibility:private [final]' type=<root>.Wrapper.dummy.<no name provided> origin=null
+              receiver: GET_VAR '<this>: <root>.Wrapper declared in <root>.Wrapper.<get-dummy>' type=<root>.Wrapper origin=null
+    PROPERTY name:bar visibility:private modality:FINAL [val]
+      FIELD PROPERTY_BACKING_FIELD name:bar type:<root>.Wrapper.bar.<no name provided> visibility:private [final]
+        EXPRESSION_BODY
+          BLOCK type=<root>.Wrapper.bar.<no name provided> origin=OBJECT_LITERAL
+            CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.Bar]
+              $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Wrapper.bar.<no name provided>
+              CONSTRUCTOR visibility:public <> () returnType:<root>.Wrapper.bar.<no name provided> [primary]
+                BLOCK_BODY
+                  DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+                  INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.Bar]'
+              PROPERTY DELEGATED_MEMBER name:foo visibility:public modality:OPEN [val]
+                overridden:
+                  public open foo: kotlin.String [val]
+                FUN DELEGATED_MEMBER name:<get-foo> visibility:public modality:OPEN <> ($this:<root>.Wrapper.bar.<no name provided>) returnType:kotlin.String
+                  correspondingProperty: PROPERTY DELEGATED_MEMBER name:foo visibility:public modality:OPEN [val]
+                  overridden:
+                    public open fun <get-foo> (): kotlin.String declared in <root>.Bar
+                  $this: VALUE_PARAMETER name:<this> type:<root>.Wrapper.bar.<no name provided>
+                  BLOCK_BODY
+                    RETURN type=kotlin.Nothing from='public open fun <get-foo> (): kotlin.String declared in <root>.Wrapper.bar.<no name provided>'
+                      CALL 'public open fun <get-foo> (): kotlin.String [fake_override] declared in <root>.Wrapper.dummy.<no name provided>' type=kotlin.String origin=null
+                        $this: GET_FIELD 'FIELD DELEGATE name:$$delegate_0 type:<root>.Wrapper.dummy.<no name provided> visibility:private [final]' type=<root>.Wrapper.dummy.<no name provided> origin=null
+                          receiver: GET_VAR '<this>: <root>.Wrapper.bar.<no name provided> declared in <root>.Wrapper.bar.<no name provided>.<get-foo>' type=<root>.Wrapper.bar.<no name provided> origin=null
+              FIELD DELEGATE name:$$delegate_0 type:<root>.Wrapper.dummy.<no name provided> visibility:private [final]
+                EXPRESSION_BODY
+                  CALL 'private final fun <get-dummy> (): <root>.Wrapper.dummy.<no name provided> declared in <root>.Wrapper' type=<root>.Wrapper.dummy.<no name provided> origin=GET_PROPERTY
+                    $this: GET_VAR '<this>: <root>.Wrapper declared in <root>.Wrapper' type=<root>.Wrapper 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 [fake_override,operator] declared in <root>.Bar
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+                VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+              FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+                overridden:
+                  public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.Bar
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+              FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+                overridden:
+                  public open fun toString (): kotlin.String [fake_override] declared in <root>.Bar
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+            CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.Wrapper.bar.<no name provided>' type=<root>.Wrapper.bar.<no name provided> origin=OBJECT_LITERAL
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:private modality:FINAL <> ($this:<root>.Wrapper) returnType:<root>.Wrapper.bar.<no name provided>
+        correspondingProperty: PROPERTY name:bar visibility:private modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.Wrapper
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='private final fun <get-bar> (): <root>.Wrapper.bar.<no name provided> declared in <root>.Wrapper'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:<root>.Wrapper.bar.<no name provided> visibility:private [final]' type=<root>.Wrapper.bar.<no name provided> origin=null
+              receiver: GET_VAR '<this>: <root>.Wrapper declared in <root>.Wrapper.<get-bar>' type=<root>.Wrapper 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 [operator] 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:Bar modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Bar
+    PROPERTY name:foo visibility:public modality:OPEN [val]
+      FUN name:<get-foo> visibility:public modality:OPEN <> ($this:<root>.Bar) returnType:kotlin.String
+        correspondingProperty: PROPERTY name:foo visibility:public modality:OPEN [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.Bar
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public open fun <get-foo> (): kotlin.String declared in <root>.Bar'
+            CONST String type=kotlin.String value=""
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] 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
@@ -0,0 +1,53 @@
+class Wrapper {
+  constructor() /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
+  }
+
+  private val dummy: <no name provided>
+    field = { // BLOCK
+      local class <no name provided> : Bar {
+        constructor() /* primary */ {
+          super/*Any*/()
+          /* <init>() */
+
+        }
+
+      }
+
+      <no name provided>()
+    }
+    private get
+
+  private val bar: <no name provided>
+    field = { // BLOCK
+      local class <no name provided> : Bar {
+        constructor() /* primary */ {
+          super/*Any*/()
+          /* <init>() */
+
+        }
+
+        override val foo: String
+          override get(): String {
+            return <this>.#$$delegate_0.<get-foo>()
+          }
+
+        private /* final field */ val $$delegate_0: <no name provided> = <this>.<get-dummy>()
+
+      }
+
+      <no name provided>()
+    }
+    private get
+
+}
+
+interface Bar {
+  val foo: String
+    get(): String {
+      return ""
+    }
+
+}