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

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() {