Fixed tests on IR copier

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt

@@ -377,7 +377,7 @@ class RenderIrElementVisitor : IrElementVisitor<String, Nothing?> {
             DECLARATION_RENDERER.renderDescriptor(this.descriptor)
 
         internal fun DeclarationDescriptor.ref(): String =
-            REFERENCE_RENDERER.renderDescriptor(this)
+            REFERENCE_RENDERER.renderDescriptor(this.original)
 
         internal fun KotlinType.render(): String =
             DECLARATION_RENDERER.renderType(this)

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

@@ -37,7 +37,7 @@ FILE fqName:<root> fileName:/delegatingConstructorCallToTypeAliasConstructor.kt
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:C1 flags:
     CONSTRUCTOR visibility:public <> () returnType:C1 flags:primary
       BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'constructor Cell(String)'
+        DELEGATING_CONSTRUCTOR_CALL 'constructor Cell(T)'
           <T>: kotlin.String
           value: CONST String type=kotlin.String value="O"
         INSTANCE_INITIALIZER_CALL classDescriptor='C1'
@@ -64,7 +64,7 @@ FILE fqName:<root> fileName:/delegatingConstructorCallToTypeAliasConstructor.kt
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:C2 flags:
     CONSTRUCTOR visibility:public <> () returnType:C2 flags:primary
       BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'constructor Cell(String)'
+        DELEGATING_CONSTRUCTOR_CALL 'constructor Cell(T)'
           <T>: kotlin.String
           value: CONST String type=kotlin.String value="K"
         INSTANCE_INITIALIZER_CALL classDescriptor='C2'

compiler/testData/ir/irText/declarations/annotations/delegateFieldWithAnnotations.txt

@@ -20,7 +20,7 @@ FILE fqName:<root> fileName:/delegateFieldWithAnnotations.kt
       annotations:
         CALL 'constructor Ann()' type=Ann origin=null
       EXPRESSION_BODY
-        CALL 'lazy(() -> Int): Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
+        CALL 'lazy(() -> T): Lazy<T>' type=kotlin.Lazy<kotlin.Int> origin=null
           <T>: kotlin.Int
           initializer: BLOCK type=() -> kotlin.Int origin=LAMBDA
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Int flags:
@@ -32,7 +32,7 @@ FILE fqName:<root> fileName:/delegateFieldWithAnnotations.kt
       correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL flags:delegated,val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1>(): Int'
-          CALL 'getValue(Any?, KProperty<*>) on Lazy<Int>: Int' type=kotlin.Int origin=null
+          CALL 'getValue(Any?, KProperty<*>) on Lazy<T>: T' type=kotlin.Int origin=null
             <T>: kotlin.Int
             $receiver: GET_FIELD '`test1$delegate`: Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
             thisRef: CONST Null type=kotlin.Nothing? value=null

compiler/testData/ir/irText/declarations/annotations/localDelegatedPropertiesWithAnnotations.txt

@@ -35,7 +35,7 @@ FILE fqName:<root> fileName:/localDelegatedPropertiesWithAnnotations.kt
           CALL 'constructor A(String)' type=A origin=null
             x: CONST String type=kotlin.String value="foo/test"
         VAR DELEGATE name:test$delegate type:kotlin.Lazy<kotlin.Int> flags:val
-          CALL 'lazy(() -> Int): Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
+          CALL 'lazy(() -> T): Lazy<T>' type=kotlin.Lazy<kotlin.Int> origin=null
             <T>: kotlin.Int
             initializer: BLOCK type=() -> kotlin.Int origin=LAMBDA
               FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Int flags:
@@ -46,7 +46,7 @@ FILE fqName:<root> fileName:/localDelegatedPropertiesWithAnnotations.kt
         FUN DELEGATED_PROPERTY_ACCESSOR name:<get-test> visibility:local modality:FINAL <> () returnType:kotlin.Int flags:
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='<get-test>(): Int'
-              CALL 'getValue(Any?, KProperty<*>) on Lazy<Int>: Int' type=kotlin.Int origin=null
+              CALL 'getValue(Any?, KProperty<*>) on Lazy<T>: T' type=kotlin.Int origin=null
                 <T>: kotlin.Int
                 $receiver: GET_VAR '`test$delegate`: Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
                 thisRef: CONST Null type=kotlin.Nothing? value=null

compiler/testData/ir/irText/declarations/classLevelProperties.txt

@@ -94,7 +94,7 @@ FILE fqName:<root> fileName:/classLevelProperties.kt
     PROPERTY name:test7 visibility:public modality:FINAL flags:delegated,val
       FIELD DELEGATE name:test7$delegate type:kotlin.Lazy<kotlin.Int> visibility:private flags:final
         EXPRESSION_BODY
-          CALL 'lazy(() -> Int): Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
+          CALL 'lazy(() -> T): Lazy<T>' type=kotlin.Lazy<kotlin.Int> origin=null
             <T>: kotlin.Int
             initializer: BLOCK type=() -> kotlin.Int origin=LAMBDA
               FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Int flags:
@@ -107,7 +107,7 @@ FILE fqName:<root> fileName:/classLevelProperties.kt
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test7>(): Int'
-            CALL 'getValue(Any?, KProperty<*>) on Lazy<Int>: Int' type=kotlin.Int origin=null
+            CALL 'getValue(Any?, KProperty<*>) on Lazy<T>: T' type=kotlin.Int origin=null
               <T>: kotlin.Int
               $receiver: GET_FIELD '`test7$delegate`: Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
                 receiver: GET_VAR 'this@C: C' type=C origin=null
@@ -116,7 +116,7 @@ FILE fqName:<root> fileName:/classLevelProperties.kt
     PROPERTY name:test8 visibility:public modality:FINAL flags:delegated,var
       FIELD DELEGATE name:test8$delegate type:kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */ visibility:private flags:final
         EXPRESSION_BODY
-          CALL 'hashMapOf(): HashMap<String, Int> /* = HashMap<String, Int> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */ origin=null
+          CALL 'hashMapOf(): HashMap<K, V> /* = HashMap<K, V> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */ origin=null
             <K>: kotlin.String
             <V>: kotlin.Int
       FUN DELEGATED_PROPERTY_ACCESSOR name:<get-test8> visibility:public modality:FINAL <> ($this:C) returnType:kotlin.Int flags:
@@ -124,7 +124,7 @@ FILE fqName:<root> fileName:/classLevelProperties.kt
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test8>(): Int'
-            CALL 'getValue(Any?, KProperty<*>) on MutableMap<in String, out Int>: Int' type=kotlin.Int origin=null
+            CALL 'getValue(Any?, KProperty<*>) on MutableMap<in String, out V>: V1' type=kotlin.Int origin=null
               <V>: kotlin.Int
               <V1 : V>: kotlin.Int
               $receiver: GET_FIELD '`test8$delegate`: HashMap<String, Int> /* = HashMap<String, Int> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */ origin=null
@@ -137,7 +137,7 @@ FILE fqName:<root> fileName:/classLevelProperties.kt
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<set-test8>(Int): Unit'
-            CALL 'setValue(Any?, KProperty<*>, Int) on MutableMap<in String, in Int>: Unit' type=kotlin.Unit origin=null
+            CALL 'setValue(Any?, KProperty<*>, V) on MutableMap<in String, in V>: Unit' type=kotlin.Unit origin=null
               <V>: kotlin.Int
               $receiver: GET_FIELD '`test8$delegate`: HashMap<String, Int> /* = HashMap<String, Int> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */ origin=null
                 receiver: GET_VAR 'this@C: C' type=C origin=null

compiler/testData/ir/irText/declarations/delegatedProperties.txt

@@ -2,7 +2,7 @@ FILE fqName:<root> fileName:/delegatedProperties.kt
   PROPERTY name:test1 visibility:public modality:FINAL flags:delegated,val
     FIELD DELEGATE name:test1$delegate type:kotlin.Lazy<kotlin.Int> visibility:private flags:final,static
       EXPRESSION_BODY
-        CALL 'lazy(() -> Int): Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
+        CALL 'lazy(() -> T): Lazy<T>' type=kotlin.Lazy<kotlin.Int> origin=null
           <T>: kotlin.Int
           initializer: BLOCK type=() -> kotlin.Int origin=LAMBDA
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Int flags:
@@ -14,7 +14,7 @@ FILE fqName:<root> fileName:/delegatedProperties.kt
       correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL flags:delegated,val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test1>(): Int'
-          CALL 'getValue(Any?, KProperty<*>) on Lazy<Int>: Int' type=kotlin.Int origin=null
+          CALL 'getValue(Any?, KProperty<*>) on Lazy<T>: T' type=kotlin.Int origin=null
             <T>: kotlin.Int
             $receiver: GET_FIELD '`test1$delegate`: Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
             thisRef: CONST Null type=kotlin.Nothing? value=null
@@ -40,7 +40,7 @@ FILE fqName:<root> fileName:/delegatedProperties.kt
     PROPERTY name:test2 visibility:public modality:FINAL flags:delegated,val
       FIELD DELEGATE name:test2$delegate type:kotlin.Lazy<kotlin.Int> visibility:private flags:final
         EXPRESSION_BODY
-          CALL 'lazy(() -> Int): Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
+          CALL 'lazy(() -> T): Lazy<T>' type=kotlin.Lazy<kotlin.Int> origin=null
             <T>: kotlin.Int
             initializer: BLOCK type=() -> kotlin.Int origin=LAMBDA
               FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Int flags:
@@ -53,7 +53,7 @@ FILE fqName:<root> fileName:/delegatedProperties.kt
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test2>(): Int'
-            CALL 'getValue(Any?, KProperty<*>) on Lazy<Int>: Int' type=kotlin.Int origin=null
+            CALL 'getValue(Any?, KProperty<*>) on Lazy<T>: T' type=kotlin.Int origin=null
               <T>: kotlin.Int
               $receiver: GET_FIELD '`test2$delegate`: Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
                 receiver: GET_VAR 'this@C: C' type=C origin=null
@@ -69,7 +69,7 @@ FILE fqName:<root> fileName:/delegatedProperties.kt
         $this: VALUE_PARAMETER name:<this> type:C flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-test3>(): Any'
-            CALL 'getValue(Any?, KProperty<*>) on MutableMap<in String, out Any>: Any' type=kotlin.Any origin=null
+            CALL 'getValue(Any?, KProperty<*>) on MutableMap<in String, out V>: V1' type=kotlin.Any origin=null
               <V>: kotlin.Any
               <V1 : V>: kotlin.Any
               $receiver: GET_FIELD '`test3$delegate`: MutableMap<String, Any>' type=kotlin.collections.MutableMap<kotlin.String, kotlin.Any> origin=null
@@ -82,7 +82,7 @@ FILE fqName:<root> fileName:/delegatedProperties.kt
         VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Any flags:
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<set-test3>(Any): Unit'
-            CALL 'setValue(Any?, KProperty<*>, Any) on MutableMap<in String, in Any>: Unit' type=kotlin.Unit origin=null
+            CALL 'setValue(Any?, KProperty<*>, V) on MutableMap<in String, in V>: Unit' type=kotlin.Unit origin=null
               <V>: kotlin.Any
               $receiver: GET_FIELD '`test3$delegate`: MutableMap<String, Any>' type=kotlin.collections.MutableMap<kotlin.String, kotlin.Any> origin=null
                 receiver: GET_VAR 'this@C: C' type=C origin=null
@@ -105,14 +105,14 @@ FILE fqName:<root> fileName:/delegatedProperties.kt
   PROPERTY name:test4 visibility:public modality:FINAL flags:delegated,var
     FIELD DELEGATE name:test4$delegate type:kotlin.collections.HashMap<kotlin.String, kotlin.Any> /* = java.util.HashMap<kotlin.String, kotlin.Any> */ visibility:private flags:final,static
       EXPRESSION_BODY
-        CALL 'hashMapOf(): HashMap<String, Any> /* = HashMap<String, Any> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Any> /* = java.util.HashMap<kotlin.String, kotlin.Any> */ origin=null
+        CALL 'hashMapOf(): HashMap<K, V> /* = HashMap<K, V> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Any> /* = java.util.HashMap<kotlin.String, kotlin.Any> */ origin=null
           <K>: kotlin.String
           <V>: kotlin.Any
     FUN DELEGATED_PROPERTY_ACCESSOR name:<get-test4> visibility:public modality:FINAL <> () returnType:kotlin.Any flags:
       correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL flags:delegated,var
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test4>(): Any'
-          CALL 'getValue(Any?, KProperty<*>) on MutableMap<in String, out Any>: Any' type=kotlin.Any origin=null
+          CALL 'getValue(Any?, KProperty<*>) on MutableMap<in String, out V>: V1' type=kotlin.Any origin=null
             <V>: kotlin.Any
             <V1 : V>: kotlin.Any
             $receiver: GET_FIELD '`test4$delegate`: HashMap<String, Any> /* = HashMap<String, Any> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Any> /* = java.util.HashMap<kotlin.String, kotlin.Any> */ origin=null
@@ -123,10 +123,9 @@ FILE fqName:<root> fileName:/delegatedProperties.kt
       VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Any flags:
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<set-test4>(Any): Unit'
-          CALL 'setValue(Any?, KProperty<*>, Any) on MutableMap<in String, in Any>: Unit' type=kotlin.Unit origin=null
+          CALL 'setValue(Any?, KProperty<*>, V) on MutableMap<in String, in V>: Unit' type=kotlin.Unit origin=null
             <V>: kotlin.Any
             $receiver: GET_FIELD '`test4$delegate`: HashMap<String, Any> /* = HashMap<String, Any> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Any> /* = java.util.HashMap<kotlin.String, kotlin.Any> */ origin=null
             thisRef: CONST Null type=kotlin.Nothing? value=null
             property: PROPERTY_REFERENCE 'test4: Any' field=null getter='<get-test4>(): Any' setter='<set-test4>(Any): Unit' type=kotlin.reflect.KMutableProperty0<kotlin.Any> origin=PROPERTY_REFERENCE_FOR_DELEGATE
             value: GET_VAR 'value-parameter <set-?>: Any' type=kotlin.Any origin=null
-

compiler/testData/ir/irText/declarations/kt27005.txt

@@ -2,12 +2,12 @@ FILE fqName:<root> fileName:/kt27005.kt
   FUN name:foo visibility:public modality:FINAL <> () returnType:kotlin.Unit flags:suspend
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='foo(): Unit'
-        CALL 'baz(): Unit' type=kotlin.Unit origin=null
+        CALL 'baz(): T' type=kotlin.Unit origin=null
           <T>: kotlin.Unit
   FUN name:bar visibility:public modality:FINAL <> () returnType:kotlin.Any flags:suspend
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='bar(): Any'
-        CALL 'baz(): Any' type=kotlin.Any origin=null
+        CALL 'baz(): T' type=kotlin.Any origin=null
           <T>: kotlin.Any
   FUN name:baz visibility:public modality:FINAL <T> () returnType:T flags:suspend
     TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?]

compiler/testData/ir/irText/declarations/localDelegatedProperties.txt

@@ -3,7 +3,7 @@ FILE fqName:<root> fileName:/localDelegatedProperties.kt
     BLOCK_BODY
       LOCAL_DELEGATED_PROPERTY name:x type:kotlin.Int flags:val
         VAR DELEGATE name:x$delegate type:kotlin.Lazy<kotlin.Int> flags:val
-          CALL 'lazy(() -> Int): Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
+          CALL 'lazy(() -> T): Lazy<T>' type=kotlin.Lazy<kotlin.Int> origin=null
             <T>: kotlin.Int
             initializer: BLOCK type=() -> kotlin.Int origin=LAMBDA
               FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Int flags:
@@ -14,7 +14,7 @@ FILE fqName:<root> fileName:/localDelegatedProperties.kt
         FUN DELEGATED_PROPERTY_ACCESSOR name:<get-x> visibility:local modality:FINAL <> () returnType:kotlin.Int flags:
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='<get-x>(): Int'
-              CALL 'getValue(Any?, KProperty<*>) on Lazy<Int>: Int' type=kotlin.Int origin=null
+              CALL 'getValue(Any?, KProperty<*>) on Lazy<T>: T' type=kotlin.Int origin=null
                 <T>: kotlin.Int
                 $receiver: GET_VAR '`x$delegate`: Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
                 thisRef: CONST Null type=kotlin.Nothing? value=null
@@ -25,13 +25,13 @@ FILE fqName:<root> fileName:/localDelegatedProperties.kt
     BLOCK_BODY
       LOCAL_DELEGATED_PROPERTY name:x type:kotlin.Int flags:var
         VAR DELEGATE name:x$delegate type:kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */ flags:val
-          CALL 'hashMapOf(): HashMap<String, Int> /* = HashMap<String, Int> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */ origin=null
+          CALL 'hashMapOf(): HashMap<K, V> /* = HashMap<K, V> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */ origin=null
             <K>: kotlin.String
             <V>: kotlin.Int
         FUN DELEGATED_PROPERTY_ACCESSOR name:<get-x> visibility:local modality:FINAL <> () returnType:kotlin.Int flags:
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='<get-x>(): Int'
-              CALL 'getValue(Any?, KProperty<*>) on MutableMap<in String, out Int>: Int' type=kotlin.Int origin=null
+              CALL 'getValue(Any?, KProperty<*>) on MutableMap<in String, out V>: V1' type=kotlin.Int origin=null
                 <V>: kotlin.Int
                 <V1 : V>: kotlin.Int
                 $receiver: GET_VAR '`x$delegate`: HashMap<String, Int> /* = HashMap<String, Int> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */ origin=null
@@ -41,7 +41,7 @@ FILE fqName:<root> fileName:/localDelegatedProperties.kt
           VALUE_PARAMETER name:value index:0 type:kotlin.Int flags:
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='<set-x>(Int): Unit'
-              CALL 'setValue(Any?, KProperty<*>, Int) on MutableMap<in String, in Int>: Unit' type=kotlin.Unit origin=null
+              CALL 'setValue(Any?, KProperty<*>, V) on MutableMap<in String, in V>: Unit' type=kotlin.Unit origin=null
                 <V>: kotlin.Int
                 $receiver: GET_VAR '`x$delegate`: HashMap<String, Int> /* = HashMap<String, Int> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */ origin=null
                 thisRef: CONST Null type=kotlin.Nothing? value=null

compiler/testData/ir/irText/declarations/packageLevelProperties.txt

@@ -71,7 +71,7 @@ FILE fqName:<root> fileName:/packageLevelProperties.kt
   PROPERTY name:test7 visibility:public modality:FINAL flags:delegated,val
     FIELD DELEGATE name:test7$delegate type:kotlin.Lazy<kotlin.Int> visibility:private flags:final,static
       EXPRESSION_BODY
-        CALL 'lazy(() -> Int): Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
+        CALL 'lazy(() -> T): Lazy<T>' type=kotlin.Lazy<kotlin.Int> origin=null
           <T>: kotlin.Int
           initializer: BLOCK type=() -> kotlin.Int origin=LAMBDA
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Int flags:
@@ -83,7 +83,7 @@ FILE fqName:<root> fileName:/packageLevelProperties.kt
       correspondingProperty: PROPERTY name:test7 visibility:public modality:FINAL flags:delegated,val
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test7>(): Int'
-          CALL 'getValue(Any?, KProperty<*>) on Lazy<Int>: Int' type=kotlin.Int origin=null
+          CALL 'getValue(Any?, KProperty<*>) on Lazy<T>: T' type=kotlin.Int origin=null
             <T>: kotlin.Int
             $receiver: GET_FIELD '`test7$delegate`: Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
             thisRef: CONST Null type=kotlin.Nothing? value=null
@@ -91,14 +91,14 @@ FILE fqName:<root> fileName:/packageLevelProperties.kt
   PROPERTY name:test8 visibility:public modality:FINAL flags:delegated,var
     FIELD DELEGATE name:test8$delegate type:kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */ visibility:private flags:final,static
       EXPRESSION_BODY
-        CALL 'hashMapOf(): HashMap<String, Int> /* = HashMap<String, Int> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */ origin=null
+        CALL 'hashMapOf(): HashMap<K, V> /* = HashMap<K, V> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */ origin=null
           <K>: kotlin.String
           <V>: kotlin.Int
     FUN DELEGATED_PROPERTY_ACCESSOR name:<get-test8> visibility:public modality:FINAL <> () returnType:kotlin.Int flags:
       correspondingProperty: PROPERTY name:test8 visibility:public modality:FINAL flags:delegated,var
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test8>(): Int'
-          CALL 'getValue(Any?, KProperty<*>) on MutableMap<in String, out Int>: Int' type=kotlin.Int origin=null
+          CALL 'getValue(Any?, KProperty<*>) on MutableMap<in String, out V>: V1' type=kotlin.Int origin=null
             <V>: kotlin.Int
             <V1 : V>: kotlin.Int
             $receiver: GET_FIELD '`test8$delegate`: HashMap<String, Int> /* = HashMap<String, Int> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */ origin=null
@@ -109,7 +109,7 @@ FILE fqName:<root> fileName:/packageLevelProperties.kt
       VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int flags:
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<set-test8>(Int): Unit'
-          CALL 'setValue(Any?, KProperty<*>, Int) on MutableMap<in String, in Int>: Unit' type=kotlin.Unit origin=null
+          CALL 'setValue(Any?, KProperty<*>, V) on MutableMap<in String, in V>: Unit' type=kotlin.Unit origin=null
             <V>: kotlin.Int
             $receiver: GET_FIELD '`test8$delegate`: HashMap<String, Int> /* = HashMap<String, Int> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */ origin=null
             thisRef: CONST Null type=kotlin.Nothing? value=null

compiler/testData/ir/irText/declarations/parameters/delegatedMembers.txt

@@ -46,11 +46,11 @@ FILE fqName:<root> fileName:/delegatedMembers.kt
       VALUE_PARAMETER name:t index:0 type:TT flags:
       VALUE_PARAMETER name:x index:1 type:X flags:
       BLOCK_BODY
-        CALL 'qux(TT, X): Unit' type=kotlin.Unit origin=null
+        CALL 'qux(T, X): Unit' type=kotlin.Unit origin=null
           <X>: X
           $this: GET_FIELD '`Test$IBase$delegate`: IBase<TT>' type=IBase<TT> origin=null
             receiver: GET_VAR 'this@Test: Test<TT>' type=Test<TT> origin=null
-          t: GET_VAR 'value-parameter t: TT' type=TT origin=null
+          t: GET_VAR 'value-parameter t: T' type=TT origin=null
           x: GET_VAR 'value-parameter x: X' type=X origin=null
     FUN DELEGATED_MEMBER name:foo visibility:public modality:OPEN <> ($this:Test<TT>, x:kotlin.Int) returnType:kotlin.Unit flags:
       overridden:

compiler/testData/ir/irText/expressions/argumentMappedWithError.txt

@@ -14,7 +14,7 @@ FILE fqName:<root> fileName:/argumentMappedWithError.kt
       VAR name:x type:kotlin.Int flags:val
         CONST Int type=kotlin.Int value=0
       CALL 'foo(Number): Unit' type=kotlin.Unit origin=null
-        arg: CALL 'convert() on Number: Number' type=kotlin.Number origin=null
+        arg: CALL 'convert() on Number: R' type=kotlin.Number origin=null
           <R : Number>: kotlin.Number
           $receiver: GET_VAR 'x: Int' type=kotlin.Int origin=null
 

compiler/testData/ir/irText/expressions/augmentedAssignmentWithExpression.txt

@@ -47,7 +47,7 @@ FILE fqName:<root> fileName:/augmentedAssignmentWithExpression.kt
     VALUE_PARAMETER name:a index:0 type:() -> Host flags:
     BLOCK_BODY
       CALL 'plusAssign(Int): Unit' type=kotlin.Unit origin=PLUSEQ
-        $this: CALL 'invoke(): Host' type=Host origin=INVOKE
+        $this: CALL 'invoke(): R' type=Host origin=INVOKE
           $this: GET_VAR 'value-parameter a: () -> Host' type=() -> Host origin=VARIABLE_AS_FUNCTION
         x: CONST Int type=kotlin.Int value=1
 

compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.txt

@@ -45,7 +45,7 @@ FILE fqName:<root> fileName:/breakContinueInLoopHeader.kt
         body: BLOCK type=kotlin.Unit origin=null
           BLOCK type=kotlin.Unit origin=FOR_LOOP
             VAR FOR_LOOP_ITERATOR name:tmp1_iterator type:kotlin.collections.Iterator<kotlin.String> flags:val
-              CALL 'iterator(): Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
+              CALL 'iterator(): Iterator<E>' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
                 $this: BLOCK type=kotlin.collections.List<kotlin.String> origin=ELVIS
                   VAR IR_TEMPORARY_VARIABLE name:tmp0_elvis_lhs type:kotlin.collections.List<kotlin.String>? flags:val
                     GET_VAR 'value-parameter ss: List<String>?' type=kotlin.collections.List<kotlin.String>? origin=null
@@ -63,7 +63,7 @@ FILE fqName:<root> fileName:/breakContinueInLoopHeader.kt
                 $this: GET_VAR 'tmp1_iterator: Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=null
               body: BLOCK type=kotlin.Unit origin=FOR_LOOP_INNER_WHILE
                 VAR FOR_LOOP_VARIABLE name:s type:kotlin.String flags:val
-                  CALL 'next(): String' type=kotlin.String origin=FOR_LOOP_NEXT
+                  CALL 'next(): T' type=kotlin.String origin=FOR_LOOP_NEXT
                     $this: GET_VAR 'tmp1_iterator: Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=null
   FUN name:test4 visibility:public modality:FINAL <> (ss:kotlin.collections.List<kotlin.String>?) returnType:kotlin.Unit flags:
     VALUE_PARAMETER name:ss index:0 type:kotlin.collections.List<kotlin.String>? flags:
@@ -73,7 +73,7 @@ FILE fqName:<root> fileName:/breakContinueInLoopHeader.kt
         body: BLOCK type=kotlin.Unit origin=null
           BLOCK type=kotlin.Unit origin=FOR_LOOP
             VAR FOR_LOOP_ITERATOR name:tmp1_iterator type:kotlin.collections.Iterator<kotlin.String> flags:val
-              CALL 'iterator(): Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
+              CALL 'iterator(): Iterator<E>' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
                 $this: BLOCK type=kotlin.collections.List<kotlin.String> origin=ELVIS
                   VAR IR_TEMPORARY_VARIABLE name:tmp0_elvis_lhs type:kotlin.collections.List<kotlin.String>? flags:val
                     GET_VAR 'value-parameter ss: List<String>?' type=kotlin.collections.List<kotlin.String>? origin=null
@@ -91,7 +91,7 @@ FILE fqName:<root> fileName:/breakContinueInLoopHeader.kt
                 $this: GET_VAR 'tmp1_iterator: Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=null
               body: BLOCK type=kotlin.Unit origin=FOR_LOOP_INNER_WHILE
                 VAR FOR_LOOP_VARIABLE name:s type:kotlin.String flags:val
-                  CALL 'next(): String' type=kotlin.String origin=FOR_LOOP_NEXT
+                  CALL 'next(): T' type=kotlin.String origin=FOR_LOOP_NEXT
                     $this: GET_VAR 'tmp1_iterator: Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=null
   FUN name:test5 visibility:public modality:FINAL <> () returnType:kotlin.Unit flags:
     BLOCK_BODY

compiler/testData/ir/irText/expressions/callableReferenceTypeArguments.txt

@@ -34,7 +34,7 @@ FILE fqName:<root> fileName:/callableReferenceTypeArguments.kt
   PROPERTY name:test1 visibility:public modality:FINAL flags:val
     FIELD PROPERTY_BACKING_FIELD name:test1 type:(kotlin.Int) -> kotlin.Unit visibility:public flags:final,static
       EXPRESSION_BODY
-        FUNCTION_REFERENCE 'topLevel1(Int): Unit' type=kotlin.reflect.KFunction1<@kotlin.ParameterName kotlin.Int, kotlin.Unit> origin=null
+        FUNCTION_REFERENCE 'topLevel1(T): Unit' type=kotlin.reflect.KFunction1<@kotlin.ParameterName kotlin.Int, kotlin.Unit> origin=null
           <reified T>: kotlin.Int
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:(kotlin.Int) -> kotlin.Unit flags:
       correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL flags:val
@@ -44,7 +44,7 @@ FILE fqName:<root> fileName:/callableReferenceTypeArguments.kt
   PROPERTY name:test2 visibility:public modality:FINAL flags:val
     FIELD PROPERTY_BACKING_FIELD name:test2 type:(kotlin.collections.List<kotlin.String>) -> kotlin.Unit visibility:public flags:final,static
       EXPRESSION_BODY
-        FUNCTION_REFERENCE 'topLevel2(List<String>): Unit' type=kotlin.reflect.KFunction1<@kotlin.ParameterName kotlin.collections.List<kotlin.String>, kotlin.Unit> origin=null
+        FUNCTION_REFERENCE 'topLevel2(List<T>): Unit' type=kotlin.reflect.KFunction1<@kotlin.ParameterName kotlin.collections.List<kotlin.String>, kotlin.Unit> origin=null
           <reified T>: kotlin.String
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:(kotlin.collections.List<kotlin.String>) -> kotlin.Unit flags:
       correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL flags:val
@@ -54,7 +54,7 @@ FILE fqName:<root> fileName:/callableReferenceTypeArguments.kt
   PROPERTY name:test3 visibility:public modality:FINAL flags:val
     FIELD PROPERTY_BACKING_FIELD name:test3 type:(kotlin.Int) -> kotlin.Unit visibility:public flags:final,static
       EXPRESSION_BODY
-        FUNCTION_REFERENCE 'objectMember(Int): Unit' type=kotlin.reflect.KFunction1<@kotlin.ParameterName kotlin.Int, kotlin.Unit> origin=null
+        FUNCTION_REFERENCE 'objectMember(T): Unit' type=kotlin.reflect.KFunction1<@kotlin.ParameterName kotlin.Int, kotlin.Unit> origin=null
           <reified T>: kotlin.Int
           $this: GET_OBJECT 'Host' type=Host
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test3> visibility:public modality:FINAL <> () returnType:(kotlin.Int) -> kotlin.Unit flags:

compiler/testData/ir/irText/expressions/catchParameterAccess.txt

@@ -5,7 +5,7 @@ FILE fqName:<root> fileName:/catchParameterAccess.kt
       RETURN type=kotlin.Nothing from='test(() -> Unit): Unit'
         TRY type=kotlin.Unit
           try: BLOCK type=kotlin.Unit origin=null
-            CALL 'invoke(): Unit' type=kotlin.Unit origin=INVOKE
+            CALL 'invoke(): R' type=kotlin.Unit origin=INVOKE
               $this: GET_VAR 'value-parameter f: () -> Unit' type=() -> kotlin.Unit origin=VARIABLE_AS_FUNCTION
           CATCH parameter=e: Exception /* = Exception */
             VAR CATCH_PARAMETER name:e type:kotlin.Exception /* = java.lang.Exception */ flags:val

compiler/testData/ir/irText/expressions/classReference.txt

@@ -29,12 +29,12 @@ FILE fqName:<root> fileName:/classReference.kt
           CALL 'constructor A()' type=A origin=null
       TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
         typeOperand: CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public flags: superTypes:[kotlin.Any]
-        CALL '<get-java>() on KClass<A>: Class<A>' type=java.lang.Class<A> origin=GET_PROPERTY
+        CALL '<get-java>() on KClass<T>: Class<T>' type=java.lang.Class<A> origin=GET_PROPERTY
           <`0>: A
           $receiver: CLASS_REFERENCE 'A' type=kotlin.reflect.KClass<A>
       TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
         typeOperand: CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public flags: superTypes:[kotlin.Any]
-        CALL '<get-java>() on KClass<out A>: Class<out A>' type=java.lang.Class<out A> origin=GET_PROPERTY
+        CALL '<get-java>() on KClass<T>: Class<T>' type=java.lang.Class<out A> origin=GET_PROPERTY
           <`0>: A
           $receiver: GET_CLASS type=kotlin.reflect.KClass<out A>
             CALL 'constructor A()' type=A origin=null

compiler/testData/ir/irText/expressions/coercionToUnit.txt

@@ -20,7 +20,7 @@ FILE fqName:<root> fileName:/coercionToUnit.kt
     BLOCK_BODY
       TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
         typeOperand: CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public flags: superTypes:[kotlin.Any]
-        CALL 'add(String): Boolean' type=kotlin.Boolean origin=null
+        CALL 'add(E): Boolean' type=kotlin.Boolean origin=null
           $this: GET_VAR 'value-parameter mc: MutableCollection<String>' type=kotlin.collections.MutableCollection<kotlin.String> origin=null
           element: CONST String type=kotlin.String value=""
   FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Unit flags:

compiler/testData/ir/irText/expressions/enumEntryAsReceiver.txt

@@ -142,6 +142,6 @@ FILE fqName:<root> fileName:/enumEntryAsReceiver.kt
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String flags:
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='box(): String'
-        CALL 'invoke(): String' type=kotlin.String origin=INVOKE
+        CALL 'invoke(): R' type=kotlin.String origin=INVOKE
           $this: CALL '<get-value>(): () -> String' type=() -> kotlin.String origin=GET_PROPERTY
             $this: GET_ENUM 'B' type=X

compiler/testData/ir/irText/expressions/extFunInvokeAsFun.txt

@@ -4,7 +4,7 @@ FILE fqName:<root> fileName:/extFunInvokeAsFun.kt
     VALUE_PARAMETER name:block index:1 type:kotlin.Any?.() -> kotlin.Unit flags:
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='with1(Any?, Any?.() -> Unit): Unit'
-        CALL 'invoke(Any?): Unit' type=kotlin.Unit origin=INVOKE
+        CALL 'invoke(P1): R' type=kotlin.Unit origin=INVOKE
           $this: GET_VAR 'value-parameter block: Any?.() -> Unit' type=kotlin.Any?.() -> kotlin.Unit origin=VARIABLE_AS_FUNCTION
           p1: GET_VAR 'value-parameter receiver: Any?' type=kotlin.Any? origin=null
   FUN name:with2 visibility:public modality:FINAL <> (receiver:kotlin.Any?, block:kotlin.Any?.() -> kotlin.Unit) returnType:kotlin.Unit flags:
@@ -12,7 +12,7 @@ FILE fqName:<root> fileName:/extFunInvokeAsFun.kt
     VALUE_PARAMETER name:block index:1 type:kotlin.Any?.() -> kotlin.Unit flags:
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='with2(Any?, Any?.() -> Unit): Unit'
-        CALL 'invoke(Any?): Unit' type=kotlin.Unit origin=INVOKE
+        CALL 'invoke(P1): R' type=kotlin.Unit origin=INVOKE
           $this: GET_VAR 'value-parameter block: Any?.() -> Unit' type=kotlin.Any?.() -> kotlin.Unit origin=VARIABLE_AS_FUNCTION
           p1: GET_VAR 'value-parameter receiver: Any?' type=kotlin.Any? origin=null
 

compiler/testData/ir/irText/expressions/extFunSafeInvoke.txt

@@ -15,7 +15,7 @@ FILE fqName:<root> fileName:/extFunSafeInvoke.kt
               then: CONST Null type=kotlin.Nothing? value=null
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value=true
-              then: CALL 'invoke(Any, Int, String): Unit' type=kotlin.Unit origin=INVOKE
+              then: CALL 'invoke(P1, P2, P3): R' type=kotlin.Unit origin=INVOKE
                 $this: GET_VAR 'value-parameter fn: Any.(Int, String) -> Unit' type=kotlin.Any.(kotlin.Int, kotlin.String) -> kotlin.Unit origin=VARIABLE_AS_FUNCTION
                 p1: GET_VAR 'tmp0_safe_receiver: Any?' type=kotlin.Any? origin=null
                 p2: CONST Int type=kotlin.Int value=42

compiler/testData/ir/irText/expressions/for.txt

@@ -4,28 +4,28 @@ FILE fqName:<root> fileName:/for.kt
     BLOCK_BODY
       BLOCK type=kotlin.Unit origin=FOR_LOOP
         VAR FOR_LOOP_ITERATOR name:tmp0_iterator type:kotlin.collections.Iterator<kotlin.String> flags:val
-          CALL 'iterator(): Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
+          CALL 'iterator(): Iterator<E>' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
             $this: GET_VAR 'value-parameter ss: List<String>' type=kotlin.collections.List<kotlin.String> origin=null
         WHILE label=null origin=FOR_LOOP_INNER_WHILE
           condition: CALL 'hasNext(): Boolean' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT
             $this: GET_VAR 'tmp0_iterator: Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=null
           body: BLOCK type=kotlin.Unit origin=FOR_LOOP_INNER_WHILE
             VAR FOR_LOOP_VARIABLE name:s type:kotlin.String flags:val
-              CALL 'next(): String' type=kotlin.String origin=FOR_LOOP_NEXT
+              CALL 'next(): T' type=kotlin.String origin=FOR_LOOP_NEXT
                 $this: GET_VAR 'tmp0_iterator: Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=null
   FUN name:testIterable visibility:public modality:FINAL <> (ss:kotlin.collections.List<kotlin.String>) returnType:kotlin.Unit flags:
     VALUE_PARAMETER name:ss index:0 type:kotlin.collections.List<kotlin.String> flags:
     BLOCK_BODY
       BLOCK type=kotlin.Unit origin=FOR_LOOP
         VAR FOR_LOOP_ITERATOR name:tmp0_iterator type:kotlin.collections.Iterator<kotlin.String> flags:val
-          CALL 'iterator(): Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
+          CALL 'iterator(): Iterator<E>' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
             $this: GET_VAR 'value-parameter ss: List<String>' type=kotlin.collections.List<kotlin.String> origin=null
         WHILE label=null origin=FOR_LOOP_INNER_WHILE
           condition: CALL 'hasNext(): Boolean' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT
             $this: GET_VAR 'tmp0_iterator: Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=null
           body: BLOCK type=kotlin.Unit origin=FOR_LOOP_INNER_WHILE
             VAR FOR_LOOP_VARIABLE name:s type:kotlin.String flags:val
-              CALL 'next(): String' type=kotlin.String origin=FOR_LOOP_NEXT
+              CALL 'next(): T' type=kotlin.String origin=FOR_LOOP_NEXT
                 $this: GET_VAR 'tmp0_iterator: Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=null
             BLOCK type=kotlin.Unit origin=null
               CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
@@ -35,20 +35,20 @@ FILE fqName:<root> fileName:/for.kt
     BLOCK_BODY
       BLOCK type=kotlin.Unit origin=FOR_LOOP
         VAR FOR_LOOP_ITERATOR name:tmp0_iterator type:kotlin.collections.Iterator<kotlin.Pair<kotlin.Int, kotlin.String>> flags:val
-          CALL 'iterator(): Iterator<Pair<Int, String>>' type=kotlin.collections.Iterator<kotlin.Pair<kotlin.Int, kotlin.String>> origin=FOR_LOOP_ITERATOR
+          CALL 'iterator(): Iterator<E>' type=kotlin.collections.Iterator<kotlin.Pair<kotlin.Int, kotlin.String>> origin=FOR_LOOP_ITERATOR
             $this: GET_VAR 'value-parameter pp: List<Pair<Int, String>>' type=kotlin.collections.List<kotlin.Pair<kotlin.Int, kotlin.String>> origin=null
         WHILE label=null origin=FOR_LOOP_INNER_WHILE
           condition: CALL 'hasNext(): Boolean' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT
             $this: GET_VAR 'tmp0_iterator: Iterator<Pair<Int, String>>' type=kotlin.collections.Iterator<kotlin.Pair<kotlin.Int, kotlin.String>> origin=null
           body: BLOCK type=kotlin.Unit origin=FOR_LOOP_INNER_WHILE
             VAR FOR_LOOP_IMPLICIT_VARIABLE name:tmp1_loop_parameter type:kotlin.Pair<kotlin.Int, kotlin.String> flags:val
-              CALL 'next(): Pair<Int, String>' type=kotlin.Pair<kotlin.Int, kotlin.String> origin=FOR_LOOP_NEXT
+              CALL 'next(): T' type=kotlin.Pair<kotlin.Int, kotlin.String> origin=FOR_LOOP_NEXT
                 $this: GET_VAR 'tmp0_iterator: Iterator<Pair<Int, String>>' type=kotlin.collections.Iterator<kotlin.Pair<kotlin.Int, kotlin.String>> origin=null
             VAR name:i type:kotlin.Int flags:val
-              CALL 'component1(): Int' type=kotlin.Int origin=COMPONENT_N(index=1)
+              CALL 'component1(): A' type=kotlin.Int origin=COMPONENT_N(index=1)
                 $this: GET_VAR 'tmp1_loop_parameter: Pair<Int, String>' type=kotlin.Pair<kotlin.Int, kotlin.String> origin=null
             VAR name:s type:kotlin.String flags:val
-              CALL 'component2(): String' type=kotlin.String origin=COMPONENT_N(index=2)
+              CALL 'component2(): B' type=kotlin.String origin=COMPONENT_N(index=2)
                 $this: GET_VAR 'tmp1_loop_parameter: Pair<Int, String>' type=kotlin.Pair<kotlin.Int, kotlin.String> origin=null
             BLOCK type=kotlin.Unit origin=null
               CALL 'println(Int): Unit' type=kotlin.Unit origin=null

compiler/testData/ir/irText/expressions/forWithBreakContinue.txt

@@ -4,14 +4,14 @@ FILE fqName:<root> fileName:/forWithBreakContinue.kt
     BLOCK_BODY
       BLOCK type=kotlin.Unit origin=FOR_LOOP
         VAR FOR_LOOP_ITERATOR name:tmp0_iterator type:kotlin.collections.Iterator<kotlin.String> flags:val
-          CALL 'iterator(): Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
+          CALL 'iterator(): Iterator<E>' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
             $this: GET_VAR 'value-parameter ss: List<String>' type=kotlin.collections.List<kotlin.String> origin=null
         WHILE label=null origin=FOR_LOOP_INNER_WHILE
           condition: CALL 'hasNext(): Boolean' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT
             $this: GET_VAR 'tmp0_iterator: Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=null
           body: BLOCK type=kotlin.Unit origin=FOR_LOOP_INNER_WHILE
             VAR FOR_LOOP_VARIABLE name:s type:kotlin.String flags:val
-              CALL 'next(): String' type=kotlin.String origin=FOR_LOOP_NEXT
+              CALL 'next(): T' type=kotlin.String origin=FOR_LOOP_NEXT
                 $this: GET_VAR 'tmp0_iterator: Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=null
             BLOCK type=kotlin.Nothing origin=null
               BREAK label=null loop.label=null
@@ -20,26 +20,26 @@ FILE fqName:<root> fileName:/forWithBreakContinue.kt
     BLOCK_BODY
       BLOCK type=kotlin.Unit origin=FOR_LOOP
         VAR FOR_LOOP_ITERATOR name:tmp0_iterator type:kotlin.collections.Iterator<kotlin.String> flags:val
-          CALL 'iterator(): Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
+          CALL 'iterator(): Iterator<E>' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
             $this: GET_VAR 'value-parameter ss: List<String>' type=kotlin.collections.List<kotlin.String> origin=null
         WHILE label=OUTER origin=FOR_LOOP_INNER_WHILE
           condition: CALL 'hasNext(): Boolean' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT
             $this: GET_VAR 'tmp0_iterator: Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=null
           body: BLOCK type=kotlin.Unit origin=FOR_LOOP_INNER_WHILE
             VAR FOR_LOOP_VARIABLE name:s1 type:kotlin.String flags:val
-              CALL 'next(): String' type=kotlin.String origin=FOR_LOOP_NEXT
+              CALL 'next(): T' type=kotlin.String origin=FOR_LOOP_NEXT
                 $this: GET_VAR 'tmp0_iterator: Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=null
             BLOCK type=kotlin.Nothing origin=null
               BLOCK type=kotlin.Unit origin=FOR_LOOP
                 VAR FOR_LOOP_ITERATOR name:tmp1_iterator type:kotlin.collections.Iterator<kotlin.String> flags:val
-                  CALL 'iterator(): Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
+                  CALL 'iterator(): Iterator<E>' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
                     $this: GET_VAR 'value-parameter ss: List<String>' type=kotlin.collections.List<kotlin.String> origin=null
                 WHILE label=INNER origin=FOR_LOOP_INNER_WHILE
                   condition: CALL 'hasNext(): Boolean' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT
                     $this: GET_VAR 'tmp1_iterator: Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=null
                   body: BLOCK type=kotlin.Unit origin=FOR_LOOP_INNER_WHILE
                     VAR FOR_LOOP_VARIABLE name:s2 type:kotlin.String flags:val
-                      CALL 'next(): String' type=kotlin.String origin=FOR_LOOP_NEXT
+                      CALL 'next(): T' type=kotlin.String origin=FOR_LOOP_NEXT
                         $this: GET_VAR 'tmp1_iterator: Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=null
                     BLOCK type=kotlin.Nothing origin=null
                       BREAK label=OUTER loop.label=OUTER
@@ -51,14 +51,14 @@ FILE fqName:<root> fileName:/forWithBreakContinue.kt
     BLOCK_BODY
       BLOCK type=kotlin.Unit origin=FOR_LOOP
         VAR FOR_LOOP_ITERATOR name:tmp0_iterator type:kotlin.collections.Iterator<kotlin.String> flags:val
-          CALL 'iterator(): Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
+          CALL 'iterator(): Iterator<E>' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
             $this: GET_VAR 'value-parameter ss: List<String>' type=kotlin.collections.List<kotlin.String> origin=null
         WHILE label=null origin=FOR_LOOP_INNER_WHILE
           condition: CALL 'hasNext(): Boolean' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT
             $this: GET_VAR 'tmp0_iterator: Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=null
           body: BLOCK type=kotlin.Unit origin=FOR_LOOP_INNER_WHILE
             VAR FOR_LOOP_VARIABLE name:s type:kotlin.String flags:val
-              CALL 'next(): String' type=kotlin.String origin=FOR_LOOP_NEXT
+              CALL 'next(): T' type=kotlin.String origin=FOR_LOOP_NEXT
                 $this: GET_VAR 'tmp0_iterator: Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=null
             BLOCK type=kotlin.Nothing origin=null
               CONTINUE label=null loop.label=null
@@ -67,26 +67,26 @@ FILE fqName:<root> fileName:/forWithBreakContinue.kt
     BLOCK_BODY
       BLOCK type=kotlin.Unit origin=FOR_LOOP
         VAR FOR_LOOP_ITERATOR name:tmp0_iterator type:kotlin.collections.Iterator<kotlin.String> flags:val
-          CALL 'iterator(): Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
+          CALL 'iterator(): Iterator<E>' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
             $this: GET_VAR 'value-parameter ss: List<String>' type=kotlin.collections.List<kotlin.String> origin=null
         WHILE label=OUTER origin=FOR_LOOP_INNER_WHILE
           condition: CALL 'hasNext(): Boolean' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT
             $this: GET_VAR 'tmp0_iterator: Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=null
           body: BLOCK type=kotlin.Unit origin=FOR_LOOP_INNER_WHILE
             VAR FOR_LOOP_VARIABLE name:s1 type:kotlin.String flags:val
-              CALL 'next(): String' type=kotlin.String origin=FOR_LOOP_NEXT
+              CALL 'next(): T' type=kotlin.String origin=FOR_LOOP_NEXT
                 $this: GET_VAR 'tmp0_iterator: Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=null
             BLOCK type=kotlin.Nothing origin=null
               BLOCK type=kotlin.Unit origin=FOR_LOOP
                 VAR FOR_LOOP_ITERATOR name:tmp1_iterator type:kotlin.collections.Iterator<kotlin.String> flags:val
-                  CALL 'iterator(): Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
+                  CALL 'iterator(): Iterator<E>' type=kotlin.collections.Iterator<kotlin.String> origin=FOR_LOOP_ITERATOR
                     $this: GET_VAR 'value-parameter ss: List<String>' type=kotlin.collections.List<kotlin.String> origin=null
                 WHILE label=INNER origin=FOR_LOOP_INNER_WHILE
                   condition: CALL 'hasNext(): Boolean' type=kotlin.Boolean origin=FOR_LOOP_HAS_NEXT
                     $this: GET_VAR 'tmp1_iterator: Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=null
                   body: BLOCK type=kotlin.Unit origin=FOR_LOOP_INNER_WHILE
                     VAR FOR_LOOP_VARIABLE name:s2 type:kotlin.String flags:val
-                      CALL 'next(): String' type=kotlin.String origin=FOR_LOOP_NEXT
+                      CALL 'next(): T' type=kotlin.String origin=FOR_LOOP_NEXT
                         $this: GET_VAR 'tmp1_iterator: Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=null
                     BLOCK type=kotlin.Nothing origin=null
                       CONTINUE label=OUTER loop.label=OUTER

compiler/testData/ir/irText/expressions/genericPropertyCall.txt

@@ -10,7 +10,7 @@ FILE fqName:<root> fileName:/genericPropertyCall.kt
   PROPERTY name:test visibility:public modality:FINAL flags:val
     FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.String visibility:public flags:final,static
       EXPRESSION_BODY
-        CALL '<get-id>() on String: String' type=kotlin.String origin=GET_PROPERTY
+        CALL '<get-id>() on T: T' type=kotlin.String origin=GET_PROPERTY
           <`0>: kotlin.String
           $receiver: CONST String type=kotlin.String value="abc"
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> () returnType:kotlin.String flags:

compiler/testData/ir/irText/expressions/implicitCastToNonNull.txt

@@ -74,7 +74,7 @@ FILE fqName:<root> fileName:/implicitCastToNonNull.kt
             arg0: CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EXCLEQ
               arg0: GET_VAR 'value-parameter x: T' type=T origin=null
               arg1: CONST Null type=kotlin.Nothing? value=null
-          then: CALL 'invoke(S): Unit' type=kotlin.Unit origin=INVOKE
+          then: CALL 'invoke(P1): R' type=kotlin.Unit origin=INVOKE
             $this: GET_VAR 'value-parameter fn: (S) -> Unit' type=(S) -> kotlin.Unit origin=VARIABLE_AS_FUNCTION
             p1: GET_VAR 'value-parameter x: T' type=T origin=null
 

compiler/testData/ir/irText/expressions/in.txt

@@ -4,7 +4,7 @@ FILE fqName:<root> fileName:/in.kt
     VALUE_PARAMETER name:x index:1 type:kotlin.collections.Collection<kotlin.Any> flags:
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='test1(Any, Collection<Any>): Boolean'
-        CALL 'contains(Any): Boolean' type=kotlin.Boolean origin=IN
+        CALL 'contains(E): Boolean' type=kotlin.Boolean origin=IN
           $this: GET_VAR 'value-parameter x: Collection<Any>' type=kotlin.collections.Collection<kotlin.Any> origin=null
           element: GET_VAR 'value-parameter a: Any' type=kotlin.Any origin=null
   FUN name:test2 visibility:public modality:FINAL <> (a:kotlin.Any, x:kotlin.collections.Collection<kotlin.Any>) returnType:kotlin.Boolean flags:
@@ -13,7 +13,7 @@ FILE fqName:<root> fileName:/in.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='test2(Any, Collection<Any>): Boolean'
         CALL 'NOT(Boolean): Boolean' type=kotlin.Boolean origin=NOT_IN
-          arg0: CALL 'contains(Any): Boolean' type=kotlin.Boolean origin=NOT_IN
+          arg0: CALL 'contains(E): Boolean' type=kotlin.Boolean origin=NOT_IN
             $this: GET_VAR 'value-parameter x: Collection<Any>' type=kotlin.collections.Collection<kotlin.Any> origin=null
             element: GET_VAR 'value-parameter a: Any' type=kotlin.Any origin=null
   FUN name:test3 visibility:public modality:FINAL <T> (a:T, x:kotlin.collections.Collection<T>) returnType:kotlin.Boolean flags:
@@ -22,7 +22,7 @@ FILE fqName:<root> fileName:/in.kt
     VALUE_PARAMETER name:x index:1 type:kotlin.collections.Collection<T> flags:
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='test3(T, Collection<T>): Boolean'
-        CALL 'contains(T): Boolean' type=kotlin.Boolean origin=IN
+        CALL 'contains(E): Boolean' type=kotlin.Boolean origin=IN
           $this: GET_VAR 'value-parameter x: Collection<T>' type=kotlin.collections.Collection<T> origin=null
           element: GET_VAR 'value-parameter a: T' type=T origin=null
   FUN name:test4 visibility:public modality:FINAL <T> (a:T, x:kotlin.collections.Collection<T>) returnType:kotlin.Boolean flags:
@@ -32,7 +32,7 @@ FILE fqName:<root> fileName:/in.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='test4(T, Collection<T>): Boolean'
         CALL 'NOT(Boolean): Boolean' type=kotlin.Boolean origin=NOT_IN
-          arg0: CALL 'contains(T): Boolean' type=kotlin.Boolean origin=NOT_IN
+          arg0: CALL 'contains(E): Boolean' type=kotlin.Boolean origin=NOT_IN
             $this: GET_VAR 'value-parameter x: Collection<T>' type=kotlin.collections.Collection<T> origin=null
             element: GET_VAR 'value-parameter a: T' type=T origin=null
 

compiler/testData/ir/irText/expressions/objectClassReference.txt

@@ -25,7 +25,7 @@ FILE fqName:<root> fileName:/objectClassReference.kt
         CLASS_REFERENCE 'A' type=kotlin.reflect.KClass<A>
       TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
         typeOperand: CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public flags: superTypes:[kotlin.Any]
-        CALL '<get-java>() on KClass<A>: Class<A>' type=java.lang.Class<A> origin=GET_PROPERTY
+        CALL '<get-java>() on KClass<T>: Class<T>' type=java.lang.Class<A> origin=GET_PROPERTY
           <`0>: A
           $receiver: CLASS_REFERENCE 'A' type=kotlin.reflect.KClass<A>
 

compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.txt

@@ -35,7 +35,7 @@ FILE fqName:<root> fileName:/specializedTypeAliasConstructorCall.kt
   FUN name:test visibility:public modality:FINAL <> () returnType:IntAlias /* = Cell<kotlin.Int> */ flags:
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='test(): IntAlias /* = Cell<Int> */'
-        CALL 'constructor Cell(Int)' type=Cell<kotlin.Int> origin=null
+        CALL 'constructor Cell(T)' type=Cell<kotlin.Int> origin=null
           <T>: kotlin.Int
           value: CONST Int type=kotlin.Int value=42
 

compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.txt

@@ -80,7 +80,7 @@ FILE fqName:<root> fileName:/thisOfGenericOuterClass.kt
               FIELD PROPERTY_BACKING_FIELD name:xx type:kotlin.Int visibility:public flags:final
                 EXPRESSION_BODY
                   CALL 'plus(Int): Int' type=kotlin.Int origin=PLUS
-                    $this: CALL '<get-x>(): Int' type=kotlin.Int origin=GET_PROPERTY
+                    $this: CALL '<get-x>(): T' type=kotlin.Int origin=GET_PROPERTY
                       $this: GET_VAR 'this@test: Outer<Int>' type=Outer<kotlin.Int> origin=null
                     other: CALL '<get-y>(): Int' type=kotlin.Int origin=GET_PROPERTY
                       $this: GET_VAR 'this@<no name provided>: <no name provided>' type=test.<no name provided> origin=null

compiler/testData/ir/irText/expressions/useImportedMember.txt

@@ -225,7 +225,7 @@ FILE fqName:<root> fileName:/useImportedMember.kt
         BRANCH
           if: CALL 'NOT(Boolean): Boolean' type=kotlin.Boolean origin=EXCLEQ
             arg0: CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EXCLEQ
-              arg0: CALL 'g1(String): String' type=kotlin.String origin=null
+              arg0: CALL 'g1(T): T' type=kotlin.String origin=null
                 <T>: kotlin.String
                 $this: GET_OBJECT 'C' type=C
                 t: CONST String type=kotlin.String value="7"
@@ -236,7 +236,7 @@ FILE fqName:<root> fileName:/useImportedMember.kt
         BRANCH
           if: CALL 'NOT(Boolean): Boolean' type=kotlin.Boolean origin=EXCLEQ
             arg0: CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EXCLEQ
-              arg0: CALL '<get-g2>() on String: String' type=kotlin.String origin=GET_PROPERTY
+              arg0: CALL '<get-g2>() on T: T' type=kotlin.String origin=GET_PROPERTY
                 <`0>: kotlin.String
                 $this: GET_OBJECT 'C' type=C
                 $receiver: CONST String type=kotlin.String value="8"
@@ -247,7 +247,7 @@ FILE fqName:<root> fileName:/useImportedMember.kt
         BRANCH
           if: CALL 'NOT(Boolean): Boolean' type=kotlin.Boolean origin=EXCLEQ
             arg0: CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EXCLEQ
-              arg0: CALL 'fromInterface() on Int: Int' type=kotlin.Int origin=null
+              arg0: CALL 'fromInterface() on T: T' type=kotlin.Int origin=null
                 <T>: kotlin.Int
                 $this: GET_OBJECT 'C' type=C
                 $receiver: CONST Int type=kotlin.Int value=9
@@ -258,7 +258,7 @@ FILE fqName:<root> fileName:/useImportedMember.kt
         BRANCH
           if: CALL 'NOT(Boolean): Boolean' type=kotlin.Boolean origin=EXCLEQ
             arg0: CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EXCLEQ
-              arg0: CALL '<get-fromClass>() on String: String' type=kotlin.String origin=GET_PROPERTY
+              arg0: CALL '<get-fromClass>() on T: T' type=kotlin.String origin=GET_PROPERTY
                 <`0>: kotlin.String
                 $this: GET_OBJECT 'C' type=C
                 $receiver: CONST String type=kotlin.String value="10"

compiler/testData/ir/irText/expressions/vararg.txt

@@ -2,7 +2,7 @@ FILE fqName:<root> fileName:/vararg.kt
   PROPERTY name:test1 visibility:public modality:FINAL flags:val
     FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Array<kotlin.String> visibility:public flags:final,static
       EXPRESSION_BODY
-        CALL 'arrayOf(vararg String): Array<String>' type=kotlin.Array<kotlin.String> origin=null
+        CALL 'arrayOf(vararg T): Array<T>' type=kotlin.Array<kotlin.String> origin=null
           <reified T>: kotlin.String
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:kotlin.Array<kotlin.String> flags:
       correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL flags:val
@@ -12,7 +12,7 @@ FILE fqName:<root> fileName:/vararg.kt
   PROPERTY name:test2 visibility:public modality:FINAL flags:val
     FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Array<kotlin.String> visibility:public flags:final,static
       EXPRESSION_BODY
-        CALL 'arrayOf(vararg String): Array<String>' type=kotlin.Array<kotlin.String> origin=null
+        CALL 'arrayOf(vararg T): Array<T>' type=kotlin.Array<kotlin.String> origin=null
           <reified T>: kotlin.String
           elements: VARARG type=kotlin.Array<out kotlin.String> varargElementType=kotlin.String
             CONST String type=kotlin.String value="1"
@@ -26,7 +26,7 @@ FILE fqName:<root> fileName:/vararg.kt
   PROPERTY name:test3 visibility:public modality:FINAL flags:val
     FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Array<kotlin.String> visibility:public flags:final,static
       EXPRESSION_BODY
-        CALL 'arrayOf(vararg String): Array<String>' type=kotlin.Array<kotlin.String> origin=null
+        CALL 'arrayOf(vararg T): Array<T>' type=kotlin.Array<kotlin.String> origin=null
           <reified T>: kotlin.String
           elements: VARARG type=kotlin.Array<out kotlin.String> varargElementType=kotlin.String
             CONST String type=kotlin.String value="0"

compiler/testData/ir/irText/expressions/variableAsFunctionCall.txt

@@ -13,19 +13,19 @@ FILE fqName:<root> fileName:/variableAsFunctionCall.kt
     VALUE_PARAMETER name:f index:0 type:() -> kotlin.Unit flags:
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='test1(() -> Unit): Unit'
-        CALL 'invoke(): Unit' type=kotlin.Unit origin=INVOKE
+        CALL 'invoke(): R' type=kotlin.Unit origin=INVOKE
           $this: GET_VAR 'value-parameter f: () -> Unit' type=() -> kotlin.Unit origin=VARIABLE_AS_FUNCTION
   FUN name:test2 visibility:public modality:FINAL <> (f:kotlin.String.() -> kotlin.Unit) returnType:kotlin.Unit flags:
     VALUE_PARAMETER name:f index:0 type:kotlin.String.() -> kotlin.Unit flags:
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='test2(String.() -> Unit): Unit'
-        CALL 'invoke(String): Unit' type=kotlin.Unit origin=INVOKE
+        CALL 'invoke(P1): R' type=kotlin.Unit origin=INVOKE
           $this: GET_VAR 'value-parameter f: String.() -> Unit' type=kotlin.String.() -> kotlin.Unit origin=VARIABLE_AS_FUNCTION
           p1: CONST String type=kotlin.String value="hello"
   FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.String flags:
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='test3(): String'
-        CALL 'invoke(): String' type=kotlin.String origin=null
+        CALL 'invoke(): R' type=kotlin.String origin=null
           $this: CALL 'k() on String: () -> String' type=() -> kotlin.String origin=null
             $receiver: CONST String type=kotlin.String value="hello"
   FUN name:test4 visibility:public modality:FINAL <> (ns:kotlin.String?) returnType:kotlin.String? flags:
@@ -55,6 +55,6 @@ FILE fqName:<root> fileName:/variableAsFunctionCall.kt
               then: CONST Null type=kotlin.Nothing? value=null
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value=true
-              then: CALL 'invoke(): String' type=kotlin.String origin=null
+              then: CALL 'invoke(): R' type=kotlin.String origin=null
                 $this: GET_VAR 'tmp1_safe_receiver: (() -> String)?' type=(() -> kotlin.String)? origin=null
 

compiler/testData/ir/irText/expressions/variableAsFunctionCallWithGenerics.txt

@@ -16,8 +16,8 @@ FILE fqName:<root> fileName:/variableAsFunctionCallWithGenerics.kt
     VALUE_PARAMETER name:x index:0 type:kotlin.String flags:
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='testGeneric1(String): String'
-        CALL 'invoke(): String' type=kotlin.String origin=INVOKE
+        CALL 'invoke(): R' type=kotlin.String origin=INVOKE
-          $this: CALL '<get-gk>() on String: () -> String' type=() -> kotlin.String origin=GET_PROPERTY
+          $this: CALL '<get-gk>() on T: () -> T' type=() -> kotlin.String origin=GET_PROPERTY
             <`0>: kotlin.String
             $receiver: GET_VAR 'value-parameter x: String' type=kotlin.String origin=null
   PROPERTY name:kt26531Val visibility:public modality:FINAL flags:val
@@ -36,7 +36,7 @@ FILE fqName:<root> fileName:/variableAsFunctionCallWithGenerics.kt
   FUN name:kt26531 visibility:public modality:FINAL <> () returnType:kotlin.Int flags:
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='kt26531(): Int'
-        CALL 'invoke(): Int' type=kotlin.Int origin=INVOKE
+        CALL 'invoke(): R' type=kotlin.Int origin=INVOKE
-          $this: CALL '<get-kt26531Val>() on Int: () -> Int' type=() -> kotlin.Int origin=GET_PROPERTY
+          $this: CALL '<get-kt26531Val>() on T: () -> T' type=() -> kotlin.Int origin=GET_PROPERTY
             <`0>: kotlin.Int
             $receiver: CONST Int type=kotlin.Int value=7

compiler/testData/ir/irText/expressions/when.txt

@@ -48,9 +48,9 @@ FILE fqName:<root> fileName:/when.kt
                   GET_VAR 'tmp0_subject: Any?' type=kotlin.Any? origin=null
               then: CONST String type=kotlin.String value="!Number"
             BRANCH
-              if: CALL 'contains(Number) on Iterable<Number>: Boolean' type=kotlin.Boolean origin=IN
+              if: CALL 'contains(T) on Iterable<T>: Boolean' type=kotlin.Boolean origin=IN
                 <T>: kotlin.Number
-                $receiver: CALL 'setOf(): Set<Nothing>' type=kotlin.collections.Set<kotlin.Nothing> origin=null
+                $receiver: CALL 'setOf(): Set<T>' type=kotlin.collections.Set<kotlin.Nothing> origin=null
                   <T>: kotlin.Nothing
                 element: TYPE_OP type=kotlin.Number origin=IMPLICIT_CAST typeOperand=kotlin.Number
                   typeOperand: CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Number modality:ABSTRACT visibility:public flags: superTypes:[kotlin.Any; java.io.Serializable]
@@ -85,9 +85,9 @@ FILE fqName:<root> fileName:/when.kt
               GET_VAR 'value-parameter x: Any?' type=kotlin.Any? origin=null
             then: CONST String type=kotlin.String value="!Number"
           BRANCH
-            if: CALL 'contains(Number) on Iterable<Number>: Boolean' type=kotlin.Boolean origin=IN
+            if: CALL 'contains(T) on Iterable<T>: Boolean' type=kotlin.Boolean origin=IN
               <T>: kotlin.Number
-              $receiver: CALL 'setOf(): Set<Nothing>' type=kotlin.collections.Set<kotlin.Nothing> origin=null
+              $receiver: CALL 'setOf(): Set<T>' type=kotlin.collections.Set<kotlin.Nothing> origin=null
                 <T>: kotlin.Nothing
               element: TYPE_OP type=kotlin.Number origin=IMPLICIT_CAST typeOperand=kotlin.Number
                 typeOperand: CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Number modality:ABSTRACT visibility:public flags: superTypes:[kotlin.Any; java.io.Serializable]

compiler/testData/ir/irText/lambdas/extensionLambda.txt

@@ -2,7 +2,7 @@ FILE fqName:<root> fileName:/extensionLambda.kt
   FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Int flags:
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='test1(): Int'
-        CALL 'run(String.() -> Int) on String: Int' type=kotlin.Int origin=null
+        CALL 'run(T.() -> R) on T: R' type=kotlin.Int origin=null
           <T>: kotlin.String
           <R>: kotlin.Int
           $receiver: CONST String type=kotlin.String value="42"

compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.txt

@@ -87,7 +87,7 @@ FILE fqName:<root> fileName:/multipleImplicitReceivers.kt
     BLOCK_BODY
       TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
         typeOperand: CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public flags: superTypes:[kotlin.Any]
-        CALL 'with(A, A.() -> Int): Int' type=kotlin.Int origin=null
+        CALL 'with(T, T.() -> R): R' type=kotlin.Int origin=null
           <T>: A
           <R>: kotlin.Int
           receiver: GET_OBJECT 'A' type=A
@@ -96,7 +96,7 @@ FILE fqName:<root> fileName:/multipleImplicitReceivers.kt
               $receiver: VALUE_PARAMETER name:<this> type:A flags:
               BLOCK_BODY
                 RETURN type=kotlin.Nothing from='<anonymous>() on A: Int'
-                  CALL 'with(IFoo, IFoo.() -> Int): Int' type=kotlin.Int origin=null
+                  CALL 'with(T, T.() -> R): R' type=kotlin.Int origin=null
                     <T>: IFoo
                     <R>: kotlin.Int
                     receiver: GET_VAR 'value-parameter fooImpl: IFoo' type=IFoo origin=null
@@ -105,7 +105,7 @@ FILE fqName:<root> fileName:/multipleImplicitReceivers.kt
                         $receiver: VALUE_PARAMETER name:<this> type:IFoo flags:
                         BLOCK_BODY
                           RETURN type=kotlin.Nothing from='<anonymous>() on IFoo: Int'
-                            CALL 'with(IInvoke, IInvoke.() -> Int): Int' type=kotlin.Int origin=null
+                            CALL 'with(T, T.() -> R): R' type=kotlin.Int origin=null
                               <T>: IInvoke
                               <R>: kotlin.Int
                               receiver: GET_VAR 'value-parameter invokeImpl: IInvoke' type=IInvoke origin=null

compiler/testData/ir/irText/lambdas/nonLocalReturn.txt

@@ -1,7 +1,7 @@
 FILE fqName:<root> fileName:/nonLocalReturn.kt
   FUN name:test0 visibility:public modality:FINAL <> () returnType:kotlin.Unit flags:
     BLOCK_BODY
-      CALL 'run(() -> Nothing): Nothing' type=kotlin.Nothing origin=null
+      CALL 'run(() -> R): R' type=kotlin.Nothing origin=null
         <R>: kotlin.Nothing
         block: BLOCK type=() -> kotlin.Nothing origin=LAMBDA
           FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Nothing flags:
@@ -11,7 +11,7 @@ FILE fqName:<root> fileName:/nonLocalReturn.kt
           FUNCTION_REFERENCE '<anonymous>(): Nothing' type=() -> kotlin.Nothing origin=LAMBDA
   FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit flags:
     BLOCK_BODY
-      CALL 'run(() -> Unit): Unit' type=kotlin.Unit origin=null
+      CALL 'run(() -> R): R' type=kotlin.Unit origin=null
         <R>: kotlin.Unit
         block: BLOCK type=() -> kotlin.Unit origin=LAMBDA
           FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Unit flags:
@@ -21,7 +21,7 @@ FILE fqName:<root> fileName:/nonLocalReturn.kt
           FUNCTION_REFERENCE '<anonymous>(): Unit' type=() -> kotlin.Unit origin=LAMBDA
   FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit flags:
     BLOCK_BODY
-      CALL 'run(() -> Unit): Unit' type=kotlin.Unit origin=null
+      CALL 'run(() -> R): R' type=kotlin.Unit origin=null
         <R>: kotlin.Unit
         block: BLOCK type=() -> kotlin.Unit origin=LAMBDA
           FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Unit flags:
@@ -31,13 +31,13 @@ FILE fqName:<root> fileName:/nonLocalReturn.kt
           FUNCTION_REFERENCE '<anonymous>(): Unit' type=() -> kotlin.Unit origin=LAMBDA
   FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Unit flags:
     BLOCK_BODY
-      CALL 'run(() -> Unit): Unit' type=kotlin.Unit origin=null
+      CALL 'run(() -> R): R' type=kotlin.Unit origin=null
         <R>: kotlin.Unit
         block: BLOCK type=() -> kotlin.Unit origin=LAMBDA
           FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Unit flags:
             BLOCK_BODY
               RETURN type=kotlin.Nothing from='<anonymous>(): Unit'
-                CALL 'run(() -> Nothing): Nothing' type=kotlin.Nothing origin=null
+                CALL 'run(() -> R): R' type=kotlin.Nothing origin=null
                   <R>: kotlin.Nothing
                   block: BLOCK type=() -> kotlin.Nothing origin=LAMBDA
                     FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Nothing flags:
@@ -49,7 +49,7 @@ FILE fqName:<root> fileName:/nonLocalReturn.kt
   FUN name:testLrmFoo1 visibility:public modality:FINAL <> (ints:kotlin.collections.List<kotlin.Int>) returnType:kotlin.Unit flags:
     VALUE_PARAMETER name:ints index:0 type:kotlin.collections.List<kotlin.Int> flags:
     BLOCK_BODY
-      CALL 'forEach((Int) -> Unit) on Iterable<Int>: Unit' type=kotlin.Unit origin=null
+      CALL 'forEach((T) -> Unit) on Iterable<T>: Unit' type=kotlin.Unit origin=null
         <T>: kotlin.Int
         $receiver: GET_VAR 'value-parameter ints: List<Int>' type=kotlin.collections.List<kotlin.Int> origin=null
         action: BLOCK type=(kotlin.Int) -> kotlin.Unit origin=LAMBDA
@@ -70,7 +70,7 @@ FILE fqName:<root> fileName:/nonLocalReturn.kt
   FUN name:testLrmFoo2 visibility:public modality:FINAL <> (ints:kotlin.collections.List<kotlin.Int>) returnType:kotlin.Unit flags:
     VALUE_PARAMETER name:ints index:0 type:kotlin.collections.List<kotlin.Int> flags:
     BLOCK_BODY
-      CALL 'forEach((Int) -> Unit) on Iterable<Int>: Unit' type=kotlin.Unit origin=null
+      CALL 'forEach((T) -> Unit) on Iterable<T>: Unit' type=kotlin.Unit origin=null
         <T>: kotlin.Int
         $receiver: GET_VAR 'value-parameter ints: List<Int>' type=kotlin.collections.List<kotlin.Int> origin=null
         action: BLOCK type=(kotlin.Int) -> kotlin.Unit origin=LAMBDA

compiler/testData/ir/irText/regressions/integerCoercionToT.txt

@@ -90,7 +90,7 @@ FILE fqName:<root> fileName:/integerCoercionToT.kt
     VALUE_PARAMETER name:value index:0 type:IdType flags:
     VALUE_PARAMETER name:cv index:1 type:CInt32Var /* = CInt32VarX<kotlin.Int> */ flags:
     BLOCK_BODY
-      CALL '<set-value>(Int) on CInt32VarX<Int>: Unit' type=kotlin.Unit origin=EQ
+      CALL '<set-value>(T_INT) on CInt32VarX<T_INT>: Unit' type=kotlin.Unit origin=EQ
         <`0>: kotlin.Int
         $receiver: GET_VAR 'value-parameter cv: CInt32Var /* = CInt32VarX<Int> */' type=CInt32Var /* = CInt32VarX<kotlin.Int> */ origin=null
         value: CALL '<get-value>(): Int' type=kotlin.Int origin=GET_PROPERTY

compiler/testData/ir/irText/regressions/newInference/fixationOrder1.txt

@@ -34,12 +34,12 @@ FILE fqName:<root> fileName:/fixationOrder1.kt
   FUN name:test visibility:public modality:FINAL <> () returnType:Inv2<kotlin.String, kotlin.Int> flags:
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='test(): Inv2<String, Int>'
-        CALL 'check(String, Int, (String) -> Int): Inv2<String, Int>' type=Inv2<kotlin.String, kotlin.Int> origin=null
+        CALL 'check(T, R, (T) -> R): Inv2<T, R>' type=Inv2<kotlin.String, kotlin.Int> origin=null
           <T>: kotlin.String
           <R>: kotlin.Int
           x: CONST String type=kotlin.String value=""
           y: CONST Int type=kotlin.Int value=1
-          f: CALL 'foo(): (String) -> Int' type=(kotlin.String) -> kotlin.Int origin=null
+          f: CALL 'foo(): (X) -> Y' type=(kotlin.String) -> kotlin.Int origin=null
             <X>: kotlin.String
             <Y>: kotlin.Int
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String flags:

compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.txt

@@ -36,11 +36,11 @@ FILE fqName:<root> fileName:/typeAliasCtorForGenericClass.kt
   FUN name:bar visibility:public modality:FINAL <> () returnType:kotlin.Unit flags:
     BLOCK_BODY
       VAR name:b type:B<kotlin.Int> /* = A<kotlin.Int> */ flags:val
-        CALL 'constructor A(Int)' type=A<kotlin.Int> origin=null
+        CALL 'constructor A(Q)' type=A<kotlin.Int> origin=null
           <Q>: kotlin.Int
           q: CONST Int type=kotlin.Int value=2
       VAR name:b2 type:B2<kotlin.Int> /* = A<A<kotlin.Int>> */ flags:val
-        CALL 'constructor A(A<Int>)' type=A<A<kotlin.Int>> origin=null
+        CALL 'constructor A(Q)' type=A<A<kotlin.Int>> origin=null
           <Q>: A<kotlin.Int>
           q: GET_VAR 'b: B<Int> /* = A<Int> */' type=B<kotlin.Int> /* = A<kotlin.Int> */ origin=null
 

compiler/testData/ir/irText/stubs/builtinMap.txt

@@ -10,15 +10,15 @@ FILE fqName:<root> fileName:/builtinMap.kt
           BRANCH
             if: CALL 'isEmpty(): Boolean' type=kotlin.Boolean origin=null
               $this: GET_VAR 'this@plus: Map<out K1, V1>' type=kotlin.collections.Map<out K1, V1> origin=null
-            then: CALL 'mapOf(Pair<K1, V1>): Map<K1, V1>' type=kotlin.collections.Map<K1, V1> origin=null
+            then: CALL 'mapOf(Pair<K, V>): Map<K, V>' type=kotlin.collections.Map<K1, V1> origin=null
               <K>: K1
               <V>: V1
               pair: GET_VAR 'value-parameter pair: Pair<K1, V1>' type=kotlin.Pair<K1, V1> origin=null
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
-            then: CALL 'apply(LinkedHashMap<K1!, V1!> /* = LinkedHashMap<K1!, V1!> */.() -> Unit) on LinkedHashMap<K1!, V1!> /* = LinkedHashMap<K1!, V1!> */: LinkedHashMap<K1!, V1!> /* = LinkedHashMap<K1!, V1!> */' type=kotlin.collections.LinkedHashMap<K1!, V1!> /* = java.util.LinkedHashMap<K1!, V1!> */ origin=null
+            then: CALL 'apply(T.() -> Unit) on T: T' type=kotlin.collections.LinkedHashMap<K1!, V1!> /* = java.util.LinkedHashMap<K1!, V1!> */ origin=null
               <T>: kotlin.collections.LinkedHashMap<K1!, V1!> /* = java.util.LinkedHashMap<K1!, V1!> */
-              $receiver: CALL 'constructor LinkedHashMap((MutableMap<out K1!, out V1!>..Map<out K1!, V1!>?))' type=java.util.LinkedHashMap<K1!, V1!> origin=null
+              $receiver: CALL 'constructor LinkedHashMap((MutableMap<out K!, out V!>..Map<out K!, V!>?))' type=java.util.LinkedHashMap<K1!, V1!> origin=null
                 <K : Any!>: K1?
                 <V : Any!>: V1?
                 p0: GET_VAR 'this@plus: Map<out K1, V1>' type=kotlin.collections.Map<out K1, V1> origin=null
@@ -29,10 +29,10 @@ FILE fqName:<root> fileName:/builtinMap.kt
                     RETURN type=kotlin.Nothing from='<anonymous>() on LinkedHashMap<K1!, V1!> /* = LinkedHashMap<K1!, V1!> */: Unit'
                       TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
                         typeOperand: CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public flags: superTypes:[kotlin.Any]
-                        CALL 'put(K1!, V1!): V1?' type=V1? origin=null
+                        CALL 'put(K, V): V?' type=V1? origin=null
                           $this: GET_VAR 'this@<anonymous>: LinkedHashMap<(K1..K1?), (V1..V1?)>' type=kotlin.collections.LinkedHashMap<K1!, V1!> /* = java.util.LinkedHashMap<K1!, V1!> */ origin=null
-                          key: CALL '<get-first>(): K1' type=K1 origin=GET_PROPERTY
+                          key: CALL '<get-first>(): A' type=K1 origin=GET_PROPERTY
                             $this: GET_VAR 'value-parameter pair: Pair<K1, V1>' type=kotlin.Pair<K1, V1> origin=null
-                          value: CALL '<get-second>(): V1' type=V1 origin=GET_PROPERTY
+                          value: CALL '<get-second>(): B' type=V1 origin=GET_PROPERTY
                             $this: GET_VAR 'value-parameter pair: Pair<K1, V1>' type=kotlin.Pair<K1, V1> origin=null
                 FUNCTION_REFERENCE '<anonymous>() on LinkedHashMap<K1!, V1!> /* = LinkedHashMap<K1!, V1!> */: Unit' type=kotlin.collections.LinkedHashMap<K1!, V1!> /* = java.util.LinkedHashMap<K1!, V1!> */.() -> kotlin.Unit origin=LAMBDA

compiler/testData/ir/sourceRanges/augmentedAssignmentWithExpression.txt

@@ -41,6 +41,6 @@
     @20:10..23 VALUE_PARAMETER name:a index:0 type:() -> test.Host flags:
     @20:25..22:1 BLOCK_BODY
       @21:4..12 CALL 'plusAssign(Int): Unit' type=kotlin.Unit origin=PLUSEQ
-        @21:4..7 CALL 'invoke(): Host' type=test.Host origin=INVOKE
+        @21:4..7 CALL 'invoke(): R' type=test.Host origin=INVOKE
           @21:4..5 GET_VAR 'value-parameter a: () -> Host' type=() -> test.Host origin=VARIABLE_AS_FUNCTION
         @21:11..12 CONST Int type=kotlin.Int value=1