From 67e7491d4c356b0bc6fcb50d90ca77bbfc57c18f Mon Sep 17 00:00:00 2001 From: Alex Tkachman Date: Wed, 29 Aug 2012 14:32:06 +0300 Subject: [PATCH] unused parameters removed --- .../org/jetbrains/jet/codegen/ExpressionCodegen.java | 12 ++++++------ .../src/org/jetbrains/jet/codegen/StackValue.java | 6 ++---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java index 6853ac16709..1e87a5ab0a8 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java @@ -1288,7 +1288,7 @@ public class ExpressionCodegen extends JetVisitor implem VariableAsFunctionResolvedCall call = (VariableAsFunctionResolvedCall) resolvedCall; resolvedCall = call.getVariableCall(); } - receiver = StackValue.receiver(resolvedCall, receiver, this, null, state); + receiver = StackValue.receiver(resolvedCall, receiver, this, null); descriptor = resolvedCall.getResultingDescriptor(); } @@ -1631,7 +1631,7 @@ public class ExpressionCodegen extends JetVisitor implem DeclarationDescriptor funDescriptor = resolvedCall.getResultingDescriptor(); if (funDescriptor instanceof ConstructorDescriptor) { - receiver = StackValue.receiver(resolvedCall, receiver, this, null, state); + receiver = StackValue.receiver(resolvedCall, receiver, this, null); return generateConstructorCall(expression, (JetSimpleNameExpression) callee, receiver); } else if (funDescriptor instanceof FunctionDescriptor) { @@ -1711,7 +1711,7 @@ public class ExpressionCodegen extends JetVisitor implem return returnValueAsStackValue(fd, callReturnType); } else { - receiver = StackValue.receiver(resolvedCall, receiver, this, null, state); + receiver = StackValue.receiver(resolvedCall, receiver, this, null); IntrinsicMethod intrinsic = (IntrinsicMethod) callable; List args = new ArrayList(); @@ -1807,7 +1807,7 @@ public class ExpressionCodegen extends JetVisitor implem } if (!(resolvedCall.getResultingDescriptor() instanceof ConstructorDescriptor)) { // otherwise already - receiver = StackValue.receiver(resolvedCall, receiver, this, callableMethod, state); + receiver = StackValue.receiver(resolvedCall, receiver, this, callableMethod); receiver.put(receiver.type, v); if (calleeType != null) { StackValue.onStack(receiver.type).put(boxType(receiver.type), v); @@ -1828,7 +1828,7 @@ public class ExpressionCodegen extends JetVisitor implem ResolvedCall resolvedCall, CallableMethod callableMethod ) { - receiver = StackValue.receiver(resolvedCall, receiver, this, callableMethod, state); + receiver = StackValue.receiver(resolvedCall, receiver, this, callableMethod); receiver.put(receiver.type, v); } @@ -2543,7 +2543,7 @@ public class ExpressionCodegen extends JetVisitor implem StackValue receiver = StackValue.onStack(lhsType); if (!(resolvedCall.getResultingDescriptor() instanceof ConstructorDescriptor)) { // otherwise already - receiver = StackValue.receiver(resolvedCall, receiver, this, callable, state); + receiver = StackValue.receiver(resolvedCall, receiver, this, callable); receiver.put(receiver.type, v); } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java b/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java index a760e265208..8886906671a 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java @@ -344,11 +344,10 @@ public abstract class StackValue { ResolvedCall resolvedCall, StackValue receiver, ExpressionCodegen codegen, - @Nullable CallableMethod callableMethod, - GenerationState state + @Nullable CallableMethod callableMethod ) { if (resolvedCall.getThisObject().exists() || resolvedCall.getReceiverArgument().exists()) { - return new CallReceiver(resolvedCall, receiver, codegen, state, callableMethod); + return new CallReceiver(resolvedCall, receiver, codegen, callableMethod); } return receiver; } @@ -1214,7 +1213,6 @@ public abstract class StackValue { ResolvedCall resolvedCall, StackValue receiver, ExpressionCodegen codegen, - @NotNull GenerationState state, CallableMethod callableMethod ) { super(calcType(resolvedCall, codegen, callableMethod));