Rename source set "descriptor.loader.java" -> "descriptors.jvm"

The new name is more convenient and precise because this module is no
longer only about loading declarations from Java, it also contains
implementation of loading Kotlin declarations from .class files, as well
as type mapping abstractions, JVM ABI specifications, etc.

build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmPackageTable.java

@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/descriptor.loader.java/src/jvm_package_table.debug.proto
+// source: core/descriptors.jvm/src/jvm_package_table.debug.proto
 
 package org.jetbrains.kotlin.serialization.jvm;
 
@@ -3379,21 +3379,21 @@ public final class DebugJvmPackageTable {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n=core/descriptor.loader.java/src/jvm_pa" +
+      "\n6core/descriptors.jvm/src/jvm_package_t" +
-      "ckage_table.debug.proto\022&org.jetbrains.k" +
+      "able.debug.proto\022&org.jetbrains.kotlin.s" +
-      "otlin.serialization.jvm\"\303\001\n\014PackageTable" +
+      "erialization.jvm\"\303\001\n\014PackageTable\022K\n\rpac" +
-      "\022K\n\rpackage_parts\030\001 \003(\01324.org.jetbrains." +
+      "kage_parts\030\001 \003(\01324.org.jetbrains.kotlin." +
-      "kotlin.serialization.jvm.PackageParts\022L\n" +
+      "serialization.jvm.PackageParts\022L\n\016metada" +
-      "\016metadata_parts\030\002 \003(\01324.org.jetbrains.ko" +
+      "ta_parts\030\002 \003(\01324.org.jetbrains.kotlin.se" +
-      "tlin.serialization.jvm.PackageParts\022\030\n\020j" +
+      "rialization.jvm.PackageParts\022\030\n\020jvm_pack" +
-      "vm_package_name\030\003 \003(\t\"\366\001\n\014PackageParts\022\027" +
+      "age_name\030\003 \003(\t\"\366\001\n\014PackageParts\022\027\n\017packa" +
-      "\n\017package_fq_name\030\001 \002(\t\022\030\n\020short_class_n" +
+      "ge_fq_name\030\001 \002(\t\022\030\n\020short_class_name\030\002 \003" +
-      "ame\030\002 \003(\t\022*\n\036multifile_facade_short_name",
+      "(\t\022*\n\036multifile_facade_short_name_id\030\003 \003",
-      "_id\030\003 \003(\005B\002\020\001\022#\n\033multifile_facade_short_" +
+      "(\005B\002\020\001\022#\n\033multifile_facade_short_name\030\004 " +
-      "name\030\004 \003(\t\022.\n&class_with_jvm_package_nam" +
+      "\003(\t\022.\n&class_with_jvm_package_name_short" +
-      "e_short_name\030\005 \003(\t\0222\n&class_with_jvm_pac" +
+      "_name\030\005 \003(\t\0222\n&class_with_jvm_package_na" +
-      "kage_name_package_id\030\006 \003(\005B\002\020\001B\026B\024DebugJ" +
+      "me_package_id\030\006 \003(\005B\002\020\001B\026B\024DebugJvmPacka" +
-      "vmPackageTable"
+      "geTable"
     };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {

build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java

@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/descriptor.loader.java/src/jvm_descriptors.debug.proto
+// source: core/descriptors.jvm/src/jvm_descriptors.debug.proto
 
 package org.jetbrains.kotlin.serialization.jvm;
 
@@ -4655,62 +4655,62 @@ public final class DebugJvmProtoBuf {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n;core/descriptor.loader.java/src/jvm_de" +
+      "\n4core/descriptors.jvm/src/jvm_descripto" +
-      "scriptors.debug.proto\022&org.jetbrains.kot" +
+      "rs.debug.proto\022&org.jetbrains.kotlin.ser" +
-      "lin.serialization.jvm\0320core/deserializat" +
+      "ialization.jvm\0320core/deserialization/src" +
-      "ion/src/ext_options.debug.proto\0320core/de" +
+      "/ext_options.debug.proto\0320core/deseriali" +
-      "serialization/src/descriptors.debug.prot" +
+      "zation/src/descriptors.debug.proto\"\244\003\n\020S" +
-      "o\"\244\003\n\020StringTableTypes\022O\n\006record\030\001 \003(\0132?" +
+      "tringTableTypes\022O\n\006record\030\001 \003(\0132?.org.je" +
-      ".org.jetbrains.kotlin.serialization.jvm." +
+      "tbrains.kotlin.serialization.jvm.StringT" +
-      "StringTableTypes.Record\022\026\n\nlocal_name\030\005 " +
+      "ableTypes.Record\022\026\n\nlocal_name\030\005 \003(\005B\002\020\001" +
-      "\003(\005B\002\020\001\032\246\002\n\006Record\022\020\n\005range\030\001 \001(\005:\0011\022\030\n\020" +
+      "\032\246\002\n\006Record\022\020\n\005range\030\001 \001(\005:\0011\022\030\n\020predefi" +
-      "predefined_index\030\002 \001(\005\022\016\n\006string\030\006 \001(\t\022b",
+      "ned_index\030\002 \001(\005\022\016\n\006string\030\006 \001(\t\022b\n\topera",
-      "\n\toperation\030\003 \001(\0162I.org.jetbrains.kotlin" +
+      "tion\030\003 \001(\0162I.org.jetbrains.kotlin.serial" +
-      ".serialization.jvm.StringTableTypes.Reco" +
+      "ization.jvm.StringTableTypes.Record.Oper" +
-      "rd.Operation:\004NONE\022\033\n\017substring_index\030\004 " +
+      "ation:\004NONE\022\033\n\017substring_index\030\004 \003(\005B\002\020\001" +
-      "\003(\005B\002\020\001\022\030\n\014replace_char\030\005 \003(\005B\002\020\001\"E\n\tOpe" +
+      "\022\030\n\014replace_char\030\005 \003(\005B\002\020\001\"E\n\tOperation\022" +
-      "ration\022\010\n\004NONE\020\000\022\030\n\024INTERNAL_TO_CLASS_ID" +
+      "\010\n\004NONE\020\000\022\030\n\024INTERNAL_TO_CLASS_ID\020\001\022\024\n\020D" +
-      "\020\001\022\024\n\020DESC_TO_CLASS_ID\020\002\"<\n\022JvmMethodSig" +
+      "ESC_TO_CLASS_ID\020\002\"<\n\022JvmMethodSignature\022" +
-      "nature\022\022\n\004name\030\001 \001(\005B\004\230\265\030\001\022\022\n\004desc\030\002 \001(\005" +
+      "\022\n\004name\030\001 \001(\005B\004\230\265\030\001\022\022\n\004desc\030\002 \001(\005B\004\230\265\030\001\"" +
-      "B\004\230\265\030\001\";\n\021JvmFieldSignature\022\022\n\004name\030\001 \001(" +
+      ";\n\021JvmFieldSignature\022\022\n\004name\030\001 \001(\005B\004\230\265\030\001" +
-      "\005B\004\230\265\030\001\022\022\n\004desc\030\002 \001(\005B\004\230\265\030\001\"\316\002\n\024JvmPrope" +
+      "\022\022\n\004desc\030\002 \001(\005B\004\230\265\030\001\"\316\002\n\024JvmPropertySign" +
-      "rtySignature\022H\n\005field\030\001 \001(\01329.org.jetbra",
+      "ature\022H\n\005field\030\001 \001(\01329.org.jetbrains.kot",
-      "ins.kotlin.serialization.jvm.JvmFieldSig" +
+      "lin.serialization.jvm.JvmFieldSignature\022" +
-      "nature\022T\n\020synthetic_method\030\002 \001(\0132:.org.j" +
+      "T\n\020synthetic_method\030\002 \001(\0132:.org.jetbrain" +
-      "etbrains.kotlin.serialization.jvm.JvmMet" +
+      "s.kotlin.serialization.jvm.JvmMethodSign" +
-      "hodSignature\022J\n\006getter\030\003 \001(\0132:.org.jetbr" +
+      "ature\022J\n\006getter\030\003 \001(\0132:.org.jetbrains.ko" +
-      "ains.kotlin.serialization.jvm.JvmMethodS" +
+      "tlin.serialization.jvm.JvmMethodSignatur" +
-      "ignature\022J\n\006setter\030\004 \001(\0132:.org.jetbrains" +
+      "e\022J\n\006setter\030\004 \001(\0132:.org.jetbrains.kotlin" +
-      ".kotlin.serialization.jvm.JvmMethodSigna" +
+      ".serialization.jvm.JvmMethodSignature:\212\001" +
-      "ture:\212\001\n\025constructor_signature\022/.org.jet" +
+      "\n\025constructor_signature\022/.org.jetbrains." +
-      "brains.kotlin.serialization.Constructor\030" +
+      "kotlin.serialization.Constructor\030d \001(\0132:" +
-      "d \001(\0132:.org.jetbrains.kotlin.serializati",
+      ".org.jetbrains.kotlin.serialization.jvm.",
-      "on.jvm.JvmMethodSignature:\202\001\n\020method_sig" +
+      "JvmMethodSignature:\202\001\n\020method_signature\022" +
-      "nature\022,.org.jetbrains.kotlin.serializat" +
+      ",.org.jetbrains.kotlin.serialization.Fun" +
-      "ion.Function\030d \001(\0132:.org.jetbrains.kotli" +
+      "ction\030d \001(\0132:.org.jetbrains.kotlin.seria" +
-      "n.serialization.jvm.JvmMethodSignature:\206" +
+      "lization.jvm.JvmMethodSignature:\206\001\n\022prop" +
-      "\001\n\022property_signature\022,.org.jetbrains.ko" +
+      "erty_signature\022,.org.jetbrains.kotlin.se" +
-      "tlin.serialization.Property\030d \001(\0132<.org." +
+      "rialization.Property\030d \001(\0132<.org.jetbrai" +
-      "jetbrains.kotlin.serialization.jvm.JvmPr" +
+      "ns.kotlin.serialization.jvm.JvmPropertyS" +
-      "opertySignature:q\n\017type_annotation\022(.org" +
+      "ignature:q\n\017type_annotation\022(.org.jetbra" +
-      ".jetbrains.kotlin.serialization.Type\030d \003" +
+      "ins.kotlin.serialization.Type\030d \003(\0132..or" +
-      "(\0132..org.jetbrains.kotlin.serialization.",
+      "g.jetbrains.kotlin.serialization.Annotat",
-      "Annotation:8\n\006is_raw\022(.org.jetbrains.kot" +
+      "ion:8\n\006is_raw\022(.org.jetbrains.kotlin.ser" +
-      "lin.serialization.Type\030e \001(\010:\204\001\n\031type_pa" +
+      "ialization.Type\030e \001(\010:\204\001\n\031type_parameter" +
-      "rameter_annotation\0221.org.jetbrains.kotli" +
+      "_annotation\0221.org.jetbrains.kotlin.seria" +
-      "n.serialization.TypeParameter\030d \003(\0132..or" +
+      "lization.TypeParameter\030d \003(\0132..org.jetbr" +
-      "g.jetbrains.kotlin.serialization.Annotat" +
+      "ains.kotlin.serialization.Annotation:J\n\021" +
-      "ion:J\n\021class_module_name\022).org.jetbrains" +
+      "class_module_name\022).org.jetbrains.kotlin" +
-      ".kotlin.serialization.Class\030e \001(\005B\004\230\265\030\001:" +
+      ".serialization.Class\030e \001(\005B\004\230\265\030\001:u\n\024clas" +
-      "u\n\024class_local_variable\022).org.jetbrains." +
+      "s_local_variable\022).org.jetbrains.kotlin." +
-      "kotlin.serialization.Class\030f \003(\0132,.org.j" +
+      "serialization.Class\030f \003(\0132,.org.jetbrain" +
-      "etbrains.kotlin.serialization.Property:N",
+      "s.kotlin.serialization.Property:N\n\023packa",
-      "\n\023package_module_name\022+.org.jetbrains.ko" +
+      "ge_module_name\022+.org.jetbrains.kotlin.se" +
-      "tlin.serialization.Package\030e \001(\005B\004\230\265\030\001:y" +
+      "rialization.Package\030e \001(\005B\004\230\265\030\001:y\n\026packa" +
-      "\n\026package_local_variable\022+.org.jetbrains" +
+      "ge_local_variable\022+.org.jetbrains.kotlin" +
-      ".kotlin.serialization.Package\030f \003(\0132,.or" +
+      ".serialization.Package\030f \003(\0132,.org.jetbr" +
-      "g.jetbrains.kotlin.serialization.Propert" +
+      "ains.kotlin.serialization.PropertyB\022B\020De" +
-      "yB\022B\020DebugJvmProtoBuf"
+      "bugJvmProtoBuf"
     };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {

build.xml

@@ -79,8 +79,8 @@
     <typedef name="skip" classname="com.intellij.ant.ClassFilterAnnotationRegexp" classpathref="javac2.classpath" loaderref="javac2.loader"/>
 
     <dirset id="compilerSources.dirset" dir="${basedir}/">
-        <include name="core/descriptor.loader.java/src"/>
         <include name="core/descriptors/src"/>
+        <include name="core/descriptors.jvm/src"/>
         <include name="core/deserialization/src"/>
         <include name="core/util.runtime/src"/>
         <include name="compiler/backend/src"/>
@@ -125,7 +125,7 @@
         <include name="descriptors/**"/>
         <include name="deserialization/**"/>
         <include name="serialization/**"/>
-        <include name="descriptor.loader.java/**"/>
+        <include name="descriptors.jvm/**"/>
         <include name="frontend.java/**"/>
         <include name="backend/**"/>
         <include name="backend-common/**"/>
@@ -246,8 +246,8 @@
     <target name="compiler-sources">
         <jar jarfile="${output}/kotlin-compiler-sources.jar">
             <!-- TODO How to convert it from pathset or dirset ? -->
-            <fileset dir="core/descriptor.loader.java/src"/>
             <fileset dir="core/descriptors/src"/>
+            <fileset dir="core/descriptors.jvm/src"/>
             <fileset dir="core/deserialization/src"/>
             <fileset dir="core/util.runtime/src"/>
             <fileset dir="compiler/backend/src"/>
@@ -372,7 +372,7 @@
                     <include name="kotlin/**"/>
                 </fileset>
                 <fileset dir="${basedir}/core/deserialization/src" includes="META-INF/services/**"/>
-                <fileset dir="${basedir}/core/descriptor.loader.java/src" includes="META-INF/services/**"/>
+                <fileset dir="${basedir}/core/descriptors.jvm/src" includes="META-INF/services/**"/>
                 <fileset dir="${basedir}/compiler/frontend.java/src" includes="META-INF/services/**"/>
                 <fileset dir="${basedir}/compiler/backend/src" includes="META-INF/services/**"/>
                 <fileset dir="${basedir}/compiler/cli/src" includes="META-INF/services/**"/>

core/build.gradle.kts

@@ -16,11 +16,11 @@ dependencies {
 
 sourceSets {
     "main" {
-        java.srcDirs("descriptor.loader.java/src",
+        java.srcDirs("descriptors/src",
-                     "descriptors/src",
+                     "descriptors.jvm/src",
                      "descriptors.runtime/src",
                      "deserialization/src")
-        resources.srcDirs("descriptor.loader.java/src", "deserialization/src").apply { include("META-INF/**") }
+        resources.srcDirs("descriptors.jvm/src", "deserialization/src").apply { include("META-INF/**") }
     }
     "test" {}
 }

core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmPackageTable.java

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

core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java

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