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

Refactor componentN() function generation

Browse Source 
Adopt to the new FunctionGenerationStrategy
This commit is contained in:
Alexander Udalov
2013-04-10 15:24:39 +04:00
parent 34009a2134
commit 9187116055
2 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
+1 -1
View File
@@ -324,7 +324,7 @@ public class FunctionCodegen extends GenerationStateAware {
iv.areturn(asmMethod.getReturnType());
}
public static void genJetAnnotations(
private static void genJetAnnotations(
@NotNull GenerationState state,
@NotNull FunctionDescriptor functionDescriptor,
@Nullable JvmMethodSignature jvmSignature,
compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+22 -19
View File
@@ -671,29 +671,32 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
}
}
private void generateComponentFunction(@NotNull FunctionDescriptor function, @NotNull ValueParameterDescriptor parameter) {
private void generateComponentFunction(@NotNull FunctionDescriptor function, @NotNull final ValueParameterDescriptor parameter) {
JetType returnType = function.getReturnType();
assert returnType != null : "Return type of component function should not be null: " + function;
Type componentType = typeMapper.mapReturnType(returnType);
final Type componentType = typeMapper.mapReturnType(returnType);
String desc = "()" + componentType.getDescriptor();
MethodVisitor mv = v.newMethod(myClass,
AsmUtil.getMethodAsmFlags(function, OwnerKind.IMPLEMENTATION),
function.getName().getName(),
desc,
null, null);
JvmMethodSignature signature = typeMapper.mapSignature(function.getName(), function);
FunctionCodegen.genJetAnnotations(state, function, null, null, mv);
mv.visitCode();
InstructionAdapter iv = new InstructionAdapter(mv);
if (!componentType.equals(Type.VOID_TYPE)) {
iv.load(0, classAsmType);
iv.invokevirtual(classAsmType.getInternalName(), PropertyCodegen.getterName(parameter.getName()), desc);
}
iv.areturn(componentType);
FunctionCodegen.endVisit(mv, function.getName().getName(), myClass);
FunctionCodegen fc = new FunctionCodegen(context, v, state);
fc.generateMethod(myClass, signature, true, null, function, new FunctionGenerationStrategy() {
@Override
public void generateBody(
@NotNull MethodVisitor mv,
@NotNull JvmMethodSignature signature,
@NotNull MethodContext context,
@NotNull Collection<String> localVariableNames,
@NotNull FrameMap frameMap
) {
InstructionAdapter iv = new InstructionAdapter(mv);
if (!componentType.equals(Type.VOID_TYPE)) {
iv.load(0, classAsmType);
String desc = "()" + componentType.getDescriptor();
iv.invokevirtual(classAsmType.getInternalName(), PropertyCodegen.getterName(parameter.getName()), desc);
}
iv.areturn(componentType);
}
});
}
private void generateCopyFunction(@NotNull final FunctionDescriptor function) {