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

Minor, simplify method

Browse Source
This commit is contained in:
Alexander Udalov
2013-12-05 16:49:16 +04:00
parent 161af7003d
commit 0215f892a6
1 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+8 -17
View File
@@ -199,19 +199,12 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
return state; return state;
} }
StackValue castToRequiredTypeOfInterfaceIfNeeded(StackValue inner, DeclarationDescriptor provided, @Nullable ClassDescriptor required) { @NotNull
if (required == null) { private StackValue castToRequiredTypeOfInterfaceIfNeeded(
return inner; StackValue inner,
} @NotNull ClassDescriptor provided,
@NotNull ClassDescriptor required
if (provided instanceof CallableDescriptor) { ) {
ReceiverParameterDescriptor receiverParameter = ((CallableDescriptor) provided).getReceiverParameter();
assert receiverParameter != null : receiverParameter;
provided = receiverParameter.getType().getConstructor().getDeclarationDescriptor();
}
assert provided instanceof ClassDescriptor;
if (!isInterface(provided) && isInterface(required)) { if (!isInterface(provided) && isInterface(required)) {
inner.put(OBJECT_TYPE, v); inner.put(OBJECT_TYPE, v);
Type type = asmType(required.getDefaultType()); Type type = asmType(required.getDefaultType());
@@ -2217,12 +2210,10 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
private StackValue generateReceiver(DeclarationDescriptor provided) { private StackValue generateReceiver(DeclarationDescriptor provided) {
if (context.getCallableDescriptorWithReceiver() == provided) { if (context.getCallableDescriptorWithReceiver() == provided) {
StackValue result = context.getReceiverExpression(typeMapper); return context.getReceiverExpression(typeMapper);
return castToRequiredTypeOfInterfaceIfNeeded(result, provided, null);
} }
StackValue result = context.lookupInContext(provided, StackValue.local(0, OBJECT_TYPE), state, false); return context.lookupInContext(provided, StackValue.local(0, OBJECT_TYPE), state, false);
return castToRequiredTypeOfInterfaceIfNeeded(result, provided, null);
} }
private void generateScript(@NotNull ScriptReceiver receiver) { private void generateScript(@NotNull ScriptReceiver receiver) {