Clean up after reusing allDescriptors() from LazyJavaScope to avoid compute contributed descriptors in LazyJavaPackageScope

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

@@ -174,11 +174,11 @@ class LazyJavaPackageScope(
         // combined computeDescriptors() and computeClassNames()
         // computeFunctionNames and computePropertyNames return always emptySet
         // therefore don't need to check if kindFilter anything else but CLASSIFIERS
-        if (!kindFilter.acceptsKinds(DescriptorKindFilter.CLASSIFIERS_MASK or DescriptorKindFilter.NON_SINGLETON_CLASSIFIERS_MASK))
+        return if (!kindFilter.acceptsKinds(DescriptorKindFilter.CLASSIFIERS_MASK or DescriptorKindFilter.NON_SINGLETON_CLASSIFIERS_MASK)) {
-            emptyList<DeclarationDescriptor>()
+            emptyList()
-
+        } else {
-        // we don't use implementation from super which caches all descriptors and does not use filters
+            // we don't use implementation from super which caches all descriptors and does not use filters
-        val allContributedDescriptors = allDescriptors()
+            allDescriptors().filter { it is ClassDescriptor && nameFilter(it.name) }.toList()
-        return allContributedDescriptors.filter { it is ClassDescriptor && nameFilter(it.name) }.toList()
+        }
     }
 }