Move module 'serialization' to core/

.idea/modules.xml

@@ -36,7 +36,7 @@
       <module fileurl="file://$PROJECT_DIR$/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml" filepath="$PROJECT_DIR$/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml" group="ide/jps" />
       <module fileurl="file://$PROJECT_DIR$/compiler/preloader/preloader.iml" filepath="$PROJECT_DIR$/compiler/preloader/preloader.iml" group="compiler/cli" />
       <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$/compiler/frontend/serialization/serialization.iml" filepath="$PROJECT_DIR$/compiler/frontend/serialization/serialization.iml" group="compiler" />
+      <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.java/serialization.java.iml" filepath="$PROJECT_DIR$/core/serialization.java/serialization.java.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" />

build.xml

@@ -61,7 +61,7 @@
     <dirset id="compilerSources.dirset" dir="${basedir}/">
         <include name="compiler/frontend/src"/>
         <include name="core/descriptors/src"/>
-        <include name="compiler/frontend/serialization/src"/>
+        <include name="core/serialization/src"/>
         <include name="core/descriptor.loader.java/src"/>
         <include name="compiler/frontend.java/src"/>
         <include name="core/serialization.java/src"/>

compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugJavaProtoBuf.java

@@ -3796,45 +3796,45 @@ public final class DebugJavaProtoBuf {
     java.lang.String[] descriptorData = {
       "\n8core/serialization.java/src/java_descr" +
       "iptors.debug.proto\022+org.jetbrains.jet.de" +
-      "scriptors.serialization\032;compiler/fronte" +
+      "scriptors.serialization\032.core/serializat" +
-      "nd/serialization/src/descriptors.debug.p" +
+      "ion/src/descriptors.debug.proto\"\213\002\n\010Java" +
-      "roto\"\213\002\n\010JavaType\022[\n\016primitive_type\030\001 \001(" +
+      "Type\022[\n\016primitive_type\030\001 \001(\0162C.org.jetbr" +
-      "\0162C.org.jetbrains.jet.descriptors.serial" +
+      "ains.jet.descriptors.serialization.JavaT" +
-      "ization.JavaType.PrimitiveType\022\025\n\rclass_" +
+      "ype.PrimitiveType\022\025\n\rclass_fq_name\030\002 \001(\005" +
-      "fq_name\030\002 \001(\005\022\032\n\017array_dimension\030\003 \001(\005:\001" +
+      "\022\032\n\017array_dimension\030\003 \001(\005:\0010\"o\n\rPrimitiv" +
-      "0\"o\n\rPrimitiveType\022\010\n\004VOID\020\000\022\013\n\007BOOLEAN\020" +
+      "eType\022\010\n\004VOID\020\000\022\013\n\007BOOLEAN\020\001\022\010\n\004CHAR\020\002\022\010" +
-      "\001\022\010\n\004CHAR\020\002\022\010\n\004BYTE\020\003\022\t\n\005SHORT\020\004\022\007\n\003INT\020",
+      "\n\004BYTE\020\003\022\t\n\005SHORT\020\004\022\007\n\003INT\020\005\022\t\n\005FLOAT\020\006\022",
-      "\005\022\t\n\005FLOAT\020\006\022\010\n\004LONG\020\007\022\n\n\006DOUBLE\020\010\"\276\001\n\023J" +
+      "\010\n\004LONG\020\007\022\n\n\006DOUBLE\020\010\"\276\001\n\023JavaMethodSign" +
-      "avaMethodSignature\022\014\n\004name\030\001 \002(\005\022J\n\013retu" +
+      "ature\022\014\n\004name\030\001 \002(\005\022J\n\013return_type\030\002 \002(\013" +
-      "rn_type\030\002 \002(\01325.org.jetbrains.jet.descri" +
+      "25.org.jetbrains.jet.descriptors.seriali" +
-      "ptors.serialization.JavaType\022M\n\016paramete" +
+      "zation.JavaType\022M\n\016parameter_type\030\003 \003(\0132" +
-      "r_type\030\003 \003(\01325.org.jetbrains.jet.descrip" +
+      "5.org.jetbrains.jet.descriptors.serializ" +
-      "tors.serialization.JavaType\"\212\001\n\022JavaFiel" +
+      "ation.JavaType\"\212\001\n\022JavaFieldSignature\022\014\n" +
-      "dSignature\022\014\n\004name\030\001 \002(\005\022C\n\004type\030\002 \002(\01325" +
+      "\004name\030\001 \002(\005\022C\n\004type\030\002 \002(\01325.org.jetbrain" +
-      ".org.jetbrains.jet.descriptors.serializa" +
+      "s.jet.descriptors.serialization.JavaType" +
-      "tion.JavaType\022!\n\022is_static_in_outer\030\003 \001(" +
+      "\022!\n\022is_static_in_outer\030\003 \001(\010:\005false\"\347\002\n\025" +
-      "\010:\005false\"\347\002\n\025JavaPropertySignature\022N\n\005fi",
+      "JavaPropertySignature\022N\n\005field\030\001 \001(\0132?.o",
-      "eld\030\001 \001(\0132?.org.jetbrains.jet.descriptor" +
+      "rg.jetbrains.jet.descriptors.serializati" +
-      "s.serialization.JavaFieldSignature\022Z\n\020sy" +
+      "on.JavaFieldSignature\022Z\n\020synthetic_metho" +
-      "nthetic_method\030\002 \001(\0132@.org.jetbrains.jet" +
+      "d\030\002 \001(\0132@.org.jetbrains.jet.descriptors." +
-      ".descriptors.serialization.JavaMethodSig" +
+      "serialization.JavaMethodSignature\022P\n\006get" +
-      "nature\022P\n\006getter\030\003 \001(\0132@.org.jetbrains.j" +
+      "ter\030\003 \001(\0132@.org.jetbrains.jet.descriptor" +
-      "et.descriptors.serialization.JavaMethodS" +
+      "s.serialization.JavaMethodSignature\022P\n\006s" +
-      "ignature\022P\n\006setter\030\004 \001(\0132@.org.jetbrains" +
+      "etter\030\004 \001(\0132@.org.jetbrains.jet.descript" +
-      ".jet.descriptors.serialization.JavaMetho" +
+      "ors.serialization.JavaMethodSignature:\221\001" +
-      "dSignature:\221\001\n\020method_signature\0225.org.je" +
+      "\n\020method_signature\0225.org.jetbrains.jet.d" +
-      "tbrains.jet.descriptors.serialization.Ca",
+      "escriptors.serialization.Callable\030d \001(\0132",
-      "llable\030d \001(\0132@.org.jetbrains.jet.descrip" +
+      "@.org.jetbrains.jet.descriptors.serializ" +
-      "tors.serialization.JavaMethodSignature:\225" +
+      "ation.JavaMethodSignature:\225\001\n\022property_s" +
-      "\001\n\022property_signature\0225.org.jetbrains.je" +
+      "ignature\0225.org.jetbrains.jet.descriptors" +
-      "t.descriptors.serialization.Callable\030e \001" +
+      ".serialization.Callable\030e \001(\0132B.org.jetb" +
-      "(\0132B.org.jetbrains.jet.descriptors.seria" +
+      "rains.jet.descriptors.serialization.Java" +
-      "lization.JavaPropertySignature:N\n\017impl_c" +
+      "PropertySignature:N\n\017impl_class_name\0225.o" +
-      "lass_name\0225.org.jetbrains.jet.descriptor" +
+      "rg.jetbrains.jet.descriptors.serializati" +
-      "s.serialization.Callable\030f \001(\005:S\n\005index\022" +
+      "on.Callable\030f \001(\005:S\n\005index\022D.org.jetbrai" +
-      "D.org.jetbrains.jet.descriptors.serializ" +
+      "ns.jet.descriptors.serialization.Callabl" +
-      "ation.Callable.ValueParameter\030d \001(\005B\023B\021D",
+      "e.ValueParameter\030d \001(\005B\023B\021DebugJavaProto",
-      "ebugJavaProtoBuf"
+      "Buf"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {

compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugProtoBuf.java

@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: compiler/frontend/serialization/src/descriptors.debug.proto
+// source: core/serialization/src/descriptors.debug.proto
 
 package org.jetbrains.jet.descriptors.serialization;
 
@@ -10307,6 +10307,7 @@ public final class DebugProtoBuf {
      *MemberKind
      *hasGetter
      *hasSetter
+     *hasConstant
      * </pre>
      */
     boolean hasFlags();
@@ -10322,6 +10323,7 @@ public final class DebugProtoBuf {
      *MemberKind
      *hasGetter
      *hasSetter
+     *hasConstant
      * </pre>
      */
     int getFlags();
@@ -11852,6 +11854,7 @@ public final class DebugProtoBuf {
      *MemberKind
      *hasGetter
      *hasSetter
+     *hasConstant
      * </pre>
      */
     public boolean hasFlags() {
@@ -11869,6 +11872,7 @@ public final class DebugProtoBuf {
      *MemberKind
      *hasGetter
      *hasSetter
+     *hasConstant
      * </pre>
      */
     public int getFlags() {
@@ -12667,6 +12671,7 @@ public final class DebugProtoBuf {
        *MemberKind
        *hasGetter
        *hasSetter
+       *hasConstant
        * </pre>
        */
       public boolean hasFlags() {
@@ -12684,6 +12689,7 @@ public final class DebugProtoBuf {
        *MemberKind
        *hasGetter
        *hasSetter
+       *hasConstant
        * </pre>
        */
       public int getFlags() {
@@ -12701,6 +12707,7 @@ public final class DebugProtoBuf {
        *MemberKind
        *hasGetter
        *hasSetter
+       *hasConstant
        * </pre>
        */
       public Builder setFlags(int value) {
@@ -12721,6 +12728,7 @@ public final class DebugProtoBuf {
        *MemberKind
        *hasGetter
        *hasSetter
+       *hasConstant
        * </pre>
        */
       public Builder clearFlags() {
@@ -13830,85 +13838,85 @@ public final class DebugProtoBuf {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n;compiler/frontend/serialization/src/de" +
+      "\n.core/serialization/src/descriptors.deb" +
-      "scriptors.debug.proto\022+org.jetbrains.jet" +
+      "ug.proto\022+org.jetbrains.jet.descriptors." +
-      ".descriptors.serialization\"\037\n\017SimpleName" +
+      "serialization\"\037\n\017SimpleNameTable\022\014\n\004name" +
-      "Table\022\014\n\004name\030\001 \003(\t\"\317\002\n\022QualifiedNameTab" +
+      "\030\001 \003(\t\"\317\002\n\022QualifiedNameTable\022e\n\016qualifi" +
-      "le\022e\n\016qualified_name\030\001 \003(\0132M.org.jetbrai" +
+      "ed_name\030\001 \003(\0132M.org.jetbrains.jet.descri" +
-      "ns.jet.descriptors.serialization.Qualifi" +
+      "ptors.serialization.QualifiedNameTable.Q" +
-      "edNameTable.QualifiedName\032\321\001\n\rQualifiedN" +
+      "ualifiedName\032\321\001\n\rQualifiedName\022!\n\025parent" +
-      "ame\022!\n\025parent_qualified_name\030\001 \001(\005:\002-1\022\022" +
+      "_qualified_name\030\001 \001(\005:\002-1\022\022\n\nshort_name\030" +
-      "\n\nshort_name\030\002 \002(\005\022i\n\004kind\030\003 \001(\0162R.org.j" +
+      "\002 \002(\005\022i\n\004kind\030\003 \001(\0162R.org.jetbrains.jet." +
-      "etbrains.jet.descriptors.serialization.Q",
+      "descriptors.serialization.QualifiedNameT",
-      "ualifiedNameTable.QualifiedName.Kind:\007PA" +
+      "able.QualifiedName.Kind:\007PACKAGE\"\036\n\004Kind" +
-      "CKAGE\"\036\n\004Kind\022\t\n\005CLASS\020\000\022\013\n\007PACKAGE\020\001\"\263\004" +
+      "\022\t\n\005CLASS\020\000\022\013\n\007PACKAGE\020\001\"\263\004\n\004Type\022R\n\013con" +
-      "\n\004Type\022R\n\013constructor\030\001 \002(\0132=.org.jetbra" +
+      "structor\030\001 \002(\0132=.org.jetbrains.jet.descr" +
-      "ins.jet.descriptors.serialization.Type.C" +
+      "iptors.serialization.Type.Constructor\022L\n" +
-      "onstructor\022L\n\010argument\030\002 \003(\0132:.org.jetbr" +
+      "\010argument\030\002 \003(\0132:.org.jetbrains.jet.desc" +
-      "ains.jet.descriptors.serialization.Type." +
+      "riptors.serialization.Type.Argument\022\027\n\010n" +
-      "Argument\022\027\n\010nullable\030\003 \001(\010:\005false\032\231\001\n\013Co" +
+      "ullable\030\003 \001(\010:\005false\032\231\001\n\013Constructor\022W\n\004" +
-      "nstructor\022W\n\004kind\030\001 \001(\0162B.org.jetbrains." +
+      "kind\030\001 \001(\0162B.org.jetbrains.jet.descripto" +
-      "jet.descriptors.serialization.Type.Const" +
+      "rs.serialization.Type.Constructor.Kind:\005" +
-      "ructor.Kind:\005CLASS\022\n\n\002id\030\002 \002(\005\"%\n\004Kind\022\t",
+      "CLASS\022\n\n\002id\030\002 \002(\005\"%\n\004Kind\022\t\n\005CLASS\020\000\022\022\n\016",
-      "\n\005CLASS\020\000\022\022\n\016TYPE_PARAMETER\020\001\032\323\001\n\010Argume" +
+      "TYPE_PARAMETER\020\001\032\323\001\n\010Argument\022^\n\nproject" +
-      "nt\022^\n\nprojection\030\001 \001(\0162E.org.jetbrains.j" +
+      "ion\030\001 \001(\0162E.org.jetbrains.jet.descriptor" +
-      "et.descriptors.serialization.Type.Argume" +
+      "s.serialization.Type.Argument.Projection" +
-      "nt.Projection:\003INV\022?\n\004type\030\002 \002(\01321.org.j" +
+      ":\003INV\022?\n\004type\030\002 \002(\01321.org.jetbrains.jet." +
-      "etbrains.jet.descriptors.serialization.T" +
+      "descriptors.serialization.Type\"&\n\nProjec" +
-      "ype\"&\n\nProjection\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003IN" +
+      "tion\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002\"\213\002\n\rTypeP" +
-      "V\020\002\"\213\002\n\rTypeParameter\022\n\n\002id\030\001 \002(\005\022\014\n\004nam" +
+      "arameter\022\n\n\002id\030\001 \002(\005\022\014\n\004name\030\002 \002(\005\022\026\n\007re" +
-      "e\030\002 \002(\005\022\026\n\007reified\030\003 \001(\010:\005false\022Z\n\010varia" +
+      "ified\030\003 \001(\010:\005false\022Z\n\010variance\030\004 \001(\0162C.o" +
-      "nce\030\004 \001(\0162C.org.jetbrains.jet.descriptor" +
-      "s.serialization.TypeParameter.Variance:\003",
-      "INV\022F\n\013upper_bound\030\005 \003(\01321.org.jetbrains" +
-      ".jet.descriptors.serialization.Type\"$\n\010V" +
-      "ariance\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002\"\254\006\n\005Cl" +
-      "ass\022\020\n\005flags\030\001 \001(\005:\0010\022\030\n\020extra_visibilit" +
-      "y\030\002 \001(\t\022\017\n\007fq_name\030\003 \002(\005\022T\n\014class_object" +
-      "\030\004 \001(\0132>.org.jetbrains.jet.descriptors.s" +
-      "erialization.Class.ClassObject\022R\n\016type_p" +
-      "arameter\030\005 \003(\0132:.org.jetbrains.jet.descr" +
-      "iptors.serialization.TypeParameter\022D\n\tsu" +
-      "pertype\030\006 \003(\01321.org.jetbrains.jet.descri",
-      "ptors.serialization.Type\022\031\n\021nested_class" +
-      "_name\030\007 \003(\005\022E\n\006member\030\013 \003(\01325.org.jetbra" +
-      "ins.jet.descriptors.serialization.Callab" +
-      "le\022\022\n\nenum_entry\030\014 \003(\005\022b\n\023primary_constr" +
-      "uctor\030\r \001(\0132E.org.jetbrains.jet.descript" +
-      "ors.serialization.Class.PrimaryConstruct" +
-      "or\032O\n\013ClassObject\022@\n\004data\030\001 \001(\01322.org.je" +
-      "tbrains.jet.descriptors.serialization.Cl" +
-      "ass\032Y\n\022PrimaryConstructor\022C\n\004data\030\001 \001(\0132" +
-      "5.org.jetbrains.jet.descriptors.serializ",
-      "ation.Callable\"p\n\004Kind\022\t\n\005CLASS\020\000\022\t\n\005TRA" +
-      "IT\020\001\022\016\n\nENUM_CLASS\020\002\022\016\n\nENUM_ENTRY\020\003\022\024\n\020" +
-      "ANNOTATION_CLASS\020\004\022\n\n\006OBJECT\020\005\022\020\n\014CLASS_" +
-      "OBJECT\020\006\"P\n\007Package\022E\n\006member\030\001 \003(\01325.or" +
-      "g.jetbrains.jet.descriptors.serializatio" +
-      "n.Callable\"\220\006\n\010Callable\022\r\n\005flags\030\001 \001(\005\022\030" +
-      "\n\020extra_visibility\030\002 \001(\t\022\024\n\014getter_flags" +
-      "\030\t \001(\005\022\024\n\014setter_flags\030\n \001(\005\022R\n\016type_par" +
-      "ameter\030\004 \003(\0132:.org.jetbrains.jet.descrip" +
-      "tors.serialization.TypeParameter\022H\n\rrece",
-      "iver_type\030\005 \001(\01321.org.jetbrains.jet.desc" +
-      "riptors.serialization.Type\022\014\n\004name\030\006 \002(\005" +
-      "\022]\n\017value_parameter\030\007 \003(\0132D.org.jetbrain" +
-      "s.jet.descriptors.serialization.Callable" +
-      ".ValueParameter\022F\n\013return_type\030\010 \002(\01321.o" +
       "rg.jetbrains.jet.descriptors.serializati" +
-      "on.Type\032\305\001\n\016ValueParameter\022\r\n\005flags\030\001 \001(" +
+      "on.TypeParameter.Variance:\003INV\022F\n\013upper_",
-      "\005\022\014\n\004name\030\002 \002(\005\022?\n\004type\030\003 \002(\01321.org.jetb" +
+      "bound\030\005 \003(\01321.org.jetbrains.jet.descript" +
-      "rains.jet.descriptors.serialization.Type" +
+      "ors.serialization.Type\"$\n\010Variance\022\006\n\002IN" +
-      "\022N\n\023vararg_element_type\030\004 \001(\01321.org.jetb",
+      "\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002\"\254\006\n\005Class\022\020\n\005flags\030" +
-      "rains.jet.descriptors.serialization.Type" +
+      "\001 \001(\005:\0010\022\030\n\020extra_visibility\030\002 \001(\t\022\017\n\007fq" +
-      "*\005\010d\020\310\001\"Q\n\nMemberKind\022\017\n\013DECLARATION\020\000\022\021" +
+      "_name\030\003 \002(\005\022T\n\014class_object\030\004 \001(\0132>.org." +
-      "\n\rFAKE_OVERRIDE\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYN" +
+      "jetbrains.jet.descriptors.serialization." +
-      "THESIZED\020\003\":\n\014CallableKind\022\007\n\003FUN\020\000\022\007\n\003V" +
+      "Class.ClassObject\022R\n\016type_parameter\030\005 \003(" +
-      "AL\020\001\022\007\n\003VAR\020\002\022\017\n\013CONSTRUCTOR\020\003*\005\010d\020\310\001*-\n" +
+      "\0132:.org.jetbrains.jet.descriptors.serial" +
-      "\010Modality\022\t\n\005FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRA" +
+      "ization.TypeParameter\022D\n\tsupertype\030\006 \003(\013" +
-      "CT\020\002*M\n\nVisibility\022\014\n\010INTERNAL\020\000\022\013\n\007PRIV" +
+      "21.org.jetbrains.jet.descriptors.seriali",
-      "ATE\020\001\022\r\n\tPROTECTED\020\002\022\n\n\006PUBLIC\020\003\022\t\n\005EXTR" +
+      "zation.Type\022\031\n\021nested_class_name\030\007 \003(\005\022E" +
-      "A\020\004B\022B\rDebugProtoBuf\210\001\000"
+      "\n\006member\030\013 \003(\01325.org.jetbrains.jet.descr" +
+      "iptors.serialization.Callable\022\022\n\nenum_en" +
+      "try\030\014 \003(\005\022b\n\023primary_constructor\030\r \001(\0132E" +
+      ".org.jetbrains.jet.descriptors.serializa" +
+      "tion.Class.PrimaryConstructor\032O\n\013ClassOb" +
+      "ject\022@\n\004data\030\001 \001(\01322.org.jetbrains.jet.d" +
+      "escriptors.serialization.Class\032Y\n\022Primar" +
+      "yConstructor\022C\n\004data\030\001 \001(\01325.org.jetbrai" +
+      "ns.jet.descriptors.serialization.Callabl",
+      "e\"p\n\004Kind\022\t\n\005CLASS\020\000\022\t\n\005TRAIT\020\001\022\016\n\nENUM_" +
+      "CLASS\020\002\022\016\n\nENUM_ENTRY\020\003\022\024\n\020ANNOTATION_CL" +
+      "ASS\020\004\022\n\n\006OBJECT\020\005\022\020\n\014CLASS_OBJECT\020\006\"P\n\007P" +
+      "ackage\022E\n\006member\030\001 \003(\01325.org.jetbrains.j" +
+      "et.descriptors.serialization.Callable\"\220\006" +
+      "\n\010Callable\022\r\n\005flags\030\001 \001(\005\022\030\n\020extra_visib" +
+      "ility\030\002 \001(\t\022\024\n\014getter_flags\030\t \001(\005\022\024\n\014set" +
+      "ter_flags\030\n \001(\005\022R\n\016type_parameter\030\004 \003(\0132" +
+      ":.org.jetbrains.jet.descriptors.serializ" +
+      "ation.TypeParameter\022H\n\rreceiver_type\030\005 \001",
+      "(\01321.org.jetbrains.jet.descriptors.seria" +
+      "lization.Type\022\014\n\004name\030\006 \002(\005\022]\n\017value_par" +
+      "ameter\030\007 \003(\0132D.org.jetbrains.jet.descrip" +
+      "tors.serialization.Callable.ValueParamet" +
+      "er\022F\n\013return_type\030\010 \002(\01321.org.jetbrains." +
+      "jet.descriptors.serialization.Type\032\305\001\n\016V" +
+      "alueParameter\022\r\n\005flags\030\001 \001(\005\022\014\n\004name\030\002 \002" +
+      "(\005\022?\n\004type\030\003 \002(\01321.org.jetbrains.jet.des" +
+      "criptors.serialization.Type\022N\n\023vararg_el" +
+      "ement_type\030\004 \001(\01321.org.jetbrains.jet.des",
+      "criptors.serialization.Type*\005\010d\020\310\001\"Q\n\nMe" +
+      "mberKind\022\017\n\013DECLARATION\020\000\022\021\n\rFAKE_OVERRI" +
+      "DE\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYNTHESIZED\020\003\":\n" +
+      "\014CallableKind\022\007\n\003FUN\020\000\022\007\n\003VAL\020\001\022\007\n\003VAR\020\002" +
+      "\022\017\n\013CONSTRUCTOR\020\003*\005\010d\020\310\001*-\n\010Modality\022\t\n\005" +
+      "FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRACT\020\002*M\n\nVisib" +
+      "ility\022\014\n\010INTERNAL\020\000\022\013\n\007PRIVATE\020\001\022\r\n\tPROT" +
+      "ECTED\020\002\022\n\n\006PUBLIC\020\003\022\t\n\005EXTRA\020\004B\022B\rDebugP" +
+      "rotoBuf\210\001\000"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {

core/serialization.java/src/java_descriptors.proto

@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.descriptors.serialization;
 
-import "compiler/frontend/serialization/src/descriptors.proto";
+import "core/serialization/src/descriptors.proto";
 
 option java_outer_classname = "JavaProtoBuf";
 option optimize_for = LITE_RUNTIME;

core/serialization/serialization.iml

@@ -4,7 +4,6 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

core/serialization/src/org/jetbrains/jet/descriptors/serialization/ProtoBuf.java

@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: compiler/frontend/serialization/src/descriptors.proto
+// source: core/serialization/src/descriptors.proto
 
 package org.jetbrains.jet.descriptors.serialization;
 
@@ -7834,6 +7834,7 @@ public final class ProtoBuf {
      *MemberKind
      *hasGetter
      *hasSetter
+     *hasConstant
      * </pre>
      */
     boolean hasFlags();
@@ -7849,6 +7850,7 @@ public final class ProtoBuf {
      *MemberKind
      *hasGetter
      *hasSetter
+     *hasConstant
      * </pre>
      */
     int getFlags();
@@ -9056,6 +9058,7 @@ public final class ProtoBuf {
      *MemberKind
      *hasGetter
      *hasSetter
+     *hasConstant
      * </pre>
      */
     public boolean hasFlags() {
@@ -9073,6 +9076,7 @@ public final class ProtoBuf {
      *MemberKind
      *hasGetter
      *hasSetter
+     *hasConstant
      * </pre>
      */
     public int getFlags() {
@@ -9748,6 +9752,7 @@ public final class ProtoBuf {
        *MemberKind
        *hasGetter
        *hasSetter
+       *hasConstant
        * </pre>
        */
       public boolean hasFlags() {
@@ -9765,6 +9770,7 @@ public final class ProtoBuf {
        *MemberKind
        *hasGetter
        *hasSetter
+       *hasConstant
        * </pre>
        */
       public int getFlags() {
@@ -9782,6 +9788,7 @@ public final class ProtoBuf {
        *MemberKind
        *hasGetter
        *hasSetter
+       *hasConstant
        * </pre>
        */
       public Builder setFlags(int value) {
@@ -9802,6 +9809,7 @@ public final class ProtoBuf {
        *MemberKind
        *hasGetter
        *hasSetter
+       *hasConstant
        * </pre>
        */
       public Builder clearFlags() {

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

@@ -36,10 +36,10 @@ fun main(args: Array<String>) {
     try {
         checkVersion()
 
-        val commonProto = "compiler/frontend/serialization/src/descriptors.proto"
+        val commonProto = "core/serialization/src/descriptors.proto"
         val javaProto = "core/serialization.java/src/java_descriptors.proto"
 
-        execProtoc(commonProto, "compiler/frontend/serialization/src")
+        execProtoc(commonProto, "core/serialization/src")
         execProtoc(javaProto, "core/serialization.java/src")
 
         modifyAndExecProtoc(commonProto, "compiler/tests")