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

Rename: Inliner->CallGenerator

Browse Source
This commit is contained in:
Mikhael Bogdanov
2014-02-21 11:35:30 +04:00
parent 476a9ede64
commit 4d8898c9f2
4 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java
+2 -2
View File
@@ -25,7 +25,7 @@ import org.jetbrains.asm4.MethodVisitor;
import org.jetbrains.asm4.Type; import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter; import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.asm4.commons.Method; import org.jetbrains.asm4.commons.Method;
import org.jetbrains.jet.codegen.inline.Inliner; import org.jetbrains.jet.codegen.inline.CallGenerator;
import org.jetbrains.jet.codegen.binding.CalculatedClosure; import org.jetbrains.jet.codegen.binding.CalculatedClosure;
import org.jetbrains.jet.codegen.context.CodegenContext; import org.jetbrains.jet.codegen.context.CodegenContext;
import org.jetbrains.jet.codegen.context.LocalLookup; import org.jetbrains.jet.codegen.context.LocalLookup;
@@ -154,7 +154,7 @@ public class ClosureCodegen extends ParentCodegenAwareImpl {
v.anew(asmType); v.anew(asmType);
v.dup(); v.dup();
codegen.pushClosureOnStack(closure, false, Inliner.NOT_INLINE); codegen.pushClosureOnStack(closure, false, CallGenerator.NOT_INLINE);
v.invokespecial(asmType.getInternalName(), "<init>", constructor.getDescriptor()); v.invokespecial(asmType.getInternalName(), "<init>", constructor.getDescriptor());
} }
return StackValue.onStack(asmType); return StackValue.onStack(asmType);
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+30 -30
View File
@@ -33,7 +33,7 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter; import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.asm4.commons.Method; import org.jetbrains.asm4.commons.Method;
import org.jetbrains.jet.codegen.inline.InlineCodegen; import org.jetbrains.jet.codegen.inline.InlineCodegen;
import org.jetbrains.jet.codegen.inline.Inliner; import org.jetbrains.jet.codegen.inline.CallGenerator;
import org.jetbrains.jet.codegen.inline.NameGenerator; import org.jetbrains.jet.codegen.inline.NameGenerator;
import org.jetbrains.jet.codegen.binding.CalculatedClosure; import org.jetbrains.jet.codegen.binding.CalculatedClosure;
import org.jetbrains.jet.codegen.binding.CodegenBinding; import org.jetbrains.jet.codegen.binding.CodegenBinding;
@@ -1334,7 +1334,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
v.anew(type); v.anew(type);
v.dup(); v.dup();
pushClosureOnStack(closure, false, Inliner.NOT_INLINE); pushClosureOnStack(closure, false, CallGenerator.NOT_INLINE);
JetDelegatorToSuperCall superCall = closure.getSuperCall(); JetDelegatorToSuperCall superCall = closure.getSuperCall();
if (superCall != null) { if (superCall != null) {
@@ -1355,7 +1355,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
return StackValue.onStack(type); return StackValue.onStack(type);
} }
public void pushClosureOnStack(CalculatedClosure closure, boolean ignoreThisAndReceiver, Inliner inliner) { public void pushClosureOnStack(CalculatedClosure closure, boolean ignoreThisAndReceiver, CallGenerator callGenerator) {
if (closure != null) { if (closure != null) {
int paramIndex = 0; int paramIndex = 0;
if (!ignoreThisAndReceiver) { if (!ignoreThisAndReceiver) {
@@ -1364,20 +1364,20 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
StackValue thisOrOuter = generateThisOrOuter(captureThis, false); StackValue thisOrOuter = generateThisOrOuter(captureThis, false);
assert !isPrimitive(thisOrOuter.type) : "This or outer should be non primitive: " + thisOrOuter.type; assert !isPrimitive(thisOrOuter.type) : "This or outer should be non primitive: " + thisOrOuter.type;
if (inliner.shouldPutValue(thisOrOuter.type, thisOrOuter, null)) { if (callGenerator.shouldPutValue(thisOrOuter.type, thisOrOuter, null)) {
thisOrOuter.put(thisOrOuter.type, v); thisOrOuter.put(thisOrOuter.type, v);
} }
inliner.putCapturedInLocal(thisOrOuter.type, thisOrOuter, null, paramIndex++); callGenerator.putCapturedInLocal(thisOrOuter.type, thisOrOuter, null, paramIndex++);
} }
JetType captureReceiver = closure.getCaptureReceiverType(); JetType captureReceiver = closure.getCaptureReceiverType();
if (captureReceiver != null) { if (captureReceiver != null) {
Type asmType = typeMapper.mapType(captureReceiver); Type asmType = typeMapper.mapType(captureReceiver);
StackValue.Local capturedReceiver = StackValue.local(context.isStatic() ? 0 : 1, asmType); StackValue.Local capturedReceiver = StackValue.local(context.isStatic() ? 0 : 1, asmType);
if (inliner.shouldPutValue(asmType, capturedReceiver, null)) { if (callGenerator.shouldPutValue(asmType, capturedReceiver, null)) {
capturedReceiver.put(asmType, v); capturedReceiver.put(asmType, v);
} }
inliner.putCapturedInLocal(asmType, capturedReceiver, null, paramIndex++); callGenerator.putCapturedInLocal(asmType, capturedReceiver, null, paramIndex++);
} }
} }
@@ -1387,10 +1387,10 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
sharedVarType = typeMapper.mapType((VariableDescriptor) entry.getKey()); sharedVarType = typeMapper.mapType((VariableDescriptor) entry.getKey());
} }
StackValue capturedVar = entry.getValue().getOuterValue(this); StackValue capturedVar = entry.getValue().getOuterValue(this);
if (inliner.shouldPutValue(sharedVarType, capturedVar, null)) { if (callGenerator.shouldPutValue(sharedVarType, capturedVar, null)) {
capturedVar.put(sharedVarType, v); capturedVar.put(sharedVarType, v);
} }
inliner.putCapturedInLocal(sharedVarType, capturedVar, null, paramIndex++); callGenerator.putCapturedInLocal(sharedVarType, capturedVar, null, paramIndex++);
} }
} }
} }
@@ -2123,7 +2123,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
descriptor instanceof SimpleFunctionDescriptor && descriptor instanceof SimpleFunctionDescriptor &&
((SimpleFunctionDescriptor) descriptor).getInlineStrategy().isInline(); ((SimpleFunctionDescriptor) descriptor).getInlineStrategy().isInline();
Inliner inliner = !isInline ? Inliner.NOT_INLINE : CallGenerator callGenerator = !isInline ? CallGenerator.NOT_INLINE :
new InlineCodegen(this, state, (SimpleFunctionDescriptor) unwrapFakeOverride( new InlineCodegen(this, state, (SimpleFunctionDescriptor) unwrapFakeOverride(
(CallableMemberDescriptor) descriptor.getOriginal()), call); (CallableMemberDescriptor) descriptor.getOriginal()), call);
@@ -2136,16 +2136,16 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
receiver.put(receiver.type, v); receiver.put(receiver.type, v);
} }
assert inliner == Inliner.NOT_INLINE || !hasDefaults(resolvedCall) && !tailRecursionCodegen.isTailRecursion(resolvedCall) : assert callGenerator == CallGenerator.NOT_INLINE || !hasDefaultArguments(resolvedCall) && !tailRecursionCodegen.isTailRecursion(resolvedCall) :
"Method with defaults or tail recursive couldn't be inlined " + descriptor; "Method with defaults or tail recursive couldn't be inlined " + descriptor;
pushArgumentsAndInvoke(resolvedCall, callableMethod, inliner); pushArgumentsAndInvoke(resolvedCall, callableMethod, callGenerator);
} }
private void pushArgumentsAndInvoke(@NotNull ResolvedCall<?> resolvedCall, @NotNull CallableMethod callable, @NotNull Inliner inliner) { private void pushArgumentsAndInvoke(@NotNull ResolvedCall<?> resolvedCall, @NotNull CallableMethod callable, @NotNull CallGenerator callGenerator) {
inliner.putHiddenParams(); callGenerator.putHiddenParams();
int mask = pushMethodArguments(resolvedCall, callable.getValueParameterTypes(), inliner); int mask = pushMethodArguments(resolvedCall, callable.getValueParameterTypes(), callGenerator);
if (tailRecursionCodegen.isTailRecursion(resolvedCall)) { if (tailRecursionCodegen.isTailRecursion(resolvedCall)) {
tailRecursionCodegen.generateTailRecursion(resolvedCall); tailRecursionCodegen.generateTailRecursion(resolvedCall);
@@ -2153,8 +2153,8 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
} }
if (mask == 0) { if (mask == 0) {
if (inliner != Inliner.NOT_INLINE) { if (callGenerator != CallGenerator.NOT_INLINE) {
inliner.inlineCall(callable, getParentCodegen().getBuilder().getVisitor()); callGenerator.inlineCall(callable, getParentCodegen().getBuilder().getVisitor());
} else { } else {
callable.invokeWithNotNullAssertion(v, state, resolvedCall); callable.invokeWithNotNullAssertion(v, state, resolvedCall);
} }
@@ -2163,7 +2163,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
callable.invokeDefaultWithNotNullAssertion(v, state, resolvedCall, mask); callable.invokeDefaultWithNotNullAssertion(v, state, resolvedCall, mask);
} }
inliner.leaveTemps(); callGenerator.leaveTemps();
} }
private void genThisAndReceiverFromResolvedCall( private void genThisAndReceiverFromResolvedCall(
@@ -2325,11 +2325,11 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
return false; return false;
} }
private int pushMethodArguments(@NotNull ResolvedCall resolvedCall, List<Type> valueParameterTypes, Inliner inliner) { private int pushMethodArguments(@NotNull ResolvedCall resolvedCall, List<Type> valueParameterTypes, CallGenerator callGenerator) {
return pushMethodArguments(resolvedCall, valueParameterTypes, false, inliner); return pushMethodArguments(resolvedCall, valueParameterTypes, false, callGenerator);
} }
private int pushMethodArguments(@NotNull ResolvedCall resolvedCall, List<Type> valueParameterTypes, boolean skipLast, Inliner inliner) { private int pushMethodArguments(@NotNull ResolvedCall resolvedCall, List<Type> valueParameterTypes, boolean skipLast, CallGenerator callGenerator) {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
List<ResolvedValueArgument> valueArguments = resolvedCall.getValueArgumentsByIndex(); List<ResolvedValueArgument> valueArguments = resolvedCall.getValueArgumentsByIndex();
CallableDescriptor fd = resolvedCall.getResultingDescriptor(); CallableDescriptor fd = resolvedCall.getResultingDescriptor();
@@ -2339,7 +2339,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
throw new IllegalStateException(); throw new IllegalStateException();
} }
inliner = inliner != null ? inliner : Inliner.NOT_INLINE; callGenerator = callGenerator != null ? callGenerator : CallGenerator.NOT_INLINE;
int mask = 0; int mask = 0;
for (Iterator<ValueParameterDescriptor> iterator = valueParameters.iterator(); iterator.hasNext(); ) { for (Iterator<ValueParameterDescriptor> iterator = valueParameters.iterator(); iterator.hasNext(); ) {
@@ -2360,15 +2360,15 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
assert argumentExpression != null : valueArgument.asElement().getText(); assert argumentExpression != null : valueArgument.asElement().getText();
//TODO deparenthisise //TODO deparenthisise
if (inliner.isInliningClosure(argumentExpression, valueParameter)) { if (callGenerator.isInliningClosure(argumentExpression, valueParameter)) {
inliner.rememberClosure((JetFunctionLiteralExpression) argumentExpression, parameterType); callGenerator.rememberClosure((JetFunctionLiteralExpression) argumentExpression, parameterType);
putInLocal = false; putInLocal = false;
} else { } else {
StackValue value = gen(argumentExpression); StackValue value = gen(argumentExpression);
if (inliner.shouldPutValue(parameterType, value, valueParameter)) { if (callGenerator.shouldPutValue(parameterType, value, valueParameter)) {
value.put(parameterType, v); value.put(parameterType, v);
} }
valueIfPresent = value; callGenerator.putInLocal(parameterType, value, valueParameter);
} }
} else if (resolvedValueArgument instanceof DefaultValueArgument) { } else if (resolvedValueArgument instanceof DefaultValueArgument) {
pushDefaultValueOnStack(parameterType, v); pushDefaultValueOnStack(parameterType, v);
@@ -2383,13 +2383,13 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
} }
if (putInLocal) { if (putInLocal) {
inliner.putInLocal(parameterType, valueIfPresent, valueParameter); callGenerator.putInLocal(parameterType, valueIfPresent, valueParameter);
} }
} }
return mask; return mask;
} }
private static boolean hasDefaults(@NotNull ResolvedCall<?> resolvedCall) { private static boolean hasDefaultArguments(@NotNull ResolvedCall<?> resolvedCall) {
List<ResolvedValueArgument> valueArguments = resolvedCall.getValueArgumentsByIndex(); List<ResolvedValueArgument> valueArguments = resolvedCall.getValueArgumentsByIndex();
CallableDescriptor fd = resolvedCall.getResultingDescriptor(); CallableDescriptor fd = resolvedCall.getResultingDescriptor();
@@ -3023,7 +3023,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
receiver.put(receiver.type, v); receiver.put(receiver.type, v);
} }
pushArgumentsAndInvoke(resolvedCall, callable, Inliner.NOT_INLINE); pushArgumentsAndInvoke(resolvedCall, callable, CallGenerator.NOT_INLINE);
if (keepReturnValue) { if (keepReturnValue) {
value.store(callable.getReturnType(), v); value.store(callable.getReturnType(), v);
@@ -3342,7 +3342,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
//Resolved call to local class constructor doesn't have resolvedCall.getThisObject() and resolvedCall.getReceiverArgument() //Resolved call to local class constructor doesn't have resolvedCall.getThisObject() and resolvedCall.getReceiverArgument()
//so we need generate closure on stack //so we need generate closure on stack
//See StackValue.receiver for more info //See StackValue.receiver for more info
pushClosureOnStack(closure, resolvedCall.getThisObject().exists() || resolvedCall.getReceiverArgument().exists(), Inliner.NOT_INLINE); pushClosureOnStack(closure, resolvedCall.getThisObject().exists() || resolvedCall.getReceiverArgument().exists(), CallGenerator.NOT_INLINE);
ConstructorDescriptor originalOfSamAdapter = (ConstructorDescriptor) SamCodegenUtil.getOriginalIfSamAdapter(constructorDescriptor); ConstructorDescriptor originalOfSamAdapter = (ConstructorDescriptor) SamCodegenUtil.getOriginalIfSamAdapter(constructorDescriptor);
CallableMethod method = typeMapper.mapToCallableMethod(originalOfSamAdapter == null ? constructorDescriptor : originalOfSamAdapter); CallableMethod method = typeMapper.mapToCallableMethod(originalOfSamAdapter == null ? constructorDescriptor : originalOfSamAdapter);
compiler/backend/src/org/jetbrains/jet/codegen/inline/Inliner.java → compiler/backend/src/org/jetbrains/jet/codegen/inline/CallGenerator.java
+2 -2
View File
@@ -24,9 +24,9 @@ import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
import org.jetbrains.jet.lang.psi.JetExpression; import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression; import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression;
public interface Inliner { public interface CallGenerator {
Inliner NOT_INLINE = new Inliner() { CallGenerator NOT_INLINE = new CallGenerator() {
@Override @Override
public void inlineCall( public void inlineCall(
CallableMethod callableMethod, ClassVisitor visitor CallableMethod callableMethod, ClassVisitor visitor
compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegen.java
+1 -1
View File
@@ -57,7 +57,7 @@ import static org.jetbrains.jet.codegen.AsmUtil.getMethodAsmFlags;
import static org.jetbrains.jet.codegen.AsmUtil.isPrimitive; import static org.jetbrains.jet.codegen.AsmUtil.isPrimitive;
import static org.jetbrains.jet.codegen.binding.CodegenBinding.asmTypeForAnonymousClass; import static org.jetbrains.jet.codegen.binding.CodegenBinding.asmTypeForAnonymousClass;
public class InlineCodegen implements ParentCodegenAware, Inliner { public class InlineCodegen implements ParentCodegenAware, CallGenerator {
private final JetTypeMapper typeMapper; private final JetTypeMapper typeMapper;