Fix inline class coercion in string template with StringBuilder.append
Inline class values with array as a carrier type were not boxed. #KT-27113
This commit is contained in:
@@ -3870,7 +3870,7 @@ public class ExpressionCodegen extends KtVisitor<StackValue, StackValue> impleme
|
|||||||
gen(expr, exprType, exprKotlinType);
|
gen(expr, exprType, exprKotlinType);
|
||||||
}
|
}
|
||||||
|
|
||||||
genInvokeAppendMethod(v, exprType.getSort() == Type.ARRAY ? OBJECT_TYPE : exprType, exprKotlinType);
|
genInvokeAppendMethod(v, exprType, exprKotlinType);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
// !LANGUAGE: +InlineClasses
|
||||||
|
// IGNORE_BACKEND: JS, JS_IR, JVM_IR
|
||||||
|
// WITH_RUNTIME
|
||||||
|
|
||||||
|
class CharacterLiteral(private val prefix: NamelessString, private val s: NamelessString) {
|
||||||
|
override fun toString(): String = "$prefix'$s'"
|
||||||
|
}
|
||||||
|
|
||||||
|
inline class NamelessString(val b: ByteArray) {
|
||||||
|
override fun toString(): String = String(b)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun box(): String {
|
||||||
|
val ns1 = NamelessString("abc".toByteArray())
|
||||||
|
val ns2 = NamelessString("def".toByteArray())
|
||||||
|
val cl = CharacterLiteral(ns1, ns2)
|
||||||
|
if (cl.toString() != "abc'def'") return throw AssertionError(cl.toString())
|
||||||
|
return "OK"
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
// !LANGUAGE: +InlineClasses
|
||||||
|
// IGNORE_BACKEND: JVM_IR
|
||||||
|
// WITH_RUNTIME
|
||||||
|
|
||||||
|
inline class A(val a: Any)
|
||||||
|
|
||||||
|
inline class NA(val b: Any?)
|
||||||
|
|
||||||
|
fun box(): String {
|
||||||
|
val ns1 = NA(A("abc"))
|
||||||
|
val ns2 = NA(null)
|
||||||
|
val t = "-$ns1-$ns2-"
|
||||||
|
if (t != "-NA(b=A(a=abc))-NA(b=null)-") return throw AssertionError(t)
|
||||||
|
return "OK"
|
||||||
|
}
|
||||||
+10
@@ -11859,6 +11859,16 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
|
|||||||
runTest("compiler/testData/codegen/box/inlineClasses/kt27096_reference.kt");
|
runTest("compiler/testData/codegen/box/inlineClasses/kt27096_reference.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("kt27113.kt")
|
||||||
|
public void testKt27113() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/inlineClasses/kt27113.kt");
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("kt27113a.kt")
|
||||||
|
public void testKt27113a() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/inlineClasses/kt27113a.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("kt27132.kt")
|
@TestMetadata("kt27132.kt")
|
||||||
public void testKt27132() throws Exception {
|
public void testKt27132() throws Exception {
|
||||||
runTest("compiler/testData/codegen/box/inlineClasses/kt27132.kt");
|
runTest("compiler/testData/codegen/box/inlineClasses/kt27132.kt");
|
||||||
|
|||||||
+10
@@ -11859,6 +11859,16 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
|
|||||||
runTest("compiler/testData/codegen/box/inlineClasses/kt27096_reference.kt");
|
runTest("compiler/testData/codegen/box/inlineClasses/kt27096_reference.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("kt27113.kt")
|
||||||
|
public void testKt27113() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/inlineClasses/kt27113.kt");
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("kt27113a.kt")
|
||||||
|
public void testKt27113a() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/inlineClasses/kt27113a.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("kt27132.kt")
|
@TestMetadata("kt27132.kt")
|
||||||
public void testKt27132() throws Exception {
|
public void testKt27132() throws Exception {
|
||||||
runTest("compiler/testData/codegen/box/inlineClasses/kt27132.kt");
|
runTest("compiler/testData/codegen/box/inlineClasses/kt27132.kt");
|
||||||
|
|||||||
+10
@@ -11864,6 +11864,16 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
|
|||||||
runTest("compiler/testData/codegen/box/inlineClasses/kt27096_reference.kt");
|
runTest("compiler/testData/codegen/box/inlineClasses/kt27096_reference.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("kt27113.kt")
|
||||||
|
public void testKt27113() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/inlineClasses/kt27113.kt");
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("kt27113a.kt")
|
||||||
|
public void testKt27113a() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/inlineClasses/kt27113a.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("kt27132.kt")
|
@TestMetadata("kt27132.kt")
|
||||||
public void testKt27132() throws Exception {
|
public void testKt27132() throws Exception {
|
||||||
runTest("compiler/testData/codegen/box/inlineClasses/kt27132.kt");
|
runTest("compiler/testData/codegen/box/inlineClasses/kt27132.kt");
|
||||||
|
|||||||
+10
@@ -10399,6 +10399,16 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
|
|||||||
runTest("compiler/testData/codegen/box/inlineClasses/kt27096_reference.kt");
|
runTest("compiler/testData/codegen/box/inlineClasses/kt27096_reference.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("kt27113.kt")
|
||||||
|
public void testKt27113() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/inlineClasses/kt27113.kt");
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("kt27113a.kt")
|
||||||
|
public void testKt27113a() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/inlineClasses/kt27113a.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("kt27132.kt")
|
@TestMetadata("kt27132.kt")
|
||||||
public void testKt27132() throws Exception {
|
public void testKt27132() throws Exception {
|
||||||
runTest("compiler/testData/codegen/box/inlineClasses/kt27132.kt");
|
runTest("compiler/testData/codegen/box/inlineClasses/kt27132.kt");
|
||||||
|
|||||||
+10
@@ -11444,6 +11444,16 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
|
|||||||
runTest("compiler/testData/codegen/box/inlineClasses/kt27096_reference.kt");
|
runTest("compiler/testData/codegen/box/inlineClasses/kt27096_reference.kt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("kt27113.kt")
|
||||||
|
public void testKt27113() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/inlineClasses/kt27113.kt");
|
||||||
|
}
|
||||||
|
|
||||||
|
@TestMetadata("kt27113a.kt")
|
||||||
|
public void testKt27113a() throws Exception {
|
||||||
|
runTest("compiler/testData/codegen/box/inlineClasses/kt27113a.kt");
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("kt27132.kt")
|
@TestMetadata("kt27132.kt")
|
||||||
public void testKt27132() throws Exception {
|
public void testKt27132() throws Exception {
|
||||||
runTest("compiler/testData/codegen/box/inlineClasses/kt27132.kt");
|
runTest("compiler/testData/codegen/box/inlineClasses/kt27132.kt");
|
||||||
|
|||||||
Reference in New Issue
Block a user