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

DelegateKind is not needed when generating delegates

Browse Source 
"this.context" is correct and more useful
This commit is contained in:
Alexander Udalov
2012-10-29 19:41:52 +04:00
parent c3854e9bd4
commit fcbb5fe191
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+4 -7
View File
@@ -1093,10 +1093,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
field.store(fieldType, iv); field.store(fieldType, iv);
} }
final CodegenContext delegateContext = context.intoClass(superClassDescriptor, generateDelegates(superClassDescriptor, field);
new OwnerKind.DelegateKind(field, superTypeAsmType.getInternalName()),
state);
generateDelegates(superClassDescriptor, delegateContext, field);
} }
private void lookupConstructorExpressionsInClosureIfPresent(final ConstructorContext constructorContext) { private void lookupConstructorExpressionsInClosureIfPresent(final ConstructorContext constructorContext) {
@@ -1527,9 +1524,9 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
return false; return false;
} }
protected void generateDelegates(ClassDescriptor toClass, CodegenContext delegateContext, StackValue field) { protected void generateDelegates(ClassDescriptor toClass, StackValue field) {
final FunctionCodegen functionCodegen = new FunctionCodegen(delegateContext, v, state); final FunctionCodegen functionCodegen = new FunctionCodegen(context, v, state);
final PropertyCodegen propertyCodegen = new PropertyCodegen(delegateContext, v, functionCodegen); final PropertyCodegen propertyCodegen = new PropertyCodegen(context, v, functionCodegen);
for (DeclarationDescriptor declaration : descriptor.getDefaultType().getMemberScope().getAllDescriptors()) { for (DeclarationDescriptor declaration : descriptor.getDefaultType().getMemberScope().getAllDescriptors()) {
if (declaration instanceof CallableMemberDescriptor) { if (declaration instanceof CallableMemberDescriptor) {