[IR] update testdata: better support for IrCall

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

@@ -26,15 +26,15 @@ class Test1<E : Any?> : IBase<E> {
 
   override val <C : Any?> C.id: Map<E, C>?
     override get(): Map<E, C>? {
-      return #$$delegate_0.<get-id><C>($receiver = <this>)
+      return (#$$delegate_0, <this>).<get-id><C>()
     }
 
   override var <D : Any?> List<D>.x: D?
     override get(): D? {
-      return #$$delegate_0.<get-x><D>($receiver = <this>)
+      return (#$$delegate_0, <this>).<get-x><D>()
     }
     override set(<set-?>: D?) {
-      #$$delegate_0.<set-x><D>($receiver = <this>, <set-?> = <set-?>)
+      (#$$delegate_0, <this>).<set-x><D>(<set-?> = <set-?>)
     }
 
 
@@ -61,15 +61,15 @@ class Test2 : IBase<String> {
 
   override val <C : Any?> C.id: Map<String, C>?
     override get(): Map<String, C>? {
-      return #$$delegate_0.<get-id><C>($receiver = <this>)
+      return (#$$delegate_0, <this>).<get-id><C>()
     }
 
   override var <D : Any?> List<D>.x: D?
     override get(): D? {
-      return #$$delegate_0.<get-x><D>($receiver = <this>)
+      return (#$$delegate_0, <this>).<get-x><D>()
     }
     override set(<set-?>: D?) {
-      #$$delegate_0.<set-x><D>($receiver = <this>, <set-?> = <set-?>)
+      (#$$delegate_0, <this>).<set-x><D>(<set-?> = <set-?>)
     }
 
 

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

@@ -106,7 +106,7 @@ class Test1 : IBase {
   }
 
   override fun String.qux() {
-    #$$delegate_0.qux($receiver = <this>)
+    (#$$delegate_0, <this>).qux()
   }
 
 
@@ -131,13 +131,13 @@ class Test2 : IBase, IOther {
   }
 
   override fun String.qux() {
-    #$$delegate_0.qux($receiver = <this>)
+    (#$$delegate_0, <this>).qux()
   }
 
   private /*final field*/ val $$delegate_1: IOther = otherImpl(x0 = "", y0 = 42)
   override val Byte.z1: Int
     override get(): Int {
-      return #$$delegate_1.<get-z1>($receiver = <this>)
+      return (#$$delegate_1, <this>).<get-z1>()
     }
 
   override val x: String
@@ -147,10 +147,10 @@ class Test2 : IBase, IOther {
 
   override var Byte.z2: Int
     override get(): Int {
-      return #$$delegate_1.<get-z2>($receiver = <this>)
+      return (#$$delegate_1, <this>).<get-z2>()
     }
     override set(<set-?>: Int) {
-      #$$delegate_1.<set-z2>($receiver = <this>, <set-?> = <set-?>)
+      (#$$delegate_1, <this>).<set-z2>(<set-?> = <set-?>)
     }
 
   override var y: Int

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

@@ -26,7 +26,7 @@ class K2 : JFoo {
   }
 
   override fun foo(): String {
-    return <this>.foo() /*!! String */
+    return super.foo() /*!! String */
   }
 
 
@@ -55,7 +55,7 @@ class K4 : JUnrelatedFoo, IFoo {
   }
 
   override fun foo(): @FlexibleNullability String? {
-    return <this>.foo()
+    return super.foo()
   }
 
 

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

@@ -9,7 +9,7 @@ class TestInitValInLambdaCalledOnce {
     get
 
   init {
-    run<Int, Unit>($receiver = 1, block =     local fun Int.<anonymous>() {
+    1.run<Int, Unit>(block =     local fun Int.<anonymous>() {
       #x = 0
     }
 )

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

@@ -34,13 +34,13 @@ class CBoth : ILeft, IRight {
   }
 
   override fun foo() {
-    <this>.foo()
-    <this>.foo()
+    super.foo()
+    super.foo()
   }
 
   override val bar: Int
     override get(): Int {
-      return <this>.<get-bar>().plus(other = <this>.<get-bar>())
+      return super.<get-bar>().plus(other = super.<get-bar>())
     }
 
 

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

@@ -13,7 +13,7 @@ open class Base {
     open get
 
   override fun hashCode(): Int {
-    return <this>.hashCode()
+    return super.hashCode()
   }
 
 
@@ -28,12 +28,12 @@ class Derived : Base {
   }
 
   override fun foo() {
-    <this>.foo()
+    super.foo()
   }
 
   override val bar: String
     override get(): String {
-      return <this>.<get-bar>()
+      return super.<get-bar>()
     }
 
 

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

@@ -35,12 +35,12 @@ class Derived : Base, BaseI {
   }
 
   override fun foo() {
-    <this>.foo()
+    super.foo()
   }
 
   override val bar: String
     override get(): String {
-      return <this>.<get-bar>()
+      return super.<get-bar>()
     }
 
 

compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.kt.txt

@@ -33,7 +33,7 @@ class DFoo : IFoo {
   private /*final field*/ val $$delegate_0: IFoo = d
   @Ann
   override fun String.testExtFun() {
-    #$$delegate_0.testExtFun($receiver = <this>)
+    (#$$delegate_0, <this>).testExtFun()
   }
 
   @Ann
@@ -43,7 +43,7 @@ class DFoo : IFoo {
 
   override val String.testExtVal: String
     override get(): String {
-      return #$$delegate_0.<get-testExtVal>($receiver = <this>)
+      return (#$$delegate_0, <this>).<get-testExtVal>()
     }
 
   override val testVal: String

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

@@ -11,6 +11,6 @@ val test1: Int /* by */
   }
 )
   get(): Int {
-    return getValue<Int>($receiver = #test1$delegate, thisRef = null, property = ::test1)
+    return #test1$delegate.getValue<Int>(thisRef = null, property = ::test1)
   }
 

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

@@ -17,7 +17,7 @@ fun foo(m: Map<String, Int>) {
     }
 )
     local get(): Int {
-      return getValue<Int>($receiver = test$delegate, thisRef = null, property = ::test)
+      return test$delegate.getValue<Int>(thisRef = null, property = ::test)
     }
 
 

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

@@ -41,16 +41,16 @@ class C {
     }
 )
     get(): Int {
-      return getValue<Int>($receiver = #test7$delegate, thisRef = <this>, property = ::test7)
+      return #test7$delegate.getValue<Int>(thisRef = <this>, property = ::test7)
     }
 
   var test8: Int /* by */ 
     field = hashMapOf<String, Int>()
     get(): Int {
-      return getValue<Int, Int>($receiver = #test8$delegate, thisRef = <this>, property = ::test8)
+      return #test8$delegate.getValue<Int, Int>(thisRef = <this>, property = ::test8)
     }
     set(<set-?>: Int) {
-      return setValue<Int>($receiver = #test8$delegate, thisRef = <this>, property = ::test8, value = <set-?>)
+      return #test8$delegate.setValue<Int>(thisRef = <this>, property = ::test8, value = <set-?>)
     }
 
 

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

@@ -4,7 +4,7 @@ val test1: Int /* by */
   }
 )
   get(): Int {
-    return getValue<Int>($receiver = #test1$delegate, thisRef = null, property = ::test1)
+    return #test1$delegate.getValue<Int>(thisRef = null, property = ::test1)
   }
 
 class C {
@@ -24,16 +24,16 @@ class C {
     }
 )
     get(): Int {
-      return getValue<Int>($receiver = #test2$delegate, thisRef = <this>, property = ::test2)
+      return #test2$delegate.getValue<Int>(thisRef = <this>, property = ::test2)
     }
 
   var test3: Any /* by */ 
     field = <this>.<get-map>()
     get(): Any {
-      return getValue<Any, Any>($receiver = #test3$delegate, thisRef = <this>, property = ::test3)
+      return #test3$delegate.getValue<Any, Any>(thisRef = <this>, property = ::test3)
     }
     set(<set-?>: Any) {
-      return setValue<Any>($receiver = #test3$delegate, thisRef = <this>, property = ::test3, value = <set-?>)
+      return #test3$delegate.setValue<Any>(thisRef = <this>, property = ::test3, value = <set-?>)
     }
 
 
@@ -44,9 +44,9 @@ class C {
 var test4: Any /* by */ 
   field = hashMapOf<String, Any>()
   get(): Any {
-    return getValue<Any, Any>($receiver = #test4$delegate, thisRef = null, property = ::test4)
+    return #test4$delegate.getValue<Any, Any>(thisRef = null, property = ::test4)
   }
   set(<set-?>: Any) {
-    return setValue<Any>($receiver = #test4$delegate, thisRef = null, property = ::test4, value = <set-?>)
+    return #test4$delegate.setValue<Any>(thisRef = null, property = ::test4, value = <set-?>)
   }
 

compiler/testData/ir/irText/declarations/kt35550.kt.txt

@@ -19,7 +19,7 @@ class A : I {
   private /*final field*/ val $$delegate_0: I = i
   override val <T : Any?> T.id: T
     override get(): T {
-      return #$$delegate_0.<get-id><T>($receiver = <this>)
+      return (#$$delegate_0, <this>).<get-id><T>()
     }
 
 

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

@@ -5,7 +5,7 @@ fun test1() {
     }
 )
     local get(): Int {
-      return getValue<Int>($receiver = x$delegate, thisRef = null, property = ::x)
+      return x$delegate.getValue<Int>(thisRef = null, property = ::x)
     }
 
 
@@ -16,10 +16,10 @@ fun test2() {
   var x: Int
     val x$delegate: HashMap<String, Int> = hashMapOf<String, Int>()
     local get(): Int {
-      return getValue<Int, Int>($receiver = x$delegate, thisRef = null, property = ::x)
+      return x$delegate.getValue<Int, Int>(thisRef = null, property = ::x)
     }
     local set(value: Int) {
-      return setValue<Int>($receiver = x$delegate, thisRef = null, property = ::x, value = value)
+      return x$delegate.setValue<Int>(thisRef = null, property = ::x, value = value)
     }
 
 

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

@@ -34,15 +34,15 @@ val test7: Int /* by */
   }
 )
   get(): Int {
-    return getValue<Int>($receiver = #test7$delegate, thisRef = null, property = ::test7)
+    return #test7$delegate.getValue<Int>(thisRef = null, property = ::test7)
   }
 
 var test8: Int /* by */ 
   field = hashMapOf<String, Int>()
   get(): Int {
-    return getValue<Int, Int>($receiver = #test8$delegate, thisRef = null, property = ::test8)
+    return #test8$delegate.getValue<Int, Int>(thisRef = null, property = ::test8)
   }
   set(<set-?>: Int) {
-    return setValue<Int>($receiver = #test8$delegate, thisRef = null, property = ::test8, value = <set-?>)
+    return #test8$delegate.setValue<Int>(thisRef = null, property = ::test8, value = <set-?>)
   }
 

compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.kt.txt

@@ -23,15 +23,15 @@ operator fun String.getValue(receiver: Any?, p: Any): String {
 }
 
 val testO: String /* by */ 
-  field = provideDelegate($receiver = TODO("IrConstructorCall"), host = null, p = ::testO)
+  field = TODO("IrConstructorCall").provideDelegate(host = null, p = ::testO)
   get(): String {
-    return getValue($receiver = #testO$delegate, receiver = null, p = ::testO)
+    return #testO$delegate.getValue(receiver = null, p = ::testO)
   }
 
 val testK: String /* by */ 
   field = "K"
   get(): String {
-    return getValue($receiver = #testK$delegate, receiver = null, p = ::testK)
+    return #testK$delegate.getValue(receiver = null, p = ::testK)
   }
 
 val testOK: String

compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.kt.txt

@@ -24,16 +24,16 @@ operator fun String.getValue(receiver: Any?, p: Any): String {
 
 fun box(): String {
   val testO: String
-    val testO$delegate: String = provideDelegate($receiver = TODO("IrConstructorCall"), host = null, p = ::testO)
+    val testO$delegate: String = TODO("IrConstructorCall").provideDelegate(host = null, p = ::testO)
     local get(): String {
-      return getValue($receiver = testO$delegate, receiver = null, p = ::testO)
+      return testO$delegate.getValue(receiver = null, p = ::testO)
     }
 
 
   val testK: String
     val testK$delegate: String = "K"
     local get(): String {
-      return getValue($receiver = testK$delegate, receiver = null, p = ::testK)
+      return testK$delegate.getValue(receiver = null, p = ::testK)
     }
 
 

compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.kt.txt

@@ -30,13 +30,13 @@ object Host {
   }
 
   val String.plusK: String /* by */ 
-    field = <this>.provideDelegate($receiver = "K", host = <this>, p = ::plusK)
+    field = (<this>, "K").provideDelegate(host = <this>, p = ::plusK)
     get(): String {
       return #plusK$delegate.getValue(receiver = <this>, p = ::plusK)
     }
 
   val ok: String
-    field = <this>.<get-plusK>($receiver = "O")
+    field = (<this>, "O").<get-plusK>()
     get
 
 

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

@@ -7,6 +7,6 @@ fun foo(arg: Number) {
 
 fun main(args: Array<String>) {
   val x: Int = 0
-  foo(arg = convert<Number>($receiver = x))
+  foo(arg = x.convert<Number>())
 }
 

compiler/testData/ir/irText/expressions/arrayAugmentedAssignment2.kt.txt

@@ -16,7 +16,7 @@ fun IB.test(a: IA) {
   { // BLOCK
     val tmp0_array: IA = a
     val tmp1_index0: String = ""
-    <this>.set($receiver = tmp0_array, index = tmp1_index0, value = tmp0_array.get(index = tmp1_index0).plus(other = 42))
+    (<this>, tmp0_array).set(index = tmp1_index0, value = tmp0_array.get(index = tmp1_index0).plus(other = 42))
   }
 }