From ef8e7ea0bbc108b37fac3d6ad02c91fe7572ac91 Mon Sep 17 00:00:00 2001
From: Michael Nedzelsky <Michael.Nedzelsky@jetbrains.com>
Date: Wed, 23 Sep 2015 17:36:50 +0300
Subject: [PATCH] Revert "add strict check for internal visibility during
 compilation"

This reverts commit d1ee58186fc689001b662dfac7d2fd9c92b0bd23.
---
 .../kotlin/descriptors/Visibilities.java      | 19 +------------------
 .../kotlin/resolve/DescriptorUtils.java       | 17 -----------------
 2 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java
index 7d849a8efc4..073b7cb7962 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.descriptors;
 import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.descriptors.impl.PackageFragmentDescriptorImpl;
 import org.jetbrains.kotlin.resolve.DescriptorUtils;
 import org.jetbrains.kotlin.resolve.scopes.receivers.ClassReceiver;
 import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue;
@@ -122,26 +121,10 @@ public class Visibilities {
         @Override
         public boolean isVisible(@NotNull ReceiverValue receiver, @NotNull DeclarationDescriptorWithVisibility what, @NotNull DeclarationDescriptor from) {
             DeclarationDescriptor fromOrModule = from instanceof PackageViewDescriptor ? ((PackageViewDescriptor) from).getModule() : from;
-            if (!isInFriendModule(what, fromOrModule)) return false;
-
-            return isWithSourcesOrFromIncrementalPackageFragment(what) || !isWithSourcesOrFromIncrementalPackageFragment(from);
+            return isInFriendModule(what, fromOrModule);
         }
     };
 
-    @SuppressWarnings("deprecation")
-    private static boolean isWithSourcesOrFromIncrementalPackageFragment(@NotNull DeclarationDescriptor descriptor) {
-        SourceElement sourceElement = DescriptorUtils.getSourceElement(descriptor);
-        if (sourceElement.isKotlinSourceElement()) return true;
-
-        PackageFragmentDescriptor containingPackage = DescriptorUtils.getParentOfType(descriptor, PackageFragmentDescriptor.class, false);
-
-        if (containingPackage instanceof PackageFragmentDescriptorImpl) {
-            return ((PackageFragmentDescriptorImpl)containingPackage).isIncremental();
-        }
-
-        return false;
-    }
-
     public static final Visibility PUBLIC = new Visibility("public", true) {
         @Override
         public boolean mustCheckInImports() {
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java
index 4f53c0ed340..bc191c82ffb 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java
@@ -589,23 +589,6 @@ public class DescriptorUtils {
         return getJvmNameAnnotation(annotated.getAnnotations());
     }
 
-    @NotNull
-    public static SourceElement getSourceElement(@NotNull DeclarationDescriptor descriptor) {
-        if (descriptor instanceof PropertySetterDescriptor) {
-            descriptor = ((PropertySetterDescriptor) descriptor).getCorrespondingProperty();
-        }
-
-        if (descriptor instanceof CallableMemberDescriptor && ((CallableMemberDescriptor)descriptor).getSource() == SourceElement.NO_SOURCE) {
-            descriptor = descriptor.getContainingDeclaration();
-        }
-
-        if (descriptor instanceof DeclarationDescriptorWithSource) {
-            return ((DeclarationDescriptorWithSource) descriptor).getSource();
-        }
-
-        return SourceElement.NO_SOURCE;
-    }
-
     private static void getSubPackagesFqNames(PackageViewDescriptor packageView, Set<FqName> result) {
         FqName fqName = packageView.getFqName();
         if (!fqName.isRoot()) {