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

Use Name instead of String for lateinit-related StackValues

Browse Source 
to emphasize that this is a descriptor name, not a JVM name
This commit is contained in:
Dmitry Petrov
2017-08-30 14:15:46 +03:00
parent c8d25c587a
commit 21e3051a78
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java
+13 -12
View File
@@ -31,6 +31,7 @@ import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper;
import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.descriptors.impl.SyntheticFieldDescriptor; import org.jetbrains.kotlin.descriptors.impl.SyntheticFieldDescriptor;
import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.load.java.JvmAbi;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.psi.KtExpression; import org.jetbrains.kotlin.psi.KtExpression;
import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.kotlin.psi.ValueArgument;
import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContext;
@@ -149,7 +150,7 @@ public abstract class StackValue {
@NotNull @NotNull
public static Local local(int index, @NotNull Type type, @NotNull VariableDescriptor descriptor) { public static Local local(int index, @NotNull Type type, @NotNull VariableDescriptor descriptor) {
return new Local(index, type, descriptor.isLateInit(), descriptor.getName().asString()); return new Local(index, type, descriptor.isLateInit(), descriptor.getName());
} }
@NotNull @NotNull
@@ -170,7 +171,7 @@ public abstract class StackValue {
@NotNull @NotNull
public static StackValue shared(int index, @NotNull Type type, @NotNull VariableDescriptor descriptor) { public static StackValue shared(int index, @NotNull Type type, @NotNull VariableDescriptor descriptor) {
return new Shared(index, type, descriptor.isLateInit(), descriptor.getName().asString()); return new Shared(index, type, descriptor.isLateInit(), descriptor.getName());
} }
@NotNull @NotNull
@@ -449,7 +450,7 @@ public abstract class StackValue {
@NotNull VariableDescriptor variableDescriptor @NotNull VariableDescriptor variableDescriptor
) { ) {
return new FieldForSharedVar(localType, classType, fieldName, refWrapper, return new FieldForSharedVar(localType, classType, fieldName, refWrapper,
variableDescriptor.isLateInit(), variableDescriptor.getName().asString()); variableDescriptor.isLateInit(), variableDescriptor.getName());
} }
@NotNull @NotNull
@@ -637,9 +638,9 @@ public abstract class StackValue {
public static class Local extends StackValue { public static class Local extends StackValue {
public final int index; public final int index;
private final boolean isLateinit; private final boolean isLateinit;
private final String name; private final Name name;
private Local(int index, Type type, boolean isLateinit, String name) { private Local(int index, Type type, boolean isLateinit, Name name) {
super(type, false); super(type, false);
if (index < 0) { if (index < 0) {
@@ -663,7 +664,7 @@ public abstract class StackValue {
public void putSelector(@NotNull Type type, @NotNull InstructionAdapter v) { public void putSelector(@NotNull Type type, @NotNull InstructionAdapter v) {
v.load(index, this.type); v.load(index, this.type);
if (isLateinit) { if (isLateinit) {
StackValue.genNonNullAssertForLateinit(v, name); StackValue.genNonNullAssertForLateinit(v, name.asString());
} }
coerceTo(type, v); coerceTo(type, v);
// TODO unbox // TODO unbox
@@ -1382,9 +1383,9 @@ public abstract class StackValue {
public static class Shared extends StackValueWithSimpleReceiver { public static class Shared extends StackValueWithSimpleReceiver {
private final int index; private final int index;
private final boolean isLateinit; private final boolean isLateinit;
private final String name; private final Name name;
public Shared(int index, Type type, boolean isLateinit, String name) { public Shared(int index, Type type, boolean isLateinit, Name name) {
super(type, false, false, local(index, OBJECT_TYPE), false); super(type, false, false, local(index, OBJECT_TYPE), false);
this.index = index; this.index = index;
@@ -1410,7 +1411,7 @@ public abstract class StackValue {
Type sharedType = sharedTypeForType(this.type); Type sharedType = sharedTypeForType(this.type);
v.visitFieldInsn(GETFIELD, sharedType.getInternalName(), "element", refType.getDescriptor()); v.visitFieldInsn(GETFIELD, sharedType.getInternalName(), "element", refType.getDescriptor());
if (isLateinit) { if (isLateinit) {
StackValue.genNonNullAssertForLateinit(v, name); StackValue.genNonNullAssertForLateinit(v, name.asString());
} }
coerceFrom(refType, v); coerceFrom(refType, v);
coerceTo(type, v); coerceTo(type, v);
@@ -1450,11 +1451,11 @@ public abstract class StackValue {
final Type owner; final Type owner;
final String name; final String name;
final boolean isLateinit; final boolean isLateinit;
final String variableName; final Name variableName;
public FieldForSharedVar( public FieldForSharedVar(
Type type, Type owner, String name, StackValue.Field receiver, Type type, Type owner, String name, StackValue.Field receiver,
boolean isLateinit, String variableName boolean isLateinit, Name variableName
) { ) {
super(type, false, false, receiver, receiver.canHaveSideEffects()); super(type, false, false, receiver, receiver.canHaveSideEffects());
@@ -1474,7 +1475,7 @@ public abstract class StackValue {
Type refType = refType(this.type); Type refType = refType(this.type);
v.visitFieldInsn(GETFIELD, sharedType.getInternalName(), "element", refType.getDescriptor()); v.visitFieldInsn(GETFIELD, sharedType.getInternalName(), "element", refType.getDescriptor());
if (isLateinit) { if (isLateinit) {
StackValue.genNonNullAssertForLateinit(v, variableName); StackValue.genNonNullAssertForLateinit(v, variableName.asString());
} }
coerceFrom(refType, v); coerceFrom(refType, v);
coerceTo(type, v); coerceTo(type, v);