diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java index 0810318e0ea..a922f7b8cc4 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java @@ -21229,6 +21229,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/modifiers/const/stdlibConstFun.kt"); } + @Test + @TestMetadata("stringConcatenation.kt") + public void testStringConcatenation() throws Exception { + runTest("compiler/testData/diagnostics/tests/modifiers/const/stringConcatenation.kt"); + } + @Test @TestMetadata("stringConcatenationWithObject.kt") public void testStringConcatenationWithObject() throws Exception { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java index 5b205cca8af..1c504b49399 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java @@ -21229,6 +21229,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/tests/modifiers/const/stdlibConstFun.kt"); } + @Test + @TestMetadata("stringConcatenation.kt") + public void testStringConcatenation() throws Exception { + runTest("compiler/testData/diagnostics/tests/modifiers/const/stringConcatenation.kt"); + } + @Test @TestMetadata("stringConcatenationWithObject.kt") public void testStringConcatenationWithObject() throws Exception { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java index 919ed7c3999..dd7ea73963c 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java @@ -21235,6 +21235,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/tests/modifiers/const/stdlibConstFun.kt"); } + @Test + @TestMetadata("stringConcatenation.kt") + public void testStringConcatenation() throws Exception { + runTest("compiler/testData/diagnostics/tests/modifiers/const/stringConcatenation.kt"); + } + @Test @TestMetadata("stringConcatenationWithObject.kt") public void testStringConcatenationWithObject() throws Exception { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirConstChecks.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirConstChecks.kt index 75186784fea..50052ad8468 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirConstChecks.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirConstChecks.kt @@ -79,7 +79,7 @@ internal fun checkConstantArguments( if (exp is FirResolvedQualifier) { return ConstantArgumentKind.NOT_CONST } - checkConstantArguments(exp, session).let { return it } + checkConstantArguments(exp, session)?.let { return it } } } expression is FirGetClassCall -> { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java index 45f5023209d..e016dd8ad7e 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java @@ -28388,6 +28388,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr runTest("compiler/testData/codegen/box/involvesIrInterpreter/dumpIrAndCheck/stdlibConst.kt"); } + @Test + @TestMetadata("stringConcatenation.kt") + public void testStringConcatenation() throws Exception { + runTest("compiler/testData/codegen/box/involvesIrInterpreter/dumpIrAndCheck/stringConcatenation.kt"); + } + @Test @TestMetadata("stringOperations.kt") public void testStringOperations() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java index 667d86440e9..8ec7a4acf79 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java @@ -28388,6 +28388,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo runTest("compiler/testData/codegen/box/involvesIrInterpreter/dumpIrAndCheck/stdlibConst.kt"); } + @Test + @TestMetadata("stringConcatenation.kt") + public void testStringConcatenation() throws Exception { + runTest("compiler/testData/codegen/box/involvesIrInterpreter/dumpIrAndCheck/stringConcatenation.kt"); + } + @Test @TestMetadata("stringOperations.kt") public void testStringOperations() throws Exception { diff --git a/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/InstructionsUnfolder.kt b/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/InstructionsUnfolder.kt index a6b24fbfa07..0fab7c84c55 100644 --- a/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/InstructionsUnfolder.kt +++ b/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/InstructionsUnfolder.kt @@ -398,7 +398,10 @@ private fun unfoldStringConcatenation(expression: IrStringConcatenation, environ is Primitive<*> -> { // This block is not really needed, but this way it is easier to handle `toString` with `treatFloatInSpecialWay` enabled. callStack.popState() - val toStringCall = IrCallImpl.fromSymbolOwner(UNDEFINED_OFFSET, UNDEFINED_OFFSET, environment.irBuiltIns.memberToString) + val toStringCall = IrCallImpl.fromSymbolOwner( + UNDEFINED_OFFSET, UNDEFINED_OFFSET, + if (state.isNull()) environment.irBuiltIns.extensionToString else environment.irBuiltIns.memberToString + ) callStack.pushSimpleInstruction(toStringCall) callStack.pushState(state) } diff --git a/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/checker/IrConstTransformer.kt b/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/checker/IrConstTransformer.kt index 69e360b7971..9e6eec72346 100644 --- a/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/checker/IrConstTransformer.kt +++ b/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/checker/IrConstTransformer.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlin.ir.declarations.IrField import org.jetbrains.kotlin.ir.declarations.IrFile import org.jetbrains.kotlin.ir.expressions.* import org.jetbrains.kotlin.ir.expressions.impl.IrConstImpl +import org.jetbrains.kotlin.ir.expressions.impl.IrStringConcatenationImpl import org.jetbrains.kotlin.ir.expressions.impl.IrVarargImpl import org.jetbrains.kotlin.ir.interpreter.IrInterpreter import org.jetbrains.kotlin.ir.interpreter.IrInterpreterConfiguration @@ -21,6 +22,8 @@ import org.jetbrains.kotlin.ir.interpreter.toIrConst import org.jetbrains.kotlin.ir.types.* import org.jetbrains.kotlin.ir.util.dump import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid +import kotlin.math.max +import kotlin.math.min class IrConstTransformer( private val interpreter: IrInterpreter, @@ -100,6 +103,56 @@ class IrConstTransformer( return super.visitField(declaration) } + override fun visitStringConcatenation(expression: IrStringConcatenation): IrExpression { + fun IrExpression.wrapInStringConcat(): IrExpression = IrStringConcatenationImpl( + this.startOffset, this.endOffset, expression.type, listOf(this@wrapInStringConcat) + ) + + fun IrExpression.wrapInToStringConcatAndInterpret(): IrExpression = wrapInStringConcat().interpret(failAsError = false) + + // here `StringBuilder`'s list is used to optimize memory, everything works without it + val folded = mutableListOf() + val buildersList = mutableListOf() + for (next in expression.arguments) { + val last = folded.lastOrNull() + when { + !next.wrapInStringConcat().canBeInterpreted() -> { + folded += next + buildersList.add(StringBuilder()) + } + last == null || !last.wrapInStringConcat().canBeInterpreted() -> { + val result = next.wrapInToStringConcatAndInterpret() + folded += result + buildersList.add(StringBuilder((result as? IrConst<*>)?.value?.toString() ?: "")) + } + else -> { + val nextAsConst = next.wrapInToStringConcatAndInterpret() + if (nextAsConst !is IrConst<*>) { + folded += next + buildersList.add(StringBuilder()) + } else { + folded[folded.size - 1] = IrConstImpl.string( + // Inlined strings may have `last.startOffset > next.endOffset` + min(last.startOffset, next.startOffset), max(last.endOffset, next.endOffset), expression.type, "" + ) + buildersList.last().append(nextAsConst.value.toString()) + } + } + } + } + + val foldedConst = folded.singleOrNull() as? IrConst<*> + if (foldedConst != null) { + return IrConstImpl.string(expression.startOffset, expression.endOffset, expression.type, buildersList.single().toString()) + } + + folded.zip(buildersList).forEach { + @Suppress("UNCHECKED_CAST") + (it.first as? IrConst)?.value = it.second.toString() + } + return IrStringConcatenationImpl(expression.startOffset, expression.endOffset, expression.type, folded) + } + override fun visitDeclaration(declaration: IrDeclarationBase): IrStatement { transformAnnotations(declaration) return super.visitDeclaration(declaration) diff --git a/compiler/testData/codegen/box/involvesIrInterpreter/dumpIrAndCheck/stringConcatenation.kt b/compiler/testData/codegen/box/involvesIrInterpreter/dumpIrAndCheck/stringConcatenation.kt new file mode 100644 index 00000000000..504d2135851 --- /dev/null +++ b/compiler/testData/codegen/box/involvesIrInterpreter/dumpIrAndCheck/stringConcatenation.kt @@ -0,0 +1,16 @@ +// TARGET_BACKEND: JVM_IR +// TARGET_BACKEND: NATIVE +// TARGET_BACKEND: JS_IR +// WITH_STDLIB + +const val simple = "O${'K'} ${1.toLong() + 2.5}" +const val withInnerConcatenation = "1 ${"2 ${3} ${4} 5"} 6" +const val withNull = "1 ${null}" // but `"1" + null` is invalid + +fun box(): String { + if (simple != "OK 3.5") return "Fail 1" + if (withInnerConcatenation != "1 2 3 4 5 6") return "Fail 2" + if (withNull != "1 null") return "Fail 3" + + return "OK" +} diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/recordWithCompanion.fir.ir.txt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/recordWithCompanion.fir.ir.txt index 6a1397c33d1..b7f9af5976d 100644 --- a/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/recordWithCompanion.fir.ir.txt +++ b/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/recordWithCompanion.fir.ir.txt @@ -104,8 +104,7 @@ FILE fqName: fileName:/recordWithCompanion.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .Tag' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="Tag(" - CONST String type=kotlin.String value="id=" + CONST String type=kotlin.String value="Tag(id=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:id type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .Tag declared in .Tag.toString' type=.Tag origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/diagnostics/tests/annotations/parameters/expressions/stringTemplate.fir.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/stringTemplate.fir.kt deleted file mode 100644 index 148a13432fc..00000000000 --- a/compiler/testData/diagnostics/tests/annotations/parameters/expressions/stringTemplate.fir.kt +++ /dev/null @@ -1,19 +0,0 @@ -package test - -annotation class Ann( - val s1: String, - val s2: String, - val s3: String, - val s4: String -) - -val i = 1 - -@Ann( - s1 = "a$i", - s2 = "a$i b", - s3 = "$i", - s4 = "a${i}a$i" -) class MyClass - -// EXPECTED: @Ann(s1 = "a1", s2 = "a1 b", s3 = "1", s4 = "a1a1") diff --git a/compiler/testData/diagnostics/tests/annotations/parameters/expressions/stringTemplate.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/stringTemplate.kt index b62292155e7..09756fdb96d 100644 --- a/compiler/testData/diagnostics/tests/annotations/parameters/expressions/stringTemplate.kt +++ b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/stringTemplate.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL package test annotation class Ann( diff --git a/compiler/testData/diagnostics/tests/annotations/parameters/expressions/strings.fir.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/strings.fir.kt deleted file mode 100644 index ae6987c7bfb..00000000000 --- a/compiler/testData/diagnostics/tests/annotations/parameters/expressions/strings.fir.kt +++ /dev/null @@ -1,9 +0,0 @@ -package test - -annotation class Ann(val s1: String, val s2: String) - -val i = 1 - -@Ann(s1 = "a" + "b", s2 = "a" + "a$i") class MyClass - -// EXPECTED: @Ann(s1 = "ab", s2 = "aa1") diff --git a/compiler/testData/diagnostics/tests/annotations/parameters/expressions/strings.kt b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/strings.kt index 1625ef42576..312ae5760e0 100644 --- a/compiler/testData/diagnostics/tests/annotations/parameters/expressions/strings.kt +++ b/compiler/testData/diagnostics/tests/annotations/parameters/expressions/strings.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL package test annotation class Ann(val s1: String, val s2: String) diff --git a/compiler/testData/diagnostics/tests/modifiers/const/stringConcatenation.fir.kt b/compiler/testData/diagnostics/tests/modifiers/const/stringConcatenation.fir.kt new file mode 100644 index 00000000000..5daca058981 --- /dev/null +++ b/compiler/testData/diagnostics/tests/modifiers/const/stringConcatenation.fir.kt @@ -0,0 +1,16 @@ +const val simple = "O${'K'} ${1.toLong() + 2.0}" +const val withInnerConcatenation = "1 ${"2 ${3} ${4} 5"} 6" + +object A +object B { + override fun toString(): String = "B" +} + +const val printA = "A: $A" +const val printB = "B: $B" + +const val withNull = "1 ${null}" +const val withNullPlus = "1" + null + +val nonConst = 0 +const val withNonConst = "A $nonConst B" diff --git a/compiler/testData/diagnostics/tests/modifiers/const/stringConcatenation.kt b/compiler/testData/diagnostics/tests/modifiers/const/stringConcatenation.kt new file mode 100644 index 00000000000..b164029b4ae --- /dev/null +++ b/compiler/testData/diagnostics/tests/modifiers/const/stringConcatenation.kt @@ -0,0 +1,16 @@ +const val simple = "O${'K'} ${1.toLong() + 2.0}" +const val withInnerConcatenation = "1 ${"2 ${3} ${4} 5"} 6" + +object A +object B { + override fun toString(): String = "B" +} + +const val printA = "A: $A" +const val printB = "B: $B" + +const val withNull = "1 ${null}" +const val withNullPlus = "1" + null + +val nonConst = 0 +const val withNonConst = "A $nonConst B" diff --git a/compiler/testData/diagnostics/tests/modifiers/const/stringConcatenation.txt b/compiler/testData/diagnostics/tests/modifiers/const/stringConcatenation.txt new file mode 100644 index 00000000000..3bbcb0e06ca --- /dev/null +++ b/compiler/testData/diagnostics/tests/modifiers/const/stringConcatenation.txt @@ -0,0 +1,24 @@ +package + +public val nonConst: kotlin.Int = 0 +public const val printA: kotlin.String +public const val printB: kotlin.String +public const val simple: kotlin.String = "OK 3.0" +public const val withInnerConcatenation: kotlin.String = "1 2 3 4 5 6" +public const val withNonConst: kotlin.String = "A 0 B" +public const val withNull: kotlin.String = "1 null" +public const val withNullPlus: kotlin.String + +public object A { + private constructor A() + public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String +} + +public object B { + private constructor B() + public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public open override /*1*/ fun toString(): kotlin.String +} diff --git a/compiler/testData/ir/irText/classes/dataClasses/dataClassWithArrayMembers.fir.ir.txt b/compiler/testData/ir/irText/classes/dataClasses/dataClassWithArrayMembers.fir.ir.txt index e567ce82ad1..e21f103fd70 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/dataClassWithArrayMembers.fir.ir.txt +++ b/compiler/testData/ir/irText/classes/dataClasses/dataClassWithArrayMembers.fir.ir.txt @@ -413,48 +413,39 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .Test1' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="Test1(" - CONST String type=kotlin.String value="stringArray=" + CONST String type=kotlin.String value="Test1(stringArray=" CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:stringArray type:kotlin.Array visibility:private [final]' type=kotlin.Array origin=null receiver: GET_VAR ': .Test1 declared in .Test1.toString' type=.Test1 origin=null - CONST String type=kotlin.String value=", " - CONST String type=kotlin.String value="charArray=" + CONST String type=kotlin.String value=", charArray=" CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:charArray type:kotlin.CharArray visibility:private [final]' type=kotlin.CharArray origin=null receiver: GET_VAR ': .Test1 declared in .Test1.toString' type=.Test1 origin=null - CONST String type=kotlin.String value=", " - CONST String type=kotlin.String value="booleanArray=" + CONST String type=kotlin.String value=", booleanArray=" CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:booleanArray type:kotlin.BooleanArray visibility:private [final]' type=kotlin.BooleanArray origin=null receiver: GET_VAR ': .Test1 declared in .Test1.toString' type=.Test1 origin=null - CONST String type=kotlin.String value=", " - CONST String type=kotlin.String value="byteArray=" + CONST String type=kotlin.String value=", byteArray=" CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:byteArray type:kotlin.ByteArray visibility:private [final]' type=kotlin.ByteArray origin=null receiver: GET_VAR ': .Test1 declared in .Test1.toString' type=.Test1 origin=null - CONST String type=kotlin.String value=", " - CONST String type=kotlin.String value="shortArray=" + CONST String type=kotlin.String value=", shortArray=" CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:shortArray type:kotlin.ShortArray visibility:private [final]' type=kotlin.ShortArray origin=null receiver: GET_VAR ': .Test1 declared in .Test1.toString' type=.Test1 origin=null - CONST String type=kotlin.String value=", " - CONST String type=kotlin.String value="intArray=" + CONST String type=kotlin.String value=", intArray=" CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:intArray type:kotlin.IntArray visibility:private [final]' type=kotlin.IntArray origin=null receiver: GET_VAR ': .Test1 declared in .Test1.toString' type=.Test1 origin=null - CONST String type=kotlin.String value=", " - CONST String type=kotlin.String value="longArray=" + CONST String type=kotlin.String value=", longArray=" CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:longArray type:kotlin.LongArray visibility:private [final]' type=kotlin.LongArray origin=null receiver: GET_VAR ': .Test1 declared in .Test1.toString' type=.Test1 origin=null - CONST String type=kotlin.String value=", " - CONST String type=kotlin.String value="floatArray=" + CONST String type=kotlin.String value=", floatArray=" CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:floatArray type:kotlin.FloatArray visibility:private [final]' type=kotlin.FloatArray origin=null receiver: GET_VAR ': .Test1 declared in .Test1.toString' type=.Test1 origin=null - CONST String type=kotlin.String value=", " - CONST String type=kotlin.String value="doubleArray=" + CONST String type=kotlin.String value=", doubleArray=" CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:doubleArray type:kotlin.DoubleArray visibility:private [final]' type=kotlin.DoubleArray origin=null receiver: GET_VAR ': .Test1 declared in .Test1.toString' type=.Test1 origin=null @@ -545,8 +536,7 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .Test2' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="Test2(" - CONST String type=kotlin.String value="genericArray=" + CONST String type=kotlin.String value="Test2(genericArray=" CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:genericArray type:kotlin.Array.Test2> visibility:private [final]' type=kotlin.Array.Test2> origin=null receiver: GET_VAR ': .Test2.Test2> declared in .Test2.toString' type=.Test2.Test2> origin=null @@ -644,8 +634,7 @@ FILE fqName: fileName:/dataClassWithArrayMembers.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .Test3' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="Test3(" - CONST String type=kotlin.String value="anyArrayN=" + CONST String type=kotlin.String value="Test3(anyArrayN=" CALL 'public final fun dataClassArrayMemberToString (arg0: kotlin.Any?): kotlin.String declared in kotlin.internal.ir' type=kotlin.String origin=null arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:anyArrayN type:kotlin.Array? visibility:private [final]' type=kotlin.Array? origin=null receiver: GET_VAR ': .Test3 declared in .Test3.toString' type=.Test3 origin=null diff --git a/compiler/testData/ir/irText/classes/dataClasses/dataClassWithArrayMembers.fir.kt.txt b/compiler/testData/ir/irText/classes/dataClasses/dataClassWithArrayMembers.fir.kt.txt index 80b39231a1d..79356de1faa 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/dataClassWithArrayMembers.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/dataClasses/dataClassWithArrayMembers.fir.kt.txt @@ -133,7 +133,7 @@ data class Test1 { } override fun toString(): String { - return "Test1(" + "stringArray=" + dataClassArrayMemberToString(arg0 = .#stringArray) + ", " + "charArray=" + dataClassArrayMemberToString(arg0 = .#charArray) + ", " + "booleanArray=" + dataClassArrayMemberToString(arg0 = .#booleanArray) + ", " + "byteArray=" + dataClassArrayMemberToString(arg0 = .#byteArray) + ", " + "shortArray=" + dataClassArrayMemberToString(arg0 = .#shortArray) + ", " + "intArray=" + dataClassArrayMemberToString(arg0 = .#intArray) + ", " + "longArray=" + dataClassArrayMemberToString(arg0 = .#longArray) + ", " + "floatArray=" + dataClassArrayMemberToString(arg0 = .#floatArray) + ", " + "doubleArray=" + dataClassArrayMemberToString(arg0 = .#doubleArray) + ")" + return "Test1(stringArray=" + dataClassArrayMemberToString(arg0 = .#stringArray) + ", charArray=" + dataClassArrayMemberToString(arg0 = .#charArray) + ", booleanArray=" + dataClassArrayMemberToString(arg0 = .#booleanArray) + ", byteArray=" + dataClassArrayMemberToString(arg0 = .#byteArray) + ", shortArray=" + dataClassArrayMemberToString(arg0 = .#shortArray) + ", intArray=" + dataClassArrayMemberToString(arg0 = .#intArray) + ", longArray=" + dataClassArrayMemberToString(arg0 = .#longArray) + ", floatArray=" + dataClassArrayMemberToString(arg0 = .#floatArray) + ", doubleArray=" + dataClassArrayMemberToString(arg0 = .#doubleArray) + ")" } } @@ -176,7 +176,7 @@ data class Test2 { } override fun toString(): String { - return "Test2(" + "genericArray=" + dataClassArrayMemberToString(arg0 = .#genericArray) + ")" + return "Test2(genericArray=" + dataClassArrayMemberToString(arg0 = .#genericArray) + ")" } } @@ -222,7 +222,7 @@ data class Test3 { } override fun toString(): String { - return "Test3(" + "anyArrayN=" + dataClassArrayMemberToString(arg0 = .#anyArrayN) + ")" + return "Test3(anyArrayN=" + dataClassArrayMemberToString(arg0 = .#anyArrayN) + ")" } } diff --git a/compiler/testData/ir/irText/classes/dataClasses/dataClasses.fir.ir.txt b/compiler/testData/ir/irText/classes/dataClasses/dataClasses.fir.ir.txt index 5b85b83a7cf..fba5988070f 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/dataClasses.fir.ir.txt +++ b/compiler/testData/ir/irText/classes/dataClasses/dataClasses.fir.ir.txt @@ -167,16 +167,13 @@ FILE fqName: fileName:/dataClasses.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .Test1' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="Test1(" - CONST String type=kotlin.String value="x=" + CONST String type=kotlin.String value="Test1(x=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test1 declared in .Test1.toString' type=.Test1 origin=null - CONST String type=kotlin.String value=", " - CONST String type=kotlin.String value="y=" + CONST String type=kotlin.String value=", y=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .Test1 declared in .Test1.toString' type=.Test1 origin=null - CONST String type=kotlin.String value=", " - CONST String type=kotlin.String value="z=" + CONST String type=kotlin.String value=", z=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Any visibility:private [final]' type=kotlin.Any origin=null receiver: GET_VAR ': .Test1 declared in .Test1.toString' type=.Test1 origin=null CONST String type=kotlin.String value=")" @@ -273,8 +270,7 @@ FILE fqName: fileName:/dataClasses.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .Test2' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="Test2(" - CONST String type=kotlin.String value="x=" + CONST String type=kotlin.String value="Test2(x=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any? visibility:private [final]' type=kotlin.Any? origin=null receiver: GET_VAR ': .Test2 declared in .Test2.toString' type=.Test2 origin=null CONST String type=kotlin.String value=")" @@ -505,20 +501,16 @@ FILE fqName: fileName:/dataClasses.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .Test3' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="Test3(" - CONST String type=kotlin.String value="d=" + CONST String type=kotlin.String value="Test3(d=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:d type:kotlin.Double visibility:private [final]' type=kotlin.Double origin=null receiver: GET_VAR ': .Test3 declared in .Test3.toString' type=.Test3 origin=null - CONST String type=kotlin.String value=", " - CONST String type=kotlin.String value="dn=" + CONST String type=kotlin.String value=", dn=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:dn type:kotlin.Double? visibility:private [final]' type=kotlin.Double? origin=null receiver: GET_VAR ': .Test3 declared in .Test3.toString' type=.Test3 origin=null - CONST String type=kotlin.String value=", " - CONST String type=kotlin.String value="f=" + CONST String type=kotlin.String value=", f=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:f type:kotlin.Float visibility:private [final]' type=kotlin.Float origin=null receiver: GET_VAR ': .Test3 declared in .Test3.toString' type=.Test3 origin=null - CONST String type=kotlin.String value=", " - CONST String type=kotlin.String value="df=" + CONST String type=kotlin.String value=", df=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:df type:kotlin.Float? visibility:private [final]' type=kotlin.Float? origin=null receiver: GET_VAR ': .Test3 declared in .Test3.toString' type=.Test3 origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/classes/dataClasses/dataClasses.fir.kt.txt b/compiler/testData/ir/irText/classes/dataClasses/dataClasses.fir.kt.txt index fbba8285987..860e0c95bec 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/dataClasses.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/dataClasses/dataClasses.fir.kt.txt @@ -61,7 +61,7 @@ data class Test1 { } override fun toString(): String { - return "Test1(" + "x=" + .#x + ", " + "y=" + .#y + ", " + "z=" + .#z + ")" + return "Test1(x=" + .#x + ", y=" + .#y + ", z=" + .#z + ")" } } @@ -107,7 +107,7 @@ data class Test2 { } override fun toString(): String { - return "Test2(" + "x=" + .#x + ")" + return "Test2(x=" + .#x + ")" } } @@ -193,7 +193,7 @@ data class Test3 { } override fun toString(): String { - return "Test3(" + "d=" + .#d + ", " + "dn=" + .#dn + ", " + "f=" + .#f + ", " + "df=" + .#df + ")" + return "Test3(d=" + .#d + ", dn=" + .#dn + ", f=" + .#f + ", df=" + .#df + ")" } } diff --git a/compiler/testData/ir/irText/classes/dataClasses/dataClassesGeneric.fir.ir.txt b/compiler/testData/ir/irText/classes/dataClasses/dataClassesGeneric.fir.ir.txt index 6abd4067041..cc8d4567d90 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/dataClassesGeneric.fir.ir.txt +++ b/compiler/testData/ir/irText/classes/dataClasses/dataClassesGeneric.fir.ir.txt @@ -94,8 +94,7 @@ FILE fqName: fileName:/dataClassesGeneric.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .Test1' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="Test1(" - CONST String type=kotlin.String value="x=" + CONST String type=kotlin.String value="Test1(x=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of .Test1 visibility:private [final]' type=T of .Test1 origin=null receiver: GET_VAR ': .Test1.Test1> declared in .Test1.toString' type=.Test1.Test1> origin=null CONST String type=kotlin.String value=")" @@ -185,8 +184,7 @@ FILE fqName: fileName:/dataClassesGeneric.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .Test2' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="Test2(" - CONST String type=kotlin.String value="x=" + CONST String type=kotlin.String value="Test2(x=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of .Test2 visibility:private [final]' type=T of .Test2 origin=null receiver: GET_VAR ': .Test2.Test2> declared in .Test2.toString' type=.Test2.Test2> origin=null CONST String type=kotlin.String value=")" @@ -276,8 +274,7 @@ FILE fqName: fileName:/dataClassesGeneric.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .Test3' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="Test3(" - CONST String type=kotlin.String value="x=" + CONST String type=kotlin.String value="Test3(x=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.collections.List.Test3> visibility:private [final]' type=kotlin.collections.List.Test3> origin=null receiver: GET_VAR ': .Test3.Test3> declared in .Test3.toString' type=.Test3.Test3> origin=null CONST String type=kotlin.String value=")" @@ -365,8 +362,7 @@ FILE fqName: fileName:/dataClassesGeneric.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .Test4' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="Test4(" - CONST String type=kotlin.String value="x=" + CONST String type=kotlin.String value="Test4(x=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.collections.List visibility:private [final]' type=kotlin.collections.List origin=null receiver: GET_VAR ': .Test4 declared in .Test4.toString' type=.Test4 origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/classes/dataClasses/dataClassesGeneric.fir.kt.txt b/compiler/testData/ir/irText/classes/dataClasses/dataClassesGeneric.fir.kt.txt index 9a8e39bb9d2..fe75bd56ed3 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/dataClassesGeneric.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/dataClasses/dataClassesGeneric.fir.kt.txt @@ -39,7 +39,7 @@ data class Test1 { } override fun toString(): String { - return "Test1(" + "x=" + .#x + ")" + return "Test1(x=" + .#x + ")" } } @@ -82,7 +82,7 @@ data class Test2 { } override fun toString(): String { - return "Test2(" + "x=" + .#x + ")" + return "Test2(x=" + .#x + ")" } } @@ -125,7 +125,7 @@ data class Test3 { } override fun toString(): String { - return "Test3(" + "x=" + .#x + ")" + return "Test3(x=" + .#x + ")" } } @@ -168,7 +168,7 @@ data class Test4 { } override fun toString(): String { - return "Test4(" + "x=" + .#x + ")" + return "Test4(x=" + .#x + ")" } } diff --git a/compiler/testData/ir/irText/classes/dataClasses/delegationInSealed.fir.ir.txt b/compiler/testData/ir/irText/classes/dataClasses/delegationInSealed.fir.ir.txt index 060a2d17000..d493005ab51 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/delegationInSealed.fir.ir.txt +++ b/compiler/testData/ir/irText/classes/dataClasses/delegationInSealed.fir.ir.txt @@ -132,8 +132,7 @@ FILE fqName: fileName:/delegationInSealed.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .A.B' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="B(" - CONST String type=kotlin.String value="c=" + CONST String type=kotlin.String value="B(c=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:c type:kotlin.CharSequence visibility:private [final]' type=kotlin.CharSequence origin=null receiver: GET_VAR ': .A.B declared in .A.B.toString' type=.A.B origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/classes/dataClasses/delegationInSealed.fir.kt.txt b/compiler/testData/ir/irText/classes/dataClasses/delegationInSealed.fir.kt.txt index a23ac789b18..47a66a6ca1c 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/delegationInSealed.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/dataClasses/delegationInSealed.fir.kt.txt @@ -56,7 +56,7 @@ sealed class A : CharSequence { } override fun toString(): String { - return "B(" + "c=" + .#c + ")" + return "B(c=" + .#c + ")" } } diff --git a/compiler/testData/ir/irText/classes/dataClasses/kt31649.fir.ir.txt b/compiler/testData/ir/irText/classes/dataClasses/kt31649.fir.ir.txt index 422e0c6309a..305aa686ff8 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/kt31649.fir.ir.txt +++ b/compiler/testData/ir/irText/classes/dataClasses/kt31649.fir.ir.txt @@ -92,8 +92,7 @@ FILE fqName: fileName:/kt31649.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .TestData' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="TestData(" - CONST String type=kotlin.String value="nn=" + CONST String type=kotlin.String value="TestData(nn=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null receiver: GET_VAR ': .TestData declared in .TestData.toString' type=.TestData origin=null CONST String type=kotlin.String value=")" @@ -167,8 +166,7 @@ FILE fqName: fileName:/kt31649.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .TestInline' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="TestInline(" - CONST String type=kotlin.String value="nn=" + CONST String type=kotlin.String value="TestInline(nn=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null receiver: GET_VAR ': .TestInline declared in .TestInline.toString' type=.TestInline origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/classes/dataClasses/kt31649.fir.kt.txt b/compiler/testData/ir/irText/classes/dataClasses/kt31649.fir.kt.txt index 6f76ca5bd82..620dd95de1a 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/kt31649.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/dataClasses/kt31649.fir.kt.txt @@ -39,7 +39,7 @@ data class TestData { } override fun toString(): String { - return "TestData(" + "nn=" + .#nn + ")" + return "TestData(nn=" + .#nn + ")" } } @@ -74,7 +74,7 @@ value class TestInline { } override fun toString(): String { - return "TestInline(" + "nn=" + .#nn + ")" + return "TestInline(nn=" + .#nn + ")" } } diff --git a/compiler/testData/ir/irText/classes/dataClasses/kt49936.fir.ir.txt b/compiler/testData/ir/irText/classes/dataClasses/kt49936.fir.ir.txt index 8813ce83af6..d9e89d7d5c7 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/kt49936.fir.ir.txt +++ b/compiler/testData/ir/irText/classes/dataClasses/kt49936.fir.ir.txt @@ -91,8 +91,7 @@ FILE fqName: fileName:/kt49936.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .A' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="A(" - CONST String type=kotlin.String value="x=" + CONST String type=kotlin.String value="A(x=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .A declared in .A.toString' type=.A origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/classes/dataClasses/lambdaInDataClassDefaultParameter.fir.ir.txt b/compiler/testData/ir/irText/classes/dataClasses/lambdaInDataClassDefaultParameter.fir.ir.txt index 9e04c02b05f..ad405bf45d6 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/lambdaInDataClassDefaultParameter.fir.ir.txt +++ b/compiler/testData/ir/irText/classes/dataClasses/lambdaInDataClassDefaultParameter.fir.ir.txt @@ -91,8 +91,7 @@ FILE fqName: fileName:/lambdaInDataClassDefaultParameter.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .A' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="A(" - CONST String type=kotlin.String value="runA=" + CONST String type=kotlin.String value="A(runA=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:runA type:@[ExtensionFunctionType] kotlin.Function2<.A, kotlin.String, kotlin.Unit> visibility:private [final]' type=@[ExtensionFunctionType] kotlin.Function2<.A, kotlin.String, kotlin.Unit> origin=null receiver: GET_VAR ': .A declared in .A.toString' type=.A origin=null CONST String type=kotlin.String value=")" @@ -202,8 +201,7 @@ FILE fqName: fileName:/lambdaInDataClassDefaultParameter.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .B' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="B(" - CONST String type=kotlin.String value="x=" + CONST String type=kotlin.String value="B(x=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any visibility:private [final]' type=kotlin.Any origin=null receiver: GET_VAR ': .B declared in .B.toString' type=.B origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/classes/dataClasses/lambdaInDataClassDefaultParameter.fir.kt.txt b/compiler/testData/ir/irText/classes/dataClasses/lambdaInDataClassDefaultParameter.fir.kt.txt index 941f486de08..a105fca2c6b 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/lambdaInDataClassDefaultParameter.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/dataClasses/lambdaInDataClassDefaultParameter.fir.kt.txt @@ -39,7 +39,7 @@ data class A { } override fun toString(): String { - return "A(" + "runA=" + .#runA + ")" + return "A(runA=" + .#runA + ")" } } @@ -93,7 +93,7 @@ data class B { } override fun toString(): String { - return "B(" + "x=" + .#x + ")" + return "B(x=" + .#x + ")" } } diff --git a/compiler/testData/ir/irText/classes/dataClasses/openDataClass.fir.ir.txt b/compiler/testData/ir/irText/classes/dataClasses/openDataClass.fir.ir.txt index 895c66ee370..734f62fee02 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/openDataClass.fir.ir.txt +++ b/compiler/testData/ir/irText/classes/dataClasses/openDataClass.fir.ir.txt @@ -128,12 +128,10 @@ FILE fqName: fileName:/openDataClass.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .ValidatedProperties' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="ValidatedProperties(" - CONST String type=kotlin.String value="test1=" + CONST String type=kotlin.String value="ValidatedProperties(test1=" CALL 'public open fun (): kotlin.String declared in .ValidatedProperties' type=kotlin.String origin=null $this: GET_VAR ': .ValidatedProperties declared in .ValidatedProperties.toString' type=.ValidatedProperties origin=null - CONST String type=kotlin.String value=", " - CONST String type=kotlin.String value="test2=" + CONST String type=kotlin.String value=", test2=" CALL 'public open fun (): kotlin.String declared in .ValidatedProperties' type=kotlin.String origin=null $this: GET_VAR ': .ValidatedProperties declared in .ValidatedProperties.toString' type=.ValidatedProperties origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/classes/dataClasses/openDataClass.fir.kt.txt b/compiler/testData/ir/irText/classes/dataClasses/openDataClass.fir.kt.txt index 9531a7e5269..1ff6c00bba4 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/openDataClass.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/dataClasses/openDataClass.fir.kt.txt @@ -50,7 +50,7 @@ open data class ValidatedProperties { } override fun toString(): String { - return "ValidatedProperties(" + "test1=" + .() + ", " + "test2=" + .() + ")" + return "ValidatedProperties(test1=" + .() + ", test2=" + .() + ")" } } diff --git a/compiler/testData/ir/irText/classes/inlineClass.fir.ir.txt b/compiler/testData/ir/irText/classes/inlineClass.fir.ir.txt index 606cd976509..bbf189aa1e8 100644 --- a/compiler/testData/ir/irText/classes/inlineClass.fir.ir.txt +++ b/compiler/testData/ir/irText/classes/inlineClass.fir.ir.txt @@ -60,8 +60,7 @@ FILE fqName: fileName:/inlineClass.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .Test' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="Test(" - CONST String type=kotlin.String value="x=" + CONST String type=kotlin.String value="Test(x=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Test declared in .Test.toString' type=.Test origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/classes/inlineClass.fir.kt.txt b/compiler/testData/ir/irText/classes/inlineClass.fir.kt.txt index a1c6c982640..a6ad5fee165 100644 --- a/compiler/testData/ir/irText/classes/inlineClass.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/inlineClass.fir.kt.txt @@ -25,7 +25,7 @@ value class Test { } override fun toString(): String { - return "Test(" + "x=" + .#x + ")" + return "Test(x=" + .#x + ")" } } diff --git a/compiler/testData/ir/irText/classes/inlineClassSyntheticMethods.fir.ir.txt b/compiler/testData/ir/irText/classes/inlineClassSyntheticMethods.fir.ir.txt index 63cc502ee58..4a051babff1 100644 --- a/compiler/testData/ir/irText/classes/inlineClassSyntheticMethods.fir.ir.txt +++ b/compiler/testData/ir/irText/classes/inlineClassSyntheticMethods.fir.ir.txt @@ -105,8 +105,7 @@ FILE fqName: fileName:/inlineClassSyntheticMethods.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .IC' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="IC(" - CONST String type=kotlin.String value="c=" + CONST String type=kotlin.String value="IC(c=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:c type:.C.IC> visibility:private [final]' type=.C.IC> origin=null receiver: GET_VAR ': .IC.IC> declared in .IC.toString' type=.IC.IC> origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/classes/inlineClassSyntheticMethods.fir.kt.txt b/compiler/testData/ir/irText/classes/inlineClassSyntheticMethods.fir.kt.txt index 91c145104d5..fe5663ad27a 100644 --- a/compiler/testData/ir/irText/classes/inlineClassSyntheticMethods.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/inlineClassSyntheticMethods.fir.kt.txt @@ -46,7 +46,7 @@ value class IC { } override fun toString(): String { - return "IC(" + "c=" + .#c + ")" + return "IC(c=" + .#c + ")" } } diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/arrayAccessCompositeOperators.fir.ir.txt b/compiler/testData/ir/irText/declarations/contextReceivers/arrayAccessCompositeOperators.fir.ir.txt index 2f87aa07c55..2e54684aff8 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/arrayAccessCompositeOperators.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/arrayAccessCompositeOperators.fir.ir.txt @@ -91,8 +91,7 @@ FILE fqName: fileName:/arrayAccessCompositeOperators.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .MyContainer' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="MyContainer(" - CONST String type=kotlin.String value="i=" + CONST String type=kotlin.String value="MyContainer(i=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:i type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .MyContainer declared in .MyContainer.toString' type=.MyContainer origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/arrayAccessCompositeOperators.fir.kt.txt b/compiler/testData/ir/irText/declarations/contextReceivers/arrayAccessCompositeOperators.fir.kt.txt index dfc516fba4a..324c09a7a85 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/arrayAccessCompositeOperators.fir.kt.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/arrayAccessCompositeOperators.fir.kt.txt @@ -37,7 +37,7 @@ data class MyContainer { } override fun toString(): String { - return "MyContainer(" + "i=" + .#i + ")" + return "MyContainer(i=" + .#i + ")" } } diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/arrayAccessOperators.fir.ir.txt b/compiler/testData/ir/irText/declarations/contextReceivers/arrayAccessOperators.fir.ir.txt index d83bced5048..8e785efd204 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/arrayAccessOperators.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/arrayAccessOperators.fir.ir.txt @@ -91,8 +91,7 @@ FILE fqName: fileName:/arrayAccessOperators.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .MyContainer' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="MyContainer(" - CONST String type=kotlin.String value="s=" + CONST String type=kotlin.String value="MyContainer(s=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.String visibility:private' type=kotlin.String origin=null receiver: GET_VAR ': .MyContainer declared in .MyContainer.toString' type=.MyContainer origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/arrayAccessOperators.fir.kt.txt b/compiler/testData/ir/irText/declarations/contextReceivers/arrayAccessOperators.fir.kt.txt index 32802291b26..6dc37958633 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/arrayAccessOperators.fir.kt.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/arrayAccessOperators.fir.kt.txt @@ -37,7 +37,7 @@ data class MyContainer { } override fun toString(): String { - return "MyContainer(" + "s=" + .#s + ")" + return "MyContainer(s=" + .#s + ")" } } diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/compoundAssignmentOperators.fir.ir.txt b/compiler/testData/ir/irText/declarations/contextReceivers/compoundAssignmentOperators.fir.ir.txt index 54f69c9befd..6637ce42053 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/compoundAssignmentOperators.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/compoundAssignmentOperators.fir.ir.txt @@ -91,8 +91,7 @@ FILE fqName: fileName:/compoundAssignmentOperators.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .Result' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="Result(" - CONST String type=kotlin.String value="i=" + CONST String type=kotlin.String value="Result(i=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:i type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .Result declared in .Result.toString' type=.Result origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/compoundAssignmentOperators.fir.kt.txt b/compiler/testData/ir/irText/declarations/contextReceivers/compoundAssignmentOperators.fir.kt.txt index f0bc1234e62..b36952aa74e 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/compoundAssignmentOperators.fir.kt.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/compoundAssignmentOperators.fir.kt.txt @@ -37,7 +37,7 @@ data class Result { } override fun toString(): String { - return "Result(" + "i=" + .#i + ")" + return "Result(i=" + .#i + ")" } } diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.fir.ir.txt b/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.fir.ir.txt index 0872ede681b..134e47da052 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.fir.ir.txt @@ -148,12 +148,10 @@ FILE fqName: fileName:/compareTo.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .Pair' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="Pair(" - CONST String type=kotlin.String value="first=" + CONST String type=kotlin.String value="Pair(first=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:first type:A of .Pair visibility:private [final]' type=A of .Pair origin=null receiver: GET_VAR ': .Pair.Pair, B of .Pair> declared in .Pair.toString' type=.Pair.Pair, B of .Pair> origin=null - CONST String type=kotlin.String value=", " - CONST String type=kotlin.String value="second=" + CONST String type=kotlin.String value=", second=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:second type:B of .Pair visibility:private [final]' type=B of .Pair origin=null receiver: GET_VAR ': .Pair.Pair, B of .Pair> declared in .Pair.toString' type=.Pair.Pair, B of .Pair> origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.fir.kt.txt b/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.fir.kt.txt index 9665cd0de45..8aa5ed01bda 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.fir.kt.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.fir.kt.txt @@ -55,7 +55,7 @@ data class Pair { } override fun toString(): String { - return "Pair(" + "first=" + .#first + ", " + "second=" + .#second + ")" + return "Pair(first=" + .#first + ", second=" + .#second + ")" } } diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/iteratorOperator.fir.ir.txt b/compiler/testData/ir/irText/declarations/contextReceivers/iteratorOperator.fir.ir.txt index 906af14e2eb..dce4c353217 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/iteratorOperator.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/iteratorOperator.fir.ir.txt @@ -93,8 +93,7 @@ FILE fqName: fileName:/iteratorOperator.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .Counter' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="Counter(" - CONST String type=kotlin.String value="i=" + CONST String type=kotlin.String value="Counter(i=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:i type:kotlin.Int visibility:private' type=kotlin.Int origin=null receiver: GET_VAR ': .Counter declared in .Counter.toString' type=.Counter origin=null CONST String type=kotlin.String value=")" @@ -184,8 +183,7 @@ FILE fqName: fileName:/iteratorOperator.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .CounterConfig' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="CounterConfig(" - CONST String type=kotlin.String value="max=" + CONST String type=kotlin.String value="CounterConfig(max=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:max type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .CounterConfig declared in .CounterConfig.toString' type=.CounterConfig origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/iteratorOperator.fir.kt.txt b/compiler/testData/ir/irText/declarations/contextReceivers/iteratorOperator.fir.kt.txt index 8e4e2cd17b4..70fc98d5058 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/iteratorOperator.fir.kt.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/iteratorOperator.fir.kt.txt @@ -37,7 +37,7 @@ data class Counter { } override fun toString(): String { - return "Counter(" + "i=" + .#i + ")" + return "Counter(i=" + .#i + ")" } } @@ -80,7 +80,7 @@ data class CounterConfig { } override fun toString(): String { - return "CounterConfig(" + "max=" + .#max + ")" + return "CounterConfig(max=" + .#max + ")" } } diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/unaryOperators.fir.ir.txt b/compiler/testData/ir/irText/declarations/contextReceivers/unaryOperators.fir.ir.txt index 9403c47aa1d..acb96585951 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/unaryOperators.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/unaryOperators.fir.ir.txt @@ -83,8 +83,7 @@ FILE fqName: fileName:/unaryOperators.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .Result' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="Result(" - CONST String type=kotlin.String value="i=" + CONST String type=kotlin.String value="Result(i=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:i type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .Result declared in .Result.toString' type=.Result origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/unaryOperators.fir.kt.txt b/compiler/testData/ir/irText/declarations/contextReceivers/unaryOperators.fir.kt.txt index ba3e64b97a6..baec71e984a 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/unaryOperators.fir.kt.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/unaryOperators.fir.kt.txt @@ -36,7 +36,7 @@ data class Result { } override fun toString(): String { - return "Result(" + "i=" + .#i + ")" + return "Result(i=" + .#i + ")" } } diff --git a/compiler/testData/ir/irText/declarations/inlineCollectionOfInlineClass.fir.ir.txt b/compiler/testData/ir/irText/declarations/inlineCollectionOfInlineClass.fir.ir.txt index 2081c51a17e..d46917c4316 100644 --- a/compiler/testData/ir/irText/declarations/inlineCollectionOfInlineClass.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/inlineCollectionOfInlineClass.fir.ir.txt @@ -60,8 +60,7 @@ FILE fqName: fileName:/inlineCollectionOfInlineClass.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .IT' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="IT(" - CONST String type=kotlin.String value="x=" + CONST String type=kotlin.String value="IT(x=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .IT declared in .IT.toString' type=.IT origin=null CONST String type=kotlin.String value=")" @@ -242,8 +241,7 @@ FILE fqName: fileName:/inlineCollectionOfInlineClass.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .InlineMutableSet' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="InlineMutableSet(" - CONST String type=kotlin.String value="ms=" + CONST String type=kotlin.String value="InlineMutableSet(ms=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:ms type:kotlin.collections.MutableSet<.IT> visibility:private [final]' type=kotlin.collections.MutableSet<.IT> origin=null receiver: GET_VAR ': .InlineMutableSet declared in .InlineMutableSet.toString' type=.InlineMutableSet origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/declarations/inlineCollectionOfInlineClass.fir.kt.txt b/compiler/testData/ir/irText/declarations/inlineCollectionOfInlineClass.fir.kt.txt index c7bb8c1c983..4be294179ba 100644 --- a/compiler/testData/ir/irText/declarations/inlineCollectionOfInlineClass.fir.kt.txt +++ b/compiler/testData/ir/irText/declarations/inlineCollectionOfInlineClass.fir.kt.txt @@ -25,7 +25,7 @@ value class IT { } override fun toString(): String { - return "IT(" + "x=" + .#x + ")" + return "IT(x=" + .#x + ")" } } @@ -102,7 +102,7 @@ value class InlineMutableSet : MutableSet { } override fun toString(): String { - return "InlineMutableSet(" + "ms=" + .#ms + ")" + return "InlineMutableSet(ms=" + .#ms + ")" } } diff --git a/compiler/testData/ir/irText/declarations/jvmRecord/dataClassWithJvmRecord.fir.ir.txt b/compiler/testData/ir/irText/declarations/jvmRecord/dataClassWithJvmRecord.fir.ir.txt index 44f19eb5dea..5ca7341e116 100644 --- a/compiler/testData/ir/irText/declarations/jvmRecord/dataClassWithJvmRecord.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/jvmRecord/dataClassWithJvmRecord.fir.ir.txt @@ -85,8 +85,7 @@ FILE fqName: fileName:/dataClassWithJvmRecord.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .MyRec' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="MyRec(" - CONST String type=kotlin.String value="name=" + CONST String type=kotlin.String value="MyRec(name=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:name type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .MyRec declared in .MyRec.toString' type=.MyRec origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/declarations/jvmRecord/dataClassWithJvmRecord.fir.kt.txt b/compiler/testData/ir/irText/declarations/jvmRecord/dataClassWithJvmRecord.fir.kt.txt index 7844b5916f4..5abe36b5118 100644 --- a/compiler/testData/ir/irText/declarations/jvmRecord/dataClassWithJvmRecord.fir.kt.txt +++ b/compiler/testData/ir/irText/declarations/jvmRecord/dataClassWithJvmRecord.fir.kt.txt @@ -37,7 +37,7 @@ data class MyRec : Record { } override fun toString(): String { - return "MyRec(" + "name=" + .#name + ")" + return "MyRec(name=" + .#name + ")" } } diff --git a/compiler/testData/ir/irText/declarations/kt52677.fir.ir.txt b/compiler/testData/ir/irText/declarations/kt52677.fir.ir.txt index 56c0294b596..3f07235bf8c 100644 --- a/compiler/testData/ir/irText/declarations/kt52677.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/kt52677.fir.ir.txt @@ -117,8 +117,7 @@ FILE fqName: fileName:/kt52677.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .LoginSuccessPacket' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="LoginSuccessPacket(" - CONST String type=kotlin.String value="id=" + CONST String type=kotlin.String value="LoginSuccessPacket(id=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:id type:@[MySerializable(c = ...)] .Uuid1 visibility:private [final]' type=@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1 origin=null receiver: GET_VAR ': .LoginSuccessPacket declared in .LoginSuccessPacket.toString' type=.LoginSuccessPacket origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/declarations/kt52677.fir.kt.txt b/compiler/testData/ir/irText/declarations/kt52677.fir.kt.txt index a13310c5aba..e1b15331f39 100644 --- a/compiler/testData/ir/irText/declarations/kt52677.fir.kt.txt +++ b/compiler/testData/ir/irText/declarations/kt52677.fir.kt.txt @@ -51,7 +51,7 @@ data class LoginSuccessPacket { } override fun toString(): String { - return "LoginSuccessPacket(" + "id=" + .#id + ")" + return "LoginSuccessPacket(id=" + .#id + ")" } } diff --git a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.ir.txt b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.ir.txt index 43f65a56ff4..75bf663d6a9 100644 --- a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.ir.txt @@ -139,12 +139,10 @@ FILE fqName: fileName:/dataClassMembers.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .Test' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="Test(" - CONST String type=kotlin.String value="x=" + CONST String type=kotlin.String value="Test(x=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of .Test visibility:private [final]' type=T of .Test origin=null receiver: GET_VAR ': .Test.Test> declared in .Test.toString' type=.Test.Test> origin=null - CONST String type=kotlin.String value=", " - CONST String type=kotlin.String value="y=" + CONST String type=kotlin.String value=", y=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:private [final]' type=kotlin.String origin=null receiver: GET_VAR ': .Test.Test> declared in .Test.toString' type=.Test.Test> origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.kt.txt b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.kt.txt index 6d3ce06ec60..eecc6bc846f 100644 --- a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.kt.txt +++ b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.kt.txt @@ -52,7 +52,7 @@ data class Test { } override fun toString(): String { - return "Test(" + "x=" + .#x + ", " + "y=" + .#y + ")" + return "Test(x=" + .#x + ", y=" + .#y + ")" } } diff --git a/compiler/testData/ir/irText/firProblems/ArrayMap.fir.ir.txt b/compiler/testData/ir/irText/firProblems/ArrayMap.fir.ir.txt index b438849feba..cdba61cff0e 100644 --- a/compiler/testData/ir/irText/firProblems/ArrayMap.fir.ir.txt +++ b/compiler/testData/ir/irText/firProblems/ArrayMap.fir.ir.txt @@ -824,12 +824,10 @@ FILE fqName: fileName:/ArrayMap.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .ArrayMapImpl.Entry' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="Entry(" - CONST String type=kotlin.String value="key=" + CONST String type=kotlin.String value="Entry(key=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:key type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .ArrayMapImpl.Entry.ArrayMapImpl.Entry> declared in .ArrayMapImpl.Entry.toString' type=.ArrayMapImpl.Entry.ArrayMapImpl.Entry> origin=null - CONST String type=kotlin.String value=", " - CONST String type=kotlin.String value="value=" + CONST String type=kotlin.String value=", value=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of .ArrayMapImpl.Entry visibility:private [final]' type=T of .ArrayMapImpl.Entry origin=null receiver: GET_VAR ': .ArrayMapImpl.Entry.ArrayMapImpl.Entry> declared in .ArrayMapImpl.Entry.toString' type=.ArrayMapImpl.Entry.ArrayMapImpl.Entry> origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/firProblems/ArrayMap.fir.kt.txt b/compiler/testData/ir/irText/firProblems/ArrayMap.fir.kt.txt index 5b6bce3c1d0..0b5f1c44679 100644 --- a/compiler/testData/ir/irText/firProblems/ArrayMap.fir.kt.txt +++ b/compiler/testData/ir/irText/firProblems/ArrayMap.fir.kt.txt @@ -320,7 +320,7 @@ internal class ArrayMapImpl : ArrayMap { } override fun toString(): String { - return "Entry(" + "key=" + .#key + ", " + "value=" + .#value + ")" + return "Entry(key=" + .#key + ", value=" + .#value + ")" } } diff --git a/compiler/testData/ir/irText/firProblems/MultiList.fir.ir.txt b/compiler/testData/ir/irText/firProblems/MultiList.fir.ir.txt index 9a941c6b4c5..6d8fdb0a74a 100644 --- a/compiler/testData/ir/irText/firProblems/MultiList.fir.ir.txt +++ b/compiler/testData/ir/irText/firProblems/MultiList.fir.ir.txt @@ -94,8 +94,7 @@ FILE fqName: fileName:/MultiList.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .Some' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="Some(" - CONST String type=kotlin.String value="value=" + CONST String type=kotlin.String value="Some(value=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of .Some visibility:private [final]' type=T of .Some origin=null receiver: GET_VAR ': .Some.Some> declared in .Some.toString' type=.Some.Some> origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/firProblems/MultiList.fir.kt.txt b/compiler/testData/ir/irText/firProblems/MultiList.fir.kt.txt index c3cc6eda24c..86418c2ccfc 100644 --- a/compiler/testData/ir/irText/firProblems/MultiList.fir.kt.txt +++ b/compiler/testData/ir/irText/firProblems/MultiList.fir.kt.txt @@ -39,7 +39,7 @@ data class Some { } override fun toString(): String { - return "Some(" + "value=" + .#value + ")" + return "Some(value=" + .#value + ")" } } diff --git a/compiler/testData/ir/irText/firProblems/SignatureClash.fir.ir.txt b/compiler/testData/ir/irText/firProblems/SignatureClash.fir.ir.txt index 200b9bf916e..6a1b949c41b 100644 --- a/compiler/testData/ir/irText/firProblems/SignatureClash.fir.ir.txt +++ b/compiler/testData/ir/irText/firProblems/SignatureClash.fir.ir.txt @@ -176,8 +176,7 @@ FILE fqName: fileName:/SignatureClash.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .DataClass' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="DataClass(" - CONST String type=kotlin.String value="delegate=" + CONST String type=kotlin.String value="DataClass(delegate=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:delegate type:.Delegate visibility:private [final]' type=.Delegate origin=null receiver: GET_VAR ': .DataClass declared in .DataClass.toString' type=.DataClass origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/firProblems/SignatureClash.fir.kt.txt b/compiler/testData/ir/irText/firProblems/SignatureClash.fir.kt.txt index 658296fec27..ffc773c9e45 100644 --- a/compiler/testData/ir/irText/firProblems/SignatureClash.fir.kt.txt +++ b/compiler/testData/ir/irText/firProblems/SignatureClash.fir.kt.txt @@ -71,7 +71,7 @@ data class DataClass : Derived, Delegate { } override fun toString(): String { - return "DataClass(" + "delegate=" + .#delegate + ")" + return "DataClass(delegate=" + .#delegate + ")" } } diff --git a/compiler/testData/ir/irText/lambdas/destructuringInLambda.fir.ir.txt b/compiler/testData/ir/irText/lambdas/destructuringInLambda.fir.ir.txt index dcdbccb9208..893f90b1555 100644 --- a/compiler/testData/ir/irText/lambdas/destructuringInLambda.fir.ir.txt +++ b/compiler/testData/ir/irText/lambdas/destructuringInLambda.fir.ir.txt @@ -126,12 +126,10 @@ FILE fqName: fileName:/destructuringInLambda.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .A' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="A(" - CONST String type=kotlin.String value="x=" + CONST String type=kotlin.String value="A(x=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .A declared in .A.toString' type=.A origin=null - CONST String type=kotlin.String value=", " - CONST String type=kotlin.String value="y=" + CONST String type=kotlin.String value=", y=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .A declared in .A.toString' type=.A origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/lambdas/destructuringInLambda.fir.kt.txt b/compiler/testData/ir/irText/lambdas/destructuringInLambda.fir.kt.txt index 0cd20cbde77..e9195d28e4b 100644 --- a/compiler/testData/ir/irText/lambdas/destructuringInLambda.fir.kt.txt +++ b/compiler/testData/ir/irText/lambdas/destructuringInLambda.fir.kt.txt @@ -49,7 +49,7 @@ data class A { } override fun toString(): String { - return "A(" + "x=" + .#x + ", " + "y=" + .#y + ")" + return "A(x=" + .#x + ", y=" + .#y + ")" } } diff --git a/compiler/testData/ir/irText/regressions/kt45236.fir.ir.txt b/compiler/testData/ir/irText/regressions/kt45236.fir.ir.txt index f12fcc8ca63..de69b144a58 100644 --- a/compiler/testData/ir/irText/regressions/kt45236.fir.ir.txt +++ b/compiler/testData/ir/irText/regressions/kt45236.fir.ir.txt @@ -157,12 +157,10 @@ FILE fqName: fileName:/kt45236.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .NetRequestStatus.Error' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="Error(" - CONST String type=kotlin.String value="error=" + CONST String type=kotlin.String value="Error(error=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:error type:kotlin.Throwable visibility:private [final]' type=kotlin.Throwable origin=null receiver: GET_VAR ': .NetRequestStatus.Error.NetRequestStatus.Error> declared in .NetRequestStatus.Error.toString' type=.NetRequestStatus.Error.NetRequestStatus.Error> origin=null - CONST String type=kotlin.String value=", " - CONST String type=kotlin.String value="value=" + CONST String type=kotlin.String value=", value=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of .NetRequestStatus.Error? visibility:private [final]' type=T of .NetRequestStatus.Error? origin=null receiver: GET_VAR ': .NetRequestStatus.Error.NetRequestStatus.Error> declared in .NetRequestStatus.Error.toString' type=.NetRequestStatus.Error.NetRequestStatus.Error> origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.fir.ir.txt b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.fir.ir.txt index 656b41b9abb..25dae76933d 100644 --- a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.fir.ir.txt +++ b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.fir.ir.txt @@ -252,12 +252,10 @@ FILE fqName: fileName:/enhancedNullabilityInForLoop.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .P' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="P(" - CONST String type=kotlin.String value="x=" + CONST String type=kotlin.String value="P(x=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .P declared in .P.toString' type=.P origin=null - CONST String type=kotlin.String value=", " - CONST String type=kotlin.String value="y=" + CONST String type=kotlin.String value=", y=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .P declared in .P.toString' type=.P origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.fir.kt.txt b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.fir.kt.txt index 96779c1935a..62dec72a4ca 100644 --- a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.fir.kt.txt +++ b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.fir.kt.txt @@ -125,7 +125,7 @@ data class P { } override fun toString(): String { - return "P(" + "x=" + .#x + ", " + "y=" + .#y + ")" + return "P(x=" + .#x + ", y=" + .#y + ")" } } diff --git a/compiler/testData/ir/irText/types/typeAliasWithUnsafeVariance.fir.ir.txt b/compiler/testData/ir/irText/types/typeAliasWithUnsafeVariance.fir.ir.txt index ebefd9d18c4..55c42ca5057 100644 --- a/compiler/testData/ir/irText/types/typeAliasWithUnsafeVariance.fir.ir.txt +++ b/compiler/testData/ir/irText/types/typeAliasWithUnsafeVariance.fir.ir.txt @@ -87,8 +87,7 @@ FILE fqName: fileName:/typeAliasWithUnsafeVariance.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .Tag' STRING_CONCATENATION type=kotlin.String - CONST String type=kotlin.String value="Tag(" - CONST String type=kotlin.String value="action=" + CONST String type=kotlin.String value="Tag(action=" GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:action type:kotlin.Function1.Tag, kotlin.Unit> visibility:private [final]' type=kotlin.Function1.Tag, kotlin.Unit> origin=null receiver: GET_VAR ': .Tag.Tag> declared in .Tag.toString' type=.Tag.Tag> origin=null CONST String type=kotlin.String value=")" diff --git a/compiler/testData/ir/irText/types/typeAliasWithUnsafeVariance.fir.kt.txt b/compiler/testData/ir/irText/types/typeAliasWithUnsafeVariance.fir.kt.txt index 93b2be28f4f..a80d2ab0cf4 100644 --- a/compiler/testData/ir/irText/types/typeAliasWithUnsafeVariance.fir.kt.txt +++ b/compiler/testData/ir/irText/types/typeAliasWithUnsafeVariance.fir.kt.txt @@ -37,7 +37,7 @@ data class Tag { } override fun toString(): String { - return "Tag(" + "action=" + .#action + ")" + return "Tag(action=" + .#action + ")" } } diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java index e83ad9480ac..dd836841b0e 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java @@ -21235,6 +21235,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/modifiers/const/stdlibConstFun.kt"); } + @Test + @TestMetadata("stringConcatenation.kt") + public void testStringConcatenation() throws Exception { + runTest("compiler/testData/diagnostics/tests/modifiers/const/stringConcatenation.kt"); + } + @Test @TestMetadata("stringConcatenationWithObject.kt") public void testStringConcatenationWithObject() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java index f312269d99f..9c878d93775 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java @@ -28388,6 +28388,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/involvesIrInterpreter/dumpIrAndCheck/stdlibConst.kt"); } + @Test + @TestMetadata("stringConcatenation.kt") + public void testStringConcatenation() throws Exception { + runTest("compiler/testData/codegen/box/involvesIrInterpreter/dumpIrAndCheck/stringConcatenation.kt"); + } + @Test @TestMetadata("stringOperations.kt") public void testStringOperations() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java index e45d6db60a1..34cc7318245 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java @@ -28388,6 +28388,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack runTest("compiler/testData/codegen/box/involvesIrInterpreter/dumpIrAndCheck/stdlibConst.kt"); } + @Test + @TestMetadata("stringConcatenation.kt") + public void testStringConcatenation() throws Exception { + runTest("compiler/testData/codegen/box/involvesIrInterpreter/dumpIrAndCheck/stringConcatenation.kt"); + } + @Test @TestMetadata("stringOperations.kt") public void testStringOperations() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java index 7b2389c22be..a5a9b8867bc 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java @@ -21142,6 +21142,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest { runTest("compiler/testData/codegen/box/involvesIrInterpreter/dumpIrAndCheck/stdlibConst.kt"); } + @Test + @TestMetadata("stringConcatenation.kt") + public void testStringConcatenation() throws Exception { + runTest("compiler/testData/codegen/box/involvesIrInterpreter/dumpIrAndCheck/stringConcatenation.kt"); + } + @Test @TestMetadata("stringOperations.kt") public void testStringOperations() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java index 54e22ff9757..4aca2a08d59 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java @@ -21142,6 +21142,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/involvesIrInterpreter/dumpIrAndCheck/stdlibConst.kt"); } + @Test + @TestMetadata("stringConcatenation.kt") + public void testStringConcatenation() throws Exception { + runTest("compiler/testData/codegen/box/involvesIrInterpreter/dumpIrAndCheck/stringConcatenation.kt"); + } + @Test @TestMetadata("stringOperations.kt") public void testStringOperations() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java index dc3156fac09..b41dad208e8 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java @@ -21142,6 +21142,12 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes runTest("compiler/testData/codegen/box/involvesIrInterpreter/dumpIrAndCheck/stdlibConst.kt"); } + @Test + @TestMetadata("stringConcatenation.kt") + public void testStringConcatenation() throws Exception { + runTest("compiler/testData/codegen/box/involvesIrInterpreter/dumpIrAndCheck/stringConcatenation.kt"); + } + @Test @TestMetadata("stringOperations.kt") public void testStringOperations() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java index bd887d5f053..2191d58a1e9 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java @@ -24332,6 +24332,12 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe runTest("compiler/testData/codegen/box/involvesIrInterpreter/dumpIrAndCheck/stdlibConst.kt"); } + @Test + @TestMetadata("stringConcatenation.kt") + public void testStringConcatenation() throws Exception { + runTest("compiler/testData/codegen/box/involvesIrInterpreter/dumpIrAndCheck/stringConcatenation.kt"); + } + @Test @TestMetadata("stringOperations.kt") public void testStringOperations() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K1NativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K1NativeCodegenBoxTestGenerated.java index 172a9be533e..5b6ad186219 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K1NativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/K1NativeCodegenBoxTestGenerated.java @@ -24097,6 +24097,12 @@ public class K1NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTes runTest("compiler/testData/codegen/box/involvesIrInterpreter/dumpIrAndCheck/stdlibConst.kt"); } + @Test + @TestMetadata("stringConcatenation.kt") + public void testStringConcatenation() throws Exception { + runTest("compiler/testData/codegen/box/involvesIrInterpreter/dumpIrAndCheck/stringConcatenation.kt"); + } + @Test @TestMetadata("stringOperations.kt") public void testStringOperations() throws Exception {