[IR] update testdata: super and receiver for field accesses

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

@@ -42,86 +42,86 @@ data class Test1 {
     get
 
   operator fun component1(): Array<String> {
-    return #stringArray
+    return <this>.#stringArray
   }
 
   operator fun component2(): CharArray {
-    return #charArray
+    return <this>.#charArray
   }
 
   operator fun component3(): BooleanArray {
-    return #booleanArray
+    return <this>.#booleanArray
   }
 
   operator fun component4(): ByteArray {
-    return #byteArray
+    return <this>.#byteArray
   }
 
   operator fun component5(): ShortArray {
-    return #shortArray
+    return <this>.#shortArray
   }
 
   operator fun component6(): IntArray {
-    return #intArray
+    return <this>.#intArray
   }
 
   operator fun component7(): LongArray {
-    return #longArray
+    return <this>.#longArray
   }
 
   operator fun component8(): FloatArray {
-    return #floatArray
+    return <this>.#floatArray
   }
 
   operator fun component9(): DoubleArray {
-    return #doubleArray
+    return <this>.#doubleArray
   }
 
-  fun copy(stringArray: Array<String> = #stringArray, charArray: CharArray = #charArray, booleanArray: BooleanArray = #booleanArray, byteArray: ByteArray = #byteArray, shortArray: ShortArray = #shortArray, intArray: IntArray = #intArray, longArray: LongArray = #longArray, floatArray: FloatArray = #floatArray, doubleArray: DoubleArray = #doubleArray): Test1 {
+  fun copy(stringArray: Array<String> = <this>.#stringArray, charArray: CharArray = <this>.#charArray, booleanArray: BooleanArray = <this>.#booleanArray, byteArray: ByteArray = <this>.#byteArray, shortArray: ShortArray = <this>.#shortArray, intArray: IntArray = <this>.#intArray, longArray: LongArray = <this>.#longArray, floatArray: FloatArray = <this>.#floatArray, doubleArray: DoubleArray = <this>.#doubleArray): Test1 {
     return Test1(stringArray = stringArray, charArray = charArray, booleanArray = booleanArray, byteArray = byteArray, shortArray = shortArray, intArray = intArray, longArray = longArray, floatArray = floatArray, doubleArray = doubleArray)
   }
 
   override fun toString(): String {
     return "Test1(" + 
 "stringArray=" + 
-dataClassArrayMemberToString(arg0 = #stringArray) + 
+dataClassArrayMemberToString(arg0 = <this>.#stringArray) + 
 ", " + 
 "charArray=" + 
-dataClassArrayMemberToString(arg0 = #charArray) + 
+dataClassArrayMemberToString(arg0 = <this>.#charArray) + 
 ", " + 
 "booleanArray=" + 
-dataClassArrayMemberToString(arg0 = #booleanArray) + 
+dataClassArrayMemberToString(arg0 = <this>.#booleanArray) + 
 ", " + 
 "byteArray=" + 
-dataClassArrayMemberToString(arg0 = #byteArray) + 
+dataClassArrayMemberToString(arg0 = <this>.#byteArray) + 
 ", " + 
 "shortArray=" + 
-dataClassArrayMemberToString(arg0 = #shortArray) + 
+dataClassArrayMemberToString(arg0 = <this>.#shortArray) + 
 ", " + 
 "intArray=" + 
-dataClassArrayMemberToString(arg0 = #intArray) + 
+dataClassArrayMemberToString(arg0 = <this>.#intArray) + 
 ", " + 
 "longArray=" + 
-dataClassArrayMemberToString(arg0 = #longArray) + 
+dataClassArrayMemberToString(arg0 = <this>.#longArray) + 
 ", " + 
 "floatArray=" + 
-dataClassArrayMemberToString(arg0 = #floatArray) + 
+dataClassArrayMemberToString(arg0 = <this>.#floatArray) + 
 ", " + 
 "doubleArray=" + 
-dataClassArrayMemberToString(arg0 = #doubleArray) + 
+dataClassArrayMemberToString(arg0 = <this>.#doubleArray) + 
 ")"
   }
 
   override fun hashCode(): Int {
-    var result: Int = dataClassArrayMemberHashCode(arg0 = #stringArray)
+    var result: Int = dataClassArrayMemberHashCode(arg0 = <this>.#stringArray)
-    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = #charArray))
+    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = <this>.#charArray))
-    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = #booleanArray))
+    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = <this>.#booleanArray))
-    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = #byteArray))
+    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = <this>.#byteArray))
-    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = #shortArray))
+    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = <this>.#shortArray))
-    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = #intArray))
+    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = <this>.#intArray))
-    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = #longArray))
+    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = <this>.#longArray))
-    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = #floatArray))
+    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = <this>.#floatArray))
-    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = #doubleArray))
+    result = result.times(other = 31).plus(other = dataClassArrayMemberHashCode(arg0 = <this>.#doubleArray))
     return result
   }
 
@@ -134,31 +134,31 @@ dataClassArrayMemberToString(arg0 = #doubleArray) +
     }
     val tmp0_other_with_cast: Test1 = other as Test1
     when {
-      EQEQ(arg0 = #stringArray, arg1 = #stringArray).not() -> return false
+      EQEQ(arg0 = <this>.#stringArray, arg1 = tmp0_other_with_cast.#stringArray).not() -> return false
     }
     when {
-      EQEQ(arg0 = #charArray, arg1 = #charArray).not() -> return false
+      EQEQ(arg0 = <this>.#charArray, arg1 = tmp0_other_with_cast.#charArray).not() -> return false
     }
     when {
-      EQEQ(arg0 = #booleanArray, arg1 = #booleanArray).not() -> return false
+      EQEQ(arg0 = <this>.#booleanArray, arg1 = tmp0_other_with_cast.#booleanArray).not() -> return false
     }
     when {
-      EQEQ(arg0 = #byteArray, arg1 = #byteArray).not() -> return false
+      EQEQ(arg0 = <this>.#byteArray, arg1 = tmp0_other_with_cast.#byteArray).not() -> return false
     }
     when {
-      EQEQ(arg0 = #shortArray, arg1 = #shortArray).not() -> return false
+      EQEQ(arg0 = <this>.#shortArray, arg1 = tmp0_other_with_cast.#shortArray).not() -> return false
     }
     when {
-      EQEQ(arg0 = #intArray, arg1 = #intArray).not() -> return false
+      EQEQ(arg0 = <this>.#intArray, arg1 = tmp0_other_with_cast.#intArray).not() -> return false
     }
     when {
-      EQEQ(arg0 = #longArray, arg1 = #longArray).not() -> return false
+      EQEQ(arg0 = <this>.#longArray, arg1 = tmp0_other_with_cast.#longArray).not() -> return false
     }
     when {
-      EQEQ(arg0 = #floatArray, arg1 = #floatArray).not() -> return false
+      EQEQ(arg0 = <this>.#floatArray, arg1 = tmp0_other_with_cast.#floatArray).not() -> return false
     }
     when {
-      EQEQ(arg0 = #doubleArray, arg1 = #doubleArray).not() -> return false
+      EQEQ(arg0 = <this>.#doubleArray, arg1 = tmp0_other_with_cast.#doubleArray).not() -> return false
     }
     return true
   }
@@ -177,22 +177,22 @@ data class Test2<T : Any?> {
     get
 
   operator fun component1(): Array<T> {
-    return #genericArray
+    return <this>.#genericArray
   }
 
-  fun copy(genericArray: Array<T> = #genericArray): Test2<T> {
+  fun copy(genericArray: Array<T> = <this>.#genericArray): Test2<T> {
     return Test2<T>(genericArray = genericArray)
   }
 
   override fun toString(): String {
     return "Test2(" + 
 "genericArray=" + 
-dataClassArrayMemberToString(arg0 = #genericArray) + 
+dataClassArrayMemberToString(arg0 = <this>.#genericArray) + 
 ")"
   }
 
   override fun hashCode(): Int {
-    return dataClassArrayMemberHashCode(arg0 = #genericArray)
+    return dataClassArrayMemberHashCode(arg0 = <this>.#genericArray)
   }
 
   override operator fun equals(other: Any?): Boolean {
@@ -204,7 +204,7 @@ dataClassArrayMemberToString(arg0 = #genericArray) +
     }
     val tmp0_other_with_cast: Test2<T> = other as Test2<T>
     when {
-      EQEQ(arg0 = #genericArray, arg1 = #genericArray).not() -> return false
+      EQEQ(arg0 = <this>.#genericArray, arg1 = tmp0_other_with_cast.#genericArray).not() -> return false
     }
     return true
   }
@@ -223,24 +223,24 @@ data class Test3 {
     get
 
   operator fun component1(): Array<Any>? {
-    return #anyArrayN
+    return <this>.#anyArrayN
   }
 
-  fun copy(anyArrayN: Array<Any>? = #anyArrayN): Test3 {
+  fun copy(anyArrayN: Array<Any>? = <this>.#anyArrayN): Test3 {
     return Test3(anyArrayN = anyArrayN)
   }
 
   override fun toString(): String {
     return "Test3(" + 
 "anyArrayN=" + 
-dataClassArrayMemberToString(arg0 = #anyArrayN) + 
+dataClassArrayMemberToString(arg0 = <this>.#anyArrayN) + 
 ")"
   }
 
   override fun hashCode(): Int {
     return when {
-      EQEQ(arg0 = #anyArrayN, arg1 = null) -> 0
+      EQEQ(arg0 = <this>.#anyArrayN, arg1 = null) -> 0
-      true -> dataClassArrayMemberHashCode(arg0 = #anyArrayN)
+      true -> dataClassArrayMemberHashCode(arg0 = <this>.#anyArrayN)
     }
   }
 
@@ -253,7 +253,7 @@ dataClassArrayMemberToString(arg0 = #anyArrayN) +
     }
     val tmp0_other_with_cast: Test3 = other as Test3
     when {
-      EQEQ(arg0 = #anyArrayN, arg1 = #anyArrayN).not() -> return false
+      EQEQ(arg0 = <this>.#anyArrayN, arg1 = tmp0_other_with_cast.#anyArrayN).not() -> return false
     }
     return true
   }

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

@@ -18,38 +18,38 @@ data class Test1 {
     get
 
   operator fun component1(): Int {
-    return #x
+    return <this>.#x
   }
 
   operator fun component2(): String {
-    return #y
+    return <this>.#y
   }
 
   operator fun component3(): Any {
-    return #z
+    return <this>.#z
   }
 
-  fun copy(x: Int = #x, y: String = #y, z: Any = #z): Test1 {
+  fun copy(x: Int = <this>.#x, y: String = <this>.#y, z: Any = <this>.#z): Test1 {
     return Test1(x = x, y = y, z = z)
   }
 
   override fun toString(): String {
     return "Test1(" + 
 "x=" + 
-#x + 
+<this>.#x + 
 ", " + 
 "y=" + 
-#y + 
+<this>.#y + 
 ", " + 
 "z=" + 
-#z + 
+<this>.#z + 
 ")"
   }
 
   override fun hashCode(): Int {
-    var result: Int = #x.hashCode()
+    var result: Int = <this>.#x.hashCode()
-    result = result.times(other = 31).plus(other = #y.hashCode())
+    result = result.times(other = 31).plus(other = <this>.#y.hashCode())
-    result = result.times(other = 31).plus(other = #z.hashCode())
+    result = result.times(other = 31).plus(other = <this>.#z.hashCode())
     return result
   }
 
@@ -62,13 +62,13 @@ data class Test1 {
     }
     val tmp0_other_with_cast: Test1 = other as Test1
     when {
-      EQEQ(arg0 = #x, arg1 = #x).not() -> return false
+      EQEQ(arg0 = <this>.#x, arg1 = tmp0_other_with_cast.#x).not() -> return false
     }
     when {
-      EQEQ(arg0 = #y, arg1 = #y).not() -> return false
+      EQEQ(arg0 = <this>.#y, arg1 = tmp0_other_with_cast.#y).not() -> return false
     }
     when {
-      EQEQ(arg0 = #z, arg1 = #z).not() -> return false
+      EQEQ(arg0 = <this>.#z, arg1 = tmp0_other_with_cast.#z).not() -> return false
     }
     return true
   }
@@ -87,24 +87,24 @@ data class Test2 {
     get
 
   operator fun component1(): Any? {
-    return #x
+    return <this>.#x
   }
 
-  fun copy(x: Any? = #x): Test2 {
+  fun copy(x: Any? = <this>.#x): Test2 {
     return Test2(x = x)
   }
 
   override fun toString(): String {
     return "Test2(" + 
 "x=" + 
-#x + 
+<this>.#x + 
 ")"
   }
 
   override fun hashCode(): Int {
     return when {
-      EQEQ(arg0 = #x, arg1 = null) -> 0
+      EQEQ(arg0 = <this>.#x, arg1 = null) -> 0
-      true -> #x.hashCode()
+      true -> <this>.#x.hashCode()
     }
   }
 
@@ -117,7 +117,7 @@ data class Test2 {
     }
     val tmp0_other_with_cast: Test2 = other as Test2
     when {
-      EQEQ(arg0 = #x, arg1 = #x).not() -> return false
+      EQEQ(arg0 = <this>.#x, arg1 = tmp0_other_with_cast.#x).not() -> return false
     }
     return true
   }
@@ -148,51 +148,51 @@ data class Test3 {
     get
 
   operator fun component1(): Double {
-    return #d
+    return <this>.#d
   }
 
   operator fun component2(): Double? {
-    return #dn
+    return <this>.#dn
   }
 
   operator fun component3(): Float {
-    return #f
+    return <this>.#f
   }
 
   operator fun component4(): Float? {
-    return #df
+    return <this>.#df
   }
 
-  fun copy(d: Double = #d, dn: Double? = #dn, f: Float = #f, df: Float? = #df): Test3 {
+  fun copy(d: Double = <this>.#d, dn: Double? = <this>.#dn, f: Float = <this>.#f, df: Float? = <this>.#df): Test3 {
     return Test3(d = d, dn = dn, f = f, df = df)
   }
 
   override fun toString(): String {
     return "Test3(" + 
 "d=" + 
-#d + 
+<this>.#d + 
 ", " + 
 "dn=" + 
-#dn + 
+<this>.#dn + 
 ", " + 
 "f=" + 
-#f + 
+<this>.#f + 
 ", " + 
 "df=" + 
-#df + 
+<this>.#df + 
 ")"
   }
 
   override fun hashCode(): Int {
-    var result: Int = #d.hashCode()
+    var result: Int = <this>.#d.hashCode()
     result = result.times(other = 31).plus(other = when {
-      EQEQ(arg0 = #dn, arg1 = null) -> 0
+      EQEQ(arg0 = <this>.#dn, arg1 = null) -> 0
-      true -> #dn.hashCode()
+      true -> <this>.#dn.hashCode()
     })
-    result = result.times(other = 31).plus(other = #f.hashCode())
+    result = result.times(other = 31).plus(other = <this>.#f.hashCode())
     result = result.times(other = 31).plus(other = when {
-      EQEQ(arg0 = #df, arg1 = null) -> 0
+      EQEQ(arg0 = <this>.#df, arg1 = null) -> 0
-      true -> #df.hashCode()
+      true -> <this>.#df.hashCode()
     })
     return result
   }
@@ -206,16 +206,16 @@ data class Test3 {
     }
     val tmp0_other_with_cast: Test3 = other as Test3
     when {
-      EQEQ(arg0 = #d, arg1 = #d).not() -> return false
+      EQEQ(arg0 = <this>.#d, arg1 = tmp0_other_with_cast.#d).not() -> return false
     }
     when {
-      EQEQ(arg0 = #dn, arg1 = #dn).not() -> return false
+      EQEQ(arg0 = <this>.#dn, arg1 = tmp0_other_with_cast.#dn).not() -> return false
     }
     when {
-      EQEQ(arg0 = #f, arg1 = #f).not() -> return false
+      EQEQ(arg0 = <this>.#f, arg1 = tmp0_other_with_cast.#f).not() -> return false
     }
     when {
-      EQEQ(arg0 = #df, arg1 = #df).not() -> return false
+      EQEQ(arg0 = <this>.#df, arg1 = tmp0_other_with_cast.#df).not() -> return false
     }
     return true
   }

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

@@ -10,24 +10,24 @@ data class Test1<T : Any?> {
     get
 
   operator fun component1(): T {
-    return #x
+    return <this>.#x
   }
 
-  fun copy(x: T = #x): Test1<T> {
+  fun copy(x: T = <this>.#x): Test1<T> {
     return Test1<T>(x = x)
   }
 
   override fun toString(): String {
     return "Test1(" + 
 "x=" + 
-#x + 
+<this>.#x + 
 ")"
   }
 
   override fun hashCode(): Int {
     return when {
-      EQEQ(arg0 = #x, arg1 = null) -> 0
+      EQEQ(arg0 = <this>.#x, arg1 = null) -> 0
-      true -> #x.hashCode()
+      true -> <this>.#x.hashCode()
     }
   }
 
@@ -40,7 +40,7 @@ data class Test1<T : Any?> {
     }
     val tmp0_other_with_cast: Test1<T> = other as Test1<T>
     when {
-      EQEQ(arg0 = #x, arg1 = #x).not() -> return false
+      EQEQ(arg0 = <this>.#x, arg1 = tmp0_other_with_cast.#x).not() -> return false
     }
     return true
   }
@@ -59,22 +59,22 @@ data class Test2<T : Number> {
     get
 
   operator fun component1(): T {
-    return #x
+    return <this>.#x
   }
 
-  fun copy(x: T = #x): Test2<T> {
+  fun copy(x: T = <this>.#x): Test2<T> {
     return Test2<T>(x = x)
   }
 
   override fun toString(): String {
     return "Test2(" + 
 "x=" + 
-#x + 
+<this>.#x + 
 ")"
   }
 
   override fun hashCode(): Int {
-    return #x.hashCode()
+    return <this>.#x.hashCode()
   }
 
   override operator fun equals(other: Any?): Boolean {
@@ -86,7 +86,7 @@ data class Test2<T : Number> {
     }
     val tmp0_other_with_cast: Test2<T> = other as Test2<T>
     when {
-      EQEQ(arg0 = #x, arg1 = #x).not() -> return false
+      EQEQ(arg0 = <this>.#x, arg1 = tmp0_other_with_cast.#x).not() -> return false
     }
     return true
   }
@@ -105,22 +105,22 @@ data class Test3<T : Any?> {
     get
 
   operator fun component1(): List<T> {
-    return #x
+    return <this>.#x
   }
 
-  fun copy(x: List<T> = #x): Test3<T> {
+  fun copy(x: List<T> = <this>.#x): Test3<T> {
     return Test3<T>(x = x)
   }
 
   override fun toString(): String {
     return "Test3(" + 
 "x=" + 
-#x + 
+<this>.#x + 
 ")"
   }
 
   override fun hashCode(): Int {
-    return #x.hashCode()
+    return <this>.#x.hashCode()
   }
 
   override operator fun equals(other: Any?): Boolean {
@@ -132,7 +132,7 @@ data class Test3<T : Any?> {
     }
     val tmp0_other_with_cast: Test3<T> = other as Test3<T>
     when {
-      EQEQ(arg0 = #x, arg1 = #x).not() -> return false
+      EQEQ(arg0 = <this>.#x, arg1 = tmp0_other_with_cast.#x).not() -> return false
     }
     return true
   }
@@ -151,22 +151,22 @@ data class Test4 {
     get
 
   operator fun component1(): List<String> {
-    return #x
+    return <this>.#x
   }
 
-  fun copy(x: List<String> = #x): Test4 {
+  fun copy(x: List<String> = <this>.#x): Test4 {
     return Test4(x = x)
   }
 
   override fun toString(): String {
     return "Test4(" + 
 "x=" + 
-#x + 
+<this>.#x + 
 ")"
   }
 
   override fun hashCode(): Int {
-    return #x.hashCode()
+    return <this>.#x.hashCode()
   }
 
   override operator fun equals(other: Any?): Boolean {
@@ -178,7 +178,7 @@ data class Test4 {
     }
     val tmp0_other_with_cast: Test4 = other as Test4
     when {
-      EQEQ(arg0 = #x, arg1 = #x).not() -> return false
+      EQEQ(arg0 = <this>.#x, arg1 = tmp0_other_with_cast.#x).not() -> return false
     }
     return true
   }

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

@@ -18,20 +18,20 @@ class Test1<E : Any?> : IBase<E> {
 
   private /*final field*/ val $$delegate_0: IBase<E> = i
   override fun <B : Any?> foo(a: E, b: B) {
-    #$$delegate_0.foo<B>(a = a, b = b)
+    <this>.#$$delegate_0.foo<B>(a = a, b = b)
   }
 
   override val <C : Any?> C.id: Map<E, C>?
     override get(): Map<E, C>? {
-      return (#$$delegate_0, <this>).<get-id><C>()
+      return (<this>.#$$delegate_0, <this>).<get-id><C>()
     }
 
   override var <D : Any?> List<D>.x: D?
     override get(): D? {
-      return (#$$delegate_0, <this>).<get-x><D>()
+      return (<this>.#$$delegate_0, <this>).<get-x><D>()
     }
     override set(<set-?>: D?) {
-      (#$$delegate_0, <this>).<set-x><D>(<set-?> = <set-?>)
+      (<this>.#$$delegate_0, <this>).<set-x><D>(<set-?> = <set-?>)
     }
 
 }
@@ -50,20 +50,20 @@ class Test2 : IBase<String> {
 
   private /*final field*/ val $$delegate_0: IBase<String> = j
   override fun <B : Any?> foo(a: String, b: B) {
-    #$$delegate_0.foo<B>(a = a, b = b)
+    <this>.#$$delegate_0.foo<B>(a = a, b = b)
   }
 
   override val <C : Any?> C.id: Map<String, C>?
     override get(): Map<String, C>? {
-      return (#$$delegate_0, <this>).<get-id><C>()
+      return (<this>.#$$delegate_0, <this>).<get-id><C>()
     }
 
   override var <D : Any?> List<D>.x: D?
     override get(): D? {
-      return (#$$delegate_0, <this>).<get-x><D>()
+      return (<this>.#$$delegate_0, <this>).<get-x><D>()
     }
     override set(<set-?>: D?) {
-      (#$$delegate_0, <this>).<set-x><D>(<set-?> = <set-?>)
+      (<this>.#$$delegate_0, <this>).<set-x><D>(<set-?> = <set-?>)
     }
 
 }

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

@@ -86,15 +86,15 @@ class Test1 : IBase {
 
   private /*final field*/ val $$delegate_0: BaseImpl = BaseImpl
   override fun bar(): Int {
-    return #$$delegate_0.bar()
+    return <this>.#$$delegate_0.bar()
   }
 
   override fun foo(x: Int, s: String) {
-    #$$delegate_0.foo(x = x, s = s)
+    <this>.#$$delegate_0.foo(x = x, s = s)
   }
 
   override fun String.qux() {
-    (#$$delegate_0, <this>).qux()
+    (<this>.#$$delegate_0, <this>).qux()
   }
 
 }
@@ -108,42 +108,42 @@ class Test2 : IBase, IOther {
 
   private /*final field*/ val $$delegate_0: BaseImpl = BaseImpl
   override fun bar(): Int {
-    return #$$delegate_0.bar()
+    return <this>.#$$delegate_0.bar()
   }
 
   override fun foo(x: Int, s: String) {
-    #$$delegate_0.foo(x = x, s = s)
+    <this>.#$$delegate_0.foo(x = x, s = s)
   }
 
   override fun String.qux() {
-    (#$$delegate_0, <this>).qux()
+    (<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, <this>).<get-z1>()
+      return (<this>.#$$delegate_1, <this>).<get-z1>()
     }
 
   override val x: String
     override get(): String {
-      return #$$delegate_1.<get-x>()
+      return <this>.#$$delegate_1.<get-x>()
     }
 
   override var Byte.z2: Int
     override get(): Int {
-      return (#$$delegate_1, <this>).<get-z2>()
+      return (<this>.#$$delegate_1, <this>).<get-z2>()
     }
     override set(<set-?>: Int) {
-      (#$$delegate_1, <this>).<set-z2>(<set-?> = <set-?>)
+      (<this>.#$$delegate_1, <this>).<set-z2>(<set-?> = <set-?>)
     }
 
   override var y: Int
     override get(): Int {
-      return #$$delegate_1.<get-y>()
+      return <this>.#$$delegate_1.<get-y>()
     }
     override set(<set-?>: Int) {
-      #$$delegate_1.<set-y>(<set-?> = <set-?>)
+      <this>.#$$delegate_1.<set-y>(<set-?> = <set-?>)
     }
 
 }

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

@@ -11,28 +11,28 @@ class Test : J {
 
   @NotNull()
   override fun returnNotNull(): @EnhancedNullability String {
-    return #j.returnNotNull()
+    return <this>.#j.returnNotNull()
   }
 
   @Nullable()
   override fun returnNullable(): @EnhancedNullability String? {
-    return #j.returnNullable()
+    return <this>.#j.returnNullable()
   }
 
   override fun returnsFlexible(): @FlexibleNullability String? {
-    return #j.returnsFlexible()
+    return <this>.#j.returnsFlexible()
   }
 
   override fun takeFlexible(x: @FlexibleNullability String?) {
-    #j.takeFlexible(x = x)
+    <this>.#j.takeFlexible(x = x)
   }
 
   override fun takeNotNull(x: @EnhancedNullability String) {
-    #j.takeNotNull(x = x)
+    <this>.#j.takeNotNull(x = x)
   }
 
   override fun takeNullable(x: @EnhancedNullability String?) {
-    #j.takeNullable(x = x)
+    <this>.#j.takeNullable(x = x)
   }
 
 }

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

@@ -28,7 +28,7 @@ class C : IFooBar {
 
   private /*final field*/ val $$delegate_0: FooBarImpl = FooBarImpl
   override fun foo() {
-    #$$delegate_0.foo()
+    <this>.#$$delegate_0.foo()
   }
 
   override fun bar() {

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

@@ -104,7 +104,7 @@ abstract enum class TestEnum4 : Enum<TestEnum4> {
       get
 
     init {
-      #z = <this>.<get-x>()
+      <this>.#z = <this>.<get-x>()
     }
 
     override fun foo() {

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

@@ -33,14 +33,14 @@ open enum class A : Enum<A> {
     super/*Enum*/<A>()
     /* <init>() */
 
-    #prop1 = arg
+    <this>.#prop1 = arg
   }
 
   private constructor() {
     super/*Enum*/<A>()
     /* <init>() */
 
-    #prop1 = "default"
+    <this>.#prop1 = "default"
     <this>.<set-prop3>(<set-?> = "empty")
   }
 

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

@@ -56,7 +56,7 @@ class TestJFoo : IFoo {
 
   private /*final field*/ val $$delegate_0: JFoo = JFoo()
   override fun foo(): String {
-    return #$$delegate_0.foo() /*!! String */
+    return <this>.#$$delegate_0.foo() /*!! String */
   }
 
 }
@@ -70,7 +70,7 @@ class TestK1 : IFoo {
 
   private /*final field*/ val $$delegate_0: K1 = K1()
   override fun foo(): String {
-    return #$$delegate_0.foo() /*!! String */
+    return <this>.#$$delegate_0.foo() /*!! String */
   }
 
 }
@@ -84,7 +84,7 @@ class TestK2 : IFoo {
 
   private /*final field*/ val $$delegate_0: K2 = K2()
   override fun foo(): String {
-    return #$$delegate_0.foo()
+    return <this>.#$$delegate_0.foo()
   }
 
 }
@@ -98,7 +98,7 @@ class TestK3 : IFoo {
 
   private /*final field*/ val $$delegate_0: K3 = K3()
   override fun foo(): String {
-    return #$$delegate_0.foo()
+    return <this>.#$$delegate_0.foo()
   }
 
 }
@@ -112,7 +112,7 @@ class TestK4 : IFoo {
 
   private /*final field*/ val $$delegate_0: K4 = K4()
   override fun foo(): String {
-    return #$$delegate_0.foo() /*!! String */
+    return <this>.#$$delegate_0.foo() /*!! String */
   }
 
 }

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

@@ -35,7 +35,7 @@ class TestInitValInInitBlock {
     get
 
   init {
-    #x = 0
+    <this>.#x = 0
   }
 
 }

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

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

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

@@ -54,7 +54,7 @@ class TestInitVarWithCustomSetter {
     field = 0
     get
     set(value: Int) {
-      #x = value
+      <this>.#x = value
     }
 
 }
@@ -63,7 +63,7 @@ class TestInitVarWithCustomSetterWithExplicitCtor {
   var x: Int
     get
     set(value: Int) {
-      #x = value
+      <this>.#x = value
     }
 
   init {
@@ -82,7 +82,7 @@ class TestInitVarWithCustomSetterInCtor {
   var x: Int
     get
     set(value: Int) {
-      #x = value
+      <this>.#x = value
     }
 
   constructor() {

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

@@ -12,12 +12,12 @@ inline class Test {
   override fun toString(): String {
     return "Test(" + 
 "x=" + 
-#x + 
+<this>.#x + 
 ")"
   }
 
   override fun hashCode(): Int {
-    return #x.hashCode()
+    return <this>.#x.hashCode()
   }
 
   override operator fun equals(other: Any?): Boolean {
@@ -26,7 +26,7 @@ inline class Test {
     }
     val tmp0_other_with_cast: Test = other as Test
     when {
-      EQEQ(arg0 = #x, arg1 = #x).not() -> return false
+      EQEQ(arg0 = <this>.#x, arg1 = tmp0_other_with_cast.#x).not() -> return false
     }
     return true
   }

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

@@ -33,12 +33,12 @@ inline class IC<TT : Any?> {
   override fun toString(): String {
     return "IC(" + 
 "c=" + 
-#c + 
+<this>.#c + 
 ")"
   }
 
   override fun hashCode(): Int {
-    return #c.hashCode()
+    return <this>.#c.hashCode()
   }
 
   override operator fun equals(other: Any?): Boolean {
@@ -47,7 +47,7 @@ inline class IC<TT : Any?> {
     }
     val tmp0_other_with_cast: IC<TT> = other as IC<TT>
     when {
-      EQEQ(arg0 = #c, arg1 = #c).not() -> return false
+      EQEQ(arg0 = <this>.#c, arg1 = tmp0_other_with_cast.#c).not() -> return false
     }
     return true
   }

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

@@ -10,24 +10,24 @@ data class TestData {
     get
 
   operator fun component1(): Nothing? {
-    return #nn
+    return <this>.#nn
   }
 
-  fun copy(nn: Nothing? = #nn): TestData {
+  fun copy(nn: Nothing? = <this>.#nn): TestData {
     return TestData(nn = nn)
   }
 
   override fun toString(): String {
     return "TestData(" + 
 "nn=" + 
-#nn + 
+<this>.#nn + 
 ")"
   }
 
   override fun hashCode(): Int {
     return when {
-      EQEQ(arg0 = #nn, arg1 = null) -> 0
+      EQEQ(arg0 = <this>.#nn, arg1 = null) -> 0
-      true -> #nn.hashCode()
+      true -> <this>.#nn.hashCode()
     }
   }
 
@@ -40,7 +40,7 @@ data class TestData {
     }
     val tmp0_other_with_cast: TestData = other as TestData
     when {
-      EQEQ(arg0 = #nn, arg1 = #nn).not() -> return false
+      EQEQ(arg0 = <this>.#nn, arg1 = tmp0_other_with_cast.#nn).not() -> return false
     }
     return true
   }
@@ -61,14 +61,14 @@ inline class TestInline {
   override fun toString(): String {
     return "TestInline(" + 
 "nn=" + 
-#nn + 
+<this>.#nn + 
 ")"
   }
 
   override fun hashCode(): Int {
     return when {
-      EQEQ(arg0 = #nn, arg1 = null) -> 0
+      EQEQ(arg0 = <this>.#nn, arg1 = null) -> 0
-      true -> #nn.hashCode()
+      true -> <this>.#nn.hashCode()
     }
   }
 
@@ -78,7 +78,7 @@ inline class TestInline {
     }
     val tmp0_other_with_cast: TestInline = other as TestInline
     when {
-      EQEQ(arg0 = #nn, arg1 = #nn).not() -> return false
+      EQEQ(arg0 = <this>.#nn, arg1 = tmp0_other_with_cast.#nn).not() -> return false
     }
     return true
   }

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

@@ -13,22 +13,22 @@ data class A {
     get
 
   operator fun component1(): @ExtensionFunctionType Function2<A, String, Unit> {
-    return #runA
+    return <this>.#runA
   }
 
-  fun copy(runA: @ExtensionFunctionType Function2<A, String, Unit> = #runA): A {
+  fun copy(runA: @ExtensionFunctionType Function2<A, String, Unit> = <this>.#runA): A {
     return A(runA = runA)
   }
 
   override fun toString(): String {
     return "A(" + 
 "runA=" + 
-#runA + 
+<this>.#runA + 
 ")"
   }
 
   override fun hashCode(): Int {
-    return #runA.hashCode()
+    return <this>.#runA.hashCode()
   }
 
   override operator fun equals(other: Any?): Boolean {
@@ -40,7 +40,7 @@ data class A {
     }
     val tmp0_other_with_cast: A = other as A
     when {
-      EQEQ(arg0 = #runA, arg1 = #runA).not() -> return false
+      EQEQ(arg0 = <this>.#runA, arg1 = tmp0_other_with_cast.#runA).not() -> return false
     }
     return true
   }
@@ -70,22 +70,22 @@ data class B {
     get
 
   operator fun component1(): Any {
-    return #x
+    return <this>.#x
   }
 
-  fun copy(x: Any = #x): B {
+  fun copy(x: Any = <this>.#x): B {
     return B(x = x)
   }
 
   override fun toString(): String {
     return "B(" + 
 "x=" + 
-#x + 
+<this>.#x + 
 ")"
   }
 
   override fun hashCode(): Int {
-    return #x.hashCode()
+    return <this>.#x.hashCode()
   }
 
   override operator fun equals(other: Any?): Boolean {
@@ -97,7 +97,7 @@ data class B {
     }
     val tmp0_other_with_cast: B = other as B
     when {
-      EQEQ(arg0 = #x, arg1 = #x).not() -> return false
+      EQEQ(arg0 = <this>.#x, arg1 = tmp0_other_with_cast.#x).not() -> return false
     }
     return true
   }

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

@@ -22,7 +22,7 @@ object Test : Base {
     get
 
   init {
-    #y = <this>.<get-x>()
+    <this>.#y = <this>.<get-x>()
   }
 
 }

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

@@ -47,7 +47,7 @@ class Test3 {
     get
 
   init {
-    #x = x
+    <this>.#x = x
   }
 
 }

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

@@ -25,7 +25,7 @@ class TestInitBlock : Base {
     get
 
   init {
-    #x = 0
+    <this>.#x = 0
   }
 
   constructor() {

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

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

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

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

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

@@ -24,16 +24,16 @@ class C {
     }
 )
     get(): Int {
-      return #test2$delegate.getValue<Int>(thisRef = <this>, property = ::test2)
+      return <this>.#test2$delegate.getValue<Int>(thisRef = <this>, property = ::test2)
     }
 
   var test3: Any /* by */ 
     field = <this>.<get-map>()
     get(): Any {
-      return #test3$delegate.getValue<Any, Any>(thisRef = <this>, property = ::test3)
+      return <this>.#test3$delegate.getValue<Any, Any>(thisRef = <this>, property = ::test3)
     }
     set(<set-?>: Any) {
-      return #test3$delegate.setValue<Any>(thisRef = <this>, property = ::test3, value = <set-?>)
+      return <this>.#test3$delegate.setValue<Any>(thisRef = <this>, property = ::test3, value = <set-?>)
     }
 
 }

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

@@ -12,12 +12,12 @@ inline class IT {
   override fun toString(): String {
     return "IT(" + 
 "x=" + 
-#x + 
+<this>.#x + 
 ")"
   }
 
   override fun hashCode(): Int {
-    return #x.hashCode()
+    return <this>.#x.hashCode()
   }
 
   override operator fun equals(other: Any?): Boolean {
@@ -26,7 +26,7 @@ inline class IT {
     }
     val tmp0_other_with_cast: IT = other as IT
     when {
-      EQEQ(arg0 = #x, arg1 = #x).not() -> return false
+      EQEQ(arg0 = <this>.#x, arg1 = tmp0_other_with_cast.#x).not() -> return false
     }
     return true
   }
@@ -92,12 +92,12 @@ inline class InlineMutableSet : MutableSet<IT> {
   override fun toString(): String {
     return "InlineMutableSet(" + 
 "ms=" + 
-#ms + 
+<this>.#ms + 
 ")"
   }
 
   override fun hashCode(): Int {
-    return #ms.hashCode()
+    return <this>.#ms.hashCode()
   }
 
   override operator fun equals(other: Any?): Boolean {
@@ -106,7 +106,7 @@ inline class InlineMutableSet : MutableSet<IT> {
     }
     val tmp0_other_with_cast: InlineMutableSet = other as InlineMutableSet
     when {
-      EQEQ(arg0 = #ms, arg1 = #ms).not() -> return false
+      EQEQ(arg0 = <this>.#ms, arg1 = tmp0_other_with_cast.#ms).not() -> return false
     }
     return true
   }

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

@@ -12,7 +12,7 @@ object Definitions {
     get
 
   val ktValue: String
-    field = #CONSTANT
+    field = super.#CONSTANT
     get
 
 }

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

@@ -16,7 +16,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, <this>).<get-id><T>()
+      return (<this>.#$$delegate_0, <this>).<get-id><T>()
     }
 
 }

compiler/testData/ir/irText/declarations/parameters/dataClassMembers.kt.txt

@@ -14,33 +14,33 @@ data class Test<T : Any?> {
     get
 
   operator fun component1(): T {
-    return #x
+    return <this>.#x
   }
 
   operator fun component2(): String {
-    return #y
+    return <this>.#y
   }
 
-  fun copy(x: T = #x, y: String = #y): Test<T> {
+  fun copy(x: T = <this>.#x, y: String = <this>.#y): Test<T> {
     return Test<T>(x = x, y = y)
   }
 
   override fun toString(): String {
     return "Test(" + 
 "x=" + 
-#x + 
+<this>.#x + 
 ", " + 
 "y=" + 
-#y + 
+<this>.#y + 
 ")"
   }
 
   override fun hashCode(): Int {
     var result: Int = when {
-      EQEQ(arg0 = #x, arg1 = null) -> 0
+      EQEQ(arg0 = <this>.#x, arg1 = null) -> 0
-      true -> #x.hashCode()
+      true -> <this>.#x.hashCode()
     }
-    result = result.times(other = 31).plus(other = #y.hashCode())
+    result = result.times(other = 31).plus(other = <this>.#y.hashCode())
     return result
   }
 
@@ -53,10 +53,10 @@ data class Test<T : Any?> {
     }
     val tmp0_other_with_cast: Test<T> = other as Test<T>
     when {
-      EQEQ(arg0 = #x, arg1 = #x).not() -> return false
+      EQEQ(arg0 = <this>.#x, arg1 = tmp0_other_with_cast.#x).not() -> return false
     }
     when {
-      EQEQ(arg0 = #y, arg1 = #y).not() -> return false
+      EQEQ(arg0 = <this>.#y, arg1 = tmp0_other_with_cast.#y).not() -> return false
     }
     return true
   }

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

@@ -16,16 +16,16 @@ class Test<TT : Any?> : IBase<TT> {
 
   private /*final field*/ val $$delegate_0: IBase<TT> = impl
   override fun <X : Any?> qux(t: TT, x: X) {
-    #$$delegate_0.qux<X>(t = t, x = x)
+    <this>.#$$delegate_0.qux<X>(t = t, x = x)
   }
 
   override fun foo(x: Int) {
-    #$$delegate_0.foo(x = x)
+    <this>.#$$delegate_0.foo(x = x)
   }
 
   override val bar: Int
     override get(): Int {
-      return #$$delegate_0.<get-bar>()
+      return <this>.#$$delegate_0.<get-bar>()
     }
 
 }

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

@@ -42,7 +42,7 @@ class Host {
   val testMember: String /* by */ 
     field = DelegateProvider(value = "OK").provideDelegate(thisRef = <this>, property = ::testMember)
     get(): String {
-      return #testMember$delegate.getValue(thisRef = <this>, property = ::testMember)
+      return <this>.#testMember$delegate.getValue(thisRef = <this>, property = ::testMember)
     }
 
 }

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

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

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

@@ -11,14 +11,14 @@ fun test2(mc: MutableCollection<String>) {
 
 fun test3() {
   { // BLOCK
-    val tmp0_safe_receiver: @FlexibleNullability PrintStream? = #out
+    val tmp0_safe_receiver: @FlexibleNullability PrintStream? = super.#out
     when {
       EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
       true -> tmp0_safe_receiver /*!! PrintStream */.println(p0 = "Hello,")
     }
   } /*~> Unit */
   { // BLOCK
-    val tmp1_safe_receiver: @FlexibleNullability PrintStream? = #out
+    val tmp1_safe_receiver: @FlexibleNullability PrintStream? = super.#out
     when {
       EQEQ(arg0 = tmp1_safe_receiver, arg1 = null) -> null
       true -> tmp1_safe_receiver /*!! PrintStream */.println(p0 = "world!")

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

@@ -7,10 +7,10 @@ fun testEquals(a: Int, b: Int): Boolean {
 }
 
 fun testJEqeqNull(): Boolean {
-  return EQEQ(arg0 = #INT_NULL, arg1 = null)
+  return EQEQ(arg0 = super.#INT_NULL, arg1 = null)
 }
 
 fun testJEqualsNull(): Boolean {
-  return #INT_NULL /*!! Int */.equals(other = null)
+  return super.#INT_NULL /*!! Int */.equals(other = null)
 }
 

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

@@ -54,15 +54,15 @@ fun test(b: Boolean) {
     b -> d1
     true -> d2
   }
-  #f = 42
+  k /*as JFieldOwner */super.#f = 42
-  #f /*~> Unit */
+  k /*as JFieldOwner */super.#f /*~> Unit */
   val md1: DerivedThroughMid1 = DerivedThroughMid1()
   val md2: DerivedThroughMid2 = DerivedThroughMid2()
   val mk: Any = when {
     b -> md1
     true -> md2
   }
-  #f = 44
+  mk /*as Mid */super.#f = 44
-  #f /*~> Unit */
+  mk /*as Mid */super.#f /*~> Unit */
 }
 

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

@@ -6,15 +6,15 @@ class Derived : Base {
   }
 
   init {
-    #value = 0
+    <this>super.#value = 0
   }
 
   fun getValue(): Int {
-    return #value
+    return <this>super.#value
   }
 
   fun setValue(value: Int) {
-    #value = value
+    <this>super.#value = value
   }
 
 }

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

@@ -1,14 +1,14 @@
 fun testFun() {
-  #out /*!! PrintStream */.println(p0 = "testFun")
+  super.#out /*!! PrintStream */.println(p0 = "testFun")
 }
 
 var testProp: Any
   get(): Any {
-    #out /*!! PrintStream */.println(p0 = "testProp/get")
+    super.#out /*!! PrintStream */.println(p0 = "testProp/get")
     return 42
   }
   set(value: Any) {
-    #out /*!! PrintStream */.println(p0 = "testProp/set")
+    super.#out /*!! PrintStream */.println(p0 = "testProp/set")
   }
 
 class TestClass {
@@ -21,14 +21,14 @@ class TestClass {
   val test: Int
     field = when {
       true -> { // BLOCK
-        #out /*!! PrintStream */.println(p0 = "TestClass/test")
+        super.#out /*!! PrintStream */.println(p0 = "TestClass/test")
         42
       }
     }
     get
 
   init {
-    #out /*!! PrintStream */.println(p0 = "TestClass/init")
+    super.#out /*!! PrintStream */.println(p0 = "TestClass/init")
   }
 
 }

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

@@ -53,7 +53,7 @@ class Test2 : J {
   }
 
   init {
-    #field = 42
+    <this>super.#field = 42
   }
 
 }

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

@@ -14,7 +14,7 @@ class A {
 
   init {
     a().apply<String>(block = local fun String.<anonymous>() {
-      #b = <this>
+      <this>.#b = <this>
     }
 ) /*~> Unit */
   }

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

@@ -8,7 +8,7 @@ class Derived : Base {
   fun setValue(v: Any) {
     when {
       v is String -> { // BLOCK
-        #value = v /*as String */
+        <this>super.#value = v /*as String */
       }
     }
   }

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

@@ -9,7 +9,7 @@ class C {
     get
 
   init {
-    #s = { // BLOCK
+    <this>.#s = { // BLOCK
       val tmp0_safe_receiver: Any? = x
       when {
         EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null

compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.kt.txt

@@ -7,48 +7,48 @@ class Impl : A, B {
 
   private /*final field*/ val $$delegate_0: B = b
   override fun add(element: @FlexibleNullability String?): Boolean {
-    return #$$delegate_0.add(element = element)
+    return <this>.#$$delegate_0.add(element = element)
   }
 
   override fun addAll(elements: Collection<@FlexibleNullability String?>): Boolean {
-    return #$$delegate_0.addAll(elements = elements)
+    return <this>.#$$delegate_0.addAll(elements = elements)
   }
 
   override fun clear() {
-    #$$delegate_0.clear()
+    <this>.#$$delegate_0.clear()
   }
 
   override operator fun contains(element: @FlexibleNullability String?): Boolean {
-    return #$$delegate_0.contains(element = element)
+    return <this>.#$$delegate_0.contains(element = element)
   }
 
   override fun containsAll(elements: Collection<@FlexibleNullability String?>): Boolean {
-    return #$$delegate_0.containsAll(elements = elements)
+    return <this>.#$$delegate_0.containsAll(elements = elements)
   }
 
   override fun isEmpty(): Boolean {
-    return #$$delegate_0.isEmpty()
+    return <this>.#$$delegate_0.isEmpty()
   }
 
   override operator fun iterator(): MutableIterator<@FlexibleNullability String?> {
-    return #$$delegate_0.iterator()
+    return <this>.#$$delegate_0.iterator()
   }
 
   override fun remove(element: @FlexibleNullability String?): Boolean {
-    return #$$delegate_0.remove(element = element)
+    return <this>.#$$delegate_0.remove(element = element)
   }
 
   override fun removeAll(elements: Collection<@FlexibleNullability String?>): Boolean {
-    return #$$delegate_0.removeAll(elements = elements)
+    return <this>.#$$delegate_0.removeAll(elements = elements)
   }
 
   override fun retainAll(elements: Collection<@FlexibleNullability String?>): Boolean {
-    return #$$delegate_0.retainAll(elements = elements)
+    return <this>.#$$delegate_0.retainAll(elements = elements)
   }
 
   override val size: Int
     override get(): Int {
-      return #$$delegate_0.<get-size>()
+      return <this>.#$$delegate_0.<get-size>()
     }
 
 }

compiler/testData/ir/irText/firProblems/MultiList.kt.txt

@@ -10,24 +10,24 @@ data class Some<T : Any?> {
     get
 
   operator fun component1(): T {
-    return #value
+    return <this>.#value
   }
 
-  fun copy(value: T = #value): Some<T> {
+  fun copy(value: T = <this>.#value): Some<T> {
     return Some<T>(value = value)
   }
 
   override fun toString(): String {
     return "Some(" + 
 "value=" + 
-#value + 
+<this>.#value + 
 ")"
   }
 
   override fun hashCode(): Int {
     return when {
-      EQEQ(arg0 = #value, arg1 = null) -> 0
+      EQEQ(arg0 = <this>.#value, arg1 = null) -> 0
-      true -> #value.hashCode()
+      true -> <this>.#value.hashCode()
     }
   }
 
@@ -40,7 +40,7 @@ data class Some<T : Any?> {
     }
     val tmp0_other_with_cast: Some<T> = other as Some<T>
     when {
-      EQEQ(arg0 = #value, arg1 = #value).not() -> return false
+      EQEQ(arg0 = <this>.#value, arg1 = tmp0_other_with_cast.#value).not() -> return false
     }
     return true
   }

compiler/testData/ir/irText/firProblems/SignatureClash.kt.txt

@@ -41,26 +41,26 @@ data class DataClass : Derived, Delegate {
     get
 
   override fun bar() {
-    #delegate.bar()
+    <this>.#delegate.bar()
   }
 
   operator fun component1(): Delegate {
-    return #delegate
+    return <this>.#delegate
   }
 
-  fun copy(delegate: Delegate = #delegate): DataClass {
+  fun copy(delegate: Delegate = <this>.#delegate): DataClass {
     return DataClass(delegate = delegate)
   }
 
   override fun toString(): String {
     return "DataClass(" + 
 "delegate=" + 
-#delegate + 
+<this>.#delegate + 
 ")"
   }
 
   override fun hashCode(): Int {
-    return #delegate.hashCode()
+    return <this>.#delegate.hashCode()
   }
 
   override operator fun equals(other: Any?): Boolean {
@@ -72,7 +72,7 @@ data class DataClass : Derived, Delegate {
     }
     val tmp0_other_with_cast: DataClass = other as DataClass
     when {
-      EQEQ(arg0 = #delegate, arg1 = #delegate).not() -> return false
+      EQEQ(arg0 = <this>.#delegate, arg1 = tmp0_other_with_cast.#delegate).not() -> return false
     }
     return true
   }

compiler/testData/ir/irText/lambdas/destructuringInLambda.kt.txt

@@ -14,30 +14,30 @@ data class A {
     get
 
   operator fun component1(): Int {
-    return #x
+    return <this>.#x
   }
 
   operator fun component2(): Int {
-    return #y
+    return <this>.#y
   }
 
-  fun copy(x: Int = #x, y: Int = #y): A {
+  fun copy(x: Int = <this>.#x, y: Int = <this>.#y): A {
     return A(x = x, y = y)
   }
 
   override fun toString(): String {
     return "A(" + 
 "x=" + 
-#x + 
+<this>.#x + 
 ", " + 
 "y=" + 
-#y + 
+<this>.#y + 
 ")"
   }
 
   override fun hashCode(): Int {
-    var result: Int = #x.hashCode()
+    var result: Int = <this>.#x.hashCode()
-    result = result.times(other = 31).plus(other = #y.hashCode())
+    result = result.times(other = 31).plus(other = <this>.#y.hashCode())
     return result
   }
 
@@ -50,10 +50,10 @@ data class A {
     }
     val tmp0_other_with_cast: A = other as A
     when {
-      EQEQ(arg0 = #x, arg1 = #x).not() -> return false
+      EQEQ(arg0 = <this>.#x, arg1 = tmp0_other_with_cast.#x).not() -> return false
     }
     when {
-      EQEQ(arg0 = #y, arg1 = #y).not() -> return false
+      EQEQ(arg0 = <this>.#y, arg1 = tmp0_other_with_cast.#y).not() -> return false
     }
     return true
   }

compiler/testData/ir/irText/types/genericDelegatedDeepProperty.kt.txt

@@ -108,7 +108,7 @@ val <T : Any?> Value<T, CR<T>>.additionalText: P<T, T> /* by */
           <no name provided>()
         }
         private get(): Any? {
-          return #deepO$delegate.getValue(t = <this>, p = ::deepO) /*as Any? */
+          return <this>.#deepO$delegate.getValue(t = <this>, p = ::deepO) /*as Any? */
         }
 
       private val Value<Any?, CR<Any?>>.deepK: Any? /* by */ 
@@ -129,7 +129,7 @@ val <T : Any?> Value<T, CR<T>>.additionalText: P<T, T> /* by */
           <no name provided>()
         }
         private get(): Any? {
-          return #deepK$delegate.getValue(t = <this>, p = ::deepK) /*as Any? */
+          return <this>.#deepK$delegate.getValue(t = <this>, p = ::deepK) /*as Any? */
         }
 
       override operator fun getValue(t: Value<Any?, CR<Any?>>, p: KProperty<*>): P<Any?, Any?> {

compiler/testData/ir/irText/types/javaWildcardType.kt.txt

@@ -15,36 +15,36 @@ class C : J, K {
 
   private /*final field*/ val $$delegate_0: J = j
   override fun jf1(): @FlexibleNullability MutableCollection<out @FlexibleNullability CharSequence?>? {
-    return #$$delegate_0.jf1()
+    return <this>.#$$delegate_0.jf1()
   }
 
   override fun jf2(): @FlexibleNullability MutableCollection<@FlexibleNullability CharSequence?>? {
-    return #$$delegate_0.jf2()
+    return <this>.#$$delegate_0.jf2()
   }
 
   override fun jg1(c: @FlexibleNullability MutableCollection<out @FlexibleNullability CharSequence?>?) {
-    #$$delegate_0.jg1(c = c)
+    <this>.#$$delegate_0.jg1(c = c)
   }
 
   override fun jg2(c: @FlexibleNullability MutableCollection<@FlexibleNullability CharSequence?>?) {
-    #$$delegate_0.jg2(c = c)
+    <this>.#$$delegate_0.jg2(c = c)
   }
 
   private /*final field*/ val $$delegate_1: K = k
   override fun kf1(): Collection<out CharSequence> {
-    return #$$delegate_1.kf1()
+    return <this>.#$$delegate_1.kf1()
   }
 
   override fun kf2(): Collection<CharSequence> {
-    return #$$delegate_1.kf2()
+    return <this>.#$$delegate_1.kf2()
   }
 
   override fun kg1(c: Collection<out CharSequence>) {
-    #$$delegate_1.kg1(c = c)
+    <this>.#$$delegate_1.kg1(c = c)
   }
 
   override fun kg2(c: Collection<CharSequence>) {
-    #$$delegate_1.kg2(c = c)
+    <this>.#$$delegate_1.kg2(c = c)
   }
 
 }

compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.kt.txt

@@ -90,30 +90,30 @@ data class P {
     get
 
   operator fun component1(): Int {
-    return #x
+    return <this>.#x
   }
 
   operator fun component2(): Int {
-    return #y
+    return <this>.#y
   }
 
-  fun copy(x: Int = #x, y: Int = #y): P {
+  fun copy(x: Int = <this>.#x, y: Int = <this>.#y): P {
     return P(x = x, y = y)
   }
 
   override fun toString(): String {
     return "P(" + 
 "x=" + 
-#x + 
+<this>.#x + 
 ", " + 
 "y=" + 
-#y + 
+<this>.#y + 
 ")"
   }
 
   override fun hashCode(): Int {
-    var result: Int = #x.hashCode()
+    var result: Int = <this>.#x.hashCode()
-    result = result.times(other = 31).plus(other = #y.hashCode())
+    result = result.times(other = 31).plus(other = <this>.#y.hashCode())
     return result
   }
 
@@ -126,10 +126,10 @@ data class P {
     }
     val tmp0_other_with_cast: P = other as P
     when {
-      EQEQ(arg0 = #x, arg1 = #x).not() -> return false
+      EQEQ(arg0 = <this>.#x, arg1 = tmp0_other_with_cast.#x).not() -> return false
     }
     when {
-      EQEQ(arg0 = #y, arg1 = #y).not() -> return false
+      EQEQ(arg0 = <this>.#y, arg1 = tmp0_other_with_cast.#y).not() -> return false
     }
     return true
   }

compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.kt.txt

@@ -33,11 +33,11 @@ class MySet : Set<String> {
 
 fun test() {
   f(s = s() /*!! String */)
-  f(s = #STRING /*!! String */)
+  f(s = super.#STRING /*!! String */)
 }
 
 fun testContains(m: MySet) {
-  m.contains(element = #STRING /*!! String */) /*~> Unit */
+  m.contains(element = super.#STRING /*!! String */) /*~> Unit */
   m.contains(element = "abc") /*~> Unit */
 }
 

compiler/testData/ir/irText/types/nullChecks/platformTypeReceiver.kt.txt

@@ -1,5 +1,5 @@
 fun test1(): Boolean {
-  return #BOOL_NULL /*!! Boolean */.equals(other = null)
+  return super.#BOOL_NULL /*!! Boolean */.equals(other = null)
 }
 
 fun test2(): Boolean {

compiler/testData/ir/irText/types/rawTypeInSignature.kt.txt

@@ -46,35 +46,35 @@ class KRaw : JRaw {
 
   private /*final field*/ val $$delegate_0: JRaw = j
   override fun returnsRawGenericIn(): @FlexibleNullability @RawType GenericIn<Number>? {
-    return #$$delegate_0.returnsRawGenericIn()
+    return <this>.#$$delegate_0.returnsRawGenericIn()
   }
 
   override fun returnsRawGenericInv(): @FlexibleNullability @RawType GenericInv<Number>? {
-    return #$$delegate_0.returnsRawGenericInv()
+    return <this>.#$$delegate_0.returnsRawGenericInv()
   }
 
   override fun returnsRawGenericOut(): @FlexibleNullability @RawType GenericOut<Number>? {
-    return #$$delegate_0.returnsRawGenericOut()
+    return <this>.#$$delegate_0.returnsRawGenericOut()
   }
 
   override fun returnsRawList(): @FlexibleNullability @RawType MutableList<Any?>? {
-    return #$$delegate_0.returnsRawList()
+    return <this>.#$$delegate_0.returnsRawList()
   }
 
   override fun takesRawGenericIn(g: @FlexibleNullability @RawType GenericIn<Number>?) {
-    #$$delegate_0.takesRawGenericIn(g = g)
+    <this>.#$$delegate_0.takesRawGenericIn(g = g)
   }
 
   override fun takesRawGenericInv(g: @FlexibleNullability @RawType GenericInv<Number>?) {
-    #$$delegate_0.takesRawGenericInv(g = g)
+    <this>.#$$delegate_0.takesRawGenericInv(g = g)
   }
 
   override fun takesRawGenericOut(g: @FlexibleNullability @RawType GenericOut<Number>?) {
-    #$$delegate_0.takesRawGenericOut(g = g)
+    <this>.#$$delegate_0.takesRawGenericOut(g = g)
   }
 
   override fun takesRawList(list: @FlexibleNullability @RawType MutableList<Any?>?) {
-    #$$delegate_0.takesRawList(list = list)
+    <this>.#$$delegate_0.takesRawList(list = list)
   }
 
 }

compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.kt.txt

@@ -1,11 +1,11 @@
 fun testSetField(a: Any, b: Any) {
   a as JCell<String> /*~> Unit */
   b as String /*~> Unit */
-  #value = b /*as String */
+  a /*as JCell<String> */super.#value = b /*as String */
 }
 
 fun testGetField(a: Any): String {
   a as JCell<String> /*~> Unit */
-  return #value /*!! String */
+  return a /*as JCell<String> */super.#value /*!! String */
 }