Using isTopLevelDeclaration instaed of a direct instanceof check

compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java

@@ -31,6 +31,7 @@ import org.jetbrains.jet.codegen.state.GenerationState;
 import org.jetbrains.jet.codegen.state.JetTypeMapper;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
+import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
 import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants;
 import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
@@ -191,7 +192,7 @@ public class AsmUtil {
         Classes in byte code should be public or package private
      */
     public static int getVisibilityAccessFlagForClass(ClassDescriptor descriptor) {
-        if (descriptor.getContainingDeclaration() instanceof NamespaceDescriptor ||
+        if (DescriptorUtils.isTopLevelDeclaration(descriptor) ||
             descriptor.getVisibility() == Visibilities.PUBLIC ||
             descriptor.getVisibility() == Visibilities.INTERNAL) {
             return ACC_PUBLIC;

compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java

@@ -22,6 +22,7 @@ import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
+import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.java.JvmAbi;
 import org.jetbrains.jet.lang.resolve.java.JvmClassName;
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
@@ -196,8 +197,8 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid {
 
     private String getName(ClassDescriptor classDescriptor) {
         String base = peekFromStack(nameStack);
-        return classDescriptor.getContainingDeclaration() instanceof NamespaceDescriptor ? base.isEmpty() ? classDescriptor.getName()
-                .getName() : base + '/' + classDescriptor.getName() : base + '$' + classDescriptor.getName();
+        return DescriptorUtils.isTopLevelDeclaration(classDescriptor) ? base.isEmpty() ? classDescriptor.getName()
+                        .getName() : base + '/' + classDescriptor.getName() : base + '$' + classDescriptor.getName();
     }
 
     @Override

compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java

@@ -231,11 +231,6 @@ public class DescriptorUtils {
         }
     }
 
-    public static boolean isTopLevelNamespace(@NotNull NamespaceDescriptor namespaceDescriptor) {
-        return namespaceDescriptor.getContainingDeclaration() instanceof NamespaceDescriptor
-                && namespaceDescriptor.getContainingDeclaration().getContainingDeclaration() instanceof ModuleDescriptor;
-    }
-
     public static boolean isRootNamespace(@NotNull NamespaceDescriptor namespaceDescriptor) {
         return namespaceDescriptor.getContainingDeclaration() instanceof ModuleDescriptor;
     }
@@ -400,7 +395,7 @@ public class DescriptorUtils {
 
     public static boolean isExternallyAccessible(PropertyDescriptor propertyDescriptor) {
         return propertyDescriptor.getVisibility() != Visibilities.PRIVATE || isClassObject(propertyDescriptor.getContainingDeclaration())
-               || propertyDescriptor.getContainingDeclaration() instanceof NamespaceDescriptor;
+               || isTopLevelDeclaration(propertyDescriptor);
     }
 
     @NotNull

compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java

@@ -333,7 +333,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
     }
 
     private void renderModalityForCallable(@NotNull CallableMemberDescriptor callable, @NotNull StringBuilder builder) {
-        if (!(callable.getContainingDeclaration() instanceof NamespaceDescriptor) || callable.getModality() != Modality.FINAL) {
+        if (!DescriptorUtils.isTopLevelDeclaration(callable) || callable.getModality() != Modality.FINAL) {
             renderModality(callable.getModality(), builder);
         }
     }