From 573188bdc4ab1ad92f00d065a03d887106dcf855 Mon Sep 17 00:00:00 2001 From: Juan Chen Date: Wed, 8 Jan 2020 16:20:45 -0800 Subject: [PATCH] [FIR2IR]: fix translation of this references in instance methods Currently FirThisReceiverExpression of instance methods are translated to references of the class' thisReceiver, not the method's dispatch receiver, which causes problems with IrFrameMap::typeOf, as the class' thisReceiver is not in the typeMap. This commit translates non-qualified "this" references of instance methods to references of the methods' dispatch receiver. --- .../kotlin/fir/backend/Fir2IrVisitor.kt | 11 +++++ .../box/binaryOp/kt6747_identityEquals.kt | 1 - ...ctionTypeMultipleBoundsImplicitReceiver.kt | 1 - .../box/classLiteral/bound/smartCast.kt | 1 - .../defaultObjectSameNamesAsInOuter.kt | 1 - .../codegen/box/classes/inheritedMethod.kt | 1 - .../testData/codegen/box/classes/kt1759.kt | 1 - .../testData/codegen/box/classes/kt2391.kt | 1 - .../captureInSuperConstructorCall/kt4174a.kt | 1 - ...orCallWithJumpOutInConstructorArguments.kt | 1 - ...ssiblyPoppedUnitializedValueInArguments.kt | 1 - .../breakContinueInExpressions/kt16713.kt | 1 - .../breakContinueInExpressions/kt16713_2.kt | 1 - .../codegen/box/controlStructures/kt1441.kt | 1 - .../box/dataClasses/changingVarParam.kt | 1 - .../box/dataClasses/equals/alreadyDeclared.kt | 1 - .../codegen/box/dataClasses/equals/null.kt | 1 - .../box/dataClasses/equals/nullother.kt | 1 - .../box/dataClasses/equals/sameinstance.kt | 1 - .../dataClasses/hashCode/alreadyDeclared.kt | 1 - .../codegen/box/dataClasses/hashCode/null.kt | 1 - .../codegen/box/dataClasses/mixedParams.kt | 1 - .../box/dataClasses/multiDeclaration.kt | 1 - .../nonTrivialFinalMemberInSuperClass.kt | 1 - .../dataClasses/toString/alreadyDeclared.kt | 1 - .../codegen/box/dataClasses/twoValParams.kt | 1 - .../codegen/box/dataClasses/unitComponent.kt | 1 - .../provideDelegate/kt15437.kt | 1 - .../functions/tailRecursion/thisReferences.kt | 1 - .../box/extensionProperties/inClass.kt | 1 - .../extensionProperties/inClassWithGetter.kt | 1 - .../inClassWithPrivateGetter.kt | 1 - .../fieldRename/genericPropertyWithItself.kt | 1 - .../codegen/box/functions/defaultargs2.kt | 1 - .../codegen/box/functions/defaultargs7.kt | 1 - .../functions/invoke/kt3821invokeOnThis.kt | 1 - .../functions/invoke/kt3822invokeOnThis.kt | 1 - .../codegen/box/increment/classNaryGetSet.kt | 1 - .../codegen/box/increment/classWithGetSet.kt | 1 - .../jvmStaticVarInInlineClassCompanion.kt | 1 - .../box/innerNested/protectedNestedClass.kt | 1 - .../deepLocalHierarchy.kt | 1 - .../localExtendsLocalWithClosure.kt | 1 - .../box/jvm8/defaults/inlineProperty.kt | 1 - .../box/jvmStatic/propertyAsDefault.kt | 1 - .../propertyGetterDelegatesToAnother.kt | 1 - .../codegen/box/lazyCodegen/ifElse.kt | 2 - .../box/lazyCodegen/safeAssignComplex.kt | 1 - .../codegen/box/localClasses/kt3389.kt | 1 - .../box/localClasses/nameWithWhitespace.kt | 1 - .../box/multiDecl/forRange/MultiDeclFor.kt | 1 - .../MultiDeclForComponentExtensions.kt | 1 - .../box/multiDecl/forRange/UnderscoreNames.kt | 1 - .../forRange/explicitRangeTo/MultiDeclFor.kt | 1 - .../MultiDeclForComponentExtensions.kt | 1 - .../explicitRangeToWithDot/MultiDeclFor.kt | 1 - .../MultiDeclForComponentExtensions.kt | 1 - .../codegen/box/multiDecl/returnInElvis.kt | 1 - ...tAccessedFromMethodInlinedInNestedClass.kt | 1 - .../testData/codegen/box/objects/kt18982.kt | 1 - .../testData/codegen/box/package/checkCast.kt | 1 - .../objectWithAsymmetricEqualsEqPrimitive.kt | 1 - .../codegen/box/primitiveTypes/kt887.kt | 1 - .../testData/codegen/box/properties/kt1168.kt | 1 - .../testData/codegen/box/properties/kt1170.kt | 1 - .../testData/codegen/box/properties/kt1417.kt | 1 - .../testData/codegen/box/properties/kt3118.kt | 1 - .../properties/lateinit/accessorException.kt | 1 - .../box/properties/lateinit/exceptionField.kt | 1 - .../box/properties/lateinit/nameClash.kt | 2 - .../box/properties/lateinit/override.kt | 1 - .../properties/lateinit/overrideException.kt | 1 - .../codegen/box/publishedApi/simple.kt | 1 - .../box/regressions/nullableAfterExclExcl.kt | 1 - .../box/secondaryConstructors/withGenerics.kt | 1 - .../box/secondaryConstructors/withPrimary.kt | 1 - .../secondaryConstructors/withoutPrimary.kt | 1 - .../codegen/box/smartCasts/falseSmartCast.kt | 1 - .../box/smartCasts/implicitReceiver.kt | 1 - .../box/smartCasts/implicitReceiverInWhen.kt | 1 - .../box/smartCasts/implicitToGrandSon.kt | 1 - .../codegen/box/smartCasts/kt19100.kt | 1 - .../testData/codegen/box/strings/kt5956.kt | 1 - .../codegen/box/traits/genericMethod.kt | 1 - .../box/traits/privateInterfaceMethod.kt | 1 - compiler/testData/codegen/box/unit/ifElse.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 +++---- .../ir/irText/classes/initValInLambda.fir.txt | 2 +- .../lambdaInDataClassDefaultParameter.fir.txt | 8 ++-- .../irText/classes/outerClassAccess.fir.txt | 6 +-- ...edPropertyAccessorsWithAnnotations.fir.txt | 4 +- .../parameters/dataClassMembers.fir.txt | 8 ++-- .../provideDelegate/local.fir.txt | 4 +- .../provideDelegate/member.fir.txt | 4 +- .../provideDelegate/memberExtension.fir.txt | 2 +- .../provideDelegate/topLevel.fir.txt | 4 +- .../augmentedAssignmentWithExpression.fir.txt | 2 +- .../expressions/chainOfSafeCalls.fir.txt | 4 +- .../implicitCastToTypeParameter.fir.txt | 2 +- .../expressions/interfaceThisRef.fir.txt | 23 ---------- .../ir/irText/expressions/interfaceThisRef.kt | 2 + .../jvmInstanceFieldReference.fir.txt | 4 +- .../ir/irText/expressions/kt30020.fir.txt | 2 +- .../expressions/objectReference.fir.txt | 12 ++--- .../outerClassInstanceReference.fir.txt | 2 +- .../setFieldWithImplicitCast.fir.txt | 2 +- .../thisReferenceBeforeClassDeclared.fir.txt | 2 +- .../lambdas/destructuringInLambda.fir.txt | 8 ++-- .../genericClassInDifferentModule_m2.fir.txt | 2 +- 112 files changed, 102 insertions(+), 200 deletions(-) delete mode 100644 compiler/testData/ir/irText/expressions/interfaceThisRef.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 ce95099e50a..56702137c3e 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 @@ -877,6 +877,17 @@ class Fir2IrVisitor( } override fun visitThisReceiverExpression(thisReceiverExpression: FirThisReceiverExpression, data: Any?): IrElement { + val calleeReference = thisReceiverExpression.calleeReference + if (calleeReference.labelName == null && calleeReference.boundSymbol is FirRegularClassSymbol) { + val dispatchReceiver = this.functionStack.lastOrNull()?.dispatchReceiverParameter + if (dispatchReceiver != null) { + // Use the dispatch receiver of the containing function + return thisReceiverExpression.convertWithOffsets { startOffset, endOffset -> + IrGetValueImpl(startOffset, endOffset, dispatchReceiver.type, dispatchReceiver.symbol) + } + } + } + // TODO handle qualified "this" in instance methods of non-inner classes (inner class cases are handled by InnerClassesLowering) return visitQualifiedAccessExpression(thisReceiverExpression, data) } diff --git a/compiler/testData/codegen/box/binaryOp/kt6747_identityEquals.kt b/compiler/testData/codegen/box/binaryOp/kt6747_identityEquals.kt index f37ad05686a..cf261d60b7a 100644 --- a/compiler/testData/codegen/box/binaryOp/kt6747_identityEquals.kt +++ b/compiler/testData/codegen/box/binaryOp/kt6747_identityEquals.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR class Test { fun check(a: Any?): String { if (this === a) return "Fail 1" diff --git a/compiler/testData/codegen/box/casts/intersectionTypeMultipleBoundsImplicitReceiver.kt b/compiler/testData/codegen/box/casts/intersectionTypeMultipleBoundsImplicitReceiver.kt index 3347082965f..de3adc56939 100644 --- a/compiler/testData/codegen/box/casts/intersectionTypeMultipleBoundsImplicitReceiver.kt +++ b/compiler/testData/codegen/box/casts/intersectionTypeMultipleBoundsImplicitReceiver.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR interface FirstTrait interface SecondTrait diff --git a/compiler/testData/codegen/box/classLiteral/bound/smartCast.kt b/compiler/testData/codegen/box/classLiteral/bound/smartCast.kt index a2ceea6e4af..7b66b1e1786 100644 --- a/compiler/testData/codegen/box/classLiteral/bound/smartCast.kt +++ b/compiler/testData/codegen/box/classLiteral/bound/smartCast.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KT-16291 Smart cast doesn't work when getting class of instance class Foo(val s: String) { diff --git a/compiler/testData/codegen/box/classes/defaultObjectSameNamesAsInOuter.kt b/compiler/testData/codegen/box/classes/defaultObjectSameNamesAsInOuter.kt index 477924aaa88..8332b83ef41 100644 --- a/compiler/testData/codegen/box/classes/defaultObjectSameNamesAsInOuter.kt +++ b/compiler/testData/codegen/box/classes/defaultObjectSameNamesAsInOuter.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR class A { private val p: Int get() = 4 diff --git a/compiler/testData/codegen/box/classes/inheritedMethod.kt b/compiler/testData/codegen/box/classes/inheritedMethod.kt index 445cbc1fb83..fb9c3bfe080 100644 --- a/compiler/testData/codegen/box/classes/inheritedMethod.kt +++ b/compiler/testData/codegen/box/classes/inheritedMethod.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR open class Foo { fun xyzzy(): String = "xyzzy" } diff --git a/compiler/testData/codegen/box/classes/kt1759.kt b/compiler/testData/codegen/box/classes/kt1759.kt index d6e8b0be12f..b34b725c39b 100644 --- a/compiler/testData/codegen/box/classes/kt1759.kt +++ b/compiler/testData/codegen/box/classes/kt1759.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR class Greeter(var name : String) { fun greet() { name = name.plus("") diff --git a/compiler/testData/codegen/box/classes/kt2391.kt b/compiler/testData/codegen/box/classes/kt2391.kt index 474cc8bcf70..f3826f81a2f 100644 --- a/compiler/testData/codegen/box/classes/kt2391.kt +++ b/compiler/testData/codegen/box/classes/kt2391.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KJS_WITH_FULL_RUNTIME public interface LoggerAware { public val logger: StringBuilder diff --git a/compiler/testData/codegen/box/closures/captureInSuperConstructorCall/kt4174a.kt b/compiler/testData/codegen/box/closures/captureInSuperConstructorCall/kt4174a.kt index b8c059c4723..172aaafb985 100644 --- a/compiler/testData/codegen/box/closures/captureInSuperConstructorCall/kt4174a.kt +++ b/compiler/testData/codegen/box/closures/captureInSuperConstructorCall/kt4174a.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR open class C(val s: String) { fun test(): String { return s diff --git a/compiler/testData/codegen/box/constructorCall/nestedConstructorCallWithJumpOutInConstructorArguments.kt b/compiler/testData/codegen/box/constructorCall/nestedConstructorCallWithJumpOutInConstructorArguments.kt index 77f4090d926..151cc983141 100644 --- a/compiler/testData/codegen/box/constructorCall/nestedConstructorCallWithJumpOutInConstructorArguments.kt +++ b/compiler/testData/codegen/box/constructorCall/nestedConstructorCallWithJumpOutInConstructorArguments.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // FILE: test.kt diff --git a/compiler/testData/codegen/box/constructorCall/possiblyPoppedUnitializedValueInArguments.kt b/compiler/testData/codegen/box/constructorCall/possiblyPoppedUnitializedValueInArguments.kt index 251f40eebab..d889fb109ff 100644 --- a/compiler/testData/codegen/box/constructorCall/possiblyPoppedUnitializedValueInArguments.kt +++ b/compiler/testData/codegen/box/constructorCall/possiblyPoppedUnitializedValueInArguments.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME // FILE: test.kt diff --git a/compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/kt16713.kt b/compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/kt16713.kt index 5cb060955a1..91199580064 100644 --- a/compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/kt16713.kt +++ b/compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/kt16713.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR class MyQueue { fun poll(): String? = null } diff --git a/compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/kt16713_2.kt b/compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/kt16713_2.kt index fedede42b01..17a4079833e 100644 --- a/compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/kt16713_2.kt +++ b/compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/kt16713_2.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR class MyQueue { fun poll(): String? = null } diff --git a/compiler/testData/codegen/box/controlStructures/kt1441.kt b/compiler/testData/codegen/box/controlStructures/kt1441.kt index e288bc7d235..7e5099064b0 100644 --- a/compiler/testData/codegen/box/controlStructures/kt1441.kt +++ b/compiler/testData/codegen/box/controlStructures/kt1441.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR class Foo { var rnd = 10 diff --git a/compiler/testData/codegen/box/dataClasses/changingVarParam.kt b/compiler/testData/codegen/box/dataClasses/changingVarParam.kt index 6e85f86797f..56f9c63561f 100644 --- a/compiler/testData/codegen/box/dataClasses/changingVarParam.kt +++ b/compiler/testData/codegen/box/dataClasses/changingVarParam.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR data class A(var string: String) fun box(): String { diff --git a/compiler/testData/codegen/box/dataClasses/equals/alreadyDeclared.kt b/compiler/testData/codegen/box/dataClasses/equals/alreadyDeclared.kt index 400845b819f..65e9e5b9bcf 100644 --- a/compiler/testData/codegen/box/dataClasses/equals/alreadyDeclared.kt +++ b/compiler/testData/codegen/box/dataClasses/equals/alreadyDeclared.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR data class A(val x: Int) { override fun equals(other: Any?): Boolean = false } diff --git a/compiler/testData/codegen/box/dataClasses/equals/null.kt b/compiler/testData/codegen/box/dataClasses/equals/null.kt index 6ff930ca1a4..a6008d0d670 100644 --- a/compiler/testData/codegen/box/dataClasses/equals/null.kt +++ b/compiler/testData/codegen/box/dataClasses/equals/null.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR data class A(val v: Any?) data class B(val v: T) diff --git a/compiler/testData/codegen/box/dataClasses/equals/nullother.kt b/compiler/testData/codegen/box/dataClasses/equals/nullother.kt index e53a3a08a7e..bb0f764e061 100644 --- a/compiler/testData/codegen/box/dataClasses/equals/nullother.kt +++ b/compiler/testData/codegen/box/dataClasses/equals/nullother.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR class Dummy { override fun equals(other: Any?) = true } diff --git a/compiler/testData/codegen/box/dataClasses/equals/sameinstance.kt b/compiler/testData/codegen/box/dataClasses/equals/sameinstance.kt index 079830f15c0..04a1cfdc4f1 100644 --- a/compiler/testData/codegen/box/dataClasses/equals/sameinstance.kt +++ b/compiler/testData/codegen/box/dataClasses/equals/sameinstance.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR data class A(val arg: Any? = null) fun box() : String { diff --git a/compiler/testData/codegen/box/dataClasses/hashCode/alreadyDeclared.kt b/compiler/testData/codegen/box/dataClasses/hashCode/alreadyDeclared.kt index 37aa97dd82d..ee7b621c974 100644 --- a/compiler/testData/codegen/box/dataClasses/hashCode/alreadyDeclared.kt +++ b/compiler/testData/codegen/box/dataClasses/hashCode/alreadyDeclared.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR data class A(val x: Int) { override fun hashCode(): Int = -3 } diff --git a/compiler/testData/codegen/box/dataClasses/hashCode/null.kt b/compiler/testData/codegen/box/dataClasses/hashCode/null.kt index 4ceedb078d4..75777abec50 100644 --- a/compiler/testData/codegen/box/dataClasses/hashCode/null.kt +++ b/compiler/testData/codegen/box/dataClasses/hashCode/null.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR data class A(val a: Any?, var x: Int) data class B(val a: Any?) data class C(val a: Int, var x: Int?) diff --git a/compiler/testData/codegen/box/dataClasses/mixedParams.kt b/compiler/testData/codegen/box/dataClasses/mixedParams.kt index 65bdc289aa7..90637df9768 100644 --- a/compiler/testData/codegen/box/dataClasses/mixedParams.kt +++ b/compiler/testData/codegen/box/dataClasses/mixedParams.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR data class A(var x: Int, val z: Int) fun box(): String { diff --git a/compiler/testData/codegen/box/dataClasses/multiDeclaration.kt b/compiler/testData/codegen/box/dataClasses/multiDeclaration.kt index 1a7ed12751c..c74ea42a4a3 100644 --- a/compiler/testData/codegen/box/dataClasses/multiDeclaration.kt +++ b/compiler/testData/codegen/box/dataClasses/multiDeclaration.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR data class A(val x: Int, val y: Any?, val z: String) fun box(): String { diff --git a/compiler/testData/codegen/box/dataClasses/nonTrivialFinalMemberInSuperClass.kt b/compiler/testData/codegen/box/dataClasses/nonTrivialFinalMemberInSuperClass.kt index f16b89a55c5..4e655f2d38e 100644 --- a/compiler/testData/codegen/box/dataClasses/nonTrivialFinalMemberInSuperClass.kt +++ b/compiler/testData/codegen/box/dataClasses/nonTrivialFinalMemberInSuperClass.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR abstract class Base { final override fun toString() = "OK" final override fun hashCode() = 42 diff --git a/compiler/testData/codegen/box/dataClasses/toString/alreadyDeclared.kt b/compiler/testData/codegen/box/dataClasses/toString/alreadyDeclared.kt index cf068564eb3..f95ea92633c 100644 --- a/compiler/testData/codegen/box/dataClasses/toString/alreadyDeclared.kt +++ b/compiler/testData/codegen/box/dataClasses/toString/alreadyDeclared.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR data class A(val x: Int) { override fun toString(): String = "!" } diff --git a/compiler/testData/codegen/box/dataClasses/twoValParams.kt b/compiler/testData/codegen/box/dataClasses/twoValParams.kt index 3cc9dcc2067..91b918b1a8c 100644 --- a/compiler/testData/codegen/box/dataClasses/twoValParams.kt +++ b/compiler/testData/codegen/box/dataClasses/twoValParams.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR data class A(val x: Int, val y: String) fun box(): String { diff --git a/compiler/testData/codegen/box/dataClasses/unitComponent.kt b/compiler/testData/codegen/box/dataClasses/unitComponent.kt index d7b1348bbfb..b70b461ab91 100644 --- a/compiler/testData/codegen/box/dataClasses/unitComponent.kt +++ b/compiler/testData/codegen/box/dataClasses/unitComponent.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR data class A(val x: Unit) fun box(): String { diff --git a/compiler/testData/codegen/box/delegatedProperty/provideDelegate/kt15437.kt b/compiler/testData/codegen/box/delegatedProperty/provideDelegate/kt15437.kt index d33f94a1dcd..85d54e3cc18 100644 --- a/compiler/testData/codegen/box/delegatedProperty/provideDelegate/kt15437.kt +++ b/compiler/testData/codegen/box/delegatedProperty/provideDelegate/kt15437.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR import kotlin.reflect.KProperty class Delegate { diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.kt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.kt index b9c04709def..4428b315f41 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.kt +++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // IGNORE_BACKEND: JS_IR // TODO: muted automatically, investigate should it be ran for JS or not // DONT_RUN_GENERATED_CODE: JS diff --git a/compiler/testData/codegen/box/extensionProperties/inClass.kt b/compiler/testData/codegen/box/extensionProperties/inClass.kt index 17fe96d3b4c..7f1d8387e59 100644 --- a/compiler/testData/codegen/box/extensionProperties/inClass.kt +++ b/compiler/testData/codegen/box/extensionProperties/inClass.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR class Test { val Int.foo: String get() = "OK" diff --git a/compiler/testData/codegen/box/extensionProperties/inClassWithGetter.kt b/compiler/testData/codegen/box/extensionProperties/inClassWithGetter.kt index 7b7642ac692..e14ca8e686f 100644 --- a/compiler/testData/codegen/box/extensionProperties/inClassWithGetter.kt +++ b/compiler/testData/codegen/box/extensionProperties/inClassWithGetter.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR class Test { val Int.foo: String get() { diff --git a/compiler/testData/codegen/box/extensionProperties/inClassWithPrivateGetter.kt b/compiler/testData/codegen/box/extensionProperties/inClassWithPrivateGetter.kt index e65590d3c5d..b16ace4a6f0 100644 --- a/compiler/testData/codegen/box/extensionProperties/inClassWithPrivateGetter.kt +++ b/compiler/testData/codegen/box/extensionProperties/inClassWithPrivateGetter.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR class Test { private val Int.foo: String get() { diff --git a/compiler/testData/codegen/box/fieldRename/genericPropertyWithItself.kt b/compiler/testData/codegen/box/fieldRename/genericPropertyWithItself.kt index d844b16cce4..ea584c3a917 100644 --- a/compiler/testData/codegen/box/fieldRename/genericPropertyWithItself.kt +++ b/compiler/testData/codegen/box/fieldRename/genericPropertyWithItself.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR public class MPair ( public val first: A ) { diff --git a/compiler/testData/codegen/box/functions/defaultargs2.kt b/compiler/testData/codegen/box/functions/defaultargs2.kt index 39a40db2dbb..710cc126ad2 100644 --- a/compiler/testData/codegen/box/functions/defaultargs2.kt +++ b/compiler/testData/codegen/box/functions/defaultargs2.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR class T4( val c1: Boolean, val c2: Boolean, diff --git a/compiler/testData/codegen/box/functions/defaultargs7.kt b/compiler/testData/codegen/box/functions/defaultargs7.kt index c9f6abd7260..107929fad00 100644 --- a/compiler/testData/codegen/box/functions/defaultargs7.kt +++ b/compiler/testData/codegen/box/functions/defaultargs7.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR class A(val expected: Int) { fun foo(x: Int, y: Int = x + 20, z: Int = y * 2) = z == expected } diff --git a/compiler/testData/codegen/box/functions/invoke/kt3821invokeOnThis.kt b/compiler/testData/codegen/box/functions/invoke/kt3821invokeOnThis.kt index 274020fdd4c..d15d396965a 100644 --- a/compiler/testData/codegen/box/functions/invoke/kt3821invokeOnThis.kt +++ b/compiler/testData/codegen/box/functions/invoke/kt3821invokeOnThis.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR //KT-3821 Invoke convention doesn't work for `this` class A() { diff --git a/compiler/testData/codegen/box/functions/invoke/kt3822invokeOnThis.kt b/compiler/testData/codegen/box/functions/invoke/kt3822invokeOnThis.kt index dc8c76a7673..816a8c47874 100644 --- a/compiler/testData/codegen/box/functions/invoke/kt3822invokeOnThis.kt +++ b/compiler/testData/codegen/box/functions/invoke/kt3822invokeOnThis.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // IGNORE_BACKEND: JS_IR //KT-3822 Compiler crashes when use invoke convention with `this` in class which extends Function0 // IGNORE_BACKEND: JS diff --git a/compiler/testData/codegen/box/increment/classNaryGetSet.kt b/compiler/testData/codegen/box/increment/classNaryGetSet.kt index 80695545d3e..121ace263e0 100644 --- a/compiler/testData/codegen/box/increment/classNaryGetSet.kt +++ b/compiler/testData/codegen/box/increment/classNaryGetSet.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR object A { var x = 0 diff --git a/compiler/testData/codegen/box/increment/classWithGetSet.kt b/compiler/testData/codegen/box/increment/classWithGetSet.kt index c3dfdaaab93..97d2925acb4 100644 --- a/compiler/testData/codegen/box/increment/classWithGetSet.kt +++ b/compiler/testData/codegen/box/increment/classWithGetSet.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR class AByte(var value: Byte) { operator fun get(i: Int) = value diff --git a/compiler/testData/codegen/box/inlineClasses/jvmStaticVarInInlineClassCompanion.kt b/compiler/testData/codegen/box/inlineClasses/jvmStaticVarInInlineClassCompanion.kt index 3dbbbafb33f..07966551096 100644 --- a/compiler/testData/codegen/box/inlineClasses/jvmStaticVarInInlineClassCompanion.kt +++ b/compiler/testData/codegen/box/inlineClasses/jvmStaticVarInInlineClassCompanion.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/innerNested/protectedNestedClass.kt b/compiler/testData/codegen/box/innerNested/protectedNestedClass.kt index 7622cb538a1..7de7c5cf0a6 100644 --- a/compiler/testData/codegen/box/innerNested/protectedNestedClass.kt +++ b/compiler/testData/codegen/box/innerNested/protectedNestedClass.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // See KT-9246 IllegalAccessError when trying to access protected nested class from parent class // FILE: a.kt diff --git a/compiler/testData/codegen/box/innerNested/superConstructorCall/deepLocalHierarchy.kt b/compiler/testData/codegen/box/innerNested/superConstructorCall/deepLocalHierarchy.kt index f63a0f0b8a8..760f7b0deae 100644 --- a/compiler/testData/codegen/box/innerNested/superConstructorCall/deepLocalHierarchy.kt +++ b/compiler/testData/codegen/box/innerNested/superConstructorCall/deepLocalHierarchy.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR fun box(): String { abstract class L1 { abstract fun foo(): String diff --git a/compiler/testData/codegen/box/innerNested/superConstructorCall/localExtendsLocalWithClosure.kt b/compiler/testData/codegen/box/innerNested/superConstructorCall/localExtendsLocalWithClosure.kt index b9dd9789e75..f24ed933d5c 100644 --- a/compiler/testData/codegen/box/innerNested/superConstructorCall/localExtendsLocalWithClosure.kt +++ b/compiler/testData/codegen/box/innerNested/superConstructorCall/localExtendsLocalWithClosure.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR fun box(): String { val result = "OK" diff --git a/compiler/testData/codegen/box/jvm8/defaults/inlineProperty.kt b/compiler/testData/codegen/box/jvm8/defaults/inlineProperty.kt index e35975415ad..5599ca7c425 100644 --- a/compiler/testData/codegen/box/jvm8/defaults/inlineProperty.kt +++ b/compiler/testData/codegen/box/jvm8/defaults/inlineProperty.kt @@ -1,5 +1,4 @@ // !JVM_DEFAULT_MODE: enable -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // JVM_TARGET: 1.8 // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvmStatic/propertyAsDefault.kt b/compiler/testData/codegen/box/jvmStatic/propertyAsDefault.kt index 5afaf1785cc..2974b5366f6 100644 --- a/compiler/testData/codegen/box/jvmStatic/propertyAsDefault.kt +++ b/compiler/testData/codegen/box/jvmStatic/propertyAsDefault.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/codegen/box/jvmStatic/propertyGetterDelegatesToAnother.kt b/compiler/testData/codegen/box/jvmStatic/propertyGetterDelegatesToAnother.kt index 3f66fb7064b..767a0b188ae 100644 --- a/compiler/testData/codegen/box/jvmStatic/propertyGetterDelegatesToAnother.kt +++ b/compiler/testData/codegen/box/jvmStatic/propertyGetterDelegatesToAnother.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // WITH_RUNTIME // TARGET_BACKEND: JVM object ObjectThisTest { diff --git a/compiler/testData/codegen/box/lazyCodegen/ifElse.kt b/compiler/testData/codegen/box/lazyCodegen/ifElse.kt index fa4f250e824..0f683860b24 100644 --- a/compiler/testData/codegen/box/lazyCodegen/ifElse.kt +++ b/compiler/testData/codegen/box/lazyCodegen/ifElse.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR - class A (val p: String, p1: String, p2: String) { var cond1 :String = "" diff --git a/compiler/testData/codegen/box/lazyCodegen/safeAssignComplex.kt b/compiler/testData/codegen/box/lazyCodegen/safeAssignComplex.kt index 3e123bdc0a8..6dd9cac91de 100644 --- a/compiler/testData/codegen/box/lazyCodegen/safeAssignComplex.kt +++ b/compiler/testData/codegen/box/lazyCodegen/safeAssignComplex.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR var holder = "" var mainShape: Shape? = null diff --git a/compiler/testData/codegen/box/localClasses/kt3389.kt b/compiler/testData/codegen/box/localClasses/kt3389.kt index a47adbdee47..abb515b1688 100644 --- a/compiler/testData/codegen/box/localClasses/kt3389.kt +++ b/compiler/testData/codegen/box/localClasses/kt3389.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR package t class Reproduce { diff --git a/compiler/testData/codegen/box/localClasses/nameWithWhitespace.kt b/compiler/testData/codegen/box/localClasses/nameWithWhitespace.kt index 11bf0d3503c..2bdaf3a9a12 100644 --- a/compiler/testData/codegen/box/localClasses/nameWithWhitespace.kt +++ b/compiler/testData/codegen/box/localClasses/nameWithWhitespace.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // IGNORE_BACKEND: JS_IR // IGNORE_BACKEND: JS diff --git a/compiler/testData/codegen/box/multiDecl/forRange/MultiDeclFor.kt b/compiler/testData/codegen/box/multiDecl/forRange/MultiDeclFor.kt index 312a46a4a51..ceabb3396b0 100644 --- a/compiler/testData/codegen/box/multiDecl/forRange/MultiDeclFor.kt +++ b/compiler/testData/codegen/box/multiDecl/forRange/MultiDeclFor.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR class Range(val from : C, val to: C) { operator fun iterator() = It(from, to) } diff --git a/compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForComponentExtensions.kt b/compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForComponentExtensions.kt index fccbbf9112a..edcd9c1188e 100644 --- a/compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForComponentExtensions.kt +++ b/compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForComponentExtensions.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR class Range(val from : C, val to: C) { operator fun iterator() = It(from, to) } diff --git a/compiler/testData/codegen/box/multiDecl/forRange/UnderscoreNames.kt b/compiler/testData/codegen/box/multiDecl/forRange/UnderscoreNames.kt index fcef3d33d07..9139c8cd549 100644 --- a/compiler/testData/codegen/box/multiDecl/forRange/UnderscoreNames.kt +++ b/compiler/testData/codegen/box/multiDecl/forRange/UnderscoreNames.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR class Range(val from : C, val to: C) { operator fun iterator() = It(from, to) } diff --git a/compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclFor.kt b/compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclFor.kt index 2bac1849b67..1c746927ffc 100644 --- a/compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclFor.kt +++ b/compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclFor.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR class Range(val from : C, val to: C) { operator fun iterator() = It(from, to) } diff --git a/compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentExtensions.kt b/compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentExtensions.kt index e1d53832ad1..2a3ce2cf5b7 100644 --- a/compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentExtensions.kt +++ b/compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentExtensions.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR class Range(val from : C, val to: C) { operator fun iterator() = It(from, to) } diff --git a/compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclFor.kt b/compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclFor.kt index 8f48d5cdc04..be1dacd3f39 100644 --- a/compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclFor.kt +++ b/compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclFor.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR class Range(val from : C, val to: C) { operator fun iterator() = It(from, to) } diff --git a/compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentExtensions.kt b/compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentExtensions.kt index 92e36d74a0c..08eb7d8914d 100644 --- a/compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentExtensions.kt +++ b/compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentExtensions.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR class Range(val from : C, val to: C) { operator fun iterator() = It(from, to) } diff --git a/compiler/testData/codegen/box/multiDecl/returnInElvis.kt b/compiler/testData/codegen/box/multiDecl/returnInElvis.kt index e8a5d6fc8e6..9f381d75225 100644 --- a/compiler/testData/codegen/box/multiDecl/returnInElvis.kt +++ b/compiler/testData/codegen/box/multiDecl/returnInElvis.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR data class Z(val p: String, val k: String) diff --git a/compiler/testData/codegen/box/objects/companionObjectAccess/privateCompanionObjectAccessedFromMethodInlinedInNestedClass.kt b/compiler/testData/codegen/box/objects/companionObjectAccess/privateCompanionObjectAccessedFromMethodInlinedInNestedClass.kt index 62c83263ecf..aaa63fc49f1 100644 --- a/compiler/testData/codegen/box/objects/companionObjectAccess/privateCompanionObjectAccessedFromMethodInlinedInNestedClass.kt +++ b/compiler/testData/codegen/box/objects/companionObjectAccess/privateCompanionObjectAccessedFromMethodInlinedInNestedClass.kt @@ -1,5 +1,4 @@ // !LANGUAGE: +ProperVisibilityForCompanionObjectInstanceField -// IGNORE_BACKEND_FIR: JVM_IR class Outer { private companion object { diff --git a/compiler/testData/codegen/box/objects/kt18982.kt b/compiler/testData/codegen/box/objects/kt18982.kt index 8a9f095c2ee..daf03fb9bf6 100644 --- a/compiler/testData/codegen/box/objects/kt18982.kt +++ b/compiler/testData/codegen/box/objects/kt18982.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR import Foo.bar0 as bar object Foo { diff --git a/compiler/testData/codegen/box/package/checkCast.kt b/compiler/testData/codegen/box/package/checkCast.kt index 64e18cd5409..ffdfa30042b 100644 --- a/compiler/testData/codegen/box/package/checkCast.kt +++ b/compiler/testData/codegen/box/package/checkCast.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR class C(val x: Int) { override fun equals(rhs: Any?): Boolean { if (rhs is C) { diff --git a/compiler/testData/codegen/box/primitiveTypes/equalityWithObject/objectWithAsymmetricEqualsEqPrimitive.kt b/compiler/testData/codegen/box/primitiveTypes/equalityWithObject/objectWithAsymmetricEqualsEqPrimitive.kt index 8cd4509962a..c0426625b8b 100644 --- a/compiler/testData/codegen/box/primitiveTypes/equalityWithObject/objectWithAsymmetricEqualsEqPrimitive.kt +++ b/compiler/testData/codegen/box/primitiveTypes/equalityWithObject/objectWithAsymmetricEqualsEqPrimitive.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // Strictly speaking, asymmetric equals violates contract for 'Object#equals'. // However, we don't rely on this contract so far. class FakeInt(val value: Int) { diff --git a/compiler/testData/codegen/box/primitiveTypes/kt887.kt b/compiler/testData/codegen/box/primitiveTypes/kt887.kt index 992b68e4c35..c03be7c8835 100644 --- a/compiler/testData/codegen/box/primitiveTypes/kt887.kt +++ b/compiler/testData/codegen/box/primitiveTypes/kt887.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR class Book(val name: String) : Comparable { override fun compareTo(other: Book) = name.compareTo(other.name) } diff --git a/compiler/testData/codegen/box/properties/kt1168.kt b/compiler/testData/codegen/box/properties/kt1168.kt index f73839de227..fc931784687 100644 --- a/compiler/testData/codegen/box/properties/kt1168.kt +++ b/compiler/testData/codegen/box/properties/kt1168.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR public abstract class BaseClass() { protected abstract val kind : String diff --git a/compiler/testData/codegen/box/properties/kt1170.kt b/compiler/testData/codegen/box/properties/kt1170.kt index 893c03c62be..3b33740d7c6 100644 --- a/compiler/testData/codegen/box/properties/kt1170.kt +++ b/compiler/testData/codegen/box/properties/kt1170.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR public abstract class BaseClass() { open val kind : String = "BaseClass " diff --git a/compiler/testData/codegen/box/properties/kt1417.kt b/compiler/testData/codegen/box/properties/kt1417.kt index 034b0f91be4..665f45d22cd 100644 --- a/compiler/testData/codegen/box/properties/kt1417.kt +++ b/compiler/testData/codegen/box/properties/kt1417.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR package pack open class A(val value: String ) diff --git a/compiler/testData/codegen/box/properties/kt3118.kt b/compiler/testData/codegen/box/properties/kt3118.kt index 7fda0569ca9..b95ea4ad3b4 100644 --- a/compiler/testData/codegen/box/properties/kt3118.kt +++ b/compiler/testData/codegen/box/properties/kt3118.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR package testing class Test { diff --git a/compiler/testData/codegen/box/properties/lateinit/accessorException.kt b/compiler/testData/codegen/box/properties/lateinit/accessorException.kt index e75ae1ee0af..bf4be90c919 100644 --- a/compiler/testData/codegen/box/properties/lateinit/accessorException.kt +++ b/compiler/testData/codegen/box/properties/lateinit/accessorException.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR public class A { fun getFromClass(): Boolean { try { diff --git a/compiler/testData/codegen/box/properties/lateinit/exceptionField.kt b/compiler/testData/codegen/box/properties/lateinit/exceptionField.kt index 1d62e347eab..76120e7eff5 100644 --- a/compiler/testData/codegen/box/properties/lateinit/exceptionField.kt +++ b/compiler/testData/codegen/box/properties/lateinit/exceptionField.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR class A { private lateinit var str: String diff --git a/compiler/testData/codegen/box/properties/lateinit/nameClash.kt b/compiler/testData/codegen/box/properties/lateinit/nameClash.kt index dc6aeec23b6..7b04dcf8c83 100644 --- a/compiler/testData/codegen/box/properties/lateinit/nameClash.kt +++ b/compiler/testData/codegen/box/properties/lateinit/nameClash.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR - class SS { private lateinit var s: String diff --git a/compiler/testData/codegen/box/properties/lateinit/override.kt b/compiler/testData/codegen/box/properties/lateinit/override.kt index 9cf75b67af0..02d05d723be 100644 --- a/compiler/testData/codegen/box/properties/lateinit/override.kt +++ b/compiler/testData/codegen/box/properties/lateinit/override.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR interface Intf { val str: String } diff --git a/compiler/testData/codegen/box/properties/lateinit/overrideException.kt b/compiler/testData/codegen/box/properties/lateinit/overrideException.kt index 0451aea303f..ffc98f1f128 100644 --- a/compiler/testData/codegen/box/properties/lateinit/overrideException.kt +++ b/compiler/testData/codegen/box/properties/lateinit/overrideException.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR interface Intf { val str: String } diff --git a/compiler/testData/codegen/box/publishedApi/simple.kt b/compiler/testData/codegen/box/publishedApi/simple.kt index 865d5557690..4ad78979fd4 100644 --- a/compiler/testData/codegen/box/publishedApi/simple.kt +++ b/compiler/testData/codegen/box/publishedApi/simple.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // MODULE: lib // FILE: lib.kt class A { diff --git a/compiler/testData/codegen/box/regressions/nullableAfterExclExcl.kt b/compiler/testData/codegen/box/regressions/nullableAfterExclExcl.kt index 25d97116a2b..781ff87ee01 100644 --- a/compiler/testData/codegen/box/regressions/nullableAfterExclExcl.kt +++ b/compiler/testData/codegen/box/regressions/nullableAfterExclExcl.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR interface Sample { val callMe: Int } diff --git a/compiler/testData/codegen/box/secondaryConstructors/withGenerics.kt b/compiler/testData/codegen/box/secondaryConstructors/withGenerics.kt index e2b807a291b..20cd7ce3da7 100644 --- a/compiler/testData/codegen/box/secondaryConstructors/withGenerics.kt +++ b/compiler/testData/codegen/box/secondaryConstructors/withGenerics.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // FILE: WithGenerics.java diff --git a/compiler/testData/codegen/box/secondaryConstructors/withPrimary.kt b/compiler/testData/codegen/box/secondaryConstructors/withPrimary.kt index 85ef1b723cf..28080ec08d1 100644 --- a/compiler/testData/codegen/box/secondaryConstructors/withPrimary.kt +++ b/compiler/testData/codegen/box/secondaryConstructors/withPrimary.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // FILE: WithPrimary.java diff --git a/compiler/testData/codegen/box/secondaryConstructors/withoutPrimary.kt b/compiler/testData/codegen/box/secondaryConstructors/withoutPrimary.kt index 4a2844e2d4e..d455a57dba8 100644 --- a/compiler/testData/codegen/box/secondaryConstructors/withoutPrimary.kt +++ b/compiler/testData/codegen/box/secondaryConstructors/withoutPrimary.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // FILE: WithoutPrimary.java diff --git a/compiler/testData/codegen/box/smartCasts/falseSmartCast.kt b/compiler/testData/codegen/box/smartCasts/falseSmartCast.kt index 4555777e1b5..cfdcf7e1e7c 100644 --- a/compiler/testData/codegen/box/smartCasts/falseSmartCast.kt +++ b/compiler/testData/codegen/box/smartCasts/falseSmartCast.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR open class SuperFoo { public fun bar(): String { if (this is Foo) { diff --git a/compiler/testData/codegen/box/smartCasts/implicitReceiver.kt b/compiler/testData/codegen/box/smartCasts/implicitReceiver.kt index 44b8c9d5e74..911f53248c5 100644 --- a/compiler/testData/codegen/box/smartCasts/implicitReceiver.kt +++ b/compiler/testData/codegen/box/smartCasts/implicitReceiver.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR open class A { class B : A() { val a = "FAIL" diff --git a/compiler/testData/codegen/box/smartCasts/implicitReceiverInWhen.kt b/compiler/testData/codegen/box/smartCasts/implicitReceiverInWhen.kt index 346e5b3d5c5..ce31ad2d9f3 100644 --- a/compiler/testData/codegen/box/smartCasts/implicitReceiverInWhen.kt +++ b/compiler/testData/codegen/box/smartCasts/implicitReceiverInWhen.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR open class A { fun f(): String = when (this) { diff --git a/compiler/testData/codegen/box/smartCasts/implicitToGrandSon.kt b/compiler/testData/codegen/box/smartCasts/implicitToGrandSon.kt index d71990f91d7..588cc9ff24d 100644 --- a/compiler/testData/codegen/box/smartCasts/implicitToGrandSon.kt +++ b/compiler/testData/codegen/box/smartCasts/implicitToGrandSon.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR open class A { open fun foo() = "FAIL" diff --git a/compiler/testData/codegen/box/smartCasts/kt19100.kt b/compiler/testData/codegen/box/smartCasts/kt19100.kt index 5a8cab7863b..43113a91d5e 100644 --- a/compiler/testData/codegen/box/smartCasts/kt19100.kt +++ b/compiler/testData/codegen/box/smartCasts/kt19100.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR open class KFoo { fun foo(): String { if (this is KFooQux) return qux diff --git a/compiler/testData/codegen/box/strings/kt5956.kt b/compiler/testData/codegen/box/strings/kt5956.kt index 4363571b620..037ee9ac1dc 100644 --- a/compiler/testData/codegen/box/strings/kt5956.kt +++ b/compiler/testData/codegen/box/strings/kt5956.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // KT-5956 java.lang.AbstractMethodError: test.Thing.subSequence(II)Ljava/lang/CharSequence class Thing(val delegate: CharSequence) : CharSequence { diff --git a/compiler/testData/codegen/box/traits/genericMethod.kt b/compiler/testData/codegen/box/traits/genericMethod.kt index 45bc5b985a5..e3d47b24181 100644 --- a/compiler/testData/codegen/box/traits/genericMethod.kt +++ b/compiler/testData/codegen/box/traits/genericMethod.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR interface A { val property : T diff --git a/compiler/testData/codegen/box/traits/privateInterfaceMethod.kt b/compiler/testData/codegen/box/traits/privateInterfaceMethod.kt index e7452fa2024..74b01ae58ff 100644 --- a/compiler/testData/codegen/box/traits/privateInterfaceMethod.kt +++ b/compiler/testData/codegen/box/traits/privateInterfaceMethod.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // IGNORE_BACKEND: JS interface A { diff --git a/compiler/testData/codegen/box/unit/ifElse.kt b/compiler/testData/codegen/box/unit/ifElse.kt index 414339d4b3d..171b2b2fdeb 100644 --- a/compiler/testData/codegen/box/unit/ifElse.kt +++ b/compiler/testData/codegen/box/unit/ifElse.kt @@ -1,5 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR - class A (val p: String, p1: String, p2: String) { var cond1: String = "" diff --git a/compiler/testData/ir/irText/classes/classMembers.fir.txt b/compiler/testData/ir/irText/classes/classMembers.fir.txt index 070886d3771..2a0abe229c8 100644 --- a/compiler/testData/ir/irText/classes/classMembers.fir.txt +++ b/compiler/testData/ir/irText/classes/classMembers.fir.txt @@ -127,7 +127,7 @@ FILE fqName: fileName:/classMembers.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun bar (): kotlin.Unit declared in .C.NestedInterface' CALL 'public abstract fun foo (): kotlin.Unit declared in .C.NestedInterface' type=kotlin.Unit origin=null - $this: GET_VAR ': .C.NestedInterface declared in .C.NestedInterface' type=.C.NestedInterface origin=null + $this: GET_VAR ': .C.NestedInterface declared in .C.NestedInterface.bar' type=.C.NestedInterface origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any diff --git a/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.fir.txt b/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.fir.txt index b9489dc9c42..32bf6bf3833 100644 --- a/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.fir.txt +++ b/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.fir.txt @@ -118,93 +118,93 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt 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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null + $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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null + $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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null + $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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null + $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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null + $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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null + $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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null + $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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null + $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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null + $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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null + $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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null + $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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null + $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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null + $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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null + $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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null + $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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null + $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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null + $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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null + $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] overridden: @@ -243,13 +243,13 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt 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 - $this: GET_VAR ': .Test2 declared in .Test2' type=.Test2.Test2> origin=null + $this: GET_VAR ': .Test2 declared in .Test2.component1' type=.Test2 origin=null FUN name:copy visibility:public modality:FINAL <> ($this:.Test2, genericArray:kotlin.Array.Test2>) returnType:.Test2.Test2> $this: VALUE_PARAMETER name: type:.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 - $this: GET_VAR ': .Test2 declared in .Test2' type=.Test2.Test2> origin=null + $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] overridden: @@ -287,13 +287,13 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt 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 - $this: GET_VAR ': .Test3 declared in .Test3' type=.Test3 origin=null + $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 - $this: GET_VAR ': .Test3 declared in .Test3' type=.Test3 origin=null + $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] overridden: diff --git a/compiler/testData/ir/irText/classes/dataClasses.fir.txt b/compiler/testData/ir/irText/classes/dataClasses.fir.txt index 0e895c43dfd..2cf59b18983 100644 --- a/compiler/testData/ir/irText/classes/dataClasses.fir.txt +++ b/compiler/testData/ir/irText/classes/dataClasses.fir.txt @@ -46,33 +46,33 @@ FILE fqName: fileName:/dataClasses.kt 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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null + $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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null + $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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null + $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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null + $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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null + $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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1 origin=null + $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] overridden: @@ -110,13 +110,13 @@ FILE fqName: fileName:/dataClasses.kt 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 - $this: GET_VAR ': .Test2 declared in .Test2' type=.Test2 origin=null + $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 - $this: GET_VAR ': .Test2 declared in .Test2' type=.Test2 origin=null + $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] overridden: @@ -190,43 +190,43 @@ FILE fqName: fileName:/dataClasses.kt 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 - $this: GET_VAR ': .Test3 declared in .Test3' type=.Test3 origin=null + $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 - $this: GET_VAR ': .Test3 declared in .Test3' type=.Test3 origin=null + $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 - $this: GET_VAR ': .Test3 declared in .Test3' type=.Test3 origin=null + $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 - $this: GET_VAR ': .Test3 declared in .Test3' type=.Test3 origin=null + $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 - $this: GET_VAR ': .Test3 declared in .Test3' type=.Test3 origin=null + $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 - $this: GET_VAR ': .Test3 declared in .Test3' type=.Test3 origin=null + $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 - $this: GET_VAR ': .Test3 declared in .Test3' type=.Test3 origin=null + $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 - $this: GET_VAR ': .Test3 declared in .Test3' type=.Test3 origin=null + $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] overridden: diff --git a/compiler/testData/ir/irText/classes/dataClassesGeneric.fir.txt b/compiler/testData/ir/irText/classes/dataClassesGeneric.fir.txt index 61fe605c5cf..2d5c14dbc9c 100644 --- a/compiler/testData/ir/irText/classes/dataClassesGeneric.fir.txt +++ b/compiler/testData/ir/irText/classes/dataClassesGeneric.fir.txt @@ -23,13 +23,13 @@ FILE fqName: fileName:/dataClassesGeneric.kt 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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1.Test1> origin=null + $this: GET_VAR ': .Test1 declared in .Test1.component1' type=.Test1 origin=null FUN name:copy visibility:public modality:FINAL <> ($this:.Test1, x:T of .Test1) returnType:.Test1.Test1> $this: VALUE_PARAMETER name: type:.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 - $this: GET_VAR ': .Test1 declared in .Test1' type=.Test1.Test1> origin=null + $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] overridden: @@ -68,13 +68,13 @@ FILE fqName: fileName:/dataClassesGeneric.kt 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 - $this: GET_VAR ': .Test2 declared in .Test2' type=.Test2.Test2> origin=null + $this: GET_VAR ': .Test2 declared in .Test2.component1' type=.Test2 origin=null FUN name:copy visibility:public modality:FINAL <> ($this:.Test2, x:T of .Test2) returnType:.Test2.Test2> $this: VALUE_PARAMETER name: type:.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 - $this: GET_VAR ': .Test2 declared in .Test2' type=.Test2.Test2> origin=null + $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] overridden: @@ -113,13 +113,13 @@ FILE fqName: fileName:/dataClassesGeneric.kt 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 - $this: GET_VAR ': .Test3 declared in .Test3' type=.Test3.Test3> origin=null + $this: GET_VAR ': .Test3 declared in .Test3.component1' type=.Test3 origin=null FUN name:copy visibility:public modality:FINAL <> ($this:.Test3, x:kotlin.collections.List.Test3>) returnType:.Test3.Test3> $this: VALUE_PARAMETER name: type:.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 - $this: GET_VAR ': .Test3 declared in .Test3' type=.Test3.Test3> origin=null + $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] overridden: @@ -157,13 +157,13 @@ FILE fqName: fileName:/dataClassesGeneric.kt 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 - $this: GET_VAR ': .Test4 declared in .Test4' type=.Test4 origin=null + $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 - $this: GET_VAR ': .Test4 declared in .Test4' type=.Test4 origin=null + $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] overridden: diff --git a/compiler/testData/ir/irText/classes/initValInLambda.fir.txt b/compiler/testData/ir/irText/classes/initValInLambda.fir.txt index c80fa176eab..631ecf92300 100644 --- a/compiler/testData/ir/irText/classes/initValInLambda.fir.txt +++ b/compiler/testData/ir/irText/classes/initValInLambda.fir.txt @@ -26,7 +26,7 @@ FILE fqName: fileName:/initValInLambda.kt $receiver: VALUE_PARAMETER name: type:kotlin.Int BLOCK_BODY SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Unit origin=null - receiver: GET_VAR ': .TestInitValInLambdaCalledOnce declared in .TestInitValInLambdaCalledOnce' type=.TestInitValInLambdaCalledOnce origin=null + receiver: GET_VAR ': .TestInitValInLambdaCalledOnce declared in .TestInitValInLambdaCalledOnce.' type=.TestInitValInLambdaCalledOnce origin=null value: CONST Int type=kotlin.Int value=0 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 27cab54a107..6fd9b459215 100644 --- a/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.fir.txt +++ b/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.fir.txt @@ -29,13 +29,13 @@ FILE fqName: fileName:/lambdaInDataClassDefaultParameter.kt 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 - $this: GET_VAR ': .A declared in .A' type=.A origin=null + $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 - $this: GET_VAR ': .A declared in .A' type=.A origin=null + $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] overridden: @@ -82,13 +82,13 @@ FILE fqName: fileName:/lambdaInDataClassDefaultParameter.kt 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 - $this: GET_VAR ': .B declared in .B' type=.B origin=null + $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 - $this: GET_VAR ': .B declared in .B' type=.B origin=null + $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] overridden: diff --git a/compiler/testData/ir/irText/classes/outerClassAccess.fir.txt b/compiler/testData/ir/irText/classes/outerClassAccess.fir.txt index ca2713a020e..28af2324acd 100644 --- a/compiler/testData/ir/irText/classes/outerClassAccess.fir.txt +++ b/compiler/testData/ir/irText/classes/outerClassAccess.fir.txt @@ -18,7 +18,7 @@ FILE fqName: fileName:/outerClassAccess.kt $this: VALUE_PARAMETER name: type:.Outer.Inner BLOCK_BODY CALL 'public final fun foo (): kotlin.Unit declared in .Outer' type=kotlin.Unit origin=null - $this: GET_VAR ': .Outer declared in .Outer' type=.Outer origin=null + $this: GET_VAR ': .Outer.Inner declared in .Outer.Inner.test' type=.Outer.Inner origin=null CLASS CLASS name:Inner2 modality:FINAL visibility:public [inner] superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Outer.Inner.Inner2 CONSTRUCTOR visibility:public <> () returnType:.Outer.Inner.Inner2 [primary] @@ -29,9 +29,9 @@ FILE fqName: fileName:/outerClassAccess.kt $this: VALUE_PARAMETER name: type:.Outer.Inner.Inner2 BLOCK_BODY CALL 'public final fun test (): kotlin.Unit declared in .Outer.Inner' type=kotlin.Unit origin=null - $this: GET_VAR ': .Outer.Inner declared in .Outer.Inner' type=.Outer.Inner origin=null + $this: GET_VAR ': .Outer.Inner.Inner2 declared in .Outer.Inner.Inner2.test2' type=.Outer.Inner.Inner2 origin=null CALL 'public final fun foo (): kotlin.Unit declared in .Outer' type=kotlin.Unit origin=null - $this: GET_VAR ': .Outer declared in .Outer' type=.Outer origin=null + $this: GET_VAR ': .Outer.Inner.Inner2 declared in .Outer.Inner.Inner2.test2' type=.Outer.Inner.Inner2 origin=null FUN name:test3 visibility:public modality:FINAL <> ($this:.Outer.Inner.Inner2, $receiver:.Outer) returnType:kotlin.Unit $this: VALUE_PARAMETER name: type:.Outer.Inner.Inner2 $receiver: VALUE_PARAMETER name: type:.Outer diff --git a/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.fir.txt index b5df45dbce4..a8d0592c240 100644 --- a/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.fir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.fir.txt @@ -60,7 +60,7 @@ FILE fqName: fileName:/delegatedPropertyAccessorsWithAnnotations.kt 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 - $this: GET_VAR ': .Cell declared in .Cell' type=.Cell origin=null + $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 VALUE_PARAMETER name:thisRef index:0 type:kotlin.Any? @@ -68,7 +68,7 @@ FILE fqName: fileName:/delegatedPropertyAccessorsWithAnnotations.kt VALUE_PARAMETER name:newValue index:2 type:kotlin.Int BLOCK_BODY SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:private' type=kotlin.Unit origin=null - receiver: GET_VAR ': .Cell declared in .Cell' type=.Cell origin=null + receiver: GET_VAR ': .Cell declared in .Cell.setValue' type=.Cell origin=null value: GET_VAR 'newValue: kotlin.Int declared in .Cell.setValue' type=kotlin.Int origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.txt b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.txt index f1426200999..99aab22971e 100644 --- a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.txt +++ b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.txt @@ -37,23 +37,23 @@ FILE fqName: fileName:/dataClassMembers.kt 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 - $this: GET_VAR ': .Test declared in .Test' type=.Test.Test> origin=null + $this: GET_VAR ': .Test declared in .Test.component1' type=.Test origin=null FUN name:component2 visibility:public modality:FINAL <> ($this:.Test) returnType:kotlin.String $this: VALUE_PARAMETER name: type:.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 - $this: GET_VAR ': .Test declared in .Test' type=.Test.Test> origin=null + $this: GET_VAR ': .Test declared in .Test.component2' type=.Test origin=null FUN name:copy visibility:public modality:FINAL <> ($this:.Test, x:T of .Test, y:kotlin.String) returnType:.Test.Test> $this: VALUE_PARAMETER name: type:.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 - $this: GET_VAR ': .Test declared in .Test' type=.Test.Test> origin=null + $this: GET_VAR ': .Test declared in .Test.copy' type=.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 - $this: GET_VAR ': .Test declared in .Test' type=.Test.Test> origin=null + $this: GET_VAR ': .Test declared in .Test.copy' type=.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] overridden: diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/local.fir.txt b/compiler/testData/ir/irText/declarations/provideDelegate/local.fir.txt index 4573681a08b..d5237cfb495 100644 --- a/compiler/testData/ir/irText/declarations/provideDelegate/local.fir.txt +++ b/compiler/testData/ir/irText/declarations/provideDelegate/local.fir.txt @@ -24,7 +24,7 @@ FILE fqName: fileName:/local.kt 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 - $this: GET_VAR ': .Delegate declared in .Delegate' type=.Delegate origin=null + $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: public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any @@ -64,7 +64,7 @@ FILE fqName: fileName:/local.kt 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 - $this: GET_VAR ': .DelegateProvider declared in .DelegateProvider' type=.DelegateProvider origin=null + $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: public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/member.fir.txt b/compiler/testData/ir/irText/declarations/provideDelegate/member.fir.txt index bff4d3f884d..8cf3c846adf 100644 --- a/compiler/testData/ir/irText/declarations/provideDelegate/member.fir.txt +++ b/compiler/testData/ir/irText/declarations/provideDelegate/member.fir.txt @@ -24,7 +24,7 @@ FILE fqName: fileName:/member.kt 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 - $this: GET_VAR ': .Delegate declared in .Delegate' type=.Delegate origin=null + $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: public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any @@ -64,7 +64,7 @@ FILE fqName: fileName:/member.kt 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 - $this: GET_VAR ': .DelegateProvider declared in .DelegateProvider' type=.DelegateProvider origin=null + $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: public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.fir.txt b/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.fir.txt index cc379657706..bb0ec265a02 100644 --- a/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.fir.txt +++ b/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.fir.txt @@ -32,7 +32,7 @@ FILE fqName: fileName:/memberExtension.kt 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 - $this: GET_VAR ': .Host.StringDelegate declared in .Host.StringDelegate' type=.Host.StringDelegate origin=null + $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: public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.fir.txt b/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.fir.txt index ed0a8ae07ef..b7dc6bac301 100644 --- a/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.fir.txt +++ b/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.fir.txt @@ -24,7 +24,7 @@ FILE fqName: fileName:/topLevel.kt 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 - $this: GET_VAR ': .Delegate declared in .Delegate' type=.Delegate origin=null + $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: public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any @@ -64,7 +64,7 @@ FILE fqName: fileName:/topLevel.kt 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 - $this: GET_VAR ': .DelegateProvider declared in .DelegateProvider' type=.DelegateProvider origin=null + $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: public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any diff --git a/compiler/testData/ir/irText/expressions/augmentedAssignmentWithExpression.fir.txt b/compiler/testData/ir/irText/expressions/augmentedAssignmentWithExpression.fir.txt index e059b90f2af..61aedcee00f 100644 --- a/compiler/testData/ir/irText/expressions/augmentedAssignmentWithExpression.fir.txt +++ b/compiler/testData/ir/irText/expressions/augmentedAssignmentWithExpression.fir.txt @@ -13,7 +13,7 @@ FILE fqName: fileName:/augmentedAssignmentWithExpression.kt $this: VALUE_PARAMETER name: type:.Host BLOCK_BODY CALL 'public final fun plusAssign (x: kotlin.Int): kotlin.Unit [operator] declared in .Host' type=kotlin.Unit origin=null - $this: GET_VAR ': .Host declared in .Host' type=.Host origin=null + $this: GET_VAR ': .Host declared in .Host.test1' type=.Host origin=null x: CONST Int type=kotlin.Int value=1 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/chainOfSafeCalls.fir.txt b/compiler/testData/ir/irText/expressions/chainOfSafeCalls.fir.txt index 87cf5cc5d27..6a47ca46e36 100644 --- a/compiler/testData/ir/irText/expressions/chainOfSafeCalls.fir.txt +++ b/compiler/testData/ir/irText/expressions/chainOfSafeCalls.fir.txt @@ -9,12 +9,12 @@ FILE fqName: fileName:/chainOfSafeCalls.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun foo (): .C declared in .C' - GET_VAR ': .C declared in .C' type=.C origin=null + GET_VAR ': .C declared in .C.foo' type=.C origin=null FUN name:bar visibility:public modality:FINAL <> ($this:.C) returnType:.C? $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun bar (): .C? declared in .C' - GET_VAR ': .C declared in .C' type=.C origin=null + GET_VAR ': .C declared in .C.bar' type=.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: public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any diff --git a/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.fir.txt b/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.fir.txt index 85c79b0d474..2d1aa733493 100644 --- a/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.fir.txt +++ b/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.fir.txt @@ -55,7 +55,7 @@ FILE fqName: fileName:/implicitCastToTypeParameter.kt TYPE_OP type=T of .Bar origin=CAST typeOperand=T of .Bar GET_VAR 'arg: kotlin.Any declared in .Bar.test' type=kotlin.Any origin=null CALL 'public final fun useT (t: T of .Bar): kotlin.Unit declared in .Bar' type=kotlin.Unit origin=null - $this: GET_VAR ': .Bar declared in .Bar' type=.Bar.Bar> origin=null + $this: GET_VAR ': .Bar declared in .Bar.test' type=.Bar origin=null t: GET_VAR 'arg: kotlin.Any declared in .Bar.test' type=T of .Bar origin=null FUN name:useT visibility:public modality:FINAL <> ($this:.Bar, t:T of .Bar) returnType:kotlin.Unit $this: VALUE_PARAMETER name: type:.Bar diff --git a/compiler/testData/ir/irText/expressions/interfaceThisRef.fir.txt b/compiler/testData/ir/irText/expressions/interfaceThisRef.fir.txt deleted file mode 100644 index 59432149fe6..00000000000 --- a/compiler/testData/ir/irText/expressions/interfaceThisRef.fir.txt +++ /dev/null @@ -1,23 +0,0 @@ -FILE fqName: fileName:/interfaceThisRef.kt - CLASS INTERFACE name:IFoo modality:ABSTRACT visibility:public superTypes:[kotlin.Any] - $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.IFoo - FUN name:foo visibility:public modality:ABSTRACT <> ($this:.IFoo) returnType:kotlin.Unit - $this: VALUE_PARAMETER name: type:.IFoo - FUN name:bar visibility:public modality:OPEN <> ($this:.IFoo) returnType:kotlin.Unit - $this: VALUE_PARAMETER name: type:.IFoo - BLOCK_BODY - CALL 'public abstract fun foo (): kotlin.Unit declared in .IFoo' type=kotlin.Unit origin=null - $this: GET_VAR ': .IFoo declared in .IFoo' type=.IFoo origin=null - FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] - overridden: - public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any - VALUE_PARAMETER name:other index:0 type:kotlin.Any? - FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override] - overridden: - public open fun hashCode (): kotlin.Int declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any - FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override] - overridden: - public open fun toString (): kotlin.String declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any diff --git a/compiler/testData/ir/irText/expressions/interfaceThisRef.kt b/compiler/testData/ir/irText/expressions/interfaceThisRef.kt index 026dc70c57f..3f10d2939cb 100644 --- a/compiler/testData/ir/irText/expressions/interfaceThisRef.kt +++ b/compiler/testData/ir/irText/expressions/interfaceThisRef.kt @@ -1,3 +1,5 @@ +// FIR_IDENTICAL + interface IFoo { fun foo() fun bar() { foo() } diff --git a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.fir.txt b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.fir.txt index 7ad1729ea01..931bf2ce88f 100644 --- a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.fir.txt +++ b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.fir.txt @@ -15,13 +15,13 @@ FILE fqName: fileName:/Derived.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun getValue (): kotlin.Int declared in .Derived' GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:kotlin.Int visibility:public' type=kotlin.Int origin=GET_PROPERTY - receiver: GET_VAR ': .Derived declared in .Derived' type=.Derived origin=null + receiver: GET_VAR ': .Derived declared in .Derived.getValue' type=.Derived origin=null FUN name:setValue visibility:public modality:FINAL <> ($this:.Derived, value:kotlin.Int) returnType:kotlin.Unit $this: VALUE_PARAMETER name: type:.Derived VALUE_PARAMETER name:value index:0 type:kotlin.Int BLOCK_BODY SET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:kotlin.Int visibility:public' type=kotlin.Unit origin=null - receiver: GET_VAR ': .Derived declared in .Derived' type=.Derived origin=null + receiver: GET_VAR ': .Derived declared in .Derived.setValue' type=.Derived origin=null value: GET_VAR 'value: kotlin.Int declared in .Derived.setValue' type=kotlin.Int origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/expressions/kt30020.fir.txt b/compiler/testData/ir/irText/expressions/kt30020.fir.txt index 472e436d59e..2232e8162cf 100644 --- a/compiler/testData/ir/irText/expressions/kt30020.fir.txt +++ b/compiler/testData/ir/irText/expressions/kt30020.fir.txt @@ -78,7 +78,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: GET_VAR ': .AML declared in .AML' type=.AML origin=null + $receiver: GET_VAR ': .AML declared in .AML.testExplicitThis' type=.AML origin=null element: CONST Int type=kotlin.Int value=200 CLASS CLASS name:Inner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.AML.Inner diff --git a/compiler/testData/ir/irText/expressions/objectReference.fir.txt b/compiler/testData/ir/irText/expressions/objectReference.fir.txt index c22db1dff89..7a0ad2446d6 100644 --- a/compiler/testData/ir/irText/expressions/objectReference.fir.txt +++ b/compiler/testData/ir/irText/expressions/objectReference.fir.txt @@ -31,10 +31,10 @@ FILE fqName: fileName:/objectReference.kt $this: VALUE_PARAMETER name: type:.Z BLOCK_BODY SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:private' type=kotlin.Unit origin=null - receiver: GET_VAR ': .Z declared in .Z' type=.Z origin=null + receiver: GET_VAR ': .Z declared in .Z.bar' type=.Z origin=null value: CONST Int type=kotlin.Int value=1 CALL 'public final fun foo (): kotlin.Unit declared in .Z' type=kotlin.Unit origin=null - $this: GET_VAR ': .Z declared in .Z' type=.Z origin=null + $this: GET_VAR ': .Z declared in .Z.bar' type=.Z origin=null SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_OBJECT 'CLASS OBJECT name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]' type=.Z value: CONST Int type=kotlin.Int value=1 @@ -92,10 +92,10 @@ FILE fqName: fileName:/objectReference.kt $this: VALUE_PARAMETER name: type:.Z BLOCK_BODY SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:private' type=kotlin.Unit origin=null - receiver: GET_VAR ': .Z declared in .Z' type=.Z origin=null + receiver: GET_VAR ': .Z declared in .Z.aLambda.' type=.Z origin=null value: CONST Int type=kotlin.Int value=1 CALL 'public final fun foo (): kotlin.Unit declared in .Z' type=kotlin.Unit origin=null - $this: GET_VAR ': .Z declared in .Z' type=.Z origin=null + $this: GET_VAR ': .Z declared in .Z.aLambda.' type=.Z origin=null SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_OBJECT 'CLASS OBJECT name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]' type=.Z value: CONST Int type=kotlin.Int value=1 @@ -134,10 +134,10 @@ FILE fqName: fileName:/objectReference.kt $this: VALUE_PARAMETER name: type:.Z.anObject. BLOCK_BODY SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:private' type=kotlin.Unit origin=null - receiver: GET_VAR ': .Z declared in .Z' type=.Z origin=null + receiver: GET_VAR ': .Z.anObject. declared in .Z.anObject..test' type=.Z.anObject. origin=null value: CONST Int type=kotlin.Int value=1 CALL 'public final fun foo (): kotlin.Unit declared in .Z' type=kotlin.Unit origin=null - $this: GET_VAR ': .Z declared in .Z' type=.Z origin=null + $this: GET_VAR ': .Z.anObject. declared in .Z.anObject..test' type=.Z.anObject. origin=null SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:private' type=kotlin.Unit origin=null receiver: GET_OBJECT 'CLASS OBJECT name:Z modality:FINAL visibility:public superTypes:[kotlin.Any]' type=.Z value: CONST Int type=kotlin.Int value=1 diff --git a/compiler/testData/ir/irText/expressions/outerClassInstanceReference.fir.txt b/compiler/testData/ir/irText/expressions/outerClassInstanceReference.fir.txt index 1ac85c713e3..da11a5bbaff 100644 --- a/compiler/testData/ir/irText/expressions/outerClassInstanceReference.fir.txt +++ b/compiler/testData/ir/irText/expressions/outerClassInstanceReference.fir.txt @@ -19,7 +19,7 @@ FILE fqName: fileName:/outerClassInstanceReference.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun inner (): kotlin.Unit declared in .Outer.Inner' CALL 'public final fun outer (): kotlin.Unit declared in .Outer' type=kotlin.Unit origin=null - $this: GET_VAR ': .Outer declared in .Outer' type=.Outer origin=null + $this: GET_VAR ': .Outer.Inner declared in .Outer.Inner.inner' type=.Outer.Inner origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any diff --git a/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.fir.txt b/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.fir.txt index 7f6a25553b0..712a8d66c72 100644 --- a/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.fir.txt +++ b/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.fir.txt @@ -15,7 +15,7 @@ FILE fqName: fileName:/Derived.kt GET_VAR 'v: kotlin.Any declared in .Derived.setValue' type=kotlin.Any origin=null then: BLOCK type=kotlin.Unit origin=null SET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:kotlin.String? visibility:public' type=kotlin.Unit origin=null - receiver: GET_VAR ': .Derived declared in .Derived' type=.Derived origin=null + receiver: GET_VAR ': .Derived declared in .Derived.setValue' type=.Derived origin=null value: GET_VAR 'v: kotlin.Any declared in .Derived.setValue' 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: diff --git a/compiler/testData/ir/irText/expressions/thisReferenceBeforeClassDeclared.fir.txt b/compiler/testData/ir/irText/expressions/thisReferenceBeforeClassDeclared.fir.txt index 7df0928197d..80883bbb360 100644 --- a/compiler/testData/ir/irText/expressions/thisReferenceBeforeClassDeclared.fir.txt +++ b/compiler/testData/ir/irText/expressions/thisReferenceBeforeClassDeclared.fir.txt @@ -39,7 +39,7 @@ FILE fqName: fileName:/thisReferenceBeforeClassDeclared.kt $this: VALUE_PARAMETER name: type:.WithCompanion.Companion BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun foo (): .WithCompanion.Companion declared in .WithCompanion.Companion' - GET_VAR ': .WithCompanion.Companion declared in .WithCompanion.Companion' type=.WithCompanion.Companion origin=null + GET_VAR ': .WithCompanion.Companion declared in .WithCompanion.Companion.foo' type=.WithCompanion.Companion origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any diff --git a/compiler/testData/ir/irText/lambdas/destructuringInLambda.fir.txt b/compiler/testData/ir/irText/lambdas/destructuringInLambda.fir.txt index fa2607ce0d0..ae88ca261ab 100644 --- a/compiler/testData/ir/irText/lambdas/destructuringInLambda.fir.txt +++ b/compiler/testData/ir/irText/lambdas/destructuringInLambda.fir.txt @@ -34,23 +34,23 @@ FILE fqName: fileName:/destructuringInLambda.kt 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 - $this: GET_VAR ': .A declared in .A' type=.A origin=null + $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 - $this: GET_VAR ': .A declared in .A' type=.A origin=null + $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 - $this: GET_VAR ': .A declared in .A' type=.A origin=null + $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 - $this: GET_VAR ': .A declared in .A' type=.A origin=null + $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] overridden: diff --git a/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.fir.txt b/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.fir.txt index 7d3eda72d4b..ce174b33def 100644 --- a/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.fir.txt +++ b/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.fir.txt @@ -16,7 +16,7 @@ FILE fqName: fileName:/genericClassInDifferentModule_m2.kt 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 - $this: GET_VAR ': .Derived1 declared in .Derived1' type=.Derived1.Derived1> origin=null + $this: GET_VAR ': .Derived1 declared in .Derived1.foo' type=.Derived1 origin=null PROPERTY name:bar visibility:public modality:FINAL [var] FIELD PROPERTY_BACKING_FIELD name:bar type:T of .Derived1 visibility:private EXPRESSION_BODY