Fix: not loading ancestor packages from incremental cache.

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt

@@ -56,6 +56,7 @@ public class IncrementalPackageFragmentProvider(
             ).toSet()
     val fqNameToSubFqNames = MultiMap<FqName, FqName>()
     val fqNameToPackageFragment = HashMap<FqName, PackageFragmentDescriptor>()
+    val fqNamesToLoad: Set<FqName>
 
     ;{
         fun createPackageFragment(fqName: FqName) {
@@ -72,13 +73,12 @@ public class IncrementalPackageFragmentProvider(
             fqNameToPackageFragment[fqName] = IncrementalPackageFragment(fqName)
         }
 
-        for (source in PackagePartClassUtils.getPackageFilesWithCallables(sourceFiles)) {
-            createPackageFragment(source.getPackageFqName())
-        }
+        fqNamesToLoad = (
+                PackagePartClassUtils.getPackageFilesWithCallables(sourceFiles).map { it.getPackageFqName() }
+                + incrementalCache.getPackagesWithRemovedFiles(sourceFiles)
+        ).toSet()
 
-        for (fqName in incrementalCache.getPackagesWithRemovedFiles(sourceFiles)) {
-            createPackageFragment(fqName)
-        }
+        fqNamesToLoad.forEach { createPackageFragment(it) }
     }
 
     override fun getSubPackagesOf(fqName: FqName): Collection<FqName> {
@@ -95,12 +95,17 @@ public class IncrementalPackageFragmentProvider(
             get() = this@IncrementalPackageFragmentProvider.moduleId
 
         val _memberScope: NotNullLazyValue<JetScope> = storageManager.createLazyValue {
-            val packageDataBytes = incrementalCache.getPackageData(fqName)
-            if (packageDataBytes == null) {
+            if (fqName !in fqNamesToLoad) {
                 JetScope.EMPTY
             }
             else {
-                IncrementalPackageScope(JavaProtoBufUtil.readPackageDataFrom(packageDataBytes))
+                val packageDataBytes = incrementalCache.getPackageData(fqName)
+                if (packageDataBytes == null) {
+                    JetScope.EMPTY
+                }
+                else {
+                    IncrementalPackageScope(JavaProtoBufUtil.readPackageDataFrom(packageDataBytes))
+                }
             }
         }