Put 'thisReceiver' declaration in class

Interfaces also have 'thisReceiver'

compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt

@@ -48,13 +48,11 @@ class ClassGenerator(declarationGenerator: DeclarationGenerator) : DeclarationGe
                 IrDeclarationOrigin.DEFINED,
                 descriptor
         ).buildWithScope { irClass ->
-            if (irClass.descriptor.canHaveInitializersWithInstanceReference()) {
+            irClass.thisReceiver = context.symbolTable.declareValueParameter(
-                irClass.newInstanceReceiver = context.symbolTable.declareValueParameter(
+                    ktClassOrObject.startOffset, ktClassOrObject.endOffset,
-                        ktClassOrObject.startOffset, ktClassOrObject.endOffset,
+                    IrDeclarationOrigin.NEW_INSTANCE_RECEIVER,
-                        IrDeclarationOrigin.NEW_INSTANCE_RECEIVER,
+                    irClass.descriptor.thisAsReceiverParameter
-                        irClass.descriptor.thisAsReceiverParameter
+            )
-                )
-            }
 
             declarationGenerator.generateTypeParameterDeclarations(irClass, descriptor.declaredTypeParameters)
 
@@ -79,9 +77,6 @@ class ClassGenerator(declarationGenerator: DeclarationGenerator) : DeclarationGe
         }
     }
 
-    private fun ClassDescriptor.canHaveInitializersWithInstanceReference(): Boolean =
-            kind != ClassKind.INTERFACE
-
     private fun generateFakeOverrideMemberDeclarations(irClass: IrClass) {
         irClass.descriptor.unsubstitutedMemberScope.getContributedDescriptors()
                 .mapNotNull {

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrClass.kt

@@ -27,7 +27,7 @@ interface IrClass : IrSymbolDeclaration<IrClassSymbol>, IrDeclarationContainer,
 
     override val descriptor: ClassDescriptor
 
-    var newInstanceReceiver: IrValueParameter?
+    var thisReceiver: IrValueParameter?
 }
 
 fun IrClass.addMember(member: IrDeclaration) {

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt

@@ -24,7 +24,6 @@ import org.jetbrains.kotlin.ir.util.transform
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
 import org.jetbrains.kotlin.utils.SmartList
-import java.util.*
 import kotlin.collections.ArrayList
 
 class IrClassImpl(
@@ -49,7 +48,7 @@ class IrClassImpl(
 
     override val descriptor: ClassDescriptor get() = symbol.descriptor
 
-    override var newInstanceReceiver: IrValueParameter? = null
+    override var thisReceiver: IrValueParameter? = null
 
     override val declarations: MutableList<IrDeclaration> = ArrayList()
 
@@ -59,13 +58,13 @@ class IrClassImpl(
             visitor.visitClass(this, data)
 
     override fun <D> acceptChildren(visitor: IrElementVisitor<Unit, D>, data: D) {
-        newInstanceReceiver?.accept(visitor, data)
+        thisReceiver?.accept(visitor, data)
         typeParameters.forEach { it.accept(visitor, data) }
         declarations.forEach { it.accept(visitor, data) }
     }
 
     override fun <D> transformChildren(transformer: IrElementTransformer<D>, data: D) {
-        newInstanceReceiver = newInstanceReceiver?.transform(transformer, data)
+        thisReceiver = thisReceiver?.transform(transformer, data)
         typeParameters.transform { it.transform(transformer, data) }
         declarations.transform { it.transform(transformer, data) }
     }

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

@@ -87,7 +87,7 @@ class DeepCopyIrTreeWithSymbols(private val symbolsRemapper: DeepCopySymbolsRema
                     mapDeclarationOrigin(declaration.origin),
                     symbolsRemapper.getDeclaredClass(declaration.symbol)
             ).apply {
-                newInstanceReceiver = declaration.newInstanceReceiver?.transform()
+                thisReceiver = declaration.thisReceiver?.transform()
                 declaration.typeParameters.transformTo(typeParameters)
                 declaration.transformDeclarationsTo(this)
             }

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

@@ -77,7 +77,7 @@ class DumpIrTreeVisitor(out: Appendable): IrElementVisitor<Unit, String> {
 
     override fun visitClass(declaration: IrClass, data: String) {
         declaration.dumpLabeledElementWith(data) {
-            declaration.newInstanceReceiver?.accept(this, "\$new")
+            declaration.thisReceiver?.accept(this, "\$this")
             declaration.typeParameters.dumpElements()
             declaration.declarations.dumpElements()
         }

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

@@ -1,6 +1,6 @@
 FILE /abstractMembers.kt
   CLASS CLASS AbstractClass
-    $new: VALUE_PARAMETER this@AbstractClass: AbstractClass
+    $this: VALUE_PARAMETER this@AbstractClass: AbstractClass
     CONSTRUCTOR public constructor AbstractClass()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -20,6 +20,7 @@ FILE /abstractMembers.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS INTERFACE Interface
+    $this: VALUE_PARAMETER this@Interface: Interface
     FUN public abstract fun abstractFun(): kotlin.Unit
       $this: VALUE_PARAMETER this@Interface: Interface
     PROPERTY public abstract val abstractVal: kotlin.Int

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

@@ -1,6 +1,6 @@
 FILE /argumentReorderingInDelegatingConstructorCall.kt
   CLASS CLASS Base
-    $new: VALUE_PARAMETER this@Base: Base
+    $this: VALUE_PARAMETER this@Base: Base
     CONSTRUCTOR public constructor Base(x: kotlin.Int, y: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter y: kotlin.Int
@@ -31,7 +31,7 @@ FILE /argumentReorderingInDelegatingConstructorCall.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(xx: kotlin.Int, yy: kotlin.Int)
       VALUE_PARAMETER value-parameter xx: kotlin.Int
       VALUE_PARAMETER value-parameter yy: kotlin.Int
@@ -53,7 +53,7 @@ FILE /argumentReorderingInDelegatingConstructorCall.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(xx: kotlin.Int, yy: kotlin.Int)
       VALUE_PARAMETER value-parameter xx: kotlin.Int
       VALUE_PARAMETER value-parameter yy: kotlin.Int

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

@@ -1,6 +1,6 @@
 FILE /classMembers.kt
   CLASS CLASS C
-    $new: VALUE_PARAMETER this@C: C
+    $this: VALUE_PARAMETER this@C: C
     CONSTRUCTOR public constructor C(x: kotlin.Int, y: kotlin.Int, z: kotlin.Int = ...)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter y: kotlin.Int
@@ -85,7 +85,7 @@ FILE /classMembers.kt
         CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
           message: CONST String type=kotlin.String value='2'
     CLASS CLASS NestedClass
-      $new: VALUE_PARAMETER this@NestedClass: NestedClass
+      $this: VALUE_PARAMETER this@NestedClass: NestedClass
       CONSTRUCTOR public constructor NestedClass()
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -105,6 +105,7 @@ FILE /classMembers.kt
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
     CLASS INTERFACE NestedInterface
+      $this: VALUE_PARAMETER this@NestedInterface: NestedInterface
       FUN public abstract fun foo(): kotlin.Unit
         $this: VALUE_PARAMETER this@NestedInterface: NestedInterface
       FUN public open fun bar(): kotlin.Unit
@@ -117,7 +118,7 @@ FILE /classMembers.kt
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
     CLASS OBJECT companion object of C
-      $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/classes/classes.txt

@@ -1,6 +1,6 @@
 FILE /classes.kt
   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()'
@@ -9,11 +9,12 @@ FILE /classes.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS INTERFACE TestInterface
+    $this: VALUE_PARAMETER this@TestInterface: TestInterface
     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 OBJECT TestObject
-    $new: VALUE_PARAMETER this@TestObject: TestObject
+    $this: VALUE_PARAMETER this@TestObject: TestObject
     CONSTRUCTOR private constructor TestObject()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -22,12 +23,12 @@ FILE /classes.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS ANNOTATION_CLASS TestAnnotationClass
-    $new: VALUE_PARAMETER this@TestAnnotationClass: TestAnnotationClass
+    $this: VALUE_PARAMETER this@TestAnnotationClass: TestAnnotationClass
     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 ENUM_CLASS TestEnumClass
-    $new: VALUE_PARAMETER this@TestEnumClass: TestEnumClass
+    $this: VALUE_PARAMETER this@TestEnumClass: TestEnumClass
     CONSTRUCTOR private constructor TestEnumClass()
       BLOCK_BODY
         ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'

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

@@ -1,12 +1,12 @@
 FILE /companionObject.kt
   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 Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Test1'
     CLASS OBJECT companion object of Test1
-      $new: VALUE_PARAMETER this@Companion: Companion
+      $this: VALUE_PARAMETER this@Companion: Companion
       CONSTRUCTOR private constructor Companion()
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -18,13 +18,13 @@ FILE /companionObject.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 Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Test2'
     CLASS OBJECT companion object of Test2Named
-      $new: VALUE_PARAMETER this@Named: Named
+      $this: VALUE_PARAMETER this@Named: Named
       CONSTRUCTOR private constructor Named()
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'

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

@@ -1,6 +1,6 @@
 FILE /dataClasses.kt
   CLASS CLASS Test1
-    $new: VALUE_PARAMETER this@Test1: Test1
+    $this: VALUE_PARAMETER this@Test1: Test1
     CONSTRUCTOR public constructor Test1(x: kotlin.Int, y: kotlin.String, z: kotlin.Any)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter y: kotlin.String
@@ -174,7 +174,7 @@ FILE /dataClasses.kt
         RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
           CONST Boolean type=kotlin.Boolean value='true'
   CLASS CLASS Test2
-    $new: VALUE_PARAMETER this@Test2: Test2
+    $this: VALUE_PARAMETER this@Test2: Test2
     CONSTRUCTOR public constructor Test2(x: kotlin.Any?)
       VALUE_PARAMETER value-parameter x: kotlin.Any?
       BLOCK_BODY

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

@@ -1,6 +1,6 @@
 FILE /dataClassesGeneric.kt
   CLASS CLASS Test1
-    $new: VALUE_PARAMETER this@Test1: Test1<T>
+    $this: VALUE_PARAMETER this@Test1: Test1<T>
     TYPE_PARAMETER <T>
     CONSTRUCTOR public constructor Test1<T>(x: T)
       VALUE_PARAMETER value-parameter x: T

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

@@ -1,5 +1,6 @@
 FILE /delegatedImplementation.kt
   CLASS INTERFACE IBase
+    $this: VALUE_PARAMETER this@IBase: IBase
     FUN public abstract fun foo(x: kotlin.Int, s: kotlin.String): kotlin.Unit
       $this: VALUE_PARAMETER this@IBase: IBase
       VALUE_PARAMETER value-parameter x: kotlin.Int
@@ -13,7 +14,7 @@ FILE /delegatedImplementation.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS OBJECT BaseImpl
-    $new: VALUE_PARAMETER this@BaseImpl: BaseImpl
+    $this: VALUE_PARAMETER this@BaseImpl: BaseImpl
     CONSTRUCTOR private constructor BaseImpl()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -36,6 +37,7 @@ FILE /delegatedImplementation.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS INTERFACE IOther
+    $this: VALUE_PARAMETER this@IOther: IOther
     PROPERTY public abstract val x: kotlin.String
       FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <get-x>(): kotlin.String
         $this: VALUE_PARAMETER this@IOther: IOther
@@ -67,7 +69,7 @@ FILE /delegatedImplementation.kt
       RETURN type=kotlin.Nothing from='otherImpl(String, Int): IOther'
         BLOCK type=otherImpl.<no name provided> origin=OBJECT_LITERAL
           CLASS CLASS <no name provided>
-            $new: VALUE_PARAMETER this@<no name provided>: <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 Any()'
@@ -123,7 +125,7 @@ FILE /delegatedImplementation.kt
             FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
           CALL 'constructor <no name provided>()' type=otherImpl.<no name provided> origin=OBJECT_LITERAL
   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 Any()'
@@ -160,7 +162,7 @@ FILE /delegatedImplementation.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 Any()'

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

@@ -1,5 +1,6 @@
 FILE /delegatedImplementationWithExplicitOverride.kt
   CLASS INTERFACE IFooBar
+    $this: VALUE_PARAMETER this@IFooBar: IFooBar
     FUN public abstract fun foo(): kotlin.Unit
       $this: VALUE_PARAMETER this@IFooBar: IFooBar
     FUN public abstract fun bar(): kotlin.Unit
@@ -8,7 +9,7 @@ FILE /delegatedImplementationWithExplicitOverride.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS OBJECT FooBarImpl
-    $new: VALUE_PARAMETER this@FooBarImpl: FooBarImpl
+    $this: VALUE_PARAMETER this@FooBarImpl: FooBarImpl
     CONSTRUCTOR private constructor FooBarImpl()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -23,7 +24,7 @@ FILE /delegatedImplementationWithExplicitOverride.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   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/classes/delegatingConstructorCallToTypeAliasConstructor.txt

@@ -1,6 +1,6 @@
 FILE /delegatingConstructorCallToTypeAliasConstructor.kt
   CLASS CLASS Cell
-    $new: VALUE_PARAMETER this@Cell: Cell<T>
+    $this: VALUE_PARAMETER this@Cell: Cell<T>
     TYPE_PARAMETER <T>
     CONSTRUCTOR public constructor Cell<T>(value: T)
       VALUE_PARAMETER value-parameter value: T
@@ -23,7 +23,7 @@ FILE /delegatingConstructorCallToTypeAliasConstructor.kt
   TYPEALIAS typealias CT = Cell<T> type=Cell<T>
   TYPEALIAS typealias CStr = Cell<String> type=Cell<kotlin.String>
   CLASS CLASS C1
-    $new: VALUE_PARAMETER this@C1: C1
+    $this: VALUE_PARAMETER this@C1: C1
     CONSTRUCTOR public constructor C1()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Cell(String)'
@@ -35,7 +35,7 @@ FILE /delegatingConstructorCallToTypeAliasConstructor.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS C2
-    $new: VALUE_PARAMETER this@C2: C2
+    $this: VALUE_PARAMETER this@C2: C2
     CONSTRUCTOR public constructor C2()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Cell(String)'

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

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

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

@@ -1,6 +1,6 @@
 FILE /enum.kt
   CLASS ENUM_CLASS TestEnum1
-    $new: VALUE_PARAMETER this@TestEnum1: TestEnum1
+    $this: VALUE_PARAMETER this@TestEnum1: TestEnum1
     CONSTRUCTOR private constructor TestEnum1()
       BLOCK_BODY
         ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
@@ -25,7 +25,7 @@ FILE /enum.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): TestEnum1
       SYNTHETIC_BODY kind=ENUM_VALUEOF
   CLASS ENUM_CLASS TestEnum2
-    $new: VALUE_PARAMETER this@TestEnum2: TestEnum2
+    $this: VALUE_PARAMETER this@TestEnum2: TestEnum2
     CONSTRUCTOR private constructor TestEnum2(x: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       BLOCK_BODY
@@ -66,7 +66,7 @@ FILE /enum.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): TestEnum2
       SYNTHETIC_BODY kind=ENUM_VALUEOF
   CLASS ENUM_CLASS TestEnum3
-    $new: VALUE_PARAMETER this@TestEnum3: TestEnum3
+    $this: VALUE_PARAMETER this@TestEnum3: TestEnum3
     CONSTRUCTOR private constructor TestEnum3()
       BLOCK_BODY
         ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
@@ -74,7 +74,7 @@ FILE /enum.kt
     ENUM_ENTRY enum entry TEST
       init: ENUM_CONSTRUCTOR_CALL 'constructor TEST()'
       class: CLASS ENUM_ENTRY TEST
-        $new: VALUE_PARAMETER this@TEST: TEST
+        $this: VALUE_PARAMETER this@TEST: TEST
         CONSTRUCTOR private constructor TEST()
           BLOCK_BODY
             ENUM_CONSTRUCTOR_CALL 'constructor TestEnum3()'
@@ -113,7 +113,7 @@ FILE /enum.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): TestEnum3
       SYNTHETIC_BODY kind=ENUM_VALUEOF
   CLASS ENUM_CLASS TestEnum4
-    $new: VALUE_PARAMETER this@TestEnum4: TestEnum4
+    $this: VALUE_PARAMETER this@TestEnum4: TestEnum4
     CONSTRUCTOR private constructor TestEnum4(x: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       BLOCK_BODY
@@ -132,7 +132,7 @@ FILE /enum.kt
     ENUM_ENTRY enum entry TEST1
       init: ENUM_CONSTRUCTOR_CALL 'constructor TEST1()'
       class: CLASS ENUM_ENTRY TEST1
-        $new: VALUE_PARAMETER this@TEST1: TEST1
+        $this: VALUE_PARAMETER this@TEST1: TEST1
         CONSTRUCTOR private constructor TEST1()
           BLOCK_BODY
             ENUM_CONSTRUCTOR_CALL 'constructor TestEnum4(Int)'
@@ -159,7 +159,7 @@ FILE /enum.kt
     ENUM_ENTRY enum entry TEST2
       init: ENUM_CONSTRUCTOR_CALL 'constructor TEST2()'
       class: CLASS ENUM_ENTRY TEST2
-        $new: VALUE_PARAMETER this@TEST2: TEST2
+        $this: VALUE_PARAMETER this@TEST2: TEST2
         CONSTRUCTOR private constructor TEST2()
           BLOCK_BODY
             ENUM_CONSTRUCTOR_CALL 'constructor TestEnum4(Int)'
@@ -215,7 +215,7 @@ FILE /enum.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): TestEnum4
       SYNTHETIC_BODY kind=ENUM_VALUEOF
   CLASS ENUM_CLASS TestEnum5
-    $new: VALUE_PARAMETER this@TestEnum5: TestEnum5
+    $this: VALUE_PARAMETER this@TestEnum5: TestEnum5
     CONSTRUCTOR private constructor TestEnum5(x: kotlin.Int = ...)
       VALUE_PARAMETER value-parameter x: kotlin.Int = ...
         EXPRESSION_BODY

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

@@ -1,6 +1,6 @@
 FILE /enumWithSecondaryCtor.kt
   CLASS ENUM_CLASS Test0
-    $new: VALUE_PARAMETER this@Test0: Test0
+    $this: VALUE_PARAMETER this@Test0: Test0
     CONSTRUCTOR private constructor Test0(x: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       BLOCK_BODY
@@ -38,7 +38,7 @@ FILE /enumWithSecondaryCtor.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): Test0
       SYNTHETIC_BODY kind=ENUM_VALUEOF
   CLASS ENUM_CLASS Test1
-    $new: VALUE_PARAMETER this@Test1: Test1
+    $this: VALUE_PARAMETER this@Test1: Test1
     CONSTRUCTOR private constructor Test1(x: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       BLOCK_BODY
@@ -79,7 +79,7 @@ FILE /enumWithSecondaryCtor.kt
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): Test1
       SYNTHETIC_BODY kind=ENUM_VALUEOF
   CLASS ENUM_CLASS Test2
-    $new: VALUE_PARAMETER this@Test2: Test2
+    $this: VALUE_PARAMETER this@Test2: Test2
     CONSTRUCTOR private constructor Test2(x: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       BLOCK_BODY
@@ -98,7 +98,7 @@ FILE /enumWithSecondaryCtor.kt
     ENUM_ENTRY enum entry ZERO
       init: ENUM_CONSTRUCTOR_CALL 'constructor ZERO()'
       class: CLASS ENUM_ENTRY ZERO
-        $new: VALUE_PARAMETER this@ZERO: ZERO
+        $this: VALUE_PARAMETER this@ZERO: ZERO
         CONSTRUCTOR private constructor ZERO()
           BLOCK_BODY
             ENUM_CONSTRUCTOR_CALL 'constructor Test2()'
@@ -124,7 +124,7 @@ FILE /enumWithSecondaryCtor.kt
     ENUM_ENTRY enum entry ONE
       init: ENUM_CONSTRUCTOR_CALL 'constructor ONE()'
       class: CLASS ENUM_ENTRY ONE
-        $new: VALUE_PARAMETER this@ONE: ONE
+        $this: VALUE_PARAMETER this@ONE: ONE
         CONSTRUCTOR private constructor ONE()
           BLOCK_BODY
             ENUM_CONSTRUCTOR_CALL 'constructor Test2(Int)'

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

@@ -1,6 +1,6 @@
 FILE /initBlock.kt
   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 Any()'
@@ -12,7 +12,7 @@ FILE /initBlock.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(x: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       BLOCK_BODY
@@ -35,7 +35,7 @@ FILE /initBlock.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test3
-    $new: VALUE_PARAMETER this@Test3: Test3
+    $this: VALUE_PARAMETER this@Test3: Test3
     ANONYMOUS_INITIALIZER Test3
       BLOCK_BODY
         CALL 'println(): Unit' type=kotlin.Unit origin=null
@@ -47,7 +47,7 @@ FILE /initBlock.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test4
-    $new: VALUE_PARAMETER this@Test4: Test4
+    $this: VALUE_PARAMETER this@Test4: Test4
     ANONYMOUS_INITIALIZER Test4
       BLOCK_BODY
         CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
@@ -64,7 +64,7 @@ FILE /initBlock.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test5
-    $new: VALUE_PARAMETER this@Test5: Test5
+    $this: VALUE_PARAMETER this@Test5: Test5
     CONSTRUCTOR public constructor Test5()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -74,7 +74,7 @@ FILE /initBlock.kt
         CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
           message: CONST String type=kotlin.String value='1'
     CLASS CLASS TestInner
-      $new: VALUE_PARAMETER this@TestInner: TestInner
+      $this: VALUE_PARAMETER this@TestInner: TestInner
       CONSTRUCTOR public constructor TestInner()
         $outer: VALUE_PARAMETER this@Test5: Test5
         BLOCK_BODY

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

@@ -1,6 +1,6 @@
 FILE /initVal.kt
   CLASS CLASS TestInitValFromParameter
-    $new: VALUE_PARAMETER this@TestInitValFromParameter: TestInitValFromParameter
+    $this: VALUE_PARAMETER this@TestInitValFromParameter: TestInitValFromParameter
     CONSTRUCTOR public constructor TestInitValFromParameter(x: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       BLOCK_BODY
@@ -20,7 +20,7 @@ FILE /initVal.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS TestInitValInClass
-    $new: VALUE_PARAMETER this@TestInitValInClass: TestInitValInClass
+    $this: VALUE_PARAMETER this@TestInitValInClass: TestInitValInClass
     CONSTRUCTOR public constructor TestInitValInClass()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -39,7 +39,7 @@ FILE /initVal.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS TestInitValInInitBlock
-    $new: VALUE_PARAMETER this@TestInitValInInitBlock: TestInitValInInitBlock
+    $this: VALUE_PARAMETER this@TestInitValInInitBlock: TestInitValInInitBlock
     CONSTRUCTOR public constructor TestInitValInInitBlock()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'

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

@@ -1,6 +1,6 @@
 FILE /initVar.kt
   CLASS CLASS TestInitVarFromParameter
-    $new: VALUE_PARAMETER this@TestInitVarFromParameter: TestInitVarFromParameter
+    $this: VALUE_PARAMETER this@TestInitVarFromParameter: TestInitVarFromParameter
     CONSTRUCTOR public constructor TestInitVarFromParameter(x: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       BLOCK_BODY
@@ -27,7 +27,7 @@ FILE /initVar.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS TestInitVarInClass
-    $new: VALUE_PARAMETER this@TestInitVarInClass: TestInitVarInClass
+    $this: VALUE_PARAMETER this@TestInitVarInClass: TestInitVarInClass
     CONSTRUCTOR public constructor TestInitVarInClass()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -53,7 +53,7 @@ FILE /initVar.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS TestInitVarInInitBlock
-    $new: VALUE_PARAMETER this@TestInitVarInInitBlock: TestInitVarInInitBlock
+    $this: VALUE_PARAMETER this@TestInitVarInInitBlock: TestInitVarInInitBlock
     CONSTRUCTOR public constructor TestInitVarInInitBlock()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -82,7 +82,7 @@ FILE /initVar.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS TestInitVarWithCustomSetter
-    $new: VALUE_PARAMETER this@TestInitVarWithCustomSetter: TestInitVarWithCustomSetter
+    $this: VALUE_PARAMETER this@TestInitVarWithCustomSetter: TestInitVarWithCustomSetter
     CONSTRUCTOR public constructor TestInitVarWithCustomSetter()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -108,7 +108,7 @@ FILE /initVar.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS TestInitVarWithCustomSetterWithExplicitCtor
-    $new: VALUE_PARAMETER this@TestInitVarWithCustomSetterWithExplicitCtor: TestInitVarWithCustomSetterWithExplicitCtor
+    $this: VALUE_PARAMETER this@TestInitVarWithCustomSetterWithExplicitCtor: TestInitVarWithCustomSetterWithExplicitCtor
     PROPERTY public final var x: kotlin.Int
       FIELD PROPERTY_BACKING_FIELD public final var x: kotlin.Int
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
@@ -137,7 +137,7 @@ FILE /initVar.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS TestInitVarWithCustomSetterInCtor
-    $new: VALUE_PARAMETER this@TestInitVarWithCustomSetterInCtor: TestInitVarWithCustomSetterInCtor
+    $this: VALUE_PARAMETER this@TestInitVarWithCustomSetterInCtor: TestInitVarWithCustomSetterInCtor
     PROPERTY public final var x: kotlin.Int
       FIELD PROPERTY_BACKING_FIELD public final var x: kotlin.Int
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int

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

@@ -1,12 +1,12 @@
 FILE /innerClass.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 TestInnerClass
-      $new: VALUE_PARAMETER this@TestInnerClass: TestInnerClass
+      $this: VALUE_PARAMETER this@TestInnerClass: TestInnerClass
       CONSTRUCTOR public constructor TestInnerClass()
         $outer: VALUE_PARAMETER this@Outer: Outer
         BLOCK_BODY
@@ -16,7 +16,7 @@ FILE /innerClass.kt
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
     CLASS CLASS DerivedInnerClass
-      $new: VALUE_PARAMETER this@DerivedInnerClass: DerivedInnerClass
+      $this: VALUE_PARAMETER this@DerivedInnerClass: DerivedInnerClass
       CONSTRUCTOR public constructor DerivedInnerClass()
         $outer: VALUE_PARAMETER this@Outer: Outer
         BLOCK_BODY

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

@@ -1,12 +1,12 @@
 FILE /innerClassWithDelegatingConstructor.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(x: kotlin.Int)
         $outer: VALUE_PARAMETER this@Outer: Outer
         VALUE_PARAMETER value-parameter x: kotlin.Int

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

@@ -2,7 +2,7 @@ FILE /localClasses.kt
   FUN public fun outer(): kotlin.Unit
     BLOCK_BODY
       CLASS CLASS LocalClass
-        $new: VALUE_PARAMETER this@LocalClass: LocalClass
+        $this: VALUE_PARAMETER this@LocalClass: LocalClass
         CONSTRUCTOR public constructor LocalClass()
           BLOCK_BODY
             DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'

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

@@ -1,5 +1,6 @@
 FILE /objectLiteralExpressions.kt
   CLASS INTERFACE IFoo
+    $this: VALUE_PARAMETER this@IFoo: IFoo
     FUN public abstract fun foo(): kotlin.Unit
       $this: VALUE_PARAMETER this@IFoo: IFoo
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
@@ -10,7 +11,7 @@ FILE /objectLiteralExpressions.kt
       EXPRESSION_BODY
         BLOCK type=test1.<no name provided> origin=OBJECT_LITERAL
           CLASS CLASS <no name provided>
-            $new: VALUE_PARAMETER this@<no name provided>: <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 Any()'
@@ -28,7 +29,7 @@ FILE /objectLiteralExpressions.kt
       EXPRESSION_BODY
         BLOCK type=test2.<no name provided> origin=OBJECT_LITERAL
           CLASS CLASS <no name provided>
-            $new: VALUE_PARAMETER this@<no name provided>: <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 Any()'
@@ -47,13 +48,13 @@ FILE /objectLiteralExpressions.kt
         RETURN type=kotlin.Nothing from='<get-test2>(): IFoo'
           GET_FIELD 'test2: IFoo' type=IFoo origin=null
   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
@@ -69,7 +70,7 @@ FILE /objectLiteralExpressions.kt
         RETURN type=kotlin.Nothing from='test3(): Outer.Inner'
           BLOCK type=Outer.test3.<no name provided> origin=OBJECT_LITERAL
             CLASS CLASS <no name provided>
-              $new: VALUE_PARAMETER this@<no name provided>: <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()'
@@ -93,7 +94,7 @@ FILE /objectLiteralExpressions.kt
       RETURN type=kotlin.Nothing from='test4() on Outer: Outer.Inner'
         BLOCK type=test4.<no name provided> origin=OBJECT_LITERAL
           CLASS CLASS <no name provided>
-            $new: VALUE_PARAMETER this@<no name provided>: <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()'

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

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

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

@@ -1,6 +1,6 @@
 FILE /outerClassAccess.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 /outerClassAccess.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
@@ -21,7 +21,7 @@ FILE /outerClassAccess.kt
           CALL 'foo(): Unit' type=kotlin.Unit origin=null
             $this: GET_VAR 'this@Outer: Outer' type=Outer origin=null
       CLASS CLASS Inner2
-        $new: VALUE_PARAMETER this@Inner2: Inner2
+        $this: VALUE_PARAMETER this@Inner2: Inner2
         CONSTRUCTOR public constructor Inner2()
           $outer: VALUE_PARAMETER this@Inner: Inner
           BLOCK_BODY

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

@@ -1,6 +1,6 @@
 FILE /primaryConstructor.kt
   CLASS CLASS Test1
-    $new: VALUE_PARAMETER this@Test1: Test1
+    $this: VALUE_PARAMETER this@Test1: Test1
     CONSTRUCTOR public constructor Test1(x: kotlin.Int, y: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter y: kotlin.Int
@@ -31,7 +31,7 @@ FILE /primaryConstructor.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(x: kotlin.Int, y: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter y: kotlin.Int
@@ -62,7 +62,7 @@ FILE /primaryConstructor.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test3
-    $new: VALUE_PARAMETER this@Test3: Test3
+    $this: VALUE_PARAMETER this@Test3: Test3
     CONSTRUCTOR public constructor Test3(x: kotlin.Int, y: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter y: kotlin.Int

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

@@ -1,6 +1,6 @@
 FILE /primaryConstructorWithSuperConstructorCall.kt
   CLASS CLASS Base
-    $new: VALUE_PARAMETER this@Base: Base
+    $this: VALUE_PARAMETER this@Base: Base
     CONSTRUCTOR public constructor Base()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -9,7 +9,7 @@ FILE /primaryConstructorWithSuperConstructorCall.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS TestImplicitPrimaryConstructor
-    $new: VALUE_PARAMETER this@TestImplicitPrimaryConstructor: TestImplicitPrimaryConstructor
+    $this: VALUE_PARAMETER this@TestImplicitPrimaryConstructor: TestImplicitPrimaryConstructor
     CONSTRUCTOR public constructor TestImplicitPrimaryConstructor()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Base()'
@@ -18,7 +18,7 @@ FILE /primaryConstructorWithSuperConstructorCall.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS TestExplicitPrimaryConstructor
-    $new: VALUE_PARAMETER this@TestExplicitPrimaryConstructor: TestExplicitPrimaryConstructor
+    $this: VALUE_PARAMETER this@TestExplicitPrimaryConstructor: TestExplicitPrimaryConstructor
     CONSTRUCTOR public constructor TestExplicitPrimaryConstructor()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Base()'
@@ -27,7 +27,7 @@ FILE /primaryConstructorWithSuperConstructorCall.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS TestWithDelegatingConstructor
-    $new: VALUE_PARAMETER this@TestWithDelegatingConstructor: TestWithDelegatingConstructor
+    $this: VALUE_PARAMETER this@TestWithDelegatingConstructor: TestWithDelegatingConstructor
     CONSTRUCTOR public constructor TestWithDelegatingConstructor(x: kotlin.Int, y: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter y: kotlin.Int

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

@@ -1,5 +1,6 @@
 FILE /qualifiedSuperCalls.kt
   CLASS INTERFACE ILeft
+    $this: VALUE_PARAMETER this@ILeft: ILeft
     FUN public open fun foo(): kotlin.Unit
       $this: VALUE_PARAMETER this@ILeft: ILeft
       BLOCK_BODY
@@ -13,6 +14,7 @@ FILE /qualifiedSuperCalls.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS INTERFACE IRight
+    $this: VALUE_PARAMETER this@IRight: IRight
     FUN public open fun foo(): kotlin.Unit
       $this: VALUE_PARAMETER this@IRight: IRight
       BLOCK_BODY
@@ -26,7 +28,7 @@ FILE /qualifiedSuperCalls.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS CBoth
-    $new: VALUE_PARAMETER this@CBoth: CBoth
+    $this: VALUE_PARAMETER this@CBoth: CBoth
     CONSTRUCTOR public constructor CBoth()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'

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

@@ -1,12 +1,12 @@
 FILE /sealedClasses.kt
   CLASS CLASS Expr
-    $new: VALUE_PARAMETER this@Expr: Expr
+    $this: VALUE_PARAMETER this@Expr: Expr
     CONSTRUCTOR private constructor Expr()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Expr'
     CLASS CLASS Const
-      $new: VALUE_PARAMETER this@Const: Const
+      $this: VALUE_PARAMETER this@Const: Const
       CONSTRUCTOR public constructor Const(number: kotlin.Double)
         VALUE_PARAMETER value-parameter number: kotlin.Double
         BLOCK_BODY
@@ -26,7 +26,7 @@ FILE /sealedClasses.kt
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
     CLASS CLASS Sum
-      $new: VALUE_PARAMETER this@Sum: Sum
+      $this: VALUE_PARAMETER this@Sum: Sum
       CONSTRUCTOR public constructor Sum(e1: Expr, e2: Expr)
         VALUE_PARAMETER value-parameter e1: Expr
         VALUE_PARAMETER value-parameter e2: Expr
@@ -57,7 +57,7 @@ FILE /sealedClasses.kt
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
     CLASS OBJECT NotANumber
-      $new: VALUE_PARAMETER this@NotANumber: NotANumber
+      $this: VALUE_PARAMETER this@NotANumber: NotANumber
       CONSTRUCTOR private constructor NotANumber()
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'constructor Expr()'

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

@@ -1,6 +1,6 @@
 FILE /secondaryConstructorWithInitializersFromClassBody.kt
   CLASS CLASS Base
-    $new: VALUE_PARAMETER this@Base: Base
+    $this: VALUE_PARAMETER this@Base: Base
     CONSTRUCTOR public constructor Base()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -9,7 +9,7 @@ FILE /secondaryConstructorWithInitializersFromClassBody.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS TestProperty
-    $new: VALUE_PARAMETER this@TestProperty: TestProperty
+    $this: VALUE_PARAMETER this@TestProperty: TestProperty
     PROPERTY public final val x: kotlin.Int = 0
       FIELD PROPERTY_BACKING_FIELD public final val x: kotlin.Int = 0
         EXPRESSION_BODY
@@ -28,7 +28,7 @@ FILE /secondaryConstructorWithInitializersFromClassBody.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS TestInitBlock
-    $new: VALUE_PARAMETER this@TestInitBlock: TestInitBlock
+    $this: VALUE_PARAMETER this@TestInitBlock: TestInitBlock
     PROPERTY public final val x: kotlin.Int
       FIELD PROPERTY_BACKING_FIELD public final val x: kotlin.Int
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int

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

@@ -1,6 +1,6 @@
 FILE /secondaryConstructors.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 C(Int)'

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

@@ -1,6 +1,6 @@
 FILE /superCalls.kt
   CLASS CLASS Base
-    $new: VALUE_PARAMETER this@Base: Base
+    $this: VALUE_PARAMETER this@Base: Base
     CONSTRUCTOR public constructor Base()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -22,7 +22,7 @@ FILE /superCalls.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   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/declarations/classLevelProperties.txt

@@ -1,6 +1,6 @@
 FILE /classLevelProperties.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/declarations/delegatedProperties.txt

@@ -19,7 +19,7 @@ FILE /delegatedProperties.kt
             thisRef: CONST Null type=kotlin.Nothing? value='null'
             property: PROPERTY_REFERENCE 'test1: Int' field=null getter='<get-test1>(): Int' setter=null type=kotlin.reflect.KProperty0<kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
   CLASS CLASS C
-    $new: VALUE_PARAMETER this@C: C
+    $this: VALUE_PARAMETER this@C: C
     CONSTRUCTOR public constructor C(map: kotlin.collections.MutableMap<kotlin.String, kotlin.Any>)
       VALUE_PARAMETER value-parameter map: kotlin.collections.MutableMap<kotlin.String, kotlin.Any>
       BLOCK_BODY

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

@@ -1,5 +1,6 @@
 FILE /fakeOverrides.kt
   CLASS INTERFACE IFooStr
+    $this: VALUE_PARAMETER this@IFooStr: IFooStr
     FUN public abstract fun foo(x: kotlin.String): kotlin.Unit
       $this: VALUE_PARAMETER this@IFooStr: IFooStr
       VALUE_PARAMETER value-parameter x: kotlin.String
@@ -7,6 +8,7 @@ FILE /fakeOverrides.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS INTERFACE IBar
+    $this: VALUE_PARAMETER this@IBar: IBar
     PROPERTY public abstract val bar: kotlin.Int
       FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <get-bar>(): kotlin.Int
         $this: VALUE_PARAMETER this@IBar: IBar
@@ -14,7 +16,7 @@ FILE /fakeOverrides.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS CFoo
-    $new: VALUE_PARAMETER this@CFoo: CFoo<T>
+    $this: VALUE_PARAMETER this@CFoo: CFoo<T>
     TYPE_PARAMETER <T>
     CONSTRUCTOR public constructor CFoo<T>()
       BLOCK_BODY
@@ -28,7 +30,7 @@ FILE /fakeOverrides.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 CFoo()'

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

@@ -1,5 +1,6 @@
 FILE /interfaceProperties.kt
   CLASS INTERFACE C
+    $this: VALUE_PARAMETER this@C: C
     PROPERTY public abstract val test1: kotlin.Int
       FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <get-test1>(): kotlin.Int
         $this: VALUE_PARAMETER this@C: C

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

@@ -1,7 +1,9 @@
 FILE /class.kt
   CLASS INTERFACE TestInterface
+    $this: VALUE_PARAMETER this@TestInterface: TestInterface<T>
     TYPE_PARAMETER <T>
     CLASS INTERFACE TestNestedInterface
+      $this: VALUE_PARAMETER this@TestNestedInterface: TestNestedInterface<TT>
       TYPE_PARAMETER <TT>
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
@@ -10,14 +12,14 @@ FILE /class.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test
-    $new: VALUE_PARAMETER this@Test: Test<T0>
+    $this: VALUE_PARAMETER this@Test: Test<T0>
     TYPE_PARAMETER <T0>
     CONSTRUCTOR public constructor Test<T0>()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Test'
     CLASS CLASS TestNested
-      $new: VALUE_PARAMETER this@TestNested: TestNested<T1>
+      $this: VALUE_PARAMETER this@TestNested: TestNested<T1>
       TYPE_PARAMETER <T1>
       CONSTRUCTOR public constructor TestNested<T1>()
         BLOCK_BODY
@@ -27,7 +29,7 @@ FILE /class.kt
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
     CLASS CLASS TestInner
-      $new: VALUE_PARAMETER this@TestInner: TestInner<T2, T0>
+      $this: VALUE_PARAMETER this@TestInner: TestInner<T2, T0>
       TYPE_PARAMETER <T2>
       CONSTRUCTOR public constructor TestInner<T2>()
         $outer: VALUE_PARAMETER this@Test: Test<T0>

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

@@ -1,6 +1,6 @@
 FILE /constructor.kt
   CLASS CLASS Test1
-    $new: VALUE_PARAMETER this@Test1: Test1<T1, T2>
+    $this: VALUE_PARAMETER this@Test1: Test1<T1, T2>
     TYPE_PARAMETER <T1>
     TYPE_PARAMETER <T2>
     CONSTRUCTOR public constructor Test1<T1, T2>(x: T1, y: T2)
@@ -33,7 +33,7 @@ FILE /constructor.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(x: kotlin.Int, y: kotlin.String)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter y: kotlin.String
@@ -51,7 +51,7 @@ FILE /constructor.kt
             GET_FIELD 'y: String' type=kotlin.String origin=null
               receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
     CLASS CLASS TestInner
-      $new: VALUE_PARAMETER this@TestInner: TestInner<Z>
+      $this: VALUE_PARAMETER this@TestInner: TestInner<Z>
       TYPE_PARAMETER <Z>
       CONSTRUCTOR public constructor TestInner<Z>(z: Z)
         $outer: VALUE_PARAMETER this@Test2: Test2
@@ -85,7 +85,7 @@ FILE /constructor.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test3
-    $new: VALUE_PARAMETER this@Test3: Test3
+    $this: VALUE_PARAMETER this@Test3: Test3
     CONSTRUCTOR public constructor Test3(x: kotlin.Int, y: kotlin.String = ...)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter y: kotlin.String = ...
@@ -118,7 +118,7 @@ FILE /constructor.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test4
-    $new: VALUE_PARAMETER this@Test4: Test4<T>
+    $this: VALUE_PARAMETER this@Test4: Test4<T>
     TYPE_PARAMETER <T>
     CONSTRUCTOR public constructor Test4<T>(x: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int

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

@@ -1,6 +1,6 @@
 FILE /dataClassMembers.kt
   CLASS CLASS Test
-    $new: VALUE_PARAMETER this@Test: Test<T>
+    $this: VALUE_PARAMETER this@Test: Test<T>
     TYPE_PARAMETER <T>
     CONSTRUCTOR public constructor Test<T>(x: T, y: kotlin.String = ...)
       VALUE_PARAMETER value-parameter x: T

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

@@ -21,7 +21,7 @@ FILE /defaultPropertyAccessors.kt
         SET_FIELD 'test2: Int' type=kotlin.Unit origin=null
           value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
   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()'
@@ -57,7 +57,7 @@ FILE /defaultPropertyAccessors.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS InPrimaryCtor
-    $new: VALUE_PARAMETER this@InPrimaryCtor: InPrimaryCtor<T>
+    $this: VALUE_PARAMETER this@InPrimaryCtor: InPrimaryCtor<T>
     TYPE_PARAMETER <T>
     CONSTRUCTOR public constructor InPrimaryCtor<T>(testInPrimaryCtor1: T, testInPrimaryCtor2: kotlin.Int = ...)
       VALUE_PARAMETER value-parameter testInPrimaryCtor1: T

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

@@ -1,5 +1,6 @@
 FILE /delegatedMembers.kt
   CLASS INTERFACE IBase
+    $this: VALUE_PARAMETER this@IBase: IBase<T>
     TYPE_PARAMETER <T>
     FUN public abstract fun foo(x: kotlin.Int): kotlin.Unit
       $this: VALUE_PARAMETER this@IBase: IBase<T>
@@ -16,7 +17,7 @@ FILE /delegatedMembers.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test
-    $new: VALUE_PARAMETER this@Test: Test<TT>
+    $this: VALUE_PARAMETER this@Test: Test<TT>
     TYPE_PARAMETER <TT>
     CONSTRUCTOR public constructor Test<TT>(impl: IBase<TT>)
       VALUE_PARAMETER value-parameter impl: IBase<TT>

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

@@ -21,7 +21,7 @@ FILE /fun.kt
     VALUE_PARAMETER value-parameter j: kotlin.String
     BLOCK_BODY
   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/declarations/parameters/genericInnerClass.txt

@@ -1,13 +1,13 @@
 FILE /genericInnerClass.kt
   CLASS CLASS Outer
-    $new: VALUE_PARAMETER this@Outer: Outer<T1>
+    $this: VALUE_PARAMETER this@Outer: Outer<T1>
     TYPE_PARAMETER <T1>
     CONSTRUCTOR public constructor Outer<T1>()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Outer'
     CLASS CLASS Inner
-      $new: VALUE_PARAMETER this@Inner: Inner<T2, T1>
+      $this: VALUE_PARAMETER this@Inner: Inner<T2, T1>
       TYPE_PARAMETER <T2>
       CONSTRUCTOR public constructor Inner<T2>()
         $outer: VALUE_PARAMETER this@Outer: Outer<T1>

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

@@ -45,7 +45,7 @@ FILE /propertyAccessors.kt
       VALUE_PARAMETER value-parameter value: kotlin.Int
       BLOCK_BODY
   CLASS CLASS Host
-    $new: VALUE_PARAMETER this@Host: Host<T>
+    $this: VALUE_PARAMETER this@Host: Host<T>
     TYPE_PARAMETER <T>
     CONSTRUCTOR public constructor Host<T>()
       BLOCK_BODY

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

@@ -1,6 +1,6 @@
 FILE /primaryCtorDefaultArguments.kt
   CLASS CLASS Test
-    $new: VALUE_PARAMETER this@Test: Test
+    $this: VALUE_PARAMETER this@Test: Test
     CONSTRUCTOR public constructor Test(x: kotlin.Int = ...)
       VALUE_PARAMETER value-parameter x: kotlin.Int = ...
         EXPRESSION_BODY

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

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

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

@@ -1,6 +1,6 @@
 FILE /differentReceivers.kt
   CLASS CLASS MyClass
-    $new: VALUE_PARAMETER this@MyClass: MyClass
+    $this: VALUE_PARAMETER this@MyClass: MyClass
     CONSTRUCTOR public constructor MyClass(value: kotlin.String)
       VALUE_PARAMETER value-parameter value: kotlin.String
       BLOCK_BODY

compiler/testData/ir/irText/declarations/provideDelegate/local.txt

@@ -1,6 +1,6 @@
 FILE /local.kt
   CLASS CLASS Delegate
-    $new: VALUE_PARAMETER this@Delegate: Delegate
+    $this: VALUE_PARAMETER this@Delegate: Delegate
     CONSTRUCTOR public constructor Delegate(value: kotlin.String)
       VALUE_PARAMETER value-parameter value: kotlin.String
       BLOCK_BODY
@@ -28,7 +28,7 @@ FILE /local.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS DelegateProvider
-    $new: VALUE_PARAMETER this@DelegateProvider: DelegateProvider
+    $this: VALUE_PARAMETER this@DelegateProvider: DelegateProvider
     CONSTRUCTOR public constructor DelegateProvider(value: kotlin.String)
       VALUE_PARAMETER value-parameter value: kotlin.String
       BLOCK_BODY

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

@@ -1,6 +1,6 @@
 FILE /localDifferentReceivers.kt
   CLASS CLASS MyClass
-    $new: VALUE_PARAMETER this@MyClass: MyClass
+    $this: VALUE_PARAMETER this@MyClass: MyClass
     CONSTRUCTOR public constructor MyClass(value: kotlin.String)
       VALUE_PARAMETER value-parameter value: kotlin.String
       BLOCK_BODY

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

@@ -1,6 +1,6 @@
 FILE /member.kt
   CLASS CLASS Delegate
-    $new: VALUE_PARAMETER this@Delegate: Delegate
+    $this: VALUE_PARAMETER this@Delegate: Delegate
     CONSTRUCTOR public constructor Delegate(value: kotlin.String)
       VALUE_PARAMETER value-parameter value: kotlin.String
       BLOCK_BODY
@@ -28,7 +28,7 @@ FILE /member.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS DelegateProvider
-    $new: VALUE_PARAMETER this@DelegateProvider: DelegateProvider
+    $this: VALUE_PARAMETER this@DelegateProvider: DelegateProvider
     CONSTRUCTOR public constructor DelegateProvider(value: kotlin.String)
       VALUE_PARAMETER value-parameter value: kotlin.String
       BLOCK_BODY
@@ -57,7 +57,7 @@ FILE /member.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   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/declarations/provideDelegate/memberExtension.txt

@@ -1,12 +1,12 @@
 FILE /memberExtension.kt
   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()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Host'
     CLASS CLASS StringDelegate
-      $new: VALUE_PARAMETER this@StringDelegate: StringDelegate
+      $this: VALUE_PARAMETER this@StringDelegate: StringDelegate
       CONSTRUCTOR public constructor StringDelegate(s: kotlin.String)
         VALUE_PARAMETER value-parameter s: kotlin.String
         BLOCK_BODY

compiler/testData/ir/irText/declarations/provideDelegate/topLevel.txt

@@ -1,6 +1,6 @@
 FILE /topLevel.kt
   CLASS CLASS Delegate
-    $new: VALUE_PARAMETER this@Delegate: Delegate
+    $this: VALUE_PARAMETER this@Delegate: Delegate
     CONSTRUCTOR public constructor Delegate(value: kotlin.String)
       VALUE_PARAMETER value-parameter value: kotlin.String
       BLOCK_BODY
@@ -28,7 +28,7 @@ FILE /topLevel.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS DelegateProvider
-    $new: VALUE_PARAMETER this@DelegateProvider: DelegateProvider
+    $this: VALUE_PARAMETER this@DelegateProvider: DelegateProvider
     CONSTRUCTOR public constructor DelegateProvider(value: kotlin.String)
       VALUE_PARAMETER value-parameter value: kotlin.String
       BLOCK_BODY

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

@@ -4,7 +4,7 @@ FILE /typeAlias.kt
     BLOCK_BODY
       TYPEALIAS typealias TestLocal = String type=kotlin.String
   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/errors/suppressedNonPublicCall.txt

@@ -1,6 +1,6 @@
 FILE /suppressedNonPublicCall.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/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()'

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

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

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

@@ -1,6 +1,6 @@
 FILE /multipleImplicitReceivers.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 /multipleImplicitReceivers.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()'
@@ -18,6 +18,7 @@ FILE /multipleImplicitReceivers.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS INTERFACE IFoo
+    $this: VALUE_PARAMETER this@IFoo: IFoo
     PROPERTY public open val A.foo: B
       FUN public open fun A.<get-foo>(): B
         $this: VALUE_PARAMETER this@IFoo: IFoo
@@ -29,6 +30,7 @@ FILE /multipleImplicitReceivers.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS INTERFACE IInvoke
+    $this: VALUE_PARAMETER this@IInvoke: IInvoke
     FUN public open operator fun B.invoke(): kotlin.Int
       $this: VALUE_PARAMETER this@IInvoke: IInvoke
       $receiver: VALUE_PARAMETER this@invoke: B

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

@@ -1,5 +1,6 @@
 FILE /integerCoercionToT.kt
   CLASS INTERFACE CPointed
+    $this: VALUE_PARAMETER this@CPointed: CPointed
     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
@@ -10,7 +11,7 @@ FILE /integerCoercionToT.kt
       RETURN type=kotlin.Nothing from='reinterpret() on CPointed: T'
         CALL 'TODO(): Nothing' type=kotlin.Nothing origin=null
   CLASS CLASS CInt32VarX
-    $new: VALUE_PARAMETER this@CInt32VarX: CInt32VarX<T>
+    $this: VALUE_PARAMETER this@CInt32VarX: CInt32VarX<T>
     TYPE_PARAMETER <T>
     CONSTRUCTOR public constructor CInt32VarX<T>()
       BLOCK_BODY
@@ -31,7 +32,7 @@ FILE /integerCoercionToT.kt
       VALUE_PARAMETER value-parameter value: T_INT
       BLOCK_BODY
   CLASS CLASS IdType
-    $new: VALUE_PARAMETER this@IdType: IdType
+    $this: VALUE_PARAMETER this@IdType: IdType
     CONSTRUCTOR public constructor IdType(value: kotlin.Int)
       VALUE_PARAMETER value-parameter value: kotlin.Int
       BLOCK_BODY

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

@@ -1,6 +1,6 @@
 FILE /typeAliasCtorForGenericClass.kt
   CLASS CLASS A
-    $new: VALUE_PARAMETER this@A: A<Q>
+    $this: VALUE_PARAMETER this@A: A<Q>
     TYPE_PARAMETER <Q>
     CONSTRUCTOR public constructor A<Q>(q: Q)
       VALUE_PARAMETER value-parameter q: Q

compiler/testData/ir/irText/singletons/companion.txt

@@ -1,6 +1,6 @@
 FILE /companion.kt
   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()'
@@ -11,7 +11,7 @@ FILE /companion.kt
         CALL 'test(): Unit' type=kotlin.Unit origin=null
           $this: GET_OBJECT 'companion object of Z' type=Z.Companion
     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()'