From d3f00280e957aa94e6622660a57f6e89d2e906e7 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Mon, 20 May 2019 19:56:36 +0300 Subject: [PATCH] Disable data class copy function body in raw FIR After this commit we require 'copy' body generation in FIR2IR converter --- .../kotlin/fir/builder/DataClassUtils.kt | 55 +++++++++---------- .../rawBuilder/expressions/annotated.txt | 3 +- .../rawBuilder/expressions/destructuring.txt | 3 +- .../testData/rawBuilder/expressions/for.txt | 3 +- .../rawBuilder/expressions/lambda.txt | 3 +- .../fir/resolve/testData/resolve/copy.txt | 1 - .../testData/resolve/stdlib/components.txt | 1 - .../classes/dataClassWithArrayMembers.fir.txt | 18 ------ .../ir/irText/classes/dataClasses.fir.txt | 14 ----- .../irText/classes/dataClassesGeneric.fir.txt | 15 ----- .../lambdaInDataClassDefaultParameter.fir.txt | 6 -- .../parameters/dataClassMembers.fir.txt | 5 -- .../lambdas/destructuringInLambda.fir.txt | 4 -- 13 files changed, 31 insertions(+), 100 deletions(-) diff --git a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/DataClassUtils.kt b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/DataClassUtils.kt index 9828376bf52..5115ca0972a 100644 --- a/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/DataClassUtils.kt +++ b/compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/DataClassUtils.kt @@ -14,10 +14,7 @@ import org.jetbrains.kotlin.fir.declarations.FirProperty import org.jetbrains.kotlin.fir.declarations.impl.FirClassImpl import org.jetbrains.kotlin.fir.declarations.impl.FirMemberFunctionImpl import org.jetbrains.kotlin.fir.declarations.impl.FirValueParameterImpl -import org.jetbrains.kotlin.fir.expressions.impl.FirFunctionCallImpl -import org.jetbrains.kotlin.fir.expressions.impl.FirQualifiedAccessExpressionImpl -import org.jetbrains.kotlin.fir.expressions.impl.FirReturnExpressionImpl -import org.jetbrains.kotlin.fir.expressions.impl.FirSingleExpressionBlock +import org.jetbrains.kotlin.fir.expressions.impl.* import org.jetbrains.kotlin.fir.references.FirResolvedCallableReferenceImpl import org.jetbrains.kotlin.fir.symbols.CallableId import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol @@ -89,7 +86,7 @@ internal fun KtClassOrObject.generateCopyFunction( isInfix = false, isInline = false, isTailRec = false, isExternal = false, isSuspend = false, receiverTypeRef = null, - returnTypeRef = FirImplicitTypeRefImpl(session, this) + returnTypeRef = firPrimaryConstructor.returnTypeRef//FirImplicitTypeRefImpl(session, this) ).apply { val copyFunction = this val zippedParameters = @@ -105,29 +102,31 @@ internal fun KtClassOrObject.generateCopyFunction( isCrossinline = false, isNoinline = false, isVararg = false ) } - body = FirSingleExpressionBlock( - session, - FirReturnExpressionImpl( - session, this@generateCopyFunction, - FirFunctionCallImpl(session, this@generateCopyFunction).apply { - calleeReference = FirResolvedCallableReferenceImpl( - session, this@generateCopyFunction, firClass.name, - firPrimaryConstructor.symbol - ) - }.apply { - for ((ktParameter, firParameter) in primaryConstructorParameters.zip(valueParameters)) { - this.arguments += FirQualifiedAccessExpressionImpl(session, ktParameter).apply { - calleeReference = FirResolvedCallableReferenceImpl( - session, ktParameter, firParameter.name, firParameter.symbol - ) - } - } - } - ).apply { - target = FirFunctionTarget(null) - target.bind(copyFunction) - } - ) + + body = FirEmptyExpressionBlock(session) +// body = FirSingleExpressionBlock( +// session, +// FirReturnExpressionImpl( +// session, this@generateCopyFunction, +// FirFunctionCallImpl(session, this@generateCopyFunction).apply { +// calleeReference = FirResolvedCallableReferenceImpl( +// session, this@generateCopyFunction, firClass.name, +// firPrimaryConstructor.symbol +// ) +// }.apply { +// for ((ktParameter, firParameter) in primaryConstructorParameters.zip(valueParameters)) { +// this.arguments += FirQualifiedAccessExpressionImpl(session, ktParameter).apply { +// calleeReference = FirResolvedCallableReferenceImpl( +// session, ktParameter, firParameter.name, firParameter.symbol +// ) +// } +// } +// } +// ).apply { +// target = FirFunctionTarget(null) +// target.bind(copyFunction) +// } +// ) } ) } \ No newline at end of file diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt index df22475d15d..eca3503b16f 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt @@ -29,8 +29,7 @@ FILE: annotated.kt super() } - public final fun copy(): { - ^copy R|/Two.Two|() + public final fun copy(): R|Two| { } } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt index 36fb16202a8..47bae7e9f22 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt @@ -25,8 +25,7 @@ FILE: destructuring.kt ^component3 R|/Some.third| } - public final fun copy(first: Int = R|/Some.first|, second: Double = R|/Some.second|, third: String = R|/Some.third|): { - ^copy R|/Some.Some|(R|/first|, R|/second|, R|/third|) + public final fun copy(first: Int = R|/Some.first|, second: Double = R|/Some.second|, third: String = R|/Some.third|): R|Some| { } } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt index 8d06c3b920b..69dde8bf27f 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt @@ -43,8 +43,7 @@ FILE: for.kt ^component2 R|/Some.y| } - public final fun copy(x: Int = R|/Some.x|, y: Int = R|/Some.y|): { - ^copy R|/Some.Some|(R|/x|, R|/y|) + public final fun copy(x: Int = R|/Some.x|, y: Int = R|/Some.y|): R|Some| { } } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt index 2696ea9005e..b7e17ee2ef6 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt @@ -18,8 +18,7 @@ FILE: lambda.kt ^component2 R|/Tuple.y| } - public final fun copy(x: Int = R|/Tuple.x|, y: Int = R|/Tuple.y|): { - ^copy R|/Tuple.Tuple|(R|/x|, R|/y|) + public final fun copy(x: Int = R|/Tuple.x|, y: Int = R|/Tuple.y|): R|Tuple| { } } diff --git a/compiler/fir/resolve/testData/resolve/copy.txt b/compiler/fir/resolve/testData/resolve/copy.txt index 0489878f096..72553bc500d 100644 --- a/compiler/fir/resolve/testData/resolve/copy.txt +++ b/compiler/fir/resolve/testData/resolve/copy.txt @@ -19,7 +19,6 @@ FILE: copy.kt } public final fun copy(x: R|kotlin/Int| = R|/Some.x|, y: R|kotlin/String| = R|/Some.y|): R|Some| { - ^copy R|/Some.Some|(R|/x|, R|/y|) } } diff --git a/compiler/fir/resolve/testData/resolve/stdlib/components.txt b/compiler/fir/resolve/testData/resolve/stdlib/components.txt index 4224aeea314..7489968a4ee 100644 --- a/compiler/fir/resolve/testData/resolve/stdlib/components.txt +++ b/compiler/fir/resolve/testData/resolve/stdlib/components.txt @@ -19,7 +19,6 @@ FILE: components.kt } public final fun copy(x: R|kotlin/Int| = R|/D.x|, y: R|kotlin/String| = R|/D.y|): R|D| { - ^copy R|/D.D|(R|/x|, R|/y|) } } diff --git a/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.fir.txt b/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.fir.txt index 369954c26f9..23407167c66 100644 --- a/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.fir.txt +++ b/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.fir.txt @@ -188,17 +188,6 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt EXPRESSION_BODY CALL 'public final fun (): kotlin.DoubleArray declared in .Test1' type=kotlin.DoubleArray origin=null BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun copy (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): .Test1 declared in .Test1' - CONSTRUCTOR_CALL 'public constructor (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) [primary] declared in .Test1' type=.Test1 origin=null - stringArray: GET_VAR 'stringArray: kotlin.Array declared in .Test1.copy' type=IrErrorType origin=null - charArray: GET_VAR 'charArray: kotlin.CharArray declared in .Test1.copy' type=IrErrorType origin=null - booleanArray: GET_VAR 'booleanArray: kotlin.BooleanArray declared in .Test1.copy' type=IrErrorType origin=null - byteArray: GET_VAR 'byteArray: kotlin.ByteArray declared in .Test1.copy' type=IrErrorType origin=null - shortArray: GET_VAR 'shortArray: kotlin.ShortArray declared in .Test1.copy' type=IrErrorType origin=null - intArray: GET_VAR 'intArray: kotlin.IntArray declared in .Test1.copy' type=IrErrorType origin=null - longArray: GET_VAR 'longArray: kotlin.LongArray declared in .Test1.copy' type=IrErrorType origin=null - floatArray: GET_VAR 'floatArray: kotlin.FloatArray declared in .Test1.copy' type=IrErrorType origin=null - doubleArray: GET_VAR 'doubleArray: kotlin.DoubleArray declared in .Test1.copy' type=IrErrorType origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any @@ -242,10 +231,6 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt EXPRESSION_BODY CALL 'public final fun (): kotlin.Array.Test2> declared in .Test2' type=kotlin.Array.Test2> origin=null BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun copy (genericArray: kotlin.Array.Test2>): .Test2> declared in .Test2' - CONSTRUCTOR_CALL 'public constructor (genericArray: kotlin.Array>) [primary] declared in .Test2' type=.Test2> origin=null - : - genericArray: GET_VAR 'genericArray: kotlin.Array.Test2> declared in .Test2.copy' type=IrErrorType origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any @@ -288,9 +273,6 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt EXPRESSION_BODY CALL 'public final fun (): kotlin.Array? declared in .Test3' type=kotlin.Array? origin=null BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun copy (anyArrayN: kotlin.Array?): .Test3 declared in .Test3' - CONSTRUCTOR_CALL 'public constructor (anyArrayN: kotlin.Array?) [primary] declared in .Test3' type=.Test3 origin=null - anyArrayN: GET_VAR 'anyArrayN: kotlin.Array? declared in .Test3.copy' type=IrErrorType origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any diff --git a/compiler/testData/ir/irText/classes/dataClasses.fir.txt b/compiler/testData/ir/irText/classes/dataClasses.fir.txt index 786912f7e95..9d5847c1b08 100644 --- a/compiler/testData/ir/irText/classes/dataClasses.fir.txt +++ b/compiler/testData/ir/irText/classes/dataClasses.fir.txt @@ -68,11 +68,6 @@ FILE fqName: fileName:/dataClasses.kt EXPRESSION_BODY CALL 'public final fun (): kotlin.Any declared in .Test1' type=kotlin.Any origin=null BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun copy (x: kotlin.Int, y: kotlin.String, z: kotlin.Any): .Test1 declared in .Test1' - CONSTRUCTOR_CALL 'public constructor (x: kotlin.Int, y: kotlin.String, z: kotlin.Any) [primary] declared in .Test1' type=.Test1 origin=null - x: GET_VAR 'x: kotlin.Int declared in .Test1.copy' type=IrErrorType origin=null - y: GET_VAR 'y: kotlin.String declared in .Test1.copy' type=IrErrorType origin=null - z: GET_VAR 'z: kotlin.Any declared in .Test1.copy' type=IrErrorType origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any @@ -115,9 +110,6 @@ FILE fqName: fileName:/dataClasses.kt EXPRESSION_BODY CALL 'public final fun (): kotlin.Any? declared in .Test2' type=kotlin.Any? origin=null BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun copy (x: kotlin.Any?): .Test2 declared in .Test2' - CONSTRUCTOR_CALL 'public constructor (x: kotlin.Any?) [primary] declared in .Test2' type=.Test2 origin=null - x: GET_VAR 'x: kotlin.Any? declared in .Test2.copy' type=IrErrorType origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any @@ -220,12 +212,6 @@ FILE fqName: fileName:/dataClasses.kt EXPRESSION_BODY CALL 'public final fun (): kotlin.Float? declared in .Test3' type=kotlin.Float? origin=null BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun copy (d: kotlin.Double, dn: kotlin.Double?, f: kotlin.Float, df: kotlin.Float?): .Test3 declared in .Test3' - CONSTRUCTOR_CALL 'public constructor (d: kotlin.Double, dn: kotlin.Double?, f: kotlin.Float, df: kotlin.Float?) [primary] declared in .Test3' type=.Test3 origin=null - d: GET_VAR 'd: kotlin.Double declared in .Test3.copy' type=IrErrorType origin=null - dn: GET_VAR 'dn: kotlin.Double? declared in .Test3.copy' type=IrErrorType origin=null - f: GET_VAR 'f: kotlin.Float declared in .Test3.copy' type=IrErrorType origin=null - df: GET_VAR 'df: kotlin.Float? declared in .Test3.copy' type=IrErrorType origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any diff --git a/compiler/testData/ir/irText/classes/dataClassesGeneric.fir.txt b/compiler/testData/ir/irText/classes/dataClassesGeneric.fir.txt index de1716f083a..1da3ccb044f 100644 --- a/compiler/testData/ir/irText/classes/dataClassesGeneric.fir.txt +++ b/compiler/testData/ir/irText/classes/dataClassesGeneric.fir.txt @@ -29,10 +29,6 @@ FILE fqName: fileName:/dataClassesGeneric.kt EXPRESSION_BODY CALL 'public final fun (): T of .Test1 declared in .Test1' type=T of .Test1 origin=null BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun copy (x: T of .Test1): .Test1> declared in .Test1' - CONSTRUCTOR_CALL 'public constructor (x: T of ) [primary] declared in .Test1' type=.Test1> origin=null - : - x: GET_VAR 'x: T of .Test1 declared in .Test1.copy' type=IrErrorType origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any @@ -76,10 +72,6 @@ FILE fqName: fileName:/dataClassesGeneric.kt EXPRESSION_BODY CALL 'public final fun (): T of .Test2 declared in .Test2' type=T of .Test2 origin=null BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun copy (x: T of .Test2): .Test2> declared in .Test2' - CONSTRUCTOR_CALL 'public constructor (x: T of ) [primary] declared in .Test2' type=.Test2> origin=null - : - x: GET_VAR 'x: T of .Test2 declared in .Test2.copy' type=IrErrorType origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any @@ -123,10 +115,6 @@ FILE fqName: fileName:/dataClassesGeneric.kt EXPRESSION_BODY CALL 'public final fun (): kotlin.collections.List.Test3> declared in .Test3' type=kotlin.collections.List.Test3> origin=null BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun copy (x: kotlin.collections.List.Test3>): .Test3> declared in .Test3' - CONSTRUCTOR_CALL 'public constructor (x: kotlin.collections.List>) [primary] declared in .Test3' type=.Test3> origin=null - : - x: GET_VAR 'x: kotlin.collections.List.Test3> declared in .Test3.copy' type=IrErrorType origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any @@ -169,9 +157,6 @@ FILE fqName: fileName:/dataClassesGeneric.kt EXPRESSION_BODY CALL 'public final fun (): kotlin.collections.List declared in .Test4' type=kotlin.collections.List origin=null BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun copy (x: kotlin.collections.List): .Test4 declared in .Test4' - CONSTRUCTOR_CALL 'public constructor (x: kotlin.collections.List) [primary] declared in .Test4' type=.Test4 origin=null - x: GET_VAR 'x: kotlin.collections.List declared in .Test4.copy' type=IrErrorType origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any diff --git a/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.fir.txt b/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.fir.txt index 5ee0bc24106..3cbe6768b9c 100644 --- a/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.fir.txt +++ b/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.fir.txt @@ -34,9 +34,6 @@ FILE fqName: fileName:/lambdaInDataClassDefaultParameter.kt 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 BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun copy (runA: kotlin.Function2<.A, kotlin.String, kotlin.Unit>): .A declared in .A' - CONSTRUCTOR_CALL 'public constructor (runA: kotlin.Function2<.A, kotlin.String, kotlin.Unit>) [primary] declared in .A' type=.A origin=null - runA: GET_VAR 'runA: kotlin.Function2<.A, kotlin.String, kotlin.Unit> declared in .A.copy' type=IrErrorType origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any @@ -88,9 +85,6 @@ FILE fqName: fileName:/lambdaInDataClassDefaultParameter.kt EXPRESSION_BODY CALL 'public final fun (): kotlin.Any declared in .B' type=kotlin.Any origin=null BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun copy (x: kotlin.Any): .B declared in .B' - CONSTRUCTOR_CALL 'public constructor (x: kotlin.Any) [primary] declared in .B' type=.B origin=null - x: GET_VAR 'x: kotlin.Any declared in .B.copy' type=IrErrorType origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any diff --git a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.txt b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.txt index 1e51c285ee2..1bf8ce6ca37 100644 --- a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.txt +++ b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.txt @@ -51,11 +51,6 @@ FILE fqName: fileName:/dataClassMembers.kt EXPRESSION_BODY CALL 'public final fun (): kotlin.String declared in .Test' type=kotlin.String origin=null BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun copy (x: T of .Test, y: kotlin.String): .Test> declared in .Test' - CONSTRUCTOR_CALL 'public constructor (x: T of , y: kotlin.String) [primary] declared in .Test' type=.Test> origin=null - : - x: GET_VAR 'x: T of .Test declared in .Test.copy' type=IrErrorType origin=null - y: GET_VAR 'y: kotlin.String declared in .Test.copy' type=IrErrorType origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean 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 9a892f0c066..ce33a809fd9 100644 --- a/compiler/testData/ir/irText/lambdas/destructuringInLambda.fir.txt +++ b/compiler/testData/ir/irText/lambdas/destructuringInLambda.fir.txt @@ -48,10 +48,6 @@ FILE fqName: fileName:/destructuringInLambda.kt EXPRESSION_BODY CALL 'public final fun (): kotlin.Int declared in .A' type=kotlin.Int origin=null BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun copy (x: kotlin.Int, y: kotlin.Int): .A declared in .A' - CONSTRUCTOR_CALL 'public constructor (x: kotlin.Int, y: kotlin.Int) [primary] declared in .A' type=.A origin=null - x: GET_VAR 'x: kotlin.Int declared in .A.copy' type=IrErrorType origin=null - y: GET_VAR 'y: kotlin.Int declared in .A.copy' type=IrErrorType origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any