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

Minor, extract FrameMap creation in FunctionCodegen

Browse Source
This commit is contained in:
Alexander Udalov
2014-07-17 22:49:37 +04:00
parent 33f7d6e3ef
commit 93fdf3a254
1 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
+38 -38
View File
@@ -297,18 +297,7 @@ public class FunctionCodegen extends ParentCodegenAware {
generateStaticDelegateMethodBody(mv, signature.getAsmMethod(), (PackageFacadeContext) context.getParentContext()); generateStaticDelegateMethodBody(mv, signature.getAsmMethod(), (PackageFacadeContext) context.getParentContext());
} }
else { else {
FrameMap frameMap = new FrameMap(); FrameMap frameMap = createFrameMap(parentCodegen.state, functionDescriptor, signature, isStatic(context.getContextKind()));
if (context.getContextKind() == OwnerKind.IMPLEMENTATION) {
frameMap.enterTemp(OBJECT_TYPE); // 0 slot for this
}
for (JvmMethodParameterSignature parameter : signature.getValueParameters()) {
if (parameter.getKind() != JvmMethodParameterKind.VALUE) {
frameMap.enterTemp(parameter.getAsmType());
}
}
for (ValueParameterDescriptor parameter : functionDescriptor.getValueParameters()) {
frameMap.enter(parameter, typeMapper.mapType(parameter));
}
Label methodEntry = new Label(); Label methodEntry = new Label();
mv.visitLabel(methodEntry); mv.visitLabel(methodEntry);
@@ -617,30 +606,10 @@ public class FunctionCodegen extends ParentCodegenAware {
@NotNull MemberCodegen<?> parentCodegen, @NotNull MemberCodegen<?> parentCodegen,
@NotNull GenerationState state @NotNull GenerationState state
) { ) {
FrameMap frameMap = new FrameMap(); FrameMap frameMap = createFrameMap(state, functionDescriptor, signature, isStatic);
if (!isStatic) {
frameMap.enterTemp(OBJECT_TYPE);
}
ExpressionCodegen codegen = new ExpressionCodegen(mv, frameMap, signature.getReturnType(), methodContext, state, parentCodegen); ExpressionCodegen codegen = new ExpressionCodegen(mv, frameMap, signature.getReturnType(), methodContext, state, parentCodegen);
Type[] argTypes = signature.getAsmMethod().getArgumentTypes();
List<ValueParameterDescriptor> paramDescrs = functionDescriptor.getValueParameters();
Iterator<ValueParameterDescriptor> iterator = paramDescrs.iterator();
int countOfExtraVarsInMethodArgs = 0;
for (JvmMethodParameterSignature parameterSignature : signature.getValueParameters()) {
if (parameterSignature.getKind() != JvmMethodParameterKind.VALUE) {
countOfExtraVarsInMethodArgs++;
frameMap.enterTemp(parameterSignature.getAsmType());
}
else {
frameMap.enter(iterator.next(), parameterSignature.getAsmType());
}
}
int maskIndex = frameMap.enterTemp(Type.INT_TYPE); int maskIndex = frameMap.enterTemp(Type.INT_TYPE);
CallGenerator generator = codegen.getOrCreateCallGenerator(functionDescriptor, function); CallGenerator generator = codegen.getOrCreateCallGenerator(functionDescriptor, function);
@@ -649,10 +618,17 @@ public class FunctionCodegen extends ParentCodegenAware {
loadExplicitArgumentsOnStack(iv, OBJECT_TYPE, isStatic, signature); loadExplicitArgumentsOnStack(iv, OBJECT_TYPE, isStatic, signature);
generator.putHiddenParams(); generator.putHiddenParams();
for (int index = 0; index < paramDescrs.size(); index++) { List<JvmMethodParameterSignature> mappedParameters = signature.getValueParameters();
ValueParameterDescriptor parameterDescriptor = paramDescrs.get(index); int capturedArgumentsCount = 0;
while (capturedArgumentsCount < mappedParameters.size() &&
mappedParameters.get(capturedArgumentsCount).getKind() != JvmMethodParameterKind.VALUE) {
capturedArgumentsCount++;
}
Type t = argTypes[countOfExtraVarsInMethodArgs + index]; List<ValueParameterDescriptor> valueParameters = functionDescriptor.getValueParameters();
for (int index = 0; index < valueParameters.size(); index++) {
ValueParameterDescriptor parameterDescriptor = valueParameters.get(index);
Type type = mappedParameters.get(capturedArgumentsCount + index).getAsmType();
int parameterIndex = frameMap.getIndex(parameterDescriptor); int parameterIndex = frameMap.getIndex(parameterDescriptor);
if (parameterDescriptor.declaresDefaultValue()) { if (parameterDescriptor.declaresDefaultValue()) {
@@ -664,12 +640,12 @@ public class FunctionCodegen extends ParentCodegenAware {
loadStrategy.putValueOnStack(parameterDescriptor, codegen); loadStrategy.putValueOnStack(parameterDescriptor, codegen);
iv.store(parameterIndex, t); iv.store(parameterIndex, type);
iv.mark(loadArg); iv.mark(loadArg);
} }
generator.putValueIfNeeded(parameterDescriptor, t, StackValue.local(parameterIndex, t)); generator.putValueIfNeeded(parameterDescriptor, type, StackValue.local(parameterIndex, type));
} }
CallableMethod method; CallableMethod method;
@@ -685,6 +661,30 @@ public class FunctionCodegen extends ParentCodegenAware {
iv.areturn(signature.getReturnType()); iv.areturn(signature.getReturnType());
} }
@NotNull
private static FrameMap createFrameMap(
@NotNull GenerationState state,
@NotNull FunctionDescriptor function,
@NotNull JvmMethodSignature signature,
boolean isStatic
) {
FrameMap frameMap = new FrameMap();
if (!isStatic) {
frameMap.enterTemp(OBJECT_TYPE);
}
for (JvmMethodParameterSignature parameter : signature.getValueParameters()) {
if (parameter.getKind() != JvmMethodParameterKind.VALUE) {
frameMap.enterTemp(parameter.getAsmType());
}
}
for (ValueParameterDescriptor parameter : function.getValueParameters()) {
frameMap.enter(parameter, state.getTypeMapper().mapType(parameter));
}
return frameMap;
}
private static void loadExplicitArgumentsOnStack( private static void loadExplicitArgumentsOnStack(
@NotNull InstructionAdapter iv, @NotNull InstructionAdapter iv,