Serialize mappings via proto

core/descriptor.loader.java/src/jvm_package_table.proto

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.serialization.jvm;
+
+option java_outer_classname = "JvmPackageTable";
+option optimize_for = LITE_RUNTIME;
+
+message PackageTable {
+  repeated PackageParts package_parts = 1;
+}
+
+message PackageParts {
+    required string package_fq_name = 1;
+    repeated string class_name = 2;
+}

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

@@ -49,11 +49,11 @@ public class LazyJavaPackageScope(
             = c.components.kotlinClassFinder.findKotlinClass(PackageClassUtils.getPackageClassId(packageFragment.fqName))
 
     public val kotlinBinaryClasses: List<KotlinJvmBinaryClass> by lazy {
-        val files = c.components.packageMapper.findPackageParts(jPackage.getFqName().asString().replace('.', '/'))
+        val simpleNames = c.components.packageMapper.findPackageParts(jPackage.getFqName().asString())
         val packageClassId = PackageClassUtils.getPackageClassId(packageFragment.fqName).packageFqName
 
-        files.map {
-            val classId = ClassId(packageClassId, Name.identifierNoValidate(it.substringAfterLast("/")))
+        simpleNames.map {
+            val classId = ClassId(packageClassId, Name.identifier(it))
             c.components.kotlinClassFinder.findKotlinClass(classId)
         }.filterNotNull()
     }

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

@@ -16,23 +16,30 @@
 
 package org.jetbrains.kotlin.load.kotlin
 
+import org.jetbrains.kotlin.serialization.jvm.JvmPackageTable
 import java.io.Writer
 
-public class ModuleMapping(val moduleMapping: String) {
+public class ModuleMapping(val proto: ByteArray? = null) {
 
-    val package2Parts = hashMapOf<String, PackageParts>()
+    val packageFqName2Parts = hashMapOf<String, PackageParts>()
 
     init {
-        for (i in moduleMapping.split("\n")) {
-            if(i.isEmpty()) continue
-            val (pakage, facade) = i.split("->")
-            val miniFacades = package2Parts.getOrPut(pakage, { PackageParts(pakage) })
-            miniFacades.parts.add(facade)
+        if (proto != null) {
+            val parseFrom: JvmPackageTable.PackageTable? = JvmPackageTable.PackageTable.parseFrom(proto)
+            if (parseFrom != null) {
+                parseFrom.packagePartsList.map {
+                    val packageParts = PackageParts(it.packageFqName)
+                    packageFqName2Parts.put(it.packageFqName, packageParts)
+                    it.classNameList.map {
+                        packageParts.parts.add(it)
+                    }
+                }
+            }
         }
     }
 
-    fun findPackageParts(internalPackageName: String): PackageParts? {
-        return package2Parts[internalPackageName]
+    fun findPackageParts(packageFqName: String): PackageParts? {
+        return packageFqName2Parts[packageFqName]
     }
 
     companion object {
@@ -40,22 +47,16 @@ public class ModuleMapping(val moduleMapping: String) {
     }
 }
 
-public class PackageParts(val packageInternalName: String) {
+public class PackageParts(val packageFqName: String) {
 
     val parts = linkedSetOf<String>()
 
-    fun serialize(out: Writer) {
-        for (i in parts) {
-            out.write("$packageInternalName->$i\n")
-        }
-    }
-
     override fun equals(other: Any?): Boolean {
         if (other !is PackageParts) {
             return false;
         }
 
-        if (other.packageInternalName != packageInternalName) {
+        if (other.packageFqName != packageFqName) {
             return false;
         }
 
@@ -73,6 +74,18 @@ public class PackageParts(val packageInternalName: String) {
     }
 
     override fun hashCode(): Int {
-        return packageInternalName.hashCode() / 3 + parts.size() / 3 + (parts.firstOrNull()?.hashCode() ?: 0) / 3
+        return packageFqName.hashCode() / 3 + parts.size() / 3 + (parts.firstOrNull()?.hashCode() ?: 0) / 3
     }
-}
+
+    companion object {
+        @jvmStatic public fun PackageParts.serialize(builder : JvmPackageTable.PackageTable.Builder) {
+            if (this.parts.isNotEmpty()) {
+                val packageParts = JvmPackageTable.PackageParts.newBuilder()
+                packageParts.setPackageFqName(this.packageFqName)
+                packageParts.addAllClassName(this.parts.sorted())
+                builder.addPackageParts(packageParts)
+            }
+        }
+    }
+}
+