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

Minor refactoring of TImpl codegen

Browse Source 
Use early returns, rename some variables, etc
This commit is contained in:
Alexander Udalov
2013-03-15 20:30:51 +04:00
parent 905ea962d8
commit 8afa46ed6d
1 changed files with 87 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+87 -90
View File
@@ -1351,102 +1351,99 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
} }
private void generateDelegationToTraitImpl(FunctionDescriptor fun, @NotNull FunctionDescriptor inheritedFun) { private void generateDelegationToTraitImpl(@NotNull FunctionDescriptor fun, @NotNull FunctionDescriptor inheritedFun) {
DeclarationDescriptor containingDeclaration = fun.getContainingDeclaration(); DeclarationDescriptor containingDeclaration = fun.getContainingDeclaration();
if (containingDeclaration instanceof ClassDescriptor) { if (!(containingDeclaration instanceof ClassDescriptor)) {
ClassDescriptor declaration = (ClassDescriptor) containingDeclaration; return;
if (declaration.getKind() == ClassKind.TRAIT) { }
int flags = ACC_PUBLIC; // TODO.
Method function; ClassDescriptor containingClass = (ClassDescriptor) containingDeclaration;
Method functionOriginal; if (containingClass.getKind() != ClassKind.TRAIT) {
if (fun instanceof PropertyAccessorDescriptor) { return;
PropertyDescriptor property = ((PropertyAccessorDescriptor) fun).getCorrespondingProperty(); }
if (fun instanceof PropertyGetterDescriptor) {
function = typeMapper.mapGetterSignature(property, OwnerKind.IMPLEMENTATION).getJvmMethodSignature().getAsmMethod();
functionOriginal =
typeMapper.mapGetterSignature(property.getOriginal(), OwnerKind.IMPLEMENTATION).getJvmMethodSignature()
.getAsmMethod();
}
else if (fun instanceof PropertySetterDescriptor) {
function = typeMapper.mapSetterSignature(property, OwnerKind.IMPLEMENTATION).getJvmMethodSignature().getAsmMethod();
functionOriginal =
typeMapper.mapSetterSignature(property.getOriginal(), OwnerKind.IMPLEMENTATION).getJvmMethodSignature()
.getAsmMethod();
}
else {
throw new IllegalStateException("Accessor is neither getter, nor setter, what is it?");
}
}
else {
function = typeMapper.mapSignature(fun.getName(), fun).getAsmMethod();
functionOriginal = typeMapper.mapSignature(fun.getName(), fun.getOriginal()).getAsmMethod();
}
MethodVisitor mv = v.newMethod(myClass, flags, function.getName(), function.getDescriptor(), null, null); int flags = ACC_PUBLIC; // TODO.
AnnotationCodegen.forMethod(mv, state.getTypeMapper()).genAnnotations(fun);
JvmMethodSignature jvmSignature = typeMapper.mapToCallableMethod( Method function;
inheritedFun, Method functionOriginal;
false, if (fun instanceof PropertyAccessorDescriptor) {
isCallInsideSameClassAsDeclared(inheritedFun, context), PropertyDescriptor property = ((PropertyAccessorDescriptor) fun).getCorrespondingProperty();
isCallInsideSameModuleAsDeclared(inheritedFun, context), PropertyDescriptor original = property.getOriginal();
OwnerKind.IMPLEMENTATION).getSignature(); if (fun instanceof PropertyGetterDescriptor) {
JetMethodAnnotationWriter aw = JetMethodAnnotationWriter.visitAnnotation(mv); function = typeMapper.mapGetterSignature(property, OwnerKind.IMPLEMENTATION).getJvmMethodSignature().getAsmMethod();
int kotlinFlags = getFlagsForVisibility(fun.getVisibility()); functionOriginal = typeMapper.mapGetterSignature(original, OwnerKind.IMPLEMENTATION).getJvmMethodSignature().getAsmMethod();
if (fun instanceof PropertyAccessorDescriptor) { }
kotlinFlags |= JvmStdlibNames.FLAG_PROPERTY_BIT; else if (fun instanceof PropertySetterDescriptor) {
aw.writeTypeParameters(jvmSignature.getKotlinTypeParameter()); function = typeMapper.mapSetterSignature(property, OwnerKind.IMPLEMENTATION).getJvmMethodSignature().getAsmMethod();
aw.writePropertyType(jvmSignature.getKotlinReturnType()); functionOriginal = typeMapper.mapSetterSignature(original, OwnerKind.IMPLEMENTATION).getJvmMethodSignature().getAsmMethod();
} }
else { else {
JetType returnType = fun.getReturnType(); throw new IllegalStateException("Accessor is neither getter, nor setter, what is it? " + fun);
assert returnType != null;
aw.writeTypeParameters(jvmSignature.getKotlinTypeParameter());
aw.writeReturnType(jvmSignature.getKotlinReturnType());
}
kotlinFlags |= DescriptorKindUtils.kindToFlags(inheritedFun.getKind());
aw.writeFlags(kotlinFlags);
aw.visitEnd();
if (state.getClassBuilderMode() == ClassBuilderMode.STUBS) {
genStubCode(mv);
}
else if (state.getClassBuilderMode() == ClassBuilderMode.FULL) {
mv.visitCode();
FrameMap frameMap = context.prepareFrame(state.getTypeMapper());
ExpressionCodegen codegen =
new ExpressionCodegen(mv, frameMap, jvmSignature.getAsmMethod().getReturnType(), context, state);
codegen.generateThisOrOuter(descriptor, false); // ??? wouldn't it be addClosureToConstructorParameters good idea to put it?
Type[] argTypes = function.getArgumentTypes();
List<Type> originalArgTypes = jvmSignature.getValueParameterTypes();
InstructionAdapter iv = new InstructionAdapter(mv);
iv.load(0, OBJECT_TYPE);
for (int i = 0, reg = 1; i < argTypes.length; i++) {
StackValue.local(reg, argTypes[i]).put(originalArgTypes.get(i), iv);
//noinspection AssignmentToForLoopParameter
reg += argTypes[i].getSize();
}
Type type = getTraitImplThisParameterType(declaration, typeMapper);
String fdescriptor = functionOriginal.getDescriptor().replace("(", "(" + type.getDescriptor());
Type type1 =
typeMapper.mapType(((ClassDescriptor) fun.getContainingDeclaration()).getDefaultType(), JetTypeMapperMode.TRAIT_IMPL);
iv.invokestatic(type1.getInternalName(), function.getName(), fdescriptor);
if (function.getReturnType().getSort() == Type.OBJECT &&
!function.getReturnType().equals(functionOriginal.getReturnType())) {
iv.checkcast(function.getReturnType());
}
iv.areturn(function.getReturnType());
FunctionCodegen.endVisit(iv, "trait method", callableDescriptorToDeclaration(bindingContext, fun));
}
FunctionCodegen.generateBridgeIfNeeded(context, state, v, function, fun);
} }
} }
else {
function = typeMapper.mapSignature(fun.getName(), fun).getAsmMethod();
functionOriginal = typeMapper.mapSignature(fun.getName(), fun.getOriginal()).getAsmMethod();
}
MethodVisitor mv = v.newMethod(myClass, flags, function.getName(), function.getDescriptor(), null, null);
AnnotationCodegen.forMethod(mv, state.getTypeMapper()).genAnnotations(fun);
JvmMethodSignature jvmSignature = typeMapper.mapToCallableMethod(
inheritedFun,
false,
isCallInsideSameClassAsDeclared(inheritedFun, context),
isCallInsideSameModuleAsDeclared(inheritedFun, context),
OwnerKind.IMPLEMENTATION).getSignature();
JetMethodAnnotationWriter aw = JetMethodAnnotationWriter.visitAnnotation(mv);
int kotlinFlags = getFlagsForVisibility(fun.getVisibility());
if (fun instanceof PropertyAccessorDescriptor) {
kotlinFlags |= JvmStdlibNames.FLAG_PROPERTY_BIT;
aw.writeTypeParameters(jvmSignature.getKotlinTypeParameter());
aw.writePropertyType(jvmSignature.getKotlinReturnType());
}
else {
aw.writeTypeParameters(jvmSignature.getKotlinTypeParameter());
aw.writeReturnType(jvmSignature.getKotlinReturnType());
}
kotlinFlags |= DescriptorKindUtils.kindToFlags(inheritedFun.getKind());
aw.writeFlags(kotlinFlags);
aw.visitEnd();
if (state.getClassBuilderMode() == ClassBuilderMode.STUBS) {
genStubCode(mv);
}
else if (state.getClassBuilderMode() == ClassBuilderMode.FULL) {
mv.visitCode();
FrameMap frameMap = context.prepareFrame(state.getTypeMapper());
ExpressionCodegen codegen = new ExpressionCodegen(mv, frameMap, jvmSignature.getAsmMethod().getReturnType(), context, state);
codegen.generateThisOrOuter(descriptor, false); // ??? wouldn't it be addClosureToConstructorParameters good idea to put it?
Type[] argTypes = function.getArgumentTypes();
List<Type> originalArgTypes = jvmSignature.getValueParameterTypes();
InstructionAdapter iv = new InstructionAdapter(mv);
iv.load(0, OBJECT_TYPE);
for (int i = 0, reg = 1; i < argTypes.length; i++) {
StackValue.local(reg, argTypes[i]).put(originalArgTypes.get(i), iv);
//noinspection AssignmentToForLoopParameter
reg += argTypes[i].getSize();
}
Type type = getTraitImplThisParameterType(containingClass, typeMapper);
String functionDescriptor = functionOriginal.getDescriptor().replace("(", "(" + type.getDescriptor());
Type tImplType = typeMapper.mapType(containingClass.getDefaultType(), JetTypeMapperMode.TRAIT_IMPL);
iv.invokestatic(tImplType.getInternalName(), function.getName(), functionDescriptor);
StackValue.onStack(functionOriginal.getReturnType()).put(function.getReturnType(), iv);
iv.areturn(function.getReturnType());
FunctionCodegen.endVisit(iv, "trait method", callableDescriptorToDeclaration(bindingContext, fun));
}
FunctionCodegen.generateBridgeIfNeeded(context, state, v, function, fun);
} }
private void generateDelegatorToConstructorCall( private void generateDelegatorToConstructorCall(