Removed KtScope.Empty and created util function emptyScope

compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt

@@ -99,7 +99,7 @@ public class IncrementalPackageFragmentProvider(
 
         val memberScope: NotNullLazyValue<KtScope> = storageManager.createLazyValue {
             if (fqName !in fqNamesToLoad) {
-                KtScope.Empty
+                KtScope.empty(this)
             }
             else {
                 val moduleMapping = incrementalCache.getModuleMappingData()?.let { ModuleMapping.create(it) }
@@ -128,7 +128,7 @@ public class IncrementalPackageFragmentProvider(
                         }
 
                 if (scopes.isEmpty()) {
-                    KtScope.Empty
+                    KtScope.empty(this)
                 }
                 else {
                     ChainedScope(this, "Member scope for incremental compilation: union of package parts data", *scopes.toTypedArray())
@@ -151,7 +151,7 @@ public class IncrementalPackageFragmentProvider(
             val memberScope = storageManager.createLazyValue {
                 val partsData = partsNames.map { incrementalCache.getPackagePartData(it) }.filterNotNull()
                 if (partsData.isEmpty())
-                    KtScope.Empty
+                    KtScope.empty(this)
                 else {
                     val scopes = partsData.map { IncrementalPackageScope(JvmProtoBufUtil.readPackageDataFrom(it.data, it.strings)) }
                     ChainedScope(this,

compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/PropagationHeuristics.java

@@ -67,7 +67,7 @@ class PropagationHeuristics {
                                 arrayTypeFromSuper.getConstructor(),
                                 arrayTypeFromSuper.isMarkedNullable(),
                                 Arrays.asList(new TypeProjectionImpl(Variance.OUT_VARIANCE, elementTypeInSuper)),
-                                KtScope.Empty.INSTANCE$);
+                                KtScope.Companion.empty(elementType.getMemberScope().getContainingDeclaration()));
 
                         data.reportError("Return type is not a subtype of overridden method. " +
                                          "To fix it, add annotation with Kotlin signature to super method with type "