FIR2IR: correctly set type parameters of property accessors

In particular, we generate different type parameters for getters & setters here.
2020-02-25 16:24:23 +03:00
parent 50abb07245
commit 3a3d6e740c
20 changed files with 278 additions and 317 deletions
@@ -1,138 +0,0 @@
-FILE fqName:<root> fileName:/propertyAccessors.kt
-  PROPERTY name:test1 visibility:public modality:FINAL [val]
-    FUN name:<get-test1> visibility:public modality:FINAL <> () returnType:kotlin.Int
-      correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val]
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test1> (): kotlin.Int declared in <root>'
-          CONST Int type=kotlin.Int value=42
-  PROPERTY name:test2 visibility:public modality:FINAL [var]
-    FUN name:<get-test2> visibility:public modality:FINAL <> () returnType:kotlin.Int
-      correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [var]
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test2> (): kotlin.Int declared in <root>'
-          CONST Int type=kotlin.Int value=42
-    FUN name:<set-test2> visibility:public modality:FINAL <> (value:kotlin.Int) returnType:kotlin.Unit
-      correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [var]
-      VALUE_PARAMETER name:value index:0 type:kotlin.Int
-      BLOCK_BODY
-  PROPERTY name:testExt1 visibility:public modality:FINAL [val]
-    FUN name:<get-testExt1> visibility:public modality:FINAL <> ($receiver:kotlin.String) returnType:kotlin.Int
-      correspondingProperty: PROPERTY name:testExt1 visibility:public modality:FINAL [val]
-      $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-testExt1> (): kotlin.Int declared in <root>'
-          CONST Int type=kotlin.Int value=42
-  PROPERTY name:testExt2 visibility:public modality:FINAL [var]
-    FUN name:<get-testExt2> visibility:public modality:FINAL <> ($receiver:kotlin.String) returnType:kotlin.Int
-      correspondingProperty: PROPERTY name:testExt2 visibility:public modality:FINAL [var]
-      $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-testExt2> (): kotlin.Int declared in <root>'
-          CONST Int type=kotlin.Int value=42
-    FUN name:<set-testExt2> visibility:public modality:FINAL <> ($receiver:kotlin.String, value:kotlin.Int) returnType:kotlin.Unit
-      correspondingProperty: PROPERTY name:testExt2 visibility:public modality:FINAL [var]
-      $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
-      VALUE_PARAMETER name:value index:0 type:kotlin.Int
-      BLOCK_BODY
-  PROPERTY name:testExt3 visibility:public modality:FINAL [val]
-    FUN name:<get-testExt3> visibility:public modality:FINAL <> ($receiver:T of <uninitialized parent>) returnType:kotlin.Int
-      correspondingProperty: PROPERTY name:testExt3 visibility:public modality:FINAL [val]
-      $receiver: VALUE_PARAMETER name:<this> type:T of <uninitialized parent>
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-testExt3> (): kotlin.Int declared in <root>'
-          CONST Int type=kotlin.Int value=42
-  PROPERTY name:testExt4 visibility:public modality:FINAL [var]
-    FUN name:<get-testExt4> visibility:public modality:FINAL <> ($receiver:T of <uninitialized parent>) returnType:kotlin.Int
-      correspondingProperty: PROPERTY name:testExt4 visibility:public modality:FINAL [var]
-      $receiver: VALUE_PARAMETER name:<this> type:T of <uninitialized parent>
-      BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-testExt4> (): kotlin.Int declared in <root>'
-          CONST Int type=kotlin.Int value=42
-    FUN name:<set-testExt4> visibility:public modality:FINAL <> ($receiver:T of <uninitialized parent>, value:kotlin.Int) returnType:kotlin.Unit
-      correspondingProperty: PROPERTY name:testExt4 visibility:public modality:FINAL [var]
-      $receiver: VALUE_PARAMETER name:<this> type:T of <uninitialized parent>
-      VALUE_PARAMETER name:value index:0 type:kotlin.Int
-      BLOCK_BODY
-  CLASS CLASS name:Host modality:FINAL visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Host<T of <root>.Host>
-    TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Host<T of <root>.Host> [primary]
-      BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
-        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Host modality:FINAL visibility:public superTypes:[kotlin.Any]'
-    PROPERTY name:testMem1 visibility:public modality:FINAL [val]
-      FUN name:<get-testMem1> visibility:public modality:FINAL <> ($this:<root>.Host<T of <root>.Host>) returnType:kotlin.Int
-        correspondingProperty: PROPERTY name:testMem1 visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.Host<T of <root>.Host>
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-testMem1> (): kotlin.Int declared in <root>.Host'
-            CONST Int type=kotlin.Int value=42
-    PROPERTY name:testMem2 visibility:public modality:FINAL [var]
-      FUN name:<get-testMem2> visibility:public modality:FINAL <> ($this:<root>.Host<T of <root>.Host>) returnType:kotlin.Int
-        correspondingProperty: PROPERTY name:testMem2 visibility:public modality:FINAL [var]
-        $this: VALUE_PARAMETER name:<this> type:<root>.Host<T of <root>.Host>
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-testMem2> (): kotlin.Int declared in <root>.Host'
-            CONST Int type=kotlin.Int value=42
-      FUN name:<set-testMem2> visibility:public modality:FINAL <> ($this:<root>.Host<T of <root>.Host>, value:kotlin.Int) returnType:kotlin.Unit
-        correspondingProperty: PROPERTY name:testMem2 visibility:public modality:FINAL [var]
-        $this: VALUE_PARAMETER name:<this> type:<root>.Host<T of <root>.Host>
-        VALUE_PARAMETER name:value index:0 type:kotlin.Int
-        BLOCK_BODY
-    PROPERTY name:testMemExt1 visibility:public modality:FINAL [val]
-      FUN name:<get-testMemExt1> visibility:public modality:FINAL <> ($this:<root>.Host<T of <root>.Host>, $receiver:kotlin.String) returnType:kotlin.Int
-        correspondingProperty: PROPERTY name:testMemExt1 visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.Host<T of <root>.Host>
-        $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-testMemExt1> (): kotlin.Int declared in <root>.Host'
-            CONST Int type=kotlin.Int value=42
-    PROPERTY name:testMemExt2 visibility:public modality:FINAL [var]
-      FUN name:<get-testMemExt2> visibility:public modality:FINAL <> ($this:<root>.Host<T of <root>.Host>, $receiver:kotlin.String) returnType:kotlin.Int
-        correspondingProperty: PROPERTY name:testMemExt2 visibility:public modality:FINAL [var]
-        $this: VALUE_PARAMETER name:<this> type:<root>.Host<T of <root>.Host>
-        $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-testMemExt2> (): kotlin.Int declared in <root>.Host'
-            CONST Int type=kotlin.Int value=42
-      FUN name:<set-testMemExt2> visibility:public modality:FINAL <> ($this:<root>.Host<T of <root>.Host>, $receiver:kotlin.String, value:kotlin.Int) returnType:kotlin.Unit
-        correspondingProperty: PROPERTY name:testMemExt2 visibility:public modality:FINAL [var]
-        $this: VALUE_PARAMETER name:<this> type:<root>.Host<T of <root>.Host>
-        $receiver: VALUE_PARAMETER name:<this> type:kotlin.String
-        VALUE_PARAMETER name:value index:0 type:kotlin.Int
-        BLOCK_BODY
-    PROPERTY name:testMemExt3 visibility:public modality:FINAL [val]
-      FUN name:<get-testMemExt3> visibility:public modality:FINAL <> ($this:<root>.Host<T of <root>.Host>, $receiver:TT of <uninitialized parent>) returnType:kotlin.Int
-        correspondingProperty: PROPERTY name:testMemExt3 visibility:public modality:FINAL [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.Host<T of <root>.Host>
-        $receiver: VALUE_PARAMETER name:<this> type:TT of <uninitialized parent>
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-testMemExt3> (): kotlin.Int declared in <root>.Host'
-            CONST Int type=kotlin.Int value=42
-    PROPERTY name:testMemExt4 visibility:public modality:FINAL [var]
-      FUN name:<get-testMemExt4> visibility:public modality:FINAL <> ($this:<root>.Host<T of <root>.Host>, $receiver:TT of <uninitialized parent>) returnType:kotlin.Int
-        correspondingProperty: PROPERTY name:testMemExt4 visibility:public modality:FINAL [var]
-        $this: VALUE_PARAMETER name:<this> type:<root>.Host<T of <root>.Host>
-        $receiver: VALUE_PARAMETER name:<this> type:TT of <uninitialized parent>
-        BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-testMemExt4> (): kotlin.Int declared in <root>.Host'
-            CONST Int type=kotlin.Int value=42
-      FUN name:<set-testMemExt4> visibility:public modality:FINAL <> ($this:<root>.Host<T of <root>.Host>, $receiver:TT of <uninitialized parent>, value:kotlin.Int) returnType:kotlin.Unit
-        correspondingProperty: PROPERTY name:testMemExt4 visibility:public modality:FINAL [var]
-        $this: VALUE_PARAMETER name:<this> type:<root>.Host<T of <root>.Host>
-        $receiver: VALUE_PARAMETER name:<this> type:TT of <uninitialized parent>
-        VALUE_PARAMETER name:value index:0 type:kotlin.Int
-        BLOCK_BODY
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
-      overridden:
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean [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
@@ -1,3 +1,5 @@
+// FIR_IDENTICAL
+
 val test1 get() = 42

 var test2 get() = 42; set(value) {}
@@ -25,12 +25,16 @@ FILE fqName:<root> fileName:/typeParameterBeforeBound.kt
    TYPE_PARAMETER name:U index:0 variance: superTypes:[kotlin.Any?]
    BLOCK_BODY
  PROPERTY name:test3 visibility:public modality:FINAL [var]
-    FUN name:<get-test3> visibility:public modality:FINAL <> ($receiver:<root>.Test1<T of <uninitialized parent>, U of <uninitialized parent>>) returnType:kotlin.Unit
+    FUN name:<get-test3> visibility:public modality:FINAL <T, U> ($receiver:<root>.Test1<T of <root>.<get-test3>, U of <root>.<get-test3>>) returnType:kotlin.Unit
      correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [var]
-      $receiver: VALUE_PARAMETER name:<this> type:<root>.Test1<T of <uninitialized parent>, U of <uninitialized parent>>
+      TYPE_PARAMETER name:T index:0 variance: superTypes:[U of <root>.<get-test3>]
+      TYPE_PARAMETER name:U index:0 variance: superTypes:[kotlin.Any?]
+      $receiver: VALUE_PARAMETER name:<this> type:<root>.Test1<T of <root>.<get-test3>, U of <root>.<get-test3>>
      BLOCK_BODY
-    FUN name:<set-test3> visibility:public modality:FINAL <> ($receiver:<root>.Test1<T of <uninitialized parent>, U of <uninitialized parent>>, value:kotlin.Unit) returnType:kotlin.Unit
+    FUN name:<set-test3> visibility:public modality:FINAL <T, U> ($receiver:<root>.Test1<T of <root>.<get-test3>, U of <root>.<get-test3>>, value:kotlin.Unit) returnType:kotlin.Unit
      correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [var]
-      $receiver: VALUE_PARAMETER name:<this> type:<root>.Test1<T of <uninitialized parent>, U of <uninitialized parent>>
+      TYPE_PARAMETER name:T index:0 variance: superTypes:[U of <root>.<get-test3>]
+      TYPE_PARAMETER name:U index:1 variance: superTypes:[kotlin.Any?]
+      $receiver: VALUE_PARAMETER name:<this> type:<root>.Test1<T of <root>.<get-test3>, U of <root>.<get-test3>>
      VALUE_PARAMETER name:value index:0 type:kotlin.Unit
      BLOCK_BODY