Removed MemberScope.ownerDescriptor

compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutablePackageFragmentDescriptor.java

@@ -22,17 +22,14 @@ import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.resolve.scopes.*;
 
 public class MutablePackageFragmentDescriptor extends PackageFragmentDescriptorImpl {
-    private final MemberScope scope;
 
     public MutablePackageFragmentDescriptor(@NotNull ModuleDescriptor module, @NotNull FqName fqName) {
         super(module, fqName);
-
-        scope = MemberScope.Companion.empty(module);
     }
 
     @NotNull
     @Override
     public MemberScope getMemberScope() {
-        return scope;
+        return MemberScope.Empty.INSTANCE;
     }
 }

compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemImpl.kt

@@ -165,7 +165,7 @@ public class ConstraintSystemImpl : ConstraintSystem {
 
     val TypeParameterDescriptor.correspondingType: KotlinType
         get() = cachedTypeForVariable.getOrPut(this) {
-            KotlinTypeImpl.create(Annotations.EMPTY, this.getTypeConstructor(), false, listOf(), MemberScope.empty(this))
+            KotlinTypeImpl.create(Annotations.EMPTY, this.getTypeConstructor(), false, listOf(), MemberScope.Empty)
         }
 
     fun KotlinType.isProper() = !TypeUtils.containsSpecialType(this) {
@@ -573,7 +573,7 @@ public fun createTypeSubstitutor(conversion: (TypeParameterDescriptor) -> TypePa
             if (descriptor !is TypeParameterDescriptor) return null
             val typeParameterDescriptor = conversion(descriptor) ?: return null
 
-            val type = KotlinTypeImpl.create(Annotations.EMPTY, typeParameterDescriptor.getTypeConstructor(), false, listOf(), MemberScope.empty(typeParameterDescriptor))
+            val type = KotlinTypeImpl.create(Annotations.EMPTY, typeParameterDescriptor.getTypeConstructor(), false, listOf(), MemberScope.Empty)
             return TypeProjectionImpl(type)
         }
     })

compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt

@@ -45,8 +45,6 @@ class DynamicCallableDescriptors(private val builtIns: KotlinBuiltIns) {
     val dynamicType = createDynamicType(builtIns)
 
     fun createDynamicDescriptorScope(call: Call, owner: DeclarationDescriptor) = object : MemberScopeImpl() {
-        override val ownerDescriptor: DeclarationDescriptor get() = owner
-
         override fun printScopeStructure(p: Printer) {
             p.println(javaClass.getSimpleName(), ": dynamic candidates for " + call)
         }

compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt

@@ -59,8 +59,6 @@ protected constructor(
         }.toReadOnlyList()
     }
 
-    override val ownerDescriptor: DeclarationDescriptor get() = thisDescriptor
-
     override fun getContributedClassifier(name: Name, location: LookupLocation): ClassDescriptor? {
         recordLookup(name, location)
         return classDescriptors(name).firstOrNull()
@@ -186,6 +184,6 @@ protected constructor(
     }
 
     private fun recordLookup(name: Name, from: LookupLocation) {
-        c.lookupTracker.record(from, ownerDescriptor, this, name)
+        c.lookupTracker.record(from, thisDescriptor, this, name)
     }
 }

compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/FilteringScope.kt

@@ -23,9 +23,6 @@ import org.jetbrains.kotlin.utils.Printer
 
 public class FilteringScope(private val workerScope: MemberScope, private val predicate: (DeclarationDescriptor) -> Boolean) : MemberScope {
 
-    override val ownerDescriptor: DeclarationDescriptor
-        get() = workerScope.ownerDescriptor
-
     override fun getContributedFunctions(name: Name, location: LookupLocation) = workerScope.getContributedFunctions(name, location).filter(predicate)
 
     private fun <D : DeclarationDescriptor> filterDescriptor(descriptor: D?): D?

compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt

@@ -104,7 +104,7 @@ class ClassifierQualifier(
 
     override val scope: MemberScope get() {
         if (classifier !is ClassDescriptor) {
-            return MemberScope.empty(classifier)
+            return MemberScope.Empty
         }
 
         val scopes = ArrayList<MemberScope>(3)
@@ -120,12 +120,12 @@ class ClassifierQualifier(
             scopes.add(classifier.unsubstitutedInnerClassesScope)
         }
 
-        return ChainedScope(descriptor, "Member scope for $name as class or object", *scopes.toTypedArray())
+        return ChainedScope("Member scope for $name as class or object", *scopes.toTypedArray())
     }
 
     override fun getNestedClassesAndPackageMembersScope(): MemberScope {
         if (classifier !is ClassDescriptor) {
-            return MemberScope.empty(classifier)
+            return MemberScope.Empty
         }
 
         val scopes = ArrayList<MemberScope>(2)
@@ -136,7 +136,7 @@ class ClassifierQualifier(
             scopes.add(JetScopeUtils.getStaticNestedClassesScope(classifier))
         }
 
-        return ChainedScope(descriptor, "Static scope for $name as class or object", *scopes.toTypedArray())
+        return ChainedScope("Static scope for $name as class or object", *scopes.toTypedArray())
     }
 
     override fun toString() = "Classifier{$classifier}"

compiler/frontend/src/org/jetbrains/kotlin/types/TypeIntersector.java

@@ -136,7 +136,7 @@ public class TypeIntersector {
                 constructor,
                 allNullable,
                 Collections.<TypeProjection>emptyList(),
-                new IntersectionScope(constructor, scopes)
+                new ChainedScope("member scope for intersection type " + constructor, scopes)
         );
     }
 
@@ -153,19 +153,6 @@ public class TypeIntersector {
         return upperBoundsAsType != null ? upperBoundsAsType : getBuiltIns(descriptor).getNothingType();
     }
 
-    // TODO: check intersectability, don't use a chained scope
-    private static class IntersectionScope extends ChainedScope {
-        public IntersectionScope(@NotNull TypeConstructor constructor, @NotNull MemberScope[] scopes) {
-            super(null, "member scope for intersection type " + constructor, scopes);
-        }
-
-        @NotNull
-        @Override
-        public DeclarationDescriptor getOwnerDescriptor() {
-            throw new UnsupportedOperationException("Should not call getContainingDeclaration on intersection scope " + this);
-        }
-    }
-
     private static class TypeUnifier {
         private static class TypeParameterUsage {
             private final TypeParameterDescriptor typeParameterDescriptor;