Support unboxing of inline classes after assertion operator

This commit is contained in:
Mikhail Zarechenskiy
2018-02-06 18:30:26 +03:00
parent 30c79ffadc
commit 9f24bbd980
4 changed files with 90 additions and 1 deletions
@@ -3557,7 +3557,7 @@ public class ExpressionCodegen extends KtVisitor<StackValue, StackValue> impleme
StackValue base = genQualified(receiver, expression.getBaseExpression());
if (isPrimitive(base.type)) return base;
return StackValue.operation(base.type, v -> {
return StackValue.operation(base.type, base.kotlinType, v -> {
base.put(base.type, base.kotlinType, v);
v.dup();
Label ok = new Label();
@@ -0,0 +1,47 @@
// !LANGUAGE: +InlineClasses
inline class WithPrimitive(val a: Int)
fun takeWithPrimitive(a: WithPrimitive) {}
inline class WithReference(val a: Any)
fun takeWithReference(a: WithReference) {}
inline class WithNullableReference(val a: Any?)
fun takeWithNullableReference(a: WithNullableReference) {}
fun foo(a: WithPrimitive?, b: WithPrimitive) {
takeWithPrimitive(a!!) // unbox
takeWithPrimitive(a) // unbox
takeWithPrimitive(b!!)
}
fun bar(a: WithReference?, b: WithReference) {
takeWithReference(a!!)
takeWithReference(a)
takeWithReference(b!!)
}
fun baz(a: WithNullableReference?, b: WithNullableReference) {
takeWithNullableReference(a!!) // unbox
takeWithNullableReference(a) // unbox
takeWithNullableReference(a!!) // unbox
takeWithNullableReference(b!!)
}
fun box(): String {
val a1 = WithPrimitive(1)
val b1 = WithPrimitive(2)
foo(a1, b1)
val a2 = WithReference("")
bar(a2, a2)
val a3 = WithNullableReference("test")
val a4 = WithNullableReference(123)
baz(a3, a4)
return "OK"
}
@@ -0,0 +1,36 @@
// !LANGUAGE: +InlineClasses
inline class WithPrimitive(val a: Int)
fun takeWithPrimitive(a: WithPrimitive) {}
inline class WithReference(val a: Any)
fun takeWithReference(a: WithReference) {}
inline class WithNullableReference(val a: Any?)
fun takeWithNullableReference(a: WithNullableReference) {}
fun foo(a: WithPrimitive?, b: WithPrimitive) {
takeWithPrimitive(a!!) // unbox
takeWithPrimitive(a) // unbox
takeWithPrimitive(b!!)
}
fun bar(a: WithReference?, b: WithReference) {
takeWithReference(a!!)
takeWithReference(a)
takeWithReference(b!!)
}
fun baz(a: WithNullableReference?, b: WithNullableReference) {
takeWithNullableReference(a!!) // unbox
takeWithNullableReference(a) // unbox
takeWithNullableReference(a!!) // unbox
takeWithNullableReference(b!!)
}
// 2 INVOKEVIRTUAL WithPrimitive\.unbox
// 0 INVOKEVIRTUAL WithReference\.unbox
// 3 INVOKEVIRTUAL WithNullableReference\.unbox
// 0 intValue
// 0 valueOf
@@ -1950,6 +1950,12 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
doTest(fileName);
}
@TestMetadata("inlineClassesUnboxingAfterAssertionOperator.kt")
public void testInlineClassesUnboxingAfterAssertionOperator() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/inlineClasses/inlineClassesUnboxingAfterAssertionOperator.kt");
doTest(fileName);
}
@TestMetadata("unboxInlineClassAfterSafeCall.kt")
public void testUnboxInlineClassAfterSafeCall() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/inlineClasses/unboxInlineClassAfterSafeCall.kt");