Unify containing classes mapping for deserialized callable members.

compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassInfo.kt

@@ -21,23 +21,23 @@ import org.jetbrains.kotlin.name.FqName
 public interface JvmFileClassInfo {
     public val fileClassFqName: FqName
     public val facadeClassFqName: FqName
-    public val isWithJvmName: Boolean
-    public val TEMP_isMultifileClass: Boolean
+    public val withJvmName: Boolean
+    public val withJvmMultifileClass: Boolean
 }
 
 public class JvmSimpleFileClassInfo(
         override val fileClassFqName: FqName,
-        override val isWithJvmName: Boolean
+        override val withJvmName: Boolean
 ) : JvmFileClassInfo {
     override val facadeClassFqName: FqName get() = fileClassFqName
-    override val TEMP_isMultifileClass: Boolean get() = false
+    override val withJvmMultifileClass: Boolean get() = false
 }
 
 public class JvmMultifileClassPartInfo(
         override val fileClassFqName: FqName,
         override val facadeClassFqName: FqName
 ) : JvmFileClassInfo {
-    override val isWithJvmName: Boolean get() = true
-    override val TEMP_isMultifileClass: Boolean get() = true
+    override val withJvmName: Boolean get() = true
+    override val withJvmMultifileClass: Boolean get() = true
 }
 

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

@@ -152,7 +152,7 @@ public class IncrementalPackageFragmentProvider(
                 if (partsData.isEmpty())
                     JetScope.Empty
                 else {
-                    val scopes = partsData.map { IncrementalPackageScope(JvmProtoBufUtil.readPackageDataFrom(it)) }
+                    val scopes = partsData.map { IncrementalPackageScope(JvmProtoBufUtil.readPackageDataFrom(it.data, it.strings)) }
                     ChainedScope(this,
                                  "Member scope for incremental compilation: union of multifile class parts data for $multifileClassFqName",
                                  *scopes.toTypedArray<JetScope>())