Put 'thisReceiver' declaration in class

Interfaces also have 'thisReceiver'

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

@@ -12,7 +12,7 @@ FILE /arrayAugmentedAssignment1.kt
       RETURN type=kotlin.Nothing from='bar(): Int'
         CONST Int type=kotlin.Int value='42'
   CLASS CLASS C
-    $new: VALUE_PARAMETER this@C: C
+    $this: VALUE_PARAMETER this@C: C
     CONSTRUCTOR public constructor C(x: kotlin.IntArray)
       VALUE_PARAMETER value-parameter x: kotlin.IntArray
       BLOCK_BODY

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

@@ -1,5 +1,6 @@
 FILE /arrayAugmentedAssignment2.kt
   CLASS INTERFACE IA
+    $this: VALUE_PARAMETER this@IA: IA
     FUN public abstract operator fun get(index: kotlin.String): kotlin.Int
       $this: VALUE_PARAMETER this@IA: IA
       VALUE_PARAMETER value-parameter index: kotlin.String
@@ -7,6 +8,7 @@ FILE /arrayAugmentedAssignment2.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS INTERFACE IB
+    $this: VALUE_PARAMETER this@IB: IB
     FUN public abstract operator fun IA.set(index: kotlin.String, value: kotlin.Int): kotlin.Unit
       $this: VALUE_PARAMETER this@IB: IB
       $receiver: VALUE_PARAMETER this@set: IA

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

@@ -1,6 +1,6 @@
 FILE /assignments.kt
   CLASS CLASS Ref
-    $new: VALUE_PARAMETER this@Ref: Ref
+    $this: VALUE_PARAMETER this@Ref: Ref
     CONSTRUCTOR public constructor Ref(x: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       BLOCK_BODY

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

@@ -1,6 +1,6 @@
 FILE /augmentedAssignment2.kt
   CLASS CLASS A
-    $new: VALUE_PARAMETER this@A: A
+    $this: VALUE_PARAMETER this@A: A
     CONSTRUCTOR public constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'

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

@@ -1,6 +1,6 @@
 FILE /augmentedAssignmentWithExpression.kt
   CLASS CLASS Host
-    $new: VALUE_PARAMETER this@Host: Host
+    $this: VALUE_PARAMETER this@Host: Host
     CONSTRUCTOR public constructor Host()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'

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

@@ -1,6 +1,6 @@
 FILE /boundCallableReferences.kt
   CLASS CLASS A
-    $new: VALUE_PARAMETER this@A: A
+    $this: VALUE_PARAMETER this@A: A
     CONSTRUCTOR public constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'

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

@@ -1,6 +1,6 @@
 FILE /chainOfSafeCalls.kt
   CLASS CLASS C
-    $new: VALUE_PARAMETER this@C: C
+    $this: VALUE_PARAMETER this@C: C
     CONSTRUCTOR public constructor C()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'

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

@@ -1,6 +1,6 @@
 FILE /classReference.kt
   CLASS CLASS A
-    $new: VALUE_PARAMETER this@A: A
+    $this: VALUE_PARAMETER this@A: A
     CONSTRUCTOR public constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'

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

@@ -1,6 +1,6 @@
 FILE /complexAugmentedAssignment.kt
   CLASS OBJECT X1
-    $new: VALUE_PARAMETER this@X1: X1
+    $this: VALUE_PARAMETER this@X1: X1
     CONSTRUCTOR private constructor X1()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -23,7 +23,7 @@ FILE /complexAugmentedAssignment.kt
             receiver: GET_VAR 'this@X1: X1' type=X1 origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     CLASS OBJECT X2
-      $new: VALUE_PARAMETER this@X2: X2
+      $this: VALUE_PARAMETER this@X2: X2
       CONSTRUCTOR private constructor X2()
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -46,7 +46,7 @@ FILE /complexAugmentedAssignment.kt
               receiver: GET_VAR 'this@X2: X2' type=X1.X2 origin=null
               value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
       CLASS OBJECT X3
-        $new: VALUE_PARAMETER this@X3: X3
+        $this: VALUE_PARAMETER this@X3: X3
         CONSTRUCTOR private constructor X3()
           BLOCK_BODY
             DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -146,7 +146,7 @@ FILE /complexAugmentedAssignment.kt
                 $this: GET_VAR 'tmp5: Int' type=kotlin.Int origin=null
             GET_VAR 'tmp5: Int' type=kotlin.Int origin=null
   CLASS CLASS B
-    $new: VALUE_PARAMETER this@B: B
+    $this: VALUE_PARAMETER this@B: B
     CONSTRUCTOR public constructor B(s: kotlin.Int = ...)
       VALUE_PARAMETER value-parameter s: kotlin.Int = ...
         EXPRESSION_BODY
@@ -175,7 +175,7 @@ FILE /complexAugmentedAssignment.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS OBJECT Host
-    $new: VALUE_PARAMETER this@Host: Host
+    $this: VALUE_PARAMETER this@Host: Host
     CONSTRUCTOR private constructor Host()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'

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

@@ -1,6 +1,6 @@
 FILE /contructorCall.kt
   CLASS CLASS A
-    $new: VALUE_PARAMETER this@A: A
+    $this: VALUE_PARAMETER this@A: A
     CONSTRUCTOR public constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'

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

@@ -1,9 +1,11 @@
 FILE /conventionComparisons.kt
   CLASS INTERFACE IA
+    $this: VALUE_PARAMETER this@IA: IA
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS INTERFACE IB
+    $this: VALUE_PARAMETER this@IB: IB
     FUN public abstract operator fun IA.compareTo(other: IA): kotlin.Int
       $this: VALUE_PARAMETER this@IB: IB
       $receiver: VALUE_PARAMETER this@compareTo: IA

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

@@ -1,6 +1,6 @@
 FILE /destructuring1.kt
   CLASS OBJECT A
-    $new: VALUE_PARAMETER this@A: A
+    $this: VALUE_PARAMETER this@A: A
     CONSTRUCTOR private constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -9,7 +9,7 @@ FILE /destructuring1.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS OBJECT B
-    $new: VALUE_PARAMETER this@B: B
+    $this: VALUE_PARAMETER this@B: B
     CONSTRUCTOR private constructor B()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'

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

@@ -1,6 +1,6 @@
 FILE /destructuringWithUnderscore.kt
   CLASS OBJECT A
-    $new: VALUE_PARAMETER this@A: A
+    $this: VALUE_PARAMETER this@A: A
     CONSTRUCTOR private constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -9,7 +9,7 @@ FILE /destructuringWithUnderscore.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS OBJECT B
-    $new: VALUE_PARAMETER this@B: B
+    $this: VALUE_PARAMETER this@B: B
     CONSTRUCTOR private constructor B()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'

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

@@ -1,6 +1,6 @@
 FILE /enumEntryAsReceiver.kt
   CLASS ENUM_CLASS X
-    $new: VALUE_PARAMETER this@X: X
+    $this: VALUE_PARAMETER this@X: X
     CONSTRUCTOR private constructor X()
       BLOCK_BODY
         ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
@@ -8,7 +8,7 @@ FILE /enumEntryAsReceiver.kt
     ENUM_ENTRY enum entry B
       init: ENUM_CONSTRUCTOR_CALL 'constructor B()'
       class: CLASS ENUM_ENTRY B
-        $new: VALUE_PARAMETER this@B: B
+        $this: VALUE_PARAMETER this@B: B
         CONSTRUCTOR private constructor B()
           BLOCK_BODY
             ENUM_CONSTRUCTOR_CALL 'constructor X()'

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

@@ -1,6 +1,6 @@
 FILE /forWithImplicitReceivers.kt
   CLASS OBJECT FiveTimes
-    $new: VALUE_PARAMETER this@FiveTimes: FiveTimes
+    $this: VALUE_PARAMETER this@FiveTimes: FiveTimes
     CONSTRUCTOR private constructor FiveTimes()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -9,7 +9,7 @@ FILE /forWithImplicitReceivers.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS IntCell
-    $new: VALUE_PARAMETER this@IntCell: IntCell
+    $this: VALUE_PARAMETER this@IntCell: IntCell
     CONSTRUCTOR public constructor IntCell(value: kotlin.Int)
       VALUE_PARAMETER value-parameter value: kotlin.Int
       BLOCK_BODY
@@ -36,6 +36,7 @@ FILE /forWithImplicitReceivers.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS INTERFACE IReceiver
+    $this: VALUE_PARAMETER this@IReceiver: IReceiver
     FUN public open operator fun FiveTimes.iterator(): IntCell
       $this: VALUE_PARAMETER this@IReceiver: IReceiver
       $receiver: VALUE_PARAMETER this@iterator: FiveTimes

compiler/testData/ir/irText/expressions/interfaceThisRef.kt

@@ -0,0 +1,4 @@
+interface IFoo {
+    fun foo()
+    fun bar() { foo() }
+}

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

@@ -0,0 +1,13 @@
+FILE /interfaceThisRef.kt
+  CLASS INTERFACE IFoo
+    $this: VALUE_PARAMETER this@IFoo: IFoo
+    FUN public abstract fun foo(): kotlin.Unit
+      $this: VALUE_PARAMETER this@IFoo: IFoo
+    FUN public open fun bar(): kotlin.Unit
+      $this: VALUE_PARAMETER this@IFoo: IFoo
+      BLOCK_BODY
+        CALL 'foo(): Unit' type=kotlin.Unit origin=null
+          $this: GET_VAR 'this@IFoo: IFoo' type=IFoo origin=null
+    FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String

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

@@ -1,6 +1,6 @@
 FILE /Derived.kt
   CLASS CLASS Derived
-    $new: VALUE_PARAMETER this@Derived: Derived
+    $this: VALUE_PARAMETER this@Derived: Derived
     CONSTRUCTOR public constructor Derived()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Base()'

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

@@ -22,7 +22,7 @@ FILE /jvmStaticFieldReference.kt
             GET_FIELD 'out: PrintStream!' type=java.io.PrintStream! origin=GET_PROPERTY
           p0: CONST String type=kotlin.String value='testProp/set'
   CLASS CLASS TestClass
-    $new: VALUE_PARAMETER this@TestClass: TestClass
+    $this: VALUE_PARAMETER this@TestClass: TestClass
     CONSTRUCTOR public constructor TestClass()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'

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

@@ -1,6 +1,6 @@
 FILE /kt16904.kt
   CLASS CLASS A
-    $new: VALUE_PARAMETER this@A: A
+    $this: VALUE_PARAMETER this@A: A
     CONSTRUCTOR public constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -36,7 +36,7 @@ FILE /kt16904.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS B
-    $new: VALUE_PARAMETER this@B: B
+    $this: VALUE_PARAMETER this@B: B
     CONSTRUCTOR public constructor B()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -49,7 +49,7 @@ FILE /kt16904.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test1
-    $new: VALUE_PARAMETER this@Test1: Test1
+    $this: VALUE_PARAMETER this@Test1: Test1
     CONSTRUCTOR public constructor Test1()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor A()'
@@ -79,7 +79,7 @@ FILE /kt16904.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test2
-    $new: VALUE_PARAMETER this@Test2: Test2
+    $this: VALUE_PARAMETER this@Test2: Test2
     CONSTRUCTOR public constructor Test2()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor J()'

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

@@ -1,12 +1,12 @@
 FILE /kt16905.kt
   CLASS CLASS Outer
-    $new: VALUE_PARAMETER this@Outer: Outer
+    $this: VALUE_PARAMETER this@Outer: Outer
     CONSTRUCTOR public constructor Outer()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Outer'
     CLASS CLASS Inner
-      $new: VALUE_PARAMETER this@Inner: Inner
+      $this: VALUE_PARAMETER this@Inner: Inner
       CONSTRUCTOR public constructor Inner()
         $outer: VALUE_PARAMETER this@Outer: Outer
         BLOCK_BODY
@@ -16,7 +16,7 @@ FILE /kt16905.kt
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
     CLASS CLASS InnerDerived0
-      $new: VALUE_PARAMETER this@InnerDerived0: InnerDerived0
+      $this: VALUE_PARAMETER this@InnerDerived0: InnerDerived0
       CONSTRUCTOR public constructor InnerDerived0()
         $outer: VALUE_PARAMETER this@Outer: Outer
         BLOCK_BODY
@@ -27,7 +27,7 @@ FILE /kt16905.kt
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
     CLASS CLASS InnerDerived1
-      $new: VALUE_PARAMETER this@InnerDerived1: InnerDerived1
+      $this: VALUE_PARAMETER this@InnerDerived1: InnerDerived1
       CONSTRUCTOR public constructor InnerDerived1()
         $outer: VALUE_PARAMETER this@Outer: Outer
         BLOCK_BODY

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

@@ -1,6 +1,6 @@
 FILE /membersImportedFromObject.kt
   CLASS OBJECT A
-    $new: VALUE_PARAMETER this@A: A
+    $this: VALUE_PARAMETER this@A: A
     CONSTRUCTOR private constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'

compiler/testData/ir/irText/expressions/multipleThisReferences.kt

@@ -0,0 +1,9 @@
+class Outer {
+    open inner class Inner(val x: Int)
+}
+
+class Host(val y: Int) {
+    fun Outer.test() = object : Outer.Inner(42) {
+        val xx = x + y
+    }
+}

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

@@ -0,0 +1,85 @@
+FILE /multipleThisReferences.kt
+  CLASS CLASS Outer
+    $this: VALUE_PARAMETER this@Outer: Outer
+    CONSTRUCTOR public constructor Outer()
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
+        INSTANCE_INITIALIZER_CALL classDescriptor='Outer'
+    CLASS CLASS Inner
+      $this: VALUE_PARAMETER this@Inner: Inner
+      CONSTRUCTOR public constructor Inner(x: kotlin.Int)
+        $outer: VALUE_PARAMETER this@Outer: Outer
+        VALUE_PARAMETER value-parameter x: kotlin.Int
+        BLOCK_BODY
+          DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
+          INSTANCE_INITIALIZER_CALL classDescriptor='Inner'
+      PROPERTY public final val x: kotlin.Int
+        FIELD PROPERTY_BACKING_FIELD public final val x: kotlin.Int
+          EXPRESSION_BODY
+            GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+        FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
+          $this: VALUE_PARAMETER this@Inner: Inner
+          BLOCK_BODY
+            RETURN type=kotlin.Nothing from='<get-x>(): Int'
+              GET_FIELD 'x: Int' type=kotlin.Int origin=null
+                receiver: GET_VAR 'this@Inner: Inner' type=Outer.Inner origin=null
+      FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+    FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+  CLASS CLASS Host
+    $this: VALUE_PARAMETER this@Host: Host
+    CONSTRUCTOR public constructor Host(y: kotlin.Int)
+      VALUE_PARAMETER value-parameter y: kotlin.Int
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
+        INSTANCE_INITIALIZER_CALL classDescriptor='Host'
+    PROPERTY public final val y: kotlin.Int
+      FIELD PROPERTY_BACKING_FIELD public final val y: kotlin.Int
+        EXPRESSION_BODY
+          GET_VAR 'value-parameter y: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-y>(): kotlin.Int
+        $this: VALUE_PARAMETER this@Host: Host
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='<get-y>(): Int'
+            GET_FIELD 'y: Int' type=kotlin.Int origin=null
+              receiver: GET_VAR 'this@Host: Host' type=Host origin=null
+    FUN public final fun Outer.test(): Outer.Inner
+      $this: VALUE_PARAMETER this@Host: Host
+      $receiver: VALUE_PARAMETER this@test: Outer
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='test() on Outer: Outer.Inner'
+          BLOCK type=Host.test.<no name provided> origin=OBJECT_LITERAL
+            CLASS CLASS <no name provided>
+              $this: VALUE_PARAMETER this@<no name provided>: <no name provided>
+              CONSTRUCTOR public constructor <no name provided>()
+                BLOCK_BODY
+                  DELEGATING_CONSTRUCTOR_CALL 'constructor Inner(Int)'
+                    $this: GET_VAR 'this@test: Outer' type=Outer origin=null
+                    x: CONST Int type=kotlin.Int value='42'
+                  INSTANCE_INITIALIZER_CALL classDescriptor='<no name provided>'
+              PROPERTY public final val xx: kotlin.Int
+                FIELD PROPERTY_BACKING_FIELD public final val xx: kotlin.Int
+                  EXPRESSION_BODY
+                    CALL 'plus(Int): Int' type=kotlin.Int origin=PLUS
+                      $this: CALL '<get-x>(): Int' type=kotlin.Int origin=GET_PROPERTY
+                        $this: GET_VAR 'this@<no name provided>: <no name provided>' type=Host.test.<no name provided> origin=null
+                      other: CALL '<get-y>(): Int' type=kotlin.Int origin=GET_PROPERTY
+                        $this: GET_VAR 'this@Host: Host' type=Host origin=null
+                FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-xx>(): kotlin.Int
+                  $this: VALUE_PARAMETER this@<no name provided>: <no name provided>
+                  BLOCK_BODY
+                    RETURN type=kotlin.Nothing from='<get-xx>(): Int'
+                      GET_FIELD 'xx: Int' type=kotlin.Int origin=null
+                        receiver: GET_VAR 'this@<no name provided>: <no name provided>' type=Host.test.<no name provided> origin=null
+              PROPERTY FAKE_OVERRIDE public final override val x: kotlin.Int
+                FUN FAKE_OVERRIDE public final override fun <get-x>(): kotlin.Int
+              FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+              FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+              FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+            CALL 'constructor <no name provided>()' type=Host.test.<no name provided> origin=OBJECT_LITERAL
+    FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String

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

@@ -1,6 +1,6 @@
 FILE /objectAsCallable.kt
   CLASS OBJECT A
-    $new: VALUE_PARAMETER this@A: A
+    $this: VALUE_PARAMETER this@A: A
     CONSTRUCTOR private constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -9,7 +9,7 @@ FILE /objectAsCallable.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS ENUM_CLASS En
-    $new: VALUE_PARAMETER this@En: En
+    $this: VALUE_PARAMETER this@En: En
     CONSTRUCTOR private constructor En()
       BLOCK_BODY
         ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'

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

@@ -1,6 +1,6 @@
 FILE /objectClassReference.kt
   CLASS OBJECT A
-    $new: VALUE_PARAMETER this@A: A
+    $this: VALUE_PARAMETER this@A: A
     CONSTRUCTOR private constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'

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

@@ -1,6 +1,6 @@
 FILE /outerClassInstanceReference.kt
   CLASS CLASS Outer
-    $new: VALUE_PARAMETER this@Outer: Outer
+    $this: VALUE_PARAMETER this@Outer: Outer
     CONSTRUCTOR public constructor Outer()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -9,7 +9,7 @@ FILE /outerClassInstanceReference.kt
       $this: VALUE_PARAMETER this@Outer: Outer
       BLOCK_BODY
     CLASS CLASS Inner
-      $new: VALUE_PARAMETER this@Inner: Inner
+      $this: VALUE_PARAMETER this@Inner: Inner
       CONSTRUCTOR public constructor Inner()
         $outer: VALUE_PARAMETER this@Outer: Outer
         BLOCK_BODY

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

@@ -83,7 +83,7 @@ FILE /primitivesImplicitConversions.kt
             $this: CONST Int type=kotlin.Int value='1'
     BLOCK_BODY
   CLASS CLASS TestImplicitArguments
-    $new: VALUE_PARAMETER this@TestImplicitArguments: TestImplicitArguments
+    $this: VALUE_PARAMETER this@TestImplicitArguments: TestImplicitArguments
     CONSTRUCTOR public constructor TestImplicitArguments(x: kotlin.Long = ...)
       VALUE_PARAMETER value-parameter x: kotlin.Long = ...
         EXPRESSION_BODY

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

@@ -1,6 +1,6 @@
 FILE /reflectionLiterals.kt
   CLASS CLASS A
-    $new: VALUE_PARAMETER this@A: A
+    $this: VALUE_PARAMETER this@A: A
     CONSTRUCTOR public constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'

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

@@ -1,6 +1,6 @@
 FILE /safeAssignment.kt
   CLASS CLASS C
-    $new: VALUE_PARAMETER this@C: C
+    $this: VALUE_PARAMETER this@C: C
     CONSTRUCTOR public constructor C(x: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       BLOCK_BODY

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

@@ -1,6 +1,6 @@
 FILE /safeCallWithIncrementDecrement.kt
   CLASS CLASS C
-    $new: VALUE_PARAMETER this@C: C
+    $this: VALUE_PARAMETER this@C: C
     CONSTRUCTOR public constructor C()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'

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

@@ -1,6 +1,6 @@
 FILE /safeCalls.kt
   CLASS CLASS Ref
-    $new: VALUE_PARAMETER this@Ref: Ref
+    $this: VALUE_PARAMETER this@Ref: Ref
     CONSTRUCTOR public constructor Ref(value: kotlin.Int)
       VALUE_PARAMETER value-parameter value: kotlin.Int
       BLOCK_BODY
@@ -27,6 +27,7 @@ FILE /safeCalls.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS INTERFACE IHost
+    $this: VALUE_PARAMETER this@IHost: IHost
     FUN public open fun kotlin.String.extLength(): kotlin.Int
       $this: VALUE_PARAMETER this@IHost: IHost
       $receiver: VALUE_PARAMETER this@extLength: String

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

@@ -1,6 +1,6 @@
 FILE /Derived.kt
   CLASS CLASS Derived
-    $new: VALUE_PARAMETER this@Derived: Derived
+    $this: VALUE_PARAMETER this@Derived: Derived
     CONSTRUCTOR public constructor Derived()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Base()'

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

@@ -1,9 +1,11 @@
 FILE /smartCastsWithDestructuring.kt
   CLASS INTERFACE I1
+    $this: VALUE_PARAMETER this@I1: I1
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS INTERFACE I2
+    $this: VALUE_PARAMETER this@I2: I2
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String

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

@@ -0,0 +1,8 @@
+class Outer<T>(val x: T) {
+    open inner class Inner(val y: Int)
+}
+
+fun Outer<Int>.test() =
+        object : Outer<Int>.Inner(42) {
+            val xx = x + y
+        }

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

@@ -0,0 +1,76 @@
+FILE /thisOfGenericOuterClass.kt
+  CLASS CLASS Outer
+    $this: VALUE_PARAMETER this@Outer: Outer<T>
+    TYPE_PARAMETER <T>
+    CONSTRUCTOR public constructor Outer<T>(x: T)
+      VALUE_PARAMETER value-parameter x: T
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
+        INSTANCE_INITIALIZER_CALL classDescriptor='Outer'
+    PROPERTY public final val x: T
+      FIELD PROPERTY_BACKING_FIELD public final val x: T
+        EXPRESSION_BODY
+          GET_VAR 'value-parameter x: T' type=T origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): T
+        $this: VALUE_PARAMETER this@Outer: Outer<T>
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='<get-x>(): T'
+            GET_FIELD 'x: T' type=T origin=null
+              receiver: GET_VAR 'this@Outer: Outer<T>' type=Outer<T> origin=null
+    CLASS CLASS Inner
+      $this: VALUE_PARAMETER this@Inner: Inner<T>
+      CONSTRUCTOR public constructor Inner(y: kotlin.Int)
+        $outer: VALUE_PARAMETER this@Outer: Outer<T>
+        VALUE_PARAMETER value-parameter y: kotlin.Int
+        BLOCK_BODY
+          DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
+          INSTANCE_INITIALIZER_CALL classDescriptor='Inner'
+      PROPERTY public final val y: kotlin.Int
+        FIELD PROPERTY_BACKING_FIELD public final val y: kotlin.Int
+          EXPRESSION_BODY
+            GET_VAR 'value-parameter y: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+        FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-y>(): kotlin.Int
+          $this: VALUE_PARAMETER this@Inner: Inner<T>
+          BLOCK_BODY
+            RETURN type=kotlin.Nothing from='<get-y>(): Int'
+              GET_FIELD 'y: Int' type=kotlin.Int origin=null
+                receiver: GET_VAR 'this@Inner: Inner<T>' type=Outer<T>.Inner origin=null
+      FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+    FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+  FUN public fun Outer<kotlin.Int>.test(): Outer<kotlin.Int>.Inner
+    $receiver: VALUE_PARAMETER this@test: Outer<Int>
+    BLOCK_BODY
+      RETURN type=kotlin.Nothing from='test() on Outer<Int>: Outer<Int>.Inner'
+        BLOCK type=test.<no name provided> origin=OBJECT_LITERAL
+          CLASS CLASS <no name provided>
+            $this: VALUE_PARAMETER this@<no name provided>: <no name provided>
+            CONSTRUCTOR public constructor <no name provided>()
+              BLOCK_BODY
+                DELEGATING_CONSTRUCTOR_CALL 'constructor Inner(Int)'
+                  $this: GET_VAR 'this@test: Outer<Int>' type=Outer<kotlin.Int> origin=null
+                  y: CONST Int type=kotlin.Int value='42'
+                INSTANCE_INITIALIZER_CALL classDescriptor='<no name provided>'
+            PROPERTY public final val xx: kotlin.Int
+              FIELD PROPERTY_BACKING_FIELD public final val xx: kotlin.Int
+                EXPRESSION_BODY
+                  CALL 'plus(Int): Int' type=kotlin.Int origin=PLUS
+                    $this: CALL '<get-x>(): Int' 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
+              FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-xx>(): kotlin.Int
+                $this: VALUE_PARAMETER this@<no name provided>: <no name provided>
+                BLOCK_BODY
+                  RETURN type=kotlin.Nothing from='<get-xx>(): Int'
+                    GET_FIELD 'xx: Int' type=kotlin.Int origin=null
+                      receiver: GET_VAR 'this@<no name provided>: <no name provided>' type=test.<no name provided> origin=null
+            PROPERTY FAKE_OVERRIDE public final override val y: kotlin.Int
+              FUN FAKE_OVERRIDE public final override fun <get-y>(): kotlin.Int
+            FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+            FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+            FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+          CALL 'constructor <no name provided>()' type=test.<no name provided> origin=OBJECT_LITERAL

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

@@ -1,5 +1,6 @@
 FILE /typeOperators.kt
   CLASS INTERFACE IThing
+    $this: VALUE_PARAMETER this@IThing: IThing
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String

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

@@ -1,6 +1,6 @@
 FILE /values.kt
   CLASS ENUM_CLASS Enum
-    $new: VALUE_PARAMETER this@Enum: Enum
+    $this: VALUE_PARAMETER this@Enum: Enum
     CONSTRUCTOR private constructor Enum()
       BLOCK_BODY
         ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
@@ -23,7 +23,7 @@ FILE /values.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): Enum
       SYNTHETIC_BODY kind=ENUM_VALUEOF
   CLASS OBJECT A
-    $new: VALUE_PARAMETER this@A: A
+    $this: VALUE_PARAMETER this@A: A
     CONSTRUCTOR private constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -40,13 +40,13 @@ FILE /values.kt
         RETURN type=kotlin.Nothing from='<get-a>(): Int'
           GET_FIELD 'a: Int' type=kotlin.Int origin=null
   CLASS CLASS Z
-    $new: VALUE_PARAMETER this@Z: Z
+    $this: VALUE_PARAMETER this@Z: Z
     CONSTRUCTOR public constructor Z()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Z'
     CLASS OBJECT companion object of Z
-      $new: VALUE_PARAMETER this@Companion: Companion
+      $this: VALUE_PARAMETER this@Companion: Companion
       CONSTRUCTOR private constructor Companion()
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'

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

@@ -1,6 +1,6 @@
 FILE /when.kt
   CLASS OBJECT A
-    $new: VALUE_PARAMETER this@A: A
+    $this: VALUE_PARAMETER this@A: A
     CONSTRUCTOR private constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'