From 10c2aa16575ef0fbf3e8c05dc9a4a4724efac4ad Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Mon, 16 Mar 2020 16:10:18 +0300 Subject: [PATCH] [FIR2IR] Set origin properly for set field / variable --- .../fir/backend/generators/CallGenerator.kt | 8 ++- .../ir/irText/classes/initVar.fir.txt | 6 +- .../declarations/classLevelProperties.fir.txt | 2 +- .../localDelegatedProperties.fir.txt | 6 +- .../packageLevelProperties.fir.txt | 2 +- .../parameters/useNextParamInLambda.fir.txt | 2 +- .../ir/irText/expressions/assignments.fir.txt | 56 ------------------- .../ir/irText/expressions/assignments.kt | 1 + .../expressions/augmentedAssignment1.fir.txt | 10 ++-- .../breakContinueInLoopHeader.fir.txt | 4 +- .../expressions/breakContinueInWhen.fir.txt | 4 +- .../withVarargViewedAsArray.fir.txt | 2 +- .../complexAugmentedAssignment.fir.txt | 4 +- .../ir/irText/expressions/field.fir.txt | 4 +- .../expressions/incrementDecrement.fir.txt | 8 +-- .../jvmInstanceFieldReference.fir.txt | 4 +- .../ir/irText/expressions/kt16904.fir.txt | 2 +- .../ir/irText/expressions/kt24804.fir.txt | 2 +- .../ir/irText/expressions/kt27933.fir.txt | 4 +- .../expressions/propertyReferences.fir.txt | 2 +- .../setFieldWithImplicitCast.fir.txt | 2 +- .../irText/expressions/whileDoWhile.fir.txt | 8 +-- .../ir/irText/lambdas/localFunction.fir.txt | 2 +- .../irText/regressions/coercionInLoop.fir.txt | 2 +- ...rtCastOnFieldReceiverOfGenericType.fir.txt | 2 +- 25 files changed, 48 insertions(+), 101 deletions(-) delete mode 100644 compiler/testData/ir/irText/expressions/assignments.fir.txt diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallGenerator.kt index db8a760a874..1083b6f6ded 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallGenerator.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallGenerator.kt @@ -90,11 +90,12 @@ internal class CallGenerator( val type = typeConverter.unitType val calleeReference = variableAssignment.calleeReference val symbol = calleeReference.toSymbol(session, classifierStorage, declarationStorage) + val origin = IrStatementOrigin.EQ return variableAssignment.convertWithOffsets { startOffset, endOffset -> if (symbol != null && symbol.isBound) { when (symbol) { is IrFieldSymbol -> IrSetFieldImpl( - startOffset, endOffset, symbol, type + startOffset, endOffset, symbol, type, origin ).apply { value = visitor.convertToIrExpression(variableAssignment.rValue) } @@ -103,10 +104,11 @@ internal class CallGenerator( val setter = irProperty.setter val backingField = irProperty.backingField when { - setter != null -> IrCallImpl(startOffset, endOffset, type, setter.symbol, origin = IrStatementOrigin.EQ).apply { + setter != null -> IrCallImpl(startOffset, endOffset, type, setter.symbol, origin).apply { putValueArgument(0, visitor.convertToIrExpression(variableAssignment.rValue)) } backingField != null -> IrSetFieldImpl(startOffset, endOffset, backingField.symbol, type).apply { + // NB: to be consistent with FIR2IR, origin should be null here value = visitor.convertToIrExpression(variableAssignment.rValue) } else -> generateErrorCallExpression(startOffset, endOffset, calleeReference) @@ -115,7 +117,7 @@ internal class CallGenerator( is IrVariableSymbol -> { IrSetVariableImpl( startOffset, endOffset, type, symbol, - visitor.convertToIrExpression(variableAssignment.rValue), null + visitor.convertToIrExpression(variableAssignment.rValue), origin ) } else -> generateErrorCallExpression(startOffset, endOffset, calleeReference) diff --git a/compiler/testData/ir/irText/classes/initVar.fir.txt b/compiler/testData/ir/irText/classes/initVar.fir.txt index 8b86c54456d..72886acb0fa 100644 --- a/compiler/testData/ir/irText/classes/initVar.fir.txt +++ b/compiler/testData/ir/irText/classes/initVar.fir.txt @@ -139,7 +139,7 @@ FILE fqName: fileName:/initVar.kt $this: VALUE_PARAMETER name: type:.TestInitVarWithCustomSetter VALUE_PARAMETER name:value index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private' type=kotlin.Unit origin=EQ value: GET_VAR 'value: kotlin.Int declared in .TestInitVarWithCustomSetter.' type=kotlin.Int origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: @@ -170,7 +170,7 @@ FILE fqName: fileName:/initVar.kt $this: VALUE_PARAMETER name: type:.TestInitVarWithCustomSetterWithExplicitCtor VALUE_PARAMETER name:value index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private' type=kotlin.Unit origin=EQ value: GET_VAR 'value: kotlin.Int declared in .TestInitVarWithCustomSetterWithExplicitCtor.' type=kotlin.Int origin=null ANONYMOUS_INITIALIZER isStatic=false BLOCK_BODY @@ -210,7 +210,7 @@ FILE fqName: fileName:/initVar.kt $this: VALUE_PARAMETER name: type:.TestInitVarWithCustomSetterInCtor VALUE_PARAMETER name:value index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private' type=kotlin.Unit origin=EQ value: GET_VAR 'value: kotlin.Int declared in .TestInitVarWithCustomSetterInCtor.' type=kotlin.Int origin=null CONSTRUCTOR visibility:public <> () returnType:.TestInitVarWithCustomSetterInCtor BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/classLevelProperties.fir.txt b/compiler/testData/ir/irText/declarations/classLevelProperties.fir.txt index 43599ec1b22..bb0b96af3b2 100644 --- a/compiler/testData/ir/irText/declarations/classLevelProperties.fir.txt +++ b/compiler/testData/ir/irText/declarations/classLevelProperties.fir.txt @@ -58,7 +58,7 @@ FILE fqName: fileName:/classLevelProperties.kt $this: VALUE_PARAMETER name: type:.C VALUE_PARAMETER name:value index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:private' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:private' type=kotlin.Unit origin=EQ value: GET_VAR 'value: kotlin.Int declared in .C.' type=kotlin.Int origin=null PROPERTY name:test5 visibility:public modality:FINAL [var] FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:private diff --git a/compiler/testData/ir/irText/declarations/localDelegatedProperties.fir.txt b/compiler/testData/ir/irText/declarations/localDelegatedProperties.fir.txt index 517bd7baad5..a48503ef25e 100644 --- a/compiler/testData/ir/irText/declarations/localDelegatedProperties.fir.txt +++ b/compiler/testData/ir/irText/declarations/localDelegatedProperties.fir.txt @@ -7,18 +7,18 @@ FILE fqName: fileName:/localDelegatedProperties.kt FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY VAR name:x type:IrErrorType [var] - SET_VAR 'var x: IrErrorType [var] declared in .test2' type=kotlin.Unit origin=null + SET_VAR 'var x: IrErrorType [var] declared in .test2' type=kotlin.Unit origin=EQ CONST Int type=kotlin.Int value=0 VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.Int [val] TYPE_OP type=kotlin.Int origin=IMPLICIT_CAST typeOperand=kotlin.Int GET_VAR 'var x: IrErrorType [var] declared in .test2' type=IrErrorType origin=null - SET_VAR 'var x: IrErrorType [var] declared in .test2' type=kotlin.Unit origin=null + SET_VAR 'var x: IrErrorType [var] declared in .test2' type=kotlin.Unit origin=EQ CALL 'public final fun inc (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: TYPE_OP type=IrErrorType origin=IMPLICIT_CAST typeOperand=IrErrorType GET_VAR 'val tmp_0: kotlin.Int [val] declared in .test2' type=kotlin.Int origin=null TYPE_OP type=IrErrorType origin=IMPLICIT_CAST typeOperand=IrErrorType GET_VAR 'val tmp_0: kotlin.Int [val] declared in .test2' type=kotlin.Int origin=null - SET_VAR 'var x: IrErrorType [var] declared in .test2' type=kotlin.Unit origin=null + SET_VAR 'var x: IrErrorType [var] declared in .test2' type=kotlin.Unit origin=EQ CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: TYPE_OP type=kotlin.Int origin=IMPLICIT_CAST typeOperand=kotlin.Int GET_VAR 'var x: IrErrorType [var] declared in .test2' type=IrErrorType origin=null diff --git a/compiler/testData/ir/irText/declarations/packageLevelProperties.fir.txt b/compiler/testData/ir/irText/declarations/packageLevelProperties.fir.txt index db2b414e403..d5e5c56fae2 100644 --- a/compiler/testData/ir/irText/declarations/packageLevelProperties.fir.txt +++ b/compiler/testData/ir/irText/declarations/packageLevelProperties.fir.txt @@ -42,7 +42,7 @@ FILE fqName: fileName:/packageLevelProperties.kt correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [var] VALUE_PARAMETER name:value index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=EQ value: GET_VAR 'value: kotlin.Int declared in .' type=kotlin.Int origin=null PROPERTY name:test5 visibility:public modality:FINAL [var] FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:private [static] diff --git a/compiler/testData/ir/irText/declarations/parameters/useNextParamInLambda.fir.txt b/compiler/testData/ir/irText/declarations/parameters/useNextParamInLambda.fir.txt index 7f75d584782..f1ee547fa73 100644 --- a/compiler/testData/ir/irText/declarations/parameters/useNextParamInLambda.fir.txt +++ b/compiler/testData/ir/irText/declarations/parameters/useNextParamInLambda.fir.txt @@ -27,7 +27,7 @@ FILE fqName: fileName:/useNextParamInLambda.kt CATCH parameter=val e: java.lang.Exception [val] declared in .box VAR name:e type:java.lang.Exception [val] BLOCK type=kotlin.Unit origin=null - SET_VAR 'var result: kotlin.String [var] declared in .box' type=kotlin.Unit origin=null + SET_VAR 'var result: kotlin.String [var] declared in .box' type=kotlin.Unit origin=EQ CONST String type=kotlin.String value="OK" RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in ' CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=PLUS diff --git a/compiler/testData/ir/irText/expressions/assignments.fir.txt b/compiler/testData/ir/irText/expressions/assignments.fir.txt deleted file mode 100644 index 3d72ce8ddcc..00000000000 --- a/compiler/testData/ir/irText/expressions/assignments.fir.txt +++ /dev/null @@ -1,56 +0,0 @@ -FILE fqName: fileName:/assignments.kt - CLASS CLASS name:Ref modality:FINAL visibility:public superTypes:[kotlin.Any] - $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Ref - CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:.Ref [primary] - VALUE_PARAMETER name:x index:0 type:kotlin.Int - BLOCK_BODY - DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Ref modality:FINAL visibility:public superTypes:[kotlin.Any]' - PROPERTY name:x visibility:public modality:FINAL [var] - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private - EXPRESSION_BODY - GET_VAR 'x: kotlin.Int declared in .Ref.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Ref) returnType:kotlin.Int - correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [var] - $this: VALUE_PARAMETER name: type:.Ref - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Ref' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private' type=kotlin.Int origin=null - receiver: GET_VAR ': .Ref declared in .Ref.' type=.Ref origin=null - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Ref, :kotlin.Int) returnType:kotlin.Unit - correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [var] - $this: VALUE_PARAMETER name: type:.Ref - VALUE_PARAMETER name: index:0 type:kotlin.Int - BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private' type=kotlin.Unit origin=null - receiver: GET_VAR ': .Ref declared in .Ref.' type=.Ref origin=null - value: GET_VAR ': kotlin.Int declared in .Ref.' type=kotlin.Int origin=null - FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] - overridden: - public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any - VALUE_PARAMETER name:other index:0 type:kotlin.Any? - FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override] - overridden: - public open fun hashCode (): kotlin.Int declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any - FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override] - overridden: - public open fun toString (): kotlin.String declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any - FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit - BLOCK_BODY - VAR name:x type:kotlin.Int [var] - CONST Int type=kotlin.Int value=0 - SET_VAR 'var x: kotlin.Int [var] declared in .test1' type=kotlin.Unit origin=null - CONST Int type=kotlin.Int value=1 - SET_VAR 'var x: kotlin.Int [var] declared in .test1' type=kotlin.Unit origin=null - CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=PLUS - $this: GET_VAR 'var x: kotlin.Int [var] declared in .test1' type=kotlin.Int origin=null - other: CONST Int type=kotlin.Int value=1 - FUN name:test2 visibility:public modality:FINAL <> (r:.Ref) returnType:kotlin.Unit - VALUE_PARAMETER name:r index:0 type:.Ref - BLOCK_BODY - CALL 'public final fun (: kotlin.Int): kotlin.Unit declared in .Ref' type=kotlin.Unit origin=EQ - $this: GET_VAR 'r: .Ref declared in .test2' type=.Ref origin=null - : CONST Int type=kotlin.Int value=0 diff --git a/compiler/testData/ir/irText/expressions/assignments.kt b/compiler/testData/ir/irText/expressions/assignments.kt index 37c6d7f81ae..c20e3997ab0 100644 --- a/compiler/testData/ir/irText/expressions/assignments.kt +++ b/compiler/testData/ir/irText/expressions/assignments.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL class Ref(var x: Int) fun test1() { diff --git a/compiler/testData/ir/irText/expressions/augmentedAssignment1.fir.txt b/compiler/testData/ir/irText/expressions/augmentedAssignment1.fir.txt index 751e10f9a3a..60796f04c00 100644 --- a/compiler/testData/ir/irText/expressions/augmentedAssignment1.fir.txt +++ b/compiler/testData/ir/irText/expressions/augmentedAssignment1.fir.txt @@ -18,23 +18,23 @@ FILE fqName: fileName:/augmentedAssignment1.kt BLOCK_BODY VAR name:x type:kotlin.Int [var] CONST Int type=kotlin.Int value=0 - SET_VAR 'var x: kotlin.Int [var] declared in .testVariable' type=kotlin.Unit origin=null + SET_VAR 'var x: kotlin.Int [var] declared in .testVariable' type=kotlin.Unit origin=EQ CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'var x: kotlin.Int [var] declared in .testVariable' type=kotlin.Int origin=null other: CONST Int type=kotlin.Int value=1 - SET_VAR 'var x: kotlin.Int [var] declared in .testVariable' type=kotlin.Unit origin=null + SET_VAR 'var x: kotlin.Int [var] declared in .testVariable' type=kotlin.Unit origin=EQ CALL 'public final fun minus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'var x: kotlin.Int [var] declared in .testVariable' type=kotlin.Int origin=null other: CONST Int type=kotlin.Int value=2 - SET_VAR 'var x: kotlin.Int [var] declared in .testVariable' type=kotlin.Unit origin=null + SET_VAR 'var x: kotlin.Int [var] declared in .testVariable' type=kotlin.Unit origin=EQ CALL 'public final fun times (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'var x: kotlin.Int [var] declared in .testVariable' type=kotlin.Int origin=null other: CONST Int type=kotlin.Int value=3 - SET_VAR 'var x: kotlin.Int [var] declared in .testVariable' type=kotlin.Unit origin=null + SET_VAR 'var x: kotlin.Int [var] declared in .testVariable' type=kotlin.Unit origin=EQ CALL 'public final fun div (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'var x: kotlin.Int [var] declared in .testVariable' type=kotlin.Int origin=null other: CONST Int type=kotlin.Int value=4 - SET_VAR 'var x: kotlin.Int [var] declared in .testVariable' type=kotlin.Unit origin=null + SET_VAR 'var x: kotlin.Int [var] declared in .testVariable' type=kotlin.Unit origin=EQ CALL 'public final fun rem (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'var x: kotlin.Int [var] declared in .testVariable' type=kotlin.Int origin=null other: CONST Int type=kotlin.Int value=5 diff --git a/compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.fir.txt b/compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.fir.txt index 43d813a4417..bf8ae360fbd 100644 --- a/compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.fir.txt +++ b/compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.fir.txt @@ -108,7 +108,7 @@ FILE fqName: fileName:/breakContinueInLoopHeader.kt body: BLOCK type=kotlin.Unit origin=WHILE_LOOP VAR IR_TEMPORARY_VARIABLE name:tmp_6 type:kotlin.Int [val] GET_VAR 'var i: kotlin.Int [var] declared in .test5' type=kotlin.Int origin=null - SET_VAR 'var i: kotlin.Int [var] declared in .test5' type=kotlin.Unit origin=null + SET_VAR 'var i: kotlin.Int [var] declared in .test5' type=kotlin.Unit origin=EQ CALL 'public final fun inc (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'val tmp_6: kotlin.Int [val] declared in .test5' type=kotlin.Int origin=null GET_VAR 'var i: kotlin.Int [var] declared in .test5' type=kotlin.Int origin=null @@ -118,7 +118,7 @@ FILE fqName: fileName:/breakContinueInLoopHeader.kt body: BLOCK type=kotlin.Int origin=null VAR IR_TEMPORARY_VARIABLE name:tmp_7 type:kotlin.Int [val] GET_VAR 'var j: kotlin.Int [var] declared in .test5' type=kotlin.Int origin=null - SET_VAR 'var j: kotlin.Int [var] declared in .test5' type=kotlin.Unit origin=null + SET_VAR 'var j: kotlin.Int [var] declared in .test5' type=kotlin.Unit origin=EQ CALL 'public final fun inc (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'val tmp_7: kotlin.Int [val] declared in .test5' type=kotlin.Int origin=null GET_VAR 'var j: kotlin.Int [var] declared in .test5' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/expressions/breakContinueInWhen.fir.txt b/compiler/testData/ir/irText/expressions/breakContinueInWhen.fir.txt index 7244fced15e..2d24e85e354 100644 --- a/compiler/testData/ir/irText/expressions/breakContinueInWhen.fir.txt +++ b/compiler/testData/ir/irText/expressions/breakContinueInWhen.fir.txt @@ -111,7 +111,7 @@ FILE fqName: fileName:/breakContinueInWhen.kt body: BLOCK type=kotlin.Unit origin=null VAR IR_TEMPORARY_VARIABLE name:tmp_2 type:kotlin.Int [val] GET_VAR 'var k: kotlin.Int [var] declared in .testContinueDoWhile' type=kotlin.Int origin=null - SET_VAR 'var k: kotlin.Int [var] declared in .testContinueDoWhile' type=kotlin.Unit origin=null + SET_VAR 'var k: kotlin.Int [var] declared in .testContinueDoWhile' type=kotlin.Unit origin=EQ CALL 'public final fun inc (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'val tmp_2: kotlin.Int [val] declared in .testContinueDoWhile' type=kotlin.Int origin=null GET_VAR 'var k: kotlin.Int [var] declared in .testContinueDoWhile' type=kotlin.Int origin=null @@ -121,7 +121,7 @@ FILE fqName: fileName:/breakContinueInWhen.kt arg0: GET_VAR 'var k: kotlin.Int [var] declared in .testContinueDoWhile' type=kotlin.Int origin=null arg1: CONST Int type=kotlin.Int value=2 then: CONTINUE label=null loop.label=null - SET_VAR 'var s: kotlin.String [var] declared in .testContinueDoWhile' type=kotlin.Unit origin=null + SET_VAR 'var s: kotlin.String [var] declared in .testContinueDoWhile' type=kotlin.Unit origin=EQ CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=null $this: GET_VAR 'var s: kotlin.String [var] declared in .testContinueDoWhile' type=kotlin.String origin=null other: STRING_CONCATENATION type=kotlin.String diff --git a/compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.fir.txt b/compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.fir.txt index f1ea73e00ba..629043117f3 100644 --- a/compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.fir.txt +++ b/compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.fir.txt @@ -15,7 +15,7 @@ FILE fqName: fileName:/withVarargViewedAsArray.kt VAR FOR_LOOP_VARIABLE name:arg type:kotlin.Int [val] CALL 'public final fun next (): kotlin.Int [operator] declared in kotlin.collections.IntIterator' type=kotlin.Int origin=FOR_LOOP_NEXT $this: GET_VAR 'val tmp_0: kotlin.collections.IntIterator [val] declared in .sum' type=kotlin.collections.IntIterator origin=null - SET_VAR 'var result: kotlin.Int [var] declared in .sum' type=kotlin.Unit origin=null + SET_VAR 'var result: kotlin.Int [var] declared in .sum' type=kotlin.Unit origin=EQ CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'var result: kotlin.Int [var] declared in .sum' type=kotlin.Int origin=null other: GET_VAR 'val arg: kotlin.Int [val] declared in .sum' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.fir.txt b/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.fir.txt index a3545de13d8..6966f2db6d8 100644 --- a/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.fir.txt +++ b/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.fir.txt @@ -124,7 +124,7 @@ FILE fqName: fileName:/complexAugmentedAssignment.kt index: BLOCK type=kotlin.Int origin=null VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.Int [val] GET_VAR 'var i: kotlin.Int [var] declared in .test1' type=kotlin.Int origin=null - SET_VAR 'var i: kotlin.Int [var] declared in .test1' type=kotlin.Unit origin=null + SET_VAR 'var i: kotlin.Int [var] declared in .test1' type=kotlin.Unit origin=EQ CALL 'public final fun inc (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'val tmp_1: kotlin.Int [val] declared in .test1' type=kotlin.Int origin=null GET_VAR 'val tmp_1: kotlin.Int [val] declared in .test1' type=kotlin.Int origin=null @@ -133,7 +133,7 @@ FILE fqName: fileName:/complexAugmentedAssignment.kt index: BLOCK type=kotlin.Int origin=null VAR IR_TEMPORARY_VARIABLE name:tmp_2 type:kotlin.Int [val] GET_VAR 'var i: kotlin.Int [var] declared in .test1' type=kotlin.Int origin=null - SET_VAR 'var i: kotlin.Int [var] declared in .test1' type=kotlin.Unit origin=null + SET_VAR 'var i: kotlin.Int [var] declared in .test1' type=kotlin.Unit origin=EQ CALL 'public final fun inc (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'val tmp_2: kotlin.Int [val] declared in .test1' type=kotlin.Int origin=null GET_VAR 'val tmp_2: kotlin.Int [val] declared in .test1' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/expressions/field.fir.txt b/compiler/testData/ir/irText/expressions/field.fir.txt index 921bbfa1904..c6a52440ff4 100644 --- a/compiler/testData/ir/irText/expressions/field.fir.txt +++ b/compiler/testData/ir/irText/expressions/field.fir.txt @@ -12,7 +12,7 @@ FILE fqName: fileName:/field.kt correspondingProperty: PROPERTY name:testSimple visibility:public modality:FINAL [var] VALUE_PARAMETER name:value index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testSimple type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testSimple type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=EQ value: GET_VAR 'value: kotlin.Int declared in .' type=kotlin.Int origin=null PROPERTY name:testAugmented visibility:public modality:FINAL [var] FIELD PROPERTY_BACKING_FIELD name:testAugmented type:kotlin.Int visibility:private [static] @@ -27,7 +27,7 @@ FILE fqName: fileName:/field.kt correspondingProperty: PROPERTY name:testAugmented visibility:public modality:FINAL [var] VALUE_PARAMETER name:value index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testAugmented type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testAugmented type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=EQ value: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testAugmented type:kotlin.Int visibility:private [static]' type=kotlin.Int origin=GET_PROPERTY other: GET_VAR 'value: kotlin.Int declared in .' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/expressions/incrementDecrement.fir.txt b/compiler/testData/ir/irText/expressions/incrementDecrement.fir.txt index b855bf823fc..cb8e881dcf9 100644 --- a/compiler/testData/ir/irText/expressions/incrementDecrement.fir.txt +++ b/compiler/testData/ir/irText/expressions/incrementDecrement.fir.txt @@ -35,7 +35,7 @@ FILE fqName: fileName:/incrementDecrement.kt BLOCK type=kotlin.Int origin=null VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.Int [val] GET_VAR 'var x: kotlin.Int [var] declared in .testVarPrefix' type=kotlin.Int origin=null - SET_VAR 'var x: kotlin.Int [var] declared in .testVarPrefix' type=kotlin.Unit origin=null + SET_VAR 'var x: kotlin.Int [var] declared in .testVarPrefix' type=kotlin.Unit origin=EQ CALL 'public final fun inc (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'val tmp_0: kotlin.Int [val] declared in .testVarPrefix' type=kotlin.Int origin=null GET_VAR 'var x: kotlin.Int [var] declared in .testVarPrefix' type=kotlin.Int origin=null @@ -43,7 +43,7 @@ FILE fqName: fileName:/incrementDecrement.kt BLOCK type=kotlin.Int origin=null VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.Int [val] GET_VAR 'var x: kotlin.Int [var] declared in .testVarPrefix' type=kotlin.Int origin=null - SET_VAR 'var x: kotlin.Int [var] declared in .testVarPrefix' type=kotlin.Unit origin=null + SET_VAR 'var x: kotlin.Int [var] declared in .testVarPrefix' type=kotlin.Unit origin=EQ CALL 'public final fun dec (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'val tmp_1: kotlin.Int [val] declared in .testVarPrefix' type=kotlin.Int origin=null GET_VAR 'var x: kotlin.Int [var] declared in .testVarPrefix' type=kotlin.Int origin=null @@ -55,7 +55,7 @@ FILE fqName: fileName:/incrementDecrement.kt BLOCK type=kotlin.Int origin=null VAR IR_TEMPORARY_VARIABLE name:tmp_2 type:kotlin.Int [val] GET_VAR 'var x: kotlin.Int [var] declared in .testVarPostfix' type=kotlin.Int origin=null - SET_VAR 'var x: kotlin.Int [var] declared in .testVarPostfix' type=kotlin.Unit origin=null + SET_VAR 'var x: kotlin.Int [var] declared in .testVarPostfix' type=kotlin.Unit origin=EQ CALL 'public final fun inc (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'val tmp_2: kotlin.Int [val] declared in .testVarPostfix' type=kotlin.Int origin=null GET_VAR 'val tmp_2: kotlin.Int [val] declared in .testVarPostfix' type=kotlin.Int origin=null @@ -63,7 +63,7 @@ FILE fqName: fileName:/incrementDecrement.kt BLOCK type=kotlin.Int origin=null VAR IR_TEMPORARY_VARIABLE name:tmp_3 type:kotlin.Int [val] GET_VAR 'var x: kotlin.Int [var] declared in .testVarPostfix' type=kotlin.Int origin=null - SET_VAR 'var x: kotlin.Int [var] declared in .testVarPostfix' type=kotlin.Unit origin=null + SET_VAR 'var x: kotlin.Int [var] declared in .testVarPostfix' type=kotlin.Unit origin=EQ CALL 'public final fun dec (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'val tmp_3: kotlin.Int [val] declared in .testVarPostfix' type=kotlin.Int origin=null GET_VAR 'val tmp_3: kotlin.Int [val] declared in .testVarPostfix' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.fir.txt b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.fir.txt index 931bf2ce88f..1490d7e8bbd 100644 --- a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.fir.txt +++ b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.fir.txt @@ -7,7 +7,7 @@ FILE fqName: fileName:/Derived.kt INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Derived modality:FINAL visibility:public superTypes:[.Base]' ANONYMOUS_INITIALIZER isStatic=false BLOCK_BODY - SET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:kotlin.Int visibility:public' type=kotlin.Unit origin=EQ receiver: GET_VAR ': .Derived declared in .Derived' type=.Derived origin=null value: CONST Int type=kotlin.Int value=0 FUN name:getValue visibility:public modality:FINAL <> ($this:.Derived) returnType:kotlin.Int @@ -20,7 +20,7 @@ FILE fqName: fileName:/Derived.kt $this: VALUE_PARAMETER name: type:.Derived VALUE_PARAMETER name:value index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:kotlin.Int visibility:public' type=kotlin.Unit origin=EQ receiver: GET_VAR ': .Derived declared in .Derived.setValue' type=.Derived origin=null value: GET_VAR 'value: kotlin.Int declared in .Derived.setValue' type=kotlin.Int origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] diff --git a/compiler/testData/ir/irText/expressions/kt16904.fir.txt b/compiler/testData/ir/irText/expressions/kt16904.fir.txt index 8c53e2af42d..6e39f4799ef 100644 --- a/compiler/testData/ir/irText/expressions/kt16904.fir.txt +++ b/compiler/testData/ir/irText/expressions/kt16904.fir.txt @@ -125,7 +125,7 @@ FILE fqName: fileName:/kt16904.kt INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test2 modality:FINAL visibility:public superTypes:[.J]' ANONYMOUS_INITIALIZER isStatic=false BLOCK_BODY - SET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:field type:kotlin.Int visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:field type:kotlin.Int visibility:public' type=kotlin.Unit origin=EQ receiver: GET_VAR ': .Test2 declared in .Test2' type=.Test2 origin=null value: CONST Int type=kotlin.Int value=42 FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] diff --git a/compiler/testData/ir/irText/expressions/kt24804.fir.txt b/compiler/testData/ir/irText/expressions/kt24804.fir.txt index 5d2b5d08020..fe4c8fc42a4 100644 --- a/compiler/testData/ir/irText/expressions/kt24804.fir.txt +++ b/compiler/testData/ir/irText/expressions/kt24804.fir.txt @@ -11,7 +11,7 @@ FILE fqName: fileName:/kt24804.kt CONST Int type=kotlin.Int value=10 DO_WHILE label=l2 origin=DO_WHILE_LOOP body: BLOCK type=kotlin.Unit origin=null - SET_VAR 'var z: kotlin.Int [var] declared in .run' type=kotlin.Unit origin=null + SET_VAR 'var z: kotlin.Int [var] declared in .run' type=kotlin.Unit origin=EQ CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'var z: kotlin.Int [var] declared in .run' type=kotlin.Int origin=null other: CONST Int type=kotlin.Int value=1 diff --git a/compiler/testData/ir/irText/expressions/kt27933.fir.txt b/compiler/testData/ir/irText/expressions/kt27933.fir.txt index 2f3cad55f60..7c1ded1618c 100644 --- a/compiler/testData/ir/irText/expressions/kt27933.fir.txt +++ b/compiler/testData/ir/irText/expressions/kt27933.fir.txt @@ -13,7 +13,7 @@ FILE fqName: fileName:/kt27933.kt BRANCH if: CONST Boolean type=kotlin.Boolean value=true then: BLOCK type=kotlin.Unit origin=null - SET_VAR 'var r: kotlin.String [var] declared in .box' type=kotlin.Unit origin=null + SET_VAR 'var r: kotlin.String [var] declared in .box' type=kotlin.Unit origin=EQ CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=null $this: GET_VAR 'var r: kotlin.String [var] declared in .box' type=kotlin.String origin=null other: CONST String type=kotlin.String value="O" @@ -23,7 +23,7 @@ FILE fqName: fileName:/kt27933.kt arg0: GET_VAR 'var r: kotlin.String [var] declared in .box' type=kotlin.String origin=null arg1: CONST String type=kotlin.String value="O" then: BLOCK type=kotlin.Unit origin=null - SET_VAR 'var r: kotlin.String [var] declared in .box' type=kotlin.Unit origin=null + SET_VAR 'var r: kotlin.String [var] declared in .box' type=kotlin.Unit origin=EQ CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=null $this: GET_VAR 'var r: kotlin.String [var] declared in .box' type=kotlin.String origin=null other: CONST String type=kotlin.String value="K" diff --git a/compiler/testData/ir/irText/expressions/propertyReferences.fir.txt b/compiler/testData/ir/irText/expressions/propertyReferences.fir.txt index a09c713cfbf..fbe76c6ddf9 100644 --- a/compiler/testData/ir/irText/expressions/propertyReferences.fir.txt +++ b/compiler/testData/ir/irText/expressions/propertyReferences.fir.txt @@ -135,7 +135,7 @@ FILE fqName: fileName:/propertyReferences.kt correspondingProperty: PROPERTY name:varWithBackingFieldAndAccessors visibility:public modality:FINAL [var] VALUE_PARAMETER name:value index:0 type:kotlin.Int BLOCK_BODY - SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:varWithBackingFieldAndAccessors type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=null + SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:varWithBackingFieldAndAccessors type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=EQ value: GET_VAR 'value: kotlin.Int declared in .' type=kotlin.Int origin=null PROPERTY name:test_varWithBackingFieldAndAccessors visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:test_varWithBackingFieldAndAccessors type:kotlin.reflect.KMutableProperty0 visibility:private [final,static] diff --git a/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.fir.txt b/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.fir.txt index b52816f7797..48831842144 100644 --- a/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.fir.txt +++ b/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.fir.txt @@ -14,7 +14,7 @@ FILE fqName: fileName:/Derived.kt if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=kotlin.String GET_VAR 'v: kotlin.Any declared in .Derived.setValue' type=kotlin.Any origin=null then: BLOCK type=kotlin.Unit origin=null - SET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:kotlin.String? visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:kotlin.String? visibility:public' type=kotlin.Unit origin=EQ receiver: GET_VAR ': .Derived declared in .Derived.setValue' type=.Derived origin=null value: TYPE_OP type=kotlin.String origin=IMPLICIT_CAST typeOperand=kotlin.String GET_VAR 'v: kotlin.Any declared in .Derived.setValue' type=kotlin.Any origin=null diff --git a/compiler/testData/ir/irText/expressions/whileDoWhile.fir.txt b/compiler/testData/ir/irText/expressions/whileDoWhile.fir.txt index 27c9df623cd..a9f504001cd 100644 --- a/compiler/testData/ir/irText/expressions/whileDoWhile.fir.txt +++ b/compiler/testData/ir/irText/expressions/whileDoWhile.fir.txt @@ -15,7 +15,7 @@ FILE fqName: fileName:/whileDoWhile.kt body: BLOCK type=kotlin.Int origin=null VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.Int [val] GET_VAR 'var x: kotlin.Int [var] declared in .test' type=kotlin.Int origin=null - SET_VAR 'var x: kotlin.Int [var] declared in .test' type=kotlin.Unit origin=null + SET_VAR 'var x: kotlin.Int [var] declared in .test' type=kotlin.Unit origin=EQ CALL 'public final fun inc (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'val tmp_0: kotlin.Int [val] declared in .test' type=kotlin.Int origin=null GET_VAR 'val tmp_0: kotlin.Int [val] declared in .test' type=kotlin.Int origin=null @@ -26,7 +26,7 @@ FILE fqName: fileName:/whileDoWhile.kt body: BLOCK type=kotlin.Int origin=WHILE_LOOP VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.Int [val] GET_VAR 'var x: kotlin.Int [var] declared in .test' type=kotlin.Int origin=null - SET_VAR 'var x: kotlin.Int [var] declared in .test' type=kotlin.Unit origin=null + SET_VAR 'var x: kotlin.Int [var] declared in .test' type=kotlin.Unit origin=EQ CALL 'public final fun inc (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'val tmp_1: kotlin.Int [val] declared in .test' type=kotlin.Int origin=null GET_VAR 'val tmp_1: kotlin.Int [val] declared in .test' type=kotlin.Int origin=null @@ -39,7 +39,7 @@ FILE fqName: fileName:/whileDoWhile.kt body: BLOCK type=kotlin.Int origin=null VAR IR_TEMPORARY_VARIABLE name:tmp_2 type:kotlin.Int [val] GET_VAR 'var x: kotlin.Int [var] declared in .test' type=kotlin.Int origin=null - SET_VAR 'var x: kotlin.Int [var] declared in .test' type=kotlin.Unit origin=null + SET_VAR 'var x: kotlin.Int [var] declared in .test' type=kotlin.Unit origin=EQ CALL 'public final fun inc (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'val tmp_2: kotlin.Int [val] declared in .test' type=kotlin.Int origin=null GET_VAR 'val tmp_2: kotlin.Int [val] declared in .test' type=kotlin.Int origin=null @@ -50,7 +50,7 @@ FILE fqName: fileName:/whileDoWhile.kt body: BLOCK type=kotlin.Int origin=null VAR IR_TEMPORARY_VARIABLE name:tmp_3 type:kotlin.Int [val] GET_VAR 'var x: kotlin.Int [var] declared in .test' type=kotlin.Int origin=null - SET_VAR 'var x: kotlin.Int [var] declared in .test' type=kotlin.Unit origin=null + SET_VAR 'var x: kotlin.Int [var] declared in .test' type=kotlin.Unit origin=EQ CALL 'public final fun inc (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'val tmp_3: kotlin.Int [val] declared in .test' type=kotlin.Int origin=null GET_VAR 'val tmp_3: kotlin.Int [val] declared in .test' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/lambdas/localFunction.fir.txt b/compiler/testData/ir/irText/lambdas/localFunction.fir.txt index 1f76bebefaf..f0bc40a163f 100644 --- a/compiler/testData/ir/irText/lambdas/localFunction.fir.txt +++ b/compiler/testData/ir/irText/lambdas/localFunction.fir.txt @@ -7,7 +7,7 @@ FILE fqName: fileName:/localFunction.kt BLOCK_BODY VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.Int [val] GET_VAR 'var x: kotlin.Int [var] declared in .outer' type=kotlin.Int origin=null - SET_VAR 'var x: kotlin.Int [var] declared in .outer' type=kotlin.Unit origin=null + SET_VAR 'var x: kotlin.Int [var] declared in .outer' type=kotlin.Unit origin=EQ CALL 'public final fun inc (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'val tmp_0: kotlin.Int [val] declared in .outer.local' type=kotlin.Int origin=null GET_VAR 'val tmp_0: kotlin.Int [val] declared in .outer.local' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/regressions/coercionInLoop.fir.txt b/compiler/testData/ir/irText/regressions/coercionInLoop.fir.txt index 07f4212b537..ad848e89cdf 100644 --- a/compiler/testData/ir/irText/regressions/coercionInLoop.fir.txt +++ b/compiler/testData/ir/irText/regressions/coercionInLoop.fir.txt @@ -29,7 +29,7 @@ FILE fqName: fileName:/coercionInLoop.kt $this: GET_VAR 'var i: kotlin.Int [var] declared in .box' type=kotlin.Int origin=null VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.Int [val] GET_VAR 'var i: kotlin.Int [var] declared in .box' type=kotlin.Int origin=null - SET_VAR 'var i: kotlin.Int [var] declared in .box' type=kotlin.Unit origin=null + SET_VAR 'var i: kotlin.Int [var] declared in .box' type=kotlin.Unit origin=EQ CALL 'public final fun inc (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'val tmp_0: kotlin.Int [val] declared in .box' type=kotlin.Int origin=null GET_VAR 'val tmp_0: kotlin.Int [val] declared in .box' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.fir.txt b/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.fir.txt index 25c1027d2d3..bd7196c7ec1 100644 --- a/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.fir.txt +++ b/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.fir.txt @@ -7,7 +7,7 @@ FILE fqName: fileName:/smartCastOnFieldReceiverOfGenericType.kt GET_VAR 'a: kotlin.Any declared in .testSetField' type=kotlin.Any origin=null TYPE_OP type=kotlin.String origin=CAST typeOperand=kotlin.String GET_VAR 'b: kotlin.Any declared in .testSetField' type=kotlin.Any origin=null - SET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:kotlin.String? visibility:public' type=kotlin.Unit origin=null + SET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:kotlin.String? visibility:public' type=kotlin.Unit origin=EQ receiver: TYPE_OP type=.JCell origin=IMPLICIT_CAST typeOperand=.JCell GET_VAR 'a: kotlin.Any declared in .testSetField' type=kotlin.Any origin=null value: TYPE_OP type=kotlin.String origin=IMPLICIT_CAST typeOperand=kotlin.String