azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce a separate StackValue class for lateinit local vars

Browse Source 
Local lateinit var differs in behavior from a simple local var,
and logic that relies of 'instanceof Local' checks assuming that all
instances of Local are simple local vars can produce faulty code
(as in KT-23260, where a local lateinit var was not explicitly put on
stack when passed as an argument to an inline function, thus causing
null propagation).

 #KT-23260 Fixed Target versions 1.2.50
This commit is contained in:
Dmitry Petrov
2018-03-15 13:52:07 +03:00
parent 7be4f5d31f
commit 22c2d8b563
6 changed files with 81 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java
+42 -22
View File
@@ -157,8 +157,13 @@ public abstract class StackValue {
}
@NotNull
public static Local local(int index, @NotNull Type type, @NotNull VariableDescriptor descriptor) {
return new Local(index, type, descriptor.getType(), descriptor.isLateInit(), descriptor.getName());
public static StackValue local(int index, @NotNull Type type, @NotNull VariableDescriptor descriptor) {
if (descriptor.isLateInit()) {
return new LateinitLocal(index, type, descriptor.getType(), descriptor.getName());
}
else {
return new Local(index, type, descriptor.getType());
}
}
@NotNull
@@ -805,50 +810,65 @@ public abstract class StackValue {
public static class Local extends StackValue {
public final int index;
private final boolean isLateinit;
private final Name name;
private Local(int index, Type type, KotlinType kotlinType, boolean isLateinit, Name name) {
private Local(int index, Type type, KotlinType kotlinType) {
super(type, kotlinType, false);
if (index < 0) {
throw new IllegalStateException("local variable index must be non-negative");
}
if (isLateinit && name == null) {
throw new IllegalArgumentException("Lateinit local variable should have name: #" + index + " " + type.getDescriptor());
}
this.index = index;
this.isLateinit = isLateinit;
this.name = name;
}
private Local(int index, Type type) {
this(index, type, null, false, null);
}
private Local(int index, Type type, KotlinType kotlinType) {
this(index, type, kotlinType, false, null);
this(index, type, null);
}
@Override
public void putSelector(@NotNull Type type, @Nullable KotlinType kotlinType, @NotNull InstructionAdapter v) {
v.load(index, this.type);
if (isLateinit) {
StackValue.genNonNullAssertForLateinit(v, name.asString());
}
coerceTo(type, kotlinType, v);
// TODO unbox
}
@Override
public void storeSelector(@NotNull Type topOfStackType, @Nullable KotlinType topOfStackKotlinType, @NotNull InstructionAdapter v) {
coerceFrom(topOfStackType, topOfStackKotlinType, v);
v.store(index, this.type);
if (isLateinit) {
PseudoInsnsKt.storeNotNull(v);
}
}
public static class LateinitLocal extends StackValue {
public final int index;
private final Name name;
private LateinitLocal(int index, Type type, KotlinType kotlinType, Name name) {
super(type, kotlinType, false);
if (index < 0) {
throw new IllegalStateException("local variable index must be non-negative");
}
if (name == null) {
throw new IllegalArgumentException("Lateinit local variable should have name: #" + index + " " + type.getDescriptor());
}
this.index = index;
this.name = name;
}
@Override
public void putSelector(@NotNull Type type, @Nullable KotlinType kotlinType, @NotNull InstructionAdapter v) {
v.load(index, this.type);
StackValue.genNonNullAssertForLateinit(v, name.asString());
coerceTo(type, kotlinType, v);
}
@Override
public void storeSelector(@NotNull Type topOfStackType, @Nullable KotlinType topOfStackKotlinType, @NotNull InstructionAdapter v) {
coerceFrom(topOfStackType, topOfStackKotlinType, v);
v.store(index, this.type);
PseudoInsnsKt.storeNotNull(v);
}
}
compiler/testData/codegen/box/properties/lateinit/local/kt23260.kt
Vendored
+15
View File
@@ -0,0 +1,15 @@
// WITH_RUNTIME
fun box(): String {
lateinit var str: String
try {
println(str)
return "Should throw an exception"
}
catch (e: UninitializedPropertyAccessException) {
return "OK"
}
catch (e: Throwable) {
return "Unexpected exception: ${e::class}"
}
}
compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -13812,6 +13812,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/properties/lateinit/local/capturedLocalLateinit.kt");
}
@TestMetadata("kt23260.kt")
public void testKt23260() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/local/kt23260.kt");
doTest(fileName);
}
@TestMetadata("localLateinit.kt")
public void testLocalLateinit() throws Exception {
runTest("compiler/testData/codegen/box/properties/lateinit/local/localLateinit.kt");
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -13812,6 +13812,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/properties/lateinit/local/capturedLocalLateinit.kt");
}
@TestMetadata("kt23260.kt")
public void testKt23260() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/local/kt23260.kt");
doTest(fileName);
}
@TestMetadata("localLateinit.kt")
public void testLocalLateinit() throws Exception {
runTest("compiler/testData/codegen/box/properties/lateinit/local/localLateinit.kt");
compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+6
View File
@@ -13812,6 +13812,12 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/properties/lateinit/local/capturedLocalLateinit.kt");
}
@TestMetadata("kt23260.kt")
public void testKt23260() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/local/kt23260.kt");
doTest(fileName);
}
@TestMetadata("localLateinit.kt")
public void testLocalLateinit() throws Exception {
runTest("compiler/testData/codegen/box/properties/lateinit/local/localLateinit.kt");
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -13202,6 +13202,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/properties/lateinit/local/capturedLocalLateinit.kt");
}
@TestMetadata("kt23260.kt")
public void testKt23260() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/local/kt23260.kt");
doTest(fileName);
}
@TestMetadata("localLateinit.kt")
public void testLocalLateinit() throws Exception {
runTest("compiler/testData/codegen/box/properties/lateinit/local/localLateinit.kt");