Removed MemberScope.ownerDescriptor

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt

@@ -61,9 +61,9 @@ import java.util.*
 
 public class LazyJavaClassMemberScope(
         c: LazyJavaResolverContext,
-        containingDeclaration: ClassDescriptor,
+        override val ownerDescriptor: ClassDescriptor,
         private val jClass: JavaClass
-) : LazyJavaScope(c, containingDeclaration) {
+) : LazyJavaScope(c) {
 
     override fun computeMemberIndex(): MemberIndex {
         return object : ClassMemberIndex(jClass, { !it.isStatic() }) {
@@ -634,9 +634,6 @@ public class LazyJavaClassMemberScope(
         }
     }
 
-    override val ownerDescriptor: ClassDescriptor
-        get() = super.ownerDescriptor as ClassDescriptor
-
     // namespaces should be resolved elsewhere
     override fun getPackage(name: Name) = null
 

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageScope.kt

@@ -36,11 +36,12 @@ import org.jetbrains.kotlin.resolve.scopes.MemberScope
 public class LazyJavaPackageScope(
         c: LazyJavaResolverContext,
         private val jPackage: JavaPackage,
-        private val containingDeclaration: LazyJavaPackageFragment
-) : LazyJavaStaticScope(c, containingDeclaration) {
+        override val ownerDescriptor: LazyJavaPackageFragment
+) : LazyJavaStaticScope(c) {
+
     private val partToFacade = c.storageManager.createLazyValue {
         val result = hashMapOf<String, String>()
-        kotlinClasses@for (kotlinClass in containingDeclaration.kotlinBinaryClasses) {
+        kotlinClasses@for (kotlinClass in ownerDescriptor.kotlinBinaryClasses) {
             val header = kotlinClass.classHeader
             when (header.kind) {
                 KotlinClassHeader.Kind.MULTIFILE_CLASS_PART -> {
@@ -62,25 +63,23 @@ public class LazyJavaPackageScope(
             partToFacade()[partName]
 
     private val deserializedPackageScope = c.storageManager.createLazyValue {
-        if (containingDeclaration.kotlinBinaryClasses.isEmpty()) {
+        if (ownerDescriptor.kotlinBinaryClasses.isEmpty()) {
             // If the scope is queried but no package parts are found, there's a possibility that we're trying to load symbols
             // from an old package with the binary-incompatible facade.
             // We try to read the old package facade if there is one, to report the "incompatible ABI version" message.
-            packageFragment.oldPackageFacade?.let { binaryClass ->
+            ownerDescriptor.oldPackageFacade?.let { binaryClass ->
                 c.components.deserializedDescriptorResolver.readData(binaryClass, DeserializedDescriptorResolver.KOTLIN_PACKAGE_FACADE)
             }
 
-            MemberScope.empty(packageFragment)
+            MemberScope.Empty
         }
         else {
-            c.components.deserializedDescriptorResolver.createKotlinPackageScope(packageFragment, containingDeclaration.kotlinBinaryClasses)
+            c.components.deserializedDescriptorResolver.createKotlinPackageScope(ownerDescriptor, ownerDescriptor.kotlinBinaryClasses)
         }
     }
 
-    private val packageFragment: LazyJavaPackageFragment get() = ownerDescriptor as LazyJavaPackageFragment
-
     private val classes = c.storageManager.createMemoizedFunctionWithNullableValues<Name, ClassDescriptor> { name ->
-        val classId = ClassId(packageFragment.fqName, name)
+        val classId = ClassId(ownerDescriptor.fqName, name)
 
         val kotlinResult = c.resolveKotlinBinaryClass(c.components.kotlinClassFinder.findKotlinClass(classId))
         when (kotlinResult) {
@@ -89,8 +88,8 @@ public class LazyJavaPackageScope(
             is KotlinClassLookupResult.NotFound -> {
                 c.components.finder.findClass(classId)?.let { javaClass ->
                     c.javaClassResolver.resolveClass(javaClass).apply {
-                        assert(this == null || this.containingDeclaration == packageFragment) {
-                            "Wrong package fragment for $this, expected $packageFragment"
+                        assert(this == null || this.containingDeclaration == ownerDescriptor) {
+                            "Wrong package fragment for $this, expected $ownerDescriptor"
                         }
                     }
                 }

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt

@@ -51,10 +51,9 @@ import org.jetbrains.kotlin.utils.addIfNotNull
 import org.jetbrains.kotlin.utils.toReadOnlyList
 import java.util.*
 
-public abstract class LazyJavaScope(
-        protected val c: LazyJavaResolverContext,
-        override val ownerDescriptor: DeclarationDescriptor
-) : MemberScopeImpl() {
+public abstract class LazyJavaScope(protected val c: LazyJavaResolverContext) : MemberScopeImpl() {
+    protected abstract val ownerDescriptor: DeclarationDescriptor
+
     // this lazy value is not used at all in LazyPackageFragmentScopeForJavaPackage because we do not use caching there
     // but is placed in the base class to not duplicate code
     private val allDescriptors = c.storageManager.createRecursionTolerantLazyValue<Collection<DeclarationDescriptor>>(

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticClassScope.kt

@@ -36,8 +36,8 @@ import org.jetbrains.kotlin.types.KotlinType
 public class LazyJavaStaticClassScope(
         c: LazyJavaResolverContext,
         private val jClass: JavaClass,
-        descriptor: LazyJavaClassDescriptor
-) : LazyJavaStaticScope(c, descriptor) {
+        override val ownerDescriptor: LazyJavaClassDescriptor
+) : LazyJavaStaticScope(c) {
 
     override fun computeMemberIndex(): MemberIndex {
         val delegate = ClassMemberIndex(jClass) { it.isStatic() }
@@ -110,9 +110,6 @@ public class LazyJavaStaticClassScope(
         }
     }
 
-    override val ownerDescriptor: LazyJavaClassDescriptor
-        get() = super.ownerDescriptor as LazyJavaClassDescriptor
-
     private fun getStaticFunctionsFromJavaSuperClasses(name: Name, descriptor: ClassDescriptor): Set<SimpleFunctionDescriptor> {
         val staticScope = descriptor.getParentJavaStaticClassScope() ?: return emptySet()
         return staticScope.getContributedFunctions(name, NoLookupLocation.WHEN_GET_SUPER_MEMBERS).map { it as SimpleFunctionDescriptor }.toSet()

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticScope.kt

@@ -16,7 +16,6 @@
 
 package org.jetbrains.kotlin.load.java.lazy.descriptors
 
-import org.jetbrains.kotlin.descriptors.ClassOrPackageFragmentDescriptor
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
 import org.jetbrains.kotlin.load.java.lazy.LazyJavaResolverContext
@@ -25,10 +24,7 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.types.KotlinType
 
-public abstract class LazyJavaStaticScope(
-        c: LazyJavaResolverContext,
-        descriptor: ClassOrPackageFragmentDescriptor
-) : LazyJavaScope(c, descriptor) {
+public abstract class LazyJavaStaticScope(c: LazyJavaResolverContext) : LazyJavaScope(c) {
 
     override fun getDispatchReceiverParameter() = null
 

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BuiltInClassesAreSerializableOnJvm.kt

@@ -42,7 +42,7 @@ class BuiltInClassesAreSerializableOnJvm(
 
     private fun createMockJavaIoSerializableType(): KotlinType {
         val mockJavaIoPackageFragment = object : PackageFragmentDescriptorImpl(moduleDescriptor, FqName("java.io")) {
-            override fun getMemberScope() = MemberScope.empty(this)
+            override fun getMemberScope() = MemberScope.Empty
         }
 
         //NOTE: can't reference anyType right away, because this is sometimes called when JvmBuiltIns are initializing
@@ -56,7 +56,7 @@ class BuiltInClassesAreSerializableOnJvm(
                 mockJavaIoPackageFragment, Name.identifier("Serializable"), Modality.ABSTRACT, superTypes, SourceElement.NO_SOURCE
         )
 
-        mockSerializableClass.initialize(MemberScope.empty(mockSerializableClass), emptySet(), null)
+        mockSerializableClass.initialize(MemberScope.Empty, emptySet(), null)
         return mockSerializableClass.defaultType
     }
 

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java

@@ -104,9 +104,9 @@ public final class DeserializedDescriptorResolver {
             }
         }
         if (list.isEmpty()) {
-            return MemberScope.Companion.empty(descriptor);
+            return MemberScope.Empty.INSTANCE;
         }
-        return new ChainedScope(descriptor, "Member scope for union of package parts data", list.toArray(new MemberScope[list.size()]));
+        return new ChainedScope("Member scope for union of package parts data", list.toArray(new MemberScope[list.size()]));
     }
 
     @Nullable