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

Remove CodegenBinding.LOCAL_VARIABLE_DELEGATE

Browse Source 
Calculate this value at call sites explicitly instead
This commit is contained in:
Alexander Udalov
2017-06-08 19:37:20 +03:00
parent 66ea288be7
commit b97589b33e
4 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java
-11
View File
@@ -379,17 +379,6 @@ class CodegenAnnotatingVisitor extends KtVisitorVoid {
KotlinType delegateType = JvmCodegenUtil.getPropertyDelegateType(variableDescriptor, bindingContext);
if (delegateType == null) return;
LocalVariableDescriptor delegateVariableDescriptor = new LocalVariableDescriptor(
variableDescriptor.getContainingDeclaration(),
Annotations.Companion.getEMPTY(),
variableDescriptor.getName(),
delegateType,
false,
false,
SourceElement.NO_SOURCE
);
bindingTrace.record(LOCAL_VARIABLE_DELEGATE, variableDescriptor, delegateVariableDescriptor);
LocalVariableDescriptor metadataVariableDescriptor = new LocalVariableDescriptor(
variableDescriptor.getContainingDeclaration(),
Annotations.Companion.getEMPTY(),
compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java
-3
View File
@@ -60,9 +60,6 @@ public class CodegenBinding {
public static final WritableSlice<String, List<WhenByEnumsMapping>> MAPPINGS_FOR_WHENS_BY_ENUM_IN_CLASS_FILE =
Slices.createSimpleSlice();
public static final WritableSlice<VariableDescriptor, VariableDescriptor> LOCAL_VARIABLE_DELEGATE =
Slices.createSimpleSlice();
public static final WritableSlice<VariableDescriptor, VariableDescriptor> LOCAL_VARIABLE_PROPERTY_METADATA =
Slices.createSimpleSlice();
compiler/backend/src/org/jetbrains/kotlin/codegen/context/LocalLookup.java
+5 -2
View File
@@ -55,9 +55,12 @@ public interface LocalLookup {
boolean idx = localLookup != null && localLookup.lookupLocal(vd);
if (!idx) return null;
VariableDescriptor delegateVariableDescriptor = state.getBindingContext().get(LOCAL_VARIABLE_DELEGATE, vd);
KotlinType delegateType =
vd instanceof VariableDescriptorWithAccessors
? JvmCodegenUtil.getPropertyDelegateType((VariableDescriptorWithAccessors) vd, state.getBindingContext())
: null;
Type sharedVarType = state.getTypeMapper().getSharedVarType(vd);
Type localType = state.getTypeMapper().mapType(delegateVariableDescriptor != null ? delegateVariableDescriptor : vd);
Type localType = state.getTypeMapper().mapType(delegateType != null ? delegateType : vd.getType());
Type type = sharedVarType != null ? sharedVarType : localType;
String fieldName = "$" + vd.getName();
compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java
+5 -5
View File
@@ -1392,11 +1392,11 @@ public class KotlinTypeMapper {
Type sharedVarType = getSharedVarType(variableDescriptor);
if (sharedVarType == null) {
if (isDelegatedLocalVariable(variableDescriptor)) {
VariableDescriptor delegateVariableDescriptor = bindingContext.get(LOCAL_VARIABLE_DELEGATE,
(VariableDescriptor) variableDescriptor);
assert delegateVariableDescriptor != null :
"Local delegated property " + variableDescriptor + " delegate descriptor should be not null";
sharedVarType = mapType(delegateVariableDescriptor.getType());
//noinspection CastConflictsWithInstanceof
KotlinType delegateType =
JvmCodegenUtil.getPropertyDelegateType((LocalVariableDescriptor) variableDescriptor, bindingContext);
assert delegateType != null : "Local delegated property type should not be null: " + variableDescriptor;
sharedVarType = mapType(delegateType);
}
else {
sharedVarType = mapType(((VariableDescriptor) variableDescriptor).getType());