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

Move handling of VariableAsFunctionCall's to invokeFunction

Browse Source
This commit is contained in:
Andrey Breslav
2013-11-28 19:43:37 +04:00
parent 23e533f3b7
commit db4b73189a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+6 -6
View File
@@ -1906,12 +1906,6 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
} }
Call call = bindingContext.get(CALL, expression.getCalleeExpression()); Call call = bindingContext.get(CALL, expression.getCalleeExpression());
if (resolvedCall instanceof VariableAsFunctionResolvedCall) {
VariableAsFunctionResolvedCall variableAsFunctionResolvedCall = (VariableAsFunctionResolvedCall) resolvedCall;
ResolvedCallWithTrace<FunctionDescriptor> functionCall = variableAsFunctionResolvedCall.getFunctionCall();
return invokeFunction(call, receiver, functionCall);
}
if (funDescriptor instanceof SimpleFunctionDescriptor) { if (funDescriptor instanceof SimpleFunctionDescriptor) {
SimpleFunctionDescriptor original = ((SimpleFunctionDescriptor) funDescriptor).getOriginal(); SimpleFunctionDescriptor original = ((SimpleFunctionDescriptor) funDescriptor).getOriginal();
if (original instanceof SamConstructorDescriptor) { if (original instanceof SamConstructorDescriptor) {
@@ -1993,6 +1987,12 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
StackValue receiver, StackValue receiver,
ResolvedCall<? extends CallableDescriptor> resolvedCall ResolvedCall<? extends CallableDescriptor> resolvedCall
) { ) {
if (resolvedCall instanceof VariableAsFunctionResolvedCall) {
VariableAsFunctionResolvedCall variableAsFunctionResolvedCall = (VariableAsFunctionResolvedCall) resolvedCall;
ResolvedCallWithTrace<FunctionDescriptor> functionCall = variableAsFunctionResolvedCall.getFunctionCall();
return invokeFunction(call, receiver, functionCall);
}
FunctionDescriptor fd = (FunctionDescriptor) resolvedCall.getResultingDescriptor(); FunctionDescriptor fd = (FunctionDescriptor) resolvedCall.getResultingDescriptor();
boolean superCall = isSuperCall(call); boolean superCall = isSuperCall(call);