Add symbols to references

TODO: fix some more tests
2017-03-23 16:04:40 +03:00
parent 0595e93952
commit c9777fd79f
189 changed files with 2723 additions and 1048 deletions
@@ -1,5 +1,6 @@
 FILE /argumentReorderingInDelegatingConstructorCall.kt
  CLASS CLASS Base
+    $new: VALUE_PARAMETER <receiver: Base>
    CONSTRUCTOR public constructor Base(x: kotlin.Int, y: kotlin.Int)
      VALUE_PARAMETER value-parameter x: kotlin.Int
      VALUE_PARAMETER value-parameter y: kotlin.Int
@@ -30,6 +31,7 @@ FILE /argumentReorderingInDelegatingConstructorCall.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS Test1
+    $new: VALUE_PARAMETER <receiver: Test1>
    CONSTRUCTOR public constructor Test1(xx: kotlin.Int, yy: kotlin.Int)
      VALUE_PARAMETER value-parameter xx: kotlin.Int
      VALUE_PARAMETER value-parameter yy: kotlin.Int
@@ -51,6 +53,7 @@ FILE /argumentReorderingInDelegatingConstructorCall.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS Test2
+    $new: VALUE_PARAMETER <receiver: Test2>
    CONSTRUCTOR public constructor Test2(xx: kotlin.Int, yy: kotlin.Int)
      VALUE_PARAMETER value-parameter xx: kotlin.Int
      VALUE_PARAMETER value-parameter yy: kotlin.Int
@@ -1,5 +1,6 @@
 FILE /classMembers.kt
  CLASS CLASS C
+    $new: VALUE_PARAMETER <receiver: C>
    CONSTRUCTOR public constructor C(x: kotlin.Int, y: kotlin.Int, z: kotlin.Int = ...)
      VALUE_PARAMETER value-parameter x: kotlin.Int
      VALUE_PARAMETER value-parameter y: kotlin.Int
@@ -84,6 +85,7 @@ FILE /classMembers.kt
        CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
          message: CONST String type=kotlin.String value='2'
    CLASS CLASS NestedClass
+      $new: VALUE_PARAMETER <receiver: NestedClass>
      CONSTRUCTOR public constructor NestedClass()
        BLOCK_BODY
          DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -115,6 +117,7 @@ FILE /classMembers.kt
      FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
      FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
    CLASS OBJECT companion object of C
+      $new: VALUE_PARAMETER <receiver: companion object of C>
      CONSTRUCTOR private constructor Companion()
        BLOCK_BODY
          DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -1,5 +1,6 @@
 FILE /classes.kt
  CLASS CLASS TestClass
+    $new: VALUE_PARAMETER <receiver: TestClass>
    CONSTRUCTOR public constructor TestClass()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -12,6 +13,7 @@ FILE /classes.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS OBJECT TestObject
+    $new: VALUE_PARAMETER <receiver: TestObject>
    CONSTRUCTOR private constructor TestObject()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -20,10 +22,12 @@ FILE /classes.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS ANNOTATION_CLASS TestAnnotationClass
+    $new: VALUE_PARAMETER <receiver: TestAnnotationClass>
    FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS ENUM_CLASS TestEnumClass
+    $new: VALUE_PARAMETER <receiver: TestEnumClass>
    CONSTRUCTOR private constructor TestEnumClass()
      BLOCK_BODY
        ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
@@ -1,10 +1,12 @@
 FILE /companionObject.kt
  CLASS CLASS Test1
+    $new: VALUE_PARAMETER <receiver: Test1>
    CONSTRUCTOR public constructor Test1()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
        INSTANCE_INITIALIZER_CALL classDescriptor='Test1'
    CLASS OBJECT companion object of Test1
+      $new: VALUE_PARAMETER <receiver: companion object of Test1>
      CONSTRUCTOR private constructor Companion()
        BLOCK_BODY
          DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -16,11 +18,13 @@ FILE /companionObject.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS Test2
+    $new: VALUE_PARAMETER <receiver: Test2>
    CONSTRUCTOR public constructor Test2()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
        INSTANCE_INITIALIZER_CALL classDescriptor='Test2'
    CLASS OBJECT companion object of Test2Named
+      $new: VALUE_PARAMETER <receiver: companion object of Test2Named>
      CONSTRUCTOR private constructor Named()
        BLOCK_BODY
          DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -1,5 +1,6 @@
 FILE /dataClasses.kt
  CLASS CLASS Test1
+    $new: VALUE_PARAMETER <receiver: Test1>
    CONSTRUCTOR public constructor Test1(x: kotlin.Int, y: kotlin.String, z: kotlin.Any)
      VALUE_PARAMETER value-parameter x: kotlin.Int
      VALUE_PARAMETER value-parameter y: kotlin.String
@@ -173,6 +174,7 @@ FILE /dataClasses.kt
        RETURN type=kotlin.Nothing from='equals(Any?): Boolean'
          CONST Boolean type=kotlin.Boolean value='true'
  CLASS CLASS Test2
+    $new: VALUE_PARAMETER <receiver: Test2>
    CONSTRUCTOR public constructor Test2(x: kotlin.Any?)
      VALUE_PARAMETER value-parameter x: kotlin.Any?
      BLOCK_BODY
@@ -1,5 +1,6 @@
 FILE /dataClassesGeneric.kt
  CLASS CLASS Test1
+    $new: VALUE_PARAMETER <receiver: Test1>
    TYPE_PARAMETER <T>
    CONSTRUCTOR public constructor Test1<T>(x: T)
      TYPE_PARAMETER <T>
@@ -13,6 +13,7 @@ FILE /delegatedImplementation.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS OBJECT BaseImpl
+    $new: VALUE_PARAMETER <receiver: BaseImpl>
    CONSTRUCTOR private constructor BaseImpl()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -90,6 +91,7 @@ FILE /delegatedImplementation.kt
      RETURN type=kotlin.Nothing from='otherImpl(String, Int): IOther'
        BLOCK type=otherImpl.<no name provided> origin=OBJECT_LITERAL
          CLASS CLASS <no name provided>
+            $new: VALUE_PARAMETER <receiver: <no name provided>>
            CONSTRUCTOR public constructor <no name provided>()
              BLOCK_BODY
                DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -145,6 +147,7 @@ FILE /delegatedImplementation.kt
            FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
          CALL 'constructor <no name provided>()' type=otherImpl.<no name provided> origin=OBJECT_LITERAL
  CLASS CLASS Test1
+    $new: VALUE_PARAMETER <receiver: Test1>
    CONSTRUCTOR public constructor Test1()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -181,6 +184,7 @@ FILE /delegatedImplementation.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS Test2
+    $new: VALUE_PARAMETER <receiver: Test2>
    CONSTRUCTOR public constructor Test2()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -8,6 +8,7 @@ FILE /delegatedImplementationWithExplicitOverride.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS OBJECT FooBarImpl
+    $new: VALUE_PARAMETER <receiver: FooBarImpl>
    CONSTRUCTOR private constructor FooBarImpl()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -22,6 +23,7 @@ FILE /delegatedImplementationWithExplicitOverride.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS C
+    $new: VALUE_PARAMETER <receiver: C>
    CONSTRUCTOR public constructor C()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -1,5 +1,6 @@
 FILE /delegatingConstructorCallToTypeAliasConstructor.kt
  CLASS CLASS Cell
+    $new: VALUE_PARAMETER <receiver: Cell>
    TYPE_PARAMETER <T>
    CONSTRUCTOR public constructor Cell<T>(value: T)
      TYPE_PARAMETER <T>
@@ -23,6 +24,7 @@ FILE /delegatingConstructorCallToTypeAliasConstructor.kt
  TYPEALIAS typealias CT = Cell<T> type=Cell<T>
  TYPEALIAS typealias CStr = Cell<String> type=Cell<kotlin.String>
  CLASS CLASS C1
+    $new: VALUE_PARAMETER <receiver: C1>
    CONSTRUCTOR public constructor C1()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Cell(String)'
@@ -34,6 +36,7 @@ FILE /delegatingConstructorCallToTypeAliasConstructor.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS C2
+    $new: VALUE_PARAMETER <receiver: C2>
    CONSTRUCTOR public constructor C2()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Cell(String)'
@@ -1,5 +1,6 @@
 FILE /delegatingConstructorCallsInSecondaryConstructors.kt
  CLASS CLASS Base
+    $new: VALUE_PARAMETER <receiver: Base>
    CONSTRUCTOR public constructor Base()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -8,6 +9,7 @@ FILE /delegatingConstructorCallsInSecondaryConstructors.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS Test
+    $new: VALUE_PARAMETER <receiver: Test>
    CONSTRUCTOR public constructor Test()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Base()'
@@ -1,5 +1,6 @@
 FILE /enum.kt
  CLASS ENUM_CLASS TestEnum1
+    $new: VALUE_PARAMETER <receiver: TestEnum1>
    CONSTRUCTOR private constructor TestEnum1()
      BLOCK_BODY
        ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
@@ -24,6 +25,7 @@ FILE /enum.kt
    FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): TestEnum1
      SYNTHETIC_BODY kind=ENUM_VALUEOF
  CLASS ENUM_CLASS TestEnum2
+    $new: VALUE_PARAMETER <receiver: TestEnum2>
    CONSTRUCTOR private constructor TestEnum2(x: kotlin.Int)
      VALUE_PARAMETER value-parameter x: kotlin.Int
      BLOCK_BODY
@@ -64,6 +66,7 @@ FILE /enum.kt
    FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): TestEnum2
      SYNTHETIC_BODY kind=ENUM_VALUEOF
  CLASS ENUM_CLASS TestEnum3
+    $new: VALUE_PARAMETER <receiver: TestEnum3>
    CONSTRUCTOR private constructor TestEnum3()
      BLOCK_BODY
        ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
@@ -71,6 +74,7 @@ FILE /enum.kt
    ENUM_ENTRY enum entry TEST
      init: ENUM_CONSTRUCTOR_CALL 'constructor TEST()'
      class: CLASS ENUM_ENTRY TEST
+        $new: VALUE_PARAMETER <receiver: TEST>
        CONSTRUCTOR private constructor TEST()
          BLOCK_BODY
            ENUM_CONSTRUCTOR_CALL 'constructor TestEnum3()'
@@ -109,6 +113,7 @@ FILE /enum.kt
    FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): TestEnum3
      SYNTHETIC_BODY kind=ENUM_VALUEOF
  CLASS ENUM_CLASS TestEnum4
+    $new: VALUE_PARAMETER <receiver: TestEnum4>
    CONSTRUCTOR private constructor TestEnum4(x: kotlin.Int)
      VALUE_PARAMETER value-parameter x: kotlin.Int
      BLOCK_BODY
@@ -127,6 +132,7 @@ FILE /enum.kt
    ENUM_ENTRY enum entry TEST1
      init: ENUM_CONSTRUCTOR_CALL 'constructor TEST1()'
      class: CLASS ENUM_ENTRY TEST1
+        $new: VALUE_PARAMETER <receiver: TEST1>
        CONSTRUCTOR private constructor TEST1()
          BLOCK_BODY
            ENUM_CONSTRUCTOR_CALL 'constructor TestEnum4(Int)'
@@ -153,6 +159,7 @@ FILE /enum.kt
    ENUM_ENTRY enum entry TEST2
      init: ENUM_CONSTRUCTOR_CALL 'constructor TEST2()'
      class: CLASS ENUM_ENTRY TEST2
+        $new: VALUE_PARAMETER <receiver: TEST2>
        CONSTRUCTOR private constructor TEST2()
          BLOCK_BODY
            ENUM_CONSTRUCTOR_CALL 'constructor TestEnum4(Int)'
@@ -208,6 +215,7 @@ FILE /enum.kt
    FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): TestEnum4
      SYNTHETIC_BODY kind=ENUM_VALUEOF
  CLASS ENUM_CLASS TestEnum5
+    $new: VALUE_PARAMETER <receiver: TestEnum5>
    CONSTRUCTOR private constructor TestEnum5(x: kotlin.Int = ...)
      VALUE_PARAMETER value-parameter x: kotlin.Int = ...
        EXPRESSION_BODY
@@ -1,5 +1,6 @@
 FILE /enumWithSecondaryCtor.kt
  CLASS ENUM_CLASS Test0
+    $new: VALUE_PARAMETER <receiver: Test0>
    CONSTRUCTOR private constructor Test0(x: kotlin.Int)
      VALUE_PARAMETER value-parameter x: kotlin.Int
      BLOCK_BODY
@@ -37,6 +38,7 @@ FILE /enumWithSecondaryCtor.kt
    FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): Test0
      SYNTHETIC_BODY kind=ENUM_VALUEOF
  CLASS ENUM_CLASS Test1
+    $new: VALUE_PARAMETER <receiver: Test1>
    CONSTRUCTOR private constructor Test1(x: kotlin.Int)
      VALUE_PARAMETER value-parameter x: kotlin.Int
      BLOCK_BODY
@@ -77,6 +79,7 @@ FILE /enumWithSecondaryCtor.kt
    FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): Test1
      SYNTHETIC_BODY kind=ENUM_VALUEOF
  CLASS ENUM_CLASS Test2
+    $new: VALUE_PARAMETER <receiver: Test2>
    CONSTRUCTOR private constructor Test2(x: kotlin.Int)
      VALUE_PARAMETER value-parameter x: kotlin.Int
      BLOCK_BODY
@@ -95,6 +98,7 @@ FILE /enumWithSecondaryCtor.kt
    ENUM_ENTRY enum entry ZERO
      init: ENUM_CONSTRUCTOR_CALL 'constructor ZERO()'
      class: CLASS ENUM_ENTRY ZERO
+        $new: VALUE_PARAMETER <receiver: ZERO>
        CONSTRUCTOR private constructor ZERO()
          BLOCK_BODY
            ENUM_CONSTRUCTOR_CALL 'constructor Test2()'
@@ -120,6 +124,7 @@ FILE /enumWithSecondaryCtor.kt
    ENUM_ENTRY enum entry ONE
      init: ENUM_CONSTRUCTOR_CALL 'constructor ONE()'
      class: CLASS ENUM_ENTRY ONE
+        $new: VALUE_PARAMETER <receiver: ONE>
        CONSTRUCTOR private constructor ONE()
          BLOCK_BODY
            ENUM_CONSTRUCTOR_CALL 'constructor Test2(Int)'
@@ -1,5 +1,6 @@
 FILE /initBlock.kt
  CLASS CLASS Test1
+    $new: VALUE_PARAMETER <receiver: Test1>
    CONSTRUCTOR public constructor Test1()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -11,6 +12,7 @@ FILE /initBlock.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS Test2
+    $new: VALUE_PARAMETER <receiver: Test2>
    CONSTRUCTOR public constructor Test2(x: kotlin.Int)
      VALUE_PARAMETER value-parameter x: kotlin.Int
      BLOCK_BODY
@@ -33,6 +35,7 @@ FILE /initBlock.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS Test3
+    $new: VALUE_PARAMETER <receiver: Test3>
    ANONYMOUS_INITIALIZER Test3
      BLOCK_BODY
        CALL 'println(): Unit' type=kotlin.Unit origin=null
@@ -44,6 +47,7 @@ FILE /initBlock.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS Test4
+    $new: VALUE_PARAMETER <receiver: Test4>
    ANONYMOUS_INITIALIZER Test4
      BLOCK_BODY
        CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
@@ -60,6 +64,7 @@ FILE /initBlock.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS Test5
+    $new: VALUE_PARAMETER <receiver: Test5>
    CONSTRUCTOR public constructor Test5()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -69,8 +74,9 @@ FILE /initBlock.kt
        CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
          message: CONST String type=kotlin.String value='1'
    CLASS CLASS TestInner
+      $new: VALUE_PARAMETER <receiver: TestInner>
      CONSTRUCTOR public constructor TestInner()
-        $this: VALUE_PARAMETER <receiver: Test5>
+        $outer: VALUE_PARAMETER <receiver: Test5>
        BLOCK_BODY
          DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
          INSTANCE_INITIALIZER_CALL classDescriptor='TestInner'
@@ -1,5 +1,6 @@
 FILE /initVal.kt
  CLASS CLASS TestInitValFromParameter
+    $new: VALUE_PARAMETER <receiver: TestInitValFromParameter>
    CONSTRUCTOR public constructor TestInitValFromParameter(x: kotlin.Int)
      VALUE_PARAMETER value-parameter x: kotlin.Int
      BLOCK_BODY
@@ -19,6 +20,7 @@ FILE /initVal.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS TestInitValInClass
+    $new: VALUE_PARAMETER <receiver: TestInitValInClass>
    CONSTRUCTOR public constructor TestInitValInClass()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -37,6 +39,7 @@ FILE /initVal.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS TestInitValInInitBlock
+    $new: VALUE_PARAMETER <receiver: TestInitValInInitBlock>
    CONSTRUCTOR public constructor TestInitValInInitBlock()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -1,5 +1,6 @@
 FILE /initVar.kt
  CLASS CLASS TestInitVarFromParameter
+    $new: VALUE_PARAMETER <receiver: TestInitVarFromParameter>
    CONSTRUCTOR public constructor TestInitVarFromParameter(x: kotlin.Int)
      VALUE_PARAMETER value-parameter x: kotlin.Int
      BLOCK_BODY
@@ -26,6 +27,7 @@ FILE /initVar.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS TestInitVarInClass
+    $new: VALUE_PARAMETER <receiver: TestInitVarInClass>
    CONSTRUCTOR public constructor TestInitVarInClass()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -51,6 +53,7 @@ FILE /initVar.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS TestInitVarInInitBlock
+    $new: VALUE_PARAMETER <receiver: TestInitVarInInitBlock>
    CONSTRUCTOR public constructor TestInitVarInInitBlock()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -79,6 +82,7 @@ FILE /initVar.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS TestInitVarWithCustomSetter
+    $new: VALUE_PARAMETER <receiver: TestInitVarWithCustomSetter>
    CONSTRUCTOR public constructor TestInitVarWithCustomSetter()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -104,6 +108,7 @@ FILE /initVar.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS TestInitVarWithCustomSetterWithExplicitCtor
+    $new: VALUE_PARAMETER <receiver: TestInitVarWithCustomSetterWithExplicitCtor>
    PROPERTY public final var x: kotlin.Int
      FIELD PROPERTY_BACKING_FIELD public final var x: kotlin.Int
      FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
@@ -132,6 +137,7 @@ FILE /initVar.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS TestInitVarWithCustomSetterInCtor
+    $new: VALUE_PARAMETER <receiver: TestInitVarWithCustomSetterInCtor>
    PROPERTY public final var x: kotlin.Int
      FIELD PROPERTY_BACKING_FIELD public final var x: kotlin.Int
      FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
@@ -1,12 +1,14 @@
 FILE /innerClass.kt
  CLASS CLASS Outer
+    $new: VALUE_PARAMETER <receiver: Outer>
    CONSTRUCTOR public constructor Outer()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
        INSTANCE_INITIALIZER_CALL classDescriptor='Outer'
    CLASS CLASS TestInnerClass
+      $new: VALUE_PARAMETER <receiver: TestInnerClass>
      CONSTRUCTOR public constructor TestInnerClass()
-        $this: VALUE_PARAMETER <receiver: Outer>
+        $outer: VALUE_PARAMETER <receiver: Outer>
        BLOCK_BODY
          DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
          INSTANCE_INITIALIZER_CALL classDescriptor='TestInnerClass'
@@ -14,8 +16,9 @@ FILE /innerClass.kt
      FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
      FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
    CLASS CLASS DerivedInnerClass
+      $new: VALUE_PARAMETER <receiver: DerivedInnerClass>
      CONSTRUCTOR public constructor DerivedInnerClass()
-        $this: VALUE_PARAMETER <receiver: Outer>
+        $outer: VALUE_PARAMETER <receiver: Outer>
        BLOCK_BODY
          DELEGATING_CONSTRUCTOR_CALL 'constructor TestInnerClass()'
            $this: GET_VAR '<receiver: Outer>' type=Outer origin=null
@@ -1,12 +1,14 @@
 FILE /innerClassWithDelegatingConstructor.kt
  CLASS CLASS Outer
+    $new: VALUE_PARAMETER <receiver: Outer>
    CONSTRUCTOR public constructor Outer()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
        INSTANCE_INITIALIZER_CALL classDescriptor='Outer'
    CLASS CLASS Inner
+      $new: VALUE_PARAMETER <receiver: Inner>
      CONSTRUCTOR public constructor Inner(x: kotlin.Int)
-        $this: VALUE_PARAMETER <receiver: Outer>
+        $outer: VALUE_PARAMETER <receiver: Outer>
        VALUE_PARAMETER value-parameter x: kotlin.Int
        BLOCK_BODY
          DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -22,7 +24,7 @@ FILE /innerClassWithDelegatingConstructor.kt
              GET_FIELD 'x: Int' type=kotlin.Int origin=null
                receiver: GET_VAR '<receiver: Inner>' type=Outer.Inner origin=null
      CONSTRUCTOR public constructor Inner()
-        $this: VALUE_PARAMETER <receiver: Outer>
+        $outer: VALUE_PARAMETER <receiver: Outer>
        BLOCK_BODY
          DELEGATING_CONSTRUCTOR_CALL 'constructor Inner(Int)'
            $this: GET_VAR '<receiver: Outer>' type=Outer origin=null
@@ -2,6 +2,7 @@ FILE /localClasses.kt
  FUN public fun outer(): kotlin.Unit
    BLOCK_BODY
      CLASS CLASS LocalClass
+        $new: VALUE_PARAMETER <receiver: LocalClass>
        CONSTRUCTOR public constructor LocalClass()
          BLOCK_BODY
            DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -10,6 +10,7 @@ FILE /objectLiteralExpressions.kt
      EXPRESSION_BODY
        BLOCK type=test1.<no name provided> origin=OBJECT_LITERAL
          CLASS CLASS <no name provided>
+            $new: VALUE_PARAMETER <receiver: <no name provided>>
            CONSTRUCTOR public constructor <no name provided>()
              BLOCK_BODY
                DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -27,6 +28,7 @@ FILE /objectLiteralExpressions.kt
      EXPRESSION_BODY
        BLOCK type=test2.<no name provided> origin=OBJECT_LITERAL
          CLASS CLASS <no name provided>
+            $new: VALUE_PARAMETER <receiver: <no name provided>>
            CONSTRUCTOR public constructor <no name provided>()
              BLOCK_BODY
                DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -45,13 +47,15 @@ FILE /objectLiteralExpressions.kt
        RETURN type=kotlin.Nothing from='<get-test2>(): IFoo'
          GET_FIELD 'test2: IFoo' type=IFoo origin=null
  CLASS CLASS Outer
+    $new: VALUE_PARAMETER <receiver: Outer>
    CONSTRUCTOR public constructor Outer()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
        INSTANCE_INITIALIZER_CALL classDescriptor='Outer'
    CLASS CLASS Inner
+      $new: VALUE_PARAMETER <receiver: Inner>
      CONSTRUCTOR public constructor Inner()
-        $this: VALUE_PARAMETER <receiver: Outer>
+        $outer: VALUE_PARAMETER <receiver: Outer>
        BLOCK_BODY
          DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
          INSTANCE_INITIALIZER_CALL classDescriptor='Inner'
@@ -65,6 +69,7 @@ FILE /objectLiteralExpressions.kt
        RETURN type=kotlin.Nothing from='test3(): Outer.Inner'
          BLOCK type=Outer.test3.<no name provided> origin=OBJECT_LITERAL
            CLASS CLASS <no name provided>
+              $new: VALUE_PARAMETER <receiver: <no name provided>>
              CONSTRUCTOR public constructor <no name provided>()
                BLOCK_BODY
                  DELEGATING_CONSTRUCTOR_CALL 'constructor Inner()'
@@ -88,6 +93,7 @@ FILE /objectLiteralExpressions.kt
      RETURN type=kotlin.Nothing from='test4() on Outer: Outer.Inner'
        BLOCK type=test4.<no name provided> origin=OBJECT_LITERAL
          CLASS CLASS <no name provided>
+            $new: VALUE_PARAMETER <receiver: <no name provided>>
            CONSTRUCTOR public constructor <no name provided>()
              BLOCK_BODY
                DELEGATING_CONSTRUCTOR_CALL 'constructor Inner()'
@@ -1,5 +1,6 @@
 FILE /objectWithInitializers.kt
  CLASS CLASS Base
+    $new: VALUE_PARAMETER <receiver: Base>
    CONSTRUCTOR public constructor Base()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -8,6 +9,7 @@ FILE /objectWithInitializers.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS OBJECT Test
+    $new: VALUE_PARAMETER <receiver: Test>
    CONSTRUCTOR private constructor Test()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Base()'
@@ -1,5 +1,6 @@
 FILE /outerClassAccess.kt
  CLASS CLASS Outer
+    $new: VALUE_PARAMETER <receiver: Outer>
    CONSTRUCTOR public constructor Outer()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -8,8 +9,9 @@ FILE /outerClassAccess.kt
      $this: VALUE_PARAMETER <receiver: Outer>
      BLOCK_BODY
    CLASS CLASS Inner
+      $new: VALUE_PARAMETER <receiver: Inner>
      CONSTRUCTOR public constructor Inner()
-        $this: VALUE_PARAMETER <receiver: Outer>
+        $outer: VALUE_PARAMETER <receiver: Outer>
        BLOCK_BODY
          DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
          INSTANCE_INITIALIZER_CALL classDescriptor='Inner'
@@ -19,8 +21,9 @@ FILE /outerClassAccess.kt
          CALL 'foo(): Unit' type=kotlin.Unit origin=null
            $this: GET_VAR '<receiver: Outer>' type=Outer origin=null
      CLASS CLASS Inner2
+        $new: VALUE_PARAMETER <receiver: Inner2>
        CONSTRUCTOR public constructor Inner2()
-          $this: VALUE_PARAMETER <receiver: Inner>
+          $outer: VALUE_PARAMETER <receiver: Inner>
          BLOCK_BODY
            DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
            INSTANCE_INITIALIZER_CALL classDescriptor='Inner2'
@@ -1,5 +1,6 @@
 FILE /primaryConstructorWithSuperConstructorCall.kt
  CLASS CLASS Base
+    $new: VALUE_PARAMETER <receiver: Base>
    CONSTRUCTOR public constructor Base()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -8,6 +9,7 @@ FILE /primaryConstructorWithSuperConstructorCall.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS TestImplicitPrimaryConstructor
+    $new: VALUE_PARAMETER <receiver: TestImplicitPrimaryConstructor>
    CONSTRUCTOR public constructor TestImplicitPrimaryConstructor()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Base()'
@@ -16,6 +18,7 @@ FILE /primaryConstructorWithSuperConstructorCall.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS TestExplicitPrimaryConstructor
+    $new: VALUE_PARAMETER <receiver: TestExplicitPrimaryConstructor>
    CONSTRUCTOR public constructor TestExplicitPrimaryConstructor()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Base()'
@@ -24,6 +27,7 @@ FILE /primaryConstructorWithSuperConstructorCall.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS TestWithDelegatingConstructor
+    $new: VALUE_PARAMETER <receiver: TestWithDelegatingConstructor>
    CONSTRUCTOR public constructor TestWithDelegatingConstructor(x: kotlin.Int, y: kotlin.Int)
      VALUE_PARAMETER value-parameter x: kotlin.Int
      VALUE_PARAMETER value-parameter y: kotlin.Int
@@ -26,6 +26,7 @@ FILE /qualifiedSuperCalls.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS CBoth
+    $new: VALUE_PARAMETER <receiver: CBoth>
    CONSTRUCTOR public constructor CBoth()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -1,10 +1,12 @@
 FILE /sealedClasses.kt
  CLASS CLASS Expr
+    $new: VALUE_PARAMETER <receiver: Expr>
    CONSTRUCTOR private constructor Expr()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
        INSTANCE_INITIALIZER_CALL classDescriptor='Expr'
    CLASS CLASS Const
+      $new: VALUE_PARAMETER <receiver: Const>
      CONSTRUCTOR public constructor Const(number: kotlin.Double)
        VALUE_PARAMETER value-parameter number: kotlin.Double
        BLOCK_BODY
@@ -24,6 +26,7 @@ FILE /sealedClasses.kt
      FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
      FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
    CLASS CLASS Sum
+      $new: VALUE_PARAMETER <receiver: Sum>
      CONSTRUCTOR public constructor Sum(e1: Expr, e2: Expr)
        VALUE_PARAMETER value-parameter e1: Expr
        VALUE_PARAMETER value-parameter e2: Expr
@@ -54,6 +57,7 @@ FILE /sealedClasses.kt
      FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
      FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
    CLASS OBJECT NotANumber
+      $new: VALUE_PARAMETER <receiver: NotANumber>
      CONSTRUCTOR private constructor NotANumber()
        BLOCK_BODY
          DELEGATING_CONSTRUCTOR_CALL 'constructor Expr()'
@@ -1,5 +1,6 @@
 FILE /secondaryConstructorWithInitializersFromClassBody.kt
  CLASS CLASS Base
+    $new: VALUE_PARAMETER <receiver: Base>
    CONSTRUCTOR public constructor Base()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -8,6 +9,7 @@ FILE /secondaryConstructorWithInitializersFromClassBody.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS TestProperty
+    $new: VALUE_PARAMETER <receiver: TestProperty>
    PROPERTY public final val x: kotlin.Int = 0
      FIELD PROPERTY_BACKING_FIELD public final val x: kotlin.Int = 0
        EXPRESSION_BODY
@@ -26,6 +28,7 @@ FILE /secondaryConstructorWithInitializersFromClassBody.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS TestInitBlock
+    $new: VALUE_PARAMETER <receiver: TestInitBlock>
    PROPERTY public final val x: kotlin.Int
      FIELD PROPERTY_BACKING_FIELD public final val x: kotlin.Int
      FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): kotlin.Int
@@ -1,5 +1,6 @@
 FILE /secondaryConstructors.kt
  CLASS CLASS C
+    $new: VALUE_PARAMETER <receiver: C>
    CONSTRUCTOR public constructor C()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor C(Int)'
@@ -1,5 +1,6 @@
 FILE /superCalls.kt
  CLASS CLASS Base
+    $new: VALUE_PARAMETER <receiver: Base>
    CONSTRUCTOR public constructor Base()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -21,6 +22,7 @@ FILE /superCalls.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS Derived
+    $new: VALUE_PARAMETER <receiver: Derived>
    CONSTRUCTOR public constructor Derived()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Base()'
@@ -1,5 +1,6 @@
 FILE /classLevelProperties.kt
  CLASS CLASS C
+    $new: VALUE_PARAMETER <receiver: C>
    CONSTRUCTOR public constructor C()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -91,7 +92,7 @@ FILE /classLevelProperties.kt
                BLOCK_BODY
                  RETURN type=kotlin.Nothing from='<anonymous>(): Int'
                    CONST Int type=kotlin.Int value='42'
-              CALLABLE_REFERENCE '<anonymous>(): Int' type=() -> kotlin.Int origin=LAMBDA
+              FUNCTION_REFERENCE '<anonymous>(): Int' type=() -> kotlin.Int origin=LAMBDA
      FUN DELEGATED_PROPERTY_ACCESSOR public final fun <get-test7>(): kotlin.Int
        $this: VALUE_PARAMETER <receiver: C>
        BLOCK_BODY
@@ -101,7 +102,7 @@ FILE /classLevelProperties.kt
              $receiver: GET_FIELD '`test7$delegate`: Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
                receiver: GET_VAR '<receiver: C>' type=C origin=null
              thisRef: GET_VAR '<receiver: C>' type=C origin=null
-              property: CALLABLE_REFERENCE 'test7: Int' type=kotlin.reflect.KProperty1<C, kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+              property: PROPERTY_REFERENCE 'test7: Int' field=null getter='<get-test7>(): Int' setter=null type=kotlin.reflect.KProperty1<C, kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
    PROPERTY public final var test8: kotlin.Int
      FIELD DELEGATE val `test8$delegate`: kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */
        EXPRESSION_BODY
@@ -117,7 +118,7 @@ FILE /classLevelProperties.kt
              $receiver: GET_FIELD '`test8$delegate`: HashMap<String, Int> /* = HashMap<String, Int> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */ origin=null
                receiver: GET_VAR '<receiver: C>' type=C origin=null
              thisRef: GET_VAR '<receiver: C>' type=C origin=null
-              property: CALLABLE_REFERENCE 'test8: Int' type=kotlin.reflect.KMutableProperty1<C, kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+              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
      FUN DELEGATED_PROPERTY_ACCESSOR public final fun <set-test8>(<set-?>: kotlin.Int): kotlin.Unit
        $this: VALUE_PARAMETER <receiver: C>
        VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
@@ -128,7 +129,7 @@ FILE /classLevelProperties.kt
              $receiver: GET_FIELD '`test8$delegate`: HashMap<String, Int> /* = HashMap<String, Int> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */ origin=null
                receiver: GET_VAR '<receiver: C>' type=C origin=null
              thisRef: GET_VAR '<receiver: C>' type=C origin=null
-              property: CALLABLE_REFERENCE 'test8: Int' type=kotlin.reflect.KMutableProperty1<C, kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+              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
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
@@ -9,7 +9,7 @@ FILE /delegatedProperties.kt
              BLOCK_BODY
                RETURN type=kotlin.Nothing from='<anonymous>(): Int'
                  CONST Int type=kotlin.Int value='42'
-            CALLABLE_REFERENCE '<anonymous>(): Int' type=() -> kotlin.Int origin=LAMBDA
+            FUNCTION_REFERENCE '<anonymous>(): Int' type=() -> kotlin.Int origin=LAMBDA
    FUN DELEGATED_PROPERTY_ACCESSOR public fun <get-test1>(): kotlin.Int
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='<get-test1>(): Int'
@@ -17,8 +17,9 @@ FILE /delegatedProperties.kt
            <T>: Int
            $receiver: GET_FIELD '`test1$delegate`: Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
            thisRef: CONST Null type=kotlin.Nothing? value='null'
-            property: CALLABLE_REFERENCE 'test1: Int' type=kotlin.reflect.KProperty0<kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+            property: PROPERTY_REFERENCE 'test1: Int' field=null getter='<get-test1>(): Int' setter=null type=kotlin.reflect.KProperty0<kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
  CLASS CLASS C
+    $new: VALUE_PARAMETER <receiver: C>
    CONSTRUCTOR public constructor C(map: kotlin.collections.MutableMap<kotlin.String, kotlin.Any>)
      VALUE_PARAMETER value-parameter map: kotlin.collections.MutableMap<kotlin.String, kotlin.Any>
      BLOCK_BODY
@@ -44,7 +45,7 @@ FILE /delegatedProperties.kt
                BLOCK_BODY
                  RETURN type=kotlin.Nothing from='<anonymous>(): Int'
                    CONST Int type=kotlin.Int value='42'
-              CALLABLE_REFERENCE '<anonymous>(): Int' type=() -> kotlin.Int origin=LAMBDA
+              FUNCTION_REFERENCE '<anonymous>(): Int' type=() -> kotlin.Int origin=LAMBDA
      FUN DELEGATED_PROPERTY_ACCESSOR public final fun <get-test2>(): kotlin.Int
        $this: VALUE_PARAMETER <receiver: C>
        BLOCK_BODY
@@ -54,7 +55,7 @@ FILE /delegatedProperties.kt
              $receiver: GET_FIELD '`test2$delegate`: Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
                receiver: GET_VAR '<receiver: C>' type=C origin=null
              thisRef: GET_VAR '<receiver: C>' type=C origin=null
-              property: CALLABLE_REFERENCE 'test2: Int' type=kotlin.reflect.KProperty1<C, kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+              property: PROPERTY_REFERENCE 'test2: Int' field=null getter='<get-test2>(): Int' setter=null type=kotlin.reflect.KProperty1<C, kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
    PROPERTY public final var test3: kotlin.Any
      FIELD DELEGATE val `test3$delegate`: kotlin.collections.MutableMap<kotlin.String, kotlin.Any>
        EXPRESSION_BODY
@@ -69,7 +70,7 @@ FILE /delegatedProperties.kt
              $receiver: GET_FIELD '`test3$delegate`: MutableMap<String, Any>' type=kotlin.collections.MutableMap<kotlin.String, kotlin.Any> origin=null
                receiver: GET_VAR '<receiver: C>' type=C origin=null
              thisRef: GET_VAR '<receiver: C>' type=C origin=null
-              property: CALLABLE_REFERENCE 'test3: Any' type=kotlin.reflect.KMutableProperty1<C, kotlin.Any> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+              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
      FUN DELEGATED_PROPERTY_ACCESSOR public final fun <set-test3>(<set-?>: kotlin.Any): kotlin.Unit
        $this: VALUE_PARAMETER <receiver: C>
        VALUE_PARAMETER value-parameter <set-?>: kotlin.Any
@@ -80,7 +81,7 @@ FILE /delegatedProperties.kt
              $receiver: GET_FIELD '`test3$delegate`: MutableMap<String, Any>' type=kotlin.collections.MutableMap<kotlin.String, kotlin.Any> origin=null
                receiver: GET_VAR '<receiver: C>' type=C origin=null
              thisRef: GET_VAR '<receiver: C>' type=C origin=null
-              property: CALLABLE_REFERENCE 'test3: Any' type=kotlin.reflect.KMutableProperty1<C, kotlin.Any> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+              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
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
@@ -98,7 +99,7 @@ FILE /delegatedProperties.kt
            <V>: Any
            $receiver: GET_FIELD '`test4$delegate`: HashMap<String, Any> /* = HashMap<String, Any> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Any> /* = java.util.HashMap<kotlin.String, kotlin.Any> */ origin=null
            thisRef: CONST Null type=kotlin.Nothing? value='null'
-            property: CALLABLE_REFERENCE 'test4: Any' type=kotlin.reflect.KMutableProperty0<kotlin.Any> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+            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
    FUN DELEGATED_PROPERTY_ACCESSOR public fun <set-test4>(<set-?>: kotlin.Any): kotlin.Unit
      VALUE_PARAMETER value-parameter <set-?>: kotlin.Any
      BLOCK_BODY
@@ -107,5 +108,5 @@ FILE /delegatedProperties.kt
            <V>: Any
            $receiver: GET_FIELD '`test4$delegate`: HashMap<String, Any> /* = HashMap<String, Any> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Any> /* = java.util.HashMap<kotlin.String, kotlin.Any> */ origin=null
            thisRef: CONST Null type=kotlin.Nothing? value='null'
-            property: CALLABLE_REFERENCE 'test4: Any' type=kotlin.reflect.KMutableProperty0<kotlin.Any> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+            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
@@ -18,6 +18,7 @@ FILE /fakeOverrides.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS CFoo
+    $new: VALUE_PARAMETER <receiver: CFoo>
    TYPE_PARAMETER <T>
    CONSTRUCTOR public constructor CFoo<T>()
      TYPE_PARAMETER <T>
@@ -32,6 +33,7 @@ FILE /fakeOverrides.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS Test1
+    $new: VALUE_PARAMETER <receiver: Test1>
    CONSTRUCTOR public constructor Test1()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor CFoo()'
@@ -69,7 +69,7 @@ FILE /packageLevelProperties.kt
              BLOCK_BODY
                RETURN type=kotlin.Nothing from='<anonymous>(): Int'
                  CONST Int type=kotlin.Int value='42'
-            CALLABLE_REFERENCE '<anonymous>(): Int' type=() -> kotlin.Int origin=LAMBDA
+            FUNCTION_REFERENCE '<anonymous>(): Int' type=() -> kotlin.Int origin=LAMBDA
    FUN DELEGATED_PROPERTY_ACCESSOR public fun <get-test7>(): kotlin.Int
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='<get-test7>(): Int'
@@ -77,7 +77,7 @@ FILE /packageLevelProperties.kt
            <T>: Int
            $receiver: GET_FIELD '`test7$delegate`: Lazy<Int>' type=kotlin.Lazy<kotlin.Int> origin=null
            thisRef: CONST Null type=kotlin.Nothing? value='null'
-            property: CALLABLE_REFERENCE 'test7: Int' type=kotlin.reflect.KProperty0<kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+            property: PROPERTY_REFERENCE 'test7: Int' field=null getter='<get-test7>(): Int' setter=null type=kotlin.reflect.KProperty0<kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
  PROPERTY public var test8: kotlin.Int
    FIELD DELEGATE val `test8$delegate`: kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */
      EXPRESSION_BODY
@@ -91,7 +91,7 @@ FILE /packageLevelProperties.kt
            <V>: Int
            $receiver: GET_FIELD '`test8$delegate`: HashMap<String, Int> /* = HashMap<String, Int> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */ origin=null
            thisRef: CONST Null type=kotlin.Nothing? value='null'
-            property: CALLABLE_REFERENCE 'test8: Int' type=kotlin.reflect.KMutableProperty0<kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+            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
    FUN DELEGATED_PROPERTY_ACCESSOR public fun <set-test8>(<set-?>: kotlin.Int): kotlin.Unit
      VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
      BLOCK_BODY
@@ -100,5 +100,5 @@ FILE /packageLevelProperties.kt
            <V>: Int
            $receiver: GET_FIELD '`test8$delegate`: HashMap<String, Int> /* = HashMap<String, Int> */' type=kotlin.collections.HashMap<kotlin.String, kotlin.Int> /* = java.util.HashMap<kotlin.String, kotlin.Int> */ origin=null
            thisRef: CONST Null type=kotlin.Nothing? value='null'
-            property: CALLABLE_REFERENCE 'test8: Int' type=kotlin.reflect.KMutableProperty0<kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+            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
@@ -10,6 +10,7 @@ FILE /class.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS Test
+    $new: VALUE_PARAMETER <receiver: Test>
    TYPE_PARAMETER <T0>
    CONSTRUCTOR public constructor Test<T0>()
      TYPE_PARAMETER <T0>
@@ -17,6 +18,7 @@ FILE /class.kt
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
        INSTANCE_INITIALIZER_CALL classDescriptor='Test'
    CLASS CLASS TestNested
+      $new: VALUE_PARAMETER <receiver: TestNested>
      TYPE_PARAMETER <T1>
      CONSTRUCTOR public constructor TestNested<T1>()
        TYPE_PARAMETER <T1>
@@ -27,10 +29,11 @@ FILE /class.kt
      FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
      FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
    CLASS CLASS TestInner
+      $new: VALUE_PARAMETER <receiver: TestInner>
      TYPE_PARAMETER <T2>
      CONSTRUCTOR public constructor TestInner<T2>()
        TYPE_PARAMETER <T2>
-        $this: VALUE_PARAMETER <receiver: Test>
+        $outer: VALUE_PARAMETER <receiver: Test>
        BLOCK_BODY
          DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
          INSTANCE_INITIALIZER_CALL classDescriptor='TestInner'
@@ -1,5 +1,6 @@
 FILE /constructor.kt
  CLASS CLASS Test1
+    $new: VALUE_PARAMETER <receiver: Test1>
    TYPE_PARAMETER <T1>
    TYPE_PARAMETER <T2>
    CONSTRUCTOR public constructor Test1<T1, T2>(x: T1, y: T2)
@@ -34,6 +35,7 @@ FILE /constructor.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS Test2
+    $new: VALUE_PARAMETER <receiver: Test2>
    CONSTRUCTOR public constructor Test2(x: kotlin.Int, y: kotlin.String)
      VALUE_PARAMETER value-parameter x: kotlin.Int
      VALUE_PARAMETER value-parameter y: kotlin.String
@@ -51,10 +53,11 @@ FILE /constructor.kt
            GET_FIELD 'y: String' type=kotlin.String origin=null
              receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
    CLASS CLASS TestInner
+      $new: VALUE_PARAMETER <receiver: TestInner>
      TYPE_PARAMETER <Z>
      CONSTRUCTOR public constructor TestInner<Z>(z: Z)
        TYPE_PARAMETER <Z>
-        $this: VALUE_PARAMETER <receiver: Test2>
+        $outer: VALUE_PARAMETER <receiver: Test2>
        VALUE_PARAMETER value-parameter z: Z
        BLOCK_BODY
          DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -71,7 +74,7 @@ FILE /constructor.kt
                receiver: GET_VAR '<receiver: TestInner>' type=Test2.TestInner<Z> origin=null
      CONSTRUCTOR public constructor TestInner<Z>(z: Z, i: kotlin.Int)
        TYPE_PARAMETER <Z>
-        $this: VALUE_PARAMETER <receiver: Test2>
+        $outer: VALUE_PARAMETER <receiver: Test2>
        VALUE_PARAMETER value-parameter z: Z
        VALUE_PARAMETER value-parameter i: kotlin.Int
        BLOCK_BODY
@@ -86,6 +89,7 @@ FILE /constructor.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS Test3
+    $new: VALUE_PARAMETER <receiver: Test3>
    CONSTRUCTOR public constructor Test3(x: kotlin.Int, y: kotlin.String = ...)
      VALUE_PARAMETER value-parameter x: kotlin.Int
      VALUE_PARAMETER value-parameter y: kotlin.String = ...
@@ -118,6 +122,7 @@ FILE /constructor.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS Test4
+    $new: VALUE_PARAMETER <receiver: Test4>
    TYPE_PARAMETER <T>
    CONSTRUCTOR public constructor Test4<T>(x: kotlin.Int)
      TYPE_PARAMETER <T>
@@ -1,5 +1,6 @@
 FILE /dataClassMembers.kt
  CLASS CLASS Test
+    $new: VALUE_PARAMETER <receiver: Test>
    TYPE_PARAMETER <T>
    CONSTRUCTOR public constructor Test<T>(x: T, y: kotlin.String = ...)
      TYPE_PARAMETER <T>
@@ -21,6 +21,7 @@ FILE /defaultPropertyAccessors.kt
        SET_FIELD 'test2: Int' type=kotlin.Unit origin=null
          value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
  CLASS CLASS Host
+    $new: VALUE_PARAMETER <receiver: Host>
    CONSTRUCTOR public constructor Host()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -56,6 +57,7 @@ FILE /defaultPropertyAccessors.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS InPrimaryCtor
+    $new: VALUE_PARAMETER <receiver: InPrimaryCtor>
    TYPE_PARAMETER <T>
    CONSTRUCTOR public constructor InPrimaryCtor<T>(testInPrimaryCtor1: T, testInPrimaryCtor2: kotlin.Int = ...)
      TYPE_PARAMETER <T>
@@ -21,6 +21,7 @@ FILE /fun.kt
    VALUE_PARAMETER value-parameter j: kotlin.String
    BLOCK_BODY
  CLASS CLASS Host
+    $new: VALUE_PARAMETER <receiver: Host>
    CONSTRUCTOR public constructor Host()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -8,7 +8,7 @@ FILE /lambdas.kt
            BLOCK_BODY
              RETURN type=kotlin.Nothing from='<anonymous>(String): String'
                GET_VAR 'value-parameter it: String' type=kotlin.String origin=null
-          CALLABLE_REFERENCE '<anonymous>(String): String' type=(kotlin.String) -> kotlin.String origin=LAMBDA
+          FUNCTION_REFERENCE '<anonymous>(String): String' type=(kotlin.String) -> kotlin.String origin=LAMBDA
    FUN DEFAULT_PROPERTY_ACCESSOR public fun <get-test1>(): (kotlin.String) -> kotlin.String
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='<get-test1>(): (String) -> String'
@@ -24,7 +24,7 @@ FILE /lambdas.kt
              RETURN type=kotlin.Nothing from='<anonymous>(Any) on Any: Int'
                CALL 'hashCode(): Int' type=kotlin.Int origin=null
                  $this: GET_VAR 'value-parameter it: Any' type=kotlin.Any origin=null
-          CALLABLE_REFERENCE '<anonymous>(Any) on Any: Int' type=kotlin.Any.(kotlin.Any) -> kotlin.Int origin=LAMBDA
+          FUNCTION_REFERENCE '<anonymous>(Any) on Any: Int' type=kotlin.Any.(kotlin.Any) -> kotlin.Int origin=LAMBDA
    FUN DEFAULT_PROPERTY_ACCESSOR public fun <get-test2>(): kotlin.Any.(kotlin.Any) -> kotlin.Any
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='<get-test2>(): Any.(Any) -> Any'
@@ -39,7 +39,7 @@ FILE /lambdas.kt
            BLOCK_BODY
              RETURN type=kotlin.Nothing from='<anonymous>(Int, Int): Unit'
                GET_OBJECT 'Unit' type=kotlin.Unit
-          CALLABLE_REFERENCE '<anonymous>(Int, Int): Unit' type=(kotlin.Int, kotlin.Int) -> kotlin.Unit origin=LAMBDA
+          FUNCTION_REFERENCE '<anonymous>(Int, Int): Unit' type=(kotlin.Int, kotlin.Int) -> kotlin.Unit origin=LAMBDA
    FUN DEFAULT_PROPERTY_ACCESSOR public fun <get-test3>(): (kotlin.Int, kotlin.Int) -> kotlin.Unit
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='<get-test3>(): (Int, Int) -> Unit'
@@ -52,7 +52,7 @@ FILE /lambdas.kt
            VALUE_PARAMETER value-parameter i: kotlin.Int
            VALUE_PARAMETER value-parameter j: kotlin.Int
            BLOCK_BODY
-          CALLABLE_REFERENCE '<no name provided>(Int, Int): Unit' type=(kotlin.Int, kotlin.Int) -> kotlin.Unit origin=ANONYMOUS_FUNCTION
+          FUNCTION_REFERENCE '<no name provided>(Int, Int): Unit' type=(kotlin.Int, kotlin.Int) -> kotlin.Unit origin=ANONYMOUS_FUNCTION
    FUN DEFAULT_PROPERTY_ACCESSOR public fun <get-test4>(): (kotlin.Int, kotlin.Int) -> kotlin.Unit
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='<get-test4>(): (Int, Int) -> Unit'
@@ -45,6 +45,7 @@ FILE /propertyAccessors.kt
      VALUE_PARAMETER value-parameter value: kotlin.Int
      BLOCK_BODY
  CLASS CLASS Host
+    $new: VALUE_PARAMETER <receiver: Host>
    TYPE_PARAMETER <T>
    CONSTRUCTOR public constructor Host<T>()
      TYPE_PARAMETER <T>
@@ -1,5 +1,6 @@
 FILE /primaryCtorDefaultArguments.kt
  CLASS CLASS Test
+    $new: VALUE_PARAMETER <receiver: Test>
    CONSTRUCTOR public constructor Test(x: kotlin.Int = ...)
      VALUE_PARAMETER value-parameter x: kotlin.Int = ...
        EXPRESSION_BODY
@@ -1,5 +1,6 @@
 FILE /primaryCtorProperties.kt
  CLASS CLASS C
+    $new: VALUE_PARAMETER <receiver: C>
    CONSTRUCTOR public constructor C(test1: kotlin.Int, test2: kotlin.Int)
      VALUE_PARAMETER value-parameter test1: kotlin.Int
      VALUE_PARAMETER value-parameter test2: kotlin.Int
@@ -1,5 +1,6 @@
 FILE /differentReceivers.kt
  CLASS CLASS MyClass
+    $new: VALUE_PARAMETER <receiver: MyClass>
    CONSTRUCTOR public constructor MyClass(value: kotlin.String)
      VALUE_PARAMETER value-parameter value: kotlin.String
      BLOCK_BODY
@@ -40,14 +41,14 @@ FILE /differentReceivers.kt
          $receiver: CALL 'constructor MyClass(String)' type=MyClass origin=null
            value: CONST String type=kotlin.String value='O'
          host: CONST Null type=kotlin.Nothing? value='null'
-          p: CALLABLE_REFERENCE 'testO: String' type=kotlin.reflect.KProperty0<kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+          p: PROPERTY_REFERENCE 'testO: String' field=null getter='<get-testO>(): String' setter=null type=kotlin.reflect.KProperty0<kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
    FUN DELEGATED_PROPERTY_ACCESSOR public fun <get-testO>(): kotlin.String
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='<get-testO>(): String'
          CALL 'getValue(Any?, Any) on String: String' type=kotlin.String origin=null
            $receiver: GET_FIELD '`testO$delegate`: String' type=kotlin.String origin=null
            receiver: CONST Null type=kotlin.Nothing? value='null'
-            p: CALLABLE_REFERENCE 'testO: String' type=kotlin.reflect.KProperty0<kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+            p: PROPERTY_REFERENCE 'testO: String' field=null getter='<get-testO>(): String' setter=null type=kotlin.reflect.KProperty0<kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
  PROPERTY public val testK: kotlin.String
    FIELD DELEGATE val `testK$delegate`: kotlin.String
      EXPRESSION_BODY
@@ -58,7 +59,7 @@ FILE /differentReceivers.kt
          CALL 'getValue(Any?, Any) on String: String' type=kotlin.String origin=null
            $receiver: GET_FIELD '`testK$delegate`: String' type=kotlin.String origin=null
            receiver: CONST Null type=kotlin.Nothing? value='null'
-            p: CALLABLE_REFERENCE 'testK: String' type=kotlin.reflect.KProperty0<kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+            p: PROPERTY_REFERENCE 'testK: String' field=null getter='<get-testK>(): String' setter=null type=kotlin.reflect.KProperty0<kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
  PROPERTY public val testOK: kotlin.String
    FIELD PROPERTY_BACKING_FIELD public val testOK: kotlin.String
      EXPRESSION_BODY
@@ -1,5 +1,6 @@
 FILE /member.kt
  CLASS CLASS Delegate
+    $new: VALUE_PARAMETER <receiver: Delegate>
    CONSTRUCTOR public constructor Delegate(value: kotlin.String)
      VALUE_PARAMETER value-parameter value: kotlin.String
      BLOCK_BODY
@@ -27,6 +28,7 @@ FILE /member.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS DelegateProvider
+    $new: VALUE_PARAMETER <receiver: DelegateProvider>
    CONSTRUCTOR public constructor DelegateProvider(value: kotlin.String)
      VALUE_PARAMETER value-parameter value: kotlin.String
      BLOCK_BODY
@@ -55,6 +57,7 @@ FILE /member.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS Host
+    $new: VALUE_PARAMETER <receiver: Host>
    CONSTRUCTOR public constructor Host()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -66,7 +69,7 @@ FILE /member.kt
            $this: CALL 'constructor DelegateProvider(String)' type=DelegateProvider origin=null
              value: CONST String type=kotlin.String value='OK'
            thisRef: GET_VAR '<receiver: Host>' type=Host origin=null
-            property: CALLABLE_REFERENCE 'testMember: String' type=kotlin.reflect.KProperty1<Host, kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+            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 DELEGATED_PROPERTY_ACCESSOR public final fun <get-testMember>(): kotlin.String
        $this: VALUE_PARAMETER <receiver: Host>
        BLOCK_BODY
@@ -75,7 +78,7 @@ FILE /member.kt
              $this: GET_FIELD '`testMember$delegate`: Delegate' type=Delegate origin=null
                receiver: GET_VAR '<receiver: Host>' type=Host origin=null
              thisRef: GET_VAR '<receiver: Host>' type=Host origin=null
-              property: CALLABLE_REFERENCE 'testMember: String' type=kotlin.reflect.KProperty1<Host, kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+              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
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
@@ -1,10 +1,12 @@
 FILE /memberExtension.kt
  CLASS OBJECT Host
+    $new: VALUE_PARAMETER <receiver: Host>
    CONSTRUCTOR private constructor Host()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
        INSTANCE_INITIALIZER_CALL classDescriptor='Host'
    CLASS CLASS StringDelegate
+      $new: VALUE_PARAMETER <receiver: StringDelegate>
      CONSTRUCTOR public constructor StringDelegate(s: kotlin.String)
        VALUE_PARAMETER value-parameter s: kotlin.String
        BLOCK_BODY
@@ -49,7 +51,7 @@ FILE /memberExtension.kt
            $this: GET_VAR '<receiver: Host>' type=Host origin=null
            $receiver: CONST String type=kotlin.String value='K'
            host: GET_VAR '<receiver: Host>' type=Host origin=null
-            p: CALLABLE_REFERENCE 'plusK: String on String' type=kotlin.reflect.KProperty2<kotlin.String, Host, kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+            p: PROPERTY_REFERENCE 'plusK: String on String' field=null getter='<get-plusK>() on String: String' setter=null type=kotlin.reflect.KProperty2<kotlin.String, Host, kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
      FUN DELEGATED_PROPERTY_ACCESSOR public final fun kotlin.String.<get-plusK>(): kotlin.String
        $this: VALUE_PARAMETER <receiver: Host>
        $receiver: VALUE_PARAMETER <receiver: plusK: String on String>
@@ -59,7 +61,7 @@ FILE /memberExtension.kt
              $this: GET_FIELD '`plusK$delegate`: Host.StringDelegate' type=Host.StringDelegate origin=null
                receiver: GET_VAR '<receiver: Host>' type=Host origin=null
              receiver: GET_VAR '<receiver: plusK: String on String>' type=kotlin.String origin=null
-              p: CALLABLE_REFERENCE 'plusK: String on String' type=kotlin.reflect.KProperty2<kotlin.String, Host, kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+              p: PROPERTY_REFERENCE 'plusK: String on String' field=null getter='<get-plusK>() on String: String' setter=null type=kotlin.reflect.KProperty2<kotlin.String, Host, kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
    PROPERTY public final val ok: kotlin.String
      FIELD PROPERTY_BACKING_FIELD public final val ok: kotlin.String
        EXPRESSION_BODY
@@ -1,5 +1,6 @@
 FILE /topLevel.kt
  CLASS CLASS Delegate
+    $new: VALUE_PARAMETER <receiver: Delegate>
    CONSTRUCTOR public constructor Delegate(value: kotlin.String)
      VALUE_PARAMETER value-parameter value: kotlin.String
      BLOCK_BODY
@@ -27,6 +28,7 @@ FILE /topLevel.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS DelegateProvider
+    $new: VALUE_PARAMETER <receiver: DelegateProvider>
    CONSTRUCTOR public constructor DelegateProvider(value: kotlin.String)
      VALUE_PARAMETER value-parameter value: kotlin.String
      BLOCK_BODY
@@ -61,11 +63,11 @@ FILE /topLevel.kt
          $this: CALL 'constructor DelegateProvider(String)' type=DelegateProvider origin=null
            value: CONST String type=kotlin.String value='OK'
          thisRef: CONST Null type=kotlin.Nothing? value='null'
-          property: CALLABLE_REFERENCE 'testTopLevel: String' type=kotlin.reflect.KProperty0<kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+          property: PROPERTY_REFERENCE 'testTopLevel: String' field=null getter='<get-testTopLevel>(): String' setter=null type=kotlin.reflect.KProperty0<kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
    FUN DELEGATED_PROPERTY_ACCESSOR public fun <get-testTopLevel>(): kotlin.String
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='<get-testTopLevel>(): String'
          CALL 'getValue(Any?, Any?): String' type=kotlin.String origin=null
            $this: GET_FIELD '`testTopLevel$delegate`: Delegate' type=Delegate origin=null
            thisRef: CONST Null type=kotlin.Nothing? value='null'
-            property: CALLABLE_REFERENCE 'testTopLevel: String' type=kotlin.reflect.KProperty0<kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+            property: PROPERTY_REFERENCE 'testTopLevel: String' field=null getter='<get-testTopLevel>(): String' setter=null type=kotlin.reflect.KProperty0<kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
@@ -4,6 +4,7 @@ FILE /typeAlias.kt
    BLOCK_BODY
      TYPEALIAS typealias TestLocal = String type=kotlin.String
  CLASS CLASS C
+    $new: VALUE_PARAMETER <receiver: C>
    CONSTRUCTOR public constructor C()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -1,5 +1,6 @@
 FILE /suppressedNonPublicCall.kt
  CLASS CLASS C
+    $new: VALUE_PARAMETER <receiver: C>
    CONSTRUCTOR public constructor C()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -12,6 +12,7 @@ FILE /arrayAugmentedAssignment1.kt
      RETURN type=kotlin.Nothing from='bar(): Int'
        CONST Int type=kotlin.Int value='42'
  CLASS CLASS C
+    $new: VALUE_PARAMETER <receiver: C>
    CONSTRUCTOR public constructor C(x: kotlin.IntArray)
      VALUE_PARAMETER value-parameter x: kotlin.IntArray
      BLOCK_BODY
@@ -1,5 +1,6 @@
 FILE /assignments.kt
  CLASS CLASS Ref
+    $new: VALUE_PARAMETER <receiver: Ref>
    CONSTRUCTOR public constructor Ref(x: kotlin.Int)
      VALUE_PARAMETER value-parameter x: kotlin.Int
      BLOCK_BODY
@@ -1,5 +1,6 @@
 FILE /augmentedAssignment2.kt
  CLASS CLASS A
+    $new: VALUE_PARAMETER <receiver: A>
    CONSTRUCTOR public constructor A()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -1,5 +1,6 @@
 FILE /augmentedAssignmentWithExpression.kt
  CLASS CLASS Host
+    $new: VALUE_PARAMETER <receiver: Host>
    CONSTRUCTOR public constructor Host()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -12,7 +13,7 @@ FILE /augmentedAssignmentWithExpression.kt
      $this: VALUE_PARAMETER <receiver: Host>
      BLOCK_BODY
        CALL 'plusAssign(Int): Unit' type=kotlin.Unit origin=PLUSEQ
-          $this: GET_VAR '<receiver: Host>' type=Host origin=null
+          $this: GET_VAR '<receiver: 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
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
@@ -25,7 +26,7 @@ FILE /augmentedAssignmentWithExpression.kt
    $receiver: VALUE_PARAMETER <receiver: test2() on Host: Unit>
    BLOCK_BODY
      CALL 'plusAssign(Int): Unit' type=kotlin.Unit origin=PLUSEQ
-        $this: GET_VAR '<receiver: test2() on Host: Unit>' type=Host origin=null
+        $this: GET_VAR '<receiver: test2() on Host: Unit>' type=Host origin=PLUSEQ
        x: CONST Int type=kotlin.Int value='1'
  FUN public fun test3(): kotlin.Unit
    BLOCK_BODY
@@ -21,7 +21,7 @@ FILE /badBreakContinue.kt
                BLOCK_BODY
                  ERROR_EXPR 'Loop not found for break expression: break@L1' type=kotlin.Nothing
                  ERROR_EXPR 'Loop not found for continue expression: continue@L1' type=kotlin.Nothing
-              CALLABLE_REFERENCE '<anonymous>(): Nothing' type=() -> kotlin.Nothing origin=LAMBDA
+              FUNCTION_REFERENCE '<anonymous>(): Nothing' type=() -> kotlin.Nothing origin=LAMBDA
  FUN public fun test4(): kotlin.Unit
    BLOCK_BODY
      WHILE label=null origin=WHILE_LOOP
@@ -1,5 +1,6 @@
 FILE /boundCallableReferences.kt
  CLASS CLASS A
+    $new: VALUE_PARAMETER <receiver: A>
    CONSTRUCTOR public constructor A()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -26,7 +27,7 @@ FILE /boundCallableReferences.kt
  PROPERTY public val test1: kotlin.reflect.KFunction0<kotlin.Unit>
    FIELD PROPERTY_BACKING_FIELD public val test1: kotlin.reflect.KFunction0<kotlin.Unit>
      EXPRESSION_BODY
-        CALLABLE_REFERENCE 'foo(): Unit' type=kotlin.reflect.KFunction0<kotlin.Unit> origin=null
+        FUNCTION_REFERENCE 'foo(): Unit' type=kotlin.reflect.KFunction0<kotlin.Unit> origin=null
          $this: CALL 'constructor A()' type=A origin=null
    FUN DEFAULT_PROPERTY_ACCESSOR public fun <get-test1>(): kotlin.reflect.KFunction0<kotlin.Unit>
      BLOCK_BODY
@@ -35,7 +36,7 @@ FILE /boundCallableReferences.kt
  PROPERTY public val test2: kotlin.reflect.KProperty0<kotlin.Int>
    FIELD PROPERTY_BACKING_FIELD public val test2: kotlin.reflect.KProperty0<kotlin.Int>
      EXPRESSION_BODY
-        CALLABLE_REFERENCE 'bar: Int' type=kotlin.reflect.KProperty0<kotlin.Int> origin=null
+        PROPERTY_REFERENCE 'bar: Int' field=null getter='<get-bar>(): Int' setter=null type=kotlin.reflect.KProperty0<kotlin.Int> origin=null
          $this: CALL 'constructor A()' type=A origin=null
    FUN DEFAULT_PROPERTY_ACCESSOR public fun <get-test2>(): kotlin.reflect.KProperty0<kotlin.Int>
      BLOCK_BODY
@@ -44,7 +45,7 @@ FILE /boundCallableReferences.kt
  PROPERTY public val test3: kotlin.reflect.KFunction0<kotlin.Unit>
    FIELD PROPERTY_BACKING_FIELD public val test3: kotlin.reflect.KFunction0<kotlin.Unit>
      EXPRESSION_BODY
-        CALLABLE_REFERENCE 'qux() on A: Unit' type=kotlin.reflect.KFunction0<kotlin.Unit> origin=null
+        FUNCTION_REFERENCE 'qux() on A: Unit' type=kotlin.reflect.KFunction0<kotlin.Unit> origin=null
          $receiver: CALL 'constructor A()' type=A origin=null
    FUN DEFAULT_PROPERTY_ACCESSOR public fun <get-test3>(): kotlin.reflect.KFunction0<kotlin.Unit>
      BLOCK_BODY
@@ -1,5 +1,6 @@
 FILE /chainOfSafeCalls.kt
  CLASS CLASS C
+    $new: VALUE_PARAMETER <receiver: C>
    CONSTRUCTOR public constructor C()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -1,5 +1,6 @@
 FILE /classReference.kt
  CLASS CLASS A
+    $new: VALUE_PARAMETER <receiver: A>
    CONSTRUCTOR public constructor A()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -8,7 +8,7 @@ FILE /coercionToUnit.kt
              RETURN type=kotlin.Nothing from='<anonymous>(): Unit'
                TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
                  CONST Int type=kotlin.Int value='42'
-          CALLABLE_REFERENCE '<anonymous>(): Unit' type=() -> kotlin.Unit origin=LAMBDA
+          FUNCTION_REFERENCE '<anonymous>(): Unit' type=() -> kotlin.Unit origin=LAMBDA
    FUN DEFAULT_PROPERTY_ACCESSOR public fun <get-test1>(): () -> kotlin.Unit
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='<get-test1>(): () -> Unit'
@@ -1,5 +1,6 @@
 FILE /complexAugmentedAssignment.kt
  CLASS OBJECT X1
+    $new: VALUE_PARAMETER <receiver: X1>
    CONSTRUCTOR private constructor X1()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -22,6 +23,7 @@ FILE /complexAugmentedAssignment.kt
            receiver: GET_VAR '<receiver: X1>' type=X1 origin=null
            value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
    CLASS OBJECT X2
+      $new: VALUE_PARAMETER <receiver: X2>
      CONSTRUCTOR private constructor X2()
        BLOCK_BODY
          DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -44,6 +46,7 @@ FILE /complexAugmentedAssignment.kt
              receiver: GET_VAR '<receiver: X2>' type=X1.X2 origin=null
              value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
      CLASS OBJECT X3
+        $new: VALUE_PARAMETER <receiver: X3>
        CONSTRUCTOR private constructor X3()
          BLOCK_BODY
            DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -143,6 +146,7 @@ FILE /complexAugmentedAssignment.kt
                $this: GET_VAR 'tmp5: Int' type=kotlin.Int origin=null
            GET_VAR 'tmp5: Int' type=kotlin.Int origin=null
  CLASS CLASS B
+    $new: VALUE_PARAMETER <receiver: B>
    CONSTRUCTOR public constructor B(s: kotlin.Int = ...)
      VALUE_PARAMETER value-parameter s: kotlin.Int = ...
        EXPRESSION_BODY
@@ -171,6 +175,7 @@ FILE /complexAugmentedAssignment.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS OBJECT Host
+    $new: VALUE_PARAMETER <receiver: Host>
    CONSTRUCTOR private constructor Host()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -1,5 +1,6 @@
 FILE /contructorCall.kt
  CLASS CLASS A
+    $new: VALUE_PARAMETER <receiver: A>
    CONSTRUCTOR public constructor A()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -1,5 +1,6 @@
 FILE /destructuring1.kt
  CLASS OBJECT A
+    $new: VALUE_PARAMETER <receiver: A>
    CONSTRUCTOR private constructor A()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -8,6 +9,7 @@ FILE /destructuring1.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS OBJECT B
+    $new: VALUE_PARAMETER <receiver: B>
    CONSTRUCTOR private constructor B()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -1,5 +1,6 @@
 FILE /destructuringWithUnderscore.kt
  CLASS OBJECT A
+    $new: VALUE_PARAMETER <receiver: A>
    CONSTRUCTOR private constructor A()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -8,6 +9,7 @@ FILE /destructuringWithUnderscore.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS OBJECT B
+    $new: VALUE_PARAMETER <receiver: B>
    CONSTRUCTOR private constructor B()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -1,5 +1,6 @@
 FILE /enumEntryAsReceiver.kt
  CLASS ENUM_CLASS X
+    $new: VALUE_PARAMETER <receiver: X>
    CONSTRUCTOR private constructor X()
      BLOCK_BODY
        ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
@@ -7,6 +8,7 @@ FILE /enumEntryAsReceiver.kt
    ENUM_ENTRY enum entry B
      init: ENUM_CONSTRUCTOR_CALL 'constructor B()'
      class: CLASS ENUM_ENTRY B
+        $new: VALUE_PARAMETER <receiver: B>
        CONSTRUCTOR private constructor B()
          BLOCK_BODY
            ENUM_CONSTRUCTOR_CALL 'constructor X()'
@@ -16,6 +18,7 @@ FILE /enumEntryAsReceiver.kt
            EXPRESSION_BODY
              CONST String type=kotlin.String value='OK'
          FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-value2>(): kotlin.String
+            $this: VALUE_PARAMETER <receiver: B>
            BLOCK_BODY
              RETURN type=kotlin.Nothing from='<get-value2>(): String'
                GET_FIELD 'value2: String' type=kotlin.String origin=null
@@ -29,18 +32,42 @@ FILE /enumEntryAsReceiver.kt
                    RETURN type=kotlin.Nothing from='<anonymous>(): String'
                      CALL '<get-value2>(): String' type=kotlin.String origin=GET_PROPERTY
                        $this: GET_ENUM 'B' type=X.B
-                CALLABLE_REFERENCE '<anonymous>(): String' type=() -> kotlin.String origin=LAMBDA
+                FUNCTION_REFERENCE '<anonymous>(): String' type=() -> kotlin.String origin=LAMBDA
          FUN DEFAULT_PROPERTY_ACCESSOR public open override fun <get-value>(): () -> kotlin.String
+            $this: VALUE_PARAMETER <receiver: B>
            BLOCK_BODY
              RETURN type=kotlin.Nothing from='<get-value>(): () -> String'
                GET_FIELD 'value: () -> String' type=() -> kotlin.String origin=null
                  receiver: GET_VAR '<receiver: B>' type=X.B origin=null
+        FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
+        FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
+        FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<X!>!
+        FUN FAKE_OVERRIDE public final override fun compareTo(other: X): kotlin.Int
+        FUN FAKE_OVERRIDE public final override fun equals(other: kotlin.Any?): kotlin.Boolean
+        FUN FAKE_OVERRIDE public final override fun hashCode(): kotlin.Int
+        PROPERTY FAKE_OVERRIDE public final override val name: kotlin.String
+          FUN FAKE_OVERRIDE public final override fun <get-name>(): kotlin.String
+        PROPERTY FAKE_OVERRIDE public final override val ordinal: kotlin.Int
+          FUN FAKE_OVERRIDE public final override fun <get-ordinal>(): kotlin.Int
+        FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
    PROPERTY public abstract val value: () -> kotlin.String
      FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <get-value>(): () -> kotlin.String
+        $this: VALUE_PARAMETER <receiver: X>
        BLOCK_BODY
          RETURN type=kotlin.Nothing from='<get-value>(): () -> String'
            GET_FIELD 'value: () -> String' type=() -> kotlin.String origin=null
              receiver: GET_VAR '<receiver: X>' type=X origin=null
+    FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
+    FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
+    FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<X!>!
+    FUN FAKE_OVERRIDE public final override fun compareTo(other: X): kotlin.Int
+    FUN FAKE_OVERRIDE public final override fun equals(other: kotlin.Any?): kotlin.Boolean
+    FUN FAKE_OVERRIDE public final override fun hashCode(): kotlin.Int
+    PROPERTY FAKE_OVERRIDE public final override val name: kotlin.String
+      FUN FAKE_OVERRIDE public final override fun <get-name>(): kotlin.String
+    PROPERTY FAKE_OVERRIDE public final override val ordinal: kotlin.Int
+      FUN FAKE_OVERRIDE public final override fun <get-ordinal>(): kotlin.Int
+    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
    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
@@ -1,5 +1,6 @@
 FILE /forWithImplicitReceivers.kt
  CLASS OBJECT FiveTimes
+    $new: VALUE_PARAMETER <receiver: FiveTimes>
    CONSTRUCTOR private constructor FiveTimes()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -8,6 +9,7 @@ FILE /forWithImplicitReceivers.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS IntCell
+    $new: VALUE_PARAMETER <receiver: IntCell>
    CONSTRUCTOR public constructor IntCell(value: kotlin.Int)
      VALUE_PARAMETER value-parameter value: kotlin.Int
      BLOCK_BODY
@@ -1,5 +1,6 @@
 FILE /Derived.kt
  CLASS CLASS Derived
+    $new: VALUE_PARAMETER <receiver: Derived>
    CONSTRUCTOR public constructor Derived()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Base()'
@@ -22,6 +22,7 @@ FILE /jvmStaticFieldReference.kt
            GET_FIELD 'out: PrintStream!' type=java.io.PrintStream! origin=GET_PROPERTY
          p0: CONST String type=kotlin.String value='testProp/set'
  CLASS CLASS TestClass
+    $new: VALUE_PARAMETER <receiver: TestClass>
    CONSTRUCTOR public constructor TestClass()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -1,5 +1,6 @@
 FILE /kt16904.kt
  CLASS CLASS A
+    $new: VALUE_PARAMETER <receiver: A>
    CONSTRUCTOR public constructor A()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -9,6 +10,7 @@ FILE /kt16904.kt
        EXPRESSION_BODY
          CALL 'constructor B()' type=B origin=null
      FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-x>(): B
+        $this: VALUE_PARAMETER <receiver: A>
        BLOCK_BODY
          RETURN type=kotlin.Nothing from='<get-x>(): B'
            GET_FIELD 'x: B' type=B origin=null
@@ -18,23 +20,36 @@ FILE /kt16904.kt
        EXPRESSION_BODY
          CONST Int type=kotlin.Int value='0'
      FUN DEFAULT_PROPERTY_ACCESSOR public final fun <get-y>(): kotlin.Int
+        $this: VALUE_PARAMETER <receiver: A>
        BLOCK_BODY
          RETURN type=kotlin.Nothing from='<get-y>(): Int'
            GET_FIELD 'y: Int' type=kotlin.Int origin=null
              receiver: GET_VAR '<receiver: A>' type=A origin=null
      FUN DEFAULT_PROPERTY_ACCESSOR public final fun <set-y>(<set-?>: kotlin.Int): kotlin.Unit
+        $this: VALUE_PARAMETER <receiver: A>
+        VALUE_PARAMETER value-parameter <set-?>: kotlin.Int
        BLOCK_BODY
          SET_FIELD 'y: Int' type=kotlin.Unit origin=null
            receiver: GET_VAR '<receiver: 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
+    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS B
+    $new: VALUE_PARAMETER <receiver: B>
    CONSTRUCTOR public constructor B()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
        INSTANCE_INITIALIZER_CALL classDescriptor='B'
    FUN public final operator fun plusAssign(x: kotlin.Int): kotlin.Unit
+      $this: VALUE_PARAMETER <receiver: B>
+      VALUE_PARAMETER value-parameter x: kotlin.Int
      BLOCK_BODY
+    FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS Test1
+    $new: VALUE_PARAMETER <receiver: Test1>
    CONSTRUCTOR public constructor Test1()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor A()'
@@ -55,7 +70,16 @@ FILE /kt16904.kt
              $this: CALL '<get-y>(): Int' type=kotlin.Int origin=PLUSEQ
                $this: GET_VAR 'tmp1_this: Test1' type=Test1 origin=null
              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
+    PROPERTY FAKE_OVERRIDE public final override var y: kotlin.Int
+      FUN FAKE_OVERRIDE public final override fun <get-y>(): kotlin.Int
+      FUN FAKE_OVERRIDE public final override fun <set-y>(<set-?>: kotlin.Int): kotlin.Unit
+    FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS CLASS Test2
+    $new: VALUE_PARAMETER <receiver: Test2>
    CONSTRUCTOR public constructor Test2()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor J()'
@@ -65,3 +89,7 @@ FILE /kt16904.kt
        SET_FIELD 'field: Int' type=kotlin.Unit origin=EQ
          receiver: GET_VAR '<receiver: Test2>' type=Test2 origin=null
          value: CONST Int type=kotlin.Int value='42'
+    PROPERTY FAKE_OVERRIDE public final override var field: kotlin.Int
+    FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
@@ -1,26 +1,45 @@
 FILE /kt16905.kt
  CLASS CLASS Outer
+    $new: VALUE_PARAMETER <receiver: Outer>
    CONSTRUCTOR public constructor Outer()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
        INSTANCE_INITIALIZER_CALL classDescriptor='Outer'
    CLASS CLASS Inner
+      $new: VALUE_PARAMETER <receiver: Inner>
      CONSTRUCTOR public constructor Inner()
+        $outer: VALUE_PARAMETER <receiver: Outer>
        BLOCK_BODY
          DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
          INSTANCE_INITIALIZER_CALL classDescriptor='Inner'
+      FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
    CLASS CLASS InnerDerived0
+      $new: VALUE_PARAMETER <receiver: InnerDerived0>
      CONSTRUCTOR public constructor InnerDerived0()
+        $outer: VALUE_PARAMETER <receiver: Outer>
        BLOCK_BODY
          DELEGATING_CONSTRUCTOR_CALL 'constructor Inner()'
            $this: GET_VAR '<receiver: Outer>' type=Outer origin=null
          INSTANCE_INITIALIZER_CALL classDescriptor='InnerDerived0'
+      FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
    CLASS CLASS InnerDerived1
+      $new: VALUE_PARAMETER <receiver: InnerDerived1>
      CONSTRUCTOR public constructor InnerDerived1()
+        $outer: VALUE_PARAMETER <receiver: Outer>
        BLOCK_BODY
          DELEGATING_CONSTRUCTOR_CALL 'constructor Inner()'
            $this: GET_VAR '<receiver: Outer>' type=Outer origin=null
          INSTANCE_INITIALIZER_CALL classDescriptor='InnerDerived1'
+      FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+      FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+      FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+    FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
+    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  TYPEALIAS typealias OI = Outer.Inner type=Outer.Inner
  FUN public fun test(): Outer.Inner
    BLOCK_BODY
@@ -1,5 +1,6 @@
 FILE /membersImportedFromObject.kt
  CLASS OBJECT A
+    $new: VALUE_PARAMETER <receiver: A>
    CONSTRUCTOR private constructor A()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -1,5 +1,6 @@
 FILE /objectAsCallable.kt
  CLASS OBJECT A
+    $new: VALUE_PARAMETER <receiver: A>
    CONSTRUCTOR private constructor A()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -8,6 +9,7 @@ FILE /objectAsCallable.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS ENUM_CLASS En
+    $new: VALUE_PARAMETER <receiver: En>
    CONSTRUCTOR private constructor En()
      BLOCK_BODY
        ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
@@ -1,5 +1,6 @@
 FILE /objectClassReference.kt
  CLASS OBJECT A
+    $new: VALUE_PARAMETER <receiver: A>
    CONSTRUCTOR private constructor A()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -83,6 +83,7 @@ FILE /primitivesImplicitConversions.kt
            $this: CONST Int type=kotlin.Int value='1'
    BLOCK_BODY
  CLASS CLASS TestImplicitArguments
+    $new: VALUE_PARAMETER <receiver: TestImplicitArguments>
    CONSTRUCTOR public constructor TestImplicitArguments(x: kotlin.Long = ...)
      VALUE_PARAMETER value-parameter x: kotlin.Long = ...
        EXPRESSION_BODY
@@ -1,5 +1,6 @@
 FILE /reflectionLiterals.kt
  CLASS CLASS A
+    $new: VALUE_PARAMETER <receiver: A>
    CONSTRUCTOR public constructor A()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -40,7 +41,7 @@ FILE /reflectionLiterals.kt
  PROPERTY public val test3: kotlin.reflect.KFunction1<A, kotlin.Unit>
    FIELD PROPERTY_BACKING_FIELD public val test3: kotlin.reflect.KFunction1<A, kotlin.Unit>
      EXPRESSION_BODY
-        CALLABLE_REFERENCE 'foo(): Unit' type=kotlin.reflect.KFunction1<A, kotlin.Unit> origin=null
+        FUNCTION_REFERENCE 'foo(): Unit' type=kotlin.reflect.KFunction1<A, kotlin.Unit> origin=null
    FUN DEFAULT_PROPERTY_ACCESSOR public fun <get-test3>(): kotlin.reflect.KFunction1<A, kotlin.Unit>
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='<get-test3>(): KFunction1<A, Unit>'
@@ -48,7 +49,7 @@ FILE /reflectionLiterals.kt
  PROPERTY public val test4: kotlin.reflect.KFunction0<A>
    FIELD PROPERTY_BACKING_FIELD public val test4: kotlin.reflect.KFunction0<A>
      EXPRESSION_BODY
-        CALLABLE_REFERENCE 'constructor A()' type=kotlin.reflect.KFunction0<A> origin=null
+        FUNCTION_REFERENCE 'constructor A()' type=kotlin.reflect.KFunction0<A> origin=null
    FUN DEFAULT_PROPERTY_ACCESSOR public fun <get-test4>(): kotlin.reflect.KFunction0<A>
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='<get-test4>(): KFunction0<A>'
@@ -56,7 +57,7 @@ FILE /reflectionLiterals.kt
  PROPERTY public val test5: kotlin.reflect.KFunction0<kotlin.Unit>
    FIELD PROPERTY_BACKING_FIELD public val test5: kotlin.reflect.KFunction0<kotlin.Unit>
      EXPRESSION_BODY
-        CALLABLE_REFERENCE 'foo(): Unit' type=kotlin.reflect.KFunction0<kotlin.Unit> origin=null
+        FUNCTION_REFERENCE 'foo(): Unit' type=kotlin.reflect.KFunction0<kotlin.Unit> origin=null
          $this: CALL 'constructor A()' type=A origin=null
    FUN DEFAULT_PROPERTY_ACCESSOR public fun <get-test5>(): kotlin.reflect.KFunction0<kotlin.Unit>
      BLOCK_BODY
@@ -65,7 +66,7 @@ FILE /reflectionLiterals.kt
  PROPERTY public val test6: kotlin.reflect.KFunction0<kotlin.Unit>
    FIELD PROPERTY_BACKING_FIELD public val test6: kotlin.reflect.KFunction0<kotlin.Unit>
      EXPRESSION_BODY
-        CALLABLE_REFERENCE 'bar(): Unit' type=kotlin.reflect.KFunction0<kotlin.Unit> origin=null
+        FUNCTION_REFERENCE 'bar(): Unit' type=kotlin.reflect.KFunction0<kotlin.Unit> origin=null
    FUN DEFAULT_PROPERTY_ACCESSOR public fun <get-test6>(): kotlin.reflect.KFunction0<kotlin.Unit>
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='<get-test6>(): KFunction0<Unit>'
@@ -73,7 +74,7 @@ FILE /reflectionLiterals.kt
  PROPERTY public val test7: kotlin.reflect.KProperty0<kotlin.Int>
    FIELD PROPERTY_BACKING_FIELD public val test7: kotlin.reflect.KProperty0<kotlin.Int>
      EXPRESSION_BODY
-        CALLABLE_REFERENCE 'qux: Int' type=kotlin.reflect.KProperty0<kotlin.Int> origin=null
+        PROPERTY_REFERENCE 'qux: Int' field=null getter='<get-qux>(): Int' setter=null type=kotlin.reflect.KProperty0<kotlin.Int> origin=null
    FUN DEFAULT_PROPERTY_ACCESSOR public fun <get-test7>(): kotlin.reflect.KProperty0<kotlin.Int>
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='<get-test7>(): KProperty0<Int>'
@@ -1,5 +1,6 @@
 FILE /safeAssignment.kt
  CLASS CLASS C
+    $new: VALUE_PARAMETER <receiver: C>
    CONSTRUCTOR public constructor C(x: kotlin.Int)
      VALUE_PARAMETER value-parameter x: kotlin.Int
      BLOCK_BODY
@@ -1,5 +1,6 @@
 FILE /safeCallWithIncrementDecrement.kt
  CLASS CLASS C
+    $new: VALUE_PARAMETER <receiver: C>
    CONSTRUCTOR public constructor C()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -1,5 +1,6 @@
 FILE /safeCalls.kt
  CLASS CLASS Ref
+    $new: VALUE_PARAMETER <receiver: Ref>
    CONSTRUCTOR public constructor Ref(value: kotlin.Int)
      VALUE_PARAMETER value-parameter value: kotlin.Int
      BLOCK_BODY
@@ -1,5 +1,6 @@
 FILE /Derived.kt
  CLASS CLASS Derived
+    $new: VALUE_PARAMETER <receiver: Derived>
    CONSTRUCTOR public constructor Derived()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Base()'
@@ -5,6 +5,7 @@ FILE /tryCatch.kt
        try: BLOCK type=kotlin.Unit origin=null
          CALL 'println(): Unit' type=kotlin.Unit origin=null
        CATCH parameter=e: Throwable
+          VAR CATCH_PARAMETER val e: kotlin.Throwable
          BLOCK type=kotlin.Unit origin=null
            CALL 'println(): Unit' type=kotlin.Unit origin=null
        finally: BLOCK type=kotlin.Unit origin=null
@@ -17,6 +18,7 @@ FILE /tryCatch.kt
            CALL 'println(): Unit' type=kotlin.Unit origin=null
            CONST Int type=kotlin.Int value='42'
          CATCH parameter=e: Throwable
+            VAR CATCH_PARAMETER val e: kotlin.Throwable
            BLOCK type=kotlin.Int origin=null
              CALL 'println(): Unit' type=kotlin.Unit origin=null
              CONST Int type=kotlin.Int value='24'
@@ -14,5 +14,6 @@ FILE /tryCatchWithImplicitCast.kt
            TYPE_OP type=kotlin.String origin=IMPLICIT_CAST typeOperand=kotlin.String
              GET_VAR 'value-parameter a: Any' type=kotlin.Any origin=null
          CATCH parameter=e: Throwable
+            VAR CATCH_PARAMETER val e: kotlin.Throwable
            BLOCK type=kotlin.String origin=null
              CONST String type=kotlin.String value=''
@@ -1,5 +1,6 @@
 FILE /values.kt
  CLASS ENUM_CLASS Enum
+    $new: VALUE_PARAMETER <receiver: Enum>
    CONSTRUCTOR private constructor Enum()
      BLOCK_BODY
        ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
@@ -22,6 +23,7 @@ FILE /values.kt
    FUN ENUM_CLASS_SPECIAL_MEMBER public final fun valueOf(value: kotlin.String): Enum
      SYNTHETIC_BODY kind=ENUM_VALUEOF
  CLASS OBJECT A
+    $new: VALUE_PARAMETER <receiver: A>
    CONSTRUCTOR private constructor A()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -38,11 +40,13 @@ FILE /values.kt
        RETURN type=kotlin.Nothing from='<get-a>(): Int'
          GET_FIELD 'a: Int' type=kotlin.Int origin=null
  CLASS CLASS Z
+    $new: VALUE_PARAMETER <receiver: Z>
    CONSTRUCTOR public constructor Z()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
        INSTANCE_INITIALIZER_CALL classDescriptor='Z'
    CLASS OBJECT companion object of Z
+      $new: VALUE_PARAMETER <receiver: companion object of Z>
      CONSTRUCTOR private constructor Companion()
        BLOCK_BODY
          DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -8,7 +8,7 @@ FILE /variableAsFunctionCall.kt
            BLOCK_BODY
              RETURN type=kotlin.Nothing from='<anonymous>(): String'
                GET_VAR '<receiver: k() on String: () -> String>' type=kotlin.String origin=null
-          CALLABLE_REFERENCE '<anonymous>(): String' type=() -> kotlin.String origin=LAMBDA
+          FUNCTION_REFERENCE '<anonymous>(): String' type=() -> kotlin.String origin=LAMBDA
  FUN public fun test1(f: () -> kotlin.Unit): kotlin.Unit
    VALUE_PARAMETER value-parameter f: () -> kotlin.Unit
    BLOCK_BODY
@@ -1,5 +1,6 @@
 FILE /when.kt
  CLASS OBJECT A
+    $new: VALUE_PARAMETER <receiver: A>
    CONSTRUCTOR private constructor A()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -6,7 +6,7 @@ FILE /anonymousFunction.kt
          FUN local final fun <no name provided>(): kotlin.Unit
            BLOCK_BODY
              CALL 'println(): Unit' type=kotlin.Unit origin=null
-          CALLABLE_REFERENCE '<no name provided>(): Unit' type=() -> kotlin.Unit origin=ANONYMOUS_FUNCTION
+          FUNCTION_REFERENCE '<no name provided>(): Unit' type=() -> kotlin.Unit origin=ANONYMOUS_FUNCTION
    FUN DEFAULT_PROPERTY_ACCESSOR public fun <get-anonymous>(): () -> kotlin.Unit
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='<get-anonymous>(): () -> Unit'
@@ -1,5 +1,6 @@
 FILE /destructuringInLambda.kt
  CLASS CLASS A
+    $new: VALUE_PARAMETER <receiver: A>
    CONSTRUCTOR public constructor A(x: kotlin.Int, y: kotlin.Int)
      VALUE_PARAMETER value-parameter x: kotlin.Int
      VALUE_PARAMETER value-parameter y: kotlin.Int
@@ -142,7 +143,7 @@ FILE /destructuringInLambda.kt
                CALL 'plus(Int): Int' type=kotlin.Int origin=PLUS
                  $this: CONST Int type=kotlin.Int value='42'
                  other: GET_VAR 'y: Int' type=kotlin.Int origin=null
-          CALLABLE_REFERENCE '<anonymous>(A): Int' type=(A) -> kotlin.Int origin=LAMBDA
+          FUNCTION_REFERENCE '<anonymous>(A): Int' type=(A) -> kotlin.Int origin=LAMBDA
    FUN DEFAULT_PROPERTY_ACCESSOR public fun <get-fn>(): (A) -> kotlin.Int
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='<get-fn>(): (A) -> Int'
@@ -13,4 +13,4 @@ FILE /extensionLambda.kt
                RETURN type=kotlin.Nothing from='<anonymous>() on String: Int'
                  CALL '<get-length>(): Int' type=kotlin.Int origin=GET_PROPERTY
                    $this: GET_VAR '<receiver: <anonymous>() on String: Int>' type=kotlin.String origin=null
-            CALLABLE_REFERENCE '<anonymous>() on String: Int' type=kotlin.String.() -> kotlin.Int origin=LAMBDA
+            FUNCTION_REFERENCE '<anonymous>() on String: Int' type=kotlin.String.() -> kotlin.Int origin=LAMBDA
@@ -7,7 +7,7 @@ FILE /justLambda.kt
            BLOCK_BODY
              RETURN type=kotlin.Nothing from='<anonymous>(): Int'
                CONST Int type=kotlin.Int value='42'
-          CALLABLE_REFERENCE '<anonymous>(): Int' type=() -> kotlin.Int origin=LAMBDA
+          FUNCTION_REFERENCE '<anonymous>(): Int' type=() -> kotlin.Int origin=LAMBDA
    FUN DEFAULT_PROPERTY_ACCESSOR public fun <get-test1>(): () -> kotlin.Int
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='<get-test1>(): () -> Int'
@@ -20,7 +20,7 @@ FILE /justLambda.kt
            BLOCK_BODY
              RETURN type=kotlin.Nothing from='<anonymous>(): Unit'
                GET_OBJECT 'Unit' type=kotlin.Unit
-          CALLABLE_REFERENCE '<anonymous>(): Unit' type=() -> kotlin.Unit origin=LAMBDA
+          FUNCTION_REFERENCE '<anonymous>(): Unit' type=() -> kotlin.Unit origin=LAMBDA
    FUN DEFAULT_PROPERTY_ACCESSOR public fun <get-test2>(): () -> kotlin.Unit
      BLOCK_BODY
        RETURN type=kotlin.Nothing from='<get-test2>(): () -> Unit'
@@ -1,5 +1,6 @@
 FILE /multipleImplicitReceivers.kt
  CLASS OBJECT A
+    $new: VALUE_PARAMETER <receiver: A>
    CONSTRUCTOR private constructor A()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -8,6 +9,7 @@ FILE /multipleImplicitReceivers.kt
    FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
  CLASS OBJECT B
+    $new: VALUE_PARAMETER <receiver: B>
    CONSTRUCTOR private constructor B()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -73,6 +75,6 @@ FILE /multipleImplicitReceivers.kt
                                        $receiver: CALL '<get-foo>() on A: B' type=B origin=GET_PROPERTY
                                          $this: GET_VAR '<receiver: <anonymous>() on IFoo: Int>' type=IFoo origin=null
                                          $receiver: GET_VAR '<receiver: <anonymous>() on A: Int>' type=A origin=null
-                                CALLABLE_REFERENCE '<anonymous>() on IInvoke: Int' type=IInvoke.() -> kotlin.Int origin=LAMBDA
-                      CALLABLE_REFERENCE '<anonymous>() on IFoo: Int' type=IFoo.() -> kotlin.Int origin=LAMBDA
-            CALLABLE_REFERENCE '<anonymous>() on A: Int' type=A.() -> kotlin.Int origin=LAMBDA
+                                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
@@ -8,7 +8,7 @@ FILE /nonLocalReturn.kt
            BLOCK_BODY
              RETURN type=kotlin.Nothing from='test0(): Unit'
                GET_OBJECT 'Unit' type=kotlin.Unit
-          CALLABLE_REFERENCE '<anonymous>(): Nothing' type=() -> kotlin.Nothing origin=LAMBDA
+          FUNCTION_REFERENCE '<anonymous>(): Nothing' type=() -> kotlin.Nothing origin=LAMBDA
  FUN public fun test1(): kotlin.Unit
    BLOCK_BODY
      CALL 'run(() -> Unit): Unit' type=kotlin.Unit origin=null
@@ -18,7 +18,7 @@ FILE /nonLocalReturn.kt
            BLOCK_BODY
              RETURN type=kotlin.Nothing from='<anonymous>(): Unit'
                GET_OBJECT 'Unit' type=kotlin.Unit
-          CALLABLE_REFERENCE '<anonymous>(): Unit' type=() -> kotlin.Unit origin=LAMBDA
+          FUNCTION_REFERENCE '<anonymous>(): Unit' type=() -> kotlin.Unit origin=LAMBDA
  FUN public fun test2(): kotlin.Unit
    BLOCK_BODY
      CALL 'run(() -> Unit): Unit' type=kotlin.Unit origin=null
@@ -28,7 +28,7 @@ FILE /nonLocalReturn.kt
            BLOCK_BODY
              RETURN type=kotlin.Nothing from='<anonymous>(): Unit'
                GET_OBJECT 'Unit' type=kotlin.Unit
-          CALLABLE_REFERENCE '<anonymous>(): Unit' type=() -> kotlin.Unit origin=LAMBDA
+          FUNCTION_REFERENCE '<anonymous>(): Unit' type=() -> kotlin.Unit origin=LAMBDA
  FUN public fun testLrmFoo1(ints: kotlin.collections.List<kotlin.Int>): kotlin.Unit
    VALUE_PARAMETER value-parameter ints: kotlin.collections.List<kotlin.Int>
    BLOCK_BODY
@@ -49,7 +49,7 @@ FILE /nonLocalReturn.kt
              RETURN type=kotlin.Nothing from='<anonymous>(Int): Unit'
                CALL 'print(Int): Unit' type=kotlin.Unit origin=null
                  message: GET_VAR 'value-parameter it: Int' type=kotlin.Int origin=null
-          CALLABLE_REFERENCE '<anonymous>(Int): Unit' type=(kotlin.Int) -> kotlin.Unit origin=LAMBDA
+          FUNCTION_REFERENCE '<anonymous>(Int): Unit' type=(kotlin.Int) -> kotlin.Unit origin=LAMBDA
  FUN public fun testLrmFoo2(ints: kotlin.collections.List<kotlin.Int>): kotlin.Unit
    VALUE_PARAMETER value-parameter ints: kotlin.collections.List<kotlin.Int>
    BLOCK_BODY
@@ -70,4 +70,4 @@ FILE /nonLocalReturn.kt
              RETURN type=kotlin.Nothing from='<anonymous>(Int): Unit'
                CALL 'print(Int): Unit' type=kotlin.Unit origin=null
                  message: GET_VAR 'value-parameter it: Int' type=kotlin.Int origin=null
-          CALLABLE_REFERENCE '<anonymous>(Int): Unit' type=(kotlin.Int) -> kotlin.Unit origin=LAMBDA
+          FUNCTION_REFERENCE '<anonymous>(Int): Unit' type=(kotlin.Int) -> kotlin.Unit origin=LAMBDA
@@ -9,6 +9,6 @@ FILE /samAdapter.kt
                RETURN type=kotlin.Nothing from='<anonymous>(): Unit'
                  CALL 'println(Any?): Unit' type=kotlin.Unit origin=null
                    message: CONST String type=kotlin.String value='Hello, world!'
-            CALLABLE_REFERENCE '<anonymous>(): Unit' type=() -> kotlin.Unit origin=LAMBDA
+            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
@@ -10,6 +10,7 @@ FILE /integerCoercionToT.kt
      RETURN type=kotlin.Nothing from='reinterpret() on CPointed: T'
        CALL 'TODO(): Nothing' type=kotlin.Nothing origin=null
  CLASS CLASS CInt32VarX
+    $new: VALUE_PARAMETER <receiver: CInt32VarX>
    TYPE_PARAMETER <T>
    CONSTRUCTOR public constructor CInt32VarX<T>()
      TYPE_PARAMETER <T>
@@ -31,6 +32,7 @@ FILE /integerCoercionToT.kt
      VALUE_PARAMETER value-parameter value: T_INT
      BLOCK_BODY
  CLASS CLASS IdType
+    $new: VALUE_PARAMETER <receiver: IdType>
    CONSTRUCTOR public constructor IdType(value: kotlin.Int)
      VALUE_PARAMETER value-parameter value: kotlin.Int
      BLOCK_BODY
@@ -1,5 +1,6 @@
 FILE /companion.kt
  CLASS CLASS Z
+    $new: VALUE_PARAMETER <receiver: Z>
    CONSTRUCTOR public constructor Z()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -10,6 +11,7 @@ FILE /companion.kt
        CALL 'test(): Unit' type=kotlin.Unit origin=null
          $this: GET_OBJECT 'companion object of Z' type=Z.Companion
    CLASS OBJECT companion object of Z
+      $new: VALUE_PARAMETER <receiver: companion object of Z>
      CONSTRUCTOR private constructor Companion()
        BLOCK_BODY
          DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -1,5 +1,6 @@
 FILE /enumEntry.kt
  CLASS ENUM_CLASS Z
+    $new: VALUE_PARAMETER <receiver: Z>
    CONSTRUCTOR private constructor Z()
      BLOCK_BODY
        ENUM_CONSTRUCTOR_CALL 'constructor Enum(String, Int)'
@@ -7,6 +8,7 @@ FILE /enumEntry.kt
    ENUM_ENTRY enum entry ENTRY
      init: ENUM_CONSTRUCTOR_CALL 'constructor ENTRY()'
      class: CLASS ENUM_ENTRY ENTRY
+        $new: VALUE_PARAMETER <receiver: ENTRY>
        CONSTRUCTOR private constructor ENTRY()
          BLOCK_BODY
            ENUM_CONSTRUCTOR_CALL 'constructor Z()'
@@ -15,6 +17,7 @@ FILE /enumEntry.kt
          $this: VALUE_PARAMETER <receiver: ENTRY>
          BLOCK_BODY
        CLASS CLASS A
+          $new: VALUE_PARAMETER <receiver: A>
          CONSTRUCTOR public constructor A()
            BLOCK_BODY
              DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -24,6 +27,31 @@ FILE /enumEntry.kt
            BLOCK_BODY
              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
+          FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
+          FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+        FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
+        FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
+        FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<Z!>!
+        FUN FAKE_OVERRIDE public final override fun compareTo(other: Z): kotlin.Int
+        FUN FAKE_OVERRIDE public final override fun equals(other: kotlin.Any?): kotlin.Boolean
+        FUN FAKE_OVERRIDE public final override fun hashCode(): kotlin.Int
+        PROPERTY FAKE_OVERRIDE public final override val name: kotlin.String
+          FUN FAKE_OVERRIDE public final override fun <get-name>(): kotlin.String
+        PROPERTY FAKE_OVERRIDE public final override val ordinal: kotlin.Int
+          FUN FAKE_OVERRIDE public final override fun <get-ordinal>(): kotlin.Int
+        FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
+    FUN FAKE_OVERRIDE protected final override fun clone(): kotlin.Any
+    FUN FAKE_OVERRIDE protected/*protected and package*/ final override fun finalize(): kotlin.Unit
+    FUN FAKE_OVERRIDE public final override fun getDeclaringClass(): java.lang.Class<Z!>!
+    FUN FAKE_OVERRIDE public final override fun compareTo(other: Z): kotlin.Int
+    FUN FAKE_OVERRIDE public final override fun equals(other: kotlin.Any?): kotlin.Boolean
+    FUN FAKE_OVERRIDE public final override fun hashCode(): kotlin.Int
+    PROPERTY FAKE_OVERRIDE public final override val name: kotlin.String
+      FUN FAKE_OVERRIDE public final override fun <get-name>(): kotlin.String
+    PROPERTY FAKE_OVERRIDE public final override val ordinal: kotlin.Int
+      FUN FAKE_OVERRIDE public final override fun <get-ordinal>(): kotlin.Int
+    FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
    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
@@ -1,5 +1,6 @@
 FILE /object.kt
  CLASS OBJECT Z
+    $new: VALUE_PARAMETER <receiver: Z>
    CONSTRUCTOR private constructor Z()
      BLOCK_BODY
        DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -8,6 +9,7 @@ FILE /object.kt
      $this: VALUE_PARAMETER <receiver: Z>
      BLOCK_BODY
    CLASS CLASS A
+      $new: VALUE_PARAMETER <receiver: A>
      CONSTRUCTOR public constructor A()
        BLOCK_BODY
          DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'