diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt
index 26cb9ba4dd9..b09d46c797d 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt
@@ -65,7 +65,7 @@ class ClassGenerator(declarationGenerator: DeclarationGenerator) : DeclarationGe
 
             generateMembersDeclaredInClassBody(irClass, ktClassOrObject)
 
-            generateFakeOverrideMemberDeclarations(irClass)
+            generateFakeOverrideMemberDeclarations(irClass, ktClassOrObject)
 
             if (descriptor.isData) {
                 generateAdditionalMembersForDataClass(irClass, ktClassOrObject)
@@ -77,7 +77,7 @@ class ClassGenerator(declarationGenerator: DeclarationGenerator) : DeclarationGe
         }
     }
 
-    private fun generateFakeOverrideMemberDeclarations(irClass: IrClass) {
+    private fun generateFakeOverrideMemberDeclarations(irClass: IrClass, ktClassOrObject: KtClassOrObject) {
         irClass.descriptor.unsubstitutedMemberScope.getContributedDescriptors()
                 .mapNotNull {
                     it.safeAs<CallableMemberDescriptor>().takeIf {
@@ -86,7 +86,7 @@ class ClassGenerator(declarationGenerator: DeclarationGenerator) : DeclarationGe
                 }
                 .sortedWith(StableCallableMembersComparator)
                 .forEach { fakeOverride ->
-                    irClass.addMember(declarationGenerator.generateFakeOverrideDeclaration(fakeOverride))
+                    irClass.addMember(declarationGenerator.generateFakeOverrideDeclaration(fakeOverride, ktClassOrObject))
                 }
     }
 
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DeclarationGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DeclarationGenerator.kt
index 3bd05c3c8a4..c6aeeee3a62 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DeclarationGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DeclarationGenerator.kt
@@ -87,7 +87,7 @@ class DeclarationGenerator(override val context: GeneratorContext) : Generator {
     fun generateInitializerBody(scopeOwnerSymbol: IrSymbol, ktBody: KtExpression): IrExpressionBody =
             createBodyGenerator(scopeOwnerSymbol).generateExpressionBody(ktBody)
 
-    fun generateFakeOverrideDeclaration(memberDescriptor: CallableMemberDescriptor, ktElement: KtElement? = null): IrDeclaration {
+    fun generateFakeOverrideDeclaration(memberDescriptor: CallableMemberDescriptor, ktElement: KtElement): IrDeclaration {
         assert(memberDescriptor.kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE) {
             "Fake override expected: $memberDescriptor"
         }
@@ -101,7 +101,7 @@ class DeclarationGenerator(override val context: GeneratorContext) : Generator {
         }
     }
 
-    private fun generateFakeOverrideProperty(propertyDescriptor: PropertyDescriptor, ktElement: KtElement?): IrProperty =
+    private fun generateFakeOverrideProperty(propertyDescriptor: PropertyDescriptor, ktElement: KtElement): IrProperty =
             IrPropertyImpl(
                     ktElement.startOffsetOrUndefined, ktElement.endOffsetOrUndefined,
                     IrDeclarationOrigin.FAKE_OVERRIDE,
@@ -117,12 +117,8 @@ class DeclarationGenerator(override val context: GeneratorContext) : Generator {
                     propertyDescriptor.setter?.let { generateFakeOverrideFunction(it, ktElement) }
             )
 
-    private fun generateFakeOverrideFunction(functionDescriptor: FunctionDescriptor, ktElement: KtElement?): IrFunction =
-            context.symbolTable.declareSimpleFunction(
-                    ktElement.startOffsetOrUndefined, ktElement.endOffsetOrUndefined,
-                    IrDeclarationOrigin.FAKE_OVERRIDE,
-                    functionDescriptor
-            )
+    private fun generateFakeOverrideFunction(functionDescriptor: FunctionDescriptor, ktElement: KtElement): IrFunction =
+            FunctionGenerator(this).generateFakeOverrideFunction(functionDescriptor, ktElement)
 }
 
 abstract class DeclarationGeneratorExtension(val declarationGenerator: DeclarationGenerator) : Generator {
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt
index 7386de13a2d..fb5ab87a574 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/FunctionGenerator.kt
@@ -54,6 +54,14 @@ class FunctionGenerator(declarationGenerator: DeclarationGenerator) : Declaratio
                 generateLambdaBody(ktFunction)
             }
 
+    fun generateFakeOverrideFunction(functionDescriptor: FunctionDescriptor, ktElement: KtElement): IrFunction =
+            context.symbolTable.declareSimpleFunction(
+                    ktElement.startOffsetOrUndefined, ktElement.endOffsetOrUndefined,
+                    IrDeclarationOrigin.FAKE_OVERRIDE,
+                    functionDescriptor
+            ).buildWithScope { irFunction ->
+                generateFunctionParameterDeclarations(irFunction, ktElement, null)
+            }
 
     private inline fun declareSimpleFunction(
             ktFunction: KtFunction,
@@ -71,7 +79,7 @@ class FunctionGenerator(declarationGenerator: DeclarationGenerator) : Declaratio
 
     fun generateFunctionParameterDeclarations(
             irFunction: IrFunction,
-            ktParameterOwner: KtElement,
+            ktParameterOwner: KtElement?,
             ktReceiverParameterElement: KtElement?
     ) {
         declarationGenerator.generateTypeParameterDeclarations(irFunction, irFunction.descriptor.typeParameters)
diff --git a/compiler/testData/ir/irText/classes/abstractMembers.txt b/compiler/testData/ir/irText/classes/abstractMembers.txt
index 7ed60473f27..1105f7b4809 100644
--- a/compiler/testData/ir/irText/classes/abstractMembers.txt
+++ b/compiler/testData/ir/irText/classes/abstractMembers.txt
@@ -17,8 +17,12 @@ FILE /abstractMembers.kt
         $this: VALUE_PARAMETER this@AbstractClass: AbstractClass
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS INTERFACE Interface
     $this: VALUE_PARAMETER this@Interface: Interface
     FUN public abstract fun abstractFun(): kotlin.Unit
@@ -33,5 +37,10 @@ FILE /abstractMembers.kt
         $this: VALUE_PARAMETER this@Interface: Interface
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.txt b/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.txt
index f1649212d15..42ba986af49 100644
--- a/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.txt
+++ b/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.txt
@@ -28,8 +28,12 @@ FILE /argumentReorderingInDelegatingConstructorCall.kt
             GET_FIELD 'y: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@Base: Base' type=Base origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS Test1
     $this: VALUE_PARAMETER this@Test1: Test1
     CONSTRUCTOR public constructor Test1(xx: kotlin.Int, yy: kotlin.Int)
@@ -47,11 +51,17 @@ FILE /argumentReorderingInDelegatingConstructorCall.kt
         INSTANCE_INITIALIZER_CALL classDescriptor='Test1'
     PROPERTY FAKE_OVERRIDE public final override val x: kotlin.Int
       FUN FAKE_OVERRIDE public final override fun <get-x>(): kotlin.Int
+        $this: VALUE_PARAMETER this@Base: Base
     PROPERTY FAKE_OVERRIDE public final override val y: kotlin.Int
       FUN FAKE_OVERRIDE public final override fun <get-y>(): kotlin.Int
+        $this: VALUE_PARAMETER this@Base: Base
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS Test2
     $this: VALUE_PARAMETER this@Test2: Test2
     CONSTRUCTOR public constructor Test2(xx: kotlin.Int, yy: kotlin.Int)
@@ -82,8 +92,15 @@ FILE /argumentReorderingInDelegatingConstructorCall.kt
             yy: GET_VAR 'tmp0_yy: Int' type=kotlin.Int origin=null
     PROPERTY FAKE_OVERRIDE public final override val x: kotlin.Int
       FUN FAKE_OVERRIDE public final override fun <get-x>(): kotlin.Int
+        $this: VALUE_PARAMETER this@Base: Base
     PROPERTY FAKE_OVERRIDE public final override val y: kotlin.Int
       FUN FAKE_OVERRIDE public final override fun <get-y>(): kotlin.Int
+        $this: VALUE_PARAMETER this@Base: Base
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/classes/classMembers.txt b/compiler/testData/ir/irText/classes/classMembers.txt
index 2483cc5507b..4ce0c328e80 100644
--- a/compiler/testData/ir/irText/classes/classMembers.txt
+++ b/compiler/testData/ir/irText/classes/classMembers.txt
@@ -102,8 +102,12 @@ FILE /classMembers.kt
           CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
             message: CONST String type=kotlin.String value='4'
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     CLASS INTERFACE NestedInterface
       $this: VALUE_PARAMETER this@NestedInterface: NestedInterface
       FUN public abstract fun foo(): kotlin.Unit
@@ -115,8 +119,12 @@ FILE /classMembers.kt
             CALL 'foo(): Unit' type=kotlin.Unit origin=null
               $this: GET_VAR 'this@NestedInterface: NestedInterface' type=C.NestedInterface origin=null
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     CLASS OBJECT companion object of C
       $this: VALUE_PARAMETER this@Companion: Companion
       CONSTRUCTOR private constructor Companion()
@@ -124,8 +132,17 @@ FILE /classMembers.kt
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
           INSTANCE_INITIALIZER_CALL classDescriptor='companion object of C'
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/classes/classes.txt b/compiler/testData/ir/irText/classes/classes.txt
index 868028c857e..4b885ddd45a 100644
--- a/compiler/testData/ir/irText/classes/classes.txt
+++ b/compiler/testData/ir/irText/classes/classes.txt
@@ -6,13 +6,21 @@ FILE /classes.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='TestClass'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS INTERFACE TestInterface
     $this: VALUE_PARAMETER this@TestInterface: TestInterface
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS OBJECT TestObject
     $this: VALUE_PARAMETER this@TestObject: TestObject
     CONSTRUCTOR private constructor TestObject()
@@ -20,13 +28,21 @@ FILE /classes.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='TestObject'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS ANNOTATION_CLASS TestAnnotationClass
     $this: VALUE_PARAMETER this@TestAnnotationClass: TestAnnotationClass
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS ENUM_CLASS TestEnumClass
     $this: VALUE_PARAMETER this@TestEnumClass: TestEnumClass
     CONSTRUCTOR private constructor TestEnumClass()
@@ -34,17 +50,29 @@ FILE /classes.kt
         ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
         INSTANCE_INITIALIZER_CALL classDescriptor='TestEnumClass'
     FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnumClass>
     FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnumClass>
     FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<TestEnumClass!>!
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnumClass>
     FUN FAKE_OVERRIDE public final override fun compareTo(other: TestEnumClass): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnumClass>
+      VALUE_PARAMETER value-parameter other: TestEnumClass
     FUN FAKE_OVERRIDE public final override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnumClass>
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public final override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnumClass>
     PROPERTY FAKE_OVERRIDE public final override val name: kotlin.String
       FUN FAKE_OVERRIDE public final override fun <get-name>(): kotlin.String
+        $this: VALUE_PARAMETER this@Enum: Enum<TestEnumClass>
     PROPERTY FAKE_OVERRIDE public final override val ordinal: kotlin.Int
       FUN FAKE_OVERRIDE public final override fun <get-ordinal>(): kotlin.Int
+        $this: VALUE_PARAMETER this@Enum: Enum<TestEnumClass>
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnumClass>
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun values(): kotlin.Array<TestEnumClass>
       SYNTHETIC_BODY kind=ENUM_VALUES
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): TestEnumClass
       SYNTHETIC_BODY kind=ENUM_VALUEOF
+
diff --git a/compiler/testData/ir/irText/classes/companionObject.txt b/compiler/testData/ir/irText/classes/companionObject.txt
index 0d14562fec6..f47975751b5 100644
--- a/compiler/testData/ir/irText/classes/companionObject.txt
+++ b/compiler/testData/ir/irText/classes/companionObject.txt
@@ -12,11 +12,19 @@ FILE /companionObject.kt
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
           INSTANCE_INITIALIZER_CALL classDescriptor='companion object of Test1'
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS Test2
     $this: VALUE_PARAMETER this@Test2: Test2
     CONSTRUCTOR public constructor Test2()
@@ -30,8 +38,17 @@ FILE /companionObject.kt
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
           INSTANCE_INITIALIZER_CALL classDescriptor='companion object of Test2Named'
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/classes/dataClasses.txt b/compiler/testData/ir/irText/classes/dataClasses.txt
index c0d32376c1e..bb004d533f5 100644
--- a/compiler/testData/ir/irText/classes/dataClasses.txt
+++ b/compiler/testData/ir/irText/classes/dataClasses.txt
@@ -270,3 +270,4 @@ FILE /dataClasses.kt
               CONST Boolean type=kotlin.Boolean value='false'
         RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
           CONST Boolean type=kotlin.Boolean value='true'
+
diff --git a/compiler/testData/ir/irText/classes/dataClassesGeneric.txt b/compiler/testData/ir/irText/classes/dataClassesGeneric.txt
index 51295a4e748..8a598b0c00d 100644
--- a/compiler/testData/ir/irText/classes/dataClassesGeneric.txt
+++ b/compiler/testData/ir/irText/classes/dataClassesGeneric.txt
@@ -98,3 +98,4 @@ FILE /dataClassesGeneric.kt
               CONST Boolean type=kotlin.Boolean value='false'
         RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
           CONST Boolean type=kotlin.Boolean value='true'
+
diff --git a/compiler/testData/ir/irText/classes/delegatedImplementation.txt b/compiler/testData/ir/irText/classes/delegatedImplementation.txt
index 70dfe50d979..831ca3e6384 100644
--- a/compiler/testData/ir/irText/classes/delegatedImplementation.txt
+++ b/compiler/testData/ir/irText/classes/delegatedImplementation.txt
@@ -11,8 +11,12 @@ FILE /delegatedImplementation.kt
       $this: VALUE_PARAMETER this@IBase: IBase
       $receiver: VALUE_PARAMETER this@qux: String
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS OBJECT BaseImpl
     $this: VALUE_PARAMETER this@BaseImpl: BaseImpl
     CONSTRUCTOR private constructor BaseImpl()
@@ -34,8 +38,12 @@ FILE /delegatedImplementation.kt
       $receiver: VALUE_PARAMETER this@qux: String
       BLOCK_BODY
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS INTERFACE IOther
     $this: VALUE_PARAMETER this@IOther: IOther
     PROPERTY public abstract val x: kotlin.String
@@ -60,8 +68,12 @@ FILE /delegatedImplementation.kt
         $receiver: VALUE_PARAMETER this@z2: Byte
         VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun otherImpl(x0: kotlin.String, y0: kotlin.Int): IOther
     VALUE_PARAMETER value-parameter x0: kotlin.String
     VALUE_PARAMETER value-parameter y0: kotlin.Int
@@ -121,8 +133,12 @@ FILE /delegatedImplementation.kt
                 VALUE_PARAMETER value-parameter value: kotlin.Int
                 BLOCK_BODY
             FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+              $this: VALUE_PARAMETER this@Any: Any
+              VALUE_PARAMETER value-parameter other: kotlin.Any?
             FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+              $this: VALUE_PARAMETER this@Any: Any
             FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+              $this: VALUE_PARAMETER this@Any: Any
           CALL 'constructor <no name provided>()' type=otherImpl.<no name provided> origin=OBJECT_LITERAL
   CLASS CLASS Test1
     $this: VALUE_PARAMETER this@Test1: Test1
@@ -159,8 +175,12 @@ FILE /delegatedImplementation.kt
             receiver: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
           $receiver: GET_VAR 'this@qux: String' type=kotlin.String origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS Test2
     $this: VALUE_PARAMETER this@Test2: Test2
     CONSTRUCTOR public constructor Test2()
@@ -255,5 +275,10 @@ FILE /delegatedImplementation.kt
               receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
             <set-?>: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.txt b/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.txt
index abd6fabfa2a..1cd3c4f8c11 100644
--- a/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.txt
+++ b/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.txt
@@ -6,8 +6,12 @@ FILE /delegatedImplementationWithExplicitOverride.kt
     FUN public abstract fun bar(): kotlin.Unit
       $this: VALUE_PARAMETER this@IFooBar: IFooBar
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS OBJECT FooBarImpl
     $this: VALUE_PARAMETER this@FooBarImpl: FooBarImpl
     CONSTRUCTOR private constructor FooBarImpl()
@@ -21,8 +25,12 @@ FILE /delegatedImplementationWithExplicitOverride.kt
       $this: VALUE_PARAMETER this@FooBarImpl: FooBarImpl
       BLOCK_BODY
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS C
     $this: VALUE_PARAMETER this@C: C
     CONSTRUCTOR public constructor C()
@@ -42,5 +50,10 @@ FILE /delegatedImplementationWithExplicitOverride.kt
       $this: VALUE_PARAMETER this@C: C
       BLOCK_BODY
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.txt b/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.txt
index d0eeed4fd87..40c2568290a 100644
--- a/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.txt
+++ b/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.txt
@@ -18,8 +18,12 @@ FILE /delegatingConstructorCallToTypeAliasConstructor.kt
             GET_FIELD 'value: T' type=T origin=null
               receiver: GET_VAR 'this@Cell: Cell<T>' type=Cell<T> origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   TYPEALIAS typealias CT = Cell<T> type=Cell<T>
   TYPEALIAS typealias CStr = Cell<String> type=Cell<kotlin.String>
   CLASS CLASS C1
@@ -31,9 +35,14 @@ FILE /delegatingConstructorCallToTypeAliasConstructor.kt
         INSTANCE_INITIALIZER_CALL classDescriptor='C1'
     PROPERTY FAKE_OVERRIDE public final override val value: kotlin.String
       FUN FAKE_OVERRIDE public final override fun <get-value>(): kotlin.String
+        $this: VALUE_PARAMETER this@Cell: Cell<String>
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS C2
     $this: VALUE_PARAMETER this@C2: C2
     CONSTRUCTOR public constructor C2()
@@ -43,6 +52,12 @@ FILE /delegatingConstructorCallToTypeAliasConstructor.kt
         INSTANCE_INITIALIZER_CALL classDescriptor='C2'
     PROPERTY FAKE_OVERRIDE public final override val value: kotlin.String
       FUN FAKE_OVERRIDE public final override fun <get-value>(): kotlin.String
+        $this: VALUE_PARAMETER this@Cell: Cell<String>
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/classes/delegatingConstructorCallsInSecondaryConstructors.txt b/compiler/testData/ir/irText/classes/delegatingConstructorCallsInSecondaryConstructors.txt
index dfd20aa683f..f82261b79e7 100644
--- a/compiler/testData/ir/irText/classes/delegatingConstructorCallsInSecondaryConstructors.txt
+++ b/compiler/testData/ir/irText/classes/delegatingConstructorCallsInSecondaryConstructors.txt
@@ -6,8 +6,12 @@ FILE /delegatingConstructorCallsInSecondaryConstructors.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Base'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS Test
     $this: VALUE_PARAMETER this@Test: Test
     CONSTRUCTOR public constructor Test()
@@ -24,5 +28,10 @@ FILE /delegatingConstructorCallsInSecondaryConstructors.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Test()'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/classes/enum.txt b/compiler/testData/ir/irText/classes/enum.txt
index 5cb646a783d..0a234b7909d 100644
--- a/compiler/testData/ir/irText/classes/enum.txt
+++ b/compiler/testData/ir/irText/classes/enum.txt
@@ -10,16 +10,27 @@ FILE /enum.kt
     ENUM_ENTRY enum entry TEST2
       init: ENUM_CONSTRUCTOR_CALL 'constructor TestEnum1()'
     FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum1>
     FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum1>
     FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<TestEnum1!>!
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum1>
     FUN FAKE_OVERRIDE public final override fun compareTo(other: TestEnum1): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum1>
+      VALUE_PARAMETER value-parameter other: TestEnum1
     FUN FAKE_OVERRIDE public final override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum1>
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public final override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum1>
     PROPERTY FAKE_OVERRIDE public final override val name: kotlin.String
       FUN FAKE_OVERRIDE public final override fun <get-name>(): kotlin.String
+        $this: VALUE_PARAMETER this@Enum: Enum<TestEnum1>
     PROPERTY FAKE_OVERRIDE public final override val ordinal: kotlin.Int
       FUN FAKE_OVERRIDE public final override fun <get-ordinal>(): kotlin.Int
+        $this: VALUE_PARAMETER this@Enum: Enum<TestEnum1>
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum1>
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun values(): kotlin.Array<TestEnum1>
       SYNTHETIC_BODY kind=ENUM_VALUES
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): TestEnum1
@@ -51,16 +62,27 @@ FILE /enum.kt
       init: ENUM_CONSTRUCTOR_CALL 'constructor TestEnum2(Int)'
         x: CONST Int type=kotlin.Int value='3'
     FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum2>
     FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum2>
     FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<TestEnum2!>!
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum2>
     FUN FAKE_OVERRIDE public final override fun compareTo(other: TestEnum2): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum2>
+      VALUE_PARAMETER value-parameter other: TestEnum2
     FUN FAKE_OVERRIDE public final override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum2>
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public final override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum2>
     PROPERTY FAKE_OVERRIDE public final override val name: kotlin.String
       FUN FAKE_OVERRIDE public final override fun <get-name>(): kotlin.String
+        $this: VALUE_PARAMETER this@Enum: Enum<TestEnum2>
     PROPERTY FAKE_OVERRIDE public final override val ordinal: kotlin.Int
       FUN FAKE_OVERRIDE public final override fun <get-ordinal>(): kotlin.Int
+        $this: VALUE_PARAMETER this@Enum: Enum<TestEnum2>
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum2>
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun values(): kotlin.Array<TestEnum2>
       SYNTHETIC_BODY kind=ENUM_VALUES
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): TestEnum2
@@ -85,29 +107,51 @@ FILE /enum.kt
             CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
               message: CONST String type=kotlin.String value='Hello, world!'
         FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
+          $this: VALUE_PARAMETER this@Enum: Enum<TestEnum3>
         FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
+          $this: VALUE_PARAMETER this@Enum: Enum<TestEnum3>
         FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<TestEnum3!>!
+          $this: VALUE_PARAMETER this@Enum: Enum<TestEnum3>
         FUN FAKE_OVERRIDE public final override fun compareTo(other: TestEnum3): kotlin.Int
+          $this: VALUE_PARAMETER this@Enum: Enum<TestEnum3>
+          VALUE_PARAMETER value-parameter other: TestEnum3
         FUN FAKE_OVERRIDE public final override fun equals(other: kotlin.Any?): kotlin.Boolean
+          $this: VALUE_PARAMETER this@Enum: Enum<TestEnum3>
+          VALUE_PARAMETER value-parameter other: kotlin.Any?
         FUN FAKE_OVERRIDE public final override fun hashCode(): kotlin.Int
+          $this: VALUE_PARAMETER this@Enum: Enum<TestEnum3>
         PROPERTY FAKE_OVERRIDE public final override val name: kotlin.String
           FUN FAKE_OVERRIDE public final override fun <get-name>(): kotlin.String
+            $this: VALUE_PARAMETER this@Enum: Enum<TestEnum3>
         PROPERTY FAKE_OVERRIDE public final override val ordinal: kotlin.Int
           FUN FAKE_OVERRIDE public final override fun <get-ordinal>(): kotlin.Int
+            $this: VALUE_PARAMETER this@Enum: Enum<TestEnum3>
         FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+          $this: VALUE_PARAMETER this@Enum: Enum<TestEnum3>
     FUN public abstract fun foo(): kotlin.Unit
       $this: VALUE_PARAMETER this@TestEnum3: TestEnum3
     FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum3>
     FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum3>
     FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<TestEnum3!>!
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum3>
     FUN FAKE_OVERRIDE public final override fun compareTo(other: TestEnum3): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum3>
+      VALUE_PARAMETER value-parameter other: TestEnum3
     FUN FAKE_OVERRIDE public final override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum3>
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public final override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum3>
     PROPERTY FAKE_OVERRIDE public final override val name: kotlin.String
       FUN FAKE_OVERRIDE public final override fun <get-name>(): kotlin.String
+        $this: VALUE_PARAMETER this@Enum: Enum<TestEnum3>
     PROPERTY FAKE_OVERRIDE public final override val ordinal: kotlin.Int
       FUN FAKE_OVERRIDE public final override fun <get-ordinal>(): kotlin.Int
+        $this: VALUE_PARAMETER this@Enum: Enum<TestEnum3>
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum3>
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun values(): kotlin.Array<TestEnum3>
       SYNTHETIC_BODY kind=ENUM_VALUES
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): TestEnum3
@@ -144,18 +188,30 @@ FILE /enum.kt
             CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
               message: GET_ENUM 'TEST1' type=TestEnum4
         FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
+          $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
         FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
+          $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
         FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<TestEnum4!>!
+          $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
         FUN FAKE_OVERRIDE public final override fun compareTo(other: TestEnum4): kotlin.Int
+          $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
+          VALUE_PARAMETER value-parameter other: TestEnum4
         FUN FAKE_OVERRIDE public final override fun equals(other: kotlin.Any?): kotlin.Boolean
+          $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
+          VALUE_PARAMETER value-parameter other: kotlin.Any?
         FUN FAKE_OVERRIDE public final override fun hashCode(): kotlin.Int
+          $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
         PROPERTY FAKE_OVERRIDE public final override val name: kotlin.String
           FUN FAKE_OVERRIDE public final override fun <get-name>(): kotlin.String
+            $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
         PROPERTY FAKE_OVERRIDE public final override val ordinal: kotlin.Int
           FUN FAKE_OVERRIDE public final override fun <get-ordinal>(): kotlin.Int
+            $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
         PROPERTY FAKE_OVERRIDE public final override val x: kotlin.Int
           FUN FAKE_OVERRIDE public final override fun <get-x>(): kotlin.Int
+            $this: VALUE_PARAMETER this@TestEnum4: TestEnum4
         FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+          $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
     ENUM_ENTRY enum entry TEST2
       init: ENUM_CONSTRUCTOR_CALL 'constructor TEST2()'
       class: CLASS ENUM_ENTRY TEST2
@@ -185,31 +241,54 @@ FILE /enum.kt
             CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
               message: GET_ENUM 'TEST2' type=TestEnum4
         FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
+          $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
         FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
+          $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
         FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<TestEnum4!>!
+          $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
         FUN FAKE_OVERRIDE public final override fun compareTo(other: TestEnum4): kotlin.Int
+          $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
+          VALUE_PARAMETER value-parameter other: TestEnum4
         FUN FAKE_OVERRIDE public final override fun equals(other: kotlin.Any?): kotlin.Boolean
+          $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
+          VALUE_PARAMETER value-parameter other: kotlin.Any?
         FUN FAKE_OVERRIDE public final override fun hashCode(): kotlin.Int
+          $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
         PROPERTY FAKE_OVERRIDE public final override val name: kotlin.String
           FUN FAKE_OVERRIDE public final override fun <get-name>(): kotlin.String
+            $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
         PROPERTY FAKE_OVERRIDE public final override val ordinal: kotlin.Int
           FUN FAKE_OVERRIDE public final override fun <get-ordinal>(): kotlin.Int
+            $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
         PROPERTY FAKE_OVERRIDE public final override val x: kotlin.Int
           FUN FAKE_OVERRIDE public final override fun <get-x>(): kotlin.Int
+            $this: VALUE_PARAMETER this@TestEnum4: TestEnum4
         FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+          $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
     FUN public abstract fun foo(): kotlin.Unit
       $this: VALUE_PARAMETER this@TestEnum4: TestEnum4
     FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
     FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
     FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<TestEnum4!>!
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
     FUN FAKE_OVERRIDE public final override fun compareTo(other: TestEnum4): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
+      VALUE_PARAMETER value-parameter other: TestEnum4
     FUN FAKE_OVERRIDE public final override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public final override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
     PROPERTY FAKE_OVERRIDE public final override val name: kotlin.String
       FUN FAKE_OVERRIDE public final override fun <get-name>(): kotlin.String
+        $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
     PROPERTY FAKE_OVERRIDE public final override val ordinal: kotlin.Int
       FUN FAKE_OVERRIDE public final override fun <get-ordinal>(): kotlin.Int
+        $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum4>
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun values(): kotlin.Array<TestEnum4>
       SYNTHETIC_BODY kind=ENUM_VALUES
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): TestEnum4
@@ -241,17 +320,29 @@ FILE /enum.kt
       init: ENUM_CONSTRUCTOR_CALL 'constructor TestEnum5(Int = ...)'
         x: CONST Int type=kotlin.Int value='0'
     FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum5>
     FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum5>
     FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<TestEnum5!>!
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum5>
     FUN FAKE_OVERRIDE public final override fun compareTo(other: TestEnum5): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum5>
+      VALUE_PARAMETER value-parameter other: TestEnum5
     FUN FAKE_OVERRIDE public final override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum5>
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public final override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum5>
     PROPERTY FAKE_OVERRIDE public final override val name: kotlin.String
       FUN FAKE_OVERRIDE public final override fun <get-name>(): kotlin.String
+        $this: VALUE_PARAMETER this@Enum: Enum<TestEnum5>
     PROPERTY FAKE_OVERRIDE public final override val ordinal: kotlin.Int
       FUN FAKE_OVERRIDE public final override fun <get-ordinal>(): kotlin.Int
+        $this: VALUE_PARAMETER this@Enum: Enum<TestEnum5>
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Enum: Enum<TestEnum5>
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun values(): kotlin.Array<TestEnum5>
       SYNTHETIC_BODY kind=ENUM_VALUES
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): TestEnum5
       SYNTHETIC_BODY kind=ENUM_VALUEOF
+
diff --git a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.txt b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.txt
index 901db339e23..c5c0927198c 100644
--- a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.txt
+++ b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.txt
@@ -23,16 +23,27 @@ FILE /enumWithSecondaryCtor.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Test0(Int)'
           x: CONST Int type=kotlin.Int value='0'
     FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
+      $this: VALUE_PARAMETER this@Enum: Enum<Test0>
     FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
+      $this: VALUE_PARAMETER this@Enum: Enum<Test0>
     FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<Test0!>!
+      $this: VALUE_PARAMETER this@Enum: Enum<Test0>
     FUN FAKE_OVERRIDE public final override fun compareTo(other: Test0): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<Test0>
+      VALUE_PARAMETER value-parameter other: Test0
     FUN FAKE_OVERRIDE public final override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Enum: Enum<Test0>
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public final override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<Test0>
     PROPERTY FAKE_OVERRIDE public final override val name: kotlin.String
       FUN FAKE_OVERRIDE public final override fun <get-name>(): kotlin.String
+        $this: VALUE_PARAMETER this@Enum: Enum<Test0>
     PROPERTY FAKE_OVERRIDE public final override val ordinal: kotlin.Int
       FUN FAKE_OVERRIDE public final override fun <get-ordinal>(): kotlin.Int
+        $this: VALUE_PARAMETER this@Enum: Enum<Test0>
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Enum: Enum<Test0>
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun values(): kotlin.Array<Test0>
       SYNTHETIC_BODY kind=ENUM_VALUES
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): Test0
@@ -64,16 +75,27 @@ FILE /enumWithSecondaryCtor.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Test1(Int)'
           x: CONST Int type=kotlin.Int value='0'
     FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
+      $this: VALUE_PARAMETER this@Enum: Enum<Test1>
     FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
+      $this: VALUE_PARAMETER this@Enum: Enum<Test1>
     FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<Test1!>!
+      $this: VALUE_PARAMETER this@Enum: Enum<Test1>
     FUN FAKE_OVERRIDE public final override fun compareTo(other: Test1): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<Test1>
+      VALUE_PARAMETER value-parameter other: Test1
     FUN FAKE_OVERRIDE public final override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Enum: Enum<Test1>
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public final override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<Test1>
     PROPERTY FAKE_OVERRIDE public final override val name: kotlin.String
       FUN FAKE_OVERRIDE public final override fun <get-name>(): kotlin.String
+        $this: VALUE_PARAMETER this@Enum: Enum<Test1>
     PROPERTY FAKE_OVERRIDE public final override val ordinal: kotlin.Int
       FUN FAKE_OVERRIDE public final override fun <get-ordinal>(): kotlin.Int
+        $this: VALUE_PARAMETER this@Enum: Enum<Test1>
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Enum: Enum<Test1>
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun values(): kotlin.Array<Test1>
       SYNTHETIC_BODY kind=ENUM_VALUES
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): Test1
@@ -109,18 +131,30 @@ FILE /enumWithSecondaryCtor.kt
             CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
               message: CONST String type=kotlin.String value='ZERO'
         FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
+          $this: VALUE_PARAMETER this@Enum: Enum<Test2>
         FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
+          $this: VALUE_PARAMETER this@Enum: Enum<Test2>
         FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<Test2!>!
+          $this: VALUE_PARAMETER this@Enum: Enum<Test2>
         FUN FAKE_OVERRIDE public final override fun compareTo(other: Test2): kotlin.Int
+          $this: VALUE_PARAMETER this@Enum: Enum<Test2>
+          VALUE_PARAMETER value-parameter other: Test2
         FUN FAKE_OVERRIDE public final override fun equals(other: kotlin.Any?): kotlin.Boolean
+          $this: VALUE_PARAMETER this@Enum: Enum<Test2>
+          VALUE_PARAMETER value-parameter other: kotlin.Any?
         FUN FAKE_OVERRIDE public final override fun hashCode(): kotlin.Int
+          $this: VALUE_PARAMETER this@Enum: Enum<Test2>
         PROPERTY FAKE_OVERRIDE public final override val name: kotlin.String
           FUN FAKE_OVERRIDE public final override fun <get-name>(): kotlin.String
+            $this: VALUE_PARAMETER this@Enum: Enum<Test2>
         PROPERTY FAKE_OVERRIDE public final override val ordinal: kotlin.Int
           FUN FAKE_OVERRIDE public final override fun <get-ordinal>(): kotlin.Int
+            $this: VALUE_PARAMETER this@Enum: Enum<Test2>
         PROPERTY FAKE_OVERRIDE public final override val x: kotlin.Int
           FUN FAKE_OVERRIDE public final override fun <get-x>(): kotlin.Int
+            $this: VALUE_PARAMETER this@Test2: Test2
         FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+          $this: VALUE_PARAMETER this@Enum: Enum<Test2>
     ENUM_ENTRY enum entry ONE
       init: ENUM_CONSTRUCTOR_CALL 'constructor ONE()'
       class: CLASS ENUM_ENTRY ONE
@@ -136,18 +170,30 @@ FILE /enumWithSecondaryCtor.kt
             CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
               message: CONST String type=kotlin.String value='ONE'
         FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
+          $this: VALUE_PARAMETER this@Enum: Enum<Test2>
         FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
+          $this: VALUE_PARAMETER this@Enum: Enum<Test2>
         FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<Test2!>!
+          $this: VALUE_PARAMETER this@Enum: Enum<Test2>
         FUN FAKE_OVERRIDE public final override fun compareTo(other: Test2): kotlin.Int
+          $this: VALUE_PARAMETER this@Enum: Enum<Test2>
+          VALUE_PARAMETER value-parameter other: Test2
         FUN FAKE_OVERRIDE public final override fun equals(other: kotlin.Any?): kotlin.Boolean
+          $this: VALUE_PARAMETER this@Enum: Enum<Test2>
+          VALUE_PARAMETER value-parameter other: kotlin.Any?
         FUN FAKE_OVERRIDE public final override fun hashCode(): kotlin.Int
+          $this: VALUE_PARAMETER this@Enum: Enum<Test2>
         PROPERTY FAKE_OVERRIDE public final override val name: kotlin.String
           FUN FAKE_OVERRIDE public final override fun <get-name>(): kotlin.String
+            $this: VALUE_PARAMETER this@Enum: Enum<Test2>
         PROPERTY FAKE_OVERRIDE public final override val ordinal: kotlin.Int
           FUN FAKE_OVERRIDE public final override fun <get-ordinal>(): kotlin.Int
+            $this: VALUE_PARAMETER this@Enum: Enum<Test2>
         PROPERTY FAKE_OVERRIDE public final override val x: kotlin.Int
           FUN FAKE_OVERRIDE public final override fun <get-x>(): kotlin.Int
+            $this: VALUE_PARAMETER this@Test2: Test2
         FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+          $this: VALUE_PARAMETER this@Enum: Enum<Test2>
     CONSTRUCTOR private constructor Test2()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Test2(Int)'
@@ -155,17 +201,29 @@ FILE /enumWithSecondaryCtor.kt
     FUN public abstract fun foo(): kotlin.Unit
       $this: VALUE_PARAMETER this@Test2: Test2
     FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
+      $this: VALUE_PARAMETER this@Enum: Enum<Test2>
     FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
+      $this: VALUE_PARAMETER this@Enum: Enum<Test2>
     FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<Test2!>!
+      $this: VALUE_PARAMETER this@Enum: Enum<Test2>
     FUN FAKE_OVERRIDE public final override fun compareTo(other: Test2): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<Test2>
+      VALUE_PARAMETER value-parameter other: Test2
     FUN FAKE_OVERRIDE public final override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Enum: Enum<Test2>
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public final override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<Test2>
     PROPERTY FAKE_OVERRIDE public final override val name: kotlin.String
       FUN FAKE_OVERRIDE public final override fun <get-name>(): kotlin.String
+        $this: VALUE_PARAMETER this@Enum: Enum<Test2>
     PROPERTY FAKE_OVERRIDE public final override val ordinal: kotlin.Int
       FUN FAKE_OVERRIDE public final override fun <get-ordinal>(): kotlin.Int
+        $this: VALUE_PARAMETER this@Enum: Enum<Test2>
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Enum: Enum<Test2>
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun values(): kotlin.Array<Test2>
       SYNTHETIC_BODY kind=ENUM_VALUES
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): Test2
       SYNTHETIC_BODY kind=ENUM_VALUEOF
+
diff --git a/compiler/testData/ir/irText/classes/initBlock.txt b/compiler/testData/ir/irText/classes/initBlock.txt
index ff3e9cf3010..eca9d205cc2 100644
--- a/compiler/testData/ir/irText/classes/initBlock.txt
+++ b/compiler/testData/ir/irText/classes/initBlock.txt
@@ -9,8 +9,12 @@ FILE /initBlock.kt
       BLOCK_BODY
         CALL 'println(): Unit' type=kotlin.Unit origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS Test2
     $this: VALUE_PARAMETER this@Test2: Test2
     CONSTRUCTOR public constructor Test2(x: kotlin.Int)
@@ -32,8 +36,12 @@ FILE /initBlock.kt
       BLOCK_BODY
         CALL 'println(): Unit' type=kotlin.Unit origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS Test3
     $this: VALUE_PARAMETER this@Test3: Test3
     ANONYMOUS_INITIALIZER Test3
@@ -44,8 +52,12 @@ FILE /initBlock.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Test3'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS Test4
     $this: VALUE_PARAMETER this@Test4: Test4
     ANONYMOUS_INITIALIZER Test4
@@ -61,8 +73,12 @@ FILE /initBlock.kt
         CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
           message: CONST String type=kotlin.String value='2'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS Test5
     $this: VALUE_PARAMETER this@Test5: Test5
     CONSTRUCTOR public constructor Test5()
@@ -85,8 +101,17 @@ FILE /initBlock.kt
           CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
             message: CONST String type=kotlin.String value='2'
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/classes/initVal.txt b/compiler/testData/ir/irText/classes/initVal.txt
index 00715149df4..41cf2def39e 100644
--- a/compiler/testData/ir/irText/classes/initVal.txt
+++ b/compiler/testData/ir/irText/classes/initVal.txt
@@ -17,8 +17,12 @@ FILE /initVal.kt
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@TestInitValFromParameter: TestInitValFromParameter' type=TestInitValFromParameter origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS TestInitValInClass
     $this: VALUE_PARAMETER this@TestInitValInClass: TestInitValInClass
     CONSTRUCTOR public constructor TestInitValInClass()
@@ -36,8 +40,12 @@ FILE /initVal.kt
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@TestInitValInClass: TestInitValInClass' type=TestInitValInClass origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS TestInitValInInitBlock
     $this: VALUE_PARAMETER this@TestInitValInInitBlock: TestInitValInInitBlock
     CONSTRUCTOR public constructor TestInitValInInitBlock()
@@ -58,5 +66,10 @@ FILE /initVal.kt
           receiver: GET_VAR 'this@TestInitValInInitBlock: TestInitValInInitBlock' type=TestInitValInInitBlock origin=null
           value: CONST Int type=kotlin.Int value='0'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/classes/initVar.txt b/compiler/testData/ir/irText/classes/initVar.txt
index f4e0f1384df..a2aac136153 100644
--- a/compiler/testData/ir/irText/classes/initVar.txt
+++ b/compiler/testData/ir/irText/classes/initVar.txt
@@ -24,8 +24,12 @@ FILE /initVar.kt
             receiver: GET_VAR 'this@TestInitVarFromParameter: TestInitVarFromParameter' type=TestInitVarFromParameter origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS TestInitVarInClass
     $this: VALUE_PARAMETER this@TestInitVarInClass: TestInitVarInClass
     CONSTRUCTOR public constructor TestInitVarInClass()
@@ -50,8 +54,12 @@ FILE /initVar.kt
             receiver: GET_VAR 'this@TestInitVarInClass: TestInitVarInClass' type=TestInitVarInClass origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS TestInitVarInInitBlock
     $this: VALUE_PARAMETER this@TestInitVarInInitBlock: TestInitVarInInitBlock
     CONSTRUCTOR public constructor TestInitVarInInitBlock()
@@ -79,8 +87,12 @@ FILE /initVar.kt
           $this: GET_VAR 'this@TestInitVarInInitBlock: TestInitVarInInitBlock' type=TestInitVarInInitBlock origin=null
           <set-?>: CONST Int type=kotlin.Int value='0'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS TestInitVarWithCustomSetter
     $this: VALUE_PARAMETER this@TestInitVarWithCustomSetter: TestInitVarWithCustomSetter
     CONSTRUCTOR public constructor TestInitVarWithCustomSetter()
@@ -105,8 +117,12 @@ FILE /initVar.kt
             receiver: GET_VAR 'this@TestInitVarWithCustomSetter: TestInitVarWithCustomSetter' type=TestInitVarWithCustomSetter origin=null
             value: GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS TestInitVarWithCustomSetterWithExplicitCtor
     $this: VALUE_PARAMETER this@TestInitVarWithCustomSetterWithExplicitCtor: TestInitVarWithCustomSetterWithExplicitCtor
     PROPERTY public final var x: kotlin.Int
@@ -134,8 +150,12 @@ FILE /initVar.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='TestInitVarWithCustomSetterWithExplicitCtor'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS TestInitVarWithCustomSetterInCtor
     $this: VALUE_PARAMETER this@TestInitVarWithCustomSetterInCtor: TestInitVarWithCustomSetterInCtor
     PROPERTY public final var x: kotlin.Int
@@ -161,5 +181,10 @@ FILE /initVar.kt
           $this: GET_VAR 'this@TestInitVarWithCustomSetterInCtor: TestInitVarWithCustomSetterInCtor' type=TestInitVarWithCustomSetterInCtor origin=null
           value: CONST Int type=kotlin.Int value='42'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/classes/innerClass.txt b/compiler/testData/ir/irText/classes/innerClass.txt
index cb00efa3402..babcd785c6d 100644
--- a/compiler/testData/ir/irText/classes/innerClass.txt
+++ b/compiler/testData/ir/irText/classes/innerClass.txt
@@ -13,8 +13,12 @@ FILE /innerClass.kt
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
           INSTANCE_INITIALIZER_CALL classDescriptor='TestInnerClass'
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     CLASS CLASS DerivedInnerClass
       $this: VALUE_PARAMETER this@DerivedInnerClass: DerivedInnerClass
       CONSTRUCTOR public constructor DerivedInnerClass()
@@ -24,8 +28,17 @@ FILE /innerClass.kt
             $this: GET_VAR 'this@Outer: Outer' type=Outer origin=null
           INSTANCE_INITIALIZER_CALL classDescriptor='DerivedInnerClass'
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.txt b/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.txt
index 25324ae817a..9e81dd41e8a 100644
--- a/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.txt
+++ b/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.txt
@@ -30,8 +30,17 @@ FILE /innerClassWithDelegatingConstructor.kt
             $this: GET_VAR 'this@Outer: Outer' type=Outer origin=null
             x: CONST Int type=kotlin.Int value='0'
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/classes/localClasses.txt b/compiler/testData/ir/irText/classes/localClasses.txt
index 0c926e54d53..2f7eab8209a 100644
--- a/compiler/testData/ir/irText/classes/localClasses.txt
+++ b/compiler/testData/ir/irText/classes/localClasses.txt
@@ -11,7 +11,12 @@ FILE /localClasses.kt
           $this: VALUE_PARAMETER this@LocalClass: LocalClass
           BLOCK_BODY
         FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+          $this: VALUE_PARAMETER this@Any: Any
+          VALUE_PARAMETER value-parameter other: kotlin.Any?
         FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+          $this: VALUE_PARAMETER this@Any: Any
         FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+          $this: VALUE_PARAMETER this@Any: Any
       CALL 'foo(): Unit' type=kotlin.Unit origin=null
         $this: CALL 'constructor LocalClass()' type=outer.LocalClass origin=null
+
diff --git a/compiler/testData/ir/irText/classes/objectLiteralExpressions.txt b/compiler/testData/ir/irText/classes/objectLiteralExpressions.txt
index e18bb73421f..2f3463b7347 100644
--- a/compiler/testData/ir/irText/classes/objectLiteralExpressions.txt
+++ b/compiler/testData/ir/irText/classes/objectLiteralExpressions.txt
@@ -4,8 +4,12 @@ FILE /objectLiteralExpressions.kt
     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
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   PROPERTY public val test1: kotlin.Any
     FIELD PROPERTY_BACKING_FIELD public val test1: kotlin.Any
       EXPRESSION_BODY
@@ -17,8 +21,12 @@ FILE /objectLiteralExpressions.kt
                 DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
                 INSTANCE_INITIALIZER_CALL classDescriptor='<no name provided>'
             FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+              $this: VALUE_PARAMETER this@Any: Any
+              VALUE_PARAMETER value-parameter other: kotlin.Any?
             FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+              $this: VALUE_PARAMETER this@Any: Any
             FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+              $this: VALUE_PARAMETER this@Any: Any
           CALL 'constructor <no name provided>()' type=test1.<no name provided> origin=OBJECT_LITERAL
     FUN DEFAULT_PROPERTY_ACCESSOR public fun <get-test1>(): kotlin.Any
       BLOCK_BODY
@@ -40,8 +48,12 @@ FILE /objectLiteralExpressions.kt
                 CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
                   message: CONST String type=kotlin.String value='foo'
             FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+              $this: VALUE_PARAMETER this@Any: Any
+              VALUE_PARAMETER value-parameter other: kotlin.Any?
             FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+              $this: VALUE_PARAMETER this@Any: Any
             FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+              $this: VALUE_PARAMETER this@Any: Any
           CALL 'constructor <no name provided>()' type=test2.<no name provided> origin=OBJECT_LITERAL
     FUN DEFAULT_PROPERTY_ACCESSOR public fun <get-test2>(): IFoo
       BLOCK_BODY
@@ -61,9 +73,14 @@ FILE /objectLiteralExpressions.kt
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
           INSTANCE_INITIALIZER_CALL classDescriptor='Inner'
       FUN FAKE_OVERRIDE public abstract override fun foo(): kotlin.Unit
+        $this: VALUE_PARAMETER this@IFoo: IFoo
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     FUN public final fun test3(): Outer.Inner
       $this: VALUE_PARAMETER this@Outer: Outer
       BLOCK_BODY
@@ -82,12 +99,20 @@ FILE /objectLiteralExpressions.kt
                   CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
                     message: CONST String type=kotlin.String value='foo'
               FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+                $this: VALUE_PARAMETER this@Any: Any
+                VALUE_PARAMETER value-parameter other: kotlin.Any?
               FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+                $this: VALUE_PARAMETER this@Any: Any
               FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+                $this: VALUE_PARAMETER this@Any: Any
             CALL 'constructor <no name provided>()' type=Outer.test3.<no name provided> origin=OBJECT_LITERAL
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun Outer.test4(): Outer.Inner
     $receiver: VALUE_PARAMETER this@test4: Outer
     BLOCK_BODY
@@ -106,6 +131,11 @@ FILE /objectLiteralExpressions.kt
                 CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
                   message: CONST String type=kotlin.String value='foo'
             FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+              $this: VALUE_PARAMETER this@Any: Any
+              VALUE_PARAMETER value-parameter other: kotlin.Any?
             FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+              $this: VALUE_PARAMETER this@Any: Any
             FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+              $this: VALUE_PARAMETER this@Any: Any
           CALL 'constructor <no name provided>()' type=test4.<no name provided> origin=OBJECT_LITERAL
+
diff --git a/compiler/testData/ir/irText/classes/objectWithInitializers.txt b/compiler/testData/ir/irText/classes/objectWithInitializers.txt
index 1769ed54f38..04f18825af8 100644
--- a/compiler/testData/ir/irText/classes/objectWithInitializers.txt
+++ b/compiler/testData/ir/irText/classes/objectWithInitializers.txt
@@ -6,8 +6,12 @@ FILE /objectWithInitializers.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Base'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS OBJECT Test
     $this: VALUE_PARAMETER this@Test: Test
     CONSTRUCTOR private constructor Test()
@@ -39,5 +43,10 @@ FILE /objectWithInitializers.kt
           value: CALL '<get-x>(): Int' type=kotlin.Int origin=GET_PROPERTY
             $this: GET_VAR 'this@Test: Test' type=Test origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/classes/outerClassAccess.txt b/compiler/testData/ir/irText/classes/outerClassAccess.txt
index 27680afdb24..ede9c781a8f 100644
--- a/compiler/testData/ir/irText/classes/outerClassAccess.txt
+++ b/compiler/testData/ir/irText/classes/outerClassAccess.txt
@@ -41,11 +41,24 @@ FILE /outerClassAccess.kt
             CALL 'foo(): Unit' type=kotlin.Unit origin=null
               $this: GET_VAR 'this@test3: Outer' type=Outer origin=null
         FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+          $this: VALUE_PARAMETER this@Any: Any
+          VALUE_PARAMETER value-parameter other: kotlin.Any?
         FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+          $this: VALUE_PARAMETER this@Any: Any
         FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+          $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/classes/primaryConstructor.txt b/compiler/testData/ir/irText/classes/primaryConstructor.txt
index 607021fe716..62bbe51b83e 100644
--- a/compiler/testData/ir/irText/classes/primaryConstructor.txt
+++ b/compiler/testData/ir/irText/classes/primaryConstructor.txt
@@ -28,8 +28,12 @@ FILE /primaryConstructor.kt
             GET_FIELD 'y: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS Test2
     $this: VALUE_PARAMETER this@Test2: Test2
     CONSTRUCTOR public constructor Test2(x: kotlin.Int, y: kotlin.Int)
@@ -59,8 +63,12 @@ FILE /primaryConstructor.kt
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS Test3
     $this: VALUE_PARAMETER this@Test3: Test3
     CONSTRUCTOR public constructor Test3(x: kotlin.Int, y: kotlin.Int)
@@ -93,5 +101,10 @@ FILE /primaryConstructor.kt
           receiver: GET_VAR 'this@Test3: Test3' type=Test3 origin=null
           value: GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.txt b/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.txt
index 2aac7ca73fb..20eba078155 100644
--- a/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.txt
+++ b/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.txt
@@ -6,8 +6,12 @@ FILE /primaryConstructorWithSuperConstructorCall.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Base'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS TestImplicitPrimaryConstructor
     $this: VALUE_PARAMETER this@TestImplicitPrimaryConstructor: TestImplicitPrimaryConstructor
     CONSTRUCTOR public constructor TestImplicitPrimaryConstructor()
@@ -15,8 +19,12 @@ FILE /primaryConstructorWithSuperConstructorCall.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Base()'
         INSTANCE_INITIALIZER_CALL classDescriptor='TestImplicitPrimaryConstructor'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS TestExplicitPrimaryConstructor
     $this: VALUE_PARAMETER this@TestExplicitPrimaryConstructor: TestExplicitPrimaryConstructor
     CONSTRUCTOR public constructor TestExplicitPrimaryConstructor()
@@ -24,8 +32,12 @@ FILE /primaryConstructorWithSuperConstructorCall.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Base()'
         INSTANCE_INITIALIZER_CALL classDescriptor='TestExplicitPrimaryConstructor'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS TestWithDelegatingConstructor
     $this: VALUE_PARAMETER this@TestWithDelegatingConstructor: TestWithDelegatingConstructor
     CONSTRUCTOR public constructor TestWithDelegatingConstructor(x: kotlin.Int, y: kotlin.Int)
@@ -61,5 +73,10 @@ FILE /primaryConstructorWithSuperConstructorCall.kt
           x: GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=null
           y: CONST Int type=kotlin.Int value='0'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/classes/qualifiedSuperCalls.txt b/compiler/testData/ir/irText/classes/qualifiedSuperCalls.txt
index c16a7f8315b..5ffcb6a9b16 100644
--- a/compiler/testData/ir/irText/classes/qualifiedSuperCalls.txt
+++ b/compiler/testData/ir/irText/classes/qualifiedSuperCalls.txt
@@ -11,8 +11,12 @@ FILE /qualifiedSuperCalls.kt
           RETURN type=kotlin.Nothing from='<get-bar>(): Int'
             CONST Int type=kotlin.Int value='1'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS INTERFACE IRight
     $this: VALUE_PARAMETER this@IRight: IRight
     FUN public open fun foo(): kotlin.Unit
@@ -25,8 +29,12 @@ FILE /qualifiedSuperCalls.kt
           RETURN type=kotlin.Nothing from='<get-bar>(): Int'
             CONST Int type=kotlin.Int value='2'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS CBoth
     $this: VALUE_PARAMETER this@CBoth: CBoth
     CONSTRUCTOR public constructor CBoth()
@@ -51,5 +59,10 @@ FILE /qualifiedSuperCalls.kt
               other: CALL '<get-bar>(): Int' superQualifier=IRight type=kotlin.Int origin=GET_PROPERTY
                 $this: GET_VAR 'this@CBoth: CBoth' type=CBoth origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/classes/sealedClasses.txt b/compiler/testData/ir/irText/classes/sealedClasses.txt
index dbdfa064f83..14407cb973a 100644
--- a/compiler/testData/ir/irText/classes/sealedClasses.txt
+++ b/compiler/testData/ir/irText/classes/sealedClasses.txt
@@ -23,8 +23,12 @@ FILE /sealedClasses.kt
               GET_FIELD 'number: Double' type=kotlin.Double origin=null
                 receiver: GET_VAR 'this@Const: Const' type=Expr.Const origin=null
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     CLASS CLASS Sum
       $this: VALUE_PARAMETER this@Sum: Sum
       CONSTRUCTOR public constructor Sum(e1: Expr, e2: Expr)
@@ -54,8 +58,12 @@ FILE /sealedClasses.kt
               GET_FIELD 'e2: Expr' type=Expr origin=null
                 receiver: GET_VAR 'this@Sum: Sum' type=Expr.Sum origin=null
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     CLASS OBJECT NotANumber
       $this: VALUE_PARAMETER this@NotANumber: NotANumber
       CONSTRUCTOR private constructor NotANumber()
@@ -63,8 +71,17 @@ FILE /sealedClasses.kt
           DELEGATING_CONSTRUCTOR_CALL 'constructor Expr()'
           INSTANCE_INITIALIZER_CALL classDescriptor='NotANumber'
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.txt b/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.txt
index 50933ad9705..7a7ca1a9fd2 100644
--- a/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.txt
+++ b/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.txt
@@ -6,8 +6,12 @@ FILE /secondaryConstructorWithInitializersFromClassBody.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Base'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS TestProperty
     $this: VALUE_PARAMETER this@TestProperty: TestProperty
     PROPERTY public final val x: kotlin.Int = 0
@@ -25,8 +29,12 @@ FILE /secondaryConstructorWithInitializersFromClassBody.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Base()'
         INSTANCE_INITIALIZER_CALL classDescriptor='TestProperty'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS TestInitBlock
     $this: VALUE_PARAMETER this@TestInitBlock: TestInitBlock
     PROPERTY public final val x: kotlin.Int
@@ -56,5 +64,10 @@ FILE /secondaryConstructorWithInitializersFromClassBody.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor TestInitBlock()'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/classes/secondaryConstructors.txt b/compiler/testData/ir/irText/classes/secondaryConstructors.txt
index 0a04e46da1c..ef5757edf1a 100644
--- a/compiler/testData/ir/irText/classes/secondaryConstructors.txt
+++ b/compiler/testData/ir/irText/classes/secondaryConstructors.txt
@@ -11,5 +11,10 @@ FILE /secondaryConstructors.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='C'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/classes/superCalls.txt b/compiler/testData/ir/irText/classes/superCalls.txt
index 1de55db3cb2..7fb67bf102e 100644
--- a/compiler/testData/ir/irText/classes/superCalls.txt
+++ b/compiler/testData/ir/irText/classes/superCalls.txt
@@ -19,8 +19,12 @@ FILE /superCalls.kt
             GET_FIELD 'bar: String' type=kotlin.String origin=null
               receiver: GET_VAR 'this@Base: Base' type=Base origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS Derived
     $this: VALUE_PARAMETER this@Derived: Derived
     CONSTRUCTOR public constructor Derived()
@@ -40,5 +44,10 @@ FILE /superCalls.kt
             CALL '<get-bar>(): String' superQualifier=Base type=kotlin.String origin=GET_PROPERTY
               $this: GET_VAR 'this@Derived: Derived' type=Derived origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/declarations/classLevelProperties.txt b/compiler/testData/ir/irText/declarations/classLevelProperties.txt
index 03e69dea39f..2c62eb529e3 100644
--- a/compiler/testData/ir/irText/declarations/classLevelProperties.txt
+++ b/compiler/testData/ir/irText/declarations/classLevelProperties.txt
@@ -132,5 +132,10 @@ FILE /classLevelProperties.kt
               property: PROPERTY_REFERENCE 'test8: Int' field=null getter='<get-test8>(): Int' setter='<set-test8>(Int): Unit' type=kotlin.reflect.KMutableProperty1<C, kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
               value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/declarations/defaultArguments.txt b/compiler/testData/ir/irText/declarations/defaultArguments.txt
index e04119b39ac..5bde4be461a 100644
--- a/compiler/testData/ir/irText/declarations/defaultArguments.txt
+++ b/compiler/testData/ir/irText/declarations/defaultArguments.txt
@@ -19,3 +19,4 @@ FILE /defaultArguments.kt
           EXPRESSION_BODY
             GET_VAR 'value-parameter z: String = ...' type=kotlin.String origin=null
         BLOCK_BODY
+
diff --git a/compiler/testData/ir/irText/declarations/delegatedProperties.txt b/compiler/testData/ir/irText/declarations/delegatedProperties.txt
index 9ea1eac7d4b..7e925261483 100644
--- a/compiler/testData/ir/irText/declarations/delegatedProperties.txt
+++ b/compiler/testData/ir/irText/declarations/delegatedProperties.txt
@@ -84,8 +84,12 @@ FILE /delegatedProperties.kt
               property: PROPERTY_REFERENCE 'test3: Any' field=null getter='<get-test3>(): Any' setter='<set-test3>(Any): Unit' type=kotlin.reflect.KMutableProperty1<C, kotlin.Any> origin=PROPERTY_REFERENCE_FOR_DELEGATE
               value: GET_VAR 'value-parameter <set-?>: Any' type=kotlin.Any origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   PROPERTY public var test4: kotlin.Any
     FIELD DELEGATE val `test4$delegate`: kotlin.collections.HashMap<kotlin.String, kotlin.Any> /* = java.util.HashMap<kotlin.String, kotlin.Any> */
       EXPRESSION_BODY
@@ -110,3 +114,4 @@ FILE /delegatedProperties.kt
             thisRef: CONST Null type=kotlin.Nothing? value='null'
             property: PROPERTY_REFERENCE 'test4: Any' field=null getter='<get-test4>(): Any' setter='<set-test4>(Any): Unit' type=kotlin.reflect.KMutableProperty0<kotlin.Any> origin=PROPERTY_REFERENCE_FOR_DELEGATE
             value: GET_VAR 'value-parameter <set-?>: Any' type=kotlin.Any origin=null
+
diff --git a/compiler/testData/ir/irText/declarations/fakeOverrides.txt b/compiler/testData/ir/irText/declarations/fakeOverrides.txt
index 6c2bcd62c19..bc9f050ca37 100644
--- a/compiler/testData/ir/irText/declarations/fakeOverrides.txt
+++ b/compiler/testData/ir/irText/declarations/fakeOverrides.txt
@@ -5,16 +5,24 @@ FILE /fakeOverrides.kt
       $this: VALUE_PARAMETER this@IFooStr: IFooStr
       VALUE_PARAMETER value-parameter x: kotlin.String
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   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
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS CFoo
     $this: VALUE_PARAMETER this@CFoo: CFoo<T>
     TYPE_PARAMETER <T>
@@ -27,8 +35,12 @@ FILE /fakeOverrides.kt
       VALUE_PARAMETER value-parameter x: T
       BLOCK_BODY
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS Test1
     $this: VALUE_PARAMETER this@Test1: Test1
     CONSTRUCTOR public constructor Test1()
@@ -47,6 +59,13 @@ FILE /fakeOverrides.kt
             GET_FIELD 'bar: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@Test1: Test1' type=Test1 origin=null
     FUN FAKE_OVERRIDE public final override fun foo(x: kotlin.String): kotlin.Unit
+      $this: VALUE_PARAMETER this@CFoo: CFoo<String>
+      VALUE_PARAMETER value-parameter x: kotlin.String
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/declarations/fileWithAnnotations.txt b/compiler/testData/ir/irText/declarations/fileWithAnnotations.txt
index 8d68e3eb251..a0da359d9dd 100644
--- a/compiler/testData/ir/irText/declarations/fileWithAnnotations.txt
+++ b/compiler/testData/ir/irText/declarations/fileWithAnnotations.txt
@@ -11,3 +11,4 @@ FILE /fileWithAnnotations.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-bar>(): Int'
           GET_FIELD 'bar: Int' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/declarations/interfaceProperties.txt b/compiler/testData/ir/irText/declarations/interfaceProperties.txt
index c27307c4a21..8dca5de27ba 100644
--- a/compiler/testData/ir/irText/declarations/interfaceProperties.txt
+++ b/compiler/testData/ir/irText/declarations/interfaceProperties.txt
@@ -27,5 +27,10 @@ FILE /interfaceProperties.kt
         VALUE_PARAMETER value-parameter value: kotlin.Int
         BLOCK_BODY
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/declarations/localDelegatedProperties.txt b/compiler/testData/ir/irText/declarations/localDelegatedProperties.txt
index 8da441d5b02..cba3620ce16 100644
--- a/compiler/testData/ir/irText/declarations/localDelegatedProperties.txt
+++ b/compiler/testData/ir/irText/declarations/localDelegatedProperties.txt
@@ -64,3 +64,4 @@ FILE /localDelegatedProperties.kt
           value: CALL 'plus(Int): Int' type=kotlin.Int origin=PLUSEQ
             $this: CALL '<get-x>(): Int' type=kotlin.Int origin=PLUSEQ
             other: CONST Int type=kotlin.Int value='1'
+
diff --git a/compiler/testData/ir/irText/declarations/packageLevelProperties.txt b/compiler/testData/ir/irText/declarations/packageLevelProperties.txt
index d4719faa015..f73cbe6ad61 100644
--- a/compiler/testData/ir/irText/declarations/packageLevelProperties.txt
+++ b/compiler/testData/ir/irText/declarations/packageLevelProperties.txt
@@ -102,3 +102,4 @@ FILE /packageLevelProperties.kt
             thisRef: CONST Null type=kotlin.Nothing? value='null'
             property: PROPERTY_REFERENCE 'test8: Int' field=null getter='<get-test8>(): Int' setter='<set-test8>(Int): Unit' type=kotlin.reflect.KMutableProperty0<kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/declarations/parameters/class.txt b/compiler/testData/ir/irText/declarations/parameters/class.txt
index 17d61a340ad..973dbf2bbb6 100644
--- a/compiler/testData/ir/irText/declarations/parameters/class.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/class.txt
@@ -6,11 +6,19 @@ FILE /class.kt
       $this: VALUE_PARAMETER this@TestNestedInterface: TestNestedInterface<TT>
       TYPE_PARAMETER <TT>
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS Test
     $this: VALUE_PARAMETER this@Test: Test<T0>
     TYPE_PARAMETER <T0>
@@ -26,8 +34,12 @@ FILE /class.kt
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
           INSTANCE_INITIALIZER_CALL classDescriptor='TestNested'
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     CLASS CLASS TestInner
       $this: VALUE_PARAMETER this@TestInner: TestInner<T2, T0>
       TYPE_PARAMETER <T2>
@@ -37,8 +49,17 @@ FILE /class.kt
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
           INSTANCE_INITIALIZER_CALL classDescriptor='TestInner'
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/declarations/parameters/constructor.txt b/compiler/testData/ir/irText/declarations/parameters/constructor.txt
index 1cf4c7267a9..90f96f3b99d 100644
--- a/compiler/testData/ir/irText/declarations/parameters/constructor.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/constructor.txt
@@ -30,8 +30,12 @@ FILE /constructor.kt
             GET_FIELD 'y: T2' type=T2 origin=null
               receiver: GET_VAR 'this@Test1: Test1<T1, T2>' type=Test1<T1, T2> origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS Test2
     $this: VALUE_PARAMETER this@Test2: Test2
     CONSTRUCTOR public constructor Test2(x: kotlin.Int, y: kotlin.String)
@@ -79,11 +83,19 @@ FILE /constructor.kt
             $this: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
             z: GET_VAR 'value-parameter z: Z' type=Z origin=null
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS Test3
     $this: VALUE_PARAMETER this@Test3: Test3
     CONSTRUCTOR public constructor Test3(x: kotlin.Int, y: kotlin.String = ...)
@@ -115,8 +127,12 @@ FILE /constructor.kt
             GET_FIELD 'y: String' type=kotlin.String origin=null
               receiver: GET_VAR 'this@Test3: Test3' type=Test3 origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS Test4
     $this: VALUE_PARAMETER this@Test4: Test4<T>
     TYPE_PARAMETER <T>
@@ -147,5 +163,10 @@ FILE /constructor.kt
             $this: GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=null
             other: GET_VAR 'value-parameter y: Int = ...' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.txt b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.txt
index 742347bdca0..7b656bae01d 100644
--- a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.txt
@@ -144,3 +144,4 @@ FILE /dataClassMembers.kt
               CONST Boolean type=kotlin.Boolean value='false'
         RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
           CONST Boolean type=kotlin.Boolean value='true'
+
diff --git a/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.txt b/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.txt
index 247358a2428..ab710b11a14 100644
--- a/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.txt
@@ -54,8 +54,12 @@ FILE /defaultPropertyAccessors.kt
             receiver: GET_VAR 'this@Host: Host' type=Host origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS InPrimaryCtor
     $this: VALUE_PARAMETER this@InPrimaryCtor: InPrimaryCtor<T>
     TYPE_PARAMETER <T>
@@ -95,5 +99,10 @@ FILE /defaultPropertyAccessors.kt
             receiver: GET_VAR 'this@InPrimaryCtor: InPrimaryCtor<T>' type=InPrimaryCtor<T> origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.txt b/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.txt
index 0a72b44e533..5f2116b9a58 100644
--- a/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.txt
@@ -14,8 +14,12 @@ FILE /delegatedMembers.kt
       VALUE_PARAMETER value-parameter t: T
       VALUE_PARAMETER value-parameter x: X
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS Test
     $this: VALUE_PARAMETER this@Test: Test<TT>
     TYPE_PARAMETER <TT>
@@ -56,5 +60,10 @@ FILE /delegatedMembers.kt
               $this: GET_FIELD '`Test$IBase$delegate`: IBase<TT>' type=IBase<TT> origin=null
                 receiver: GET_VAR 'this@Test: Test<TT>' type=Test<TT> origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/declarations/parameters/fun.txt b/compiler/testData/ir/irText/declarations/parameters/fun.txt
index 475539c11f5..95da047c03d 100644
--- a/compiler/testData/ir/irText/declarations/parameters/fun.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/fun.txt
@@ -40,5 +40,10 @@ FILE /fun.kt
       VALUE_PARAMETER value-parameter j: T
       BLOCK_BODY
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.txt b/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.txt
index e0b38aad10b..f9c7b5202a4 100644
--- a/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.txt
@@ -20,8 +20,17 @@ FILE /genericInnerClass.kt
         VALUE_PARAMETER value-parameter x2: T2
         BLOCK_BODY
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/declarations/parameters/lambdas.txt b/compiler/testData/ir/irText/declarations/parameters/lambdas.txt
index 384228f466f..bd63e4337f6 100644
--- a/compiler/testData/ir/irText/declarations/parameters/lambdas.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/lambdas.txt
@@ -57,3 +57,4 @@ FILE /lambdas.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test4>(): (Int, Int) -> Unit'
           GET_FIELD 'test4: (Int, Int) -> Unit' type=(kotlin.Int, kotlin.Int) -> kotlin.Unit origin=null
+
diff --git a/compiler/testData/ir/irText/declarations/parameters/localFun.txt b/compiler/testData/ir/irText/declarations/parameters/localFun.txt
index e4f06b5b497..51e6eee308b 100644
--- a/compiler/testData/ir/irText/declarations/parameters/localFun.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/localFun.txt
@@ -23,3 +23,4 @@ FILE /localFun.kt
         VALUE_PARAMETER value-parameter i: kotlin.Int
         VALUE_PARAMETER value-parameter j: TT
         BLOCK_BODY
+
diff --git a/compiler/testData/ir/irText/declarations/parameters/propertyAccessors.txt b/compiler/testData/ir/irText/declarations/parameters/propertyAccessors.txt
index 9858402e7fe..f731ca45100 100644
--- a/compiler/testData/ir/irText/declarations/parameters/propertyAccessors.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/propertyAccessors.txt
@@ -106,5 +106,10 @@ FILE /propertyAccessors.kt
         VALUE_PARAMETER value-parameter value: kotlin.Int
         BLOCK_BODY
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.txt b/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.txt
index f6a48e022ac..ee24f9bb6ba 100644
--- a/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.txt
+++ b/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.txt
@@ -19,5 +19,10 @@ FILE /primaryCtorDefaultArguments.kt
             GET_FIELD 'x: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@Test: Test' type=Test origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/declarations/primaryCtorProperties.txt b/compiler/testData/ir/irText/declarations/primaryCtorProperties.txt
index ac87afc9167..baaa12d837d 100644
--- a/compiler/testData/ir/irText/declarations/primaryCtorProperties.txt
+++ b/compiler/testData/ir/irText/declarations/primaryCtorProperties.txt
@@ -35,5 +35,10 @@ FILE /primaryCtorProperties.kt
             receiver: GET_VAR 'this@C: C' type=C origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.txt b/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.txt
index 93272542f19..3151789b2b9 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.txt
@@ -17,8 +17,12 @@ FILE /differentReceivers.kt
             GET_FIELD 'value: String' type=kotlin.String origin=null
               receiver: GET_VAR 'this@MyClass: MyClass' type=MyClass origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public operator fun MyClass.provideDelegate(host: kotlin.Any?, p: kotlin.Any): kotlin.String
     $receiver: VALUE_PARAMETER this@provideDelegate: MyClass
     VALUE_PARAMETER value-parameter host: kotlin.Any?
@@ -70,3 +74,4 @@ FILE /differentReceivers.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-testOK>(): String'
           GET_FIELD 'testOK: String' type=kotlin.String origin=null
+
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/local.txt b/compiler/testData/ir/irText/declarations/provideDelegate/local.txt
index 9bd009da678..9fe30522b46 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/local.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/local.txt
@@ -25,8 +25,12 @@ FILE /local.kt
           CALL '<get-value>(): String' type=kotlin.String origin=GET_PROPERTY
             $this: GET_VAR 'this@Delegate: Delegate' type=Delegate origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS DelegateProvider
     $this: VALUE_PARAMETER this@DelegateProvider: DelegateProvider
     CONSTRUCTOR public constructor DelegateProvider(value: kotlin.String)
@@ -54,8 +58,12 @@ FILE /local.kt
             value: CALL '<get-value>(): String' type=kotlin.String origin=GET_PROPERTY
               $this: GET_VAR 'this@DelegateProvider: DelegateProvider' type=DelegateProvider origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun foo(): kotlin.Unit
     BLOCK_BODY
       LOCAL_DELEGATED_PROPERTY val testMember: kotlin.String
@@ -72,3 +80,4 @@ FILE /local.kt
                 $this: GET_VAR '`testMember$delegate`: Delegate' type=Delegate origin=null
                 thisRef: CONST Null type=kotlin.Nothing? value='null'
                 property: LOCAL_DELEGATED_PROPERTY_REFERENCE 'testMember: String' delegate='`testMember$delegate`: Delegate' getter='<get-testMember>(): String' setter=null type=kotlin.reflect.KProperty0<kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.txt b/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.txt
index 82ee14e6441..091090741c5 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.txt
@@ -17,8 +17,12 @@ FILE /localDifferentReceivers.kt
             GET_FIELD 'value: String' type=kotlin.String origin=null
               receiver: GET_VAR 'this@MyClass: MyClass' type=MyClass origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public operator fun MyClass.provideDelegate(host: kotlin.Any?, p: kotlin.Any): kotlin.String
     $receiver: VALUE_PARAMETER this@provideDelegate: MyClass
     VALUE_PARAMETER value-parameter host: kotlin.Any?
@@ -66,3 +70,4 @@ FILE /localDifferentReceivers.kt
           other: CALL '<get-testK>(): String' type=kotlin.String origin=GET_LOCAL_PROPERTY
       RETURN type=kotlin.Nothing from='box(): String'
         GET_VAR 'testOK: String' type=kotlin.String origin=null
+
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/member.txt b/compiler/testData/ir/irText/declarations/provideDelegate/member.txt
index 14ca51dc44a..ad84f02305a 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/member.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/member.txt
@@ -25,8 +25,12 @@ FILE /member.kt
           CALL '<get-value>(): String' type=kotlin.String origin=GET_PROPERTY
             $this: GET_VAR 'this@Delegate: Delegate' type=Delegate origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS DelegateProvider
     $this: VALUE_PARAMETER this@DelegateProvider: DelegateProvider
     CONSTRUCTOR public constructor DelegateProvider(value: kotlin.String)
@@ -54,8 +58,12 @@ FILE /member.kt
             value: CALL '<get-value>(): String' type=kotlin.String origin=GET_PROPERTY
               $this: GET_VAR 'this@DelegateProvider: DelegateProvider' type=DelegateProvider origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS Host
     $this: VALUE_PARAMETER this@Host: Host
     CONSTRUCTOR public constructor Host()
@@ -80,5 +88,10 @@ FILE /member.kt
               thisRef: GET_VAR 'this@Host: Host' type=Host origin=null
               property: PROPERTY_REFERENCE 'testMember: String' field=null getter='<get-testMember>(): String' setter=null type=kotlin.reflect.KProperty1<Host, kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.txt b/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.txt
index b1d095300a6..0a5659b1e28 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.txt
@@ -33,8 +33,12 @@ FILE /memberExtension.kt
               other: CALL '<get-s>(): String' type=kotlin.String origin=GET_PROPERTY
                 $this: GET_VAR 'this@StringDelegate: StringDelegate' type=Host.StringDelegate origin=null
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     FUN public final operator fun kotlin.String.provideDelegate(host: kotlin.Any?, p: kotlin.Any): Host.StringDelegate
       $this: VALUE_PARAMETER this@Host: Host
       $receiver: VALUE_PARAMETER this@provideDelegate: String
@@ -75,5 +79,10 @@ FILE /memberExtension.kt
             GET_FIELD 'ok: String' type=kotlin.String origin=null
               receiver: GET_VAR 'this@Host: Host' type=Host origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.txt b/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.txt
index 2af2298ffaf..88c18ffdf3c 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.txt
@@ -25,8 +25,12 @@ FILE /topLevel.kt
           CALL '<get-value>(): String' type=kotlin.String origin=GET_PROPERTY
             $this: GET_VAR 'this@Delegate: Delegate' type=Delegate origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS DelegateProvider
     $this: VALUE_PARAMETER this@DelegateProvider: DelegateProvider
     CONSTRUCTOR public constructor DelegateProvider(value: kotlin.String)
@@ -54,8 +58,12 @@ FILE /topLevel.kt
             value: CALL '<get-value>(): String' type=kotlin.String origin=GET_PROPERTY
               $this: GET_VAR 'this@DelegateProvider: DelegateProvider' type=DelegateProvider origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   PROPERTY public val testTopLevel: kotlin.String
     FIELD DELEGATE val `testTopLevel$delegate`: Delegate
       EXPRESSION_BODY
@@ -71,3 +79,4 @@ FILE /topLevel.kt
             $this: GET_FIELD '`testTopLevel$delegate`: Delegate' type=Delegate origin=null
             thisRef: CONST Null type=kotlin.Nothing? value='null'
             property: PROPERTY_REFERENCE 'testTopLevel: String' field=null getter='<get-testTopLevel>(): String' setter=null type=kotlin.reflect.KProperty0<kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+
diff --git a/compiler/testData/ir/irText/declarations/typeAlias.txt b/compiler/testData/ir/irText/declarations/typeAlias.txt
index 2bdb01a7d0c..fbf5bcd31c6 100644
--- a/compiler/testData/ir/irText/declarations/typeAlias.txt
+++ b/compiler/testData/ir/irText/declarations/typeAlias.txt
@@ -11,5 +11,10 @@ FILE /typeAlias.kt
         INSTANCE_INITIALIZER_CALL classDescriptor='C'
     TYPEALIAS typealias TestNested = String type=kotlin.String
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/errors/suppressedNonPublicCall.txt b/compiler/testData/ir/irText/errors/suppressedNonPublicCall.txt
index c9502ff3259..159ba28135b 100644
--- a/compiler/testData/ir/irText/errors/suppressedNonPublicCall.txt
+++ b/compiler/testData/ir/irText/errors/suppressedNonPublicCall.txt
@@ -9,10 +9,15 @@ FILE /suppressedNonPublicCall.kt
       $this: VALUE_PARAMETER this@C: C
       BLOCK_BODY
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public inline fun C.foo(): kotlin.Unit
     $receiver: VALUE_PARAMETER this@foo: C
     BLOCK_BODY
       CALL 'bar(): Unit' type=kotlin.Unit origin=null
         $this: GET_VAR 'this@foo: C' type=C origin=null
+
diff --git a/compiler/testData/ir/irText/errors/unresolvedReference.txt b/compiler/testData/ir/irText/errors/unresolvedReference.txt
index fa3846a4d14..81492b09acb 100644
--- a/compiler/testData/ir/irText/errors/unresolvedReference.txt
+++ b/compiler/testData/ir/irText/errors/unresolvedReference.txt
@@ -33,3 +33,4 @@ FILE /unresolvedReference.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test4>(): [ERROR : Type for 42 *]'
           GET_FIELD 'test4: [ERROR : Type for 42 *]' type=[ERROR : Type for 42 *] origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/arrayAccess.txt b/compiler/testData/ir/irText/expressions/arrayAccess.txt
index 7529665e588..690880f5943 100644
--- a/compiler/testData/ir/irText/expressions/arrayAccess.txt
+++ b/compiler/testData/ir/irText/expressions/arrayAccess.txt
@@ -26,3 +26,4 @@ FILE /arrayAccess.kt
           other: CALL 'get(Int): Int' type=kotlin.Int origin=GET_ARRAY_ELEMENT
             $this: GET_VAR 'value-parameter a: IntArray' type=kotlin.IntArray origin=null
             index: CALL 'foo(): Int' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/arrayAssignment.txt b/compiler/testData/ir/irText/expressions/arrayAssignment.txt
index 55c3dc58090..8e393d3b75a 100644
--- a/compiler/testData/ir/irText/expressions/arrayAssignment.txt
+++ b/compiler/testData/ir/irText/expressions/arrayAssignment.txt
@@ -25,3 +25,4 @@ FILE /arrayAssignment.kt
             CONST Int type=kotlin.Int value='3'
         index: CALL 'foo(): Int' type=kotlin.Int origin=null
         value: CONST Int type=kotlin.Int value='1'
+
diff --git a/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.txt b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.txt
index 74826252e64..ab32aa2a621 100644
--- a/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.txt
+++ b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.txt
@@ -29,8 +29,12 @@ FILE /arrayAugmentedAssignment1.kt
             GET_FIELD 'x: IntArray' type=kotlin.IntArray origin=null
               receiver: GET_VAR 'this@C: C' type=C origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun testVariable(): kotlin.Unit
     BLOCK_BODY
       VAR var x: kotlin.IntArray
@@ -83,3 +87,4 @@ FILE /arrayAugmentedAssignment1.kt
             value: CALL 'inc(): Int' type=kotlin.Int origin=POSTFIX_INCR
               $this: GET_VAR 'tmp2: Int' type=kotlin.Int origin=null
           GET_VAR 'tmp2: Int' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment2.txt b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment2.txt
index c5c426848ff..a3d1873ab2b 100644
--- a/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment2.txt
+++ b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment2.txt
@@ -5,8 +5,12 @@ FILE /arrayAugmentedAssignment2.kt
       $this: VALUE_PARAMETER this@IA: IA
       VALUE_PARAMETER value-parameter index: kotlin.String
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS INTERFACE IB
     $this: VALUE_PARAMETER this@IB: IB
     FUN public abstract operator fun IA.set(index: kotlin.String, value: kotlin.Int): kotlin.Unit
@@ -15,8 +19,12 @@ FILE /arrayAugmentedAssignment2.kt
       VALUE_PARAMETER value-parameter index: kotlin.String
       VALUE_PARAMETER value-parameter value: kotlin.Int
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun IB.test(a: IA): kotlin.Unit
     $receiver: VALUE_PARAMETER this@test: IB
     VALUE_PARAMETER value-parameter a: IA
@@ -35,3 +43,4 @@ FILE /arrayAugmentedAssignment2.kt
               $this: GET_VAR 'tmp0_array: IA' type=IA origin=null
               index: GET_VAR 'tmp1_index0: String' type=kotlin.String origin=null
             other: CONST Int type=kotlin.Int value='42'
+
diff --git a/compiler/testData/ir/irText/expressions/assignments.txt b/compiler/testData/ir/irText/expressions/assignments.txt
index 364f8885b70..04bc45ccad1 100644
--- a/compiler/testData/ir/irText/expressions/assignments.txt
+++ b/compiler/testData/ir/irText/expressions/assignments.txt
@@ -24,8 +24,12 @@ FILE /assignments.kt
             receiver: GET_VAR 'this@Ref: Ref' type=Ref origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun test1(): kotlin.Unit
     BLOCK_BODY
       VAR var x: kotlin.Int
@@ -42,3 +46,4 @@ FILE /assignments.kt
       CALL '<set-x>(Int): Unit' type=kotlin.Unit origin=EQ
         $this: GET_VAR 'value-parameter r: Ref' type=Ref origin=null
         <set-?>: CONST Int type=kotlin.Int value='0'
+
diff --git a/compiler/testData/ir/irText/expressions/augmentedAssignment1.txt b/compiler/testData/ir/irText/expressions/augmentedAssignment1.txt
index 32a0d5411b6..08b301df64a 100644
--- a/compiler/testData/ir/irText/expressions/augmentedAssignment1.txt
+++ b/compiler/testData/ir/irText/expressions/augmentedAssignment1.txt
@@ -63,3 +63,4 @@ FILE /augmentedAssignment1.kt
           <set-?>: CALL 'rem(Int): Int' type=kotlin.Int origin=PERCEQ
             $this: CALL '<get-p>(): Int' type=kotlin.Int origin=PERCEQ
             other: CONST Int type=kotlin.Int value='5'
+
diff --git a/compiler/testData/ir/irText/expressions/augmentedAssignment2.txt b/compiler/testData/ir/irText/expressions/augmentedAssignment2.txt
index 9494715187e..94bbd8d79f5 100644
--- a/compiler/testData/ir/irText/expressions/augmentedAssignment2.txt
+++ b/compiler/testData/ir/irText/expressions/augmentedAssignment2.txt
@@ -6,8 +6,12 @@ FILE /augmentedAssignment2.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='A'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public operator fun A.plusAssign(s: kotlin.String): kotlin.Unit
     $receiver: VALUE_PARAMETER this@plusAssign: A
     VALUE_PARAMETER value-parameter s: kotlin.String
@@ -77,3 +81,4 @@ FILE /augmentedAssignment2.kt
         CALL 'modAssign(String) on A: Unit' type=kotlin.Unit origin=PERCEQ
           $receiver: CALL '<get-p>(): A' type=A origin=PERCEQ
           s: CONST String type=kotlin.String value='%='
+
diff --git a/compiler/testData/ir/irText/expressions/augmentedAssignmentWithExpression.txt b/compiler/testData/ir/irText/expressions/augmentedAssignmentWithExpression.txt
index 111b7276c51..337981be87a 100644
--- a/compiler/testData/ir/irText/expressions/augmentedAssignmentWithExpression.txt
+++ b/compiler/testData/ir/irText/expressions/augmentedAssignmentWithExpression.txt
@@ -16,8 +16,12 @@ FILE /augmentedAssignmentWithExpression.kt
           $this: GET_VAR 'this@Host: Host' type=Host origin=PLUSEQ
           x: CONST Int type=kotlin.Int value='1'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun foo(): Host
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='foo(): Host'
@@ -40,3 +44,4 @@ FILE /augmentedAssignmentWithExpression.kt
         $this: CALL 'invoke(): Host' type=Host origin=INVOKE
           $this: GET_VAR 'value-parameter a: () -> Host' type=() -> Host origin=VARIABLE_AS_FUNCTION
         x: CONST Int type=kotlin.Int value='1'
+
diff --git a/compiler/testData/ir/irText/expressions/badBreakContinue.txt b/compiler/testData/ir/irText/expressions/badBreakContinue.txt
index 1ace5f45be8..a824dfb9cce 100644
--- a/compiler/testData/ir/irText/expressions/badBreakContinue.txt
+++ b/compiler/testData/ir/irText/expressions/badBreakContinue.txt
@@ -30,3 +30,4 @@ FILE /badBreakContinue.kt
       WHILE label=null origin=WHILE_LOOP
         condition: ERROR_EXPR 'Loop not found for continue expression: continue' type=kotlin.Nothing
         body: BLOCK type=kotlin.Unit origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/bangbang.txt b/compiler/testData/ir/irText/expressions/bangbang.txt
index 39de9ac8d57..ce169014d6b 100644
--- a/compiler/testData/ir/irText/expressions/bangbang.txt
+++ b/compiler/testData/ir/irText/expressions/bangbang.txt
@@ -43,3 +43,4 @@ FILE /bangbang.kt
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value='true'
               then: GET_VAR 'tmp1_notnull: Int?' type=kotlin.Int? origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/booleanConstsInAndAndOrOr.txt b/compiler/testData/ir/irText/expressions/booleanConstsInAndAndOrOr.txt
index c58b993128f..82b0d519a6b 100644
--- a/compiler/testData/ir/irText/expressions/booleanConstsInAndAndOrOr.txt
+++ b/compiler/testData/ir/irText/expressions/booleanConstsInAndAndOrOr.txt
@@ -23,3 +23,4 @@ FILE /booleanConstsInAndAndOrOr.kt
             if: CONST Boolean type=kotlin.Boolean value='true'
             then: RETURN type=kotlin.Nothing from='test2(Boolean): Unit'
               GET_OBJECT 'Unit' type=kotlin.Unit
+
diff --git a/compiler/testData/ir/irText/expressions/booleanOperators.txt b/compiler/testData/ir/irText/expressions/booleanOperators.txt
index 3fd66304359..6aefb34f364 100644
--- a/compiler/testData/ir/irText/expressions/booleanOperators.txt
+++ b/compiler/testData/ir/irText/expressions/booleanOperators.txt
@@ -39,3 +39,4 @@ FILE /booleanOperators.kt
         CALL 'or(Boolean): Boolean' type=kotlin.Boolean origin=null
           $this: GET_VAR 'value-parameter a: Boolean' type=kotlin.Boolean origin=null
           other: GET_VAR 'value-parameter b: Boolean' type=kotlin.Boolean origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/boundCallableReferences.txt b/compiler/testData/ir/irText/expressions/boundCallableReferences.txt
index ed4d695d2a7..43cf75cfd9e 100644
--- a/compiler/testData/ir/irText/expressions/boundCallableReferences.txt
+++ b/compiler/testData/ir/irText/expressions/boundCallableReferences.txt
@@ -19,8 +19,12 @@ FILE /boundCallableReferences.kt
             GET_FIELD 'bar: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@A: A' type=A origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun A.qux(): kotlin.Unit
     $receiver: VALUE_PARAMETER this@qux: A
     BLOCK_BODY
@@ -51,3 +55,4 @@ FILE /boundCallableReferences.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test3>(): KFunction0<Unit>'
           GET_FIELD 'test3: KFunction0<Unit>' type=kotlin.reflect.KFunction0<kotlin.Unit> origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/boxOk.txt b/compiler/testData/ir/irText/expressions/boxOk.txt
index 6fd35a5ac6c..2b98be391f1 100644
--- a/compiler/testData/ir/irText/expressions/boxOk.txt
+++ b/compiler/testData/ir/irText/expressions/boxOk.txt
@@ -3,3 +3,4 @@ FILE /boxOk.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='box(): String'
         CONST String type=kotlin.String value='OK'
+
diff --git a/compiler/testData/ir/irText/expressions/breakContinue.txt b/compiler/testData/ir/irText/expressions/breakContinue.txt
index 34fa640c881..17b8eccd899 100644
--- a/compiler/testData/ir/irText/expressions/breakContinue.txt
+++ b/compiler/testData/ir/irText/expressions/breakContinue.txt
@@ -57,3 +57,4 @@ FILE /breakContinue.kt
             body: BLOCK type=kotlin.Unit origin=null
               CONTINUE label=L loop.label=L
           CONTINUE label=L loop.label=L
+
diff --git a/compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.txt b/compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.txt
index e79fe25c195..f2458cdf4b6 100644
--- a/compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.txt
+++ b/compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.txt
@@ -93,3 +93,4 @@ FILE /breakContinueInLoopHeader.kt
                 VAR val s: kotlin.String
                   CALL 'next(): String' type=kotlin.String origin=FOR_LOOP_NEXT
                     $this: GET_VAR 'tmp1_iterator: Iterator<String>' type=kotlin.collections.Iterator<kotlin.String> origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/callWithReorderedArguments.txt b/compiler/testData/ir/irText/expressions/callWithReorderedArguments.txt
index 7fd464fa7f2..e2c3927c00d 100644
--- a/compiler/testData/ir/irText/expressions/callWithReorderedArguments.txt
+++ b/compiler/testData/ir/irText/expressions/callWithReorderedArguments.txt
@@ -40,3 +40,4 @@ FILE /callWithReorderedArguments.kt
         CALL 'foo(Int, Int): Unit' type=kotlin.Unit origin=null
           a: GET_VAR 'tmp3_a: Int' type=kotlin.Int origin=null
           b: GET_VAR 'tmp2_b: Int' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/calls.txt b/compiler/testData/ir/irText/expressions/calls.txt
index 045f27e1e0e..29f31937d1b 100644
--- a/compiler/testData/ir/irText/expressions/calls.txt
+++ b/compiler/testData/ir/irText/expressions/calls.txt
@@ -43,3 +43,4 @@ FILE /calls.kt
           x: CALL 'ext1() on Int: Int' type=kotlin.Int origin=null
             $receiver: GET_VAR 'this@ext3: Int' type=kotlin.Int origin=null
           y: GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/catchParameterAccess.txt b/compiler/testData/ir/irText/expressions/catchParameterAccess.txt
index 183aa91ea91..646970a0a05 100644
--- a/compiler/testData/ir/irText/expressions/catchParameterAccess.txt
+++ b/compiler/testData/ir/irText/expressions/catchParameterAccess.txt
@@ -12,3 +12,4 @@ FILE /catchParameterAccess.kt
             BLOCK type=kotlin.Nothing origin=null
               THROW type=kotlin.Nothing
                 GET_VAR 'e: Exception /* = Exception */' type=kotlin.Exception /* = java.lang.Exception */ origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/chainOfSafeCalls.txt b/compiler/testData/ir/irText/expressions/chainOfSafeCalls.txt
index 54dac5f5e41..43eb555c904 100644
--- a/compiler/testData/ir/irText/expressions/chainOfSafeCalls.txt
+++ b/compiler/testData/ir/irText/expressions/chainOfSafeCalls.txt
@@ -16,8 +16,12 @@ FILE /chainOfSafeCalls.kt
         RETURN type=kotlin.Nothing from='bar(): C?'
           GET_VAR 'this@C: C' type=C origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun test(nc: C?): C?
     VALUE_PARAMETER value-parameter nc: C?
     BLOCK_BODY
@@ -71,3 +75,4 @@ FILE /chainOfSafeCalls.kt
               if: CONST Boolean type=kotlin.Boolean value='true'
               then: CALL 'foo(): C' type=C origin=null
                 $this: GET_VAR 'tmp3_safe_receiver: C?' type=C? origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/classReference.txt b/compiler/testData/ir/irText/expressions/classReference.txt
index 6237ab5d8ab..2cd53666a56 100644
--- a/compiler/testData/ir/irText/expressions/classReference.txt
+++ b/compiler/testData/ir/irText/expressions/classReference.txt
@@ -6,8 +6,12 @@ FILE /classReference.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='A'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun test(): kotlin.Unit
     BLOCK_BODY
       TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
@@ -22,3 +26,4 @@ FILE /classReference.kt
         CALL '<get-java>() on KClass<out A>: Class<out A>' type=java.lang.Class<out A> origin=GET_PROPERTY
           $receiver: GET_CLASS type=kotlin.reflect.KClass<out A>
             CALL 'constructor A()' type=A origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/coercionToUnit.txt b/compiler/testData/ir/irText/expressions/coercionToUnit.txt
index 93ba3d0267b..185a9668d37 100644
--- a/compiler/testData/ir/irText/expressions/coercionToUnit.txt
+++ b/compiler/testData/ir/irText/expressions/coercionToUnit.txt
@@ -54,3 +54,4 @@ FILE /coercionToUnit.kt
                 $this: TYPE_OP type=java.io.PrintStream origin=IMPLICIT_NOTNULL typeOperand=java.io.PrintStream
                   GET_VAR 'tmp1_safe_receiver: PrintStream!' type=java.io.PrintStream! origin=null
                 p0: CONST String type=kotlin.String value='world!'
+
diff --git a/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.txt b/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.txt
index d8d86980972..19eabe41060 100644
--- a/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.txt
+++ b/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.txt
@@ -69,14 +69,26 @@ FILE /complexAugmentedAssignment.kt
                 receiver: GET_VAR 'this@X3: X3' type=X1.X2.X3 origin=null
                 value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
         FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+          $this: VALUE_PARAMETER this@Any: Any
+          VALUE_PARAMETER value-parameter other: kotlin.Any?
         FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+          $this: VALUE_PARAMETER this@Any: Any
         FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+          $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun test1(a: kotlin.IntArray): kotlin.Unit
     VALUE_PARAMETER value-parameter a: kotlin.IntArray
     BLOCK_BODY
@@ -172,8 +184,12 @@ FILE /complexAugmentedAssignment.kt
             receiver: GET_VAR 'this@B: B' type=B origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS OBJECT Host
     $this: VALUE_PARAMETER this@Host: Host
     CONSTRUCTOR private constructor Host()
@@ -196,8 +212,12 @@ FILE /complexAugmentedAssignment.kt
               other: CALL '<get-s>(): Int' type=kotlin.Int origin=GET_PROPERTY
                 $this: GET_VAR 'value-parameter b: B' type=B origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun Host.test3(v: B): kotlin.Unit
     $receiver: VALUE_PARAMETER this@test3: Host
     VALUE_PARAMETER value-parameter v: B
@@ -207,3 +227,4 @@ FILE /complexAugmentedAssignment.kt
         $receiver: GET_VAR 'value-parameter v: B' type=B origin=PLUSEQ
         b: CALL 'constructor B(Int = ...)' type=B origin=null
           s: CONST Int type=kotlin.Int value='1000'
+
diff --git a/compiler/testData/ir/irText/expressions/contructorCall.txt b/compiler/testData/ir/irText/expressions/contructorCall.txt
index 5086dd3e4b5..d313e2bdc07 100644
--- a/compiler/testData/ir/irText/expressions/contructorCall.txt
+++ b/compiler/testData/ir/irText/expressions/contructorCall.txt
@@ -6,8 +6,12 @@ FILE /contructorCall.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='A'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   PROPERTY public val test: A
     FIELD PROPERTY_BACKING_FIELD public val test: A
       EXPRESSION_BODY
@@ -16,3 +20,4 @@ FILE /contructorCall.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test>(): A'
           GET_FIELD 'test: A' type=A origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/conventionComparisons.txt b/compiler/testData/ir/irText/expressions/conventionComparisons.txt
index a4515c41571..3ef247cb1ca 100644
--- a/compiler/testData/ir/irText/expressions/conventionComparisons.txt
+++ b/compiler/testData/ir/irText/expressions/conventionComparisons.txt
@@ -2,8 +2,12 @@ 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
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS INTERFACE IB
     $this: VALUE_PARAMETER this@IB: IB
     FUN public abstract operator fun IA.compareTo(other: IA): kotlin.Int
@@ -11,8 +15,12 @@ FILE /conventionComparisons.kt
       $receiver: VALUE_PARAMETER this@compareTo: IA
       VALUE_PARAMETER value-parameter other: IA
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun IB.test1(a1: IA, a2: IA): kotlin.Boolean
     $receiver: VALUE_PARAMETER this@test1: IB
     VALUE_PARAMETER value-parameter a1: IA
@@ -57,3 +65,4 @@ FILE /conventionComparisons.kt
             $this: GET_VAR 'this@test4: IB' type=IB origin=null
             $receiver: GET_VAR 'value-parameter a1: IA' type=IA origin=null
             other: GET_VAR 'value-parameter a2: IA' type=IA origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/destructuring1.txt b/compiler/testData/ir/irText/expressions/destructuring1.txt
index a73b5bdfbef..8c68da1ef2a 100644
--- a/compiler/testData/ir/irText/expressions/destructuring1.txt
+++ b/compiler/testData/ir/irText/expressions/destructuring1.txt
@@ -6,8 +6,12 @@ FILE /destructuring1.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='A'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS OBJECT B
     $this: VALUE_PARAMETER this@B: B
     CONSTRUCTOR private constructor B()
@@ -27,8 +31,12 @@ FILE /destructuring1.kt
         RETURN type=kotlin.Nothing from='component2() on A: Int'
           CONST Int type=kotlin.Int value='2'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun B.test(): kotlin.Unit
     $receiver: VALUE_PARAMETER this@test: B
     BLOCK_BODY
@@ -43,3 +51,4 @@ FILE /destructuring1.kt
           CALL 'component2() on A: Int' type=kotlin.Int origin=COMPONENT_N(index=2)
             $this: GET_VAR 'this@test: B' type=B origin=null
             $receiver: GET_VAR 'tmp0_container: A' type=A origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/destructuringWithUnderscore.txt b/compiler/testData/ir/irText/expressions/destructuringWithUnderscore.txt
index 4f6e75d19bc..a3997936811 100644
--- a/compiler/testData/ir/irText/expressions/destructuringWithUnderscore.txt
+++ b/compiler/testData/ir/irText/expressions/destructuringWithUnderscore.txt
@@ -6,8 +6,12 @@ FILE /destructuringWithUnderscore.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='A'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS OBJECT B
     $this: VALUE_PARAMETER this@B: B
     CONSTRUCTOR private constructor B()
@@ -33,8 +37,12 @@ FILE /destructuringWithUnderscore.kt
         RETURN type=kotlin.Nothing from='component3() on A: Int'
           CONST Int type=kotlin.Int value='3'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun B.test(): kotlin.Unit
     $receiver: VALUE_PARAMETER this@test: B
     BLOCK_BODY
@@ -49,3 +57,4 @@ FILE /destructuringWithUnderscore.kt
           CALL 'component3() on A: Int' type=kotlin.Int origin=COMPONENT_N(index=3)
             $this: GET_VAR 'this@test: B' type=B origin=null
             $receiver: GET_VAR 'tmp0_container: A' type=A origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/dotQualified.txt b/compiler/testData/ir/irText/expressions/dotQualified.txt
index e3d000709b0..56fa036274a 100644
--- a/compiler/testData/ir/irText/expressions/dotQualified.txt
+++ b/compiler/testData/ir/irText/expressions/dotQualified.txt
@@ -22,3 +22,4 @@ FILE /dotQualified.kt
               if: CONST Boolean type=kotlin.Boolean value='true'
               then: CALL '<get-length>(): Int' type=kotlin.Int origin=GET_PROPERTY
                 $this: GET_VAR 'tmp0_safe_receiver: String?' type=kotlin.String? origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/elvis.txt b/compiler/testData/ir/irText/expressions/elvis.txt
index b1c43d1e48a..d20a4c02b13 100644
--- a/compiler/testData/ir/irText/expressions/elvis.txt
+++ b/compiler/testData/ir/irText/expressions/elvis.txt
@@ -108,3 +108,4 @@ FILE /elvis.kt
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value='true'
               then: GET_VAR 'tmp0_elvis_lhs: Any?' type=kotlin.Any? origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.txt b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.txt
index 18f519837cd..5237de8b0b2 100644
--- a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.txt
+++ b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.txt
@@ -40,30 +40,52 @@ FILE /enumEntryAsReceiver.kt
                 GET_FIELD 'value: () -> String' type=() -> kotlin.String origin=null
                   receiver: GET_VAR 'this@B: B' type=X.B origin=null
         FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
+          $this: VALUE_PARAMETER this@Enum: Enum<X>
         FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
+          $this: VALUE_PARAMETER this@Enum: Enum<X>
         FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<X!>!
+          $this: VALUE_PARAMETER this@Enum: Enum<X>
         FUN FAKE_OVERRIDE public final override fun compareTo(other: X): kotlin.Int
+          $this: VALUE_PARAMETER this@Enum: Enum<X>
+          VALUE_PARAMETER value-parameter other: X
         FUN FAKE_OVERRIDE public final override fun equals(other: kotlin.Any?): kotlin.Boolean
+          $this: VALUE_PARAMETER this@Enum: Enum<X>
+          VALUE_PARAMETER value-parameter other: kotlin.Any?
         FUN FAKE_OVERRIDE public final override fun hashCode(): kotlin.Int
+          $this: VALUE_PARAMETER this@Enum: Enum<X>
         PROPERTY FAKE_OVERRIDE public final override val name: kotlin.String
           FUN FAKE_OVERRIDE public final override fun <get-name>(): kotlin.String
+            $this: VALUE_PARAMETER this@Enum: Enum<X>
         PROPERTY FAKE_OVERRIDE public final override val ordinal: kotlin.Int
           FUN FAKE_OVERRIDE public final override fun <get-ordinal>(): kotlin.Int
+            $this: VALUE_PARAMETER this@Enum: Enum<X>
         FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+          $this: VALUE_PARAMETER this@Enum: Enum<X>
     PROPERTY public abstract val value: () -> kotlin.String
       FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <get-value>(): () -> kotlin.String
         $this: VALUE_PARAMETER this@X: X
     FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
+      $this: VALUE_PARAMETER this@Enum: Enum<X>
     FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
+      $this: VALUE_PARAMETER this@Enum: Enum<X>
     FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<X!>!
+      $this: VALUE_PARAMETER this@Enum: Enum<X>
     FUN FAKE_OVERRIDE public final override fun compareTo(other: X): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<X>
+      VALUE_PARAMETER value-parameter other: X
     FUN FAKE_OVERRIDE public final override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Enum: Enum<X>
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public final override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<X>
     PROPERTY FAKE_OVERRIDE public final override val name: kotlin.String
       FUN FAKE_OVERRIDE public final override fun <get-name>(): kotlin.String
+        $this: VALUE_PARAMETER this@Enum: Enum<X>
     PROPERTY FAKE_OVERRIDE public final override val ordinal: kotlin.Int
       FUN FAKE_OVERRIDE public final override fun <get-ordinal>(): kotlin.Int
+        $this: VALUE_PARAMETER this@Enum: Enum<X>
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Enum: Enum<X>
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun values(): kotlin.Array<X>
       SYNTHETIC_BODY kind=ENUM_VALUES
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): X
@@ -74,3 +96,4 @@ FILE /enumEntryAsReceiver.kt
         CALL 'invoke(): String' type=kotlin.String origin=INVOKE
           $this: CALL '<get-value>(): () -> String' type=() -> kotlin.String origin=GET_PROPERTY
             $this: GET_ENUM 'B' type=X
+
diff --git a/compiler/testData/ir/irText/expressions/equality.txt b/compiler/testData/ir/irText/expressions/equality.txt
index da2ee6adcc8..7d7213bfad0 100644
--- a/compiler/testData/ir/irText/expressions/equality.txt
+++ b/compiler/testData/ir/irText/expressions/equality.txt
@@ -24,3 +24,4 @@ FILE /equality.kt
         CALL 'EQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EQEQ
           arg0: GET_VAR 'value-parameter a: Any?' type=kotlin.Any? origin=null
           arg1: GET_VAR 'value-parameter b: Any?' type=kotlin.Any? origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.txt b/compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.txt
index 8fb961061dd..33d3b58b16d 100644
--- a/compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.txt
+++ b/compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.txt
@@ -11,3 +11,4 @@ FILE /extensionPropertyGetterCall.kt
       RETURN type=kotlin.Nothing from='test5() on String: String'
         CALL '<get-okext>() on String: String' type=kotlin.String origin=GET_PROPERTY
           $receiver: GET_VAR 'this@test5: String' type=kotlin.String origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/field.txt b/compiler/testData/ir/irText/expressions/field.txt
index 0293dab1e1e..098965e9b6e 100644
--- a/compiler/testData/ir/irText/expressions/field.txt
+++ b/compiler/testData/ir/irText/expressions/field.txt
@@ -27,3 +27,4 @@ FILE /field.kt
           value: CALL 'plus(Int): Int' type=kotlin.Int origin=PLUSEQ
             $this: GET_FIELD 'testAugmented: Int' type=kotlin.Int origin=PLUSEQ
             other: GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/for.txt b/compiler/testData/ir/irText/expressions/for.txt
index c66440bc126..3128e5f7b8c 100644
--- a/compiler/testData/ir/irText/expressions/for.txt
+++ b/compiler/testData/ir/irText/expressions/for.txt
@@ -55,3 +55,4 @@ FILE /for.kt
                 message: GET_VAR 'i: Int' type=kotlin.Int origin=null
               CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
                 message: GET_VAR 's: String' type=kotlin.String origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/forWithBreakContinue.txt b/compiler/testData/ir/irText/expressions/forWithBreakContinue.txt
index 328b16ca13f..fb0a2f6e861 100644
--- a/compiler/testData/ir/irText/expressions/forWithBreakContinue.txt
+++ b/compiler/testData/ir/irText/expressions/forWithBreakContinue.txt
@@ -93,3 +93,4 @@ FILE /forWithBreakContinue.kt
                       CONTINUE label=INNER loop.label=INNER
                       CONTINUE label=null loop.label=INNER
               CONTINUE label=OUTER loop.label=OUTER
+
diff --git a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt
index 5538400225a..89d14830285 100644
--- a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt
+++ b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt
@@ -6,8 +6,12 @@ FILE /forWithImplicitReceivers.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='FiveTimes'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS IntCell
     $this: VALUE_PARAMETER this@IntCell: IntCell
     CONSTRUCTOR public constructor IntCell(value: kotlin.Int)
@@ -33,8 +37,12 @@ FILE /forWithImplicitReceivers.kt
             receiver: GET_VAR 'this@IntCell: IntCell' type=IntCell origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS INTERFACE IReceiver
     $this: VALUE_PARAMETER this@IReceiver: IReceiver
     FUN public open operator fun FiveTimes.iterator(): IntCell
@@ -72,8 +80,12 @@ FILE /forWithImplicitReceivers.kt
                   $this: GET_VAR 'tmp1: Int' type=kotlin.Int origin=null
               GET_VAR 'tmp1: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun IReceiver.test(): kotlin.Unit
     $receiver: VALUE_PARAMETER this@test: IReceiver
     BLOCK_BODY
@@ -94,3 +106,4 @@ FILE /forWithImplicitReceivers.kt
             BLOCK type=kotlin.Unit origin=null
               CALL 'println(Int): Unit' type=kotlin.Unit origin=null
                 message: GET_VAR 'i: Int' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/genericPropertyCall.txt b/compiler/testData/ir/irText/expressions/genericPropertyCall.txt
index daed07a8986..39945ed7071 100644
--- a/compiler/testData/ir/irText/expressions/genericPropertyCall.txt
+++ b/compiler/testData/ir/irText/expressions/genericPropertyCall.txt
@@ -14,3 +14,4 @@ FILE /genericPropertyCall.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test>(): String'
           GET_FIELD 'test: String' type=kotlin.String origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/identity.txt b/compiler/testData/ir/irText/expressions/identity.txt
index 9781b2a7126..288ccfc55f3 100644
--- a/compiler/testData/ir/irText/expressions/identity.txt
+++ b/compiler/testData/ir/irText/expressions/identity.txt
@@ -24,3 +24,4 @@ FILE /identity.kt
         CALL 'EQEQEQ(Any?, Any?): Boolean' type=kotlin.Boolean origin=EQEQEQ
           arg0: GET_VAR 'value-parameter a: Any?' type=kotlin.Any? origin=null
           arg1: GET_VAR 'value-parameter b: Any?' type=kotlin.Any? origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/ifElseIf.txt b/compiler/testData/ir/irText/expressions/ifElseIf.txt
index d835543dc96..391b73c4d6e 100644
--- a/compiler/testData/ir/irText/expressions/ifElseIf.txt
+++ b/compiler/testData/ir/irText/expressions/ifElseIf.txt
@@ -19,3 +19,4 @@ FILE /ifElseIf.kt
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value='true'
             then: CONST Int type=kotlin.Int value='0'
+
diff --git a/compiler/testData/ir/irText/expressions/implicitCastOnPlatformType.txt b/compiler/testData/ir/irText/expressions/implicitCastOnPlatformType.txt
index 6b36a3949c0..808ea01fb21 100644
--- a/compiler/testData/ir/irText/expressions/implicitCastOnPlatformType.txt
+++ b/compiler/testData/ir/irText/expressions/implicitCastOnPlatformType.txt
@@ -5,3 +5,4 @@ FILE /implicitCastOnPlatformType.kt
         TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
           CALL 'getProperty(String!): String!' type=kotlin.String! origin=null
             p0: CONST String type=kotlin.String value='test'
+
diff --git a/compiler/testData/ir/irText/expressions/in.txt b/compiler/testData/ir/irText/expressions/in.txt
index cf80f536b8b..17639c70587 100644
--- a/compiler/testData/ir/irText/expressions/in.txt
+++ b/compiler/testData/ir/irText/expressions/in.txt
@@ -35,3 +35,4 @@ FILE /in.kt
           arg0: CALL 'contains(T): Boolean' type=kotlin.Boolean origin=NOT_IN
             $this: GET_VAR 'value-parameter x: Collection<T>' type=kotlin.collections.Collection<T> origin=null
             element: GET_VAR 'value-parameter a: T' type=T origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/incrementDecrement.txt b/compiler/testData/ir/irText/expressions/incrementDecrement.txt
index 967727da6ab..e5abfcac345 100644
--- a/compiler/testData/ir/irText/expressions/incrementDecrement.txt
+++ b/compiler/testData/ir/irText/expressions/incrementDecrement.txt
@@ -162,3 +162,4 @@ FILE /incrementDecrement.kt
             value: CALL 'dec(): Int' type=kotlin.Int origin=POSTFIX_DECR
               $this: GET_VAR 'tmp5: Int' type=kotlin.Int origin=null
           GET_VAR 'tmp5: Int' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/interfaceThisRef.txt b/compiler/testData/ir/irText/expressions/interfaceThisRef.txt
index 8762fe232b4..c1c8bd53a55 100644
--- a/compiler/testData/ir/irText/expressions/interfaceThisRef.txt
+++ b/compiler/testData/ir/irText/expressions/interfaceThisRef.txt
@@ -9,5 +9,10 @@ FILE /interfaceThisRef.kt
         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
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.txt b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.txt
index cc4b6dcfdd4..b2909f9cdea 100644
--- a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.txt
+++ b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.txt
@@ -26,5 +26,10 @@ FILE /Derived.kt
     PROPERTY FAKE_OVERRIDE public final override var value: kotlin.Int
       FIELD FAKE_OVERRIDE public final override var value: kotlin.Int
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt
index 6df35615239..5d5f0f0c900 100644
--- a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt
+++ b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt
@@ -52,5 +52,10 @@ FILE /jvmStaticFieldReference.kt
             GET_FIELD 'out: PrintStream!' type=java.io.PrintStream! origin=GET_PROPERTY
           p0: CONST String type=kotlin.String value='TestClass/init'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/expressions/kt16904.txt b/compiler/testData/ir/irText/expressions/kt16904.txt
index 6e1df535403..5a5d019711d 100644
--- a/compiler/testData/ir/irText/expressions/kt16904.txt
+++ b/compiler/testData/ir/irText/expressions/kt16904.txt
@@ -33,8 +33,12 @@ FILE /kt16904.kt
             receiver: GET_VAR 'this@A: A' type=A origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS B
     $this: VALUE_PARAMETER this@B: B
     CONSTRUCTOR public constructor B()
@@ -46,8 +50,12 @@ FILE /kt16904.kt
       VALUE_PARAMETER value-parameter x: kotlin.Int
       BLOCK_BODY
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS Test1
     $this: VALUE_PARAMETER this@Test1: Test1
     CONSTRUCTOR public constructor Test1()
@@ -72,12 +80,20 @@ FILE /kt16904.kt
               other: CONST Int type=kotlin.Int value='42'
     PROPERTY FAKE_OVERRIDE public final override val x: B
       FUN FAKE_OVERRIDE public final override fun <get-x>(): B
+        $this: VALUE_PARAMETER this@A: A
     PROPERTY FAKE_OVERRIDE public final override var y: kotlin.Int
       FUN FAKE_OVERRIDE public final override fun <get-y>(): kotlin.Int
+        $this: VALUE_PARAMETER this@A: A
       FUN FAKE_OVERRIDE public final override fun <set-y>(<set-?>: kotlin.Int): kotlin.Unit
+        $this: VALUE_PARAMETER this@A: A
+        VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS Test2
     $this: VALUE_PARAMETER this@Test2: Test2
     CONSTRUCTOR public constructor Test2()
@@ -92,5 +108,10 @@ FILE /kt16904.kt
     PROPERTY FAKE_OVERRIDE public final override var field: kotlin.Int
       FIELD FAKE_OVERRIDE public final override var field: kotlin.Int
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/expressions/kt16905.txt b/compiler/testData/ir/irText/expressions/kt16905.txt
index 1086ea989ee..8b296d0402c 100644
--- a/compiler/testData/ir/irText/expressions/kt16905.txt
+++ b/compiler/testData/ir/irText/expressions/kt16905.txt
@@ -13,8 +13,12 @@ FILE /kt16905.kt
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
           INSTANCE_INITIALIZER_CALL classDescriptor='Inner'
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     CLASS CLASS InnerDerived0
       $this: VALUE_PARAMETER this@InnerDerived0: InnerDerived0
       CONSTRUCTOR public constructor InnerDerived0()
@@ -24,8 +28,12 @@ FILE /kt16905.kt
             $this: GET_VAR 'this@Outer: Outer' type=Outer origin=null
           INSTANCE_INITIALIZER_CALL classDescriptor='InnerDerived0'
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     CLASS CLASS InnerDerived1
       $this: VALUE_PARAMETER this@InnerDerived1: InnerDerived1
       CONSTRUCTOR public constructor InnerDerived1()
@@ -35,14 +43,23 @@ FILE /kt16905.kt
             $this: GET_VAR 'this@Outer: Outer' type=Outer origin=null
           INSTANCE_INITIALIZER_CALL classDescriptor='InnerDerived1'
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   TYPEALIAS typealias OI = Outer.Inner type=Outer.Inner
   FUN public fun test(): Outer.Inner
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='test(): Outer.Inner'
         CALL 'constructor Inner()' type=Outer.Inner origin=null
           $this: CALL 'constructor Outer()' type=Outer origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/literals.txt b/compiler/testData/ir/irText/expressions/literals.txt
index d58cc502758..97f01bb0edc 100644
--- a/compiler/testData/ir/irText/expressions/literals.txt
+++ b/compiler/testData/ir/irText/expressions/literals.txt
@@ -135,3 +135,4 @@ FILE /literals.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-testL>(): Long'
           GET_FIELD 'testL: Long' type=kotlin.Long origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/membersImportedFromObject.txt b/compiler/testData/ir/irText/expressions/membersImportedFromObject.txt
index 593e822e74d..8bdf52dfdd4 100644
--- a/compiler/testData/ir/irText/expressions/membersImportedFromObject.txt
+++ b/compiler/testData/ir/irText/expressions/membersImportedFromObject.txt
@@ -34,8 +34,12 @@ FILE /membersImportedFromObject.kt
           RETURN type=kotlin.Nothing from='<get-barExt>() on Int: Int'
             CONST Int type=kotlin.Int value='43'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   PROPERTY public val test1: kotlin.Int
     FIELD PROPERTY_BACKING_FIELD public val test1: kotlin.Int
       EXPRESSION_BODY
@@ -74,3 +78,4 @@ FILE /membersImportedFromObject.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test4>(): Int'
           GET_FIELD 'test4: Int' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/multipleThisReferences.txt b/compiler/testData/ir/irText/expressions/multipleThisReferences.txt
index 65fc014e7dd..1bc88a0504e 100644
--- a/compiler/testData/ir/irText/expressions/multipleThisReferences.txt
+++ b/compiler/testData/ir/irText/expressions/multipleThisReferences.txt
@@ -24,11 +24,19 @@ FILE /multipleThisReferences.kt
               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
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS CLASS Host
     $this: VALUE_PARAMETER this@Host: Host
     CONSTRUCTOR public constructor Host(y: kotlin.Int)
@@ -76,10 +84,20 @@ FILE /multipleThisReferences.kt
                         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
+                  $this: VALUE_PARAMETER this@Inner: Inner
               FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+                $this: VALUE_PARAMETER this@Any: Any
+                VALUE_PARAMETER value-parameter other: kotlin.Any?
               FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+                $this: VALUE_PARAMETER this@Any: Any
               FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+                $this: VALUE_PARAMETER this@Any: Any
             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
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/expressions/objectAsCallable.txt b/compiler/testData/ir/irText/expressions/objectAsCallable.txt
index 5ac039a213d..48592643845 100644
--- a/compiler/testData/ir/irText/expressions/objectAsCallable.txt
+++ b/compiler/testData/ir/irText/expressions/objectAsCallable.txt
@@ -6,8 +6,12 @@ FILE /objectAsCallable.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='A'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS ENUM_CLASS En
     $this: VALUE_PARAMETER this@En: En
     CONSTRUCTOR private constructor En()
@@ -17,16 +21,27 @@ FILE /objectAsCallable.kt
     ENUM_ENTRY enum entry X
       init: ENUM_CONSTRUCTOR_CALL 'constructor En()'
     FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
+      $this: VALUE_PARAMETER this@Enum: Enum<En>
     FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
+      $this: VALUE_PARAMETER this@Enum: Enum<En>
     FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<En!>!
+      $this: VALUE_PARAMETER this@Enum: Enum<En>
     FUN FAKE_OVERRIDE public final override fun compareTo(other: En): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<En>
+      VALUE_PARAMETER value-parameter other: En
     FUN FAKE_OVERRIDE public final override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Enum: Enum<En>
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public final override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<En>
     PROPERTY FAKE_OVERRIDE public final override val name: kotlin.String
       FUN FAKE_OVERRIDE public final override fun <get-name>(): kotlin.String
+        $this: VALUE_PARAMETER this@Enum: Enum<En>
     PROPERTY FAKE_OVERRIDE public final override val ordinal: kotlin.Int
       FUN FAKE_OVERRIDE public final override fun <get-ordinal>(): kotlin.Int
+        $this: VALUE_PARAMETER this@Enum: Enum<En>
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Enum: Enum<En>
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun values(): kotlin.Array<En>
       SYNTHETIC_BODY kind=ENUM_VALUES
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): En
@@ -63,3 +78,4 @@ FILE /objectAsCallable.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test2>(): Int'
           GET_FIELD 'test2: Int' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/objectClassReference.txt b/compiler/testData/ir/irText/expressions/objectClassReference.txt
index 46e63ff3728..e506660bb04 100644
--- a/compiler/testData/ir/irText/expressions/objectClassReference.txt
+++ b/compiler/testData/ir/irText/expressions/objectClassReference.txt
@@ -6,8 +6,12 @@ FILE /objectClassReference.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='A'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun test(): kotlin.Unit
     BLOCK_BODY
       TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
@@ -15,3 +19,4 @@ FILE /objectClassReference.kt
       TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
         CALL '<get-java>() on KClass<A>: Class<A>' type=java.lang.Class<A> origin=GET_PROPERTY
           $receiver: CLASS_REFERENCE 'A' type=kotlin.reflect.KClass<A>
+
diff --git a/compiler/testData/ir/irText/expressions/outerClassInstanceReference.txt b/compiler/testData/ir/irText/expressions/outerClassInstanceReference.txt
index dcd4ab46af8..b2f13868f91 100644
--- a/compiler/testData/ir/irText/expressions/outerClassInstanceReference.txt
+++ b/compiler/testData/ir/irText/expressions/outerClassInstanceReference.txt
@@ -22,8 +22,17 @@ FILE /outerClassInstanceReference.kt
             CALL 'outer(): Unit' type=kotlin.Unit origin=null
               $this: GET_VAR 'this@Outer: Outer' type=Outer origin=null
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/expressions/primitiveComparisons.txt b/compiler/testData/ir/irText/expressions/primitiveComparisons.txt
index 2cbe232d197..ee605961083 100644
--- a/compiler/testData/ir/irText/expressions/primitiveComparisons.txt
+++ b/compiler/testData/ir/irText/expressions/primitiveComparisons.txt
@@ -215,3 +215,4 @@ FILE /primitiveComparisons.kt
           arg0: CALL 'compareTo(Double): Int' type=kotlin.Int origin=LTEQ
             $this: GET_VAR 'value-parameter a: Double' type=kotlin.Double origin=null
             other: GET_VAR 'value-parameter b: Double' type=kotlin.Double origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.txt b/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.txt
index 9f5c4bf5d30..d816ee3d468 100644
--- a/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.txt
+++ b/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.txt
@@ -104,5 +104,10 @@ FILE /primitivesImplicitConversions.kt
             GET_FIELD 'x: Long' type=kotlin.Long origin=null
               receiver: GET_VAR 'this@TestImplicitArguments: TestImplicitArguments' type=TestImplicitArguments origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/expressions/references.txt b/compiler/testData/ir/irText/expressions/references.txt
index 8c627468501..10002d8adea 100644
--- a/compiler/testData/ir/irText/expressions/references.txt
+++ b/compiler/testData/ir/irText/expressions/references.txt
@@ -51,3 +51,4 @@ FILE /references.kt
       RETURN type=kotlin.Nothing from='test5() on String: String'
         CALL '<get-okext>() on String: String' type=kotlin.String origin=GET_PROPERTY
           $receiver: GET_VAR 'this@test5: String' type=kotlin.String origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/reflectionLiterals.txt b/compiler/testData/ir/irText/expressions/reflectionLiterals.txt
index 6ec7fd1cb46..136c393e471 100644
--- a/compiler/testData/ir/irText/expressions/reflectionLiterals.txt
+++ b/compiler/testData/ir/irText/expressions/reflectionLiterals.txt
@@ -9,8 +9,12 @@ FILE /reflectionLiterals.kt
       $this: VALUE_PARAMETER this@A: A
       BLOCK_BODY
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun bar(): kotlin.Unit
     BLOCK_BODY
   PROPERTY public val qux: kotlin.Int = 42
@@ -79,3 +83,4 @@ FILE /reflectionLiterals.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test7>(): KProperty0<Int>'
           GET_FIELD 'test7: KProperty0<Int>' type=kotlin.reflect.KProperty0<kotlin.Int> origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/safeAssignment.txt b/compiler/testData/ir/irText/expressions/safeAssignment.txt
index 9b76031b7b2..6e634cb25cc 100644
--- a/compiler/testData/ir/irText/expressions/safeAssignment.txt
+++ b/compiler/testData/ir/irText/expressions/safeAssignment.txt
@@ -24,8 +24,12 @@ FILE /safeAssignment.kt
             receiver: GET_VAR 'this@C: C' type=C origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun test(nc: C?): kotlin.Unit
     VALUE_PARAMETER value-parameter nc: C?
     BLOCK_BODY
@@ -44,3 +48,4 @@ FILE /safeAssignment.kt
             then: CALL '<set-x>(Int): Unit' type=kotlin.Unit origin=EQ
               $this: GET_VAR 'tmp0_safe_receiver: C?' type=C? origin=null
               <set-?>: CONST Int type=kotlin.Int value='42'
+
diff --git a/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.txt b/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.txt
index effe135034e..d155d10a9d6 100644
--- a/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.txt
+++ b/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.txt
@@ -6,8 +6,12 @@ FILE /safeCallWithIncrementDecrement.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='C'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   PROPERTY public var test.C?.p: kotlin.Int
     FUN public fun test.C?.<get-p>(): kotlin.Int
       $receiver: VALUE_PARAMETER this@p: C?
@@ -105,3 +109,4 @@ FILE /safeCallWithIncrementDecrement.kt
             value: CALL 'inc(): Int' type=kotlin.Int origin=POSTFIX_INCR
               $this: GET_VAR 'tmp3: Int' type=kotlin.Int origin=null
           GET_VAR 'tmp3: Int' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/safeCalls.txt b/compiler/testData/ir/irText/expressions/safeCalls.txt
index 3874e3c5274..9935ea1e620 100644
--- a/compiler/testData/ir/irText/expressions/safeCalls.txt
+++ b/compiler/testData/ir/irText/expressions/safeCalls.txt
@@ -24,8 +24,12 @@ FILE /safeCalls.kt
             receiver: GET_VAR 'this@Ref: Ref' type=Ref origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS INTERFACE IHost
     $this: VALUE_PARAMETER this@IHost: IHost
     FUN public open fun kotlin.String.extLength(): kotlin.Int
@@ -36,8 +40,12 @@ FILE /safeCalls.kt
           CALL '<get-length>(): Int' type=kotlin.Int origin=GET_PROPERTY
             $this: GET_VAR 'this@extLength: String' type=kotlin.String origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun test1(x: kotlin.String?): kotlin.Int?
     VALUE_PARAMETER value-parameter x: kotlin.String?
     BLOCK_BODY
@@ -149,3 +157,4 @@ FILE /safeCalls.kt
               if: CONST Boolean type=kotlin.Boolean value='true'
               then: CALL 'foo() on Int: Int' type=kotlin.Int origin=null
                 $receiver: GET_VAR 'tmp0_safe_receiver: Int' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.txt b/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.txt
index 14b140cabf7..d2bf671fea7 100644
--- a/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.txt
+++ b/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.txt
@@ -21,5 +21,10 @@ FILE /Derived.kt
     PROPERTY FAKE_OVERRIDE public final override var value: kotlin.String!
       FIELD FAKE_OVERRIDE public final override var value: kotlin.String!
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/expressions/simpleOperators.txt b/compiler/testData/ir/irText/expressions/simpleOperators.txt
index 1e5adf1a796..e6cd553d11c 100644
--- a/compiler/testData/ir/irText/expressions/simpleOperators.txt
+++ b/compiler/testData/ir/irText/expressions/simpleOperators.txt
@@ -87,3 +87,4 @@ FILE /simpleOperators.kt
         CALL 'mod(Int): Int' type=kotlin.Int origin=null
           $this: GET_VAR 'value-parameter a: Int' type=kotlin.Int origin=null
           other: GET_VAR 'value-parameter b: Int' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/simpleUnaryOperators.txt b/compiler/testData/ir/irText/expressions/simpleUnaryOperators.txt
index caabe1e8cf1..948e7cbd9ee 100644
--- a/compiler/testData/ir/irText/expressions/simpleUnaryOperators.txt
+++ b/compiler/testData/ir/irText/expressions/simpleUnaryOperators.txt
@@ -29,3 +29,4 @@ FILE /simpleUnaryOperators.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='test6(): Boolean'
         CONST Boolean type=kotlin.Boolean value='false'
+
diff --git a/compiler/testData/ir/irText/expressions/smartCasts.txt b/compiler/testData/ir/irText/expressions/smartCasts.txt
index 219131c73b9..522b021d551 100644
--- a/compiler/testData/ir/irText/expressions/smartCasts.txt
+++ b/compiler/testData/ir/irText/expressions/smartCasts.txt
@@ -64,3 +64,4 @@ FILE /smartCasts.kt
       RETURN type=kotlin.Nothing from='test3(Any): String'
         TYPE_OP type=kotlin.String origin=IMPLICIT_CAST typeOperand=kotlin.String
           GET_VAR 'value-parameter x: Any' type=kotlin.Any origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.txt b/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.txt
index ea24d02d837..aa66e46be26 100644
--- a/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.txt
+++ b/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.txt
@@ -2,13 +2,21 @@ 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
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS INTERFACE I2
     $this: VALUE_PARAMETER this@I2: I2
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public operator fun I1.component1(): kotlin.Int
     $receiver: VALUE_PARAMETER this@component1: I1
     BLOCK_BODY
@@ -38,3 +46,4 @@ FILE /smartCastsWithDestructuring.kt
           CALL 'component2() on I2: String' type=kotlin.String origin=COMPONENT_N(index=2)
             $receiver: TYPE_OP type=I2 origin=IMPLICIT_CAST typeOperand=I2
               GET_VAR 'tmp0_container: I1' type=I1 origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/smoke.txt b/compiler/testData/ir/irText/expressions/smoke.txt
index d8f5812ca3f..4eb73cf7f41 100644
--- a/compiler/testData/ir/irText/expressions/smoke.txt
+++ b/compiler/testData/ir/irText/expressions/smoke.txt
@@ -37,3 +37,4 @@ FILE /smoke.kt
     FUN public fun <set-testVarWithAccessors>(v: kotlin.Int): kotlin.Unit
       VALUE_PARAMETER value-parameter v: kotlin.Int
       BLOCK_BODY
+
diff --git a/compiler/testData/ir/irText/expressions/stringComparisons.txt b/compiler/testData/ir/irText/expressions/stringComparisons.txt
index b46fe808e87..d573293573a 100644
--- a/compiler/testData/ir/irText/expressions/stringComparisons.txt
+++ b/compiler/testData/ir/irText/expressions/stringComparisons.txt
@@ -35,3 +35,4 @@ FILE /stringComparisons.kt
           arg0: CALL 'compareTo(String): Int' type=kotlin.Int origin=LTEQ
             $this: GET_VAR 'value-parameter a: String' type=kotlin.String origin=null
             other: GET_VAR 'value-parameter b: String' type=kotlin.String origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/stringPlus.txt b/compiler/testData/ir/irText/expressions/stringPlus.txt
index 55075659f22..a5a6673143e 100644
--- a/compiler/testData/ir/irText/expressions/stringPlus.txt
+++ b/compiler/testData/ir/irText/expressions/stringPlus.txt
@@ -31,3 +31,4 @@ FILE /stringPlus.kt
               $this: GET_VAR 'value-parameter b: Int' type=kotlin.Int origin=null
               other: CONST Int type=kotlin.Int value='1'
           other: GET_VAR 'value-parameter a: String' type=kotlin.String origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/stringTemplates.txt b/compiler/testData/ir/irText/expressions/stringTemplates.txt
index 1d0478ba620..1d035f60528 100644
--- a/compiler/testData/ir/irText/expressions/stringTemplates.txt
+++ b/compiler/testData/ir/irText/expressions/stringTemplates.txt
@@ -98,3 +98,4 @@ abc
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test9>(): String'
           GET_FIELD 'test9: String' type=kotlin.String origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.txt b/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.txt
index eecb1afe1c9..369bb55328f 100644
--- a/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.txt
+++ b/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.txt
@@ -36,11 +36,19 @@ FILE /thisOfGenericOuterClass.kt
               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
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun Outer<kotlin.Int>.test(): Outer<kotlin.Int>.Inner
     $receiver: VALUE_PARAMETER this@test: Outer<Int>
     BLOCK_BODY
@@ -70,7 +78,13 @@ FILE /thisOfGenericOuterClass.kt
                       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
+                $this: VALUE_PARAMETER this@Inner: Inner<Int>
             FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+              $this: VALUE_PARAMETER this@Any: Any
+              VALUE_PARAMETER value-parameter other: kotlin.Any?
             FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+              $this: VALUE_PARAMETER this@Any: Any
             FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+              $this: VALUE_PARAMETER this@Any: Any
           CALL 'constructor <no name provided>()' type=test.<no name provided> origin=OBJECT_LITERAL
+
diff --git a/compiler/testData/ir/irText/expressions/throw.txt b/compiler/testData/ir/irText/expressions/throw.txt
index 4122369011c..038a395a688 100644
--- a/compiler/testData/ir/irText/expressions/throw.txt
+++ b/compiler/testData/ir/irText/expressions/throw.txt
@@ -14,3 +14,4 @@ FILE /throw.kt
             THROW type=kotlin.Nothing
               TYPE_OP type=kotlin.Throwable origin=IMPLICIT_CAST typeOperand=kotlin.Throwable
                 GET_VAR 'value-parameter a: Any' type=kotlin.Any origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/tryCatch.txt b/compiler/testData/ir/irText/expressions/tryCatch.txt
index 8f86a194c8a..c5d3456de51 100644
--- a/compiler/testData/ir/irText/expressions/tryCatch.txt
+++ b/compiler/testData/ir/irText/expressions/tryCatch.txt
@@ -26,3 +26,4 @@ FILE /tryCatch.kt
             BLOCK type=kotlin.Int origin=null
               CALL 'println(): Unit' type=kotlin.Unit origin=null
               CONST Int type=kotlin.Int value='555'
+
diff --git a/compiler/testData/ir/irText/expressions/tryCatchWithImplicitCast.txt b/compiler/testData/ir/irText/expressions/tryCatchWithImplicitCast.txt
index 866493a8544..a06cd23a758 100644
--- a/compiler/testData/ir/irText/expressions/tryCatchWithImplicitCast.txt
+++ b/compiler/testData/ir/irText/expressions/tryCatchWithImplicitCast.txt
@@ -17,3 +17,4 @@ FILE /tryCatchWithImplicitCast.kt
             VAR CATCH_PARAMETER val e: kotlin.Throwable
             BLOCK type=kotlin.String origin=null
               CONST String type=kotlin.String value=''
+
diff --git a/compiler/testData/ir/irText/expressions/typeArguments.txt b/compiler/testData/ir/irText/expressions/typeArguments.txt
index 90006b6953e..1d99963e2b5 100644
--- a/compiler/testData/ir/irText/expressions/typeArguments.txt
+++ b/compiler/testData/ir/irText/expressions/typeArguments.txt
@@ -14,3 +14,4 @@ FILE /typeArguments.kt
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value='true'
             then: CONST Boolean type=kotlin.Boolean value='false'
+
diff --git a/compiler/testData/ir/irText/expressions/typeOperators.txt b/compiler/testData/ir/irText/expressions/typeOperators.txt
index 7e84e16f29f..12b668f2864 100644
--- a/compiler/testData/ir/irText/expressions/typeOperators.txt
+++ b/compiler/testData/ir/irText/expressions/typeOperators.txt
@@ -2,8 +2,12 @@ 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
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun test1(x: kotlin.Any): kotlin.Boolean
     VALUE_PARAMETER value-parameter x: kotlin.Any
     BLOCK_BODY
@@ -28,3 +32,4 @@ FILE /typeOperators.kt
       RETURN type=kotlin.Nothing from='test4(Any): IThing?'
         TYPE_OP type=IThing? origin=SAFE_CAST typeOperand=IThing
           GET_VAR 'value-parameter x: Any' type=kotlin.Any origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/values.txt b/compiler/testData/ir/irText/expressions/values.txt
index 41b94d8cd3b..646d82bcfe8 100644
--- a/compiler/testData/ir/irText/expressions/values.txt
+++ b/compiler/testData/ir/irText/expressions/values.txt
@@ -8,16 +8,27 @@ FILE /values.kt
     ENUM_ENTRY enum entry A
       init: ENUM_CONSTRUCTOR_CALL 'constructor Enum()'
     FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
+      $this: VALUE_PARAMETER this@Enum: Enum<Enum>
     FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
+      $this: VALUE_PARAMETER this@Enum: Enum<Enum>
     FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<Enum!>!
+      $this: VALUE_PARAMETER this@Enum: Enum<Enum>
     FUN FAKE_OVERRIDE public final override fun compareTo(other: Enum): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<Enum>
+      VALUE_PARAMETER value-parameter other: Enum
     FUN FAKE_OVERRIDE public final override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Enum: Enum<Enum>
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public final override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<Enum>
     PROPERTY FAKE_OVERRIDE public final override val name: kotlin.String
       FUN FAKE_OVERRIDE public final override fun <get-name>(): kotlin.String
+        $this: VALUE_PARAMETER this@Enum: Enum<Enum>
     PROPERTY FAKE_OVERRIDE public final override val ordinal: kotlin.Int
       FUN FAKE_OVERRIDE public final override fun <get-ordinal>(): kotlin.Int
+        $this: VALUE_PARAMETER this@Enum: Enum<Enum>
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Enum: Enum<Enum>
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun values(): kotlin.Array<Enum>
       SYNTHETIC_BODY kind=ENUM_VALUES
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): Enum
@@ -29,8 +40,12 @@ FILE /values.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='A'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   PROPERTY public val a: kotlin.Int = 0
     FIELD PROPERTY_BACKING_FIELD public val a: kotlin.Int = 0
       EXPRESSION_BODY
@@ -52,11 +67,19 @@ FILE /values.kt
           DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
           INSTANCE_INITIALIZER_CALL classDescriptor='companion object of Z'
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun test1(): Enum
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='test1(): Enum'
@@ -73,3 +96,4 @@ FILE /values.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='test4(): Z.Companion'
         GET_OBJECT 'companion object of Z' type=Z.Companion
+
diff --git a/compiler/testData/ir/irText/expressions/vararg.txt b/compiler/testData/ir/irText/expressions/vararg.txt
index e9e32ced813..a75ae4920c8 100644
--- a/compiler/testData/ir/irText/expressions/vararg.txt
+++ b/compiler/testData/ir/irText/expressions/vararg.txt
@@ -37,3 +37,4 @@ FILE /vararg.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test3>(): Array<String>'
           GET_FIELD 'test3: Array<String>' type=kotlin.Array<kotlin.String> origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/varargWithImplicitCast.txt b/compiler/testData/ir/irText/expressions/varargWithImplicitCast.txt
index cf2eb7bda51..9cb7029f5f2 100644
--- a/compiler/testData/ir/irText/expressions/varargWithImplicitCast.txt
+++ b/compiler/testData/ir/irText/expressions/varargWithImplicitCast.txt
@@ -28,3 +28,4 @@ FILE /varargWithImplicitCast.kt
             SPREAD_ELEMENT
               TYPE_OP type=kotlin.IntArray origin=IMPLICIT_CAST typeOperand=kotlin.IntArray
                 GET_VAR 'value-parameter a: Any' type=kotlin.Any origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/variableAsFunctionCall.txt b/compiler/testData/ir/irText/expressions/variableAsFunctionCall.txt
index dbc6ef911f2..cc81287f7ef 100644
--- a/compiler/testData/ir/irText/expressions/variableAsFunctionCall.txt
+++ b/compiler/testData/ir/irText/expressions/variableAsFunctionCall.txt
@@ -57,3 +57,4 @@ FILE /variableAsFunctionCall.kt
               if: CONST Boolean type=kotlin.Boolean value='true'
               then: CALL 'invoke(): String' type=kotlin.String origin=null
                 $this: GET_VAR 'tmp1_safe_receiver: (() -> String)?' type=(() -> kotlin.String)? origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/when.txt b/compiler/testData/ir/irText/expressions/when.txt
index 847e4f4ca43..66e794d9d43 100644
--- a/compiler/testData/ir/irText/expressions/when.txt
+++ b/compiler/testData/ir/irText/expressions/when.txt
@@ -6,8 +6,12 @@ FILE /when.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='A'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun testWithSubject(x: kotlin.Any?): kotlin.String
     VALUE_PARAMETER value-parameter x: kotlin.Any?
     BLOCK_BODY
@@ -143,3 +147,4 @@ FILE /when.kt
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value='true'
               then: CONST String type=kotlin.String value='?'
+
diff --git a/compiler/testData/ir/irText/expressions/whenCoercedToUnit.txt b/compiler/testData/ir/irText/expressions/whenCoercedToUnit.txt
index 43d17090ef7..7bf13beea91 100644
--- a/compiler/testData/ir/irText/expressions/whenCoercedToUnit.txt
+++ b/compiler/testData/ir/irText/expressions/whenCoercedToUnit.txt
@@ -12,3 +12,4 @@ FILE /whenCoercedToUnit.kt
               arg1: CONST Int type=kotlin.Int value='0'
             then: TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
               CONST Int type=kotlin.Int value='0'
+
diff --git a/compiler/testData/ir/irText/expressions/whenElse.txt b/compiler/testData/ir/irText/expressions/whenElse.txt
index 02e8ffbf73e..def71506603 100644
--- a/compiler/testData/ir/irText/expressions/whenElse.txt
+++ b/compiler/testData/ir/irText/expressions/whenElse.txt
@@ -6,3 +6,4 @@ FILE /whenElse.kt
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value='true'
             then: CONST Int type=kotlin.Int value='42'
+
diff --git a/compiler/testData/ir/irText/expressions/whenReturn.txt b/compiler/testData/ir/irText/expressions/whenReturn.txt
index 1d37dee39cf..bfd715abca8 100644
--- a/compiler/testData/ir/irText/expressions/whenReturn.txt
+++ b/compiler/testData/ir/irText/expressions/whenReturn.txt
@@ -36,3 +36,4 @@ FILE /whenReturn.kt
               CONST String type=kotlin.String value='Failure'
       RETURN type=kotlin.Nothing from='toString(String): String'
         CONST String type=kotlin.String value='???'
+
diff --git a/compiler/testData/ir/irText/expressions/whileDoWhile.txt b/compiler/testData/ir/irText/expressions/whileDoWhile.txt
index d1f4a8bf6c5..d65157146cd 100644
--- a/compiler/testData/ir/irText/expressions/whileDoWhile.txt
+++ b/compiler/testData/ir/irText/expressions/whileDoWhile.txt
@@ -88,3 +88,4 @@ FILE /whileDoWhile.kt
                 body: COMPOSITE type=kotlin.Unit origin=null
                 condition: TYPE_OP type=kotlin.Boolean origin=IMPLICIT_CAST typeOperand=kotlin.Boolean
                   GET_VAR 'a: Any?' type=kotlin.Any? origin=null
+
diff --git a/compiler/testData/ir/irText/lambdas/anonymousFunction.txt b/compiler/testData/ir/irText/lambdas/anonymousFunction.txt
index c4f0e07547b..80edca80bdf 100644
--- a/compiler/testData/ir/irText/lambdas/anonymousFunction.txt
+++ b/compiler/testData/ir/irText/lambdas/anonymousFunction.txt
@@ -11,3 +11,4 @@ FILE /anonymousFunction.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-anonymous>(): () -> Unit'
           GET_FIELD 'anonymous: () -> Unit' type=() -> kotlin.Unit origin=null
+
diff --git a/compiler/testData/ir/irText/lambdas/destructuringInLambda.txt b/compiler/testData/ir/irText/lambdas/destructuringInLambda.txt
index 9ad4ee59b78..669b1c16aec 100644
--- a/compiler/testData/ir/irText/lambdas/destructuringInLambda.txt
+++ b/compiler/testData/ir/irText/lambdas/destructuringInLambda.txt
@@ -153,3 +153,4 @@ FILE /destructuringInLambda.kt
       BLOCK_BODY
         SET_FIELD 'fn: (A) -> Int' type=kotlin.Unit origin=null
           value: GET_VAR 'value-parameter <set-?>: (A) -> Int' type=(A) -> kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/lambdas/extensionLambda.txt b/compiler/testData/ir/irText/lambdas/extensionLambda.txt
index b9e5c3812cd..c96889eb034 100644
--- a/compiler/testData/ir/irText/lambdas/extensionLambda.txt
+++ b/compiler/testData/ir/irText/lambdas/extensionLambda.txt
@@ -14,3 +14,4 @@ FILE /extensionLambda.kt
                   CALL '<get-length>(): Int' type=kotlin.Int origin=GET_PROPERTY
                     $this: GET_VAR 'this@<anonymous>: String' type=kotlin.String origin=null
             FUNCTION_REFERENCE '<anonymous>() on String: Int' type=kotlin.String.() -> kotlin.Int origin=LAMBDA
+
diff --git a/compiler/testData/ir/irText/lambdas/justLambda.txt b/compiler/testData/ir/irText/lambdas/justLambda.txt
index 76e838cf598..ab4c07f10e1 100644
--- a/compiler/testData/ir/irText/lambdas/justLambda.txt
+++ b/compiler/testData/ir/irText/lambdas/justLambda.txt
@@ -25,3 +25,4 @@ FILE /justLambda.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test2>(): () -> Unit'
           GET_FIELD 'test2: () -> Unit' type=() -> kotlin.Unit origin=null
+
diff --git a/compiler/testData/ir/irText/lambdas/localFunction.txt b/compiler/testData/ir/irText/lambdas/localFunction.txt
index e6a5c592041..c16c987e6dd 100644
--- a/compiler/testData/ir/irText/lambdas/localFunction.txt
+++ b/compiler/testData/ir/irText/lambdas/localFunction.txt
@@ -14,3 +14,4 @@ FILE /localFunction.kt
                   $this: GET_VAR 'tmp0: Int' type=kotlin.Int origin=null
               GET_VAR 'tmp0: Int' type=kotlin.Int origin=null
       CALL 'local(): Unit' type=kotlin.Unit origin=null
+
diff --git a/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.txt b/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.txt
index fa837af52e3..54499e06532 100644
--- a/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.txt
+++ b/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.txt
@@ -6,8 +6,12 @@ FILE /multipleImplicitReceivers.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='A'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS OBJECT B
     $this: VALUE_PARAMETER this@B: B
     CONSTRUCTOR private constructor B()
@@ -15,8 +19,12 @@ FILE /multipleImplicitReceivers.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='B'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS INTERFACE IFoo
     $this: VALUE_PARAMETER this@IFoo: IFoo
     PROPERTY public open val A.foo: B
@@ -27,8 +35,12 @@ FILE /multipleImplicitReceivers.kt
           RETURN type=kotlin.Nothing from='<get-foo>() on A: B'
             GET_OBJECT 'B' type=B
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   CLASS INTERFACE IInvoke
     $this: VALUE_PARAMETER this@IInvoke: IInvoke
     FUN public open operator fun B.invoke(): kotlin.Int
@@ -38,8 +50,12 @@ FILE /multipleImplicitReceivers.kt
         RETURN type=kotlin.Nothing from='invoke() on B: Int'
           CONST Int type=kotlin.Int value='42'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun test(fooImpl: IFoo, invokeImpl: IInvoke): kotlin.Unit
     VALUE_PARAMETER value-parameter fooImpl: IFoo
     VALUE_PARAMETER value-parameter invokeImpl: IInvoke
@@ -80,3 +96,4 @@ FILE /multipleImplicitReceivers.kt
                                 FUNCTION_REFERENCE '<anonymous>() on IInvoke: Int' type=IInvoke.() -> kotlin.Int origin=LAMBDA
                       FUNCTION_REFERENCE '<anonymous>() on IFoo: Int' type=IFoo.() -> kotlin.Int origin=LAMBDA
             FUNCTION_REFERENCE '<anonymous>() on A: Int' type=A.() -> kotlin.Int origin=LAMBDA
+
diff --git a/compiler/testData/ir/irText/lambdas/nonLocalReturn.txt b/compiler/testData/ir/irText/lambdas/nonLocalReturn.txt
index a8cacf6ea57..0b9d214341e 100644
--- a/compiler/testData/ir/irText/lambdas/nonLocalReturn.txt
+++ b/compiler/testData/ir/irText/lambdas/nonLocalReturn.txt
@@ -71,3 +71,4 @@ FILE /nonLocalReturn.kt
                 CALL 'print(Int): Unit' type=kotlin.Unit origin=null
                   message: GET_VAR 'value-parameter it: Int' type=kotlin.Int origin=null
           FUNCTION_REFERENCE '<anonymous>(Int): Unit' type=(kotlin.Int) -> kotlin.Unit origin=LAMBDA
+
diff --git a/compiler/testData/ir/irText/lambdas/samAdapter.txt b/compiler/testData/ir/irText/lambdas/samAdapter.txt
index 28550aa3f3a..5fc6bc58607 100644
--- a/compiler/testData/ir/irText/lambdas/samAdapter.txt
+++ b/compiler/testData/ir/irText/lambdas/samAdapter.txt
@@ -12,3 +12,4 @@ FILE /samAdapter.kt
             FUNCTION_REFERENCE '<anonymous>(): Unit' type=() -> kotlin.Unit origin=LAMBDA
       CALL 'run(): Unit' type=kotlin.Unit origin=null
         $this: GET_VAR 'hello: Runnable' type=java.lang.Runnable origin=null
+
diff --git a/compiler/testData/ir/irText/regressions/coercionInLoop.txt b/compiler/testData/ir/irText/regressions/coercionInLoop.txt
index 93d7d62db63..646a5c4797f 100644
--- a/compiler/testData/ir/irText/regressions/coercionInLoop.txt
+++ b/compiler/testData/ir/irText/regressions/coercionInLoop.txt
@@ -36,3 +36,4 @@ FILE /coercionInLoop.kt
               GET_VAR 'tmp0: Int' type=kotlin.Int origin=null
       RETURN type=kotlin.Nothing from='box(): String'
         CONST String type=kotlin.String value='OK'
+
diff --git a/compiler/testData/ir/irText/regressions/integerCoercionToT.txt b/compiler/testData/ir/irText/regressions/integerCoercionToT.txt
index 3ae11d5baed..b90d7e04f17 100644
--- a/compiler/testData/ir/irText/regressions/integerCoercionToT.txt
+++ b/compiler/testData/ir/irText/regressions/integerCoercionToT.txt
@@ -2,8 +2,12 @@ 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
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public inline fun <reified T : CPointed> CPointed.reinterpret(): T
     TYPE_PARAMETER <reified T : CPointed>
     $receiver: VALUE_PARAMETER this@reinterpret: CPointed
@@ -18,8 +22,12 @@ FILE /integerCoercionToT.kt
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='CInt32VarX'
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   TYPEALIAS typealias CInt32Var = CInt32VarX<Int> type=CInt32VarX<kotlin.Int>
   PROPERTY public var <T_INT : kotlin.Int> CInt32VarX<T_INT>.value: T_INT
     FUN public fun CInt32VarX<T_INT>.<get-value>(): T_INT
@@ -49,8 +57,12 @@ FILE /integerCoercionToT.kt
             GET_FIELD 'value: Int' type=kotlin.Int origin=null
               receiver: GET_VAR 'this@IdType: IdType' type=IdType origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   FUN public fun foo(value: IdType, cv: CInt32Var /* = CInt32VarX<kotlin.Int> */): kotlin.Unit
     VALUE_PARAMETER value-parameter value: IdType
     VALUE_PARAMETER value-parameter cv: CInt32Var /* = CInt32VarX<kotlin.Int> */
@@ -59,3 +71,4 @@ FILE /integerCoercionToT.kt
         $receiver: GET_VAR 'value-parameter cv: CInt32Var /* = CInt32VarX<Int> */' type=CInt32Var /* = CInt32VarX<kotlin.Int> */ origin=null
         value: CALL '<get-value>(): Int' type=kotlin.Int origin=GET_PROPERTY
           $this: GET_VAR 'value-parameter value: IdType' type=IdType origin=null
+
diff --git a/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.txt b/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.txt
index edd507ca50c..7f9a2c5729c 100644
--- a/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.txt
+++ b/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.txt
@@ -18,8 +18,12 @@ FILE /typeAliasCtorForGenericClass.kt
             GET_FIELD 'q: Q' type=Q origin=null
               receiver: GET_VAR 'this@A: A<Q>' type=A<Q> origin=null
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
   TYPEALIAS typealias B = A<X> type=A<X>
   TYPEALIAS typealias B2 = A<A<T>> type=A<A<T>>
   FUN public fun bar(): kotlin.Unit
@@ -30,3 +34,4 @@ FILE /typeAliasCtorForGenericClass.kt
       VAR val b2: B2<kotlin.Int> /* = A<A<kotlin.Int>> */
         CALL 'constructor A(A<Int>)' type=A<A<kotlin.Int>> origin=null
           q: GET_VAR 'b: B<Int> /* = A<Int> */' type=B<kotlin.Int> /* = A<kotlin.Int> */ origin=null
+
diff --git a/compiler/testData/ir/irText/singletons/companion.txt b/compiler/testData/ir/irText/singletons/companion.txt
index 18c82b19733..098f96dc945 100644
--- a/compiler/testData/ir/irText/singletons/companion.txt
+++ b/compiler/testData/ir/irText/singletons/companion.txt
@@ -20,8 +20,17 @@ FILE /companion.kt
         $this: VALUE_PARAMETER this@Companion: Companion
         BLOCK_BODY
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/singletons/enumEntry.txt b/compiler/testData/ir/irText/singletons/enumEntry.txt
index df4b29abf0a..163f9412fe0 100644
--- a/compiler/testData/ir/irText/singletons/enumEntry.txt
+++ b/compiler/testData/ir/irText/singletons/enumEntry.txt
@@ -28,31 +28,58 @@ FILE /enumEntry.kt
               CALL 'test(): Unit' type=kotlin.Unit origin=null
                 $this: GET_ENUM 'ENTRY' type=Z.ENTRY
           FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+            $this: VALUE_PARAMETER this@Any: Any
+            VALUE_PARAMETER value-parameter other: kotlin.Any?
           FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+            $this: VALUE_PARAMETER this@Any: Any
           FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+            $this: VALUE_PARAMETER this@Any: Any
         FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
+          $this: VALUE_PARAMETER this@Enum: Enum<Z>
         FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
+          $this: VALUE_PARAMETER this@Enum: Enum<Z>
         FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<Z!>!
+          $this: VALUE_PARAMETER this@Enum: Enum<Z>
         FUN FAKE_OVERRIDE public final override fun compareTo(other: Z): kotlin.Int
+          $this: VALUE_PARAMETER this@Enum: Enum<Z>
+          VALUE_PARAMETER value-parameter other: Z
         FUN FAKE_OVERRIDE public final override fun equals(other: kotlin.Any?): kotlin.Boolean
+          $this: VALUE_PARAMETER this@Enum: Enum<Z>
+          VALUE_PARAMETER value-parameter other: kotlin.Any?
         FUN FAKE_OVERRIDE public final override fun hashCode(): kotlin.Int
+          $this: VALUE_PARAMETER this@Enum: Enum<Z>
         PROPERTY FAKE_OVERRIDE public final override val name: kotlin.String
           FUN FAKE_OVERRIDE public final override fun <get-name>(): kotlin.String
+            $this: VALUE_PARAMETER this@Enum: Enum<Z>
         PROPERTY FAKE_OVERRIDE public final override val ordinal: kotlin.Int
           FUN FAKE_OVERRIDE public final override fun <get-ordinal>(): kotlin.Int
+            $this: VALUE_PARAMETER this@Enum: Enum<Z>
         FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+          $this: VALUE_PARAMETER this@Enum: Enum<Z>
     FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
+      $this: VALUE_PARAMETER this@Enum: Enum<Z>
     FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
+      $this: VALUE_PARAMETER this@Enum: Enum<Z>
     FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<Z!>!
+      $this: VALUE_PARAMETER this@Enum: Enum<Z>
     FUN FAKE_OVERRIDE public final override fun compareTo(other: Z): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<Z>
+      VALUE_PARAMETER value-parameter other: Z
     FUN FAKE_OVERRIDE public final override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Enum: Enum<Z>
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public final override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Enum: Enum<Z>
     PROPERTY FAKE_OVERRIDE public final override val name: kotlin.String
       FUN FAKE_OVERRIDE public final override fun <get-name>(): kotlin.String
+        $this: VALUE_PARAMETER this@Enum: Enum<Z>
     PROPERTY FAKE_OVERRIDE public final override val ordinal: kotlin.Int
       FUN FAKE_OVERRIDE public final override fun <get-ordinal>(): kotlin.Int
+        $this: VALUE_PARAMETER this@Enum: Enum<Z>
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Enum: Enum<Z>
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun values(): kotlin.Array<Z>
       SYNTHETIC_BODY kind=ENUM_VALUES
     FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): Z
       SYNTHETIC_BODY kind=ENUM_VALUEOF
+
diff --git a/compiler/testData/ir/irText/singletons/object.txt b/compiler/testData/ir/irText/singletons/object.txt
index c0b1ee30f85..d000f547529 100644
--- a/compiler/testData/ir/irText/singletons/object.txt
+++ b/compiler/testData/ir/irText/singletons/object.txt
@@ -20,8 +20,17 @@ FILE /object.kt
           CALL 'test(): Unit' type=kotlin.Unit origin=null
             $this: GET_OBJECT 'Z' type=Z
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+        $this: VALUE_PARAMETER this@Any: Any
+        VALUE_PARAMETER value-parameter other: kotlin.Any?
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+        $this: VALUE_PARAMETER this@Any: Any
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      $this: VALUE_PARAMETER this@Any: Any
+      VALUE_PARAMETER value-parameter other: kotlin.Any?
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      $this: VALUE_PARAMETER this@Any: Any
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+      $this: VALUE_PARAMETER this@Any: Any
+
diff --git a/compiler/testData/ir/irText/stubs/simple.txt b/compiler/testData/ir/irText/stubs/simple.txt
index 87225a79a0a..3de7717b528 100644
--- a/compiler/testData/ir/irText/stubs/simple.txt
+++ b/compiler/testData/ir/irText/stubs/simple.txt
@@ -9,3 +9,4 @@ FILE /simple.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='<get-test>(): Int'
           GET_FIELD 'test: Int' type=kotlin.Int origin=null
+