Rollback hack for rangeTo safe call support
This commit is contained in:
@@ -2322,7 +2322,8 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
|
|||||||
@NotNull CallGenerator callGenerator,
|
@NotNull CallGenerator callGenerator,
|
||||||
@NotNull ArgumentGenerator argumentGenerator
|
@NotNull ArgumentGenerator argumentGenerator
|
||||||
) {
|
) {
|
||||||
StackValue.SafeCall safeCallReceiver = receiver instanceof StackValue.SafeCall ? (StackValue.SafeCall) receiver : null;
|
callableMethod.beforeParameterGeneration(v, null);
|
||||||
|
|
||||||
if (!(resolvedCall.getResultingDescriptor() instanceof ConstructorDescriptor)) { // otherwise already
|
if (!(resolvedCall.getResultingDescriptor() instanceof ConstructorDescriptor)) { // otherwise already
|
||||||
receiver = StackValue.receiver(resolvedCall, receiver, this, callableMethod);
|
receiver = StackValue.receiver(resolvedCall, receiver, this, callableMethod);
|
||||||
|
|
||||||
@@ -2334,15 +2335,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (safeCallReceiver != null) {
|
receiver.put(receiver.type, v);
|
||||||
//justCoerce
|
|
||||||
receiver.put(receiver.type, v);
|
|
||||||
callableMethod.beforeParameterGeneration(v, StackValue.onStack(receiver.type));
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
callableMethod.beforeParameterGeneration(v, null);
|
|
||||||
receiver.put(receiver.type, v);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
callGenerator.putHiddenParams();
|
callGenerator.putHiddenParams();
|
||||||
|
|||||||
Reference in New Issue
Block a user