diff --git a/compiler/testData/ir/irText/declarations/localDelegatedPropertyWithSuspendOperators.txt b/compiler/testData/ir/irText/declarations/localDelegatedPropertyWithSuspendOperators.txt
index 3c95b149667..70589bceb68 100644
--- a/compiler/testData/ir/irText/declarations/localDelegatedPropertyWithSuspendOperators.txt
+++ b/compiler/testData/ir/irText/declarations/localDelegatedPropertyWithSuspendOperators.txt
@@ -1,5 +1,6 @@
 FILE /localDelegatedPropertyWithSuspendOperators.kt
   CLASS CLASS A
+    $this: VALUE_PARAMETER this@A: A
     CONSTRUCTOR public constructor A()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -9,51 +10,73 @@ FILE /localDelegatedPropertyWithSuspendOperators.kt
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value='42'
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-z>(): kotlin.Int
+        $this: VALUE_PARAMETER this@A: A
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='<get-z>(): Int'
             GET_FIELD 'z: Int' type=kotlin.Int origin=null
-              receiver: GET_VAR '<receiver: A>' type=A origin=null
+              receiver: GET_VAR 'this@A: A' type=A origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR public final fun <set-z>(<set-?>: kotlin.Int): kotlin.Unit
+        $this: VALUE_PARAMETER this@A: A
+        VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
         BLOCK_BODY
           SET_FIELD 'z: Int' type=kotlin.Unit origin=null
-            receiver: GET_VAR '<receiver: A>' type=A origin=null
+            receiver: GET_VAR 'this@A: A' type=A origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
     FUN public final operator suspend fun getValue(thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): kotlin.Int
+      $this: VALUE_PARAMETER this@A: A
+      VALUE_PARAMETER value-parameter thisRef: kotlin.Any?
+      VALUE_PARAMETER value-parameter property: kotlin.reflect.KProperty<*>
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='getValue(Any?, KProperty<*>): Int'
           CALL '<get-z>(): Int' type=kotlin.Int origin=GET_PROPERTY
-            $this: GET_VAR '<receiver: A>' type=A origin=null
+            $this: GET_VAR 'this@A: A' type=A origin=null
     FUN public final operator suspend fun setValue(thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: kotlin.Int): kotlin.Unit
+      $this: VALUE_PARAMETER this@A: A
+      VALUE_PARAMETER value-parameter thisRef: kotlin.Any?
+      VALUE_PARAMETER value-parameter property: kotlin.reflect.KProperty<*>
+      VALUE_PARAMETER value-parameter value: kotlin.Int
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='setValue(Any?, KProperty<*>, Int): Unit'
           CALL 'suspendCoroutineOrReturn(crossinline (Continuation<Unit>) -> Any?): Unit' type=kotlin.Unit origin=null
             <T>: Unit
             block: BLOCK type=(kotlin.coroutines.experimental.Continuation<kotlin.Unit>) -> kotlin.Any origin=LAMBDA
               FUN LOCAL_FUNCTION_FOR_LAMBDA local final fun <anonymous>(x: kotlin.coroutines.experimental.Continuation<kotlin.Unit>): kotlin.Any
+                VALUE_PARAMETER value-parameter x: kotlin.coroutines.experimental.Continuation<kotlin.Unit>
                 BLOCK_BODY
                   CALL '<set-z>(Int): Unit' type=kotlin.Unit origin=EQ
-                    $this: GET_VAR '<receiver: A>' type=A origin=null
+                    $this: GET_VAR 'this@A: A' type=A origin=null
                     <set-?>: GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=null
                   CALL 'resume(Unit): Unit' type=kotlin.Unit origin=null
                     $this: GET_VAR 'value-parameter x: Continuation<Unit>' type=kotlin.coroutines.experimental.Continuation<kotlin.Unit> origin=null
                     value: GET_OBJECT 'Unit' type=kotlin.Unit
                   RETURN type=kotlin.Nothing from='<anonymous>(Continuation<Unit>): Any'
                     CALL '<get-COROUTINE_SUSPENDED>(): Any' type=kotlin.Any origin=GET_PROPERTY
-              CALLABLE_REFERENCE '<anonymous>(Continuation<Unit>): Any' type=(kotlin.coroutines.experimental.Continuation<kotlin.Unit>) -> kotlin.Any origin=LAMBDA
+              FUNCTION_REFERENCE '<anonymous>(Continuation<Unit>): Any' type=(kotlin.coroutines.experimental.Continuation<kotlin.Unit>) -> kotlin.Any origin=LAMBDA
     FUN public final operator suspend fun provideDelegate(host: kotlin.Any?, p: kotlin.Any): A
+      $this: VALUE_PARAMETER this@A: A
+      VALUE_PARAMETER value-parameter host: kotlin.Any?
+      VALUE_PARAMETER value-parameter p: kotlin.Any
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='provideDelegate(Any?, Any): A'
           CALL 'suspendCoroutineOrReturn(crossinline (Continuation<A>) -> Any?): A' type=A origin=null
             <T>: A
             block: BLOCK type=(kotlin.coroutines.experimental.Continuation<A>) -> kotlin.Any origin=LAMBDA
               FUN LOCAL_FUNCTION_FOR_LAMBDA local final fun <anonymous>(x: kotlin.coroutines.experimental.Continuation<A>): kotlin.Any
+                VALUE_PARAMETER value-parameter x: kotlin.coroutines.experimental.Continuation<A>
                 BLOCK_BODY
                   CALL 'resume(A): Unit' type=kotlin.Unit origin=null
                     $this: GET_VAR 'value-parameter x: Continuation<A>' type=kotlin.coroutines.experimental.Continuation<A> origin=null
-                    value: GET_VAR '<receiver: A>' type=A origin=null
+                    value: GET_VAR 'this@A: A' type=A origin=null
                   RETURN type=kotlin.Nothing from='<anonymous>(Continuation<A>): Any'
                     CALL '<get-COROUTINE_SUSPENDED>(): Any' type=kotlin.Any origin=GET_PROPERTY
-              CALLABLE_REFERENCE '<anonymous>(Continuation<A>): Any' type=(kotlin.coroutines.experimental.Continuation<A>) -> kotlin.Any origin=LAMBDA
+              FUNCTION_REFERENCE '<anonymous>(Continuation<A>): Any' type=(kotlin.coroutines.experimental.Continuation<A>) -> kotlin.Any origin=LAMBDA
+    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 suspend fun test(): kotlin.Unit
     BLOCK_BODY
       LOCAL_DELEGATED_PROPERTY val testVal: kotlin.Int
@@ -61,33 +84,34 @@ FILE /localDelegatedPropertyWithSuspendOperators.kt
           CALL 'provideDelegate(Any?, Any): A' type=A origin=null
             $this: CALL 'constructor A()' type=A origin=null
             host: CONST Null type=kotlin.Nothing? value='null'
-            p: CALLABLE_REFERENCE 'testVal: Int' type=kotlin.reflect.KProperty0<kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+            p: LOCAL_DELEGATED_PROPERTY_REFERENCE 'testVal: Int' delegate='`testVal$delegate`: A' getter='<get-testVal>(): Int' setter=null type=kotlin.reflect.KProperty0<kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
         FUN DELEGATED_PROPERTY_ACCESSOR local final suspend fun <get-testVal>(): kotlin.Int
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='<get-testVal>(): Int'
               CALL 'getValue(Any?, KProperty<*>): Int' type=kotlin.Int origin=null
                 $this: GET_VAR '`testVal$delegate`: A' type=A origin=null
                 thisRef: CONST Null type=kotlin.Nothing? value='null'
-                property: CALLABLE_REFERENCE 'testVal: Int' type=kotlin.reflect.KProperty0<kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+                property: LOCAL_DELEGATED_PROPERTY_REFERENCE 'testVal: Int' delegate='`testVal$delegate`: A' getter='<get-testVal>(): Int' setter=null type=kotlin.reflect.KProperty0<kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
       LOCAL_DELEGATED_PROPERTY var testVar: kotlin.Int
         VAR DELEGATE val `testVar$delegate`: A
           CALL 'provideDelegate(Any?, Any): A' type=A origin=null
             $this: CALL 'constructor A()' type=A origin=null
             host: CONST Null type=kotlin.Nothing? value='null'
-            p: CALLABLE_REFERENCE 'testVar: Int' type=kotlin.reflect.KMutableProperty0<kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+            p: LOCAL_DELEGATED_PROPERTY_REFERENCE 'testVar: Int' delegate='`testVar$delegate`: A' getter='<get-testVar>(): Int' setter='<set-testVar>(Int): Int' type=kotlin.reflect.KMutableProperty0<kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
         FUN DELEGATED_PROPERTY_ACCESSOR local final suspend fun <get-testVar>(): kotlin.Int
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='<get-testVar>(): Int'
               CALL 'getValue(Any?, KProperty<*>): Int' type=kotlin.Int origin=null
                 $this: GET_VAR '`testVar$delegate`: A' type=A origin=null
                 thisRef: CONST Null type=kotlin.Nothing? value='null'
-                property: CALLABLE_REFERENCE 'testVar: Int' type=kotlin.reflect.KMutableProperty0<kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+                property: LOCAL_DELEGATED_PROPERTY_REFERENCE 'testVar: Int' delegate='`testVar$delegate`: A' getter='<get-testVar>(): Int' setter='<set-testVar>(Int): Int' type=kotlin.reflect.KMutableProperty0<kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
         FUN DELEGATED_PROPERTY_ACCESSOR local final suspend fun <set-testVar>(value: kotlin.Int): kotlin.Int
+          VALUE_PARAMETER value-parameter value: kotlin.Int
           BLOCK_BODY
             RETURN type=kotlin.Nothing from='<set-testVar>(Int): Int'
               TYPE_OP type=kotlin.Int origin=IMPLICIT_CAST typeOperand=kotlin.Int
                 CALL 'setValue(Any?, KProperty<*>, Int): Unit' type=kotlin.Unit origin=null
                   $this: GET_VAR '`testVar$delegate`: A' type=A origin=null
                   thisRef: CONST Null type=kotlin.Nothing? value='null'
-                  property: CALLABLE_REFERENCE 'testVar: Int' type=kotlin.reflect.KMutableProperty0<kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+                  property: LOCAL_DELEGATED_PROPERTY_REFERENCE 'testVar: Int' delegate='`testVar$delegate`: A' getter='<get-testVar>(): Int' setter='<set-testVar>(Int): Int' type=kotlin.reflect.KMutableProperty0<kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
                   value: GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=null