diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt index 8c2155e48e8..c48f02aca2c 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt @@ -135,16 +135,16 @@ class RenderIrElementVisitor : IrElementVisitor { "SET_VAR '${expression.descriptor.ref()}' type=${expression.type.render()} origin=${expression.origin}" override fun visitGetField(expression: IrGetField, data: Nothing?): String = - "GET_BACKING_FIELD '${expression.descriptor.ref()}' type=${expression.type.render()} origin=${expression.origin}" + "GET_FIELD '${expression.descriptor.ref()}' type=${expression.type.render()} origin=${expression.origin}" override fun visitSetField(expression: IrSetField, data: Nothing?): String = - "SET_BACKING_FIELD '${expression.descriptor.ref()}' type=${expression.type.render()} origin=${expression.origin}" + "SET_FIELD '${expression.descriptor.ref()}' type=${expression.type.render()} origin=${expression.origin}" override fun visitGetObjectValue(expression: IrGetObjectValue, data: Nothing?): String = "GET_OBJECT '${expression.descriptor.ref()}' type=${expression.type.render()}" override fun visitGetEnumValue(expression: IrGetEnumValue, data: Nothing?): String = - "GET_ENUM_VALUE '${expression.descriptor.ref()}' type=${expression.type.render()}" + "GET_ENUM '${expression.descriptor.ref()}' type=${expression.type.render()}" override fun visitStringConcatenation(expression: IrStringConcatenation, data: Nothing?): String = "STRING_CONCATENATION type=${expression.type.render()}" diff --git a/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.txt b/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.txt index 25428af7933..beb7b1ef81e 100644 --- a/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.txt +++ b/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.txt @@ -11,7 +11,7 @@ FILE /argumentReorderingInDelegatingConstructorCall.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x: Int' type=kotlin.Int origin=null + GET_FIELD 'x: Int' type=kotlin.Int origin=null receiver: THIS of 'Base' type=Base PROPERTY public final val y: kotlin.Int FIELD PROPERTY_BACKING_FIELD public final val y: kotlin.Int @@ -20,7 +20,7 @@ FILE /argumentReorderingInDelegatingConstructorCall.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'y: Int' type=kotlin.Int origin=null + GET_FIELD 'y: Int' type=kotlin.Int origin=null receiver: THIS of 'Base' type=Base CLASS CLASS Test1 CONSTRUCTOR public constructor Test1(xx: kotlin.Int, yy: kotlin.Int) diff --git a/compiler/testData/ir/irText/classes/classMembers.txt b/compiler/testData/ir/irText/classes/classMembers.txt index fc95a9e62e3..354dfef75bd 100644 --- a/compiler/testData/ir/irText/classes/classMembers.txt +++ b/compiler/testData/ir/irText/classes/classMembers.txt @@ -13,7 +13,7 @@ FILE /classMembers.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'y: Int' type=kotlin.Int origin=null + GET_FIELD 'y: Int' type=kotlin.Int origin=null receiver: THIS of 'C' type=C PROPERTY public final var z: kotlin.Int FIELD PROPERTY_BACKING_FIELD public final var z: kotlin.Int @@ -22,11 +22,11 @@ FILE /classMembers.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'z: Int' type=kotlin.Int origin=null + GET_FIELD 'z: Int' type=kotlin.Int origin=null receiver: THIS of 'C' type=C FUN DEFAULT_PROPERTY_ACCESSOR public final fun (: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'z: Int' type=kotlin.Unit origin=null + SET_FIELD 'z: Int' type=kotlin.Unit origin=null receiver: THIS of 'C' type=C value: GET_VAR 'value-parameter : Int' type=kotlin.Int origin=null CONSTRUCTOR public constructor C() @@ -42,7 +42,7 @@ FILE /classMembers.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'property: Int' type=kotlin.Int origin=null + GET_FIELD 'property: Int' type=kotlin.Int origin=null receiver: THIS of 'C' type=C PROPERTY public final val propertyWithGet: kotlin.Int FUN public final fun (): kotlin.Int diff --git a/compiler/testData/ir/irText/classes/dataClasses.txt b/compiler/testData/ir/irText/classes/dataClasses.txt index e1ec1dc0ed7..040e380c4dd 100644 --- a/compiler/testData/ir/irText/classes/dataClasses.txt +++ b/compiler/testData/ir/irText/classes/dataClasses.txt @@ -11,7 +11,7 @@ FILE /dataClasses.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x: Int' type=kotlin.Int origin=null + GET_FIELD 'x: Int' type=kotlin.Int origin=null receiver: THIS of 'Test1' type=Test1 PROPERTY public final val y: kotlin.String FIELD PROPERTY_BACKING_FIELD public final val y: kotlin.String @@ -20,7 +20,7 @@ FILE /dataClasses.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.String BLOCK_BODY RETURN type=kotlin.Nothing from='(): String' - GET_BACKING_FIELD 'y: String' type=kotlin.String origin=null + GET_FIELD 'y: String' type=kotlin.String origin=null receiver: THIS of 'Test1' type=Test1 PROPERTY public final val z: kotlin.Any FIELD PROPERTY_BACKING_FIELD public final val z: kotlin.Any @@ -29,7 +29,7 @@ FILE /dataClasses.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Any BLOCK_BODY RETURN type=kotlin.Nothing from='(): Any' - GET_BACKING_FIELD 'z: Any' type=kotlin.Any origin=null + GET_FIELD 'z: Any' type=kotlin.Any origin=null receiver: THIS of 'Test1' type=Test1 FUN GENERATED_DATA_CLASS_MEMBER public final operator fun component1(): kotlin.Int BLOCK_BODY diff --git a/compiler/testData/ir/irText/classes/delegatedImplementation.txt b/compiler/testData/ir/irText/classes/delegatedImplementation.txt index 2cb5973e27f..f52ebc6b71f 100644 --- a/compiler/testData/ir/irText/classes/delegatedImplementation.txt +++ b/compiler/testData/ir/irText/classes/delegatedImplementation.txt @@ -37,7 +37,7 @@ FILE /delegatedImplementation.kt FUN DEFAULT_PROPERTY_ACCESSOR public open override fun (): kotlin.String BLOCK_BODY RETURN type=kotlin.Nothing from='(): String' - GET_BACKING_FIELD 'x: String' type=kotlin.String origin=null + GET_FIELD 'x: String' type=kotlin.String origin=null receiver: THIS of '' type=otherImpl. PROPERTY public open override var y: kotlin.Int FIELD PROPERTY_BACKING_FIELD public open override var y: kotlin.Int @@ -46,11 +46,11 @@ FILE /delegatedImplementation.kt FUN DEFAULT_PROPERTY_ACCESSOR public open override fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'y: Int' type=kotlin.Int origin=null + GET_FIELD 'y: Int' type=kotlin.Int origin=null receiver: THIS of '' type=otherImpl. FUN DEFAULT_PROPERTY_ACCESSOR public open override fun (: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'y: Int' type=kotlin.Unit origin=null + SET_FIELD 'y: Int' type=kotlin.Unit origin=null receiver: THIS of '' type=otherImpl. value: GET_VAR 'value-parameter : Int' type=kotlin.Int origin=null PROPERTY public open override val kotlin.Byte.z1: kotlin.Int diff --git a/compiler/testData/ir/irText/classes/enum.txt b/compiler/testData/ir/irText/classes/enum.txt index f1af420a54c..10477010513 100644 --- a/compiler/testData/ir/irText/classes/enum.txt +++ b/compiler/testData/ir/irText/classes/enum.txt @@ -24,7 +24,7 @@ FILE /enum.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x: Int' type=kotlin.Int origin=null + GET_FIELD 'x: Int' type=kotlin.Int origin=null receiver: THIS of 'TestEnum2' type=TestEnum2 ENUM_ENTRY enum entry TEST1 init: ENUM_CONSTRUCTOR_CALL 'constructor TestEnum2(Int)' TEST1 @@ -72,7 +72,7 @@ FILE /enum.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x: Int' type=kotlin.Int origin=null + GET_FIELD 'x: Int' type=kotlin.Int origin=null receiver: THIS of 'TestEnum4' type=TestEnum4 ENUM_ENTRY enum entry TEST1 init: ENUM_CONSTRUCTOR_CALL 'constructor TEST1()' TEST1 @@ -85,7 +85,7 @@ FILE /enum.kt FUN public open override fun foo(): kotlin.Unit BLOCK_BODY CALL 'println(Any?): Unit' type=kotlin.Unit origin=null - message: GET_ENUM_VALUE 'TEST1' type=TestEnum4 + message: GET_ENUM 'TEST1' type=TestEnum4 ENUM_ENTRY enum entry TEST2 init: ENUM_CONSTRUCTOR_CALL 'constructor TEST2()' TEST2 class: CLASS ENUM_ENTRY TEST2 @@ -99,18 +99,18 @@ FILE /enum.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'z: Int' type=kotlin.Int origin=null + GET_FIELD 'z: Int' type=kotlin.Int origin=null receiver: THIS of 'TEST2' type=TestEnum4.TEST2 ANONYMOUS_INITIALIZER TEST2 BLOCK_BODY - SET_BACKING_FIELD 'z: Int' type=kotlin.Unit origin=null + SET_FIELD 'z: Int' type=kotlin.Unit origin=null receiver: THIS of 'TEST2' type=TestEnum4.TEST2 value: CALL '(): Int' type=kotlin.Int origin=GET_PROPERTY $this: THIS of 'TEST2' type=TestEnum4.TEST2 FUN public open override fun foo(): kotlin.Unit BLOCK_BODY CALL 'println(Any?): Unit' type=kotlin.Unit origin=null - message: GET_ENUM_VALUE 'TEST2' type=TestEnum4 + message: GET_ENUM 'TEST2' type=TestEnum4 FUN public abstract fun foo(): kotlin.Unit FUN ENUM_CLASS_SPECIAL_MEMBER public final fun values(): kotlin.Array SYNTHETIC_BODY kind=ENUM_VALUES diff --git a/compiler/testData/ir/irText/classes/initBlock.txt b/compiler/testData/ir/irText/classes/initBlock.txt index 762e6422330..412755aa3c3 100644 --- a/compiler/testData/ir/irText/classes/initBlock.txt +++ b/compiler/testData/ir/irText/classes/initBlock.txt @@ -19,7 +19,7 @@ FILE /initBlock.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x: Int' type=kotlin.Int origin=null + GET_FIELD 'x: Int' type=kotlin.Int origin=null receiver: THIS of 'Test2' type=Test2 ANONYMOUS_INITIALIZER Test2 BLOCK_BODY diff --git a/compiler/testData/ir/irText/classes/initVal.txt b/compiler/testData/ir/irText/classes/initVal.txt index 896c92b087b..3af535cefab 100644 --- a/compiler/testData/ir/irText/classes/initVal.txt +++ b/compiler/testData/ir/irText/classes/initVal.txt @@ -11,7 +11,7 @@ FILE /initVal.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x: Int' type=kotlin.Int origin=null + GET_FIELD 'x: Int' type=kotlin.Int origin=null receiver: THIS of 'TestInitValFromParameter' type=TestInitValFromParameter CLASS CLASS TestInitValInClass CONSTRUCTOR public constructor TestInitValInClass() @@ -25,7 +25,7 @@ FILE /initVal.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x: Int' type=kotlin.Int origin=null + GET_FIELD 'x: Int' type=kotlin.Int origin=null receiver: THIS of 'TestInitValInClass' type=TestInitValInClass CLASS CLASS TestInitValInInitBlock CONSTRUCTOR public constructor TestInitValInInitBlock() @@ -37,10 +37,10 @@ FILE /initVal.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x: Int' type=kotlin.Int origin=null + GET_FIELD 'x: Int' type=kotlin.Int origin=null receiver: THIS of 'TestInitValInInitBlock' type=TestInitValInInitBlock ANONYMOUS_INITIALIZER TestInitValInInitBlock BLOCK_BODY - SET_BACKING_FIELD 'x: Int' type=kotlin.Unit origin=null + SET_FIELD 'x: Int' type=kotlin.Unit origin=null receiver: THIS of 'TestInitValInInitBlock' type=TestInitValInInitBlock value: CONST Int type=kotlin.Int value='0' diff --git a/compiler/testData/ir/irText/classes/initVar.txt b/compiler/testData/ir/irText/classes/initVar.txt index 4b7b2bb442b..d065712041d 100644 --- a/compiler/testData/ir/irText/classes/initVar.txt +++ b/compiler/testData/ir/irText/classes/initVar.txt @@ -11,11 +11,11 @@ FILE /initVar.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x: Int' type=kotlin.Int origin=null + GET_FIELD 'x: Int' type=kotlin.Int origin=null receiver: THIS of 'TestInitVarFromParameter' type=TestInitVarFromParameter FUN DEFAULT_PROPERTY_ACCESSOR public final fun (: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'x: Int' type=kotlin.Unit origin=null + SET_FIELD 'x: Int' type=kotlin.Unit origin=null receiver: THIS of 'TestInitVarFromParameter' type=TestInitVarFromParameter value: GET_VAR 'value-parameter : Int' type=kotlin.Int origin=null CLASS CLASS TestInitVarInClass @@ -30,11 +30,11 @@ FILE /initVar.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x: Int' type=kotlin.Int origin=null + GET_FIELD 'x: Int' type=kotlin.Int origin=null receiver: THIS of 'TestInitVarInClass' type=TestInitVarInClass FUN DEFAULT_PROPERTY_ACCESSOR public final fun (: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'x: Int' type=kotlin.Unit origin=null + SET_FIELD 'x: Int' type=kotlin.Unit origin=null receiver: THIS of 'TestInitVarInClass' type=TestInitVarInClass value: GET_VAR 'value-parameter : Int' type=kotlin.Int origin=null CLASS CLASS TestInitVarInInitBlock @@ -47,11 +47,11 @@ FILE /initVar.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x: Int' type=kotlin.Int origin=null + GET_FIELD 'x: Int' type=kotlin.Int origin=null receiver: THIS of 'TestInitVarInInitBlock' type=TestInitVarInInitBlock FUN DEFAULT_PROPERTY_ACCESSOR public final fun (: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'x: Int' type=kotlin.Unit origin=null + SET_FIELD 'x: Int' type=kotlin.Unit origin=null receiver: THIS of 'TestInitVarInInitBlock' type=TestInitVarInInitBlock value: GET_VAR 'value-parameter : Int' type=kotlin.Int origin=null ANONYMOUS_INITIALIZER TestInitVarInInitBlock @@ -71,11 +71,11 @@ FILE /initVar.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x: Int' type=kotlin.Int origin=null + GET_FIELD 'x: Int' type=kotlin.Int origin=null receiver: THIS of 'TestInitVarWithCustomSetter' type=TestInitVarWithCustomSetter FUN public final fun (value: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'x: Int' type=kotlin.Unit origin=EQ + SET_FIELD 'x: Int' type=kotlin.Unit origin=EQ value: GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=null CLASS CLASS TestInitVarWithCustomSetterWithExplicitCtor PROPERTY public final var x: kotlin.Int @@ -83,11 +83,11 @@ FILE /initVar.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x: Int' type=kotlin.Int origin=null + GET_FIELD 'x: Int' type=kotlin.Int origin=null receiver: THIS of 'TestInitVarWithCustomSetterWithExplicitCtor' type=TestInitVarWithCustomSetterWithExplicitCtor FUN public final fun (value: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'x: Int' type=kotlin.Unit origin=EQ + SET_FIELD 'x: Int' type=kotlin.Unit origin=EQ value: GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=null ANONYMOUS_INITIALIZER TestInitVarWithCustomSetterWithExplicitCtor BLOCK_BODY @@ -104,11 +104,11 @@ FILE /initVar.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x: Int' type=kotlin.Int origin=null + GET_FIELD 'x: Int' type=kotlin.Int origin=null receiver: THIS of 'TestInitVarWithCustomSetterInCtor' type=TestInitVarWithCustomSetterInCtor FUN public final fun (value: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'x: Int' type=kotlin.Unit origin=EQ + SET_FIELD 'x: Int' type=kotlin.Unit origin=EQ value: GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=null CONSTRUCTOR public constructor TestInitVarWithCustomSetterInCtor() BLOCK_BODY diff --git a/compiler/testData/ir/irText/classes/objectLiteralExpressions.txt b/compiler/testData/ir/irText/classes/objectLiteralExpressions.txt index a9480d97d7c..7463bd1641b 100644 --- a/compiler/testData/ir/irText/classes/objectLiteralExpressions.txt +++ b/compiler/testData/ir/irText/classes/objectLiteralExpressions.txt @@ -14,7 +14,7 @@ FILE /objectLiteralExpressions.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Any BLOCK_BODY RETURN type=kotlin.Nothing from='(): Any' - GET_BACKING_FIELD 'test1: Any' type=kotlin.Any origin=null + GET_FIELD 'test1: Any' type=kotlin.Any origin=null PROPERTY public val test2: IFoo FIELD PROPERTY_BACKING_FIELD public val test2: IFoo EXPRESSION_BODY @@ -32,7 +32,7 @@ FILE /objectLiteralExpressions.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): IFoo BLOCK_BODY RETURN type=kotlin.Nothing from='(): IFoo' - GET_BACKING_FIELD 'test2: IFoo' type=IFoo origin=null + GET_FIELD 'test2: IFoo' type=IFoo origin=null CLASS CLASS Outer CONSTRUCTOR public constructor Outer() BLOCK_BODY diff --git a/compiler/testData/ir/irText/classes/objectWithInitializers.txt b/compiler/testData/ir/irText/classes/objectWithInitializers.txt index d3b43d1cc5c..f93671c9a56 100644 --- a/compiler/testData/ir/irText/classes/objectWithInitializers.txt +++ b/compiler/testData/ir/irText/classes/objectWithInitializers.txt @@ -16,18 +16,18 @@ FILE /objectWithInitializers.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x: Int' type=kotlin.Int origin=null + GET_FIELD 'x: Int' type=kotlin.Int origin=null receiver: THIS of 'Test' type=Test PROPERTY public final val y: kotlin.Int FIELD PROPERTY_BACKING_FIELD public final val y: kotlin.Int FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'y: Int' type=kotlin.Int origin=null + GET_FIELD 'y: Int' type=kotlin.Int origin=null receiver: THIS of 'Test' type=Test ANONYMOUS_INITIALIZER Test BLOCK_BODY - SET_BACKING_FIELD 'y: Int' type=kotlin.Unit origin=null + SET_FIELD 'y: Int' type=kotlin.Unit origin=null receiver: THIS of 'Test' type=Test value: CALL '(): Int' type=kotlin.Int origin=GET_PROPERTY $this: THIS of 'Test' type=Test diff --git a/compiler/testData/ir/irText/classes/primaryConstructor.txt b/compiler/testData/ir/irText/classes/primaryConstructor.txt index 554b51d4c64..41765e3c392 100644 --- a/compiler/testData/ir/irText/classes/primaryConstructor.txt +++ b/compiler/testData/ir/irText/classes/primaryConstructor.txt @@ -11,7 +11,7 @@ FILE /primaryConstructor.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x: Int' type=kotlin.Int origin=null + GET_FIELD 'x: Int' type=kotlin.Int origin=null receiver: THIS of 'Test1' type=Test1 PROPERTY public final val y: kotlin.Int FIELD PROPERTY_BACKING_FIELD public final val y: kotlin.Int @@ -20,7 +20,7 @@ FILE /primaryConstructor.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'y: Int' type=kotlin.Int origin=null + GET_FIELD 'y: Int' type=kotlin.Int origin=null receiver: THIS of 'Test1' type=Test1 CLASS CLASS Test2 CONSTRUCTOR public constructor Test2(x: kotlin.Int, y: kotlin.Int) @@ -34,7 +34,7 @@ FILE /primaryConstructor.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'y: Int' type=kotlin.Int origin=null + GET_FIELD 'y: Int' type=kotlin.Int origin=null receiver: THIS of 'Test2' type=Test2 PROPERTY public final val x: kotlin.Int FIELD PROPERTY_BACKING_FIELD public final val x: kotlin.Int @@ -43,7 +43,7 @@ FILE /primaryConstructor.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x: Int' type=kotlin.Int origin=null + GET_FIELD 'x: Int' type=kotlin.Int origin=null receiver: THIS of 'Test2' type=Test2 CLASS CLASS Test3 CONSTRUCTOR public constructor Test3(x: kotlin.Int, y: kotlin.Int) @@ -57,17 +57,17 @@ FILE /primaryConstructor.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'y: Int' type=kotlin.Int origin=null + GET_FIELD 'y: Int' type=kotlin.Int origin=null receiver: THIS of 'Test3' type=Test3 PROPERTY public final val x: kotlin.Int FIELD PROPERTY_BACKING_FIELD public final val x: kotlin.Int FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x: Int' type=kotlin.Int origin=null + GET_FIELD 'x: Int' type=kotlin.Int origin=null receiver: THIS of 'Test3' type=Test3 ANONYMOUS_INITIALIZER Test3 BLOCK_BODY - SET_BACKING_FIELD 'x: Int' type=kotlin.Unit origin=null + SET_FIELD 'x: Int' type=kotlin.Unit origin=null receiver: THIS of 'Test3' type=Test3 value: GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.txt b/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.txt index efa4293dd06..8f3e08b5c27 100644 --- a/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.txt +++ b/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.txt @@ -26,7 +26,7 @@ FILE /primaryConstructorWithSuperConstructorCall.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x: Int' type=kotlin.Int origin=null + GET_FIELD 'x: Int' type=kotlin.Int origin=null receiver: THIS of 'TestWithDelegatingConstructor' type=TestWithDelegatingConstructor PROPERTY public final val y: kotlin.Int FIELD PROPERTY_BACKING_FIELD public final val y: kotlin.Int @@ -35,7 +35,7 @@ FILE /primaryConstructorWithSuperConstructorCall.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'y: Int' type=kotlin.Int origin=null + GET_FIELD 'y: Int' type=kotlin.Int origin=null receiver: THIS of 'TestWithDelegatingConstructor' type=TestWithDelegatingConstructor CONSTRUCTOR public constructor TestWithDelegatingConstructor(x: kotlin.Int) BLOCK_BODY diff --git a/compiler/testData/ir/irText/classes/sealedClasses.txt b/compiler/testData/ir/irText/classes/sealedClasses.txt index 1302b0da9b5..7f8f290d01a 100644 --- a/compiler/testData/ir/irText/classes/sealedClasses.txt +++ b/compiler/testData/ir/irText/classes/sealedClasses.txt @@ -16,7 +16,7 @@ FILE /sealedClasses.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Double BLOCK_BODY RETURN type=kotlin.Nothing from='(): Double' - GET_BACKING_FIELD 'number: Double' type=kotlin.Double origin=null + GET_FIELD 'number: Double' type=kotlin.Double origin=null receiver: THIS of 'Const' type=Expr.Const CLASS CLASS Sum CONSTRUCTOR public constructor Sum(e1: Expr, e2: Expr) @@ -30,7 +30,7 @@ FILE /sealedClasses.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): Expr BLOCK_BODY RETURN type=kotlin.Nothing from='(): Expr' - GET_BACKING_FIELD 'e1: Expr' type=Expr origin=null + GET_FIELD 'e1: Expr' type=Expr origin=null receiver: THIS of 'Sum' type=Expr.Sum PROPERTY public final val e2: Expr FIELD PROPERTY_BACKING_FIELD public final val e2: Expr @@ -39,7 +39,7 @@ FILE /sealedClasses.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): Expr BLOCK_BODY RETURN type=kotlin.Nothing from='(): Expr' - GET_BACKING_FIELD 'e2: Expr' type=Expr origin=null + GET_FIELD 'e2: Expr' type=Expr origin=null receiver: THIS of 'Sum' type=Expr.Sum CLASS OBJECT NotANumber CONSTRUCTOR private constructor NotANumber() diff --git a/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.txt b/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.txt index c40e77bf82a..900b6a004eb 100644 --- a/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.txt +++ b/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.txt @@ -12,7 +12,7 @@ FILE /secondaryConstructorWithInitializersFromClassBody.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x: Int' type=kotlin.Int origin=null + GET_FIELD 'x: Int' type=kotlin.Int origin=null receiver: THIS of 'TestProperty' type=TestProperty CONSTRUCTOR public constructor TestProperty() BLOCK_BODY @@ -24,11 +24,11 @@ FILE /secondaryConstructorWithInitializersFromClassBody.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x: Int' type=kotlin.Int origin=null + GET_FIELD 'x: Int' type=kotlin.Int origin=null receiver: THIS of 'TestInitBlock' type=TestInitBlock ANONYMOUS_INITIALIZER TestInitBlock BLOCK_BODY - SET_BACKING_FIELD 'x: Int' type=kotlin.Unit origin=null + SET_FIELD 'x: Int' type=kotlin.Unit origin=null receiver: THIS of 'TestInitBlock' type=TestInitBlock value: CONST Int type=kotlin.Int value='0' CONSTRUCTOR public constructor TestInitBlock() diff --git a/compiler/testData/ir/irText/classes/superCalls.txt b/compiler/testData/ir/irText/classes/superCalls.txt index 8e7fe408527..2a4659a66b1 100644 --- a/compiler/testData/ir/irText/classes/superCalls.txt +++ b/compiler/testData/ir/irText/classes/superCalls.txt @@ -13,7 +13,7 @@ FILE /superCalls.kt FUN DEFAULT_PROPERTY_ACCESSOR public open fun (): kotlin.String BLOCK_BODY RETURN type=kotlin.Nothing from='(): String' - GET_BACKING_FIELD 'bar: String' type=kotlin.String origin=null + GET_FIELD 'bar: String' type=kotlin.String origin=null receiver: THIS of 'Base' type=Base CLASS CLASS Derived CONSTRUCTOR public constructor Derived() diff --git a/compiler/testData/ir/irText/declarations/classLevelProperties.txt b/compiler/testData/ir/irText/declarations/classLevelProperties.txt index 6bb3c0e1be5..3cefce1ffdf 100644 --- a/compiler/testData/ir/irText/declarations/classLevelProperties.txt +++ b/compiler/testData/ir/irText/declarations/classLevelProperties.txt @@ -11,7 +11,7 @@ FILE /classLevelProperties.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'test1: Int' type=kotlin.Int origin=null + GET_FIELD 'test1: Int' type=kotlin.Int origin=null receiver: THIS of 'C' type=C PROPERTY public final val test2: kotlin.Int FUN public final fun (): kotlin.Int @@ -25,11 +25,11 @@ FILE /classLevelProperties.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'test3: Int' type=kotlin.Int origin=null + GET_FIELD 'test3: Int' type=kotlin.Int origin=null receiver: THIS of 'C' type=C FUN DEFAULT_PROPERTY_ACCESSOR public final fun (: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'test3: Int' type=kotlin.Unit origin=null + SET_FIELD 'test3: Int' type=kotlin.Unit origin=null receiver: THIS of 'C' type=C value: GET_VAR 'value-parameter : Int' type=kotlin.Int origin=null PROPERTY public final var test4: kotlin.Int @@ -39,11 +39,11 @@ FILE /classLevelProperties.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'test4: Int' type=kotlin.Int origin=null + GET_FIELD 'test4: Int' type=kotlin.Int origin=null receiver: THIS of 'C' type=C FUN public final fun (value: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'test4: Int' type=kotlin.Unit origin=EQ + SET_FIELD 'test4: Int' type=kotlin.Unit origin=EQ value: GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=null PROPERTY public final var test5: kotlin.Int FIELD PROPERTY_BACKING_FIELD public final var test5: kotlin.Int @@ -52,11 +52,11 @@ FILE /classLevelProperties.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'test5: Int' type=kotlin.Int origin=null + GET_FIELD 'test5: Int' type=kotlin.Int origin=null receiver: THIS of 'C' type=C FUN private final fun (: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'test5: Int' type=kotlin.Unit origin=null + SET_FIELD 'test5: Int' type=kotlin.Unit origin=null receiver: THIS of 'C' type=C value: GET_VAR 'value-parameter : Int' type=kotlin.Int origin=null PROPERTY public final val test6: kotlin.Int = 1 @@ -66,7 +66,7 @@ FILE /classLevelProperties.kt FUN public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'test6: Int' type=kotlin.Int origin=null + GET_FIELD 'test6: Int' type=kotlin.Int origin=null receiver: THIS of 'C' type=C PROPERTY public final val test7: kotlin.Int FIELD DELEGATE val `test7$delegate`: kotlin.Lazy @@ -82,7 +82,7 @@ FILE /classLevelProperties.kt BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' CALL 'getValue(Any?, KProperty<*>) on Lazy: Int' type=kotlin.Int origin=null - $receiver: GET_BACKING_FIELD '`test7$delegate`: Lazy' type=kotlin.Lazy origin=null + $receiver: GET_FIELD '`test7$delegate`: Lazy' type=kotlin.Lazy origin=null receiver: THIS of 'C' type=C thisRef: THIS of 'C' type=C property: CALLABLE_REFERENCE 'test7: Int' type=kotlin.reflect.KProperty1 origin=PROPERTY_REFERENCE_FOR_DELEGATE @@ -94,7 +94,7 @@ FILE /classLevelProperties.kt BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' CALL 'getValue(Any?, KProperty<*>) on MutableMap: Int' type=kotlin.Int origin=null - $receiver: GET_BACKING_FIELD '`test8$delegate`: HashMap' type=java.util.HashMap origin=null + $receiver: GET_FIELD '`test8$delegate`: HashMap' type=java.util.HashMap origin=null receiver: THIS of 'C' type=C thisRef: THIS of 'C' type=C property: CALLABLE_REFERENCE 'test8: Int' type=kotlin.reflect.KMutableProperty1 origin=PROPERTY_REFERENCE_FOR_DELEGATE @@ -102,7 +102,7 @@ FILE /classLevelProperties.kt BLOCK_BODY RETURN type=kotlin.Nothing from='(Int): Unit' CALL 'setValue(Any?, KProperty<*>, Int) on MutableMap: Unit' type=kotlin.Unit origin=null - $receiver: GET_BACKING_FIELD '`test8$delegate`: HashMap' type=java.util.HashMap origin=null + $receiver: GET_FIELD '`test8$delegate`: HashMap' type=java.util.HashMap origin=null receiver: THIS of 'C' type=C thisRef: THIS of 'C' type=C property: CALLABLE_REFERENCE 'test8: Int' type=kotlin.reflect.KMutableProperty1 origin=PROPERTY_REFERENCE_FOR_DELEGATE diff --git a/compiler/testData/ir/irText/declarations/delegatedProperties.txt b/compiler/testData/ir/irText/declarations/delegatedProperties.txt index 100cce84103..f6b8e65c519 100644 --- a/compiler/testData/ir/irText/declarations/delegatedProperties.txt +++ b/compiler/testData/ir/irText/declarations/delegatedProperties.txt @@ -13,7 +13,7 @@ FILE /delegatedProperties.kt BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' CALL 'getValue(Any?, KProperty<*>) on Lazy: Int' type=kotlin.Int origin=null - $receiver: GET_BACKING_FIELD '`test1$delegate`: Lazy' type=kotlin.Lazy origin=null + $receiver: GET_FIELD '`test1$delegate`: Lazy' type=kotlin.Lazy origin=null thisRef: CONST Null type=kotlin.Nothing? value='null' property: CALLABLE_REFERENCE 'test1: Int' type=kotlin.reflect.KProperty0 origin=PROPERTY_REFERENCE_FOR_DELEGATE CLASS CLASS C @@ -28,7 +28,7 @@ FILE /delegatedProperties.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.collections.MutableMap BLOCK_BODY RETURN type=kotlin.Nothing from='(): MutableMap' - GET_BACKING_FIELD 'map: MutableMap' type=kotlin.collections.MutableMap origin=null + GET_FIELD 'map: MutableMap' type=kotlin.collections.MutableMap origin=null receiver: THIS of 'C' type=C PROPERTY public final val test2: kotlin.Int FIELD DELEGATE val `test2$delegate`: kotlin.Lazy @@ -44,7 +44,7 @@ FILE /delegatedProperties.kt BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' CALL 'getValue(Any?, KProperty<*>) on Lazy: Int' type=kotlin.Int origin=null - $receiver: GET_BACKING_FIELD '`test2$delegate`: Lazy' type=kotlin.Lazy origin=null + $receiver: GET_FIELD '`test2$delegate`: Lazy' type=kotlin.Lazy origin=null receiver: THIS of 'C' type=C thisRef: THIS of 'C' type=C property: CALLABLE_REFERENCE 'test2: Int' type=kotlin.reflect.KProperty1 origin=PROPERTY_REFERENCE_FOR_DELEGATE @@ -57,7 +57,7 @@ FILE /delegatedProperties.kt BLOCK_BODY RETURN type=kotlin.Nothing from='(): Any' CALL 'getValue(Any?, KProperty<*>) on MutableMap: Any' type=kotlin.Any origin=null - $receiver: GET_BACKING_FIELD '`test3$delegate`: MutableMap' type=kotlin.collections.MutableMap origin=null + $receiver: GET_FIELD '`test3$delegate`: MutableMap' type=kotlin.collections.MutableMap origin=null receiver: THIS of 'C' type=C thisRef: THIS of 'C' type=C property: CALLABLE_REFERENCE 'test3: Any' type=kotlin.reflect.KMutableProperty1 origin=PROPERTY_REFERENCE_FOR_DELEGATE @@ -65,7 +65,7 @@ FILE /delegatedProperties.kt BLOCK_BODY RETURN type=kotlin.Nothing from='(Any): Unit' CALL 'setValue(Any?, KProperty<*>, Any) on MutableMap: Unit' type=kotlin.Unit origin=null - $receiver: GET_BACKING_FIELD '`test3$delegate`: MutableMap' type=kotlin.collections.MutableMap origin=null + $receiver: GET_FIELD '`test3$delegate`: MutableMap' type=kotlin.collections.MutableMap origin=null receiver: THIS of 'C' type=C thisRef: THIS of 'C' type=C property: CALLABLE_REFERENCE 'test3: Any' type=kotlin.reflect.KMutableProperty1 origin=PROPERTY_REFERENCE_FOR_DELEGATE @@ -78,14 +78,14 @@ FILE /delegatedProperties.kt BLOCK_BODY RETURN type=kotlin.Nothing from='(): Any' CALL 'getValue(Any?, KProperty<*>) on MutableMap: Any' type=kotlin.Any origin=null - $receiver: GET_BACKING_FIELD '`test4$delegate`: HashMap' type=java.util.HashMap origin=null + $receiver: GET_FIELD '`test4$delegate`: HashMap' type=java.util.HashMap origin=null thisRef: CONST Null type=kotlin.Nothing? value='null' property: CALLABLE_REFERENCE 'test4: Any' type=kotlin.reflect.KMutableProperty0 origin=PROPERTY_REFERENCE_FOR_DELEGATE FUN DELEGATED_PROPERTY_ACCESSOR public fun (: kotlin.Any): kotlin.Unit BLOCK_BODY RETURN type=kotlin.Nothing from='(Any): Unit' CALL 'setValue(Any?, KProperty<*>, Any) on MutableMap: Unit' type=kotlin.Unit origin=null - $receiver: GET_BACKING_FIELD '`test4$delegate`: HashMap' type=java.util.HashMap origin=null + $receiver: GET_FIELD '`test4$delegate`: HashMap' type=java.util.HashMap origin=null thisRef: CONST Null type=kotlin.Nothing? value='null' property: CALLABLE_REFERENCE 'test4: Any' type=kotlin.reflect.KMutableProperty0 origin=PROPERTY_REFERENCE_FOR_DELEGATE value: GET_VAR 'value-parameter : Any' type=kotlin.Any origin=null diff --git a/compiler/testData/ir/irText/declarations/fileWithAnnotations.txt b/compiler/testData/ir/irText/declarations/fileWithAnnotations.txt index 643da44d236..8d68e3eb251 100644 --- a/compiler/testData/ir/irText/declarations/fileWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/fileWithAnnotations.txt @@ -10,4 +10,4 @@ FILE /fileWithAnnotations.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'bar: Int' type=kotlin.Int origin=null + GET_FIELD 'bar: Int' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/declarations/packageLevelProperties.txt b/compiler/testData/ir/irText/declarations/packageLevelProperties.txt index f1d0dab6ee0..38ac8bfc177 100644 --- a/compiler/testData/ir/irText/declarations/packageLevelProperties.txt +++ b/compiler/testData/ir/irText/declarations/packageLevelProperties.txt @@ -6,7 +6,7 @@ FILE /packageLevelProperties.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'test1: Int' type=kotlin.Int origin=null + GET_FIELD 'test1: Int' type=kotlin.Int origin=null PROPERTY public val test2: kotlin.Int FUN public fun (): kotlin.Int BLOCK_BODY @@ -19,10 +19,10 @@ FILE /packageLevelProperties.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'test3: Int' type=kotlin.Int origin=null + GET_FIELD 'test3: Int' type=kotlin.Int origin=null FUN DEFAULT_PROPERTY_ACCESSOR public fun (: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'test3: Int' type=kotlin.Unit origin=null + SET_FIELD 'test3: Int' type=kotlin.Unit origin=null value: GET_VAR 'value-parameter : Int' type=kotlin.Int origin=null PROPERTY public var test4: kotlin.Int FIELD PROPERTY_BACKING_FIELD public var test4: kotlin.Int @@ -31,10 +31,10 @@ FILE /packageLevelProperties.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'test4: Int' type=kotlin.Int origin=null + GET_FIELD 'test4: Int' type=kotlin.Int origin=null FUN public fun (value: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'test4: Int' type=kotlin.Unit origin=EQ + SET_FIELD 'test4: Int' type=kotlin.Unit origin=EQ value: GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=null PROPERTY public var test5: kotlin.Int FIELD PROPERTY_BACKING_FIELD public var test5: kotlin.Int @@ -43,10 +43,10 @@ FILE /packageLevelProperties.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'test5: Int' type=kotlin.Int origin=null + GET_FIELD 'test5: Int' type=kotlin.Int origin=null FUN private fun (: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'test5: Int' type=kotlin.Unit origin=null + SET_FIELD 'test5: Int' type=kotlin.Unit origin=null value: GET_VAR 'value-parameter : Int' type=kotlin.Int origin=null PROPERTY public val test6: kotlin.Int = 1 FIELD PROPERTY_BACKING_FIELD public val test6: kotlin.Int = 1 @@ -55,7 +55,7 @@ FILE /packageLevelProperties.kt FUN public fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'test6: Int' type=kotlin.Int origin=null + GET_FIELD 'test6: Int' type=kotlin.Int origin=null PROPERTY public val test7: kotlin.Int FIELD DELEGATE val `test7$delegate`: kotlin.Lazy EXPRESSION_BODY @@ -70,7 +70,7 @@ FILE /packageLevelProperties.kt BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' CALL 'getValue(Any?, KProperty<*>) on Lazy: Int' type=kotlin.Int origin=null - $receiver: GET_BACKING_FIELD '`test7$delegate`: Lazy' type=kotlin.Lazy origin=null + $receiver: GET_FIELD '`test7$delegate`: Lazy' type=kotlin.Lazy origin=null thisRef: CONST Null type=kotlin.Nothing? value='null' property: CALLABLE_REFERENCE 'test7: Int' type=kotlin.reflect.KProperty0 origin=PROPERTY_REFERENCE_FOR_DELEGATE PROPERTY public var test8: kotlin.Int @@ -81,14 +81,14 @@ FILE /packageLevelProperties.kt BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' CALL 'getValue(Any?, KProperty<*>) on MutableMap: Int' type=kotlin.Int origin=null - $receiver: GET_BACKING_FIELD '`test8$delegate`: HashMap' type=java.util.HashMap origin=null + $receiver: GET_FIELD '`test8$delegate`: HashMap' type=java.util.HashMap origin=null thisRef: CONST Null type=kotlin.Nothing? value='null' property: CALLABLE_REFERENCE 'test8: Int' type=kotlin.reflect.KMutableProperty0 origin=PROPERTY_REFERENCE_FOR_DELEGATE FUN DELEGATED_PROPERTY_ACCESSOR public fun (: kotlin.Int): kotlin.Unit BLOCK_BODY RETURN type=kotlin.Nothing from='(Int): Unit' CALL 'setValue(Any?, KProperty<*>, Int) on MutableMap: Unit' type=kotlin.Unit origin=null - $receiver: GET_BACKING_FIELD '`test8$delegate`: HashMap' type=java.util.HashMap origin=null + $receiver: GET_FIELD '`test8$delegate`: HashMap' type=java.util.HashMap origin=null thisRef: CONST Null type=kotlin.Nothing? value='null' property: CALLABLE_REFERENCE 'test8: Int' type=kotlin.reflect.KMutableProperty0 origin=PROPERTY_REFERENCE_FOR_DELEGATE value: GET_VAR 'value-parameter : Int' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.txt b/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.txt index 046f3859abd..ae8bf62a04d 100644 --- a/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.txt +++ b/compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.txt @@ -13,5 +13,5 @@ FILE /primaryCtorDefaultArguments.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x: Int' type=kotlin.Int origin=null + GET_FIELD 'x: Int' type=kotlin.Int origin=null receiver: THIS of 'Test' type=Test diff --git a/compiler/testData/ir/irText/declarations/primaryCtorProperties.txt b/compiler/testData/ir/irText/declarations/primaryCtorProperties.txt index 13eeb08c496..1f39d486ddd 100644 --- a/compiler/testData/ir/irText/declarations/primaryCtorProperties.txt +++ b/compiler/testData/ir/irText/declarations/primaryCtorProperties.txt @@ -11,7 +11,7 @@ FILE /primaryCtorProperties.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'test1: Int' type=kotlin.Int origin=null + GET_FIELD 'test1: Int' type=kotlin.Int origin=null receiver: THIS of 'C' type=C PROPERTY public final var test2: kotlin.Int FIELD PROPERTY_BACKING_FIELD public final var test2: kotlin.Int @@ -20,10 +20,10 @@ FILE /primaryCtorProperties.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'test2: Int' type=kotlin.Int origin=null + GET_FIELD 'test2: Int' type=kotlin.Int origin=null receiver: THIS of 'C' type=C FUN DEFAULT_PROPERTY_ACCESSOR public final fun (: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'test2: Int' type=kotlin.Unit origin=null + SET_FIELD 'test2: Int' type=kotlin.Unit origin=null receiver: THIS of 'C' type=C value: GET_VAR 'value-parameter : Int' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/errors/unresolvedReference.txt b/compiler/testData/ir/irText/errors/unresolvedReference.txt index 9c0459f5afa..fa3846a4d14 100644 --- a/compiler/testData/ir/irText/errors/unresolvedReference.txt +++ b/compiler/testData/ir/irText/errors/unresolvedReference.txt @@ -6,7 +6,7 @@ FILE /unresolvedReference.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): [ERROR : Type for unresolved] BLOCK_BODY RETURN type=kotlin.Nothing from='(): [ERROR : Type for unresolved]' - GET_BACKING_FIELD 'test1: [ERROR : Type for unresolved]' type=[ERROR : Type for unresolved] origin=null + GET_FIELD 'test1: [ERROR : Type for unresolved]' type=[ERROR : Type for unresolved] origin=null PROPERTY public val test2: [ERROR : Unresolved] FIELD PROPERTY_BACKING_FIELD public val test2: [ERROR : Unresolved] EXPRESSION_BODY @@ -14,7 +14,7 @@ FILE /unresolvedReference.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): [ERROR : Unresolved] BLOCK_BODY RETURN type=kotlin.Nothing from='(): [ERROR : Unresolved]' - GET_BACKING_FIELD 'test2: [ERROR : Unresolved]' type=[ERROR : Unresolved] origin=null + GET_FIELD 'test2: [ERROR : Unresolved]' type=[ERROR : Unresolved] origin=null PROPERTY public val test3: [ERROR : Type for 42.unresolved(56)] FIELD PROPERTY_BACKING_FIELD public val test3: [ERROR : Type for 42.unresolved(56)] EXPRESSION_BODY @@ -24,7 +24,7 @@ FILE /unresolvedReference.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): [ERROR : Type for 42.unresolved(56)] BLOCK_BODY RETURN type=kotlin.Nothing from='(): [ERROR : Type for 42.unresolved(56)]' - GET_BACKING_FIELD 'test3: [ERROR : Type for 42.unresolved(56)]' type=[ERROR : Type for 42.unresolved(56)] origin=null + GET_FIELD 'test3: [ERROR : Type for 42.unresolved(56)]' type=[ERROR : Type for 42.unresolved(56)] origin=null PROPERTY public val test4: [ERROR : Type for 42 *] FIELD PROPERTY_BACKING_FIELD public val test4: [ERROR : Type for 42 *] EXPRESSION_BODY @@ -32,4 +32,4 @@ FILE /unresolvedReference.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): [ERROR : Type for 42 *] BLOCK_BODY RETURN type=kotlin.Nothing from='(): [ERROR : Type for 42 *]' - GET_BACKING_FIELD 'test4: [ERROR : Type for 42 *]' type=[ERROR : Type for 42 *] origin=null + GET_FIELD 'test4: [ERROR : Type for 42 *]' type=[ERROR : Type for 42 *] origin=null diff --git a/compiler/testData/ir/irText/expressions/arrayAccess.txt b/compiler/testData/ir/irText/expressions/arrayAccess.txt index 4f56665c188..04165f801ae 100644 --- a/compiler/testData/ir/irText/expressions/arrayAccess.txt +++ b/compiler/testData/ir/irText/expressions/arrayAccess.txt @@ -6,7 +6,7 @@ FILE /arrayAccess.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'p: Int' type=kotlin.Int origin=null + GET_FIELD 'p: Int' type=kotlin.Int origin=null FUN public fun foo(): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='foo(): Int' diff --git a/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.txt b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.txt index e5c01e2b738..85fd2647467 100644 --- a/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.txt +++ b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.txt @@ -23,7 +23,7 @@ FILE /arrayAugmentedAssignment1.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.IntArray BLOCK_BODY RETURN type=kotlin.Nothing from='(): IntArray' - GET_BACKING_FIELD 'x: IntArray' type=kotlin.IntArray origin=null + GET_FIELD 'x: IntArray' type=kotlin.IntArray origin=null receiver: THIS of 'C' type=C FUN public fun testVariable(): kotlin.Unit BLOCK_BODY diff --git a/compiler/testData/ir/irText/expressions/assignments.txt b/compiler/testData/ir/irText/expressions/assignments.txt index 9e59157f3be..3ef986a8ff7 100644 --- a/compiler/testData/ir/irText/expressions/assignments.txt +++ b/compiler/testData/ir/irText/expressions/assignments.txt @@ -11,11 +11,11 @@ FILE /assignments.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x: Int' type=kotlin.Int origin=null + GET_FIELD 'x: Int' type=kotlin.Int origin=null receiver: THIS of 'Ref' type=Ref FUN DEFAULT_PROPERTY_ACCESSOR public final fun (: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'x: Int' type=kotlin.Unit origin=null + SET_FIELD 'x: Int' type=kotlin.Unit origin=null receiver: THIS of 'Ref' type=Ref value: GET_VAR 'value-parameter : Int' type=kotlin.Int origin=null FUN public fun test1(): kotlin.Unit diff --git a/compiler/testData/ir/irText/expressions/augmentedAssignment1.txt b/compiler/testData/ir/irText/expressions/augmentedAssignment1.txt index 9b24072fe3d..84a63f2f172 100644 --- a/compiler/testData/ir/irText/expressions/augmentedAssignment1.txt +++ b/compiler/testData/ir/irText/expressions/augmentedAssignment1.txt @@ -6,10 +6,10 @@ FILE /augmentedAssignment1.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'p: Int' type=kotlin.Int origin=null + GET_FIELD 'p: Int' type=kotlin.Int origin=null FUN DEFAULT_PROPERTY_ACCESSOR public fun (: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'p: Int' type=kotlin.Unit origin=null + SET_FIELD 'p: Int' type=kotlin.Unit origin=null value: GET_VAR 'value-parameter : Int' type=kotlin.Int origin=null FUN public fun testVariable(): kotlin.Unit BLOCK_BODY diff --git a/compiler/testData/ir/irText/expressions/augmentedAssignment2.txt b/compiler/testData/ir/irText/expressions/augmentedAssignment2.txt index 6d2b57ee169..2499e3c7bff 100644 --- a/compiler/testData/ir/irText/expressions/augmentedAssignment2.txt +++ b/compiler/testData/ir/irText/expressions/augmentedAssignment2.txt @@ -21,7 +21,7 @@ FILE /augmentedAssignment2.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): A BLOCK_BODY RETURN type=kotlin.Nothing from='(): A' - GET_BACKING_FIELD 'p: A' type=A origin=null + GET_FIELD 'p: A' type=A origin=null FUN public fun testVariable(): kotlin.Unit BLOCK_BODY VAR val a: A diff --git a/compiler/testData/ir/irText/expressions/boundCallableReferences.txt b/compiler/testData/ir/irText/expressions/boundCallableReferences.txt index 7ed1d9a911f..e37dabd9e09 100644 --- a/compiler/testData/ir/irText/expressions/boundCallableReferences.txt +++ b/compiler/testData/ir/irText/expressions/boundCallableReferences.txt @@ -13,7 +13,7 @@ FILE /boundCallableReferences.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'bar: Int' type=kotlin.Int origin=null + GET_FIELD 'bar: Int' type=kotlin.Int origin=null receiver: THIS of 'A' type=A FUN public fun A.qux(): kotlin.Unit BLOCK_BODY @@ -25,7 +25,7 @@ FILE /boundCallableReferences.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.reflect.KFunction0 BLOCK_BODY RETURN type=kotlin.Nothing from='(): KFunction0' - GET_BACKING_FIELD 'test1: KFunction0' type=kotlin.reflect.KFunction0 origin=null + GET_FIELD 'test1: KFunction0' type=kotlin.reflect.KFunction0 origin=null PROPERTY public val test2: kotlin.reflect.KProperty0 FIELD PROPERTY_BACKING_FIELD public val test2: kotlin.reflect.KProperty0 EXPRESSION_BODY @@ -34,7 +34,7 @@ FILE /boundCallableReferences.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.reflect.KProperty0 BLOCK_BODY RETURN type=kotlin.Nothing from='(): KProperty0' - GET_BACKING_FIELD 'test2: KProperty0' type=kotlin.reflect.KProperty0 origin=null + GET_FIELD 'test2: KProperty0' type=kotlin.reflect.KProperty0 origin=null PROPERTY public val test3: kotlin.reflect.KFunction0 FIELD PROPERTY_BACKING_FIELD public val test3: kotlin.reflect.KFunction0 EXPRESSION_BODY @@ -43,4 +43,4 @@ FILE /boundCallableReferences.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.reflect.KFunction0 BLOCK_BODY RETURN type=kotlin.Nothing from='(): KFunction0' - GET_BACKING_FIELD 'test3: KFunction0' type=kotlin.reflect.KFunction0 origin=null + GET_FIELD 'test3: KFunction0' type=kotlin.reflect.KFunction0 origin=null diff --git a/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.txt b/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.txt index fe80e55147e..b0e70b06bb8 100644 --- a/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.txt +++ b/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.txt @@ -11,11 +11,11 @@ FILE /complexAugmentedAssignment.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x1: Int' type=kotlin.Int origin=null + GET_FIELD 'x1: Int' type=kotlin.Int origin=null receiver: THIS of 'X1' type=X1 FUN DEFAULT_PROPERTY_ACCESSOR public final fun (: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'x1: Int' type=kotlin.Unit origin=null + SET_FIELD 'x1: Int' type=kotlin.Unit origin=null receiver: THIS of 'X1' type=X1 value: GET_VAR 'value-parameter : Int' type=kotlin.Int origin=null CLASS OBJECT X2 @@ -30,11 +30,11 @@ FILE /complexAugmentedAssignment.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x2: Int' type=kotlin.Int origin=null + GET_FIELD 'x2: Int' type=kotlin.Int origin=null receiver: THIS of 'X2' type=X1.X2 FUN DEFAULT_PROPERTY_ACCESSOR public final fun (: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'x2: Int' type=kotlin.Unit origin=null + SET_FIELD 'x2: Int' type=kotlin.Unit origin=null receiver: THIS of 'X2' type=X1.X2 value: GET_VAR 'value-parameter : Int' type=kotlin.Int origin=null CLASS OBJECT X3 @@ -49,11 +49,11 @@ FILE /complexAugmentedAssignment.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'x3: Int' type=kotlin.Int origin=null + GET_FIELD 'x3: Int' type=kotlin.Int origin=null receiver: THIS of 'X3' type=X1.X2.X3 FUN DEFAULT_PROPERTY_ACCESSOR public final fun (: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'x3: Int' type=kotlin.Unit origin=null + SET_FIELD 'x3: Int' type=kotlin.Unit origin=null receiver: THIS of 'X3' type=X1.X2.X3 value: GET_VAR 'value-parameter : Int' type=kotlin.Int origin=null FUN public fun test1(a: kotlin.IntArray): kotlin.Unit @@ -133,11 +133,11 @@ FILE /complexAugmentedAssignment.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 's: Int' type=kotlin.Int origin=null + GET_FIELD 's: Int' type=kotlin.Int origin=null receiver: THIS of 'B' type=B FUN DEFAULT_PROPERTY_ACCESSOR public final fun (: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 's: Int' type=kotlin.Unit origin=null + SET_FIELD 's: Int' type=kotlin.Unit origin=null receiver: THIS of 'B' type=B value: GET_VAR 'value-parameter : Int' type=kotlin.Int origin=null CLASS OBJECT Host diff --git a/compiler/testData/ir/irText/expressions/elvis.txt b/compiler/testData/ir/irText/expressions/elvis.txt index 2975971b780..b3d96113fd5 100644 --- a/compiler/testData/ir/irText/expressions/elvis.txt +++ b/compiler/testData/ir/irText/expressions/elvis.txt @@ -6,7 +6,7 @@ FILE /elvis.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Any? BLOCK_BODY RETURN type=kotlin.Nothing from='(): Any?' - GET_BACKING_FIELD 'p: Any?' type=kotlin.Any? origin=null + GET_FIELD 'p: Any?' type=kotlin.Any? origin=null FUN public fun foo(): kotlin.Any? BLOCK_BODY RETURN type=kotlin.Nothing from='foo(): Any?' diff --git a/compiler/testData/ir/irText/expressions/field.txt b/compiler/testData/ir/irText/expressions/field.txt index 77f561a1683..c9d9628147a 100644 --- a/compiler/testData/ir/irText/expressions/field.txt +++ b/compiler/testData/ir/irText/expressions/field.txt @@ -6,10 +6,10 @@ FILE /field.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'testSimple: Int' type=kotlin.Int origin=null + GET_FIELD 'testSimple: Int' type=kotlin.Int origin=null FUN public fun (value: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'testSimple: Int' type=kotlin.Unit origin=EQ + SET_FIELD 'testSimple: Int' type=kotlin.Unit origin=EQ value: GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=null PROPERTY public var testAugmented: kotlin.Int FIELD PROPERTY_BACKING_FIELD public var testAugmented: kotlin.Int @@ -18,10 +18,10 @@ FILE /field.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'testAugmented: Int' type=kotlin.Int origin=null + GET_FIELD 'testAugmented: Int' type=kotlin.Int origin=null FUN public fun (value: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'testAugmented: Int' type=kotlin.Unit origin=PLUSEQ + SET_FIELD 'testAugmented: Int' type=kotlin.Unit origin=PLUSEQ value: CALL 'plus(Int): Int' type=kotlin.Int origin=PLUSEQ - $this: GET_BACKING_FIELD 'testAugmented: Int' type=kotlin.Int origin=PLUSEQ + $this: GET_FIELD 'testAugmented: Int' type=kotlin.Int origin=PLUSEQ other: GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt index 23a8a9a5bb6..adecc8a2856 100644 --- a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt +++ b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt @@ -16,11 +16,11 @@ FILE /forWithImplicitReceivers.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'value: Int' type=kotlin.Int origin=null + GET_FIELD 'value: Int' type=kotlin.Int origin=null receiver: THIS of 'IntCell' type=IntCell FUN DEFAULT_PROPERTY_ACCESSOR public final fun (: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'value: Int' type=kotlin.Unit origin=null + SET_FIELD 'value: Int' type=kotlin.Unit origin=null receiver: THIS of 'IntCell' type=IntCell value: GET_VAR 'value-parameter : Int' type=kotlin.Int origin=null CLASS INTERFACE IReceiver diff --git a/compiler/testData/ir/irText/expressions/incrementDecrement.txt b/compiler/testData/ir/irText/expressions/incrementDecrement.txt index 395ef4cf5a6..86d0cea3b2c 100644 --- a/compiler/testData/ir/irText/expressions/incrementDecrement.txt +++ b/compiler/testData/ir/irText/expressions/incrementDecrement.txt @@ -6,10 +6,10 @@ FILE /incrementDecrement.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'p: Int' type=kotlin.Int origin=null + GET_FIELD 'p: Int' type=kotlin.Int origin=null FUN DEFAULT_PROPERTY_ACCESSOR public fun (: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'p: Int' type=kotlin.Unit origin=null + SET_FIELD 'p: Int' type=kotlin.Unit origin=null value: GET_VAR 'value-parameter : Int' type=kotlin.Int origin=null PROPERTY public val arr: kotlin.IntArray FIELD PROPERTY_BACKING_FIELD public val arr: kotlin.IntArray @@ -22,7 +22,7 @@ FILE /incrementDecrement.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.IntArray BLOCK_BODY RETURN type=kotlin.Nothing from='(): IntArray' - GET_BACKING_FIELD 'arr: IntArray' type=kotlin.IntArray origin=null + GET_FIELD 'arr: IntArray' type=kotlin.IntArray origin=null FUN public fun testVarPrefix(): kotlin.Unit BLOCK_BODY VAR var x: kotlin.Int diff --git a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.txt b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.txt index a0bc92c5f7c..ecf3b2c58a1 100644 --- a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.txt +++ b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.txt @@ -6,16 +6,16 @@ FILE /Derived.kt INSTANCE_INITIALIZER_CALL classDescriptor='Derived' ANONYMOUS_INITIALIZER Derived BLOCK_BODY - SET_BACKING_FIELD 'value: Int' type=kotlin.Unit origin=EQ + SET_FIELD 'value: Int' type=kotlin.Unit origin=EQ receiver: THIS of 'Derived' type=Derived value: CONST Int type=kotlin.Int value='0' FUN public final fun getValue(): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='getValue(): Int' - GET_BACKING_FIELD 'value: Int' type=kotlin.Int origin=GET_PROPERTY + GET_FIELD 'value: Int' type=kotlin.Int origin=GET_PROPERTY receiver: THIS of 'Derived' type=Derived FUN public final fun setValue(value: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'value: Int' type=kotlin.Unit origin=EQ + SET_FIELD 'value: Int' type=kotlin.Unit origin=EQ receiver: THIS of 'Derived' type=Derived value: GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt index a6603a47d72..dbcdbaf76c2 100644 --- a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt +++ b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt @@ -3,14 +3,14 @@ FILE /jvmStaticFieldReference.kt BLOCK_BODY CALL 'println(String!): Unit' type=kotlin.Unit origin=null $this: TYPE_OP origin=IMPLICIT_NOTNULL typeOperand=java.io.PrintStream - GET_BACKING_FIELD 'out: PrintStream!' type=java.io.PrintStream! origin=GET_PROPERTY + GET_FIELD 'out: PrintStream!' type=java.io.PrintStream! origin=GET_PROPERTY p0: CONST String type=kotlin.String value='testFun' PROPERTY public var testProp: kotlin.Any FUN public fun (): kotlin.Any BLOCK_BODY CALL 'println(String!): Unit' type=kotlin.Unit origin=null $this: TYPE_OP origin=IMPLICIT_NOTNULL typeOperand=java.io.PrintStream - GET_BACKING_FIELD 'out: PrintStream!' type=java.io.PrintStream! origin=GET_PROPERTY + GET_FIELD 'out: PrintStream!' type=java.io.PrintStream! origin=GET_PROPERTY p0: CONST String type=kotlin.String value='testProp/get' RETURN type=kotlin.Nothing from='(): Any' CONST Int type=kotlin.Int value='42' @@ -18,7 +18,7 @@ FILE /jvmStaticFieldReference.kt BLOCK_BODY CALL 'println(String!): Unit' type=kotlin.Unit origin=null $this: TYPE_OP origin=IMPLICIT_NOTNULL typeOperand=java.io.PrintStream - GET_BACKING_FIELD 'out: PrintStream!' type=java.io.PrintStream! origin=GET_PROPERTY + GET_FIELD 'out: PrintStream!' type=java.io.PrintStream! origin=GET_PROPERTY p0: CONST String type=kotlin.String value='testProp/set' CLASS CLASS TestClass CONSTRUCTOR public constructor TestClass() @@ -32,17 +32,17 @@ FILE /jvmStaticFieldReference.kt else: BLOCK type=kotlin.Int origin=null CALL 'println(String!): Unit' type=kotlin.Unit origin=null $this: TYPE_OP origin=IMPLICIT_NOTNULL typeOperand=java.io.PrintStream - GET_BACKING_FIELD 'out: PrintStream!' type=java.io.PrintStream! origin=GET_PROPERTY + GET_FIELD 'out: PrintStream!' type=java.io.PrintStream! origin=GET_PROPERTY p0: CONST String type=kotlin.String value='TestClass/test' CONST Int type=kotlin.Int value='42' FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'test: Int' type=kotlin.Int origin=null + GET_FIELD 'test: Int' type=kotlin.Int origin=null receiver: THIS of 'TestClass' type=TestClass ANONYMOUS_INITIALIZER TestClass BLOCK_BODY CALL 'println(String!): Unit' type=kotlin.Unit origin=null $this: TYPE_OP origin=IMPLICIT_NOTNULL typeOperand=java.io.PrintStream - GET_BACKING_FIELD 'out: PrintStream!' type=java.io.PrintStream! origin=GET_PROPERTY + GET_FIELD 'out: PrintStream!' type=java.io.PrintStream! origin=GET_PROPERTY p0: CONST String type=kotlin.String value='TestClass/init' diff --git a/compiler/testData/ir/irText/expressions/literals.txt b/compiler/testData/ir/irText/expressions/literals.txt index e24a3495396..d58cc502758 100644 --- a/compiler/testData/ir/irText/expressions/literals.txt +++ b/compiler/testData/ir/irText/expressions/literals.txt @@ -6,7 +6,7 @@ FILE /literals.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'test1: Int' type=kotlin.Int origin=null + GET_FIELD 'test1: Int' type=kotlin.Int origin=null PROPERTY public val test2: kotlin.Int = -1 FIELD PROPERTY_BACKING_FIELD public val test2: kotlin.Int = -1 EXPRESSION_BODY @@ -14,7 +14,7 @@ FILE /literals.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'test2: Int' type=kotlin.Int origin=null + GET_FIELD 'test2: Int' type=kotlin.Int origin=null PROPERTY public val test3: kotlin.Boolean = true FIELD PROPERTY_BACKING_FIELD public val test3: kotlin.Boolean = true EXPRESSION_BODY @@ -22,7 +22,7 @@ FILE /literals.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Boolean BLOCK_BODY RETURN type=kotlin.Nothing from='(): Boolean' - GET_BACKING_FIELD 'test3: Boolean' type=kotlin.Boolean origin=null + GET_FIELD 'test3: Boolean' type=kotlin.Boolean origin=null PROPERTY public val test4: kotlin.Boolean = false FIELD PROPERTY_BACKING_FIELD public val test4: kotlin.Boolean = false EXPRESSION_BODY @@ -30,7 +30,7 @@ FILE /literals.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Boolean BLOCK_BODY RETURN type=kotlin.Nothing from='(): Boolean' - GET_BACKING_FIELD 'test4: Boolean' type=kotlin.Boolean origin=null + GET_FIELD 'test4: Boolean' type=kotlin.Boolean origin=null PROPERTY public val test5: kotlin.String = "abc" FIELD PROPERTY_BACKING_FIELD public val test5: kotlin.String = "abc" EXPRESSION_BODY @@ -38,7 +38,7 @@ FILE /literals.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.String BLOCK_BODY RETURN type=kotlin.Nothing from='(): String' - GET_BACKING_FIELD 'test5: String' type=kotlin.String origin=null + GET_FIELD 'test5: String' type=kotlin.String origin=null PROPERTY public val test6: kotlin.Nothing? = null FIELD PROPERTY_BACKING_FIELD public val test6: kotlin.Nothing? = null EXPRESSION_BODY @@ -46,7 +46,7 @@ FILE /literals.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Nothing? BLOCK_BODY RETURN type=kotlin.Nothing from='(): Nothing?' - GET_BACKING_FIELD 'test6: Nothing?' type=kotlin.Nothing? origin=null + GET_FIELD 'test6: Nothing?' type=kotlin.Nothing? origin=null PROPERTY public val test7: kotlin.Long = 1.toLong() FIELD PROPERTY_BACKING_FIELD public val test7: kotlin.Long = 1.toLong() EXPRESSION_BODY @@ -54,7 +54,7 @@ FILE /literals.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Long BLOCK_BODY RETURN type=kotlin.Nothing from='(): Long' - GET_BACKING_FIELD 'test7: Long' type=kotlin.Long origin=null + GET_FIELD 'test7: Long' type=kotlin.Long origin=null PROPERTY public val test8: kotlin.Long = -1.toLong() FIELD PROPERTY_BACKING_FIELD public val test8: kotlin.Long = -1.toLong() EXPRESSION_BODY @@ -62,7 +62,7 @@ FILE /literals.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Long BLOCK_BODY RETURN type=kotlin.Nothing from='(): Long' - GET_BACKING_FIELD 'test8: Long' type=kotlin.Long origin=null + GET_FIELD 'test8: Long' type=kotlin.Long origin=null PROPERTY public val test9: kotlin.Double = 1.0.toDouble() FIELD PROPERTY_BACKING_FIELD public val test9: kotlin.Double = 1.0.toDouble() EXPRESSION_BODY @@ -70,7 +70,7 @@ FILE /literals.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Double BLOCK_BODY RETURN type=kotlin.Nothing from='(): Double' - GET_BACKING_FIELD 'test9: Double' type=kotlin.Double origin=null + GET_FIELD 'test9: Double' type=kotlin.Double origin=null PROPERTY public val test10: kotlin.Double = -1.0.toDouble() FIELD PROPERTY_BACKING_FIELD public val test10: kotlin.Double = -1.0.toDouble() EXPRESSION_BODY @@ -78,7 +78,7 @@ FILE /literals.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Double BLOCK_BODY RETURN type=kotlin.Nothing from='(): Double' - GET_BACKING_FIELD 'test10: Double' type=kotlin.Double origin=null + GET_FIELD 'test10: Double' type=kotlin.Double origin=null PROPERTY public val test11: kotlin.Float = 1.0.toFloat() FIELD PROPERTY_BACKING_FIELD public val test11: kotlin.Float = 1.0.toFloat() EXPRESSION_BODY @@ -86,7 +86,7 @@ FILE /literals.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Float BLOCK_BODY RETURN type=kotlin.Nothing from='(): Float' - GET_BACKING_FIELD 'test11: Float' type=kotlin.Float origin=null + GET_FIELD 'test11: Float' type=kotlin.Float origin=null PROPERTY public val test12: kotlin.Float = -1.0.toFloat() FIELD PROPERTY_BACKING_FIELD public val test12: kotlin.Float = -1.0.toFloat() EXPRESSION_BODY @@ -94,7 +94,7 @@ FILE /literals.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Float BLOCK_BODY RETURN type=kotlin.Nothing from='(): Float' - GET_BACKING_FIELD 'test12: Float' type=kotlin.Float origin=null + GET_FIELD 'test12: Float' type=kotlin.Float origin=null PROPERTY public val test13: kotlin.Char = \u0061 ('a') FIELD PROPERTY_BACKING_FIELD public val test13: kotlin.Char = \u0061 ('a') EXPRESSION_BODY @@ -102,7 +102,7 @@ FILE /literals.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Char BLOCK_BODY RETURN type=kotlin.Nothing from='(): Char' - GET_BACKING_FIELD 'test13: Char' type=kotlin.Char origin=null + GET_FIELD 'test13: Char' type=kotlin.Char origin=null PROPERTY public val testB: kotlin.Byte = 1.toByte() FIELD PROPERTY_BACKING_FIELD public val testB: kotlin.Byte = 1.toByte() EXPRESSION_BODY @@ -110,7 +110,7 @@ FILE /literals.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Byte BLOCK_BODY RETURN type=kotlin.Nothing from='(): Byte' - GET_BACKING_FIELD 'testB: Byte' type=kotlin.Byte origin=null + GET_FIELD 'testB: Byte' type=kotlin.Byte origin=null PROPERTY public val testS: kotlin.Short = 1.toShort() FIELD PROPERTY_BACKING_FIELD public val testS: kotlin.Short = 1.toShort() EXPRESSION_BODY @@ -118,7 +118,7 @@ FILE /literals.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Short BLOCK_BODY RETURN type=kotlin.Nothing from='(): Short' - GET_BACKING_FIELD 'testS: Short' type=kotlin.Short origin=null + GET_FIELD 'testS: Short' type=kotlin.Short origin=null PROPERTY public val testI: kotlin.Int = 1 FIELD PROPERTY_BACKING_FIELD public val testI: kotlin.Int = 1 EXPRESSION_BODY @@ -126,7 +126,7 @@ FILE /literals.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'testI: Int' type=kotlin.Int origin=null + GET_FIELD 'testI: Int' type=kotlin.Int origin=null PROPERTY public val testL: kotlin.Long = 1.toLong() FIELD PROPERTY_BACKING_FIELD public val testL: kotlin.Long = 1.toLong() EXPRESSION_BODY @@ -134,4 +134,4 @@ FILE /literals.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Long BLOCK_BODY RETURN type=kotlin.Nothing from='(): Long' - GET_BACKING_FIELD 'testL: Long' type=kotlin.Long origin=null + GET_FIELD 'testL: Long' type=kotlin.Long origin=null diff --git a/compiler/testData/ir/irText/expressions/references.txt b/compiler/testData/ir/irText/expressions/references.txt index a92ebe87ca6..71ad53bee00 100644 --- a/compiler/testData/ir/irText/expressions/references.txt +++ b/compiler/testData/ir/irText/expressions/references.txt @@ -6,7 +6,7 @@ FILE /references.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.String BLOCK_BODY RETURN type=kotlin.Nothing from='(): String' - GET_BACKING_FIELD 'ok: String' type=kotlin.String origin=null + GET_FIELD 'ok: String' type=kotlin.String origin=null PROPERTY public val ok2: kotlin.String = "OK" FIELD PROPERTY_BACKING_FIELD public val ok2: kotlin.String = "OK" EXPRESSION_BODY @@ -14,7 +14,7 @@ FILE /references.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.String BLOCK_BODY RETURN type=kotlin.Nothing from='(): String' - GET_BACKING_FIELD 'ok2: String' type=kotlin.String origin=null + GET_FIELD 'ok2: String' type=kotlin.String origin=null PROPERTY public val ok3: kotlin.String FUN public fun (): kotlin.String BLOCK_BODY diff --git a/compiler/testData/ir/irText/expressions/reflectionLiterals.txt b/compiler/testData/ir/irText/expressions/reflectionLiterals.txt index 58a5a63ec6f..3a11a605245 100644 --- a/compiler/testData/ir/irText/expressions/reflectionLiterals.txt +++ b/compiler/testData/ir/irText/expressions/reflectionLiterals.txt @@ -15,7 +15,7 @@ FILE /reflectionLiterals.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'qux: Int' type=kotlin.Int origin=null + GET_FIELD 'qux: Int' type=kotlin.Int origin=null PROPERTY public val test1: kotlin.reflect.KClass FIELD PROPERTY_BACKING_FIELD public val test1: kotlin.reflect.KClass EXPRESSION_BODY @@ -23,7 +23,7 @@ FILE /reflectionLiterals.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.reflect.KClass BLOCK_BODY RETURN type=kotlin.Nothing from='(): KClass' - GET_BACKING_FIELD 'test1: KClass' type=kotlin.reflect.KClass origin=null + GET_FIELD 'test1: KClass' type=kotlin.reflect.KClass origin=null PROPERTY public val test2: kotlin.reflect.KClass FIELD PROPERTY_BACKING_FIELD public val test2: kotlin.reflect.KClass EXPRESSION_BODY @@ -32,7 +32,7 @@ FILE /reflectionLiterals.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.reflect.KClass BLOCK_BODY RETURN type=kotlin.Nothing from='(): KClass' - GET_BACKING_FIELD 'test2: KClass' type=kotlin.reflect.KClass origin=null + GET_FIELD 'test2: KClass' type=kotlin.reflect.KClass origin=null PROPERTY public val test3: kotlin.reflect.KFunction1 FIELD PROPERTY_BACKING_FIELD public val test3: kotlin.reflect.KFunction1 EXPRESSION_BODY @@ -40,7 +40,7 @@ FILE /reflectionLiterals.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.reflect.KFunction1 BLOCK_BODY RETURN type=kotlin.Nothing from='(): KFunction1' - GET_BACKING_FIELD 'test3: KFunction1' type=kotlin.reflect.KFunction1 origin=null + GET_FIELD 'test3: KFunction1' type=kotlin.reflect.KFunction1 origin=null PROPERTY public val test4: kotlin.reflect.KFunction0 FIELD PROPERTY_BACKING_FIELD public val test4: kotlin.reflect.KFunction0 EXPRESSION_BODY @@ -48,7 +48,7 @@ FILE /reflectionLiterals.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.reflect.KFunction0 BLOCK_BODY RETURN type=kotlin.Nothing from='(): KFunction0' - GET_BACKING_FIELD 'test4: KFunction0' type=kotlin.reflect.KFunction0 origin=null + GET_FIELD 'test4: KFunction0' type=kotlin.reflect.KFunction0 origin=null PROPERTY public val test5: kotlin.reflect.KFunction0 FIELD PROPERTY_BACKING_FIELD public val test5: kotlin.reflect.KFunction0 EXPRESSION_BODY @@ -57,7 +57,7 @@ FILE /reflectionLiterals.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.reflect.KFunction0 BLOCK_BODY RETURN type=kotlin.Nothing from='(): KFunction0' - GET_BACKING_FIELD 'test5: KFunction0' type=kotlin.reflect.KFunction0 origin=null + GET_FIELD 'test5: KFunction0' type=kotlin.reflect.KFunction0 origin=null PROPERTY public val test6: kotlin.reflect.KFunction0 FIELD PROPERTY_BACKING_FIELD public val test6: kotlin.reflect.KFunction0 EXPRESSION_BODY @@ -65,7 +65,7 @@ FILE /reflectionLiterals.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.reflect.KFunction0 BLOCK_BODY RETURN type=kotlin.Nothing from='(): KFunction0' - GET_BACKING_FIELD 'test6: KFunction0' type=kotlin.reflect.KFunction0 origin=null + GET_FIELD 'test6: KFunction0' type=kotlin.reflect.KFunction0 origin=null PROPERTY public val test7: kotlin.reflect.KProperty0 FIELD PROPERTY_BACKING_FIELD public val test7: kotlin.reflect.KProperty0 EXPRESSION_BODY @@ -73,4 +73,4 @@ FILE /reflectionLiterals.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.reflect.KProperty0 BLOCK_BODY RETURN type=kotlin.Nothing from='(): KProperty0' - GET_BACKING_FIELD 'test7: KProperty0' type=kotlin.reflect.KProperty0 origin=null + GET_FIELD 'test7: KProperty0' type=kotlin.reflect.KProperty0 origin=null diff --git a/compiler/testData/ir/irText/expressions/safeCalls.txt b/compiler/testData/ir/irText/expressions/safeCalls.txt index 4185c64d210..5519520ed3b 100644 --- a/compiler/testData/ir/irText/expressions/safeCalls.txt +++ b/compiler/testData/ir/irText/expressions/safeCalls.txt @@ -11,11 +11,11 @@ FILE /safeCalls.kt FUN DEFAULT_PROPERTY_ACCESSOR public final fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'value: Int' type=kotlin.Int origin=null + GET_FIELD 'value: Int' type=kotlin.Int origin=null receiver: THIS of 'Ref' type=Ref FUN DEFAULT_PROPERTY_ACCESSOR public final fun (: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'value: Int' type=kotlin.Unit origin=null + SET_FIELD 'value: Int' type=kotlin.Unit origin=null receiver: THIS of 'Ref' type=Ref value: GET_VAR 'value-parameter : Int' type=kotlin.Int origin=null CLASS INTERFACE IHost diff --git a/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.txt b/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.txt index 689e7e374e3..d413daf98d5 100644 --- a/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.txt +++ b/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.txt @@ -10,7 +10,7 @@ FILE /Derived.kt if: TYPE_OP origin=INSTANCEOF typeOperand=kotlin.String GET_VAR 'value-parameter v: Any' type=kotlin.Any origin=null then: BLOCK type=kotlin.Unit origin=null - SET_BACKING_FIELD 'value: String!' type=kotlin.Unit origin=EQ + SET_FIELD 'value: String!' type=kotlin.Unit origin=EQ receiver: THIS of 'Derived' type=Derived value: TYPE_OP origin=IMPLICIT_CAST typeOperand=kotlin.String! GET_VAR 'value-parameter v: Any' type=kotlin.Any origin=null diff --git a/compiler/testData/ir/irText/expressions/smoke.txt b/compiler/testData/ir/irText/expressions/smoke.txt index 3f99793259d..99df983ba1e 100644 --- a/compiler/testData/ir/irText/expressions/smoke.txt +++ b/compiler/testData/ir/irText/expressions/smoke.txt @@ -10,7 +10,7 @@ FILE /smoke.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'testSimpleVal: Int' type=kotlin.Int origin=null + GET_FIELD 'testSimpleVal: Int' type=kotlin.Int origin=null PROPERTY public val testValWithGetter: kotlin.Int FUN public fun (): kotlin.Int BLOCK_BODY @@ -23,10 +23,10 @@ FILE /smoke.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'testSimpleVar: Int' type=kotlin.Int origin=null + GET_FIELD 'testSimpleVar: Int' type=kotlin.Int origin=null FUN DEFAULT_PROPERTY_ACCESSOR public fun (: kotlin.Int): kotlin.Unit BLOCK_BODY - SET_BACKING_FIELD 'testSimpleVar: Int' type=kotlin.Unit origin=null + SET_FIELD 'testSimpleVar: Int' type=kotlin.Unit origin=null value: GET_VAR 'value-parameter : Int' type=kotlin.Int origin=null PROPERTY public var testVarWithAccessors: kotlin.Int FUN public fun (): kotlin.Int diff --git a/compiler/testData/ir/irText/expressions/stringTemplates.txt b/compiler/testData/ir/irText/expressions/stringTemplates.txt index 462259812da..e6348401b27 100644 --- a/compiler/testData/ir/irText/expressions/stringTemplates.txt +++ b/compiler/testData/ir/irText/expressions/stringTemplates.txt @@ -10,7 +10,7 @@ FILE /stringTemplates.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.String BLOCK_BODY RETURN type=kotlin.Nothing from='(): String' - GET_BACKING_FIELD 'test1: String' type=kotlin.String origin=null + GET_FIELD 'test1: String' type=kotlin.String origin=null PROPERTY public val test2: kotlin.String = "abc" FIELD PROPERTY_BACKING_FIELD public val test2: kotlin.String = "abc" EXPRESSION_BODY @@ -18,7 +18,7 @@ FILE /stringTemplates.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.String BLOCK_BODY RETURN type=kotlin.Nothing from='(): String' - GET_BACKING_FIELD 'test2: String' type=kotlin.String origin=null + GET_FIELD 'test2: String' type=kotlin.String origin=null PROPERTY public val test3: kotlin.String = "" FIELD PROPERTY_BACKING_FIELD public val test3: kotlin.String = "" EXPRESSION_BODY @@ -26,7 +26,7 @@ FILE /stringTemplates.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.String BLOCK_BODY RETURN type=kotlin.Nothing from='(): String' - GET_BACKING_FIELD 'test3: String' type=kotlin.String origin=null + GET_FIELD 'test3: String' type=kotlin.String origin=null PROPERTY public val test4: kotlin.String = "abc" FIELD PROPERTY_BACKING_FIELD public val test4: kotlin.String = "abc" EXPRESSION_BODY @@ -34,7 +34,7 @@ FILE /stringTemplates.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.String BLOCK_BODY RETURN type=kotlin.Nothing from='(): String' - GET_BACKING_FIELD 'test4: String' type=kotlin.String origin=null + GET_FIELD 'test4: String' type=kotlin.String origin=null PROPERTY public val test5: kotlin.String = " abc " @@ -51,7 +51,7 @@ abc FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.String BLOCK_BODY RETURN type=kotlin.Nothing from='(): String' - GET_BACKING_FIELD 'test5: String' type=kotlin.String origin=null + GET_FIELD 'test5: String' type=kotlin.String origin=null PROPERTY public val test6: kotlin.String FIELD PROPERTY_BACKING_FIELD public val test6: kotlin.String EXPRESSION_BODY @@ -62,4 +62,4 @@ abc FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.String BLOCK_BODY RETURN type=kotlin.Nothing from='(): String' - GET_BACKING_FIELD 'test6: String' type=kotlin.String origin=null + GET_FIELD 'test6: String' type=kotlin.String origin=null diff --git a/compiler/testData/ir/irText/expressions/values.txt b/compiler/testData/ir/irText/expressions/values.txt index 4030be3aeee..a802efe2b52 100644 --- a/compiler/testData/ir/irText/expressions/values.txt +++ b/compiler/testData/ir/irText/expressions/values.txt @@ -22,7 +22,7 @@ FILE /values.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' - GET_BACKING_FIELD 'a: Int' type=kotlin.Int origin=null + GET_FIELD 'a: Int' type=kotlin.Int origin=null CLASS CLASS Z CONSTRUCTOR public constructor Z() BLOCK_BODY @@ -36,7 +36,7 @@ FILE /values.kt FUN public fun test1(): Enum BLOCK_BODY RETURN type=kotlin.Nothing from='test1(): Enum' - GET_ENUM_VALUE 'A' type=Enum + GET_ENUM 'A' type=Enum FUN public fun test2(): A BLOCK_BODY RETURN type=kotlin.Nothing from='test2(): A' diff --git a/compiler/testData/ir/irText/expressions/vararg.txt b/compiler/testData/ir/irText/expressions/vararg.txt index 8550a5d1d7c..d0cab9e6ee4 100644 --- a/compiler/testData/ir/irText/expressions/vararg.txt +++ b/compiler/testData/ir/irText/expressions/vararg.txt @@ -6,7 +6,7 @@ FILE /vararg.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Array BLOCK_BODY RETURN type=kotlin.Nothing from='(): Array' - GET_BACKING_FIELD 'test1: Array' type=kotlin.Array origin=null + GET_FIELD 'test1: Array' type=kotlin.Array origin=null PROPERTY public val test2: kotlin.Array FIELD PROPERTY_BACKING_FIELD public val test2: kotlin.Array EXPRESSION_BODY @@ -18,7 +18,7 @@ FILE /vararg.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Array BLOCK_BODY RETURN type=kotlin.Nothing from='(): Array' - GET_BACKING_FIELD 'test2: Array' type=kotlin.Array origin=null + GET_FIELD 'test2: Array' type=kotlin.Array origin=null PROPERTY public val test3: kotlin.Array FIELD PROPERTY_BACKING_FIELD public val test3: kotlin.Array EXPRESSION_BODY @@ -33,4 +33,4 @@ FILE /vararg.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): kotlin.Array BLOCK_BODY RETURN type=kotlin.Nothing from='(): Array' - GET_BACKING_FIELD 'test3: Array' type=kotlin.Array origin=null + GET_FIELD 'test3: Array' type=kotlin.Array origin=null diff --git a/compiler/testData/ir/irText/lambdas/anonymousFunction.txt b/compiler/testData/ir/irText/lambdas/anonymousFunction.txt index 6f48fc418e0..1ce8cc0551d 100644 --- a/compiler/testData/ir/irText/lambdas/anonymousFunction.txt +++ b/compiler/testData/ir/irText/lambdas/anonymousFunction.txt @@ -10,4 +10,4 @@ FILE /anonymousFunction.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): () -> kotlin.Unit BLOCK_BODY RETURN type=kotlin.Nothing from='(): () -> Unit' - GET_BACKING_FIELD 'anonymous: () -> Unit' type=() -> kotlin.Unit origin=null + GET_FIELD 'anonymous: () -> Unit' type=() -> kotlin.Unit origin=null diff --git a/compiler/testData/ir/irText/lambdas/justLambda.txt b/compiler/testData/ir/irText/lambdas/justLambda.txt index 2f2834be8e2..12ce9877b9f 100644 --- a/compiler/testData/ir/irText/lambdas/justLambda.txt +++ b/compiler/testData/ir/irText/lambdas/justLambda.txt @@ -11,7 +11,7 @@ FILE /justLambda.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): () -> kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='(): () -> Int' - GET_BACKING_FIELD 'test1: () -> Int' type=() -> kotlin.Int origin=null + GET_FIELD 'test1: () -> Int' type=() -> kotlin.Int origin=null PROPERTY public val test2: () -> kotlin.Unit FIELD PROPERTY_BACKING_FIELD public val test2: () -> kotlin.Unit EXPRESSION_BODY @@ -23,4 +23,4 @@ FILE /justLambda.kt FUN DEFAULT_PROPERTY_ACCESSOR public fun (): () -> kotlin.Unit BLOCK_BODY RETURN type=kotlin.Nothing from='(): () -> Unit' - GET_BACKING_FIELD 'test2: () -> Unit' type=() -> kotlin.Unit origin=null + GET_FIELD 'test2: () -> Unit' type=() -> kotlin.Unit origin=null