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

Support operatorAssign expressions in inline

Browse Source
This commit is contained in:
Mikhael Bogdanov
2014-02-21 12:49:55 +04:00
parent 4d8898c9f2
commit 2d9674089c
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+7 -8
View File
@@ -3007,9 +3007,13 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
} }
private void callAugAssignMethod(JetBinaryExpression expression, CallableMethod callable, Type lhsType, boolean keepReturnValue) { private void callAugAssignMethod(JetBinaryExpression expression, CallableMethod callable, Type lhsType, boolean keepReturnValue) {
JetSimpleNameExpression reference = expression.getOperationReference();
ResolvedCall<? extends CallableDescriptor> resolvedCall = ResolvedCall<? extends CallableDescriptor> resolvedCall =
bindingContext.get(BindingContext.RESOLVED_CALL, expression.getOperationReference()); bindingContext.get(BindingContext.RESOLVED_CALL, reference);
assert resolvedCall != null; Call call = bindingContext.get(BindingContext.CALL, reference);
assert resolvedCall != null : "Resolved call should be not null for operation reference in " + expression.getText();
assert call != null : "Call should be not null for operation reference in " + expression.getText();
StackValue value = gen(expression.getLeft()); StackValue value = gen(expression.getLeft());
if (keepReturnValue) { if (keepReturnValue) {
@@ -3018,12 +3022,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
value.put(lhsType, v); value.put(lhsType, v);
StackValue receiver = StackValue.onStack(lhsType); StackValue receiver = StackValue.onStack(lhsType);
if (!(resolvedCall.getResultingDescriptor() instanceof ConstructorDescriptor)) { // otherwise already invokeMethodWithArguments(call, callable, resolvedCall, receiver);
receiver = StackValue.receiver(resolvedCall, receiver, this, callable);
receiver.put(receiver.type, v);
}
pushArgumentsAndInvoke(resolvedCall, callable, CallGenerator.NOT_INLINE);
if (keepReturnValue) { if (keepReturnValue) {
value.store(callable.getReturnType(), v); value.store(callable.getReturnType(), v);