From db7401d8eb2db7c46115db61c1825ca512bd9824 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 26 Feb 2020 11:35:01 +0300 Subject: [PATCH] FIR2IR: set GET_PROPERTY origin for property reads --- .../kotlin/fir/backend/Fir2IrVisitor.kt | 2 +- .../ir/irText/classes/classMembers.fir.txt | 2 +- .../classes/dataClassWithArrayMembers.fir.txt | 44 ++++++------- .../ir/irText/classes/dataClasses.fir.txt | 32 ++++----- .../irText/classes/dataClassesGeneric.fir.txt | 16 ++--- .../classes/enumWithMultipleCtors.fir.txt | 6 +- .../inlineClassSyntheticMethods.fir.txt | 4 +- .../lambdaInDataClassDefaultParameter.fir.txt | 8 +-- .../classes/objectWithInitializers.fir.txt | 2 +- .../classes/qualifiedSuperCalls.fir.txt | 4 +- .../ir/irText/classes/superCalls.fir.txt | 2 +- ...edPropertyAccessorsWithAnnotations.fir.txt | 2 +- .../declarations/constValInitializers.fir.txt | 14 ++-- .../parameters/dataClassMembers.fir.txt | 8 +-- .../differentReceivers.fir.txt | 6 +- .../provideDelegate/local.fir.txt | 4 +- .../localDifferentReceivers.fir.txt | 2 +- .../provideDelegate/member.fir.txt | 4 +- .../provideDelegate/memberExtension.fir.txt | 4 +- .../provideDelegate/topLevel.fir.txt | 4 +- .../ir/irText/expressions/arrayAccess.fir.txt | 2 +- .../arrayAugmentedAssignment1.fir.txt | 4 +- .../expressions/augmentedAssignment1.fir.txt | 10 +-- .../expressions/augmentedAssignment2.fir.txt | 10 +-- .../withVarargViewedAsArray.fir.txt | 2 +- .../irText/expressions/classReference.fir.txt | 4 +- .../complexAugmentedAssignment.fir.txt | 10 +-- .../irText/expressions/dotQualified.fir.txt | 4 +- .../ir/irText/expressions/elvis.fir.txt | 2 +- .../expressions/enumEntryAsReceiver.fir.txt | 4 +- .../extensionPropertyGetterCall.fir.txt | 14 ---- .../extensionPropertyGetterCall.kt | 1 + .../forWithImplicitReceivers.fir.txt | 4 +- .../funInterface/partialSam.fir.txt | 4 +- .../expressions/genericPropertyCall.fir.txt | 2 +- .../expressions/implicitCastToNonNull.fir.txt | 8 +-- .../expressions/incrementDecrement.fir.txt | 30 ++++----- .../javaSyntheticPropertyAccess.fir.txt | 4 +- .../ir/irText/expressions/kt16904.fir.txt | 4 +- .../ir/irText/expressions/kt28006.fir.txt | 6 +- .../ir/irText/expressions/kt30020.fir.txt | 6 +- .../membersImportedFromObject.fir.txt | 4 +- .../multipleThisReferences.fir.txt | 2 +- .../expressions/objectClassReference.fir.txt | 2 +- .../objectReferenceInFieldInitializer.fir.txt | 2 +- .../ir/irText/expressions/references.fir.txt | 57 ---------------- .../ir/irText/expressions/references.kt | 1 + .../expressions/reflectionLiterals.fir.txt | 2 +- .../safeCallWithIncrementDecrement.fir.txt | 6 +- .../ir/irText/expressions/safeCalls.fir.txt | 4 +- .../signedToUnsignedConversions_test.fir.txt | 16 ++--- .../ir/irText/expressions/smartCasts.fir.txt | 66 ------------------- .../ir/irText/expressions/smartCasts.kt | 1 + .../expressions/stringTemplates.fir.txt | 6 +- .../temporaryInEnumEntryInitializer.fir.txt | 2 +- .../thisOfGenericOuterClass.fir.txt | 4 +- .../expressions/useImportedMember.fir.txt | 10 +-- .../ir/irText/expressions/values.fir.txt | 2 +- .../ir/irText/expressions/vararg.fir.txt | 42 ------------ .../testData/ir/irText/expressions/vararg.kt | 1 + ...variableAsFunctionCallWithGenerics.fir.txt | 4 +- .../whenWithSubjectVariable.fir.txt | 2 +- .../lambdas/destructuringInLambda.fir.txt | 8 +-- .../ir/irText/lambdas/extensionLambda.fir.txt | 2 +- .../lambdas/multipleImplicitReceivers.fir.txt | 2 +- .../ir/irText/stubs/builtinMap.fir.txt | 4 +- .../ir/irText/stubs/constFromBuiltins.fir.txt | 2 +- .../genericClassInDifferentModule_m2.fir.txt | 4 +- .../stubs/javaSyntheticProperty.fir.txt | 2 +- .../stubs/jdkClassSyntheticProperty.fir.txt | 2 +- .../castsInsideCoroutineInference.fir.txt | 4 +- .../genericPropertyReferenceType.fir.txt | 2 +- .../testData/ir/irText/types/kt36143.fir.txt | 7 -- compiler/testData/ir/irText/types/kt36143.kt | 1 + ...localVariableOfIntersectionType_NI.fir.txt | 6 +- ...llabilityInDestructuringAssignment.fir.txt | 8 +-- .../enhancedNullabilityInForLoop.fir.txt | 8 +-- .../smartCastOnFakeOverrideReceiver.fir.txt | 6 +- 78 files changed, 214 insertions(+), 395 deletions(-) delete mode 100644 compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.fir.txt delete mode 100644 compiler/testData/ir/irText/expressions/references.fir.txt delete mode 100644 compiler/testData/ir/irText/expressions/smartCasts.fir.txt delete mode 100644 compiler/testData/ir/irText/expressions/vararg.fir.txt delete mode 100644 compiler/testData/ir/irText/types/kt36143.fir.txt diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt index 07a764899eb..d20453207f9 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt @@ -708,7 +708,7 @@ class Fir2IrVisitor( symbol is IrPropertySymbol && symbol.isBound -> { val getter = symbol.owner.getter if (getter != null) { - IrCallImpl(startOffset, endOffset, type, getter.symbol) + IrCallImpl(startOffset, endOffset, type, getter.symbol, origin = IrStatementOrigin.GET_PROPERTY) } else { IrErrorCallExpressionImpl(startOffset, endOffset, type, "No getter found for ${calleeReference.render()}") } diff --git a/compiler/testData/ir/irText/classes/classMembers.fir.txt b/compiler/testData/ir/irText/classes/classMembers.fir.txt index 2831e04e61c..df7bbddadda 100644 --- a/compiler/testData/ir/irText/classes/classMembers.fir.txt +++ b/compiler/testData/ir/irText/classes/classMembers.fir.txt @@ -70,7 +70,7 @@ FILE fqName: fileName:/classMembers.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' - CALL 'public final fun (): kotlin.Int declared in .C' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in .C' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': .C declared in .C.' type=.C origin=null FUN name: visibility:public modality:FINAL <> ($this:.C, value:kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:propertyWithGetAndSet visibility:public modality:FINAL [var] diff --git a/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.fir.txt b/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.fir.txt index c3ba192e837..59f3bc7a29e 100644 --- a/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.fir.txt +++ b/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.fir.txt @@ -117,93 +117,93 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Array declared in .Test1' - CALL 'public final fun (): kotlin.Array declared in .Test1' type=kotlin.Array origin=null + CALL 'public final fun (): kotlin.Array declared in .Test1' type=kotlin.Array origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1.component1' type=.Test1 origin=null FUN name:component2 visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.CharArray $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component2 (): kotlin.CharArray declared in .Test1' - CALL 'public final fun (): kotlin.CharArray declared in .Test1' type=kotlin.CharArray origin=null + CALL 'public final fun (): kotlin.CharArray declared in .Test1' type=kotlin.CharArray origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1.component2' type=.Test1 origin=null FUN name:component3 visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.BooleanArray $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component3 (): kotlin.BooleanArray declared in .Test1' - CALL 'public final fun (): kotlin.BooleanArray declared in .Test1' type=kotlin.BooleanArray origin=null + CALL 'public final fun (): kotlin.BooleanArray declared in .Test1' type=kotlin.BooleanArray origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1.component3' type=.Test1 origin=null FUN name:component4 visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.ByteArray $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component4 (): kotlin.ByteArray declared in .Test1' - CALL 'public final fun (): kotlin.ByteArray declared in .Test1' type=kotlin.ByteArray origin=null + CALL 'public final fun (): kotlin.ByteArray declared in .Test1' type=kotlin.ByteArray origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1.component4' type=.Test1 origin=null FUN name:component5 visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.ShortArray $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component5 (): kotlin.ShortArray declared in .Test1' - CALL 'public final fun (): kotlin.ShortArray declared in .Test1' type=kotlin.ShortArray origin=null + CALL 'public final fun (): kotlin.ShortArray declared in .Test1' type=kotlin.ShortArray origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1.component5' type=.Test1 origin=null FUN name:component6 visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.IntArray $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component6 (): kotlin.IntArray declared in .Test1' - CALL 'public final fun (): kotlin.IntArray declared in .Test1' type=kotlin.IntArray origin=null + CALL 'public final fun (): kotlin.IntArray declared in .Test1' type=kotlin.IntArray origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1.component6' type=.Test1 origin=null FUN name:component7 visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.LongArray $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component7 (): kotlin.LongArray declared in .Test1' - CALL 'public final fun (): kotlin.LongArray declared in .Test1' type=kotlin.LongArray origin=null + CALL 'public final fun (): kotlin.LongArray declared in .Test1' type=kotlin.LongArray origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1.component7' type=.Test1 origin=null FUN name:component8 visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.FloatArray $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component8 (): kotlin.FloatArray declared in .Test1' - CALL 'public final fun (): kotlin.FloatArray declared in .Test1' type=kotlin.FloatArray origin=null + CALL 'public final fun (): kotlin.FloatArray declared in .Test1' type=kotlin.FloatArray origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1.component8' type=.Test1 origin=null FUN name:component9 visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.DoubleArray $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component9 (): kotlin.DoubleArray declared in .Test1' - CALL 'public final fun (): kotlin.DoubleArray declared in .Test1' type=kotlin.DoubleArray origin=null + CALL 'public final fun (): kotlin.DoubleArray declared in .Test1' type=kotlin.DoubleArray origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1.component9' type=.Test1 origin=null FUN name:copy visibility:public modality:FINAL <> ($this:.Test1, stringArray:kotlin.Array, charArray:kotlin.CharArray, booleanArray:kotlin.BooleanArray, byteArray:kotlin.ByteArray, shortArray:kotlin.ShortArray, intArray:kotlin.IntArray, longArray:kotlin.LongArray, floatArray:kotlin.FloatArray, doubleArray:kotlin.DoubleArray) returnType:.Test1 $this: VALUE_PARAMETER name: type:.Test1 VALUE_PARAMETER name:stringArray index:0 type:kotlin.Array EXPRESSION_BODY - CALL 'public final fun (): kotlin.Array declared in .Test1' type=kotlin.Array origin=null + CALL 'public final fun (): kotlin.Array declared in .Test1' type=kotlin.Array origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1.copy' type=.Test1 origin=null VALUE_PARAMETER name:charArray index:1 type:kotlin.CharArray EXPRESSION_BODY - CALL 'public final fun (): kotlin.CharArray declared in .Test1' type=kotlin.CharArray origin=null + CALL 'public final fun (): kotlin.CharArray declared in .Test1' type=kotlin.CharArray origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1.copy' type=.Test1 origin=null VALUE_PARAMETER name:booleanArray index:2 type:kotlin.BooleanArray EXPRESSION_BODY - CALL 'public final fun (): kotlin.BooleanArray declared in .Test1' type=kotlin.BooleanArray origin=null + CALL 'public final fun (): kotlin.BooleanArray declared in .Test1' type=kotlin.BooleanArray origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1.copy' type=.Test1 origin=null VALUE_PARAMETER name:byteArray index:3 type:kotlin.ByteArray EXPRESSION_BODY - CALL 'public final fun (): kotlin.ByteArray declared in .Test1' type=kotlin.ByteArray origin=null + CALL 'public final fun (): kotlin.ByteArray declared in .Test1' type=kotlin.ByteArray origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1.copy' type=.Test1 origin=null VALUE_PARAMETER name:shortArray index:4 type:kotlin.ShortArray EXPRESSION_BODY - CALL 'public final fun (): kotlin.ShortArray declared in .Test1' type=kotlin.ShortArray origin=null + CALL 'public final fun (): kotlin.ShortArray declared in .Test1' type=kotlin.ShortArray origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1.copy' type=.Test1 origin=null VALUE_PARAMETER name:intArray index:5 type:kotlin.IntArray EXPRESSION_BODY - CALL 'public final fun (): kotlin.IntArray declared in .Test1' type=kotlin.IntArray origin=null + CALL 'public final fun (): kotlin.IntArray declared in .Test1' type=kotlin.IntArray origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1.copy' type=.Test1 origin=null VALUE_PARAMETER name:longArray index:6 type:kotlin.LongArray EXPRESSION_BODY - CALL 'public final fun (): kotlin.LongArray declared in .Test1' type=kotlin.LongArray origin=null + CALL 'public final fun (): kotlin.LongArray declared in .Test1' type=kotlin.LongArray origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1.copy' type=.Test1 origin=null VALUE_PARAMETER name:floatArray index:7 type:kotlin.FloatArray EXPRESSION_BODY - CALL 'public final fun (): kotlin.FloatArray declared in .Test1' type=kotlin.FloatArray origin=null + CALL 'public final fun (): kotlin.FloatArray declared in .Test1' type=kotlin.FloatArray origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1.copy' type=.Test1 origin=null VALUE_PARAMETER name:doubleArray index:8 type:kotlin.DoubleArray EXPRESSION_BODY - CALL 'public final fun (): kotlin.DoubleArray declared in .Test1' type=kotlin.DoubleArray origin=null + CALL 'public final fun (): kotlin.DoubleArray declared in .Test1' type=kotlin.DoubleArray origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1.copy' type=.Test1 origin=null BLOCK_BODY FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] @@ -242,13 +242,13 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt $this: VALUE_PARAMETER name: type:.Test2.Test2> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Array.Test2> declared in .Test2' - CALL 'public final fun (): kotlin.Array.Test2> declared in .Test2' type=kotlin.Array.Test2> origin=null + CALL 'public final fun (): kotlin.Array.Test2> declared in .Test2' type=kotlin.Array.Test2> origin=GET_PROPERTY $this: GET_VAR ': .Test2.Test2> declared in .Test2.component1' type=.Test2.Test2> origin=null FUN name:copy visibility:public modality:FINAL <> ($this:.Test2.Test2>, genericArray:kotlin.Array.Test2>) returnType:.Test2.Test2> $this: VALUE_PARAMETER name: type:.Test2.Test2> VALUE_PARAMETER name:genericArray index:0 type:kotlin.Array.Test2> EXPRESSION_BODY - CALL 'public final fun (): kotlin.Array.Test2> declared in .Test2' type=kotlin.Array.Test2> origin=null + CALL 'public final fun (): kotlin.Array.Test2> declared in .Test2' type=kotlin.Array.Test2> origin=GET_PROPERTY $this: GET_VAR ': .Test2.Test2> declared in .Test2.copy' type=.Test2.Test2> origin=null BLOCK_BODY FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] @@ -286,13 +286,13 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt $this: VALUE_PARAMETER name: type:.Test3 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Array? declared in .Test3' - CALL 'public final fun (): kotlin.Array? declared in .Test3' type=kotlin.Array? origin=null + CALL 'public final fun (): kotlin.Array? declared in .Test3' type=kotlin.Array? origin=GET_PROPERTY $this: GET_VAR ': .Test3 declared in .Test3.component1' type=.Test3 origin=null FUN name:copy visibility:public modality:FINAL <> ($this:.Test3, anyArrayN:kotlin.Array?) returnType:.Test3 $this: VALUE_PARAMETER name: type:.Test3 VALUE_PARAMETER name:anyArrayN index:0 type:kotlin.Array? EXPRESSION_BODY - CALL 'public final fun (): kotlin.Array? declared in .Test3' type=kotlin.Array? origin=null + CALL 'public final fun (): kotlin.Array? declared in .Test3' type=kotlin.Array? origin=GET_PROPERTY $this: GET_VAR ': .Test3 declared in .Test3.copy' type=.Test3 origin=null BLOCK_BODY 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/classes/dataClasses.fir.txt b/compiler/testData/ir/irText/classes/dataClasses.fir.txt index 2cf59b18983..04739b99da9 100644 --- a/compiler/testData/ir/irText/classes/dataClasses.fir.txt +++ b/compiler/testData/ir/irText/classes/dataClasses.fir.txt @@ -45,33 +45,33 @@ FILE fqName: fileName:/dataClasses.kt $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Int declared in .Test1' - CALL 'public final fun (): kotlin.Int declared in .Test1' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in .Test1' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1.component1' type=.Test1 origin=null FUN name:component2 visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.String $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component2 (): kotlin.String declared in .Test1' - CALL 'public final fun (): kotlin.String declared in .Test1' type=kotlin.String origin=null + CALL 'public final fun (): kotlin.String declared in .Test1' type=kotlin.String origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1.component2' type=.Test1 origin=null FUN name:component3 visibility:public modality:FINAL <> ($this:.Test1) returnType:kotlin.Any $this: VALUE_PARAMETER name: type:.Test1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component3 (): kotlin.Any declared in .Test1' - CALL 'public final fun (): kotlin.Any declared in .Test1' type=kotlin.Any origin=null + CALL 'public final fun (): kotlin.Any declared in .Test1' type=kotlin.Any origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1.component3' type=.Test1 origin=null FUN name:copy visibility:public modality:FINAL <> ($this:.Test1, x:kotlin.Int, y:kotlin.String, z:kotlin.Any) returnType:.Test1 $this: VALUE_PARAMETER name: type:.Test1 VALUE_PARAMETER name:x index:0 type:kotlin.Int EXPRESSION_BODY - CALL 'public final fun (): kotlin.Int declared in .Test1' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in .Test1' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1.copy' type=.Test1 origin=null VALUE_PARAMETER name:y index:1 type:kotlin.String EXPRESSION_BODY - CALL 'public final fun (): kotlin.String declared in .Test1' type=kotlin.String origin=null + CALL 'public final fun (): kotlin.String declared in .Test1' type=kotlin.String origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1.copy' type=.Test1 origin=null VALUE_PARAMETER name:z index:2 type:kotlin.Any EXPRESSION_BODY - CALL 'public final fun (): kotlin.Any declared in .Test1' type=kotlin.Any origin=null + CALL 'public final fun (): kotlin.Any declared in .Test1' type=kotlin.Any origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1.copy' type=.Test1 origin=null BLOCK_BODY FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] @@ -109,13 +109,13 @@ FILE fqName: fileName:/dataClasses.kt $this: VALUE_PARAMETER name: type:.Test2 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Any? declared in .Test2' - CALL 'public final fun (): kotlin.Any? declared in .Test2' type=kotlin.Any? origin=null + CALL 'public final fun (): kotlin.Any? declared in .Test2' type=kotlin.Any? origin=GET_PROPERTY $this: GET_VAR ': .Test2 declared in .Test2.component1' type=.Test2 origin=null FUN name:copy visibility:public modality:FINAL <> ($this:.Test2, x:kotlin.Any?) returnType:.Test2 $this: VALUE_PARAMETER name: type:.Test2 VALUE_PARAMETER name:x index:0 type:kotlin.Any? EXPRESSION_BODY - CALL 'public final fun (): kotlin.Any? declared in .Test2' type=kotlin.Any? origin=null + CALL 'public final fun (): kotlin.Any? declared in .Test2' type=kotlin.Any? origin=GET_PROPERTY $this: GET_VAR ': .Test2 declared in .Test2.copy' type=.Test2 origin=null BLOCK_BODY FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] @@ -189,43 +189,43 @@ FILE fqName: fileName:/dataClasses.kt $this: VALUE_PARAMETER name: type:.Test3 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Double declared in .Test3' - CALL 'public final fun (): kotlin.Double declared in .Test3' type=kotlin.Double origin=null + CALL 'public final fun (): kotlin.Double declared in .Test3' type=kotlin.Double origin=GET_PROPERTY $this: GET_VAR ': .Test3 declared in .Test3.component1' type=.Test3 origin=null FUN name:component2 visibility:public modality:FINAL <> ($this:.Test3) returnType:kotlin.Double? $this: VALUE_PARAMETER name: type:.Test3 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component2 (): kotlin.Double? declared in .Test3' - CALL 'public final fun (): kotlin.Double? declared in .Test3' type=kotlin.Double? origin=null + CALL 'public final fun (): kotlin.Double? declared in .Test3' type=kotlin.Double? origin=GET_PROPERTY $this: GET_VAR ': .Test3 declared in .Test3.component2' type=.Test3 origin=null FUN name:component3 visibility:public modality:FINAL <> ($this:.Test3) returnType:kotlin.Float $this: VALUE_PARAMETER name: type:.Test3 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component3 (): kotlin.Float declared in .Test3' - CALL 'public final fun (): kotlin.Float declared in .Test3' type=kotlin.Float origin=null + CALL 'public final fun (): kotlin.Float declared in .Test3' type=kotlin.Float origin=GET_PROPERTY $this: GET_VAR ': .Test3 declared in .Test3.component3' type=.Test3 origin=null FUN name:component4 visibility:public modality:FINAL <> ($this:.Test3) returnType:kotlin.Float? $this: VALUE_PARAMETER name: type:.Test3 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component4 (): kotlin.Float? declared in .Test3' - CALL 'public final fun (): kotlin.Float? declared in .Test3' type=kotlin.Float? origin=null + CALL 'public final fun (): kotlin.Float? declared in .Test3' type=kotlin.Float? origin=GET_PROPERTY $this: GET_VAR ': .Test3 declared in .Test3.component4' type=.Test3 origin=null FUN name:copy visibility:public modality:FINAL <> ($this:.Test3, d:kotlin.Double, dn:kotlin.Double?, f:kotlin.Float, df:kotlin.Float?) returnType:.Test3 $this: VALUE_PARAMETER name: type:.Test3 VALUE_PARAMETER name:d index:0 type:kotlin.Double EXPRESSION_BODY - CALL 'public final fun (): kotlin.Double declared in .Test3' type=kotlin.Double origin=null + CALL 'public final fun (): kotlin.Double declared in .Test3' type=kotlin.Double origin=GET_PROPERTY $this: GET_VAR ': .Test3 declared in .Test3.copy' type=.Test3 origin=null VALUE_PARAMETER name:dn index:1 type:kotlin.Double? EXPRESSION_BODY - CALL 'public final fun (): kotlin.Double? declared in .Test3' type=kotlin.Double? origin=null + CALL 'public final fun (): kotlin.Double? declared in .Test3' type=kotlin.Double? origin=GET_PROPERTY $this: GET_VAR ': .Test3 declared in .Test3.copy' type=.Test3 origin=null VALUE_PARAMETER name:f index:2 type:kotlin.Float EXPRESSION_BODY - CALL 'public final fun (): kotlin.Float declared in .Test3' type=kotlin.Float origin=null + CALL 'public final fun (): kotlin.Float declared in .Test3' type=kotlin.Float origin=GET_PROPERTY $this: GET_VAR ': .Test3 declared in .Test3.copy' type=.Test3 origin=null VALUE_PARAMETER name:df index:3 type:kotlin.Float? EXPRESSION_BODY - CALL 'public final fun (): kotlin.Float? declared in .Test3' type=kotlin.Float? origin=null + CALL 'public final fun (): kotlin.Float? declared in .Test3' type=kotlin.Float? origin=GET_PROPERTY $this: GET_VAR ': .Test3 declared in .Test3.copy' type=.Test3 origin=null BLOCK_BODY 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/classes/dataClassesGeneric.fir.txt b/compiler/testData/ir/irText/classes/dataClassesGeneric.fir.txt index 7ca52f68070..419e1debcc5 100644 --- a/compiler/testData/ir/irText/classes/dataClassesGeneric.fir.txt +++ b/compiler/testData/ir/irText/classes/dataClassesGeneric.fir.txt @@ -22,13 +22,13 @@ FILE fqName: fileName:/dataClassesGeneric.kt $this: VALUE_PARAMETER name: type:.Test1.Test1> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component1 (): T of .Test1 declared in .Test1' - CALL 'public final fun (): T of .Test1 declared in .Test1' type=T of .Test1 origin=null + CALL 'public final fun (): T of .Test1 declared in .Test1' type=T of .Test1 origin=GET_PROPERTY $this: GET_VAR ': .Test1.Test1> declared in .Test1.component1' type=.Test1.Test1> origin=null FUN name:copy visibility:public modality:FINAL <> ($this:.Test1.Test1>, x:T of .Test1) returnType:.Test1.Test1> $this: VALUE_PARAMETER name: type:.Test1.Test1> VALUE_PARAMETER name:x index:0 type:T of .Test1 EXPRESSION_BODY - CALL 'public final fun (): T of .Test1 declared in .Test1' type=T of .Test1 origin=null + CALL 'public final fun (): T of .Test1 declared in .Test1' type=T of .Test1 origin=GET_PROPERTY $this: GET_VAR ': .Test1.Test1> declared in .Test1.copy' type=.Test1.Test1> origin=null BLOCK_BODY FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] @@ -67,13 +67,13 @@ FILE fqName: fileName:/dataClassesGeneric.kt $this: VALUE_PARAMETER name: type:.Test2.Test2> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component1 (): T of .Test2 declared in .Test2' - CALL 'public final fun (): T of .Test2 declared in .Test2' type=T of .Test2 origin=null + CALL 'public final fun (): T of .Test2 declared in .Test2' type=T of .Test2 origin=GET_PROPERTY $this: GET_VAR ': .Test2.Test2> declared in .Test2.component1' type=.Test2.Test2> origin=null FUN name:copy visibility:public modality:FINAL <> ($this:.Test2.Test2>, x:T of .Test2) returnType:.Test2.Test2> $this: VALUE_PARAMETER name: type:.Test2.Test2> VALUE_PARAMETER name:x index:0 type:T of .Test2 EXPRESSION_BODY - CALL 'public final fun (): T of .Test2 declared in .Test2' type=T of .Test2 origin=null + CALL 'public final fun (): T of .Test2 declared in .Test2' type=T of .Test2 origin=GET_PROPERTY $this: GET_VAR ': .Test2.Test2> declared in .Test2.copy' type=.Test2.Test2> origin=null BLOCK_BODY FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] @@ -112,13 +112,13 @@ FILE fqName: fileName:/dataClassesGeneric.kt $this: VALUE_PARAMETER name: type:.Test3.Test3> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.collections.List.Test3> declared in .Test3' - CALL 'public final fun (): kotlin.collections.List.Test3> declared in .Test3' type=kotlin.collections.List.Test3> origin=null + CALL 'public final fun (): kotlin.collections.List.Test3> declared in .Test3' type=kotlin.collections.List.Test3> origin=GET_PROPERTY $this: GET_VAR ': .Test3.Test3> declared in .Test3.component1' type=.Test3.Test3> origin=null FUN name:copy visibility:public modality:FINAL <> ($this:.Test3.Test3>, x:kotlin.collections.List.Test3>) returnType:.Test3.Test3> $this: VALUE_PARAMETER name: type:.Test3.Test3> VALUE_PARAMETER name:x index:0 type:kotlin.collections.List.Test3> EXPRESSION_BODY - CALL 'public final fun (): kotlin.collections.List.Test3> declared in .Test3' type=kotlin.collections.List.Test3> origin=null + CALL 'public final fun (): kotlin.collections.List.Test3> declared in .Test3' type=kotlin.collections.List.Test3> origin=GET_PROPERTY $this: GET_VAR ': .Test3.Test3> declared in .Test3.copy' type=.Test3.Test3> origin=null BLOCK_BODY FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] @@ -156,13 +156,13 @@ FILE fqName: fileName:/dataClassesGeneric.kt $this: VALUE_PARAMETER name: type:.Test4 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.collections.List declared in .Test4' - CALL 'public final fun (): kotlin.collections.List declared in .Test4' type=kotlin.collections.List origin=null + CALL 'public final fun (): kotlin.collections.List declared in .Test4' type=kotlin.collections.List origin=GET_PROPERTY $this: GET_VAR ': .Test4 declared in .Test4.component1' type=.Test4 origin=null FUN name:copy visibility:public modality:FINAL <> ($this:.Test4, x:kotlin.collections.List) returnType:.Test4 $this: VALUE_PARAMETER name: type:.Test4 VALUE_PARAMETER name:x index:0 type:kotlin.collections.List EXPRESSION_BODY - CALL 'public final fun (): kotlin.collections.List declared in .Test4' type=kotlin.collections.List origin=null + CALL 'public final fun (): kotlin.collections.List declared in .Test4' type=kotlin.collections.List origin=GET_PROPERTY $this: GET_VAR ': .Test4 declared in .Test4.copy' type=.Test4 origin=null BLOCK_BODY 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/classes/enumWithMultipleCtors.fir.txt b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.txt index 0422cdd14d8..d3d86f96519 100644 --- a/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.txt +++ b/compiler/testData/ir/irText/classes/enumWithMultipleCtors.fir.txt @@ -106,15 +106,15 @@ FILE fqName: fileName:/enumWithMultipleCtors.kt RETURN type=kotlin.Nothing from='public open fun f (): kotlin.String declared in .A' STRING_CONCATENATION type=kotlin.String CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null - $this: CALL 'public final fun (): kotlin.String declared in .A' type=kotlin.String origin=null + $this: CALL 'public final fun (): kotlin.String declared in .A' type=kotlin.String origin=GET_PROPERTY $this: GET_VAR ': .A declared in .A.f' type=.A origin=null CONST String type=kotlin.String value="#" CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null - $this: CALL 'public final fun (): kotlin.String declared in .A' type=kotlin.String origin=null + $this: CALL 'public final fun (): kotlin.String declared in .A' type=kotlin.String origin=GET_PROPERTY $this: GET_VAR ': .A declared in .A.f' type=.A origin=null CONST String type=kotlin.String value="#" CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null - $this: CALL 'public final fun (): kotlin.String declared in .A' type=kotlin.String origin=null + $this: CALL 'public final fun (): kotlin.String declared in .A' type=kotlin.String origin=GET_PROPERTY $this: GET_VAR ': .A declared in .A.f' type=.A origin=null FUN name:values visibility:public modality:FINAL <> ($this:.A) returnType:kotlin.Array<.A> $this: VALUE_PARAMETER name: type:.A diff --git a/compiler/testData/ir/irText/classes/inlineClassSyntheticMethods.fir.txt b/compiler/testData/ir/irText/classes/inlineClassSyntheticMethods.fir.txt index 126d983b566..0d9e1378685 100644 --- a/compiler/testData/ir/irText/classes/inlineClassSyntheticMethods.fir.txt +++ b/compiler/testData/ir/irText/classes/inlineClassSyntheticMethods.fir.txt @@ -23,7 +23,7 @@ FILE fqName: fileName:/inlineClassSyntheticMethods.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun hashCode (): kotlin.Int declared in .C' TYPE_OP type=kotlin.Int origin=CAST typeOperand=kotlin.Int - CALL 'public final fun (): T of .C declared in .C' type=T of .C origin=null + CALL 'public final fun (): T of .C declared in .C' type=T of .C origin=GET_PROPERTY $this: GET_VAR ': .C.C> declared in .C.hashCode' type=.C.C> origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: @@ -58,7 +58,7 @@ FILE fqName: fileName:/inlineClassSyntheticMethods.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.Int declared in .IC' CALL 'public final fun hashCode (): kotlin.Int declared in .C' type=kotlin.Int origin=null - $this: CALL 'public final fun (): .C.IC> declared in .IC' type=.C.IC> origin=null + $this: CALL 'public final fun (): .C.IC> declared in .IC' type=.C.IC> origin=GET_PROPERTY $this: GET_VAR ': .IC.IC> declared in .IC.foo' type=.IC.IC> origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.fir.txt b/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.fir.txt index 6fd9b459215..b176edfc3be 100644 --- a/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.fir.txt +++ b/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.fir.txt @@ -28,13 +28,13 @@ FILE fqName: fileName:/lambdaInDataClassDefaultParameter.kt $this: VALUE_PARAMETER name: type:.A BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Function2<.A, kotlin.String, kotlin.Unit> declared in .A' - CALL 'public final fun (): kotlin.Function2<.A, kotlin.String, kotlin.Unit> declared in .A' type=kotlin.Function2<.A, kotlin.String, kotlin.Unit> origin=null + CALL 'public final fun (): kotlin.Function2<.A, kotlin.String, kotlin.Unit> declared in .A' type=kotlin.Function2<.A, kotlin.String, kotlin.Unit> origin=GET_PROPERTY $this: GET_VAR ': .A declared in .A.component1' type=.A origin=null FUN name:copy visibility:public modality:FINAL <> ($this:.A, runA:kotlin.Function2<.A, kotlin.String, kotlin.Unit>) returnType:.A $this: VALUE_PARAMETER name: type:.A VALUE_PARAMETER name:runA index:0 type:kotlin.Function2<.A, kotlin.String, kotlin.Unit> EXPRESSION_BODY - CALL 'public final fun (): kotlin.Function2<.A, kotlin.String, kotlin.Unit> declared in .A' type=kotlin.Function2<.A, kotlin.String, kotlin.Unit> origin=null + CALL 'public final fun (): kotlin.Function2<.A, kotlin.String, kotlin.Unit> declared in .A' type=kotlin.Function2<.A, kotlin.String, kotlin.Unit> origin=GET_PROPERTY $this: GET_VAR ': .A declared in .A.copy' type=.A origin=null BLOCK_BODY FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] @@ -81,13 +81,13 @@ FILE fqName: fileName:/lambdaInDataClassDefaultParameter.kt $this: VALUE_PARAMETER name: type:.B BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Any declared in .B' - CALL 'public final fun (): kotlin.Any declared in .B' type=kotlin.Any origin=null + CALL 'public final fun (): kotlin.Any declared in .B' type=kotlin.Any origin=GET_PROPERTY $this: GET_VAR ': .B declared in .B.component1' type=.B origin=null FUN name:copy visibility:public modality:FINAL <> ($this:.B, x:kotlin.Any) returnType:.B $this: VALUE_PARAMETER name: type:.B VALUE_PARAMETER name:x index:0 type:kotlin.Any EXPRESSION_BODY - CALL 'public final fun (): kotlin.Any declared in .B' type=kotlin.Any origin=null + CALL 'public final fun (): kotlin.Any declared in .B' type=kotlin.Any origin=GET_PROPERTY $this: GET_VAR ': .B declared in .B.copy' type=.B origin=null BLOCK_BODY 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/classes/objectWithInitializers.fir.txt b/compiler/testData/ir/irText/classes/objectWithInitializers.fir.txt index a652fc410f7..bd4cc693893 100644 --- a/compiler/testData/ir/irText/classes/objectWithInitializers.fir.txt +++ b/compiler/testData/ir/irText/classes/objectWithInitializers.fir.txt @@ -48,7 +48,7 @@ FILE fqName: fileName:/objectWithInitializers.kt BLOCK_BODY SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final]' type=kotlin.Unit origin=null receiver: GET_VAR ': .Test declared in .Test' type=.Test origin=null - value: CALL 'public final fun (): kotlin.Int declared in .Test' type=kotlin.Int origin=null + value: CALL 'public final fun (): kotlin.Int declared in .Test' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': .Test declared in .Test' type=.Test origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/classes/qualifiedSuperCalls.fir.txt b/compiler/testData/ir/irText/classes/qualifiedSuperCalls.fir.txt index 41363583194..bcff9d58e23 100644 --- a/compiler/testData/ir/irText/classes/qualifiedSuperCalls.fir.txt +++ b/compiler/testData/ir/irText/classes/qualifiedSuperCalls.fir.txt @@ -69,9 +69,9 @@ FILE fqName: fileName:/qualifiedSuperCalls.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .CBoth' CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null - $this: CALL 'public open fun (): kotlin.Int declared in .ILeft' type=kotlin.Int origin=null + $this: CALL 'public open fun (): kotlin.Int declared in .ILeft' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': .CBoth declared in .CBoth.' type=.CBoth origin=null - other: CALL 'public open fun (): kotlin.Int declared in .IRight' type=kotlin.Int origin=null + other: CALL 'public open fun (): kotlin.Int declared in .IRight' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': .CBoth declared in .CBoth.' type=.CBoth origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/classes/superCalls.fir.txt b/compiler/testData/ir/irText/classes/superCalls.fir.txt index 9b7df92b159..c354aafc4f8 100644 --- a/compiler/testData/ir/irText/classes/superCalls.fir.txt +++ b/compiler/testData/ir/irText/classes/superCalls.fir.txt @@ -51,7 +51,7 @@ FILE fqName: fileName:/superCalls.kt $this: VALUE_PARAMETER name: type:.Derived BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .Derived' - CALL 'public open fun (): kotlin.String declared in .Base' type=kotlin.String origin=null + CALL 'public open fun (): kotlin.String declared in .Base' type=kotlin.String origin=GET_PROPERTY $this: GET_VAR ': .Derived declared in .Derived.' type=.Derived origin=null FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:.Base) returnType:kotlin.Int [fake_override] overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.fir.txt index 14bb1430e3a..32639926c3f 100644 --- a/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.fir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.fir.txt @@ -59,7 +59,7 @@ FILE fqName: fileName:/delegatedPropertyAccessorsWithAnnotations.kt VALUE_PARAMETER name:kProp index:1 type:kotlin.Any? BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun getValue (thisRef: kotlin.Any?, kProp: kotlin.Any?): kotlin.Int [operator] declared in .Cell' - CALL 'public final fun (): kotlin.Int declared in .Cell' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in .Cell' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': .Cell declared in .Cell.getValue' type=.Cell origin=null FUN name:setValue visibility:public modality:FINAL <> ($this:.Cell, thisRef:kotlin.Any?, kProp:kotlin.Any?, newValue:kotlin.Int) returnType:kotlin.Unit [operator] $this: VALUE_PARAMETER name: type:.Cell diff --git a/compiler/testData/ir/irText/declarations/constValInitializers.fir.txt b/compiler/testData/ir/irText/declarations/constValInitializers.fir.txt index d6fb1902ad1..2d8845f61e5 100644 --- a/compiler/testData/ir/irText/declarations/constValInitializers.fir.txt +++ b/compiler/testData/ir/irText/declarations/constValInitializers.fir.txt @@ -22,9 +22,9 @@ FILE fqName: fileName:/constValInitializers.kt EXPRESSION_BODY CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null - $this: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null - other: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null - other: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null + $this: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY + other: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY + other: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:I2 visibility:public modality:FINAL [const,val] BLOCK_BODY @@ -54,8 +54,8 @@ FILE fqName: fileName:/constValInitializers.kt FIELD PROPERTY_BACKING_FIELD name:STR3 type:kotlin.String visibility:private [final,static] EXPRESSION_BODY CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=null - $this: CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=null - other: CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=null + $this: CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=GET_PROPERTY + other: CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=GET_PROPERTY FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String correspondingProperty: PROPERTY name:STR3 visibility:public modality:FINAL [const,val] BLOCK_BODY @@ -66,9 +66,9 @@ FILE fqName: fileName:/constValInitializers.kt EXPRESSION_BODY STRING_CONCATENATION type=kotlin.String CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null - $this: CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=null + $this: CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=GET_PROPERTY CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null - $this: CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=null + $this: CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=GET_PROPERTY FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String correspondingProperty: PROPERTY name:STR4 visibility:public modality:FINAL [const,val] BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.txt b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.txt index 7f42ca2a971..b9b1390729b 100644 --- a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.txt +++ b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.txt @@ -36,23 +36,23 @@ FILE fqName: fileName:/dataClassMembers.kt $this: VALUE_PARAMETER name: type:.Test.Test> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component1 (): T of .Test declared in .Test' - CALL 'public final fun (): T of .Test declared in .Test' type=T of .Test origin=null + CALL 'public final fun (): T of .Test declared in .Test' type=T of .Test origin=GET_PROPERTY $this: GET_VAR ': .Test.Test> declared in .Test.component1' type=.Test.Test> origin=null FUN name:component2 visibility:public modality:FINAL <> ($this:.Test.Test>) returnType:kotlin.String $this: VALUE_PARAMETER name: type:.Test.Test> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component2 (): kotlin.String declared in .Test' - CALL 'public final fun (): kotlin.String declared in .Test' type=kotlin.String origin=null + CALL 'public final fun (): kotlin.String declared in .Test' type=kotlin.String origin=GET_PROPERTY $this: GET_VAR ': .Test.Test> declared in .Test.component2' type=.Test.Test> origin=null FUN name:copy visibility:public modality:FINAL <> ($this:.Test.Test>, x:T of .Test, y:kotlin.String) returnType:.Test.Test> $this: VALUE_PARAMETER name: type:.Test.Test> VALUE_PARAMETER name:x index:0 type:T of .Test EXPRESSION_BODY - CALL 'public final fun (): T of .Test declared in .Test' type=T of .Test origin=null + CALL 'public final fun (): T of .Test declared in .Test' type=T of .Test origin=GET_PROPERTY $this: GET_VAR ': .Test.Test> declared in .Test.copy' type=.Test.Test> origin=null VALUE_PARAMETER name:y index:1 type:kotlin.String EXPRESSION_BODY - CALL 'public final fun (): kotlin.String declared in .Test' type=kotlin.String origin=null + CALL 'public final fun (): kotlin.String declared in .Test' type=kotlin.String origin=GET_PROPERTY $this: GET_VAR ': .Test.Test> declared in .Test.copy' type=.Test.Test> origin=null BLOCK_BODY 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/declarations/provideDelegate/differentReceivers.fir.txt b/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.fir.txt index 30372fadfe7..d56b1e708a8 100644 --- a/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.fir.txt +++ b/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.fir.txt @@ -36,7 +36,7 @@ FILE fqName: fileName:/differentReceivers.kt VALUE_PARAMETER name:p index:1 type:kotlin.Any BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun provideDelegate (host: kotlin.Any?, p: kotlin.Any): kotlin.String [operator] declared in ' - CALL 'public final fun (): kotlin.String declared in .MyClass' type=kotlin.String origin=null + CALL 'public final fun (): kotlin.String declared in .MyClass' type=kotlin.String origin=GET_PROPERTY $this: GET_VAR ': .MyClass declared in .provideDelegate' type=.MyClass origin=null FUN name:getValue visibility:public modality:FINAL <> ($receiver:kotlin.String, receiver:kotlin.Any?, p:kotlin.Any) returnType:kotlin.String [operator] $receiver: VALUE_PARAMETER name: type:kotlin.String @@ -77,8 +77,8 @@ FILE fqName: fileName:/differentReceivers.kt FIELD PROPERTY_BACKING_FIELD name:testOK type:kotlin.String visibility:private [final,static] EXPRESSION_BODY CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=null - $this: CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=null - other: CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=null + $this: CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=GET_PROPERTY + other: CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=GET_PROPERTY FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String correspondingProperty: PROPERTY name:testOK visibility:public modality:FINAL [val] BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/local.fir.txt b/compiler/testData/ir/irText/declarations/provideDelegate/local.fir.txt index d5237cfb495..31ed33956e4 100644 --- a/compiler/testData/ir/irText/declarations/provideDelegate/local.fir.txt +++ b/compiler/testData/ir/irText/declarations/provideDelegate/local.fir.txt @@ -23,7 +23,7 @@ FILE fqName: fileName:/local.kt VALUE_PARAMETER name:property index:1 type:kotlin.Any? BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun getValue (thisRef: kotlin.Any?, property: kotlin.Any?): kotlin.String [operator] declared in .Delegate' - CALL 'public final fun (): kotlin.String declared in .Delegate' type=kotlin.String origin=null + CALL 'public final fun (): kotlin.String declared in .Delegate' type=kotlin.String origin=GET_PROPERTY $this: GET_VAR ': .Delegate declared in .Delegate.getValue' type=.Delegate origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: @@ -63,7 +63,7 @@ FILE fqName: fileName:/local.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun provideDelegate (thisRef: kotlin.Any?, property: kotlin.Any?): .Delegate [operator] declared in .DelegateProvider' CONSTRUCTOR_CALL 'public constructor (value: kotlin.String) [primary] declared in .Delegate' type=.Delegate origin=null - value: CALL 'public final fun (): kotlin.String declared in .DelegateProvider' type=kotlin.String origin=null + value: CALL 'public final fun (): kotlin.String declared in .DelegateProvider' type=kotlin.String origin=GET_PROPERTY $this: GET_VAR ': .DelegateProvider declared in .DelegateProvider.provideDelegate' type=.DelegateProvider origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.fir.txt b/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.fir.txt index 733f0970f5e..ef09f9a8e07 100644 --- a/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.fir.txt +++ b/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.fir.txt @@ -36,7 +36,7 @@ FILE fqName: fileName:/localDifferentReceivers.kt VALUE_PARAMETER name:p index:1 type:kotlin.Any BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun provideDelegate (host: kotlin.Any?, p: kotlin.Any): kotlin.String [operator] declared in ' - CALL 'public final fun (): kotlin.String declared in .MyClass' type=kotlin.String origin=null + CALL 'public final fun (): kotlin.String declared in .MyClass' type=kotlin.String origin=GET_PROPERTY $this: GET_VAR ': .MyClass declared in .provideDelegate' type=.MyClass origin=null FUN name:getValue visibility:public modality:FINAL <> ($receiver:kotlin.String, receiver:kotlin.Any?, p:kotlin.Any) returnType:kotlin.String [operator] $receiver: VALUE_PARAMETER name: type:kotlin.String diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/member.fir.txt b/compiler/testData/ir/irText/declarations/provideDelegate/member.fir.txt index 440ae2e7937..4ff136fb662 100644 --- a/compiler/testData/ir/irText/declarations/provideDelegate/member.fir.txt +++ b/compiler/testData/ir/irText/declarations/provideDelegate/member.fir.txt @@ -23,7 +23,7 @@ FILE fqName: fileName:/member.kt VALUE_PARAMETER name:property index:1 type:kotlin.Any? BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun getValue (thisRef: kotlin.Any?, property: kotlin.Any?): kotlin.String [operator] declared in .Delegate' - CALL 'public final fun (): kotlin.String declared in .Delegate' type=kotlin.String origin=null + CALL 'public final fun (): kotlin.String declared in .Delegate' type=kotlin.String origin=GET_PROPERTY $this: GET_VAR ': .Delegate declared in .Delegate.getValue' type=.Delegate origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: @@ -63,7 +63,7 @@ FILE fqName: fileName:/member.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun provideDelegate (thisRef: kotlin.Any?, property: kotlin.Any?): .Delegate [operator] declared in .DelegateProvider' CONSTRUCTOR_CALL 'public constructor (value: kotlin.String) [primary] declared in .Delegate' type=.Delegate origin=null - value: CALL 'public final fun (): kotlin.String declared in .DelegateProvider' type=kotlin.String origin=null + value: CALL 'public final fun (): kotlin.String declared in .DelegateProvider' type=kotlin.String origin=GET_PROPERTY $this: GET_VAR ': .DelegateProvider declared in .DelegateProvider.provideDelegate' type=.DelegateProvider origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.fir.txt b/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.fir.txt index 4b1cdbee39e..85ce430cb87 100644 --- a/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.fir.txt +++ b/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.fir.txt @@ -31,7 +31,7 @@ FILE fqName: fileName:/memberExtension.kt RETURN type=kotlin.Nothing from='public final fun getValue (receiver: kotlin.String, p: kotlin.Any): kotlin.String [operator] declared in .Host.StringDelegate' CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=null $this: GET_VAR 'receiver: kotlin.String declared in .Host.StringDelegate.getValue' type=kotlin.String origin=null - other: CALL 'public final fun (): kotlin.String declared in .Host.StringDelegate' type=kotlin.String origin=null + other: CALL 'public final fun (): kotlin.String declared in .Host.StringDelegate' type=kotlin.String origin=GET_PROPERTY $this: GET_VAR ': .Host.StringDelegate declared in .Host.StringDelegate.getValue' type=.Host.StringDelegate origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: @@ -77,7 +77,7 @@ FILE fqName: fileName:/memberExtension.kt PROPERTY name:ok visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:ok type:kotlin.String visibility:private [final] EXPRESSION_BODY - CALL 'public final fun (): kotlin.String declared in .Host' type=kotlin.String origin=null + CALL 'public final fun (): kotlin.String declared in .Host' type=kotlin.String origin=GET_PROPERTY $this: GET_VAR ': .Host declared in .Host' type=.Host origin=null $receiver: CONST String type=kotlin.String value="O" FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Host) returnType:kotlin.String diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.fir.txt b/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.fir.txt index 13adbb19c99..425f1c176ee 100644 --- a/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.fir.txt +++ b/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.fir.txt @@ -23,7 +23,7 @@ FILE fqName: fileName:/topLevel.kt VALUE_PARAMETER name:property index:1 type:kotlin.Any? BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun getValue (thisRef: kotlin.Any?, property: kotlin.Any?): kotlin.String [operator] declared in .Delegate' - CALL 'public final fun (): kotlin.String declared in .Delegate' type=kotlin.String origin=null + CALL 'public final fun (): kotlin.String declared in .Delegate' type=kotlin.String origin=GET_PROPERTY $this: GET_VAR ': .Delegate declared in .Delegate.getValue' type=.Delegate origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: @@ -63,7 +63,7 @@ FILE fqName: fileName:/topLevel.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun provideDelegate (thisRef: kotlin.Any?, property: kotlin.Any?): .Delegate [operator] declared in .DelegateProvider' CONSTRUCTOR_CALL 'public constructor (value: kotlin.String) [primary] declared in .Delegate' type=.Delegate origin=null - value: CALL 'public final fun (): kotlin.String declared in .DelegateProvider' type=kotlin.String origin=null + value: CALL 'public final fun (): kotlin.String declared in .DelegateProvider' type=kotlin.String origin=GET_PROPERTY $this: GET_VAR ': .DelegateProvider declared in .DelegateProvider.provideDelegate' type=.DelegateProvider origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/expressions/arrayAccess.fir.txt b/compiler/testData/ir/irText/expressions/arrayAccess.fir.txt index 83321920111..082ad87190b 100644 --- a/compiler/testData/ir/irText/expressions/arrayAccess.fir.txt +++ b/compiler/testData/ir/irText/expressions/arrayAccess.fir.txt @@ -23,7 +23,7 @@ FILE fqName: fileName:/arrayAccess.kt index: CONST Int type=kotlin.Int value=0 other: CALL 'public final fun get (index: kotlin.Int): kotlin.Int [operator] declared in kotlin.IntArray' type=kotlin.Int origin=null $this: GET_VAR 'a: kotlin.IntArray declared in .test' type=kotlin.IntArray origin=null - index: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null + index: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY other: CALL 'public final fun get (index: kotlin.Int): kotlin.Int [operator] declared in kotlin.IntArray' type=kotlin.Int origin=null $this: GET_VAR 'a: kotlin.IntArray declared in .test' type=kotlin.IntArray origin=null index: CALL 'public final fun foo (): kotlin.Int declared in ' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.fir.txt b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.fir.txt index 4acd6f85871..f0f68041d02 100644 --- a/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.fir.txt +++ b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.fir.txt @@ -57,11 +57,11 @@ FILE fqName: fileName:/arrayAugmentedAssignment1.kt BLOCK_BODY VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.Int [val] CALL 'public final fun get (index: kotlin.Int): kotlin.Int [operator] declared in kotlin.IntArray' type=kotlin.Int origin=null - $this: CALL 'public final fun (): kotlin.IntArray declared in .C' type=kotlin.IntArray origin=null + $this: CALL 'public final fun (): kotlin.IntArray declared in .C' type=kotlin.IntArray origin=GET_PROPERTY $this: GET_VAR 'c: .C declared in .testMember' type=.C origin=null index: CONST Int type=kotlin.Int value=0 CALL 'public final fun set (index: kotlin.Int, value: kotlin.Int): kotlin.Unit [operator] declared in kotlin.IntArray' type=kotlin.Unit origin=null - $this: CALL 'public final fun (): kotlin.IntArray declared in .C' type=kotlin.IntArray origin=null + $this: CALL 'public final fun (): kotlin.IntArray declared in .C' type=kotlin.IntArray origin=GET_PROPERTY $this: GET_VAR 'c: .C declared in .testMember' type=.C origin=null index: CONST Int type=kotlin.Int value=0 value: CALL 'public final fun inc (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/expressions/augmentedAssignment1.fir.txt b/compiler/testData/ir/irText/expressions/augmentedAssignment1.fir.txt index ddc11a1594d..96c60969c2c 100644 --- a/compiler/testData/ir/irText/expressions/augmentedAssignment1.fir.txt +++ b/compiler/testData/ir/irText/expressions/augmentedAssignment1.fir.txt @@ -42,21 +42,21 @@ FILE fqName: fileName:/augmentedAssignment1.kt BLOCK_BODY SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=null value: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null - $this: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null + $this: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY other: CONST Int type=kotlin.Int value=1 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=null value: CALL 'public final fun minus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null - $this: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null + $this: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY other: CONST Int type=kotlin.Int value=2 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=null value: CALL 'public final fun times (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null - $this: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null + $this: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY other: CONST Int type=kotlin.Int value=3 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=null value: CALL 'public final fun div (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null - $this: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null + $this: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY other: CONST Int type=kotlin.Int value=4 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=null value: CALL 'public final fun rem (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null - $this: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null + $this: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY other: CONST Int type=kotlin.Int value=5 diff --git a/compiler/testData/ir/irText/expressions/augmentedAssignment2.fir.txt b/compiler/testData/ir/irText/expressions/augmentedAssignment2.fir.txt index 61be95de81d..d5aa74e0f5b 100644 --- a/compiler/testData/ir/irText/expressions/augmentedAssignment2.fir.txt +++ b/compiler/testData/ir/irText/expressions/augmentedAssignment2.fir.txt @@ -69,17 +69,17 @@ FILE fqName: fileName:/augmentedAssignment2.kt FUN name:testProperty visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY CALL 'public final fun plusAssign (s: kotlin.String): kotlin.Unit [operator] declared in ' type=kotlin.Unit origin=null - $receiver: CALL 'public final fun (): .A declared in ' type=.A origin=null + $receiver: CALL 'public final fun (): .A declared in ' type=.A origin=GET_PROPERTY s: CONST String type=kotlin.String value="+=" CALL 'public final fun minusAssign (s: kotlin.String): kotlin.Unit [operator] declared in ' type=kotlin.Unit origin=null - $receiver: CALL 'public final fun (): .A declared in ' type=.A origin=null + $receiver: CALL 'public final fun (): .A declared in ' type=.A origin=GET_PROPERTY s: CONST String type=kotlin.String value="-=" CALL 'public final fun timesAssign (s: kotlin.String): kotlin.Unit [operator] declared in ' type=kotlin.Unit origin=null - $receiver: CALL 'public final fun (): .A declared in ' type=.A origin=null + $receiver: CALL 'public final fun (): .A declared in ' type=.A origin=GET_PROPERTY s: CONST String type=kotlin.String value="*=" CALL 'public final fun divAssign (s: kotlin.String): kotlin.Unit [operator] declared in ' type=kotlin.Unit origin=null - $receiver: CALL 'public final fun (): .A declared in ' type=.A origin=null + $receiver: CALL 'public final fun (): .A declared in ' type=.A origin=GET_PROPERTY s: CONST String type=kotlin.String value="/=" CALL 'public final fun remAssign (s: kotlin.String): kotlin.Unit [operator] declared in ' type=kotlin.Unit origin=null - $receiver: CALL 'public final fun (): .A declared in ' type=.A origin=null + $receiver: CALL 'public final fun (): .A declared in ' type=.A origin=GET_PROPERTY s: CONST String type=kotlin.String value="%=" diff --git a/compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.fir.txt b/compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.fir.txt index d3804cf0e25..5a60ae532c1 100644 --- a/compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.fir.txt +++ b/compiler/testData/ir/irText/expressions/callableReferences/withVarargViewedAsArray.fir.txt @@ -29,7 +29,7 @@ FILE fqName: fileName:/withVarargViewedAsArray.kt args: VARARG type=kotlin.IntArray varargElementType=kotlin.Int SPREAD_ELEMENT CONSTRUCTOR_CALL 'public constructor (size: kotlin.Int, init: kotlin.Function1) declared in kotlin.IntArray' type=kotlin.IntArray origin=null - size: CALL 'public final fun (): kotlin.Int declared in kotlin.Array' type=kotlin.Int origin=null + size: CALL 'public final fun (): kotlin.Int declared in kotlin.Array' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR 'args: kotlin.Array [vararg] declared in .nsum' type=kotlin.Array origin=null init: FUN_EXPR type=kotlin.Function1 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (it:kotlin.Int) returnType:kotlin.Int diff --git a/compiler/testData/ir/irText/expressions/classReference.fir.txt b/compiler/testData/ir/irText/expressions/classReference.fir.txt index 15469735de3..2d94afaf6d8 100644 --- a/compiler/testData/ir/irText/expressions/classReference.fir.txt +++ b/compiler/testData/ir/irText/expressions/classReference.fir.txt @@ -24,11 +24,11 @@ FILE fqName: fileName:/classReference.kt GET_OBJECT 'CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit GET_CLASS type=kotlin.reflect.KClass<.A> CONSTRUCTOR_CALL 'public constructor () [primary] declared in .A' type=.A origin=null - CALL 'public final fun (): java.lang.Class> declared in kotlin.jvm' type=java.lang.Class<.A> origin=null + CALL 'public final fun (): java.lang.Class> declared in kotlin.jvm' type=java.lang.Class<.A> origin=GET_PROPERTY : .A $receiver: GET_CLASS type=kotlin.reflect.KClass<.A> GET_OBJECT 'CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit - CALL 'public final fun (): java.lang.Class> declared in kotlin.jvm' type=java.lang.Class<.A> origin=null + CALL 'public final fun (): java.lang.Class> declared in kotlin.jvm' type=java.lang.Class<.A> origin=GET_PROPERTY : .A $receiver: GET_CLASS type=kotlin.reflect.KClass<.A> CONSTRUCTOR_CALL 'public constructor () [primary] declared in .A' type=.A origin=null diff --git a/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.fir.txt b/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.fir.txt index 0c6c7dce422..0233ee89c2b 100644 --- a/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.fir.txt +++ b/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.fir.txt @@ -143,7 +143,7 @@ FILE fqName: fileName:/complexAugmentedAssignment.kt FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY VAR IR_TEMPORARY_VARIABLE name:tmp_3 type:kotlin.Int [val] - CALL 'public final fun (): kotlin.Int declared in .X1' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in .X1' type=kotlin.Int origin=GET_PROPERTY $this: GET_OBJECT 'CLASS OBJECT name:X1 modality:FINAL visibility:public superTypes:[kotlin.Any]' type=.X1 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x1 type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_OBJECT 'CLASS OBJECT name:X1 modality:FINAL visibility:public superTypes:[kotlin.Any]' type=.X1 @@ -151,7 +151,7 @@ FILE fqName: fileName:/complexAugmentedAssignment.kt $this: GET_VAR 'val tmp_3: kotlin.Int [val] declared in .test2' type=kotlin.Int origin=null GET_VAR 'val tmp_3: kotlin.Int [val] declared in .test2' type=kotlin.Int origin=null VAR IR_TEMPORARY_VARIABLE name:tmp_4 type:kotlin.Int [val] - CALL 'public final fun (): kotlin.Int declared in .X1.X2' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in .X1.X2' type=kotlin.Int origin=GET_PROPERTY $this: GET_OBJECT 'CLASS OBJECT name:X2 modality:FINAL visibility:public superTypes:[kotlin.Any]' type=.X1.X2 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x2 type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_OBJECT 'CLASS OBJECT name:X2 modality:FINAL visibility:public superTypes:[kotlin.Any]' type=.X1.X2 @@ -159,7 +159,7 @@ FILE fqName: fileName:/complexAugmentedAssignment.kt $this: GET_VAR 'val tmp_4: kotlin.Int [val] declared in .test2' type=kotlin.Int origin=null GET_VAR 'val tmp_4: kotlin.Int [val] declared in .test2' type=kotlin.Int origin=null VAR IR_TEMPORARY_VARIABLE name:tmp_5 type:kotlin.Int [val] - CALL 'public final fun (): kotlin.Int declared in .X1.X2.X3' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in .X1.X2.X3' type=kotlin.Int origin=GET_PROPERTY $this: GET_OBJECT 'CLASS OBJECT name:X3 modality:FINAL visibility:public superTypes:[kotlin.Any]' type=.X1.X2.X3 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x3 type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_OBJECT 'CLASS OBJECT name:X3 modality:FINAL visibility:public superTypes:[kotlin.Any]' type=.X1.X2.X3 @@ -220,9 +220,9 @@ FILE fqName: fileName:/complexAugmentedAssignment.kt BLOCK_BODY SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.Int visibility:private' type=kotlin.Unit origin=null value: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null - $this: CALL 'public final fun (): kotlin.Int declared in .B' type=kotlin.Int origin=null + $this: CALL 'public final fun (): kotlin.Int declared in .B' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': .B declared in .Host.plusAssign' type=.B origin=null - other: CALL 'public final fun (): kotlin.Int declared in .B' type=kotlin.Int origin=null + other: CALL 'public final fun (): kotlin.Int declared in .B' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR 'b: .B declared in .Host.plusAssign' type=.B origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/expressions/dotQualified.fir.txt b/compiler/testData/ir/irText/expressions/dotQualified.fir.txt index 54148bcbe8b..ef415e33da0 100644 --- a/compiler/testData/ir/irText/expressions/dotQualified.fir.txt +++ b/compiler/testData/ir/irText/expressions/dotQualified.fir.txt @@ -3,11 +3,11 @@ FILE fqName: fileName:/dotQualified.kt VALUE_PARAMETER name:s index:0 type:kotlin.String BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun length (s: kotlin.String): kotlin.Int declared in ' - CALL 'public open fun (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=null + CALL 'public open fun (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR 's: kotlin.String declared in .length' type=kotlin.String origin=null FUN name:lengthN visibility:public modality:FINAL <> (s:kotlin.String?) returnType:kotlin.Int? VALUE_PARAMETER name:s index:0 type:kotlin.String? BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun lengthN (s: kotlin.String?): kotlin.Int? declared in ' - CALL 'public open fun (): kotlin.Int declared in kotlin.String' type=kotlin.Int? origin=null + CALL 'public open fun (): kotlin.Int declared in kotlin.String' type=kotlin.Int? origin=GET_PROPERTY $this: GET_VAR 's: kotlin.String? declared in .lengthN' type=kotlin.String? origin=null diff --git a/compiler/testData/ir/irText/expressions/elvis.fir.txt b/compiler/testData/ir/irText/expressions/elvis.fir.txt index 60026ac1a63..459ce80ec76 100644 --- a/compiler/testData/ir/irText/expressions/elvis.fir.txt +++ b/compiler/testData/ir/irText/expressions/elvis.fir.txt @@ -86,7 +86,7 @@ FILE fqName: fileName:/elvis.kt RETURN type=kotlin.Nothing from='public final fun test4 (x: kotlin.Any): kotlin.Any declared in ' BLOCK type=kotlin.Any origin=ELVIS VAR IR_TEMPORARY_VARIABLE name:tmp_3 type:kotlin.Any? [val] - CALL 'public final fun (): kotlin.Any? declared in ' type=kotlin.Any? origin=null + CALL 'public final fun (): kotlin.Any? declared in ' type=kotlin.Any? origin=GET_PROPERTY WHEN type=kotlin.Any origin=ELVIS BRANCH if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ diff --git a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.txt b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.txt index a2b858760da..809735933f5 100644 --- a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.txt +++ b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.txt @@ -32,7 +32,7 @@ FILE fqName: fileName:/enumEntryAsReceiver.kt $this: VALUE_PARAMETER name: type:.X.B BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.String declared in .X.B.value' - CALL 'public final fun (): kotlin.String declared in .X.B' type=kotlin.String origin=null + CALL 'public final fun (): kotlin.String declared in .X.B' type=kotlin.String origin=GET_PROPERTY $this: GET_VAR ': . declared in .' type=. origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.X.B) returnType:kotlin.Function0 correspondingProperty: PROPERTY name:value visibility:public modality:FINAL [val] @@ -90,5 +90,5 @@ FILE fqName: fileName:/enumEntryAsReceiver.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in ' CALL 'public abstract fun invoke (): R of kotlin.Function0 [operator] declared in kotlin.Function0' type=kotlin.String origin=INVOKE - $this: CALL 'public abstract fun (): kotlin.Function0 declared in .X' type=kotlin.Function0 origin=null + $this: CALL 'public abstract fun (): kotlin.Function0 declared in .X' type=kotlin.Function0 origin=GET_PROPERTY $this: GET_ENUM 'ENUM_ENTRY name:B' type=.X diff --git a/compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.fir.txt b/compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.fir.txt deleted file mode 100644 index 7ce97e01d05..00000000000 --- a/compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.fir.txt +++ /dev/null @@ -1,14 +0,0 @@ -FILE fqName: fileName:/extensionPropertyGetterCall.kt - PROPERTY name:okext visibility:public modality:FINAL [val] - FUN name: visibility:public modality:FINAL <> ($receiver:kotlin.String) returnType:kotlin.String - correspondingProperty: PROPERTY name:okext visibility:public modality:FINAL [val] - $receiver: VALUE_PARAMETER name: type:kotlin.String - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - CONST String type=kotlin.String value="OK" - FUN name:test5 visibility:public modality:FINAL <> ($receiver:kotlin.String) returnType:kotlin.String - $receiver: VALUE_PARAMETER name: type:kotlin.String - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test5 (): kotlin.String declared in ' - CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=null - $receiver: GET_VAR ': kotlin.String declared in .test5' type=kotlin.String origin=null diff --git a/compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.kt b/compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.kt index 1da7f1df274..ba66df3b6d6 100644 --- a/compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.kt +++ b/compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.kt @@ -1,2 +1,3 @@ +// FIR_IDENTICAL val String.okext: String get() = "OK" fun String.test5() = okext diff --git a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.fir.txt b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.fir.txt index 0a78b0605b1..ab87e13d481 100644 --- a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.fir.txt +++ b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.fir.txt @@ -72,7 +72,7 @@ FILE fqName: fileName:/forWithImplicitReceivers.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun hasNext (): kotlin.Boolean [operator] declared in .IReceiver' CALL 'public final fun greater (arg0: kotlin.Int, arg1: kotlin.Int): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=GT - arg0: CALL 'public final fun (): kotlin.Int declared in .IntCell' type=kotlin.Int origin=null + arg0: CALL 'public final fun (): kotlin.Int declared in .IntCell' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': .IntCell declared in .IReceiver.hasNext' type=.IntCell origin=null arg1: CONST Int type=kotlin.Int value=0 FUN name:next visibility:public modality:OPEN <> ($this:.IReceiver, $receiver:.IntCell) returnType:kotlin.Int [operator] @@ -82,7 +82,7 @@ FILE fqName: fileName:/forWithImplicitReceivers.kt RETURN type=kotlin.Nothing from='public open fun next (): kotlin.Int [operator] declared in .IReceiver' BLOCK type=kotlin.Int origin=null VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.Int [val] - CALL 'public final fun (): kotlin.Int declared in .IntCell' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in .IntCell' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': .IntCell declared in .IReceiver.next' type=.IntCell origin=null SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_VAR ': .IntCell declared in .IReceiver.next' type=.IntCell origin=null diff --git a/compiler/testData/ir/irText/expressions/funInterface/partialSam.fir.txt b/compiler/testData/ir/irText/expressions/funInterface/partialSam.fir.txt index 23de6d185b3..62aa10040af 100644 --- a/compiler/testData/ir/irText/expressions/funInterface/partialSam.fir.txt +++ b/compiler/testData/ir/irText/expressions/funInterface/partialSam.fir.txt @@ -108,7 +108,7 @@ FILE fqName: fileName:/partialSam.kt BLOCK_BODY CALL 'public final fun runConversion (f1: .Fn, f2: .Fn): kotlin.Int declared in .J' type=kotlin.Int origin=null $this: GET_VAR 'j: .J declared in .test' type=.J origin=null - f1: CALL 'public final fun (): . declared in ' type=. origin=null + f1: CALL 'public final fun (): . declared in ' type=. origin=GET_PROPERTY f2: FUN_EXPR type=kotlin.Function3 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (s:kotlin.String, i:kotlin.Int, ti:kotlin.Int) returnType:kotlin.String VALUE_PARAMETER name:s index:0 type:kotlin.String @@ -127,4 +127,4 @@ FILE fqName: fileName:/partialSam.kt BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (s: kotlin.String, i: kotlin.Int, ts: kotlin.String): kotlin.Int declared in .test' CONST Int type=kotlin.Int value=1 - f2: CALL 'public final fun (): . declared in ' type=. origin=null + f2: CALL 'public final fun (): . declared in ' type=. origin=GET_PROPERTY diff --git a/compiler/testData/ir/irText/expressions/genericPropertyCall.fir.txt b/compiler/testData/ir/irText/expressions/genericPropertyCall.fir.txt index 4c74236c178..5c2451faa20 100644 --- a/compiler/testData/ir/irText/expressions/genericPropertyCall.fir.txt +++ b/compiler/testData/ir/irText/expressions/genericPropertyCall.fir.txt @@ -10,7 +10,7 @@ FILE fqName: fileName:/genericPropertyCall.kt PROPERTY name:test visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.String visibility:private [final,static] EXPRESSION_BODY - CALL 'public final fun (): T of . declared in ' type=kotlin.String origin=null + CALL 'public final fun (): T of . declared in ' type=kotlin.String origin=GET_PROPERTY : kotlin.String $receiver: CONST String type=kotlin.String value="abc" FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String diff --git a/compiler/testData/ir/irText/expressions/implicitCastToNonNull.fir.txt b/compiler/testData/ir/irText/expressions/implicitCastToNonNull.fir.txt index de1f3d542a6..2af255a3dad 100644 --- a/compiler/testData/ir/irText/expressions/implicitCastToNonNull.fir.txt +++ b/compiler/testData/ir/irText/expressions/implicitCastToNonNull.fir.txt @@ -11,7 +11,7 @@ FILE fqName: fileName:/implicitCastToNonNull.kt then: CONST Int type=kotlin.Int value=0 BRANCH if: CONST Boolean type=kotlin.Boolean value=true - then: CALL 'public open fun (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=null + then: CALL 'public open fun (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=GET_PROPERTY $this: TYPE_OP type=kotlin.String origin=IMPLICIT_CAST typeOperand=kotlin.String GET_VAR 'x: kotlin.String? declared in .test1' type=kotlin.String? origin=null FUN name:test2 visibility:public modality:FINAL (x:T of .test2) returnType:kotlin.Int @@ -27,7 +27,7 @@ FILE fqName: fileName:/implicitCastToNonNull.kt then: CONST Int type=kotlin.Int value=0 BRANCH if: CONST Boolean type=kotlin.Boolean value=true - then: CALL 'public abstract fun (): kotlin.Int declared in kotlin.CharSequence' type=kotlin.Int origin=null + then: CALL 'public abstract fun (): kotlin.Int declared in kotlin.CharSequence' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR 'x: T of .test2 declared in .test2' type=T of .test2 origin=null FUN name:test3 visibility:public modality:FINAL (x:kotlin.Any) returnType:kotlin.Int [inline] TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.CharSequence?] @@ -41,7 +41,7 @@ FILE fqName: fileName:/implicitCastToNonNull.kt then: CONST Int type=kotlin.Int value=0 BRANCH if: CONST Boolean type=kotlin.Boolean value=true - then: CALL 'public abstract fun (): kotlin.Int declared in kotlin.CharSequence' type=kotlin.Int origin=null + then: CALL 'public abstract fun (): kotlin.Int declared in kotlin.CharSequence' type=kotlin.Int origin=GET_PROPERTY $this: TYPE_OP type=T of .test3 origin=IMPLICIT_CAST typeOperand=T of .test3 GET_VAR 'x: kotlin.Any declared in .test3' type=kotlin.Any origin=null FUN name:test4 visibility:public modality:FINAL (x:kotlin.Any?) returnType:kotlin.Int [inline] @@ -56,7 +56,7 @@ FILE fqName: fileName:/implicitCastToNonNull.kt then: CONST Int type=kotlin.Int value=0 BRANCH if: CONST Boolean type=kotlin.Boolean value=true - then: CALL 'public abstract fun (): kotlin.Int declared in kotlin.CharSequence' type=kotlin.Int origin=null + then: CALL 'public abstract fun (): kotlin.Int declared in kotlin.CharSequence' type=kotlin.Int origin=GET_PROPERTY $this: TYPE_OP type=T of .test4 origin=IMPLICIT_CAST typeOperand=T of .test4 GET_VAR 'x: kotlin.Any? declared in .test4' type=kotlin.Any? origin=null FUN name:test5 visibility:public modality:FINAL (x:T of .test5, fn:kotlin.Function1.test5, kotlin.Unit>) returnType:kotlin.Unit diff --git a/compiler/testData/ir/irText/expressions/incrementDecrement.fir.txt b/compiler/testData/ir/irText/expressions/incrementDecrement.fir.txt index 34a58261396..ccb07646aab 100644 --- a/compiler/testData/ir/irText/expressions/incrementDecrement.fir.txt +++ b/compiler/testData/ir/irText/expressions/incrementDecrement.fir.txt @@ -72,25 +72,25 @@ FILE fqName: fileName:/incrementDecrement.kt VAR name:p1 type:kotlin.Int [val] BLOCK type=kotlin.Int origin=null VAR IR_TEMPORARY_VARIABLE name:tmp_4 type:kotlin.Int [val] - CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=null value: CALL 'public final fun inc (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'val tmp_4: kotlin.Int [val] declared in .testPropPrefix' type=kotlin.Int origin=null - CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY VAR name:p2 type:kotlin.Int [val] BLOCK type=kotlin.Int origin=null VAR IR_TEMPORARY_VARIABLE name:tmp_5 type:kotlin.Int [val] - CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=null value: CALL 'public final fun dec (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'val tmp_5: kotlin.Int [val] declared in .testPropPrefix' type=kotlin.Int origin=null - CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY FUN name:testPropPostfix visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY VAR name:p1 type:kotlin.Int [val] BLOCK type=kotlin.Int origin=null VAR IR_TEMPORARY_VARIABLE name:tmp_6 type:kotlin.Int [val] - CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=null value: 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 .testPropPostfix' type=kotlin.Int origin=null @@ -98,24 +98,24 @@ FILE fqName: fileName:/incrementDecrement.kt VAR name:p2 type:kotlin.Int [val] BLOCK type=kotlin.Int origin=null VAR IR_TEMPORARY_VARIABLE name:tmp_7 type:kotlin.Int [val] - CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=null value: CALL 'public final fun dec (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'val tmp_7: kotlin.Int [val] declared in .testPropPostfix' type=kotlin.Int origin=null - CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY FUN name:testArrayPrefix visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY VAR name:a1 type:kotlin.Int [val] BLOCK type=kotlin.Int origin=null VAR IR_TEMPORARY_VARIABLE name:tmp_8 type:kotlin.Int [val] CALL 'public final fun get (index: kotlin.Int): kotlin.Int [operator] declared in kotlin.IntArray' type=kotlin.Int origin=null - $this: CALL 'public final fun (): kotlin.IntArray declared in ' type=kotlin.IntArray origin=null + $this: CALL 'public final fun (): kotlin.IntArray declared in ' type=kotlin.IntArray origin=GET_PROPERTY index: CONST Int type=kotlin.Int value=0 VAR IR_TEMPORARY_VARIABLE name:tmp_9 type:kotlin.Int [val] CALL 'public final fun inc (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'val tmp_8: kotlin.Int [val] declared in .testArrayPrefix' type=kotlin.Int origin=null CALL 'public final fun set (index: kotlin.Int, value: kotlin.Int): kotlin.Unit [operator] declared in kotlin.IntArray' type=kotlin.Unit origin=null - $this: CALL 'public final fun (): kotlin.IntArray declared in ' type=kotlin.IntArray origin=null + $this: CALL 'public final fun (): kotlin.IntArray declared in ' type=kotlin.IntArray origin=GET_PROPERTY index: CONST Int type=kotlin.Int value=0 value: GET_VAR 'val tmp_9: kotlin.Int [val] declared in .testArrayPrefix' type=kotlin.Int origin=null GET_VAR 'val tmp_9: kotlin.Int [val] declared in .testArrayPrefix' type=kotlin.Int origin=null @@ -123,13 +123,13 @@ FILE fqName: fileName:/incrementDecrement.kt BLOCK type=kotlin.Int origin=null VAR IR_TEMPORARY_VARIABLE name:tmp_10 type:kotlin.Int [val] CALL 'public final fun get (index: kotlin.Int): kotlin.Int [operator] declared in kotlin.IntArray' type=kotlin.Int origin=null - $this: CALL 'public final fun (): kotlin.IntArray declared in ' type=kotlin.IntArray origin=null + $this: CALL 'public final fun (): kotlin.IntArray declared in ' type=kotlin.IntArray origin=GET_PROPERTY index: CONST Int type=kotlin.Int value=0 VAR IR_TEMPORARY_VARIABLE name:tmp_11 type:kotlin.Int [val] CALL 'public final fun dec (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'val tmp_10: kotlin.Int [val] declared in .testArrayPrefix' type=kotlin.Int origin=null CALL 'public final fun set (index: kotlin.Int, value: kotlin.Int): kotlin.Unit [operator] declared in kotlin.IntArray' type=kotlin.Unit origin=null - $this: CALL 'public final fun (): kotlin.IntArray declared in ' type=kotlin.IntArray origin=null + $this: CALL 'public final fun (): kotlin.IntArray declared in ' type=kotlin.IntArray origin=GET_PROPERTY index: CONST Int type=kotlin.Int value=0 value: GET_VAR 'val tmp_11: kotlin.Int [val] declared in .testArrayPrefix' type=kotlin.Int origin=null GET_VAR 'val tmp_11: kotlin.Int [val] declared in .testArrayPrefix' type=kotlin.Int origin=null @@ -139,10 +139,10 @@ FILE fqName: fileName:/incrementDecrement.kt BLOCK type=kotlin.Int origin=null VAR IR_TEMPORARY_VARIABLE name:tmp_12 type:kotlin.Int [val] CALL 'public final fun get (index: kotlin.Int): kotlin.Int [operator] declared in kotlin.IntArray' type=kotlin.Int origin=null - $this: CALL 'public final fun (): kotlin.IntArray declared in ' type=kotlin.IntArray origin=null + $this: CALL 'public final fun (): kotlin.IntArray declared in ' type=kotlin.IntArray origin=GET_PROPERTY index: CONST Int type=kotlin.Int value=0 CALL 'public final fun set (index: kotlin.Int, value: kotlin.Int): kotlin.Unit [operator] declared in kotlin.IntArray' type=kotlin.Unit origin=null - $this: CALL 'public final fun (): kotlin.IntArray declared in ' type=kotlin.IntArray origin=null + $this: CALL 'public final fun (): kotlin.IntArray declared in ' type=kotlin.IntArray origin=GET_PROPERTY index: CONST Int type=kotlin.Int value=0 value: CALL 'public final fun inc (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'val tmp_12: kotlin.Int [val] declared in .testArrayPostfix' type=kotlin.Int origin=null @@ -151,10 +151,10 @@ FILE fqName: fileName:/incrementDecrement.kt BLOCK type=kotlin.Int origin=null VAR IR_TEMPORARY_VARIABLE name:tmp_13 type:kotlin.Int [val] CALL 'public final fun get (index: kotlin.Int): kotlin.Int [operator] declared in kotlin.IntArray' type=kotlin.Int origin=null - $this: CALL 'public final fun (): kotlin.IntArray declared in ' type=kotlin.IntArray origin=null + $this: CALL 'public final fun (): kotlin.IntArray declared in ' type=kotlin.IntArray origin=GET_PROPERTY index: CONST Int type=kotlin.Int value=0 CALL 'public final fun set (index: kotlin.Int, value: kotlin.Int): kotlin.Unit [operator] declared in kotlin.IntArray' type=kotlin.Unit origin=null - $this: CALL 'public final fun (): kotlin.IntArray declared in ' type=kotlin.IntArray origin=null + $this: CALL 'public final fun (): kotlin.IntArray declared in ' type=kotlin.IntArray origin=GET_PROPERTY index: CONST Int type=kotlin.Int value=0 value: CALL 'public final fun dec (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null $this: GET_VAR 'val tmp_13: kotlin.Int [val] declared in .testArrayPostfix' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/expressions/javaSyntheticPropertyAccess.fir.txt b/compiler/testData/ir/irText/expressions/javaSyntheticPropertyAccess.fir.txt index 8b1e283b7c7..da59514f8aa 100644 --- a/compiler/testData/ir/irText/expressions/javaSyntheticPropertyAccess.fir.txt +++ b/compiler/testData/ir/irText/expressions/javaSyntheticPropertyAccess.fir.txt @@ -2,11 +2,11 @@ FILE fqName: fileName:/javaSyntheticPropertyAccess.kt FUN name:test visibility:public modality:FINAL <> (j:.J) returnType:kotlin.Unit VALUE_PARAMETER name:j index:0 type:.J BLOCK_BODY - CALL 'public open fun (): kotlin.Int declared in .J' type=kotlin.Int origin=null + CALL 'public open fun (): kotlin.Int declared in .J' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR 'j: .J declared in .test' type=.J origin=null ERROR_CALL 'Unresolved reference: R|/J.foo|' type=IrErrorType VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.Int [val] - CALL 'public open fun (): kotlin.Int declared in .J' type=kotlin.Int origin=null + CALL 'public open fun (): kotlin.Int declared in .J' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR 'j: .J declared in .test' type=.J origin=null ERROR_CALL 'Unresolved reference: R|/J.foo|' type=IrErrorType GET_VAR 'val tmp_0: kotlin.Int [val] declared in .test' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/expressions/kt16904.fir.txt b/compiler/testData/ir/irText/expressions/kt16904.fir.txt index 7b10b358bca..fcf75cce4ab 100644 --- a/compiler/testData/ir/irText/expressions/kt16904.fir.txt +++ b/compiler/testData/ir/irText/expressions/kt16904.fir.txt @@ -76,12 +76,12 @@ FILE fqName: fileName:/kt16904.kt CONSTRUCTOR visibility:public <> () returnType:.Test1 BLOCK_BODY CALL 'public final fun plusAssign (x: kotlin.Int): kotlin.Unit [operator] declared in .B' type=kotlin.Unit origin=null - $this: CALL 'public final fun (): .B declared in .A' type=.B origin=null + $this: CALL 'public final fun (): .B declared in .A' type=.B origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null x: CONST Int type=kotlin.Int value=42 SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private' type=kotlin.Unit origin=null value: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null - $this: CALL 'public final fun (): kotlin.Int declared in .A' type=kotlin.Int origin=null + $this: CALL 'public final fun (): kotlin.Int declared in .A' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null other: CONST Int type=kotlin.Int value=42 DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' diff --git a/compiler/testData/ir/irText/expressions/kt28006.fir.txt b/compiler/testData/ir/irText/expressions/kt28006.fir.txt index e4c8db6b135..5f095e30e28 100644 --- a/compiler/testData/ir/irText/expressions/kt28006.fir.txt +++ b/compiler/testData/ir/irText/expressions/kt28006.fir.txt @@ -42,7 +42,7 @@ FILE fqName: fileName:/kt28006.kt CONST String type=kotlin.String value="\uD83E" CONST String type=kotlin.String value="\uDD17" CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null - $this: CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=null + $this: CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=GET_PROPERTY FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String correspondingProperty: PROPERTY name:testConst3 visibility:public modality:FINAL [const,val] BLOCK_BODY @@ -53,9 +53,9 @@ FILE fqName: fileName:/kt28006.kt EXPRESSION_BODY STRING_CONCATENATION type=kotlin.String CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null - $this: CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=null + $this: CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=GET_PROPERTY CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null - $this: CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=null + $this: CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=GET_PROPERTY FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String correspondingProperty: PROPERTY name:testConst4 visibility:public modality:FINAL [const,val] BLOCK_BODY diff --git a/compiler/testData/ir/irText/expressions/kt30020.fir.txt b/compiler/testData/ir/irText/expressions/kt30020.fir.txt index 4eb8f16441f..208d697844d 100644 --- a/compiler/testData/ir/irText/expressions/kt30020.fir.txt +++ b/compiler/testData/ir/irText/expressions/kt30020.fir.txt @@ -26,7 +26,7 @@ FILE fqName: fileName:/kt30020.kt BLOCK_BODY CALL 'public final fun plusAssign (element: T of kotlin.collections.plusAssign): kotlin.Unit [inline,operator] declared in kotlin.collections' type=kotlin.Unit origin=null : kotlin.Int - $receiver: CALL 'public abstract fun (): kotlin.collections.MutableList declared in .X' type=kotlin.collections.MutableList origin=null + $receiver: CALL 'public abstract fun (): kotlin.collections.MutableList declared in .X' type=kotlin.collections.MutableList origin=GET_PROPERTY $this: GET_VAR 'x: .X declared in .test' type=.X origin=null element: CONST Int type=kotlin.Int value=1 CALL 'public final fun plusAssign (element: T of kotlin.collections.plusAssign): kotlin.Unit [inline,operator] declared in kotlin.collections' type=kotlin.Unit origin=null @@ -37,7 +37,7 @@ FILE fqName: fileName:/kt30020.kt CALL 'public final fun plusAssign (element: T of kotlin.collections.plusAssign): kotlin.Unit [inline,operator] declared in kotlin.collections' type=kotlin.Unit origin=null : kotlin.Int $receiver: TYPE_OP type=kotlin.collections.MutableList origin=CAST typeOperand=kotlin.collections.MutableList - CALL 'public abstract fun (): kotlin.collections.MutableList declared in .X' type=kotlin.collections.MutableList origin=null + CALL 'public abstract fun (): kotlin.collections.MutableList declared in .X' type=kotlin.collections.MutableList origin=GET_PROPERTY $this: GET_VAR 'x: .X declared in .test' type=.X origin=null element: CONST Int type=kotlin.Int value=3 CALL 'public final fun plusAssign (element: T of kotlin.collections.plusAssign): kotlin.Unit [inline,operator] declared in kotlin.collections' type=kotlin.Unit origin=null @@ -50,7 +50,7 @@ FILE fqName: fileName:/kt30020.kt : kotlin.Int $receiver: CALL 'public final fun CHECK_NOT_NULL (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): T0 of kotlin.internal.ir.CHECK_NOT_NULL declared in kotlin.internal.ir' type=kotlin.collections.MutableList origin=EXCLEXCL : kotlin.collections.MutableList - arg0: CALL 'public abstract fun (): kotlin.collections.MutableList declared in .X' type=kotlin.collections.MutableList? origin=null + arg0: CALL 'public abstract fun (): kotlin.collections.MutableList declared in .X' type=kotlin.collections.MutableList? origin=GET_PROPERTY $this: GET_VAR 'nx: .X? declared in .test' type=.X? origin=null element: CONST Int type=kotlin.Int value=5 CALL 'public final fun plusAssign (element: T of kotlin.collections.plusAssign): kotlin.Unit [inline,operator] declared in kotlin.collections' type=kotlin.Unit origin=null diff --git a/compiler/testData/ir/irText/expressions/membersImportedFromObject.fir.txt b/compiler/testData/ir/irText/expressions/membersImportedFromObject.fir.txt index e6a9b05438e..7d882ef8409 100644 --- a/compiler/testData/ir/irText/expressions/membersImportedFromObject.fir.txt +++ b/compiler/testData/ir/irText/expressions/membersImportedFromObject.fir.txt @@ -61,7 +61,7 @@ FILE fqName: fileName:/membersImportedFromObject.kt PROPERTY name:test2 visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY - CALL 'public final fun (): kotlin.Int declared in .A' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in .A' type=kotlin.Int origin=GET_PROPERTY $this: GET_OBJECT 'CLASS OBJECT name:A modality:FINAL visibility:public superTypes:[kotlin.Any]' type=.A FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] @@ -82,7 +82,7 @@ FILE fqName: fileName:/membersImportedFromObject.kt PROPERTY name:test4 visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY - CALL 'public final fun (): kotlin.Int declared in .A' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in .A' type=kotlin.Int origin=GET_PROPERTY $this: CONST Int type=kotlin.Int value=1 $receiver: CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int diff --git a/compiler/testData/ir/irText/expressions/multipleThisReferences.fir.txt b/compiler/testData/ir/irText/expressions/multipleThisReferences.fir.txt index eefe7b20dce..1c65adb98cd 100644 --- a/compiler/testData/ir/irText/expressions/multipleThisReferences.fir.txt +++ b/compiler/testData/ir/irText/expressions/multipleThisReferences.fir.txt @@ -84,7 +84,7 @@ FILE fqName: fileName:/multipleThisReferences.kt FIELD PROPERTY_BACKING_FIELD name:xx type:kotlin.Int visibility:private [final] EXPRESSION_BODY CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null - $this: CALL 'public final fun (): kotlin.Int declared in .Outer.Inner' type=kotlin.Int origin=null + $this: CALL 'public final fun (): kotlin.Int declared in .Outer.Inner' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': . declared in .' type=. origin=null other: GET_VAR 'y: kotlin.Int declared in .Host.' type=kotlin.Int origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Host.test.) returnType:kotlin.Int diff --git a/compiler/testData/ir/irText/expressions/objectClassReference.fir.txt b/compiler/testData/ir/irText/expressions/objectClassReference.fir.txt index 31cbfde2536..8ef983e8bcf 100644 --- a/compiler/testData/ir/irText/expressions/objectClassReference.fir.txt +++ b/compiler/testData/ir/irText/expressions/objectClassReference.fir.txt @@ -22,7 +22,7 @@ FILE fqName: fileName:/objectClassReference.kt BLOCK_BODY GET_CLASS type=kotlin.reflect.KClass<.A> GET_OBJECT 'CLASS OBJECT name:A modality:FINAL visibility:public superTypes:[kotlin.Any]' type=.A - CALL 'public final fun (): java.lang.Class> declared in kotlin.jvm' type=java.lang.Class<.A> origin=null + CALL 'public final fun (): java.lang.Class> declared in kotlin.jvm' type=java.lang.Class<.A> origin=GET_PROPERTY : .A $receiver: GET_CLASS type=kotlin.reflect.KClass<.A> GET_OBJECT 'CLASS OBJECT name:A modality:FINAL visibility:public superTypes:[kotlin.Any]' type=.A diff --git a/compiler/testData/ir/irText/expressions/objectReferenceInFieldInitializer.fir.txt b/compiler/testData/ir/irText/expressions/objectReferenceInFieldInitializer.fir.txt index 73523e364c1..8d9e4bdfe95 100644 --- a/compiler/testData/ir/irText/expressions/objectReferenceInFieldInitializer.fir.txt +++ b/compiler/testData/ir/irText/expressions/objectReferenceInFieldInitializer.fir.txt @@ -22,7 +22,7 @@ FILE fqName: fileName:/objectReferenceInFieldInitializer.kt STRING_CONCATENATION type=kotlin.String CONST String type=kotlin.String value="1234" CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null - $this: CALL 'private final fun (): kotlin.String declared in .A' type=kotlin.String origin=null + $this: CALL 'private final fun (): kotlin.String declared in .A' type=kotlin.String origin=GET_PROPERTY $this: GET_VAR ': .A declared in .A' type=.A origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:private modality:FINAL <> ($this:.A) returnType:kotlin.String correspondingProperty: PROPERTY name:b visibility:private modality:FINAL [val] diff --git a/compiler/testData/ir/irText/expressions/references.fir.txt b/compiler/testData/ir/irText/expressions/references.fir.txt deleted file mode 100644 index d173188bed2..00000000000 --- a/compiler/testData/ir/irText/expressions/references.fir.txt +++ /dev/null @@ -1,57 +0,0 @@ -FILE fqName: fileName:/references.kt - PROPERTY name:ok visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:ok type:kotlin.String visibility:private [final,static] - EXPRESSION_BODY - CONST String type=kotlin.String value="OK" - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String - correspondingProperty: PROPERTY name:ok visibility:public modality:FINAL [val] - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:ok type:kotlin.String visibility:private [final,static]' type=kotlin.String origin=null - PROPERTY name:ok2 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:ok2 type:kotlin.String visibility:private [final,static] - EXPRESSION_BODY - CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=null - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String - correspondingProperty: PROPERTY name:ok2 visibility:public modality:FINAL [val] - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:ok2 type:kotlin.String visibility:private [final,static]' type=kotlin.String origin=null - PROPERTY name:ok3 visibility:public modality:FINAL [val] - FUN name: visibility:public modality:FINAL <> () returnType:kotlin.String - correspondingProperty: PROPERTY name:ok3 visibility:public modality:FINAL [val] - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - CONST String type=kotlin.String value="OK" - FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.String - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test1 (): kotlin.String declared in ' - CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=null - FUN name:test2 visibility:public modality:FINAL <> (x:kotlin.String) returnType:kotlin.String - VALUE_PARAMETER name:x index:0 type:kotlin.String - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test2 (x: kotlin.String): kotlin.String declared in ' - GET_VAR 'x: kotlin.String declared in .test2' type=kotlin.String origin=null - FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.String - BLOCK_BODY - VAR name:x type:kotlin.String [val] - CONST String type=kotlin.String value="OK" - RETURN type=kotlin.Nothing from='public final fun test3 (): kotlin.String declared in ' - GET_VAR 'val x: kotlin.String [val] declared in .test3' type=kotlin.String origin=null - FUN name:test4 visibility:public modality:FINAL <> () returnType:kotlin.String - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test4 (): kotlin.String declared in ' - CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=null - PROPERTY name:okext visibility:public modality:FINAL [val] - FUN name: visibility:public modality:FINAL <> ($receiver:kotlin.String) returnType:kotlin.String - correspondingProperty: PROPERTY name:okext visibility:public modality:FINAL [val] - $receiver: VALUE_PARAMETER name: type:kotlin.String - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' - CONST String type=kotlin.String value="OK" - FUN name:test5 visibility:public modality:FINAL <> ($receiver:kotlin.String) returnType:kotlin.String - $receiver: VALUE_PARAMETER name: type:kotlin.String - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test5 (): kotlin.String declared in ' - CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=null - $receiver: GET_VAR ': kotlin.String declared in .test5' type=kotlin.String origin=null diff --git a/compiler/testData/ir/irText/expressions/references.kt b/compiler/testData/ir/irText/expressions/references.kt index b3d3d16893d..5e30f763a0a 100644 --- a/compiler/testData/ir/irText/expressions/references.kt +++ b/compiler/testData/ir/irText/expressions/references.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL val ok = "OK" val ok2 = ok val ok3: String get() = "OK" diff --git a/compiler/testData/ir/irText/expressions/reflectionLiterals.fir.txt b/compiler/testData/ir/irText/expressions/reflectionLiterals.fir.txt index 77cacc55384..57e8c0dbe77 100644 --- a/compiler/testData/ir/irText/expressions/reflectionLiterals.fir.txt +++ b/compiler/testData/ir/irText/expressions/reflectionLiterals.fir.txt @@ -46,7 +46,7 @@ FILE fqName: fileName:/reflectionLiterals.kt FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.reflect.KClass visibility:private [final,static] EXPRESSION_BODY GET_CLASS type=kotlin.reflect.KClass - CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.reflect.KClass correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] BLOCK_BODY diff --git a/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.fir.txt b/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.fir.txt index 765433f99b4..40f8d3fe6db 100644 --- a/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.fir.txt +++ b/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.fir.txt @@ -51,7 +51,7 @@ FILE fqName:test fileName:/safeCallWithIncrementDecrement.kt VALUE_PARAMETER name:nc index:0 type:test.C? BLOCK_BODY VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.Int? [val] - CALL 'public final fun (): kotlin.Int declared in test' type=kotlin.Int? origin=null + CALL 'public final fun (): kotlin.Int declared in test' type=kotlin.Int? origin=GET_PROPERTY $receiver: GET_VAR 'nc: test.C? declared in test.testProperty' type=test.C? origin=null ERROR_CALL 'Unresolved reference: R|test/p|' type=IrErrorType GET_VAR 'val tmp_0: kotlin.Int? [val] declared in test.testProperty' type=kotlin.Int? origin=null @@ -60,11 +60,11 @@ FILE fqName:test fileName:/safeCallWithIncrementDecrement.kt BLOCK_BODY VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.Int [val] CALL 'public final fun get (index: kotlin.Int): kotlin.Int [operator] declared in test' type=kotlin.Int origin=null - $receiver: CALL 'public final fun (): kotlin.Int declared in test' type=kotlin.Int? origin=null + $receiver: CALL 'public final fun (): kotlin.Int declared in test' type=kotlin.Int? origin=GET_PROPERTY $receiver: GET_VAR 'nc: test.C? declared in test.testArrayAccess' type=test.C? origin=null index: CONST Int type=kotlin.Int value=0 CALL 'public final fun set (index: kotlin.Int, value: kotlin.Int): kotlin.Unit [operator] declared in test' type=kotlin.Unit origin=null - $receiver: CALL 'public final fun (): kotlin.Int declared in test' type=kotlin.Int? origin=null + $receiver: CALL 'public final fun (): kotlin.Int declared in test' type=kotlin.Int? origin=GET_PROPERTY $receiver: GET_VAR 'nc: test.C? declared in test.testArrayAccess' type=test.C? origin=null index: CONST Int type=kotlin.Int value=0 value: CALL 'public final fun inc (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/expressions/safeCalls.fir.txt b/compiler/testData/ir/irText/expressions/safeCalls.fir.txt index 962f78f51b4..c988276a94c 100644 --- a/compiler/testData/ir/irText/expressions/safeCalls.fir.txt +++ b/compiler/testData/ir/irText/expressions/safeCalls.fir.txt @@ -45,7 +45,7 @@ FILE fqName: fileName:/safeCalls.kt $receiver: VALUE_PARAMETER name: type:kotlin.String BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun extLength (): kotlin.Int declared in .IHost' - CALL 'public open fun (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=null + CALL 'public open fun (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': kotlin.String declared in .IHost.extLength' type=kotlin.String origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: @@ -64,7 +64,7 @@ FILE fqName: fileName:/safeCalls.kt VALUE_PARAMETER name:x index:0 type:kotlin.String? BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test1 (x: kotlin.String?): kotlin.Int? declared in ' - CALL 'public open fun (): kotlin.Int declared in kotlin.String' type=kotlin.Int? origin=null + CALL 'public open fun (): kotlin.Int declared in kotlin.String' type=kotlin.Int? origin=GET_PROPERTY $this: GET_VAR 'x: kotlin.String? declared in .test1' type=kotlin.String? origin=null FUN name:test2 visibility:public modality:FINAL <> (x:kotlin.String?) returnType:kotlin.Int? VALUE_PARAMETER name:x index:0 type:kotlin.String? diff --git a/compiler/testData/ir/irText/expressions/signedToUnsignedConversions_test.fir.txt b/compiler/testData/ir/irText/expressions/signedToUnsignedConversions_test.fir.txt index 059926fcdcc..0013a5521f8 100644 --- a/compiler/testData/ir/irText/expressions/signedToUnsignedConversions_test.fir.txt +++ b/compiler/testData/ir/irText/expressions/signedToUnsignedConversions_test.fir.txt @@ -86,18 +86,18 @@ FILE fqName: fileName:/signedToUnsignedConversions_test.kt FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY ERROR_CALL 'Unresolved reference: #' type=IrErrorType - CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY ERROR_CALL 'Unresolved reference: #' type=IrErrorType - CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY ERROR_CALL 'Unresolved reference: #' type=IrErrorType - CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY ERROR_CALL 'Unresolved reference: #' type=IrErrorType - CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY ERROR_CALL 'Unresolved reference: #' type=IrErrorType - CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY ERROR_CALL 'Unresolved reference: #' type=IrErrorType - CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY ERROR_CALL 'Unresolved reference: #' type=IrErrorType - CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null - CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY + CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY CONST Long type=kotlin.Long value=42 diff --git a/compiler/testData/ir/irText/expressions/smartCasts.fir.txt b/compiler/testData/ir/irText/expressions/smartCasts.fir.txt deleted file mode 100644 index 0d8d722169a..00000000000 --- a/compiler/testData/ir/irText/expressions/smartCasts.fir.txt +++ /dev/null @@ -1,66 +0,0 @@ -FILE fqName: fileName:/smartCasts.kt - FUN name:expectsString visibility:public modality:FINAL <> (s:kotlin.String) returnType:kotlin.Unit - VALUE_PARAMETER name:s index:0 type:kotlin.String - BLOCK_BODY - FUN name:expectsInt visibility:public modality:FINAL <> (i:kotlin.Int) returnType:kotlin.Unit - VALUE_PARAMETER name:i index:0 type:kotlin.Int - BLOCK_BODY - FUN name:overloaded visibility:public modality:FINAL <> (s:kotlin.String) returnType:kotlin.String - VALUE_PARAMETER name:s index:0 type:kotlin.String - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun overloaded (s: kotlin.String): kotlin.String declared in ' - GET_VAR 's: kotlin.String declared in .overloaded' type=kotlin.String origin=null - FUN name:overloaded visibility:public modality:FINAL <> (x:kotlin.Any) returnType:kotlin.Any - VALUE_PARAMETER name:x index:0 type:kotlin.Any - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun overloaded (x: kotlin.Any): kotlin.Any declared in ' - GET_VAR 'x: kotlin.Any declared in .overloaded' type=kotlin.Any origin=null - FUN name:test1 visibility:public modality:FINAL <> (x:kotlin.Any) returnType:kotlin.Unit - VALUE_PARAMETER name:x index:0 type:kotlin.Any - BLOCK_BODY - WHEN type=kotlin.Unit origin=IF - BRANCH - if: TYPE_OP type=kotlin.Boolean origin=NOT_INSTANCEOF typeOperand=kotlin.String - GET_VAR 'x: kotlin.Any declared in .test1' type=kotlin.Any origin=null - then: RETURN type=kotlin.Nothing from='public final fun test1 (x: kotlin.Any): kotlin.Unit declared in ' - GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit - CALL 'public final fun println (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null - message: CALL 'public open fun (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=null - $this: TYPE_OP type=kotlin.String origin=IMPLICIT_CAST typeOperand=kotlin.String - GET_VAR 'x: kotlin.Any declared in .test1' type=kotlin.Any origin=null - CALL 'public final fun expectsString (s: kotlin.String): kotlin.Unit declared in ' type=kotlin.Unit origin=null - s: TYPE_OP type=kotlin.String origin=IMPLICIT_CAST typeOperand=kotlin.String - GET_VAR 'x: kotlin.Any declared in .test1' type=kotlin.Any origin=null - CALL 'public final fun expectsInt (i: kotlin.Int): kotlin.Unit declared in ' type=kotlin.Unit origin=null - i: CALL 'public open fun (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=null - $this: TYPE_OP type=kotlin.String origin=IMPLICIT_CAST typeOperand=kotlin.String - GET_VAR 'x: kotlin.Any declared in .test1' type=kotlin.Any origin=null - CALL 'public final fun expectsString (s: kotlin.String): kotlin.Unit declared in ' type=kotlin.Unit origin=null - s: CALL 'public final fun overloaded (s: kotlin.String): kotlin.String declared in ' type=kotlin.String origin=null - s: TYPE_OP type=kotlin.String origin=IMPLICIT_CAST typeOperand=kotlin.String - GET_VAR 'x: kotlin.Any declared in .test1' type=kotlin.Any origin=null - FUN name:test2 visibility:public modality:FINAL <> (x:kotlin.Any) returnType:kotlin.String - VALUE_PARAMETER name:x index:0 type:kotlin.Any - BLOCK_BODY - WHEN type=kotlin.Unit origin=IF - BRANCH - if: TYPE_OP type=kotlin.Boolean origin=NOT_INSTANCEOF typeOperand=kotlin.String - GET_VAR 'x: kotlin.Any declared in .test2' type=kotlin.Any origin=null - then: RETURN type=kotlin.Nothing from='public final fun test2 (x: kotlin.Any): kotlin.String declared in ' - CONST String type=kotlin.String value="" - RETURN type=kotlin.Nothing from='public final fun test2 (x: kotlin.Any): kotlin.String declared in ' - CALL 'public final fun overloaded (s: kotlin.String): kotlin.String declared in ' type=kotlin.String origin=null - s: TYPE_OP type=kotlin.String origin=IMPLICIT_CAST typeOperand=kotlin.String - GET_VAR 'x: kotlin.Any declared in .test2' type=kotlin.Any origin=null - FUN name:test3 visibility:public modality:FINAL <> (x:kotlin.Any) returnType:kotlin.String - VALUE_PARAMETER name:x index:0 type:kotlin.Any - BLOCK_BODY - WHEN type=kotlin.Unit origin=IF - BRANCH - if: TYPE_OP type=kotlin.Boolean origin=NOT_INSTANCEOF typeOperand=kotlin.String - GET_VAR 'x: kotlin.Any declared in .test3' type=kotlin.Any origin=null - then: RETURN type=kotlin.Nothing from='public final fun test3 (x: kotlin.Any): kotlin.String declared in ' - CONST String type=kotlin.String value="" - RETURN type=kotlin.Nothing from='public final fun test3 (x: kotlin.Any): kotlin.String declared in ' - TYPE_OP type=kotlin.String origin=IMPLICIT_CAST typeOperand=kotlin.String - GET_VAR 'x: kotlin.Any declared in .test3' type=kotlin.Any origin=null diff --git a/compiler/testData/ir/irText/expressions/smartCasts.kt b/compiler/testData/ir/irText/expressions/smartCasts.kt index 1dd710ef962..479108b4cdd 100644 --- a/compiler/testData/ir/irText/expressions/smartCasts.kt +++ b/compiler/testData/ir/irText/expressions/smartCasts.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // WITH_RUNTIME fun expectsString(s: String) {} diff --git a/compiler/testData/ir/irText/expressions/stringTemplates.fir.txt b/compiler/testData/ir/irText/expressions/stringTemplates.fir.txt index 3c9f340f23e..c28b211ecb7 100644 --- a/compiler/testData/ir/irText/expressions/stringTemplates.fir.txt +++ b/compiler/testData/ir/irText/expressions/stringTemplates.fir.txt @@ -62,7 +62,7 @@ FILE fqName: fileName:/stringTemplates.kt EXPRESSION_BODY STRING_CONCATENATION type=kotlin.String CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null - $this: CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=null + $this: CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=GET_PROPERTY CONST String type=kotlin.String value=" " CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null $this: CALL 'public final fun foo (): kotlin.String declared in ' type=kotlin.String origin=null @@ -75,7 +75,7 @@ FILE fqName: fileName:/stringTemplates.kt FIELD PROPERTY_BACKING_FIELD name:test7 type:kotlin.String visibility:private [final,static] EXPRESSION_BODY CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null - $this: CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=null + $this: CALL 'public final fun (): kotlin.String declared in ' type=kotlin.String origin=GET_PROPERTY FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String correspondingProperty: PROPERTY name:test7 visibility:public modality:FINAL [val] BLOCK_BODY @@ -95,7 +95,7 @@ FILE fqName: fileName:/stringTemplates.kt FIELD PROPERTY_BACKING_FIELD name:test9 type:kotlin.String visibility:private [final,static] EXPRESSION_BODY CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null - $this: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null + $this: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String correspondingProperty: PROPERTY name:test9 visibility:public modality:FINAL [val] BLOCK_BODY diff --git a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.txt b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.txt index 580f249663a..ceb39708d4c 100644 --- a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.txt +++ b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.txt @@ -34,7 +34,7 @@ FILE fqName: fileName:/temporaryInEnumEntryInitializer.kt BLOCK_BODY ENUM_CONSTRUCTOR_CALL 'private constructor (x: kotlin.String?) [primary] declared in .En' x: CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String? origin=null - $this: CALL 'public final fun (): kotlin.Any? declared in ' type=kotlin.Any? origin=null + $this: CALL 'public final fun (): kotlin.Any? declared in ' type=kotlin.Any? origin=GET_PROPERTY INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ENTRY modality:FINAL visibility:private superTypes:[.En]' FUN name:values visibility:public modality:FINAL <> ($this:.En) returnType:kotlin.Array<.En> $this: VALUE_PARAMETER name: type:.En diff --git a/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.fir.txt b/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.fir.txt index 43135e19a5f..6dfe86e06fc 100644 --- a/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.fir.txt +++ b/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.fir.txt @@ -78,9 +78,9 @@ FILE fqName: fileName:/thisOfGenericOuterClass.kt FIELD PROPERTY_BACKING_FIELD name:xx type:kotlin.Int visibility:private [final] EXPRESSION_BODY CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null - $this: CALL 'public final fun (): kotlin.Int declared in .Outer' type=kotlin.Int origin=null + $this: CALL 'public final fun (): kotlin.Int declared in .Outer' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': .Outer declared in .test' type=.Outer origin=null - other: CALL 'public final fun (): kotlin.Int declared in .Outer.Inner' type=kotlin.Int origin=null + other: CALL 'public final fun (): kotlin.Int declared in .Outer.Inner' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': . declared in .' type=. origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.test.) returnType:kotlin.Int correspondingProperty: PROPERTY name:xx visibility:public modality:FINAL [val] diff --git a/compiler/testData/ir/irText/expressions/useImportedMember.fir.txt b/compiler/testData/ir/irText/expressions/useImportedMember.fir.txt index dd98f6af58c..f639af5f070 100644 --- a/compiler/testData/ir/irText/expressions/useImportedMember.fir.txt +++ b/compiler/testData/ir/irText/expressions/useImportedMember.fir.txt @@ -189,7 +189,7 @@ FILE fqName: fileName:/useImportedMember.kt BRANCH if: CALL 'public final fun not (): kotlin.Boolean [operator] declared in kotlin.Boolean' type=kotlin.Boolean origin=EXCLEQ $this: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EXCLEQ - arg0: CALL 'public final fun (): kotlin.Int declared in .C' type=kotlin.Int origin=null + arg0: CALL 'public final fun (): kotlin.Int declared in .C' type=kotlin.Int origin=GET_PROPERTY $this: GET_OBJECT 'CLASS OBJECT name:C modality:FINAL visibility:public superTypes:[.BaseClass; .I]' type=.C arg1: CONST Int type=kotlin.Int value=4 then: RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in ' @@ -201,7 +201,7 @@ FILE fqName: fileName:/useImportedMember.kt BRANCH if: CALL 'public final fun not (): kotlin.Boolean [operator] declared in kotlin.Boolean' type=kotlin.Boolean origin=EXCLEQ $this: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EXCLEQ - arg0: CALL 'public final fun (): kotlin.Int declared in .C' type=kotlin.Int origin=null + arg0: CALL 'public final fun (): kotlin.Int declared in .C' type=kotlin.Int origin=GET_PROPERTY $this: GET_OBJECT 'CLASS OBJECT name:C modality:FINAL visibility:public superTypes:[.BaseClass; .I]' type=.C arg1: CONST Int type=kotlin.Int value=5 then: RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in ' @@ -210,7 +210,7 @@ FILE fqName: fileName:/useImportedMember.kt BRANCH if: CALL 'public final fun not (): kotlin.Boolean [operator] declared in kotlin.Boolean' type=kotlin.Boolean origin=EXCLEQ $this: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EXCLEQ - arg0: CALL 'public final fun (): kotlin.Int declared in .C' type=kotlin.Int origin=null + arg0: CALL 'public final fun (): kotlin.Int declared in .C' type=kotlin.Int origin=GET_PROPERTY $this: CONST Int type=kotlin.Int value=5 $receiver: CONST Int type=kotlin.Int value=5 arg1: CONST Int type=kotlin.Int value=6 @@ -231,7 +231,7 @@ FILE fqName: fileName:/useImportedMember.kt BRANCH if: CALL 'public final fun not (): kotlin.Boolean [operator] declared in kotlin.Boolean' type=kotlin.Boolean origin=EXCLEQ $this: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EXCLEQ - arg0: CALL 'public final fun (): T of .C. declared in .C' type=kotlin.String origin=null + arg0: CALL 'public final fun (): T of .C. declared in .C' type=kotlin.String origin=GET_PROPERTY : kotlin.String $this: CONST String type=kotlin.String value="8" $receiver: CONST String type=kotlin.String value="8" @@ -253,7 +253,7 @@ FILE fqName: fileName:/useImportedMember.kt BRANCH if: CALL 'public final fun not (): kotlin.Boolean [operator] declared in kotlin.Boolean' type=kotlin.Boolean origin=EXCLEQ $this: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EXCLEQ - arg0: CALL 'public final fun (): T of .BaseClass. declared in .BaseClass' type=kotlin.String origin=null + arg0: CALL 'public final fun (): T of .BaseClass. declared in .BaseClass' type=kotlin.String origin=GET_PROPERTY : kotlin.String $this: CONST String type=kotlin.String value="10" $receiver: CONST String type=kotlin.String value="10" diff --git a/compiler/testData/ir/irText/expressions/values.fir.txt b/compiler/testData/ir/irText/expressions/values.fir.txt index 6e94be70a45..99827774f06 100644 --- a/compiler/testData/ir/irText/expressions/values.fir.txt +++ b/compiler/testData/ir/irText/expressions/values.fir.txt @@ -127,7 +127,7 @@ FILE fqName: fileName:/values.kt FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test3 (): kotlin.Int declared in ' - CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY FUN name:test4 visibility:public modality:FINAL <> () returnType:.Z.Companion BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test4 (): .Z.Companion declared in ' diff --git a/compiler/testData/ir/irText/expressions/vararg.fir.txt b/compiler/testData/ir/irText/expressions/vararg.fir.txt deleted file mode 100644 index e92721f4044..00000000000 --- a/compiler/testData/ir/irText/expressions/vararg.fir.txt +++ /dev/null @@ -1,42 +0,0 @@ -FILE fqName: fileName:/vararg.kt - PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Array visibility:private [final,static] - EXPRESSION_BODY - CALL 'public final fun arrayOf (vararg elements: T of kotlin.arrayOf): kotlin.Array [inline] declared in kotlin' type=kotlin.Array origin=null - : kotlin.String - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Array - correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): kotlin.Array declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Array visibility:private [final,static]' type=kotlin.Array origin=null - PROPERTY name:test2 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Array visibility:private [final,static] - EXPRESSION_BODY - CALL 'public final fun arrayOf (vararg elements: T of kotlin.arrayOf): kotlin.Array [inline] declared in kotlin' type=kotlin.Array origin=null - : kotlin.String - elements: VARARG type=kotlin.Array varargElementType=kotlin.String - CONST String type=kotlin.String value="1" - CONST String type=kotlin.String value="2" - CONST String type=kotlin.String value="3" - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Array - correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): kotlin.Array declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Array visibility:private [final,static]' type=kotlin.Array origin=null - PROPERTY name:test3 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Array visibility:private [final,static] - EXPRESSION_BODY - CALL 'public final fun arrayOf (vararg elements: T of kotlin.arrayOf): kotlin.Array [inline] declared in kotlin' type=kotlin.Array origin=null - : kotlin.String - elements: VARARG type=kotlin.Array varargElementType=kotlin.String - CONST String type=kotlin.String value="0" - SPREAD_ELEMENT - CALL 'public final fun (): kotlin.Array declared in ' type=kotlin.Array origin=null - SPREAD_ELEMENT - CALL 'public final fun (): kotlin.Array declared in ' type=kotlin.Array origin=null - CONST String type=kotlin.String value="4" - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Array - correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [val] - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): kotlin.Array declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Array visibility:private [final,static]' type=kotlin.Array origin=null diff --git a/compiler/testData/ir/irText/expressions/vararg.kt b/compiler/testData/ir/irText/expressions/vararg.kt index c2931299b79..45694544bb9 100644 --- a/compiler/testData/ir/irText/expressions/vararg.kt +++ b/compiler/testData/ir/irText/expressions/vararg.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL val test1 = arrayOf() val test2 = arrayOf("1", "2", "3") val test3 = arrayOf("0", *test2, *test1, "4") \ No newline at end of file diff --git a/compiler/testData/ir/irText/expressions/variableAsFunctionCallWithGenerics.fir.txt b/compiler/testData/ir/irText/expressions/variableAsFunctionCallWithGenerics.fir.txt index 8b82c1b268f..083c8a96192 100644 --- a/compiler/testData/ir/irText/expressions/variableAsFunctionCallWithGenerics.fir.txt +++ b/compiler/testData/ir/irText/expressions/variableAsFunctionCallWithGenerics.fir.txt @@ -16,7 +16,7 @@ FILE fqName: fileName:/variableAsFunctionCallWithGenerics.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun testGeneric1 (x: kotlin.String): T of . declared in ' CALL 'public abstract fun invoke (): R of kotlin.Function0 [operator] declared in kotlin.Function0' type=T of . origin=INVOKE - $this: CALL 'public final fun (): kotlin.Function0.> declared in ' type=kotlin.Function0 origin=null + $this: CALL 'public final fun (): kotlin.Function0.> declared in ' type=kotlin.Function0 origin=GET_PROPERTY : kotlin.String $receiver: GET_VAR 'x: kotlin.String declared in .testGeneric1' type=kotlin.String origin=null PROPERTY name:kt26531Val visibility:public modality:FINAL [val] @@ -35,6 +35,6 @@ FILE fqName: fileName:/variableAsFunctionCallWithGenerics.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun kt26531 (): T of . declared in ' CALL 'public abstract fun invoke (): R of kotlin.Function0 [operator] declared in kotlin.Function0' type=T of . origin=INVOKE - $this: CALL 'public final fun (): kotlin.Function0.> declared in ' type=kotlin.Function0 origin=null + $this: CALL 'public final fun (): kotlin.Function0.> declared in ' type=kotlin.Function0 origin=GET_PROPERTY : kotlin.Int $receiver: CONST Int type=kotlin.Int value=7 diff --git a/compiler/testData/ir/irText/expressions/whenWithSubjectVariable.fir.txt b/compiler/testData/ir/irText/expressions/whenWithSubjectVariable.fir.txt index bfd68c62d28..8f33f780b77 100644 --- a/compiler/testData/ir/irText/expressions/whenWithSubjectVariable.fir.txt +++ b/compiler/testData/ir/irText/expressions/whenWithSubjectVariable.fir.txt @@ -18,7 +18,7 @@ FILE fqName: fileName:/whenWithSubjectVariable.kt BRANCH if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=kotlin.String GET_VAR 'val y: kotlin.Any [val] declared in .test' type=kotlin.Any origin=null - then: CALL 'public open fun (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=null + then: CALL 'public open fun (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=GET_PROPERTY $this: TYPE_OP type=kotlin.String origin=IMPLICIT_CAST typeOperand=kotlin.String GET_VAR 'val y: kotlin.Any [val] declared in .test' type=kotlin.Any origin=null BRANCH diff --git a/compiler/testData/ir/irText/lambdas/destructuringInLambda.fir.txt b/compiler/testData/ir/irText/lambdas/destructuringInLambda.fir.txt index b5d8739c022..ae4110df71c 100644 --- a/compiler/testData/ir/irText/lambdas/destructuringInLambda.fir.txt +++ b/compiler/testData/ir/irText/lambdas/destructuringInLambda.fir.txt @@ -33,23 +33,23 @@ FILE fqName: fileName:/destructuringInLambda.kt $this: VALUE_PARAMETER name: type:.A BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Int declared in .A' - CALL 'public final fun (): kotlin.Int declared in .A' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in .A' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': .A declared in .A.component1' type=.A origin=null FUN name:component2 visibility:public modality:FINAL <> ($this:.A) returnType:kotlin.Int $this: VALUE_PARAMETER name: type:.A BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component2 (): kotlin.Int declared in .A' - CALL 'public final fun (): kotlin.Int declared in .A' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in .A' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': .A declared in .A.component2' type=.A origin=null FUN name:copy visibility:public modality:FINAL <> ($this:.A, x:kotlin.Int, y:kotlin.Int) returnType:.A $this: VALUE_PARAMETER name: type:.A VALUE_PARAMETER name:x index:0 type:kotlin.Int EXPRESSION_BODY - CALL 'public final fun (): kotlin.Int declared in .A' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in .A' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': .A declared in .A.copy' type=.A origin=null VALUE_PARAMETER name:y index:1 type:kotlin.Int EXPRESSION_BODY - CALL 'public final fun (): kotlin.Int declared in .A' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in .A' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': .A declared in .A.copy' type=.A origin=null BLOCK_BODY 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/lambdas/extensionLambda.fir.txt b/compiler/testData/ir/irText/lambdas/extensionLambda.fir.txt index 5299e81b0bf..a9324a4e787 100644 --- a/compiler/testData/ir/irText/lambdas/extensionLambda.fir.txt +++ b/compiler/testData/ir/irText/lambdas/extensionLambda.fir.txt @@ -11,5 +11,5 @@ FILE fqName: fileName:/extensionLambda.kt $receiver: VALUE_PARAMETER name: type:kotlin.String BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.Int declared in .test1' - CALL 'public open fun (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=null + CALL 'public open fun (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': kotlin.String declared in special.' type=kotlin.String origin=null diff --git a/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.fir.txt b/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.fir.txt index 6efc5555259..546e0de37bf 100644 --- a/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.fir.txt +++ b/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.fir.txt @@ -114,6 +114,6 @@ FILE fqName: fileName:/multipleImplicitReceivers.kt RETURN type=kotlin.Nothing from='local final fun (): kotlin.Int declared in .test..' CALL 'public open fun invoke (): kotlin.Int [operator] declared in .IInvoke' type=kotlin.Int origin=null $this: GET_VAR ': .IInvoke declared in special.' type=.IInvoke origin=null - $receiver: CALL 'public open fun (): .B declared in .IFoo' type=.B origin=null + $receiver: CALL 'public open fun (): .B declared in .IFoo' type=.B origin=GET_PROPERTY $this: GET_VAR ': .IFoo declared in special.' type=.IFoo origin=null $receiver: GET_VAR ': .A declared in special.' type=.A origin=null diff --git a/compiler/testData/ir/irText/stubs/builtinMap.fir.txt b/compiler/testData/ir/irText/stubs/builtinMap.fir.txt index 697ab3a2250..0a0e0d7c4a2 100644 --- a/compiler/testData/ir/irText/stubs/builtinMap.fir.txt +++ b/compiler/testData/ir/irText/stubs/builtinMap.fir.txt @@ -29,7 +29,7 @@ FILE fqName: fileName:/builtinMap.kt RETURN type=kotlin.Nothing from='local final fun (): kotlin.Unit declared in .plus' CALL 'public open fun put (p0: K1 of .plus?, p1: V1 of .plus?): V1 of .plus? declared in java.util.HashMap' type=V1 of .plus? origin=null $this: GET_VAR ': java.util.LinkedHashMap.plus?, V1 of .plus?> declared in special.' type=java.util.LinkedHashMap.plus?, V1 of .plus?> origin=null - p0: CALL 'public final fun (): K1 of .plus declared in kotlin.Pair' type=K1 of .plus origin=null + p0: CALL 'public final fun (): K1 of .plus declared in kotlin.Pair' type=K1 of .plus origin=GET_PROPERTY $this: GET_VAR 'pair: kotlin.Pair.plus, V1 of .plus> declared in .plus' type=kotlin.Pair.plus, V1 of .plus> origin=null - p1: CALL 'public final fun (): V1 of .plus declared in kotlin.Pair' type=V1 of .plus origin=null + p1: CALL 'public final fun (): V1 of .plus declared in kotlin.Pair' type=V1 of .plus origin=GET_PROPERTY $this: GET_VAR 'pair: kotlin.Pair.plus, V1 of .plus> declared in .plus' type=kotlin.Pair.plus, V1 of .plus> origin=null diff --git a/compiler/testData/ir/irText/stubs/constFromBuiltins.fir.txt b/compiler/testData/ir/irText/stubs/constFromBuiltins.fir.txt index 1ee4e2419f7..449a8ed2c5e 100644 --- a/compiler/testData/ir/irText/stubs/constFromBuiltins.fir.txt +++ b/compiler/testData/ir/irText/stubs/constFromBuiltins.fir.txt @@ -2,7 +2,7 @@ FILE fqName: fileName:/constFromBuiltins.kt PROPERTY name:test visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY - CALL 'public final fun (): kotlin.Int declared in kotlin.Int.Companion' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in kotlin.Int.Companion' type=kotlin.Int origin=GET_PROPERTY $this: GET_OBJECT 'CLASS CLASS name:Int modality:FINAL visibility:public superTypes:[kotlin.Number; kotlin.Comparable]' type=kotlin.Int.Companion FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val] diff --git a/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.fir.txt b/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.fir.txt index b7dead5c4ad..1cb7e5a65dd 100644 --- a/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.fir.txt +++ b/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.fir.txt @@ -15,7 +15,7 @@ FILE fqName: fileName:/genericClassInDifferentModule_m2.kt VALUE_PARAMETER name:y index:0 type:Y of .Derived1.foo BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun foo (y: Y of .Derived1.foo): T of .Derived1 declared in .Derived1' - CALL 'public final fun (): T of .Derived1 declared in .Base' type=T of .Derived1 origin=null + CALL 'public final fun (): T of .Derived1 declared in .Base' type=T of .Derived1 origin=GET_PROPERTY $this: GET_VAR ': .Derived1.Derived1> declared in .Derived1.foo' type=.Derived1.Derived1> origin=null PROPERTY name:bar visibility:public modality:FINAL [var] FIELD PROPERTY_BACKING_FIELD name:bar type:T of .Derived1 visibility:private @@ -44,7 +44,7 @@ FILE fqName: fileName:/genericClassInDifferentModule_m2.kt $receiver: VALUE_PARAMETER name: type:Z of .Derived1. BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): T of .Derived1 declared in .Derived1' - CALL 'public final fun (): T of .Derived1 declared in .Base' type=T of .Derived1 origin=null + CALL 'public final fun (): T of .Derived1 declared in .Base' type=T of .Derived1 origin=GET_PROPERTY $this: GET_VAR ': .Derived1.Derived1> declared in .Derived1.' type=.Derived1.Derived1> origin=null FUN name: visibility:public modality:FINAL ($this:.Derived1.Derived1>, $receiver:Z of .Derived1., value:T of .Derived1) returnType:kotlin.Unit correspondingProperty: PROPERTY name:exn visibility:public modality:FINAL [var] diff --git a/compiler/testData/ir/irText/stubs/javaSyntheticProperty.fir.txt b/compiler/testData/ir/irText/stubs/javaSyntheticProperty.fir.txt index 4f9f9a97e5a..29327f42799 100644 --- a/compiler/testData/ir/irText/stubs/javaSyntheticProperty.fir.txt +++ b/compiler/testData/ir/irText/stubs/javaSyntheticProperty.fir.txt @@ -2,7 +2,7 @@ FILE fqName: fileName:/javaSyntheticProperty.kt PROPERTY name:test visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.String? visibility:private [final,static] EXPRESSION_BODY - CALL 'public open fun (): kotlin.String? declared in .J' type=kotlin.String? origin=null + CALL 'public open fun (): kotlin.String? declared in .J' type=kotlin.String? origin=GET_PROPERTY $this: CONSTRUCTOR_CALL 'public/*package*/ constructor () [primary] declared in .J' type=.J origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String? correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val] diff --git a/compiler/testData/ir/irText/stubs/jdkClassSyntheticProperty.fir.txt b/compiler/testData/ir/irText/stubs/jdkClassSyntheticProperty.fir.txt index 01a7ba57071..8f08737443a 100644 --- a/compiler/testData/ir/irText/stubs/jdkClassSyntheticProperty.fir.txt +++ b/compiler/testData/ir/irText/stubs/jdkClassSyntheticProperty.fir.txt @@ -5,5 +5,5 @@ FILE fqName: fileName:/jdkClassSyntheticProperty.kt $receiver: VALUE_PARAMETER name: type:java.lang.Class<*> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Array? declared in ' - CALL 'public open fun (): kotlin.Array? declared in java.lang.Class' type=kotlin.Array? origin=null + CALL 'public open fun (): kotlin.Array? declared in java.lang.Class' type=kotlin.Array? origin=GET_PROPERTY $this: ERROR_CALL 'Unresolved reference: this@R|/test|' type=java.lang.Class<*> diff --git a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.fir.txt b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.fir.txt index 0d297a5dfc1..b767c77b5bb 100644 --- a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.fir.txt +++ b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.fir.txt @@ -80,7 +80,7 @@ FILE fqName: fileName:/castsInsideCoroutineInference.kt BLOCK_BODY VAR name:channel type:.ChannelCoroutine [val] TYPE_OP type=.ChannelCoroutine origin=CAST typeOperand=.ChannelCoroutine - CALL 'public abstract fun (): .SendChannel declared in .ProducerScope' type=.SendChannel origin=null + CALL 'public abstract fun (): .SendChannel declared in .ProducerScope' type=.SendChannel origin=GET_PROPERTY $this: GET_VAR ': .ProducerScope declared in special.' type=.ProducerScope origin=null CALL 'public abstract fun collect (collector: .FlowCollector): kotlin.Unit [suspend] declared in .Flow' type=kotlin.Unit origin=null $this: GET_VAR 'flow: .Flow<*> declared in .asFairChannel' type=.Flow<*> origin=null @@ -124,7 +124,7 @@ FILE fqName: fileName:/castsInsideCoroutineInference.kt BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (value: kotlin.Any?): kotlin.Unit declared in .asChannel.' CALL 'public abstract fun send (e: kotlin.Any): kotlin.Unit [suspend] declared in .SendChannel' type=kotlin.Unit origin=null - $this: CALL 'public abstract fun (): .SendChannel declared in .ProducerScope' type=.SendChannel origin=null + $this: CALL 'public abstract fun (): .SendChannel declared in .ProducerScope' type=.SendChannel origin=GET_PROPERTY $this: GET_VAR ': .ProducerScope declared in special.' type=.ProducerScope origin=null e: BLOCK type=kotlin.Any origin=ELVIS VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.Any? [val] diff --git a/compiler/testData/ir/irText/types/genericPropertyReferenceType.fir.txt b/compiler/testData/ir/irText/types/genericPropertyReferenceType.fir.txt index 9d8f52d0c7a..bd1f16cfd26 100644 --- a/compiler/testData/ir/irText/types/genericPropertyReferenceType.fir.txt +++ b/compiler/testData/ir/irText/types/genericPropertyReferenceType.fir.txt @@ -46,7 +46,7 @@ FILE fqName: fileName:/genericPropertyReferenceType.kt $receiver: VALUE_PARAMETER name: type:.C.> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): T of . declared in ' - CALL 'public final fun (): T of . declared in .C' type=T of . origin=null + CALL 'public final fun (): T of . declared in .C' type=T of . origin=GET_PROPERTY $this: ERROR_CALL 'Unresolved reference: this@R|/y|' type=.C.> FUN name: visibility:public modality:FINAL ($receiver:.C.>, v:T of .) returnType:kotlin.Unit correspondingProperty: PROPERTY name:y visibility:public modality:FINAL [var] diff --git a/compiler/testData/ir/irText/types/kt36143.fir.txt b/compiler/testData/ir/irText/types/kt36143.fir.txt deleted file mode 100644 index 7ad9d3cc532..00000000000 --- a/compiler/testData/ir/irText/types/kt36143.fir.txt +++ /dev/null @@ -1,7 +0,0 @@ -FILE fqName: fileName:/kt36143.kt - FUN name:test visibility:public modality:FINAL <> ($receiver:kotlin.Array) returnType:kotlin.Int - $receiver: VALUE_PARAMETER name: type:kotlin.Array - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test (): kotlin.Int declared in ' - CALL 'public final fun (): kotlin.Int declared in kotlin.Array' type=kotlin.Int origin=null - $this: GET_VAR ': kotlin.Array declared in .test' type=kotlin.Array origin=null diff --git a/compiler/testData/ir/irText/types/kt36143.kt b/compiler/testData/ir/irText/types/kt36143.kt index db18604b829..27c937f106b 100644 --- a/compiler/testData/ir/irText/types/kt36143.kt +++ b/compiler/testData/ir/irText/types/kt36143.kt @@ -1 +1,2 @@ +// FIR_IDENTICAL fun Array.test() = size \ No newline at end of file diff --git a/compiler/testData/ir/irText/types/localVariableOfIntersectionType_NI.fir.txt b/compiler/testData/ir/irText/types/localVariableOfIntersectionType_NI.fir.txt index 45f4df87cf9..9b301506207 100644 --- a/compiler/testData/ir/irText/types/localVariableOfIntersectionType_NI.fir.txt +++ b/compiler/testData/ir/irText/types/localVariableOfIntersectionType_NI.fir.txt @@ -95,21 +95,21 @@ FILE fqName: fileName:/localVariableOfIntersectionType_NI.kt VALUE_PARAMETER name:z index:2 type:.Z BLOCK_BODY CALL 'public abstract fun foo (): kotlin.Unit declared in .IA' type=kotlin.Unit origin=null - $this: CALL 'public abstract fun (): .IA declared in .Inv' type=.IA origin=null + $this: CALL 'public abstract fun (): .IA declared in .Inv' type=.IA origin=GET_PROPERTY $this: CALL 'public abstract fun create (x: .In.Z.create>, y: .In.Z.create>): .Inv.Z.create> declared in .Z' type=.Inv<.IA> origin=null : .IA $this: GET_VAR 'z: .Z declared in .test' type=.Z origin=null x: GET_VAR 'a: .In<.IA> declared in .test' type=.In<.IA> origin=null y: GET_VAR 'b: .In<.IB> declared in .test' type=.In<.IB> origin=null CALL 'public abstract fun bar (): kotlin.Unit declared in .IB' type=kotlin.Unit origin=null - $this: CALL 'public abstract fun (): .IA declared in .Inv' type=.IA origin=null + $this: CALL 'public abstract fun (): .IA declared in .Inv' type=.IA origin=GET_PROPERTY $this: CALL 'public abstract fun create (x: .In.Z.create>, y: .In.Z.create>): .Inv.Z.create> declared in .Z' type=.Inv<.IA> origin=null : .IA $this: GET_VAR 'z: .Z declared in .test' type=.Z origin=null x: GET_VAR 'a: .In<.IA> declared in .test' type=.In<.IA> origin=null y: GET_VAR 'b: .In<.IB> declared in .test' type=.In<.IB> origin=null VAR name:t type:.IA [val] - CALL 'public abstract fun (): .IA declared in .Inv' type=.IA origin=null + CALL 'public abstract fun (): .IA declared in .Inv' type=.IA origin=GET_PROPERTY $this: CALL 'public abstract fun create (x: .In.Z.create>, y: .In.Z.create>): .Inv.Z.create> declared in .Z' type=.Inv<.IA> origin=null : .IA $this: GET_VAR 'z: .Z declared in .test' type=.Z origin=null diff --git a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.fir.txt b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.fir.txt index 469543c0766..a905857de83 100644 --- a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.fir.txt +++ b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.fir.txt @@ -37,13 +37,13 @@ FILE fqName: fileName:/enhancedNullabilityInDestructuringAssignment.kt $this: VALUE_PARAMETER name: type:.P BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Int [operator] declared in .P' - CALL 'public final fun (): kotlin.Int declared in .P' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in .P' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': .P declared in .P.component1' type=.P origin=null FUN name:component2 visibility:public modality:FINAL <> ($this:.P) returnType:kotlin.Int [operator] $this: VALUE_PARAMETER name: type:.P BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component2 (): kotlin.Int [operator] declared in .P' - CALL 'public final fun (): kotlin.Int declared in .P' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in .P' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': .P declared in .P.component2' type=.P origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: @@ -94,13 +94,13 @@ FILE fqName: fileName:/enhancedNullabilityInDestructuringAssignment.kt $this: VALUE_PARAMETER name: type:.Q.Q, T2 of .Q> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component1 (): T1 of .Q [operator] declared in .Q' - CALL 'public final fun (): T1 of .Q declared in .Q' type=T1 of .Q origin=null + CALL 'public final fun (): T1 of .Q declared in .Q' type=T1 of .Q origin=GET_PROPERTY $this: GET_VAR ': .Q.Q, T2 of .Q> declared in .Q.component1' type=.Q.Q, T2 of .Q> origin=null FUN name:component2 visibility:public modality:FINAL <> ($this:.Q.Q, T2 of .Q>) returnType:T2 of .Q [operator] $this: VALUE_PARAMETER name: type:.Q.Q, T2 of .Q> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component2 (): T2 of .Q [operator] declared in .Q' - CALL 'public final fun (): T2 of .Q declared in .Q' type=T2 of .Q origin=null + CALL 'public final fun (): T2 of .Q declared in .Q' type=T2 of .Q origin=GET_PROPERTY $this: GET_VAR ': .Q.Q, T2 of .Q> declared in .Q.component2' type=.Q.Q, T2 of .Q> origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.fir.txt b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.fir.txt index 26591d89e40..1c737c94a5e 100644 --- a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.fir.txt +++ b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.fir.txt @@ -148,23 +148,23 @@ FILE fqName: fileName:/enhancedNullabilityInForLoop.kt $this: VALUE_PARAMETER name: type:.P BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Int declared in .P' - CALL 'public final fun (): kotlin.Int declared in .P' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in .P' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': .P declared in .P.component1' type=.P origin=null FUN name:component2 visibility:public modality:FINAL <> ($this:.P) returnType:kotlin.Int $this: VALUE_PARAMETER name: type:.P BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun component2 (): kotlin.Int declared in .P' - CALL 'public final fun (): kotlin.Int declared in .P' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in .P' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': .P declared in .P.component2' type=.P origin=null FUN name:copy visibility:public modality:FINAL <> ($this:.P, x:kotlin.Int, y:kotlin.Int) returnType:.P $this: VALUE_PARAMETER name: type:.P VALUE_PARAMETER name:x index:0 type:kotlin.Int EXPRESSION_BODY - CALL 'public final fun (): kotlin.Int declared in .P' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in .P' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': .P declared in .P.copy' type=.P origin=null VALUE_PARAMETER name:y index:1 type:kotlin.Int EXPRESSION_BODY - CALL 'public final fun (): kotlin.Int declared in .P' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in .P' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR ': .P declared in .P.copy' type=.P origin=null BLOCK_BODY 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/types/smartCastOnFakeOverrideReceiver.fir.txt b/compiler/testData/ir/irText/types/smartCastOnFakeOverrideReceiver.fir.txt index 659078757e9..c71a936fc3f 100644 --- a/compiler/testData/ir/irText/types/smartCastOnFakeOverrideReceiver.fir.txt +++ b/compiler/testData/ir/irText/types/smartCastOnFakeOverrideReceiver.fir.txt @@ -45,7 +45,7 @@ FILE fqName: fileName:/smartCastOnFakeOverrideReceiver.kt BRANCH if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=.B GET_VAR 'x: kotlin.Any declared in .A.testA2' type=kotlin.Any origin=null - then: CALL 'public final fun (): kotlin.Int declared in .A' type=kotlin.Int origin=null + then: CALL 'public final fun (): kotlin.Int declared in .A' type=kotlin.Int origin=GET_PROPERTY $this: TYPE_OP type=.B origin=IMPLICIT_CAST typeOperand=.B GET_VAR 'x: kotlin.Any declared in .A.testA2' type=kotlin.Any origin=null BRANCH @@ -94,7 +94,7 @@ FILE fqName: fileName:/smartCastOnFakeOverrideReceiver.kt BRANCH if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=.B GET_VAR 'x: kotlin.Any declared in .B.testB2' type=kotlin.Any origin=null - then: CALL 'public final fun (): kotlin.Int declared in .A' type=kotlin.Int origin=null + then: CALL 'public final fun (): kotlin.Int declared in .A' type=kotlin.Int origin=GET_PROPERTY $this: TYPE_OP type=.B origin=IMPLICIT_CAST typeOperand=.B GET_VAR 'x: kotlin.Any declared in .B.testB2' type=kotlin.Any origin=null BRANCH @@ -187,7 +187,7 @@ FILE fqName: fileName:/smartCastOnFakeOverrideReceiver.kt CALL 'public final fun f (): kotlin.Int declared in .GA' type=kotlin.Int origin=null $this: TYPE_OP type=.GB origin=IMPLICIT_CAST typeOperand=.GB GET_VAR 'a: kotlin.Any declared in .GB.testGB1' type=kotlin.Any origin=null - CALL 'public final fun (): kotlin.Int declared in .GA' type=kotlin.Int origin=null + CALL 'public final fun (): kotlin.Int declared in .GA' type=kotlin.Int origin=GET_PROPERTY $this: TYPE_OP type=.GB origin=IMPLICIT_CAST typeOperand=.GB GET_VAR 'a: kotlin.Any declared in .GB.testGB1' type=kotlin.Any origin=null FUN FAKE_OVERRIDE name:f visibility:public modality:FINAL <> ($this:.GA.GA>) returnType:kotlin.Int [fake_override]