diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java index f0bfd87fe3b..ee0642994ce 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java @@ -159,7 +159,7 @@ public class ClosureCodegen extends ParentCodegenAwareImpl { v.anew(asmType); v.dup(); - codegen.pushClosureOnStack(closure, false, codegen.defaulCallGenerator); + codegen.pushClosureOnStack(closure, false, codegen.defaultCallGenerator); v.invokespecial(asmType.getInternalName(), "", constructor.getDescriptor()); } return StackValue.onStack(asmType); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java index 540bc9965dd..23a9506ca1a 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java @@ -109,7 +109,7 @@ public class ExpressionCodegen extends JetVisitor implem @NotNull private final TailRecursionCodegen tailRecursionCodegen; - public final CallGenerator defaulCallGenerator; + public final CallGenerator defaultCallGenerator; public CalculatedClosure generateObjectLiteral(GenerationState state, JetObjectLiteralExpression literal) { JetObjectDeclaration objectDeclaration = literal.getObjectDeclaration(); @@ -180,7 +180,7 @@ public class ExpressionCodegen extends JetVisitor implem this.context = context; this.statementVisitor = new CodegenStatementVisitor(this); this.tailRecursionCodegen = new TailRecursionCodegen(context, this, this.v, state); - this.defaulCallGenerator = new CallGenerator.DefaultCallGenerator(this); + this.defaultCallGenerator = new CallGenerator.DefaultCallGenerator(this); } public GenerationState getState() { @@ -1342,7 +1342,7 @@ public class ExpressionCodegen extends JetVisitor implem v.anew(type); v.dup(); - pushClosureOnStack(closure, false, defaulCallGenerator); + pushClosureOnStack(closure, false, defaultCallGenerator); JetDelegatorToSuperCall superCall = closure.getSuperCall(); if (superCall != null) { @@ -1356,7 +1356,7 @@ public class ExpressionCodegen extends JetVisitor implem Type[] argumentTypes = superCallable.getAsmMethod().getArgumentTypes(); ResolvedCall resolvedCall = bindingContext.get(BindingContext.RESOLVED_CALL, superCall.getCalleeExpression()); assert resolvedCall != null; - pushMethodArguments(resolvedCall, Arrays.asList(argumentTypes), defaulCallGenerator); + pushMethodArguments(resolvedCall, Arrays.asList(argumentTypes), defaultCallGenerator); } v.invokespecial(type.getInternalName(), "", constructor.getAsmMethod().getDescriptor()); @@ -2105,7 +2105,7 @@ public class ExpressionCodegen extends JetVisitor implem descriptor instanceof SimpleFunctionDescriptor && ((SimpleFunctionDescriptor) descriptor).getInlineStrategy().isInline(); - CallGenerator callGenerator = !isInline ? defaulCallGenerator : + CallGenerator callGenerator = !isInline ? defaultCallGenerator : new InlineCodegen(this, state, (SimpleFunctionDescriptor) DescriptorUtils.unwrapFakeOverride( (CallableMemberDescriptor) descriptor.getOriginal()), call); @@ -2118,7 +2118,7 @@ public class ExpressionCodegen extends JetVisitor implem receiver.put(receiver.type, v); } - assert callGenerator == defaulCallGenerator || !hasDefaultArguments(resolvedCall) && !tailRecursionCodegen.isTailRecursion(resolvedCall) : + assert callGenerator == defaultCallGenerator || !hasDefaultArguments(resolvedCall) && !tailRecursionCodegen.isTailRecursion(resolvedCall) : "Method with defaults or tail recursive couldn't be inlined " + descriptor; pushArgumentsAndInvoke(resolvedCall, callableMethod, callGenerator); @@ -3278,7 +3278,8 @@ public class ExpressionCodegen extends JetVisitor implem //Resolved call to local class constructor doesn't have resolvedCall.getThisObject() and resolvedCall.getReceiverArgument() //so we need generate closure on stack //See StackValue.receiver for more info - pushClosureOnStack(closure, resolvedCall.getThisObject().exists() || resolvedCall.getReceiverArgument().exists(), defaulCallGenerator); + pushClosureOnStack(closure, resolvedCall.getThisObject().exists() || resolvedCall.getReceiverArgument().exists(), + defaultCallGenerator); ConstructorDescriptor originalOfSamAdapter = (ConstructorDescriptor) SamCodegenUtil.getOriginalIfSamAdapter(constructorDescriptor); CallableMethod method = typeMapper.mapToCallableMethod(originalOfSamAdapter == null ? constructorDescriptor : originalOfSamAdapter); @@ -3395,7 +3396,7 @@ public class ExpressionCodegen extends JetVisitor implem if (callable instanceof CallableMethod) { genThisAndReceiverFromResolvedCall(receiver, resolvedCall, (CallableMethod) callable); boolean skipLast = !isGetter; - pushMethodArguments(resolvedCall, ((CallableMethod) callable).getValueParameterTypes(), skipLast, defaulCallGenerator); + pushMethodArguments(resolvedCall, ((CallableMethod) callable).getValueParameterTypes(), skipLast, defaultCallGenerator); } else { gen(array, arrayType); // intrinsic method diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/StupidSync.java b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/StupidSync.java index ab000600b39..6eb881d6d3c 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/StupidSync.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/StupidSync.java @@ -51,7 +51,7 @@ public class StupidSync extends IntrinsicMethod { assert resolvedCall != null : "Resolved call for " + element.getText() + " should be not null"; - codegen.pushMethodArguments(resolvedCall, Arrays.asList(OBJECT_TYPE, FUNCTION0_TYPE), codegen.defaulCallGenerator); + codegen.pushMethodArguments(resolvedCall, Arrays.asList(OBJECT_TYPE, FUNCTION0_TYPE), codegen.defaultCallGenerator); v.invokestatic("kotlin/jvm/internal/Intrinsics", "stupidSync", Type.getMethodDescriptor(OBJECT_TYPE, OBJECT_TYPE, FUNCTION0_TYPE)); return OBJECT_TYPE; }