Merge module 'serialization.jvm' into 'descriptor.loader.java'

It was very small and there proved to be no point in separation of loading Java
classes and deserializing Kotlin classes

.idea/artifacts/KotlinBarePlugin.xml

@@ -16,7 +16,6 @@
           <element id="module-output" name="bare-plugin" />
           <element id="module-output" name="descriptor.loader.java" />
           <element id="module-output" name="frontend.java" />
-          <element id="module-output" name="serialization.jvm" />
           <element id="module-output" name="descriptors" />
         </element>
         <element id="directory" name="jps">

.idea/artifacts/KotlinPlugin.xml

@@ -26,7 +26,6 @@
           <element id="module-output" name="idea-jps-common" />
           <element id="module-output" name="preloader" />
           <element id="module-output" name="serialization" />
-          <element id="module-output" name="serialization.jvm" />
           <element id="module-output" name="backend-common" />
           <element id="library" level="project" name="builtins" />
           <element id="module-output" name="js.dart-ast" />

.idea/modules.xml

@@ -49,7 +49,6 @@
       <module fileurl="file://$PROJECT_DIR$/core/reflection.jvm/reflection.jvm.iml" filepath="$PROJECT_DIR$/core/reflection.jvm/reflection.jvm.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/core/runtime.jvm/runtime.jvm.iml" filepath="$PROJECT_DIR$/core/runtime.jvm/runtime.jvm.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/core/serialization/serialization.iml" filepath="$PROJECT_DIR$/core/serialization/serialization.iml" group="core" />
-      <module fileurl="file://$PROJECT_DIR$/core/serialization.jvm/serialization.jvm.iml" filepath="$PROJECT_DIR$/core/serialization.jvm/serialization.jvm.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/compiler/util/util.iml" filepath="$PROJECT_DIR$/compiler/util/util.iml" />
       <module fileurl="file://$PROJECT_DIR$/core/util.runtime/util.runtime.iml" filepath="$PROJECT_DIR$/core/util.runtime/util.runtime.iml" group="core" />
     </modules>

build.xml

@@ -91,9 +91,8 @@
 
     <dirset id="compilerSources.dirset" dir="${basedir}/">
         <include name="core/descriptors/src"/>
-        <include name="core/serialization/src"/>
         <include name="core/descriptor.loader.java/src"/>
-        <include name="core/serialization.jvm/src"/>
+        <include name="core/serialization/src"/>
         <include name="core/util.runtime/src"/>
         <include name="compiler/frontend/src"/>
         <include name="compiler/frontend.java/src"/>
@@ -120,7 +119,6 @@
         <include name="serialization/**"/>
         <include name="descriptor.loader.java/**"/>
         <include name="frontend.java/**"/>
-        <include name="serialization.jvm/**"/>
         <include name="backend/**"/>
         <include name="backend-common/**"/>
         <include name="cli/**"/>
@@ -203,7 +201,6 @@
             <fileset dir="core/descriptors/src"/>
             <fileset dir="core/descriptor.loader.java/src"/>
             <fileset dir="core/serialization/src"/>
-            <fileset dir="core/serialization.jvm/src"/>
             <fileset dir="core/util.runtime/src"/>
             <fileset dir="compiler/frontend/src"/>
             <fileset dir="compiler/frontend.java/src"/>
@@ -809,7 +806,6 @@
                 <include name="core/descriptors/src"/>
                 <include name="core/descriptors.runtime/src"/>
                 <include name="core/serialization/src"/>
-                <include name="core/serialization.jvm/src"/>
                 <include name="core/util.runtime/src"/>
             </src>
             <class-path>
@@ -897,7 +893,6 @@
                 <fileset dir="${basedir}/core/reflection.jvm/src" includes="**/*"/>
                 <fileset dir="${basedir}/core/runtime.jvm/src" includes="**/*"/>
                 <fileset dir="${basedir}/core/serialization/src" includes="**/*"/>
-                <fileset dir="${basedir}/core/serialization.jvm/src" includes="**/*"/>
                 <fileset dir="${basedir}/core/util.runtime/src" includes="**/*"/>
                 <fileset dir="${basedir}/libraries/stdlib/src" includes="**/*"/>
             </jar-content>

compiler/backend/backend.iml

@@ -12,8 +12,7 @@
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="library" name="javax.inject" level="project" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="backend-common" exported="" />
     <orderEntry type="module" module-name="util" />
   </component>
-</module>
+</module>

compiler/cli/cli.iml

@@ -17,7 +17,6 @@
     <orderEntry type="module" module-name="cli-common" exported="" />
     <orderEntry type="module" module-name="backend-common" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="js.serializer" />
     <orderEntry type="module" module-name="util" />
   </component>

compiler/frontend.java/frontend.java.iml

@@ -11,8 +11,7 @@
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="library" name="javax.inject" level="project" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="descriptor.loader.java" exported="" />
     <orderEntry type="module" module-name="util" />
   </component>
-</module>
+</module>

compiler/tests/compiler-tests.iml

@@ -15,7 +15,6 @@
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="library" name="dx-android" level="project" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="builtins-serializer" />
     <orderEntry type="module" module-name="descriptors.runtime" />
     <orderEntry type="module" module-name="js.frontend" />

compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java

@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/serialization.jvm/src/jvm_descriptors.debug.proto
+// source: core/descriptor.loader.java/src/jvm_descriptors.debug.proto
 
 package org.jetbrains.kotlin.serialization.jvm;
 
@@ -3802,44 +3802,44 @@ public final class DebugJvmProtoBuf {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n6core/serialization.jvm/src/jvm_descrip" +
-      "tors.debug.proto\022&org.jetbrains.kotlin.s" +
-      "erialization.jvm\032.core/serialization/src" +
-      "/descriptors.debug.proto\"\204\002\n\007JvmType\022U\n\016" +
-      "primitive_type\030\001 \001(\0162=.org.jetbrains.kot" +
-      "lin.serialization.jvm.JvmType.PrimitiveT" +
-      "ype\022\025\n\rclass_fq_name\030\002 \001(\005\022\032\n\017array_dime" +
-      "nsion\030\003 \001(\005:\0010\"o\n\rPrimitiveType\022\010\n\004VOID\020" +
-      "\000\022\013\n\007BOOLEAN\020\001\022\010\n\004CHAR\020\002\022\010\n\004BYTE\020\003\022\t\n\005SH" +
-      "ORT\020\004\022\007\n\003INT\020\005\022\t\n\005FLOAT\020\006\022\010\n\004LONG\020\007\022\n\n\006D",
-      "OUBLE\020\010\"\261\001\n\022JvmMethodSignature\022\014\n\004name\030\001" +
-      " \002(\005\022D\n\013return_type\030\002 \002(\0132/.org.jetbrain" +
-      "s.kotlin.serialization.jvm.JvmType\022G\n\016pa" +
-      "rameter_type\030\003 \003(\0132/.org.jetbrains.kotli" +
-      "n.serialization.jvm.JvmType\"\203\001\n\021JvmField" +
-      "Signature\022\014\n\004name\030\001 \002(\005\022=\n\004type\030\002 \002(\0132/." +
-      "org.jetbrains.kotlin.serialization.jvm.J" +
-      "vmType\022!\n\022is_static_in_outer\030\003 \001(\010:\005fals" +
-      "e\"\316\002\n\024JvmPropertySignature\022H\n\005field\030\001 \001(" +
-      "\01329.org.jetbrains.kotlin.serialization.j",
-      "vm.JvmFieldSignature\022T\n\020synthetic_method" +
-      "\030\002 \001(\0132:.org.jetbrains.kotlin.serializat" +
-      "ion.jvm.JvmMethodSignature\022J\n\006getter\030\003 \001" +
-      "(\0132:.org.jetbrains.kotlin.serialization." +
-      "jvm.JvmMethodSignature\022J\n\006setter\030\004 \001(\0132:" +
-      ".org.jetbrains.kotlin.serialization.jvm." +
-      "JvmMethodSignature:\202\001\n\020method_signature\022" +
-      ",.org.jetbrains.kotlin.serialization.Cal" +
-      "lable\030d \001(\0132:.org.jetbrains.kotlin.seria" +
-      "lization.jvm.JvmMethodSignature:\206\001\n\022prop",
-      "erty_signature\022,.org.jetbrains.kotlin.se" +
-      "rialization.Callable\030e \001(\0132<.org.jetbrai" +
-      "ns.kotlin.serialization.jvm.JvmPropertyS" +
-      "ignature:E\n\017impl_class_name\022,.org.jetbra" +
-      "ins.kotlin.serialization.Callable\030f \001(\005:" +
-      "J\n\005index\022;.org.jetbrains.kotlin.serializ" +
-      "ation.Callable.ValueParameter\030d \001(\005B\022B\020D" +
-      "ebugJvmProtoBuf"
+      "\n;core/descriptor.loader.java/src/jvm_de" +
+      "scriptors.debug.proto\022&org.jetbrains.kot" +
+      "lin.serialization.jvm\032.core/serializatio" +
+      "n/src/descriptors.debug.proto\"\204\002\n\007JvmTyp" +
+      "e\022U\n\016primitive_type\030\001 \001(\0162=.org.jetbrain" +
+      "s.kotlin.serialization.jvm.JvmType.Primi" +
+      "tiveType\022\025\n\rclass_fq_name\030\002 \001(\005\022\032\n\017array" +
+      "_dimension\030\003 \001(\005:\0010\"o\n\rPrimitiveType\022\010\n\004" +
+      "VOID\020\000\022\013\n\007BOOLEAN\020\001\022\010\n\004CHAR\020\002\022\010\n\004BYTE\020\003\022" +
+      "\t\n\005SHORT\020\004\022\007\n\003INT\020\005\022\t\n\005FLOAT\020\006\022\010\n\004LONG\020\007",
+      "\022\n\n\006DOUBLE\020\010\"\261\001\n\022JvmMethodSignature\022\014\n\004n" +
+      "ame\030\001 \002(\005\022D\n\013return_type\030\002 \002(\0132/.org.jet" +
+      "brains.kotlin.serialization.jvm.JvmType\022" +
+      "G\n\016parameter_type\030\003 \003(\0132/.org.jetbrains." +
+      "kotlin.serialization.jvm.JvmType\"\203\001\n\021Jvm" +
+      "FieldSignature\022\014\n\004name\030\001 \002(\005\022=\n\004type\030\002 \002" +
+      "(\0132/.org.jetbrains.kotlin.serialization." +
+      "jvm.JvmType\022!\n\022is_static_in_outer\030\003 \001(\010:" +
+      "\005false\"\316\002\n\024JvmPropertySignature\022H\n\005field" +
+      "\030\001 \001(\01329.org.jetbrains.kotlin.serializat",
+      "ion.jvm.JvmFieldSignature\022T\n\020synthetic_m" +
+      "ethod\030\002 \001(\0132:.org.jetbrains.kotlin.seria" +
+      "lization.jvm.JvmMethodSignature\022J\n\006gette" +
+      "r\030\003 \001(\0132:.org.jetbrains.kotlin.serializa" +
+      "tion.jvm.JvmMethodSignature\022J\n\006setter\030\004 " +
+      "\001(\0132:.org.jetbrains.kotlin.serialization" +
+      ".jvm.JvmMethodSignature:\202\001\n\020method_signa" +
+      "ture\022,.org.jetbrains.kotlin.serializatio" +
+      "n.Callable\030d \001(\0132:.org.jetbrains.kotlin." +
+      "serialization.jvm.JvmMethodSignature:\206\001\n",
+      "\022property_signature\022,.org.jetbrains.kotl" +
+      "in.serialization.Callable\030e \001(\0132<.org.je" +
+      "tbrains.kotlin.serialization.jvm.JvmProp" +
+      "ertySignature:E\n\017impl_class_name\022,.org.j" +
+      "etbrains.kotlin.serialization.Callable\030f" +
+      " \001(\005:J\n\005index\022;.org.jetbrains.kotlin.ser" +
+      "ialization.Callable.ValueParameter\030d \001(\005" +
+      "B\022B\020DebugJvmProtoBuf"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {

core/descriptor.loader.java/descriptor.loader.java.iml

@@ -7,9 +7,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="library" name="javax.inject" level="project" />
+    <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="util.runtime" />
   </component>
 </module>

core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java

@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/serialization.jvm/src/jvm_descriptors.proto
+// source: core/descriptor.loader.java/src/jvm_descriptors.proto
 
 package org.jetbrains.kotlin.serialization.jvm;
 

core/descriptors.runtime/descriptors.runtime.iml

@@ -10,7 +10,6 @@
     <orderEntry type="module" module-name="descriptor.loader.java" exported="" />
     <orderEntry type="module" module-name="descriptors" exported="" />
     <orderEntry type="module" module-name="serialization" exported="" />
-    <orderEntry type="module" module-name="serialization.jvm" exported="" />
     <orderEntry type="module" module-name="util.runtime" />
   </component>
 </module>

core/serialization.jvm/serialization.jvm.iml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="util.runtime" />
-  </component>
-</module>

generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt

@@ -31,10 +31,8 @@ import java.util.regex.Pattern
 // You may need to provide custom path to protoc executable, just modify this constant:
 val PROTOC_EXE = "protoc"
 
-public data class ProtoPath(
-        public val file: String,
-        public val outPath: String
-) {
+public class ProtoPath(public val file: String) {
+    public val outPath: String = File(file).getParent()
     public val packageName: String = findFirst(Pattern.compile("package (.+);"))
     public val className: String = findFirst(Pattern.compile("option java_outer_classname = \"(.+)\";"))
     public val debugClassName: String = "Debug$className"
@@ -49,10 +47,10 @@ public data class ProtoPath(
 }
 
 public val PROTO_PATHS: List<ProtoPath> = listOf(
-        ProtoPath("core/serialization/src/descriptors.proto", "core/serialization/src"),
-        ProtoPath("core/serialization/src/builtins.proto", "core/serialization/src"),
-        ProtoPath("js/js.serializer/src/js.proto", "js/js.serializer/src"),
-        ProtoPath("core/serialization.jvm/src/jvm_descriptors.proto", "core/serialization.jvm/src")
+        ProtoPath("core/serialization/src/descriptors.proto"),
+        ProtoPath("core/serialization/src/builtins.proto"),
+        ProtoPath("js/js.serializer/src/js.proto"),
+        ProtoPath("core/descriptor.loader.java/src/jvm_descriptors.proto")
 )
 
 fun main(args: Array<String>) {

idea/idea-analysis/idea-analysis.iml

@@ -15,7 +15,6 @@
     <orderEntry type="library" scope="PROVIDED" name="java-i18n" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="eval4j" />
     <orderEntry type="library" name="intellij-core-analysis" level="project" />
     <orderEntry type="module-library">

idea/idea.iml

@@ -35,7 +35,6 @@
     <orderEntry type="library" scope="PROVIDED" name="java-i18n" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="library" scope="PROVIDED" name="maven" level="project" />
     <orderEntry type="module" module-name="eval4j" />
     <orderEntry type="module" module-name="idea-analysis" exported="" />

jps-plugin/jps-plugin.iml

@@ -17,7 +17,6 @@
     <orderEntry type="module" module-name="descriptors" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
     <orderEntry type="library" name="asm" level="project" />
     <orderEntry type="module" module-name="util" />

libraries/tools/kotlin-reflect/pom.xml

@@ -56,7 +56,6 @@
                                     <fileset dir="${basedir}/../../../core/descriptors.runtime/src"/>
                                     <fileset dir="${basedir}/../../../core/reflection.jvm/src"/>
                                     <fileset dir="${basedir}/../../../core/serialization/src"/>
-                                    <fileset dir="${basedir}/../../../core/serialization.jvm/src"/>
                                     <fileset dir="${basedir}/../../../core/util.runtime/src"/>
                                 </copy>
                             </target>