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

remove unnecessary PsiElement check (which doesn't work correctly in case of a multi-module project and separate compilation), use ClassDescriptor instead

Browse Source
This commit is contained in:
Dmitry Jemerov
2012-07-12 21:02:59 +02:00
parent bd01b82746
commit a65453a1bd
1 changed files with 74 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+1 -6
View File
@@ -19,7 +19,6 @@ package org.jetbrains.jet.codegen;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Pair;
import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.codegen.signature.*; import org.jetbrains.jet.codegen.signature.*;
@@ -772,10 +771,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
DeclarationDescriptor containingDeclaration = fun.getContainingDeclaration(); DeclarationDescriptor containingDeclaration = fun.getContainingDeclaration();
if (containingDeclaration instanceof ClassDescriptor) { if (containingDeclaration instanceof ClassDescriptor) {
ClassDescriptor declaration = (ClassDescriptor) containingDeclaration; ClassDescriptor declaration = (ClassDescriptor) containingDeclaration;
PsiElement psiElement = BindingContextUtils.classDescriptorToDeclaration(bindingContext, declaration); if (declaration.getKind() == ClassKind.TRAIT) {
if (psiElement instanceof JetClass) {
JetClass jetClass = (JetClass) psiElement;
if (jetClass.isTrait()) {
int flags = ACC_PUBLIC; // TODO. int flags = ACC_PUBLIC; // TODO.
Method function; Method function;
@@ -857,7 +853,6 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
} }
} }
} }
}
private void generateDelegatorToConstructorCall(InstructionAdapter iv, ExpressionCodegen codegen, JetCallElement constructorCall, private void generateDelegatorToConstructorCall(InstructionAdapter iv, ExpressionCodegen codegen, JetCallElement constructorCall,
ConstructorDescriptor constructorDescriptor, ConstructorDescriptor constructorDescriptor,