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

Simplify CodegenBinding.canHaveOuter(), make it work for objects

Browse Source 
This fixes CompileKotlinAgainstKotlinTest
This commit is contained in:
Alexander Udalov
2013-11-15 20:39:48 +04:00
parent 90490b5c0c
commit 9890f2e5ac
2 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+1 -1
View File
@@ -2245,7 +2245,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
} }
public StackValue generateThisOrOuter(@NotNull ClassDescriptor calleeContainingClass, boolean isSuper) { public StackValue generateThisOrOuter(@NotNull ClassDescriptor calleeContainingClass, boolean isSuper) {
boolean isSingleton = CodegenBinding.isSingleton(bindingContext, calleeContainingClass); boolean isSingleton = calleeContainingClass.getKind().isSingleton();
if (isSingleton) { if (isSingleton) {
if (context.hasThisDescriptor() && context.getThisDescriptor().equals(calleeContainingClass)) { if (context.hasThisDescriptor() && context.getThisDescriptor().equals(calleeContainingClass)) {
return StackValue.local(0, typeMapper.mapType(calleeContainingClass)); return StackValue.local(0, typeMapper.mapType(calleeContainingClass));
compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java
+3 -24
View File
@@ -150,8 +150,8 @@ public class CodegenBinding {
bindingTrace.record(CLASS_FOR_SCRIPT, scriptDescriptor, classDescriptor); bindingTrace.record(CLASS_FOR_SCRIPT, scriptDescriptor, classDescriptor);
} }
public static boolean canHaveOuter(BindingContext bindingContext, @NotNull ClassDescriptor classDescriptor) { public static boolean canHaveOuter(@NotNull BindingContext bindingContext, @NotNull ClassDescriptor classDescriptor) {
if (isSingleton(bindingContext, classDescriptor)) { if (classDescriptor.getKind() != ClassKind.CLASS) {
return false; return false;
} }
@@ -160,28 +160,7 @@ public class CodegenBinding {
return false; return false;
} }
ClassKind kind = classDescriptor.getKind(); return classDescriptor.isInner() || !(classDescriptor.getContainingDeclaration() instanceof ClassDescriptor);
if (kind == ClassKind.CLASS) {
return classDescriptor.isInner() || !(classDescriptor.getContainingDeclaration() instanceof ClassDescriptor);
}
else if (kind == ClassKind.OBJECT) {
return !isSingleton(bindingContext, enclosing);
}
else {
return false;
}
}
public static boolean isSingleton(BindingContext bindingContext, @NotNull ClassDescriptor classDescriptor) {
if (isObjectDeclaration(bindingContext, classDescriptor)) {
return true;
}
if (classDescriptor.getKind() == ClassKind.ENUM_ENTRY) {
return true;
}
return false;
} }
static void recordClosure( static void recordClosure(