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

'getSuperCallLabelTarget' refactoring

Browse Source
This commit is contained in:
Michael Bogdanov
2016-07-20 09:08:54 +03:00
parent 6f41e3b462
commit 6da97027cc
2 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
+6 -12
View File
@@ -405,18 +405,12 @@ public class ExpressionCodegen extends KtVisitor<StackValue, StackValue> impleme
@NotNull CodegenContext<?> context, @NotNull CodegenContext<?> context,
@NotNull KtSuperExpression expression @NotNull KtSuperExpression expression
) { ) {
BindingContext bindingContext = context.getState().getBindingContext(); KotlinType thisTypeForSuperCall = context.getState().getBindingContext().get(BindingContext.THIS_TYPE_FOR_SUPER_EXPRESSION, expression);
PsiElement labelPsi = bindingContext.get(LABEL_TARGET, expression.getTargetLabel()); assert thisTypeForSuperCall != null : "This type for superCall ''" + expression.getText() + "'' should be not null!";
ClassDescriptor labelTarget = (ClassDescriptor) bindingContext.get(DECLARATION_TO_DESCRIPTOR, labelPsi); ClassifierDescriptor descriptor = thisTypeForSuperCall.getConstructor().getDeclarationDescriptor();
DeclarationDescriptor descriptor = bindingContext.get(REFERENCE_TARGET, expression.getInstanceReference()); assert descriptor instanceof ClassDescriptor :
// "super<descriptor>@labelTarget" "'This' reference target for ''" + expression.getText() + "''should be class descriptor, but was " + descriptor;
if (labelTarget != null) { return (ClassDescriptor) descriptor;
return labelTarget;
}
assert descriptor instanceof ClassDescriptor : "Don't know how to generate super-call to not a class";
CodegenContext result = getParentContextSubclassOf((ClassDescriptor) descriptor, context);
assert result != null : "Can't find parent context for " + descriptor;
return result.getThisDescriptor();
} }
@NotNull @NotNull
compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+1 -8
View File
@@ -1277,14 +1277,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
@Override @Override
public void visitSuperExpression(@NotNull KtSuperExpression expression) { public void visitSuperExpression(@NotNull KtSuperExpression expression) {
KotlinType thisTypeForSuperCall = bindingContext.get(BindingContext.THIS_TYPE_FOR_SUPER_EXPRESSION, expression); lookupInContext(ExpressionCodegen.getSuperCallLabelTarget(context, expression));
assert thisTypeForSuperCall != null : "This type for superCall ''" + expression.getText() + "'' should be not null!";
ClassifierDescriptor descriptor = thisTypeForSuperCall.getConstructor().getDeclarationDescriptor();
assert descriptor instanceof ClassDescriptor :
"'This' reference target for ''" + expression.getText() + "''should be class descriptor, but was " + descriptor;
if (descriptor instanceof ClassDescriptor) {
lookupInContext(descriptor);
}
} }
}; };