Update protobuf from 2.5.0 to 2.6.1

.idea/artifacts/KotlinPlugin.xml

@@ -52,7 +52,7 @@
           <element id="module-output" name="idea-ultimate" />
           <element id="module-output" name="formatter" />
           <element id="module-output" name="idea-maven" />
-          <element id="extracted-dir" path="$PROJECT_DIR$/dependencies/protobuf-2.5.0.jar" path-in-jar="/" />
+          <element id="extracted-dir" path="$PROJECT_DIR$/dependencies/protobuf-2.6.1.jar" path-in-jar="/" />
         </element>
         <element id="library" level="project" name="javax.inject" />
         <element id="directory" name="jps">

.idea/libraries/protobuf_java.xml

@@ -4,11 +4,11 @@
       <root url="file://$PROJECT_DIR$/annotations" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/dependencies/protobuf-2.5.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dependencies/protobuf-2.6.1.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/dependencies/protobuf-2.5.0-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dependencies/protobuf-2.6.1-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

build-common/test/org/jetbrains/kotlin/serialization/DebugExtOptionsProtoBuf.java

@@ -77,22 +77,23 @@ public final class DebugExtOptionsProtoBuf {
       "\001(\010B\031B\027DebugExtOptionsProtoBuf"
     };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-      new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
-        public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
-            org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
-          descriptor = root;
-          skipInComparison.internalInit(descriptor.getExtensions().get(0));
-          nameIdInTable.internalInit(descriptor.getExtensions().get(1));
-          fqNameIdInTable.internalInit(descriptor.getExtensions().get(2));
-          stringIdInTable.internalInit(descriptor.getExtensions().get(3));
-          return null;
-        }
-      };
+        new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
+              org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
           org.jetbrains.kotlin.protobuf.DescriptorProtos.getDescriptor(),
         }, assigner);
+    skipInComparison.internalInit(descriptor.getExtensions().get(0));
+    nameIdInTable.internalInit(descriptor.getExtensions().get(1));
+    fqNameIdInTable.internalInit(descriptor.getExtensions().get(2));
+    stringIdInTable.internalInit(descriptor.getExtensions().get(3));
+    org.jetbrains.kotlin.protobuf.DescriptorProtos.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)

build-common/test/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java

@@ -18,10 +18,10 @@ public final class DebugBuiltInsProtoBuf {
     registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.typeAnnotation);
     registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.typeParameterAnnotation);
   }
-  public interface BuiltInsOrBuilder
-      extends org.jetbrains.kotlin.protobuf.MessageOrBuilder {
+  public interface BuiltInsOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.builtins.BuiltIns)
+      org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
-    // optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
     /**
      * <code>optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;</code>
      */
@@ -35,7 +35,6 @@ public final class DebugBuiltInsProtoBuf {
      */
     org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder getStringsOrBuilder();
 
-    // optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
     /**
      * <code>optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;</code>
      */
@@ -49,7 +48,6 @@ public final class DebugBuiltInsProtoBuf {
      */
     org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder getQualifiedNamesOrBuilder();
 
-    // optional .org.jetbrains.kotlin.serialization.Package package = 3;
     /**
      * <code>optional .org.jetbrains.kotlin.serialization.Package package = 3;</code>
      */
@@ -63,37 +61,37 @@ public final class DebugBuiltInsProtoBuf {
      */
     org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder getPackageOrBuilder();
 
-    // repeated .org.jetbrains.kotlin.serialization.Class class = 4;
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
      */
     java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class> 
-        getClassList();
+        getClass_List();
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getClass(int index);
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getClass_(int index);
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
      */
-    int getClassCount();
+    int getClass_Count();
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
      */
     java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder> 
-        getClassOrBuilderList();
+        getClass_OrBuilderList();
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getClassOrBuilder(
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getClass_OrBuilder(
         int index);
   }
   /**
    * Protobuf type {@code org.jetbrains.kotlin.serialization.builtins.BuiltIns}
    */
   public static final class BuiltIns extends
-      org.jetbrains.kotlin.protobuf.GeneratedMessage
-      implements BuiltInsOrBuilder {
+      org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.builtins.BuiltIns)
+      BuiltInsOrBuilder {
     // Use BuiltIns.newBuilder() to construct.
     private BuiltIns(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -180,10 +178,10 @@ public final class DebugBuiltInsProtoBuf {
             }
             case 34: {
               if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-                class_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class>();
+                class__ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class>();
                 mutable_bitField0_ |= 0x00000008;
               }
-              class_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PARSER, extensionRegistry));
+              class__.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PARSER, extensionRegistry));
               break;
             }
           }
@@ -195,7 +193,7 @@ public final class DebugBuiltInsProtoBuf {
             e.getMessage()).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-          class_ = java.util.Collections.unmodifiableList(class_);
+          class__ = java.util.Collections.unmodifiableList(class__);
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -229,7 +227,6 @@ public final class DebugBuiltInsProtoBuf {
     }
 
     private int bitField0_;
-    // optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
     public static final int STRINGS_FIELD_NUMBER = 1;
     private org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable strings_;
     /**
@@ -251,7 +248,6 @@ public final class DebugBuiltInsProtoBuf {
       return strings_;
     }
 
-    // optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
     public static final int QUALIFIED_NAMES_FIELD_NUMBER = 2;
     private org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable qualifiedNames_;
     /**
@@ -273,7 +269,6 @@ public final class DebugBuiltInsProtoBuf {
       return qualifiedNames_;
     }
 
-    // optional .org.jetbrains.kotlin.serialization.Package package = 3;
     public static final int PACKAGE_FIELD_NUMBER = 3;
     private org.jetbrains.kotlin.serialization.DebugProtoBuf.Package package_;
     /**
@@ -295,52 +290,52 @@ public final class DebugBuiltInsProtoBuf {
       return package_;
     }
 
-    // repeated .org.jetbrains.kotlin.serialization.Class class = 4;
     public static final int CLASS_FIELD_NUMBER = 4;
-    private java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class> class_;
+    private java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class> class__;
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
      */
-    public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class> getClassList() {
-      return class_;
+    public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class> getClass_List() {
+      return class__;
     }
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
      */
     public java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder> 
-        getClassOrBuilderList() {
-      return class_;
+        getClass_OrBuilderList() {
+      return class__;
     }
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
      */
-    public int getClassCount() {
-      return class_.size();
+    public int getClass_Count() {
+      return class__.size();
     }
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getClass(int index) {
-      return class_.get(index);
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getClass_(int index) {
+      return class__.get(index);
     }
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getClassOrBuilder(
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getClass_OrBuilder(
         int index) {
-      return class_.get(index);
+      return class__.get(index);
     }
 
     private void initFields() {
       strings_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance();
       qualifiedNames_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
       package_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.getDefaultInstance();
-      class_ = java.util.Collections.emptyList();
+      class__ = java.util.Collections.emptyList();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       if (hasQualifiedNames()) {
         if (!getQualifiedNames().isInitialized()) {
@@ -354,8 +349,8 @@ public final class DebugBuiltInsProtoBuf {
           return false;
         }
       }
-      for (int i = 0; i < getClassCount(); i++) {
-        if (!getClass(i).isInitialized()) {
+      for (int i = 0; i < getClass_Count(); i++) {
+        if (!getClass_(i).isInitialized()) {
           memoizedIsInitialized = 0;
           return false;
         }
@@ -376,8 +371,8 @@ public final class DebugBuiltInsProtoBuf {
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         output.writeMessage(3, package_);
       }
-      for (int i = 0; i < class_.size(); i++) {
-        output.writeMessage(4, class_.get(i));
+      for (int i = 0; i < class__.size(); i++) {
+        output.writeMessage(4, class__.get(i));
       }
       getUnknownFields().writeTo(output);
     }
@@ -400,9 +395,9 @@ public final class DebugBuiltInsProtoBuf {
         size += org.jetbrains.kotlin.protobuf.CodedOutputStream
           .computeMessageSize(3, package_);
       }
-      for (int i = 0; i < class_.size(); i++) {
+      for (int i = 0; i < class__.size(); i++) {
         size += org.jetbrains.kotlin.protobuf.CodedOutputStream
-          .computeMessageSize(4, class_.get(i));
+          .computeMessageSize(4, class__.get(i));
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
@@ -486,8 +481,9 @@ public final class DebugBuiltInsProtoBuf {
      * Protobuf type {@code org.jetbrains.kotlin.serialization.builtins.BuiltIns}
      */
     public static final class Builder extends
-        org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltInsOrBuilder {
+        org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.builtins.BuiltIns)
+        org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltInsOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_descriptor;
@@ -515,7 +511,7 @@ public final class DebugBuiltInsProtoBuf {
           getStringsFieldBuilder();
           getQualifiedNamesFieldBuilder();
           getPackageFieldBuilder();
-          getClassFieldBuilder();
+          getClass_FieldBuilder();
         }
       }
       private static Builder create() {
@@ -542,11 +538,11 @@ public final class DebugBuiltInsProtoBuf {
           packageBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000004);
-        if (classBuilder_ == null) {
-          class_ = java.util.Collections.emptyList();
+        if (class_Builder_ == null) {
+          class__ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000008);
         } else {
-          classBuilder_.clear();
+          class_Builder_.clear();
         }
         return this;
       }
@@ -600,14 +596,14 @@ public final class DebugBuiltInsProtoBuf {
         } else {
           result.package_ = packageBuilder_.build();
         }
-        if (classBuilder_ == null) {
+        if (class_Builder_ == null) {
           if (((bitField0_ & 0x00000008) == 0x00000008)) {
-            class_ = java.util.Collections.unmodifiableList(class_);
+            class__ = java.util.Collections.unmodifiableList(class__);
             bitField0_ = (bitField0_ & ~0x00000008);
           }
-          result.class_ = class_;
+          result.class__ = class__;
         } else {
-          result.class_ = classBuilder_.build();
+          result.class__ = class_Builder_.build();
         }
         result.bitField0_ = to_bitField0_;
         onBuilt();
@@ -634,29 +630,29 @@ public final class DebugBuiltInsProtoBuf {
         if (other.hasPackage()) {
           mergePackage(other.getPackage());
         }
-        if (classBuilder_ == null) {
-          if (!other.class_.isEmpty()) {
-            if (class_.isEmpty()) {
-              class_ = other.class_;
+        if (class_Builder_ == null) {
+          if (!other.class__.isEmpty()) {
+            if (class__.isEmpty()) {
+              class__ = other.class__;
               bitField0_ = (bitField0_ & ~0x00000008);
             } else {
-              ensureClassIsMutable();
-              class_.addAll(other.class_);
+              ensureClass_IsMutable();
+              class__.addAll(other.class__);
             }
             onChanged();
           }
         } else {
-          if (!other.class_.isEmpty()) {
-            if (classBuilder_.isEmpty()) {
-              classBuilder_.dispose();
-              classBuilder_ = null;
-              class_ = other.class_;
+          if (!other.class__.isEmpty()) {
+            if (class_Builder_.isEmpty()) {
+              class_Builder_.dispose();
+              class_Builder_ = null;
+              class__ = other.class__;
               bitField0_ = (bitField0_ & ~0x00000008);
-              classBuilder_ = 
+              class_Builder_ = 
                 org.jetbrains.kotlin.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getClassFieldBuilder() : null;
+                   getClass_FieldBuilder() : null;
             } else {
-              classBuilder_.addAllMessages(other.class_);
+              class_Builder_.addAllMessages(other.class__);
             }
           }
         }
@@ -677,8 +673,8 @@ public final class DebugBuiltInsProtoBuf {
             return false;
           }
         }
-        for (int i = 0; i < getClassCount(); i++) {
-          if (!getClass(i).isInitialized()) {
+        for (int i = 0; i < getClass_Count(); i++) {
+          if (!getClass_(i).isInitialized()) {
             
             return false;
           }
@@ -705,7 +701,6 @@ public final class DebugBuiltInsProtoBuf {
       }
       private int bitField0_;
 
-      // optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
       private org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable strings_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
           org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder> stringsBuilder_;
@@ -814,7 +809,7 @@ public final class DebugBuiltInsProtoBuf {
         if (stringsBuilder_ == null) {
           stringsBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
               org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder>(
-                  strings_,
+                  getStrings(),
                   getParentForChildren(),
                   isClean());
           strings_ = null;
@@ -822,7 +817,6 @@ public final class DebugBuiltInsProtoBuf {
         return stringsBuilder_;
       }
 
-      // optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
       private org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable qualifiedNames_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
           org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder> qualifiedNamesBuilder_;
@@ -931,7 +925,7 @@ public final class DebugBuiltInsProtoBuf {
         if (qualifiedNamesBuilder_ == null) {
           qualifiedNamesBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
               org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder>(
-                  qualifiedNames_,
+                  getQualifiedNames(),
                   getParentForChildren(),
                   isClean());
           qualifiedNames_ = null;
@@ -939,7 +933,6 @@ public final class DebugBuiltInsProtoBuf {
         return qualifiedNamesBuilder_;
       }
 
-      // optional .org.jetbrains.kotlin.serialization.Package package = 3;
       private org.jetbrains.kotlin.serialization.DebugProtoBuf.Package package_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
           org.jetbrains.kotlin.serialization.DebugProtoBuf.Package, org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder> packageBuilder_;
@@ -1048,7 +1041,7 @@ public final class DebugBuiltInsProtoBuf {
         if (packageBuilder_ == null) {
           packageBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
               org.jetbrains.kotlin.serialization.DebugProtoBuf.Package, org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder>(
-                  package_,
+                  getPackage(),
                   getParentForChildren(),
                   isClean());
           package_ = null;
@@ -1056,244 +1049,244 @@ public final class DebugBuiltInsProtoBuf {
         return packageBuilder_;
       }
 
-      // repeated .org.jetbrains.kotlin.serialization.Class class = 4;
-      private java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class> class_ =
+      private java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class> class__ =
         java.util.Collections.emptyList();
-      private void ensureClassIsMutable() {
+      private void ensureClass_IsMutable() {
         if (!((bitField0_ & 0x00000008) == 0x00000008)) {
-          class_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class>(class_);
+          class__ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class>(class__);
           bitField0_ |= 0x00000008;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder> classBuilder_;
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder> class_Builder_;
 
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class> getClassList() {
-        if (classBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(class_);
+      public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class> getClass_List() {
+        if (class_Builder_ == null) {
+          return java.util.Collections.unmodifiableList(class__);
         } else {
-          return classBuilder_.getMessageList();
+          return class_Builder_.getMessageList();
         }
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public int getClassCount() {
-        if (classBuilder_ == null) {
-          return class_.size();
+      public int getClass_Count() {
+        if (class_Builder_ == null) {
+          return class__.size();
         } else {
-          return classBuilder_.getCount();
+          return class_Builder_.getCount();
         }
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getClass(int index) {
-        if (classBuilder_ == null) {
-          return class_.get(index);
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getClass_(int index) {
+        if (class_Builder_ == null) {
+          return class__.get(index);
         } else {
-          return classBuilder_.getMessage(index);
+          return class_Builder_.getMessage(index);
         }
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public Builder setClass(
+      public Builder setClass_(
           int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class value) {
-        if (classBuilder_ == null) {
+        if (class_Builder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureClassIsMutable();
-          class_.set(index, value);
+          ensureClass_IsMutable();
+          class__.set(index, value);
           onChanged();
         } else {
-          classBuilder_.setMessage(index, value);
+          class_Builder_.setMessage(index, value);
         }
         return this;
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public Builder setClass(
+      public Builder setClass_(
           int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder builderForValue) {
-        if (classBuilder_ == null) {
-          ensureClassIsMutable();
-          class_.set(index, builderForValue.build());
+        if (class_Builder_ == null) {
+          ensureClass_IsMutable();
+          class__.set(index, builderForValue.build());
           onChanged();
         } else {
-          classBuilder_.setMessage(index, builderForValue.build());
+          class_Builder_.setMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public Builder addClass(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class value) {
-        if (classBuilder_ == null) {
+      public Builder addClass_(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class value) {
+        if (class_Builder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureClassIsMutable();
-          class_.add(value);
+          ensureClass_IsMutable();
+          class__.add(value);
           onChanged();
         } else {
-          classBuilder_.addMessage(value);
+          class_Builder_.addMessage(value);
         }
         return this;
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public Builder addClass(
+      public Builder addClass_(
           int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class value) {
-        if (classBuilder_ == null) {
+        if (class_Builder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureClassIsMutable();
-          class_.add(index, value);
+          ensureClass_IsMutable();
+          class__.add(index, value);
           onChanged();
         } else {
-          classBuilder_.addMessage(index, value);
+          class_Builder_.addMessage(index, value);
         }
         return this;
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public Builder addClass(
+      public Builder addClass_(
           org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder builderForValue) {
-        if (classBuilder_ == null) {
-          ensureClassIsMutable();
-          class_.add(builderForValue.build());
+        if (class_Builder_ == null) {
+          ensureClass_IsMutable();
+          class__.add(builderForValue.build());
           onChanged();
         } else {
-          classBuilder_.addMessage(builderForValue.build());
+          class_Builder_.addMessage(builderForValue.build());
         }
         return this;
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public Builder addClass(
+      public Builder addClass_(
           int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder builderForValue) {
-        if (classBuilder_ == null) {
-          ensureClassIsMutable();
-          class_.add(index, builderForValue.build());
+        if (class_Builder_ == null) {
+          ensureClass_IsMutable();
+          class__.add(index, builderForValue.build());
           onChanged();
         } else {
-          classBuilder_.addMessage(index, builderForValue.build());
+          class_Builder_.addMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public Builder addAllClass(
+      public Builder addAllClass_(
           java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.Class> values) {
-        if (classBuilder_ == null) {
-          ensureClassIsMutable();
-          super.addAll(values, class_);
+        if (class_Builder_ == null) {
+          ensureClass_IsMutable();
+          org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+              values, class__);
           onChanged();
         } else {
-          classBuilder_.addAllMessages(values);
+          class_Builder_.addAllMessages(values);
         }
         return this;
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public Builder clearClass() {
-        if (classBuilder_ == null) {
-          class_ = java.util.Collections.emptyList();
+      public Builder clearClass_() {
+        if (class_Builder_ == null) {
+          class__ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000008);
           onChanged();
         } else {
-          classBuilder_.clear();
+          class_Builder_.clear();
         }
         return this;
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public Builder removeClass(int index) {
-        if (classBuilder_ == null) {
-          ensureClassIsMutable();
-          class_.remove(index);
+      public Builder removeClass_(int index) {
+        if (class_Builder_ == null) {
+          ensureClass_IsMutable();
+          class__.remove(index);
           onChanged();
         } else {
-          classBuilder_.remove(index);
+          class_Builder_.remove(index);
         }
         return this;
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder getClassBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder getClass_Builder(
           int index) {
-        return getClassFieldBuilder().getBuilder(index);
+        return getClass_FieldBuilder().getBuilder(index);
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getClassOrBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getClass_OrBuilder(
           int index) {
-        if (classBuilder_ == null) {
-          return class_.get(index);  } else {
-          return classBuilder_.getMessageOrBuilder(index);
+        if (class_Builder_ == null) {
+          return class__.get(index);  } else {
+          return class_Builder_.getMessageOrBuilder(index);
         }
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
       public java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder> 
-           getClassOrBuilderList() {
-        if (classBuilder_ != null) {
-          return classBuilder_.getMessageOrBuilderList();
+           getClass_OrBuilderList() {
+        if (class_Builder_ != null) {
+          return class_Builder_.getMessageOrBuilderList();
         } else {
-          return java.util.Collections.unmodifiableList(class_);
+          return java.util.Collections.unmodifiableList(class__);
         }
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder addClassBuilder() {
-        return getClassFieldBuilder().addBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder addClass_Builder() {
+        return getClass_FieldBuilder().addBuilder(
             org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.getDefaultInstance());
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder addClassBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder addClass_Builder(
           int index) {
-        return getClassFieldBuilder().addBuilder(
+        return getClass_FieldBuilder().addBuilder(
             index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.getDefaultInstance());
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
       public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder> 
-           getClassBuilderList() {
-        return getClassFieldBuilder().getBuilderList();
+           getClass_BuilderList() {
+        return getClass_FieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
           org.jetbrains.kotlin.serialization.DebugProtoBuf.Class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder> 
-          getClassFieldBuilder() {
-        if (classBuilder_ == null) {
-          classBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
+          getClass_FieldBuilder() {
+        if (class_Builder_ == null) {
+          class_Builder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
               org.jetbrains.kotlin.serialization.DebugProtoBuf.Class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder>(
-                  class_,
+                  class__,
                   ((bitField0_ & 0x00000008) == 0x00000008),
                   getParentForChildren(),
                   isClean());
-          class_ = null;
+          class__ = null;
         }
-        return classBuilder_;
+        return class_Builder_;
       }
 
       // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.builtins.BuiltIns)
@@ -1417,7 +1410,7 @@ public final class DebugBuiltInsProtoBuf {
           .newFileScopedGeneratedExtension(
         org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
         org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
-  private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+  private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
     internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
@@ -1475,34 +1468,35 @@ public final class DebugBuiltInsProtoBuf {
       "B\027B\025DebugBuiltInsProtoBuf"
     };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-      new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
-        public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
-            org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
-          descriptor = root;
-          internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_descriptor =
-            getDescriptor().getMessageTypes().get(0);
-          internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_fieldAccessorTable = new
-            org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_descriptor,
-              new java.lang.String[] { "Strings", "QualifiedNames", "Package", "Class", });
-          packageFqName.internalInit(descriptor.getExtensions().get(0));
-          classAnnotation.internalInit(descriptor.getExtensions().get(1));
-          constructorAnnotation.internalInit(descriptor.getExtensions().get(2));
-          functionAnnotation.internalInit(descriptor.getExtensions().get(3));
-          propertyAnnotation.internalInit(descriptor.getExtensions().get(4));
-          compileTimeValue.internalInit(descriptor.getExtensions().get(5));
-          enumEntryAnnotation.internalInit(descriptor.getExtensions().get(6));
-          parameterAnnotation.internalInit(descriptor.getExtensions().get(7));
-          typeAnnotation.internalInit(descriptor.getExtensions().get(8));
-          typeParameterAnnotation.internalInit(descriptor.getExtensions().get(9));
-          return null;
-        }
-      };
+        new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
+              org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
           org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor(),
         }, assigner);
+    internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_fieldAccessorTable = new
+      org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_descriptor,
+        new java.lang.String[] { "Strings", "QualifiedNames", "Package", "Class_", });
+    packageFqName.internalInit(descriptor.getExtensions().get(0));
+    classAnnotation.internalInit(descriptor.getExtensions().get(1));
+    constructorAnnotation.internalInit(descriptor.getExtensions().get(2));
+    functionAnnotation.internalInit(descriptor.getExtensions().get(3));
+    propertyAnnotation.internalInit(descriptor.getExtensions().get(4));
+    compileTimeValue.internalInit(descriptor.getExtensions().get(5));
+    enumEntryAnnotation.internalInit(descriptor.getExtensions().get(6));
+    parameterAnnotation.internalInit(descriptor.getExtensions().get(7));
+    typeAnnotation.internalInit(descriptor.getExtensions().get(8));
+    typeParameterAnnotation.internalInit(descriptor.getExtensions().get(9));
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)

build-common/test/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java

@@ -17,10 +17,10 @@ public final class DebugJsProtoBuf {
     registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.typeAnnotation);
     registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.typeParameterAnnotation);
   }
-  public interface ClassesOrBuilder
-      extends org.jetbrains.kotlin.protobuf.MessageOrBuilder {
+  public interface ClassesOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.Classes)
+      org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
-    // repeated int32 class_name = 1 [packed = true];
     /**
      * <code>repeated int32 class_name = 1 [packed = true];</code>
      *
@@ -50,8 +50,9 @@ public final class DebugJsProtoBuf {
    * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Classes}
    */
   public static final class Classes extends
-      org.jetbrains.kotlin.protobuf.GeneratedMessage
-      implements ClassesOrBuilder {
+      org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.Classes)
+      ClassesOrBuilder {
     // Use Classes.newBuilder() to construct.
     private Classes(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -160,7 +161,6 @@ public final class DebugJsProtoBuf {
       return PARSER;
     }
 
-    // repeated int32 class_name = 1 [packed = true];
     public static final int CLASS_NAME_FIELD_NUMBER = 1;
     private java.util.List<java.lang.Integer> className_;
     /**
@@ -202,7 +202,8 @@ public final class DebugJsProtoBuf {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       memoizedIsInitialized = 1;
       return true;
@@ -323,8 +324,9 @@ public final class DebugJsProtoBuf {
      * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Classes}
      */
     public static final class Builder extends
-        org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.ClassesOrBuilder {
+        org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.Classes)
+        org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.ClassesOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor;
@@ -443,7 +445,6 @@ public final class DebugJsProtoBuf {
       }
       private int bitField0_;
 
-      // repeated int32 class_name = 1 [packed = true];
       private java.util.List<java.lang.Integer> className_ = java.util.Collections.emptyList();
       private void ensureClassNameIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -519,7 +520,8 @@ public final class DebugJsProtoBuf {
       public Builder addAllClassName(
           java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureClassNameIsMutable();
-        super.addAll(values, className_);
+        org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+            values, className_);
         onChanged();
         return this;
       }
@@ -548,10 +550,10 @@ public final class DebugJsProtoBuf {
     // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.Classes)
   }
 
-  public interface LibraryOrBuilder
-      extends org.jetbrains.kotlin.protobuf.MessageOrBuilder {
+  public interface LibraryOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.Library)
+      org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
-    // repeated .org.jetbrains.kotlin.serialization.js.Library.FileEntry entry = 1;
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.js.Library.FileEntry entry = 1;</code>
      */
@@ -576,7 +578,6 @@ public final class DebugJsProtoBuf {
     org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.FileEntryOrBuilder getEntryOrBuilder(
         int index);
 
-    // optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];
     /**
      * <code>optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];</code>
      */
@@ -586,12 +587,11 @@ public final class DebugJsProtoBuf {
      */
     org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind getKind();
 
-    // repeated string importedModules = 3;
     /**
      * <code>repeated string importedModules = 3;</code>
      */
-    java.util.List<java.lang.String>
-    getImportedModulesList();
+    org.jetbrains.kotlin.protobuf.ProtocolStringList
+        getImportedModulesList();
     /**
      * <code>repeated string importedModules = 3;</code>
      */
@@ -610,8 +610,9 @@ public final class DebugJsProtoBuf {
    * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library}
    */
   public static final class Library extends
-      org.jetbrains.kotlin.protobuf.GeneratedMessage
-      implements LibraryOrBuilder {
+      org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.Library)
+      LibraryOrBuilder {
     // Use Library.newBuilder() to construct.
     private Library(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -677,11 +678,12 @@ public final class DebugJsProtoBuf {
               break;
             }
             case 26: {
+              org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
                 importedModules_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000004;
               }
-              importedModules_.add(input.readBytes());
+              importedModules_.add(bs);
               break;
             }
           }
@@ -696,7 +698,7 @@ public final class DebugJsProtoBuf {
           entry_ = java.util.Collections.unmodifiableList(entry_);
         }
         if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-          importedModules_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList(importedModules_);
+          importedModules_ = importedModules_.getUnmodifiableView();
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -829,10 +831,10 @@ public final class DebugJsProtoBuf {
       // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.js.Library.Kind)
     }
 
-    public interface FileEntryOrBuilder
-        extends org.jetbrains.kotlin.protobuf.MessageOrBuilder {
+    public interface FileEntryOrBuilder extends
+        // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.Library.FileEntry)
+        org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
-      // required string path = 1;
       /**
        * <code>required string path = 1;</code>
        */
@@ -847,7 +849,6 @@ public final class DebugJsProtoBuf {
       org.jetbrains.kotlin.protobuf.ByteString
           getPathBytes();
 
-      // required bytes content = 2;
       /**
        * <code>required bytes content = 2;</code>
        */
@@ -861,8 +862,9 @@ public final class DebugJsProtoBuf {
      * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library.FileEntry}
      */
     public static final class FileEntry extends
-        org.jetbrains.kotlin.protobuf.GeneratedMessage
-        implements FileEntryOrBuilder {
+        org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+        // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.Library.FileEntry)
+        FileEntryOrBuilder {
       // Use FileEntry.newBuilder() to construct.
       private FileEntry(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
         super(builder);
@@ -909,8 +911,9 @@ public final class DebugJsProtoBuf {
                 break;
               }
               case 10: {
+                org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
                 bitField0_ |= 0x00000001;
-                path_ = input.readBytes();
+                path_ = bs;
                 break;
               }
               case 18: {
@@ -958,7 +961,6 @@ public final class DebugJsProtoBuf {
       }
 
       private int bitField0_;
-      // required string path = 1;
       public static final int PATH_FIELD_NUMBER = 1;
       private java.lang.Object path_;
       /**
@@ -1001,7 +1003,6 @@ public final class DebugJsProtoBuf {
         }
       }
 
-      // required bytes content = 2;
       public static final int CONTENT_FIELD_NUMBER = 2;
       private org.jetbrains.kotlin.protobuf.ByteString content_;
       /**
@@ -1024,7 +1025,8 @@ public final class DebugJsProtoBuf {
       private byte memoizedIsInitialized = -1;
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
-        if (isInitialized != -1) return isInitialized == 1;
+        if (isInitialized == 1) return true;
+        if (isInitialized == 0) return false;
 
         if (!hasPath()) {
           memoizedIsInitialized = 0;
@@ -1146,8 +1148,9 @@ public final class DebugJsProtoBuf {
        * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library.FileEntry}
        */
       public static final class Builder extends
-          org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder>
-         implements org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.FileEntryOrBuilder {
+          org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
+          // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.Library.FileEntry)
+          org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.FileEntryOrBuilder {
         public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
             getDescriptor() {
           return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_descriptor;
@@ -1279,7 +1282,6 @@ public final class DebugJsProtoBuf {
         }
         private int bitField0_;
 
-        // required string path = 1;
         private java.lang.Object path_ = "";
         /**
          * <code>required string path = 1;</code>
@@ -1293,9 +1295,12 @@ public final class DebugJsProtoBuf {
         public java.lang.String getPath() {
           java.lang.Object ref = path_;
           if (!(ref instanceof java.lang.String)) {
-            java.lang.String s = ((org.jetbrains.kotlin.protobuf.ByteString) ref)
-                .toStringUtf8();
-            path_ = s;
+            org.jetbrains.kotlin.protobuf.ByteString bs =
+                (org.jetbrains.kotlin.protobuf.ByteString) ref;
+            java.lang.String s = bs.toStringUtf8();
+            if (bs.isValidUtf8()) {
+              path_ = s;
+            }
             return s;
           } else {
             return (java.lang.String) ref;
@@ -1353,7 +1358,6 @@ public final class DebugJsProtoBuf {
           return this;
         }
 
-        // required bytes content = 2;
         private org.jetbrains.kotlin.protobuf.ByteString content_ = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;
         /**
          * <code>required bytes content = 2;</code>
@@ -1401,7 +1405,6 @@ public final class DebugJsProtoBuf {
     }
 
     private int bitField0_;
-    // repeated .org.jetbrains.kotlin.serialization.js.Library.FileEntry entry = 1;
     public static final int ENTRY_FIELD_NUMBER = 1;
     private java.util.List<org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.FileEntry> entry_;
     /**
@@ -1437,7 +1440,6 @@ public final class DebugJsProtoBuf {
       return entry_.get(index);
     }
 
-    // optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];
     public static final int KIND_FIELD_NUMBER = 2;
     private org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind kind_;
     /**
@@ -1453,13 +1455,12 @@ public final class DebugJsProtoBuf {
       return kind_;
     }
 
-    // repeated string importedModules = 3;
     public static final int IMPORTEDMODULES_FIELD_NUMBER = 3;
     private org.jetbrains.kotlin.protobuf.LazyStringList importedModules_;
     /**
      * <code>repeated string importedModules = 3;</code>
      */
-    public java.util.List<java.lang.String>
+    public org.jetbrains.kotlin.protobuf.ProtocolStringList
         getImportedModulesList() {
       return importedModules_;
     }
@@ -1491,7 +1492,8 @@ public final class DebugJsProtoBuf {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       for (int i = 0; i < getEntryCount(); i++) {
         if (!getEntry(i).isInitialized()) {
@@ -1623,8 +1625,9 @@ public final class DebugJsProtoBuf {
      * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library}
      */
     public static final class Builder extends
-        org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.LibraryOrBuilder {
+        org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.Library)
+        org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.LibraryOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor;
@@ -1710,8 +1713,7 @@ public final class DebugJsProtoBuf {
         }
         result.kind_ = kind_;
         if (((bitField0_ & 0x00000004) == 0x00000004)) {
-          importedModules_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList(
-              importedModules_);
+          importedModules_ = importedModules_.getUnmodifiableView();
           bitField0_ = (bitField0_ & ~0x00000004);
         }
         result.importedModules_ = importedModules_;
@@ -1803,7 +1805,6 @@ public final class DebugJsProtoBuf {
       }
       private int bitField0_;
 
-      // repeated .org.jetbrains.kotlin.serialization.js.Library.FileEntry entry = 1;
       private java.util.List<org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.FileEntry> entry_ =
         java.util.Collections.emptyList();
       private void ensureEntryIsMutable() {
@@ -1945,7 +1946,8 @@ public final class DebugJsProtoBuf {
           java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.FileEntry> values) {
         if (entryBuilder_ == null) {
           ensureEntryIsMutable();
-          super.addAll(values, entry_);
+          org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+              values, entry_);
           onChanged();
         } else {
           entryBuilder_.addAllMessages(values);
@@ -2043,7 +2045,6 @@ public final class DebugJsProtoBuf {
         return entryBuilder_;
       }
 
-      // optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];
       private org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind kind_ = org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind.PLAIN;
       /**
        * <code>optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];</code>
@@ -2079,7 +2080,6 @@ public final class DebugJsProtoBuf {
         return this;
       }
 
-      // repeated string importedModules = 3;
       private org.jetbrains.kotlin.protobuf.LazyStringList importedModules_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
       private void ensureImportedModulesIsMutable() {
         if (!((bitField0_ & 0x00000004) == 0x00000004)) {
@@ -2090,9 +2090,9 @@ public final class DebugJsProtoBuf {
       /**
        * <code>repeated string importedModules = 3;</code>
        */
-      public java.util.List<java.lang.String>
+      public org.jetbrains.kotlin.protobuf.ProtocolStringList
           getImportedModulesList() {
-        return java.util.Collections.unmodifiableList(importedModules_);
+        return importedModules_.getUnmodifiableView();
       }
       /**
        * <code>repeated string importedModules = 3;</code>
@@ -2145,7 +2145,8 @@ public final class DebugJsProtoBuf {
       public Builder addAllImportedModules(
           java.lang.Iterable<java.lang.String> values) {
         ensureImportedModulesIsMutable();
-        super.addAll(values, importedModules_);
+        org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+            values, importedModules_);
         onChanged();
         return this;
       }
@@ -2282,17 +2283,17 @@ public final class DebugJsProtoBuf {
           .newFileScopedGeneratedExtension(
         org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
         org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
-  private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+  private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
     internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_org_jetbrains_kotlin_serialization_js_Classes_fieldAccessorTable;
-  private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+  private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
     internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_org_jetbrains_kotlin_serialization_js_Library_fieldAccessorTable;
-  private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+  private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
     internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
@@ -2349,45 +2350,46 @@ public final class DebugJsProtoBuf {
       "rotoBuf"
     };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-      new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
-        public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
-            org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
-          descriptor = root;
-          internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor =
-            getDescriptor().getMessageTypes().get(0);
-          internal_static_org_jetbrains_kotlin_serialization_js_Classes_fieldAccessorTable = new
-            org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor,
-              new java.lang.String[] { "ClassName", });
-          internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor =
-            getDescriptor().getMessageTypes().get(1);
-          internal_static_org_jetbrains_kotlin_serialization_js_Library_fieldAccessorTable = new
-            org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor,
-              new java.lang.String[] { "Entry", "Kind", "ImportedModules", });
-          internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_descriptor =
-            internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor.getNestedTypes().get(0);
-          internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_fieldAccessorTable = new
-            org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_descriptor,
-              new java.lang.String[] { "Path", "Content", });
-          classAnnotation.internalInit(descriptor.getExtensions().get(0));
-          constructorAnnotation.internalInit(descriptor.getExtensions().get(1));
-          functionAnnotation.internalInit(descriptor.getExtensions().get(2));
-          propertyAnnotation.internalInit(descriptor.getExtensions().get(3));
-          compileTimeValue.internalInit(descriptor.getExtensions().get(4));
-          enumEntryAnnotation.internalInit(descriptor.getExtensions().get(5));
-          parameterAnnotation.internalInit(descriptor.getExtensions().get(6));
-          typeAnnotation.internalInit(descriptor.getExtensions().get(7));
-          typeParameterAnnotation.internalInit(descriptor.getExtensions().get(8));
-          return null;
-        }
-      };
+        new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
+              org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
           org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor(),
         }, assigner);
+    internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_org_jetbrains_kotlin_serialization_js_Classes_fieldAccessorTable = new
+      org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor,
+        new java.lang.String[] { "ClassName", });
+    internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor =
+      getDescriptor().getMessageTypes().get(1);
+    internal_static_org_jetbrains_kotlin_serialization_js_Library_fieldAccessorTable = new
+      org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor,
+        new java.lang.String[] { "Entry", "Kind", "ImportedModules", });
+    internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_descriptor =
+      internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor.getNestedTypes().get(0);
+    internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_fieldAccessorTable = new
+      org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_descriptor,
+        new java.lang.String[] { "Path", "Content", });
+    classAnnotation.internalInit(descriptor.getExtensions().get(0));
+    constructorAnnotation.internalInit(descriptor.getExtensions().get(1));
+    functionAnnotation.internalInit(descriptor.getExtensions().get(2));
+    propertyAnnotation.internalInit(descriptor.getExtensions().get(3));
+    compileTimeValue.internalInit(descriptor.getExtensions().get(4));
+    enumEntryAnnotation.internalInit(descriptor.getExtensions().get(5));
+    parameterAnnotation.internalInit(descriptor.getExtensions().get(6));
+    typeAnnotation.internalInit(descriptor.getExtensions().get(7));
+    typeParameterAnnotation.internalInit(descriptor.getExtensions().get(8));
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)

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

@@ -8,10 +8,10 @@ public final class DebugJvmPackageTable {
   public static void registerAllExtensions(
       org.jetbrains.kotlin.protobuf.ExtensionRegistry registry) {
   }
-  public interface PackageTableOrBuilder
-      extends org.jetbrains.kotlin.protobuf.MessageOrBuilder {
+  public interface PackageTableOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.PackageTable)
+      org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
-    // repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
      */
@@ -40,8 +40,9 @@ public final class DebugJvmPackageTable {
    * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageTable}
    */
   public static final class PackageTable extends
-      org.jetbrains.kotlin.protobuf.GeneratedMessage
-      implements PackageTableOrBuilder {
+      org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.PackageTable)
+      PackageTableOrBuilder {
     // Use PackageTable.newBuilder() to construct.
     private PackageTable(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -137,7 +138,6 @@ public final class DebugJvmPackageTable {
       return PARSER;
     }
 
-    // repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
     public static final int PACKAGE_PARTS_FIELD_NUMBER = 1;
     private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts> packageParts_;
     /**
@@ -179,7 +179,8 @@ public final class DebugJvmPackageTable {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       for (int i = 0; i < getPackagePartsCount(); i++) {
         if (!getPackageParts(i).isInitialized()) {
@@ -292,8 +293,9 @@ public final class DebugJvmPackageTable {
      * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageTable}
      */
     public static final class Builder extends
-        org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTableOrBuilder {
+        org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.PackageTable)
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTableOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor;
@@ -443,7 +445,6 @@ public final class DebugJvmPackageTable {
       }
       private int bitField0_;
 
-      // repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
       private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts> packageParts_ =
         java.util.Collections.emptyList();
       private void ensurePackagePartsIsMutable() {
@@ -585,7 +586,8 @@ public final class DebugJvmPackageTable {
           java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts> values) {
         if (packagePartsBuilder_ == null) {
           ensurePackagePartsIsMutable();
-          super.addAll(values, packageParts_);
+          org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+              values, packageParts_);
           onChanged();
         } else {
           packagePartsBuilder_.addAllMessages(values);
@@ -694,10 +696,10 @@ public final class DebugJvmPackageTable {
     // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.PackageTable)
   }
 
-  public interface PackagePartsOrBuilder
-      extends org.jetbrains.kotlin.protobuf.MessageOrBuilder {
+  public interface PackagePartsOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+      org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
-    // required string package_fq_name = 1;
     /**
      * <code>required string package_fq_name = 1;</code>
      */
@@ -712,12 +714,11 @@ public final class DebugJvmPackageTable {
     org.jetbrains.kotlin.protobuf.ByteString
         getPackageFqNameBytes();
 
-    // repeated string class_name = 2;
     /**
      * <code>repeated string class_name = 2;</code>
      */
-    java.util.List<java.lang.String>
-    getClassNameList();
+    org.jetbrains.kotlin.protobuf.ProtocolStringList
+        getClassNameList();
     /**
      * <code>repeated string class_name = 2;</code>
      */
@@ -736,8 +737,9 @@ public final class DebugJvmPackageTable {
    * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageParts}
    */
   public static final class PackageParts extends
-      org.jetbrains.kotlin.protobuf.GeneratedMessage
-      implements PackagePartsOrBuilder {
+      org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+      PackagePartsOrBuilder {
     // Use PackageParts.newBuilder() to construct.
     private PackageParts(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -784,16 +786,18 @@ public final class DebugJvmPackageTable {
               break;
             }
             case 10: {
+              org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
-              packageFqName_ = input.readBytes();
+              packageFqName_ = bs;
               break;
             }
             case 18: {
+              org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
                 className_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              className_.add(input.readBytes());
+              className_.add(bs);
               break;
             }
           }
@@ -805,7 +809,7 @@ public final class DebugJvmPackageTable {
             e.getMessage()).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-          className_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList(className_);
+          className_ = className_.getUnmodifiableView();
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -839,7 +843,6 @@ public final class DebugJvmPackageTable {
     }
 
     private int bitField0_;
-    // required string package_fq_name = 1;
     public static final int PACKAGE_FQ_NAME_FIELD_NUMBER = 1;
     private java.lang.Object packageFqName_;
     /**
@@ -882,13 +885,12 @@ public final class DebugJvmPackageTable {
       }
     }
 
-    // repeated string class_name = 2;
     public static final int CLASS_NAME_FIELD_NUMBER = 2;
     private org.jetbrains.kotlin.protobuf.LazyStringList className_;
     /**
      * <code>repeated string class_name = 2;</code>
      */
-    public java.util.List<java.lang.String>
+    public org.jetbrains.kotlin.protobuf.ProtocolStringList
         getClassNameList() {
       return className_;
     }
@@ -919,7 +921,8 @@ public final class DebugJvmPackageTable {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       if (!hasPackageFqName()) {
         memoizedIsInitialized = 0;
@@ -1042,8 +1045,9 @@ public final class DebugJvmPackageTable {
      * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageParts}
      */
     public static final class Builder extends
-        org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder {
+        org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
@@ -1113,8 +1117,7 @@ public final class DebugJvmPackageTable {
         }
         result.packageFqName_ = packageFqName_;
         if (((bitField0_ & 0x00000002) == 0x00000002)) {
-          className_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList(
-              className_);
+          className_ = className_.getUnmodifiableView();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.className_ = className_;
@@ -1180,7 +1183,6 @@ public final class DebugJvmPackageTable {
       }
       private int bitField0_;
 
-      // required string package_fq_name = 1;
       private java.lang.Object packageFqName_ = "";
       /**
        * <code>required string package_fq_name = 1;</code>
@@ -1194,9 +1196,12 @@ public final class DebugJvmPackageTable {
       public java.lang.String getPackageFqName() {
         java.lang.Object ref = packageFqName_;
         if (!(ref instanceof java.lang.String)) {
-          java.lang.String s = ((org.jetbrains.kotlin.protobuf.ByteString) ref)
-              .toStringUtf8();
-          packageFqName_ = s;
+          org.jetbrains.kotlin.protobuf.ByteString bs =
+              (org.jetbrains.kotlin.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (bs.isValidUtf8()) {
+            packageFqName_ = s;
+          }
           return s;
         } else {
           return (java.lang.String) ref;
@@ -1254,7 +1259,6 @@ public final class DebugJvmPackageTable {
         return this;
       }
 
-      // repeated string class_name = 2;
       private org.jetbrains.kotlin.protobuf.LazyStringList className_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
       private void ensureClassNameIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
@@ -1265,9 +1269,9 @@ public final class DebugJvmPackageTable {
       /**
        * <code>repeated string class_name = 2;</code>
        */
-      public java.util.List<java.lang.String>
+      public org.jetbrains.kotlin.protobuf.ProtocolStringList
           getClassNameList() {
-        return java.util.Collections.unmodifiableList(className_);
+        return className_.getUnmodifiableView();
       }
       /**
        * <code>repeated string class_name = 2;</code>
@@ -1320,7 +1324,8 @@ public final class DebugJvmPackageTable {
       public Builder addAllClassName(
           java.lang.Iterable<java.lang.String> values) {
         ensureClassNameIsMutable();
-        super.addAll(values, className_);
+        org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+            values, className_);
         onChanged();
         return this;
       }
@@ -1358,12 +1363,12 @@ public final class DebugJvmPackageTable {
     // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.PackageParts)
   }
 
-  private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+  private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
     internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_fieldAccessorTable;
-  private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+  private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
     internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
@@ -1387,29 +1392,29 @@ public final class DebugJvmPackageTable {
       "e"
     };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-      new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
-        public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
-            org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
-          descriptor = root;
-          internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor =
-            getDescriptor().getMessageTypes().get(0);
-          internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_fieldAccessorTable = new
-            org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor,
-              new java.lang.String[] { "PackageParts", });
-          internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor =
-            getDescriptor().getMessageTypes().get(1);
-          internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable = new
-            org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor,
-              new java.lang.String[] { "PackageFqName", "ClassName", });
-          return null;
-        }
-      };
+        new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
+              org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
         }, assigner);
+    internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_fieldAccessorTable = new
+      org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor,
+        new java.lang.String[] { "PackageParts", });
+    internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor =
+      getDescriptor().getMessageTypes().get(1);
+    internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable = new
+      org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor,
+        new java.lang.String[] { "PackageFqName", "ClassName", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

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

@@ -16,10 +16,10 @@ public final class DebugJvmProtoBuf {
     registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.classModuleName);
     registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.packageModuleName);
   }
-  public interface StringTableTypesOrBuilder
-      extends org.jetbrains.kotlin.protobuf.MessageOrBuilder {
+  public interface StringTableTypesOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
+      org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
-    // repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;</code>
      */
@@ -44,7 +44,6 @@ public final class DebugJvmProtoBuf {
     org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.RecordOrBuilder getRecordOrBuilder(
         int index);
 
-    // repeated int32 local_name = 5 [packed = true];
     /**
      * <code>repeated int32 local_name = 5 [packed = true];</code>
      *
@@ -74,8 +73,9 @@ public final class DebugJvmProtoBuf {
    * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes}
    */
   public static final class StringTableTypes extends
-      org.jetbrains.kotlin.protobuf.GeneratedMessage
-      implements StringTableTypesOrBuilder {
+      org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
+      StringTableTypesOrBuilder {
     // Use StringTableTypes.newBuilder() to construct.
     private StringTableTypes(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -195,10 +195,10 @@ public final class DebugJvmProtoBuf {
       return PARSER;
     }
 
-    public interface RecordOrBuilder
-        extends org.jetbrains.kotlin.protobuf.MessageOrBuilder {
+    public interface RecordOrBuilder extends
+        // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
+        org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
-      // optional int32 range = 1 [default = 1];
       /**
        * <code>optional int32 range = 1 [default = 1];</code>
        *
@@ -216,7 +216,6 @@ public final class DebugJvmProtoBuf {
        */
       int getRange();
 
-      // optional int32 predefined_index = 2;
       /**
        * <code>optional int32 predefined_index = 2;</code>
        *
@@ -234,7 +233,6 @@ public final class DebugJvmProtoBuf {
        */
       int getPredefinedIndex();
 
-      // optional string string = 6;
       /**
        * <code>optional string string = 6;</code>
        *
@@ -261,7 +259,6 @@ public final class DebugJvmProtoBuf {
       org.jetbrains.kotlin.protobuf.ByteString
           getStringBytes();
 
-      // optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
       /**
        * <code>optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];</code>
        *
@@ -279,7 +276,6 @@ public final class DebugJvmProtoBuf {
        */
       org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation getOperation();
 
-      // repeated int32 substring_index = 4 [packed = true];
       /**
        * <code>repeated int32 substring_index = 4 [packed = true];</code>
        *
@@ -311,7 +307,6 @@ public final class DebugJvmProtoBuf {
        */
       int getSubstringIndex(int index);
 
-      // repeated int32 replace_char = 5 [packed = true];
       /**
        * <code>repeated int32 replace_char = 5 [packed = true];</code>
        *
@@ -344,8 +339,9 @@ public final class DebugJvmProtoBuf {
      * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record}
      */
     public static final class Record extends
-        org.jetbrains.kotlin.protobuf.GeneratedMessage
-        implements RecordOrBuilder {
+        org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+        // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
+        RecordOrBuilder {
       // Use Record.newBuilder() to construct.
       private Record(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
         super(builder);
@@ -455,8 +451,9 @@ public final class DebugJvmProtoBuf {
                 break;
               }
               case 50: {
+                org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
                 bitField0_ |= 0x00000004;
-                string_ = input.readBytes();
+                string_ = bs;
                 break;
               }
             }
@@ -616,7 +613,6 @@ public final class DebugJvmProtoBuf {
       }
 
       private int bitField0_;
-      // optional int32 range = 1 [default = 1];
       public static final int RANGE_FIELD_NUMBER = 1;
       private int range_;
       /**
@@ -640,7 +636,6 @@ public final class DebugJvmProtoBuf {
         return range_;
       }
 
-      // optional int32 predefined_index = 2;
       public static final int PREDEFINED_INDEX_FIELD_NUMBER = 2;
       private int predefinedIndex_;
       /**
@@ -664,7 +659,6 @@ public final class DebugJvmProtoBuf {
         return predefinedIndex_;
       }
 
-      // optional string string = 6;
       public static final int STRING_FIELD_NUMBER = 6;
       private java.lang.Object string_;
       /**
@@ -719,7 +713,6 @@ public final class DebugJvmProtoBuf {
         }
       }
 
-      // optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
       public static final int OPERATION_FIELD_NUMBER = 3;
       private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation operation_;
       /**
@@ -743,7 +736,6 @@ public final class DebugJvmProtoBuf {
         return operation_;
       }
 
-      // repeated int32 substring_index = 4 [packed = true];
       public static final int SUBSTRING_INDEX_FIELD_NUMBER = 4;
       private java.util.List<java.lang.Integer> substringIndex_;
       /**
@@ -785,7 +777,6 @@ public final class DebugJvmProtoBuf {
       }
       private int substringIndexMemoizedSerializedSize = -1;
 
-      // repeated int32 replace_char = 5 [packed = true];
       public static final int REPLACE_CHAR_FIELD_NUMBER = 5;
       private java.util.List<java.lang.Integer> replaceChar_;
       /**
@@ -835,7 +826,8 @@ public final class DebugJvmProtoBuf {
       private byte memoizedIsInitialized = -1;
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
-        if (isInitialized != -1) return isInitialized == 1;
+        if (isInitialized == 1) return true;
+        if (isInitialized == 0) return false;
 
         memoizedIsInitialized = 1;
         return true;
@@ -1005,8 +997,9 @@ public final class DebugJvmProtoBuf {
        * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record}
        */
       public static final class Builder extends
-          org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder>
-         implements org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.RecordOrBuilder {
+          org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
+          // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.RecordOrBuilder {
         public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
             getDescriptor() {
           return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor;
@@ -1182,7 +1175,6 @@ public final class DebugJvmProtoBuf {
         }
         private int bitField0_;
 
-        // optional int32 range = 1 [default = 1];
         private int range_ = 1;
         /**
          * <code>optional int32 range = 1 [default = 1];</code>
@@ -1231,7 +1223,6 @@ public final class DebugJvmProtoBuf {
           return this;
         }
 
-        // optional int32 predefined_index = 2;
         private int predefinedIndex_ ;
         /**
          * <code>optional int32 predefined_index = 2;</code>
@@ -1280,7 +1271,6 @@ public final class DebugJvmProtoBuf {
           return this;
         }
 
-        // optional string string = 6;
         private java.lang.Object string_ = "";
         /**
          * <code>optional string string = 6;</code>
@@ -1302,9 +1292,12 @@ public final class DebugJvmProtoBuf {
         public java.lang.String getString() {
           java.lang.Object ref = string_;
           if (!(ref instanceof java.lang.String)) {
-            java.lang.String s = ((org.jetbrains.kotlin.protobuf.ByteString) ref)
-                .toStringUtf8();
-            string_ = s;
+            org.jetbrains.kotlin.protobuf.ByteString bs =
+                (org.jetbrains.kotlin.protobuf.ByteString) ref;
+            java.lang.String s = bs.toStringUtf8();
+            if (bs.isValidUtf8()) {
+              string_ = s;
+            }
             return s;
           } else {
             return (java.lang.String) ref;
@@ -1378,7 +1371,6 @@ public final class DebugJvmProtoBuf {
           return this;
         }
 
-        // optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
         private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation operation_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation.NONE;
         /**
          * <code>optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];</code>
@@ -1430,7 +1422,6 @@ public final class DebugJvmProtoBuf {
           return this;
         }
 
-        // repeated int32 substring_index = 4 [packed = true];
         private java.util.List<java.lang.Integer> substringIndex_ = java.util.Collections.emptyList();
         private void ensureSubstringIndexIsMutable() {
           if (!((bitField0_ & 0x00000010) == 0x00000010)) {
@@ -1518,7 +1509,8 @@ public final class DebugJvmProtoBuf {
         public Builder addAllSubstringIndex(
             java.lang.Iterable<? extends java.lang.Integer> values) {
           ensureSubstringIndexIsMutable();
-          super.addAll(values, substringIndex_);
+          org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+              values, substringIndex_);
           onChanged();
           return this;
         }
@@ -1538,7 +1530,6 @@ public final class DebugJvmProtoBuf {
           return this;
         }
 
-        // repeated int32 replace_char = 5 [packed = true];
         private java.util.List<java.lang.Integer> replaceChar_ = java.util.Collections.emptyList();
         private void ensureReplaceCharIsMutable() {
           if (!((bitField0_ & 0x00000020) == 0x00000020)) {
@@ -1620,7 +1611,8 @@ public final class DebugJvmProtoBuf {
         public Builder addAllReplaceChar(
             java.lang.Iterable<? extends java.lang.Integer> values) {
           ensureReplaceCharIsMutable();
-          super.addAll(values, replaceChar_);
+          org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+              values, replaceChar_);
           onChanged();
           return this;
         }
@@ -1650,7 +1642,6 @@ public final class DebugJvmProtoBuf {
       // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
     }
 
-    // repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
     public static final int RECORD_FIELD_NUMBER = 1;
     private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record> record_;
     /**
@@ -1686,7 +1677,6 @@ public final class DebugJvmProtoBuf {
       return record_.get(index);
     }
 
-    // repeated int32 local_name = 5 [packed = true];
     public static final int LOCAL_NAME_FIELD_NUMBER = 5;
     private java.util.List<java.lang.Integer> localName_;
     /**
@@ -1729,7 +1719,8 @@ public final class DebugJvmProtoBuf {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       memoizedIsInitialized = 1;
       return true;
@@ -1857,8 +1848,9 @@ public final class DebugJvmProtoBuf {
      * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes}
      */
     public static final class Builder extends
-        org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypesOrBuilder {
+        org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypesOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor;
@@ -2019,7 +2011,6 @@ public final class DebugJvmProtoBuf {
       }
       private int bitField0_;
 
-      // repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
       private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record> record_ =
         java.util.Collections.emptyList();
       private void ensureRecordIsMutable() {
@@ -2161,7 +2152,8 @@ public final class DebugJvmProtoBuf {
           java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record> values) {
         if (recordBuilder_ == null) {
           ensureRecordIsMutable();
-          super.addAll(values, record_);
+          org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+              values, record_);
           onChanged();
         } else {
           recordBuilder_.addAllMessages(values);
@@ -2259,7 +2251,6 @@ public final class DebugJvmProtoBuf {
         return recordBuilder_;
       }
 
-      // repeated int32 local_name = 5 [packed = true];
       private java.util.List<java.lang.Integer> localName_ = java.util.Collections.emptyList();
       private void ensureLocalNameIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
@@ -2335,7 +2326,8 @@ public final class DebugJvmProtoBuf {
       public Builder addAllLocalName(
           java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureLocalNameIsMutable();
-        super.addAll(values, localName_);
+        org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+            values, localName_);
         onChanged();
         return this;
       }
@@ -2364,10 +2356,10 @@ public final class DebugJvmProtoBuf {
     // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
   }
 
-  public interface JvmMethodSignatureOrBuilder
-      extends org.jetbrains.kotlin.protobuf.MessageOrBuilder {
+  public interface JvmMethodSignatureOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
+      org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
-    // optional int32 name = 1;
     /**
      * <code>optional int32 name = 1;</code>
      */
@@ -2377,7 +2369,6 @@ public final class DebugJvmProtoBuf {
      */
     int getName();
 
-    // optional int32 desc = 2;
     /**
      * <code>optional int32 desc = 2;</code>
      *
@@ -2399,8 +2390,9 @@ public final class DebugJvmProtoBuf {
    * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature}
    */
   public static final class JvmMethodSignature extends
-      org.jetbrains.kotlin.protobuf.GeneratedMessage
-      implements JvmMethodSignatureOrBuilder {
+      org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
+      JvmMethodSignatureOrBuilder {
     // Use JvmMethodSignature.newBuilder() to construct.
     private JvmMethodSignature(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -2496,7 +2488,6 @@ public final class DebugJvmProtoBuf {
     }
 
     private int bitField0_;
-    // optional int32 name = 1;
     public static final int NAME_FIELD_NUMBER = 1;
     private int name_;
     /**
@@ -2512,7 +2503,6 @@ public final class DebugJvmProtoBuf {
       return name_;
     }
 
-    // optional int32 desc = 2;
     public static final int DESC_FIELD_NUMBER = 2;
     private int desc_;
     /**
@@ -2543,7 +2533,8 @@ public final class DebugJvmProtoBuf {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       memoizedIsInitialized = 1;
       return true;
@@ -2657,8 +2648,9 @@ public final class DebugJvmProtoBuf {
      * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature}
      */
     public static final class Builder extends
-        org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder {
+        org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor;
@@ -2780,7 +2772,6 @@ public final class DebugJvmProtoBuf {
       }
       private int bitField0_;
 
-      // optional int32 name = 1;
       private int name_ ;
       /**
        * <code>optional int32 name = 1;</code>
@@ -2813,7 +2804,6 @@ public final class DebugJvmProtoBuf {
         return this;
       }
 
-      // optional int32 desc = 2;
       private int desc_ ;
       /**
        * <code>optional int32 desc = 2;</code>
@@ -2873,10 +2863,10 @@ public final class DebugJvmProtoBuf {
     // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
   }
 
-  public interface JvmFieldSignatureOrBuilder
-      extends org.jetbrains.kotlin.protobuf.MessageOrBuilder {
+  public interface JvmFieldSignatureOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
+      org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
-    // optional int32 name = 1;
     /**
      * <code>optional int32 name = 1;</code>
      */
@@ -2886,7 +2876,6 @@ public final class DebugJvmProtoBuf {
      */
     int getName();
 
-    // optional int32 desc = 2;
     /**
      * <code>optional int32 desc = 2;</code>
      *
@@ -2908,8 +2897,9 @@ public final class DebugJvmProtoBuf {
    * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature}
    */
   public static final class JvmFieldSignature extends
-      org.jetbrains.kotlin.protobuf.GeneratedMessage
-      implements JvmFieldSignatureOrBuilder {
+      org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
+      JvmFieldSignatureOrBuilder {
     // Use JvmFieldSignature.newBuilder() to construct.
     private JvmFieldSignature(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -3005,7 +2995,6 @@ public final class DebugJvmProtoBuf {
     }
 
     private int bitField0_;
-    // optional int32 name = 1;
     public static final int NAME_FIELD_NUMBER = 1;
     private int name_;
     /**
@@ -3021,7 +3010,6 @@ public final class DebugJvmProtoBuf {
       return name_;
     }
 
-    // optional int32 desc = 2;
     public static final int DESC_FIELD_NUMBER = 2;
     private int desc_;
     /**
@@ -3052,7 +3040,8 @@ public final class DebugJvmProtoBuf {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       memoizedIsInitialized = 1;
       return true;
@@ -3166,8 +3155,9 @@ public final class DebugJvmProtoBuf {
      * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature}
      */
     public static final class Builder extends
-        org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder {
+        org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor;
@@ -3289,7 +3279,6 @@ public final class DebugJvmProtoBuf {
       }
       private int bitField0_;
 
-      // optional int32 name = 1;
       private int name_ ;
       /**
        * <code>optional int32 name = 1;</code>
@@ -3322,7 +3311,6 @@ public final class DebugJvmProtoBuf {
         return this;
       }
 
-      // optional int32 desc = 2;
       private int desc_ ;
       /**
        * <code>optional int32 desc = 2;</code>
@@ -3382,10 +3370,10 @@ public final class DebugJvmProtoBuf {
     // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
   }
 
-  public interface JvmPropertySignatureOrBuilder
-      extends org.jetbrains.kotlin.protobuf.MessageOrBuilder {
+  public interface JvmPropertySignatureOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
+      org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
-    // optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
     /**
      * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
      */
@@ -3399,7 +3387,6 @@ public final class DebugJvmProtoBuf {
      */
     org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder getFieldOrBuilder();
 
-    // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
     /**
      * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
      *
@@ -3425,7 +3412,6 @@ public final class DebugJvmProtoBuf {
      */
     org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getSyntheticMethodOrBuilder();
 
-    // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
     /**
      * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
      */
@@ -3439,7 +3425,6 @@ public final class DebugJvmProtoBuf {
      */
     org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getGetterOrBuilder();
 
-    // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
     /**
      * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
      */
@@ -3457,8 +3442,9 @@ public final class DebugJvmProtoBuf {
    * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature}
    */
   public static final class JvmPropertySignature extends
-      org.jetbrains.kotlin.protobuf.GeneratedMessage
-      implements JvmPropertySignatureOrBuilder {
+      org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
+      JvmPropertySignatureOrBuilder {
     // Use JvmPropertySignature.newBuilder() to construct.
     private JvmPropertySignature(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -3596,7 +3582,6 @@ public final class DebugJvmProtoBuf {
     }
 
     private int bitField0_;
-    // optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
     public static final int FIELD_FIELD_NUMBER = 1;
     private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature field_;
     /**
@@ -3618,7 +3603,6 @@ public final class DebugJvmProtoBuf {
       return field_;
     }
 
-    // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
     public static final int SYNTHETIC_METHOD_FIELD_NUMBER = 2;
     private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature syntheticMethod_;
     /**
@@ -3652,7 +3636,6 @@ public final class DebugJvmProtoBuf {
       return syntheticMethod_;
     }
 
-    // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
     public static final int GETTER_FIELD_NUMBER = 3;
     private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getter_;
     /**
@@ -3674,7 +3657,6 @@ public final class DebugJvmProtoBuf {
       return getter_;
     }
 
-    // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
     public static final int SETTER_FIELD_NUMBER = 4;
     private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature setter_;
     /**
@@ -3705,7 +3687,8 @@ public final class DebugJvmProtoBuf {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       memoizedIsInitialized = 1;
       return true;
@@ -3833,8 +3816,9 @@ public final class DebugJvmProtoBuf {
      * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature}
      */
     public static final class Builder extends
-        org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignatureOrBuilder {
+        org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignatureOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor;
@@ -4010,7 +3994,6 @@ public final class DebugJvmProtoBuf {
       }
       private int bitField0_;
 
-      // optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
       private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature field_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
           org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder> fieldBuilder_;
@@ -4119,7 +4102,7 @@ public final class DebugJvmProtoBuf {
         if (fieldBuilder_ == null) {
           fieldBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
               org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder>(
-                  field_,
+                  getField(),
                   getParentForChildren(),
                   isClean());
           field_ = null;
@@ -4127,7 +4110,6 @@ public final class DebugJvmProtoBuf {
         return fieldBuilder_;
       }
 
-      // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
       private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature syntheticMethod_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
           org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> syntheticMethodBuilder_;
@@ -4272,7 +4254,7 @@ public final class DebugJvmProtoBuf {
         if (syntheticMethodBuilder_ == null) {
           syntheticMethodBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
               org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder>(
-                  syntheticMethod_,
+                  getSyntheticMethod(),
                   getParentForChildren(),
                   isClean());
           syntheticMethod_ = null;
@@ -4280,7 +4262,6 @@ public final class DebugJvmProtoBuf {
         return syntheticMethodBuilder_;
       }
 
-      // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
       private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getter_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
           org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> getterBuilder_;
@@ -4389,7 +4370,7 @@ public final class DebugJvmProtoBuf {
         if (getterBuilder_ == null) {
           getterBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
               org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder>(
-                  getter_,
+                  getGetter(),
                   getParentForChildren(),
                   isClean());
           getter_ = null;
@@ -4397,7 +4378,6 @@ public final class DebugJvmProtoBuf {
         return getterBuilder_;
       }
 
-      // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
       private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature setter_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
           org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> setterBuilder_;
@@ -4506,7 +4486,7 @@ public final class DebugJvmProtoBuf {
         if (setterBuilder_ == null) {
           setterBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
               org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder>(
-                  setter_,
+                  getSetter(),
                   getParentForChildren(),
                   isClean());
           setter_ = null;
@@ -4594,6 +4574,10 @@ public final class DebugJvmProtoBuf {
   public static final int CLASS_MODULE_NAME_FIELD_NUMBER = 101;
   /**
    * <code>extend .org.jetbrains.kotlin.serialization.Class { ... }</code>
+   *
+   * <pre>
+   * If absent, assumed to be JvmAbi.DEFAULT_MODULE_NAME
+   * </pre>
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
@@ -4613,27 +4597,27 @@ public final class DebugJvmProtoBuf {
           .newFileScopedGeneratedExtension(
         java.lang.Integer.class,
         null);
-  private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+  private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
     internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_fieldAccessorTable;
-  private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+  private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
     internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_fieldAccessorTable;
-  private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+  private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
     internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_fieldAccessorTable;
-  private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+  private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
     internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_fieldAccessorTable;
-  private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+  private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
     internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
@@ -4699,65 +4683,69 @@ public final class DebugJvmProtoBuf {
       "\022B\020DebugJvmProtoBuf"
     };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-      new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
-        public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
-            org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
-          descriptor = root;
-          internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor =
-            getDescriptor().getMessageTypes().get(0);
-          internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_fieldAccessorTable = new
-            org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor,
-              new java.lang.String[] { "Record", "LocalName", });
-          internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor =
-            internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor.getNestedTypes().get(0);
-          internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_fieldAccessorTable = new
-            org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor,
-              new java.lang.String[] { "Range", "PredefinedIndex", "String", "Operation", "SubstringIndex", "ReplaceChar", });
-          internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor =
-            getDescriptor().getMessageTypes().get(1);
-          internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_fieldAccessorTable = new
-            org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor,
-              new java.lang.String[] { "Name", "Desc", });
-          internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor =
-            getDescriptor().getMessageTypes().get(2);
-          internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_fieldAccessorTable = new
-            org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor,
-              new java.lang.String[] { "Name", "Desc", });
-          internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor =
-            getDescriptor().getMessageTypes().get(3);
-          internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_fieldAccessorTable = new
-            org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor,
-              new java.lang.String[] { "Field", "SyntheticMethod", "Getter", "Setter", });
-          constructorSignature.internalInit(descriptor.getExtensions().get(0));
-          methodSignature.internalInit(descriptor.getExtensions().get(1));
-          propertySignature.internalInit(descriptor.getExtensions().get(2));
-          typeAnnotation.internalInit(descriptor.getExtensions().get(3));
-          isRaw.internalInit(descriptor.getExtensions().get(4));
-          typeParameterAnnotation.internalInit(descriptor.getExtensions().get(5));
-          classModuleName.internalInit(descriptor.getExtensions().get(6));
-          packageModuleName.internalInit(descriptor.getExtensions().get(7));
-          org.jetbrains.kotlin.protobuf.ExtensionRegistry registry =
-            org.jetbrains.kotlin.protobuf.ExtensionRegistry.newInstance();
-          registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
-          registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
-          registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
-          registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
-          registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
-          registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
-          return registry;
-        }
-      };
+        new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
+              org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
           org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.getDescriptor(),
           org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor(),
         }, assigner);
+    internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_fieldAccessorTable = new
+      org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor,
+        new java.lang.String[] { "Record", "LocalName", });
+    internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor =
+      internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor.getNestedTypes().get(0);
+    internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_fieldAccessorTable = new
+      org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor,
+        new java.lang.String[] { "Range", "PredefinedIndex", "String", "Operation", "SubstringIndex", "ReplaceChar", });
+    internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor =
+      getDescriptor().getMessageTypes().get(1);
+    internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_fieldAccessorTable = new
+      org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor,
+        new java.lang.String[] { "Name", "Desc", });
+    internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor =
+      getDescriptor().getMessageTypes().get(2);
+    internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_fieldAccessorTable = new
+      org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor,
+        new java.lang.String[] { "Name", "Desc", });
+    internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor =
+      getDescriptor().getMessageTypes().get(3);
+    internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_fieldAccessorTable = new
+      org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor,
+        new java.lang.String[] { "Field", "SyntheticMethod", "Getter", "Setter", });
+    constructorSignature.internalInit(descriptor.getExtensions().get(0));
+    methodSignature.internalInit(descriptor.getExtensions().get(1));
+    propertySignature.internalInit(descriptor.getExtensions().get(2));
+    typeAnnotation.internalInit(descriptor.getExtensions().get(3));
+    isRaw.internalInit(descriptor.getExtensions().get(4));
+    typeParameterAnnotation.internalInit(descriptor.getExtensions().get(5));
+    classModuleName.internalInit(descriptor.getExtensions().get(6));
+    packageModuleName.internalInit(descriptor.getExtensions().get(7));
+    org.jetbrains.kotlin.protobuf.ExtensionRegistry registry =
+        org.jetbrains.kotlin.protobuf.ExtensionRegistry.newInstance();
+    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
+    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
+    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
+    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
+    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
+    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
+    org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
+        .internalUpdateFileDescriptor(descriptor, registry);
+    org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.getDescriptor();
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)

build.xml

@@ -24,8 +24,8 @@
     <property name="build.number" value="snapshot"/>
     <property name="bootstrap.build.no.tests" value="false"/>
     <property name="idea.sdk" value="${basedir}/ideaSDK"/>
-    <property name="protobuf.jar" value="${basedir}/dependencies/protobuf-2.5.0.jar"/>
-    <property name="protobuf-lite.jar" value="${basedir}/dependencies/protobuf-2.5.0-lite.jar"/>
+    <property name="protobuf.jar" value="${basedir}/dependencies/protobuf-2.6.1.jar"/>
+    <property name="protobuf-lite.jar" value="${basedir}/dependencies/protobuf-2.6.1-lite.jar"/>
     <property name="javax.inject.jar" value="${basedir}/lib/javax.inject.jar"/>
 
     <property name="java.target" value="1.6"/>

compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt

@@ -133,7 +133,7 @@ class BuiltInsSerializer(private val dependOnOldBuiltIns: Boolean) {
 
         private fun serializeClass(classDescriptor: ClassDescriptor) {
             val classProto = DescriptorSerializer.createTopLevel(extension).classProto(classDescriptor).build()
-            proto.addClass(classProto)
+            proto.addClass_(classProto)
 
             serializeClasses(classDescriptor.unsubstitutedInnerClassesScope)
         }

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

@@ -8,10 +8,10 @@ public final class JvmPackageTable {
   public static void registerAllExtensions(
       org.jetbrains.kotlin.protobuf.ExtensionRegistryLite registry) {
   }
-  public interface PackageTableOrBuilder
-      extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
+  public interface PackageTableOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.PackageTable)
+      org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
-    // repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
      */
@@ -30,14 +30,15 @@ public final class JvmPackageTable {
    * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageTable}
    */
   public static final class PackageTable extends
-      org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-      implements PackageTableOrBuilder {
+      org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.PackageTable)
+      PackageTableOrBuilder {
     // Use PackageTable.newBuilder() to construct.
     private PackageTable(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
       super(builder);
-
+      this.unknownFields = builder.getUnknownFields();
     }
-    private PackageTable(boolean noInit) {}
+    private PackageTable(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
 
     private static final PackageTable defaultInstance;
     public static PackageTable getDefaultInstance() {
@@ -48,12 +49,18 @@ public final class JvmPackageTable {
       return defaultInstance;
     }
 
+    private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
     private PackageTable(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       initFields();
       int mutable_bitField0_ = 0;
+      org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput =
+          org.jetbrains.kotlin.protobuf.ByteString.newOutput();
+      org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput =
+          org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance(
+              unknownFieldsOutput);
       try {
         boolean done = false;
         while (!done) {
@@ -63,7 +70,7 @@ public final class JvmPackageTable {
               done = true;
               break;
             default: {
-              if (!parseUnknownField(input,
+              if (!parseUnknownField(input, unknownFieldsCodedOutput,
                                      extensionRegistry, tag)) {
                 done = true;
               }
@@ -88,6 +95,13 @@ public final class JvmPackageTable {
         if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
           packageParts_ = java.util.Collections.unmodifiableList(packageParts_);
         }
+        try {
+          unknownFieldsCodedOutput.flush();
+        } catch (java.io.IOException e) {
+        // Should not happen
+        } finally {
+          unknownFields = unknownFieldsOutput.toByteString();
+        }
         makeExtensionsImmutable();
       }
     }
@@ -106,7 +120,6 @@ public final class JvmPackageTable {
       return PARSER;
     }
 
-    // repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
     public static final int PACKAGE_PARTS_FIELD_NUMBER = 1;
     private java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts> packageParts_;
     /**
@@ -148,7 +161,8 @@ public final class JvmPackageTable {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       for (int i = 0; i < getPackagePartsCount(); i++) {
         if (!getPackageParts(i).isInitialized()) {
@@ -166,6 +180,7 @@ public final class JvmPackageTable {
       for (int i = 0; i < packageParts_.size(); i++) {
         output.writeMessage(1, packageParts_.get(i));
       }
+      output.writeRawBytes(unknownFields);
     }
 
     private int memoizedSerializedSize = -1;
@@ -178,6 +193,7 @@ public final class JvmPackageTable {
         size += org.jetbrains.kotlin.protobuf.CodedOutputStream
           .computeMessageSize(1, packageParts_.get(i));
       }
+      size += unknownFields.size();
       memoizedSerializedSize = size;
       return size;
     }
@@ -255,7 +271,9 @@ public final class JvmPackageTable {
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
           org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable, Builder>
-        implements org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTableOrBuilder {
+        implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.PackageTable)
+        org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTableOrBuilder {
       // Construct using org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
@@ -313,6 +331,8 @@ public final class JvmPackageTable {
           }
           
         }
+        setUnknownFields(
+            getUnknownFields().concat(other.unknownFields));
         return this;
       }
 
@@ -345,7 +365,6 @@ public final class JvmPackageTable {
       }
       private int bitField0_;
 
-      // repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
       private java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts> packageParts_ =
         java.util.Collections.emptyList();
       private void ensurePackagePartsIsMutable() {
@@ -447,7 +466,8 @@ public final class JvmPackageTable {
       public Builder addAllPackageParts(
           java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts> values) {
         ensurePackagePartsIsMutable();
-        super.addAll(values, packageParts_);
+        org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+            values, packageParts_);
 
         return this;
       }
@@ -481,10 +501,10 @@ public final class JvmPackageTable {
     // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.PackageTable)
   }
 
-  public interface PackagePartsOrBuilder
-      extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
+  public interface PackagePartsOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+      org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
-    // required string package_fq_name = 1;
     /**
      * <code>required string package_fq_name = 1;</code>
      */
@@ -499,12 +519,11 @@ public final class JvmPackageTable {
     org.jetbrains.kotlin.protobuf.ByteString
         getPackageFqNameBytes();
 
-    // repeated string class_name = 2;
     /**
      * <code>repeated string class_name = 2;</code>
      */
-    java.util.List<java.lang.String>
-    getClassNameList();
+    org.jetbrains.kotlin.protobuf.ProtocolStringList
+        getClassNameList();
     /**
      * <code>repeated string class_name = 2;</code>
      */
@@ -523,14 +542,15 @@ public final class JvmPackageTable {
    * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageParts}
    */
   public static final class PackageParts extends
-      org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-      implements PackagePartsOrBuilder {
+      org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+      PackagePartsOrBuilder {
     // Use PackageParts.newBuilder() to construct.
     private PackageParts(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
       super(builder);
-
+      this.unknownFields = builder.getUnknownFields();
     }
-    private PackageParts(boolean noInit) {}
+    private PackageParts(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
 
     private static final PackageParts defaultInstance;
     public static PackageParts getDefaultInstance() {
@@ -541,12 +561,18 @@ public final class JvmPackageTable {
       return defaultInstance;
     }
 
+    private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
     private PackageParts(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       initFields();
       int mutable_bitField0_ = 0;
+      org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput =
+          org.jetbrains.kotlin.protobuf.ByteString.newOutput();
+      org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput =
+          org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance(
+              unknownFieldsOutput);
       try {
         boolean done = false;
         while (!done) {
@@ -556,23 +582,25 @@ public final class JvmPackageTable {
               done = true;
               break;
             default: {
-              if (!parseUnknownField(input,
+              if (!parseUnknownField(input, unknownFieldsCodedOutput,
                                      extensionRegistry, tag)) {
                 done = true;
               }
               break;
             }
             case 10: {
+              org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
-              packageFqName_ = input.readBytes();
+              packageFqName_ = bs;
               break;
             }
             case 18: {
+              org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
                 className_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              className_.add(input.readBytes());
+              className_.add(bs);
               break;
             }
           }
@@ -584,7 +612,14 @@ public final class JvmPackageTable {
             e.getMessage()).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-          className_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList(className_);
+          className_ = className_.getUnmodifiableView();
+        }
+        try {
+          unknownFieldsCodedOutput.flush();
+        } catch (java.io.IOException e) {
+        // Should not happen
+        } finally {
+          unknownFields = unknownFieldsOutput.toByteString();
         }
         makeExtensionsImmutable();
       }
@@ -605,7 +640,6 @@ public final class JvmPackageTable {
     }
 
     private int bitField0_;
-    // required string package_fq_name = 1;
     public static final int PACKAGE_FQ_NAME_FIELD_NUMBER = 1;
     private java.lang.Object packageFqName_;
     /**
@@ -648,13 +682,12 @@ public final class JvmPackageTable {
       }
     }
 
-    // repeated string class_name = 2;
     public static final int CLASS_NAME_FIELD_NUMBER = 2;
     private org.jetbrains.kotlin.protobuf.LazyStringList className_;
     /**
      * <code>repeated string class_name = 2;</code>
      */
-    public java.util.List<java.lang.String>
+    public org.jetbrains.kotlin.protobuf.ProtocolStringList
         getClassNameList() {
       return className_;
     }
@@ -685,7 +718,8 @@ public final class JvmPackageTable {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       if (!hasPackageFqName()) {
         memoizedIsInitialized = 0;
@@ -704,6 +738,7 @@ public final class JvmPackageTable {
       for (int i = 0; i < className_.size(); i++) {
         output.writeBytes(2, className_.getByteString(i));
       }
+      output.writeRawBytes(unknownFields);
     }
 
     private int memoizedSerializedSize = -1;
@@ -725,6 +760,7 @@ public final class JvmPackageTable {
         size += dataSize;
         size += 1 * getClassNameList().size();
       }
+      size += unknownFields.size();
       memoizedSerializedSize = size;
       return size;
     }
@@ -802,7 +838,9 @@ public final class JvmPackageTable {
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
           org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts, Builder>
-        implements org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackagePartsOrBuilder {
+        implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+        org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackagePartsOrBuilder {
       // Construct using org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
@@ -848,8 +886,7 @@ public final class JvmPackageTable {
         }
         result.packageFqName_ = packageFqName_;
         if (((bitField0_ & 0x00000002) == 0x00000002)) {
-          className_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList(
-              className_);
+          className_ = className_.getUnmodifiableView();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.className_ = className_;
@@ -874,6 +911,8 @@ public final class JvmPackageTable {
           }
           
         }
+        setUnknownFields(
+            getUnknownFields().concat(other.unknownFields));
         return this;
       }
 
@@ -904,7 +943,6 @@ public final class JvmPackageTable {
       }
       private int bitField0_;
 
-      // required string package_fq_name = 1;
       private java.lang.Object packageFqName_ = "";
       /**
        * <code>required string package_fq_name = 1;</code>
@@ -918,9 +956,12 @@ public final class JvmPackageTable {
       public java.lang.String getPackageFqName() {
         java.lang.Object ref = packageFqName_;
         if (!(ref instanceof java.lang.String)) {
-          java.lang.String s = ((org.jetbrains.kotlin.protobuf.ByteString) ref)
-              .toStringUtf8();
-          packageFqName_ = s;
+          org.jetbrains.kotlin.protobuf.ByteString bs =
+              (org.jetbrains.kotlin.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (bs.isValidUtf8()) {
+            packageFqName_ = s;
+          }
           return s;
         } else {
           return (java.lang.String) ref;
@@ -978,7 +1019,6 @@ public final class JvmPackageTable {
         return this;
       }
 
-      // repeated string class_name = 2;
       private org.jetbrains.kotlin.protobuf.LazyStringList className_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
       private void ensureClassNameIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
@@ -989,9 +1029,9 @@ public final class JvmPackageTable {
       /**
        * <code>repeated string class_name = 2;</code>
        */
-      public java.util.List<java.lang.String>
+      public org.jetbrains.kotlin.protobuf.ProtocolStringList
           getClassNameList() {
-        return java.util.Collections.unmodifiableList(className_);
+        return className_.getUnmodifiableView();
       }
       /**
        * <code>repeated string class_name = 2;</code>
@@ -1044,7 +1084,8 @@ public final class JvmPackageTable {
       public Builder addAllClassName(
           java.lang.Iterable<java.lang.String> values) {
         ensureClassNameIsMutable();
-        super.addAll(values, className_);
+        org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+            values, className_);
         
         return this;
       }

core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsClassDataFinder.kt

@@ -29,7 +29,7 @@ class BuiltInsClassDataFinder(
         private val nameResolver: NameResolver
 ) : ClassDataFinder {
     private val classIdToProto =
-            proto.classList.associateBy { klass ->
+            proto.class_List.associateBy { klass ->
                 nameResolver.getClassId(klass.fqName)
             }
 

core/deserialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java

@@ -18,10 +18,10 @@ public final class BuiltInsProtoBuf {
     registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.typeAnnotation);
     registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.typeParameterAnnotation);
   }
-  public interface BuiltInsOrBuilder
-      extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
+  public interface BuiltInsOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.builtins.BuiltIns)
+      org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
-    // optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
     /**
      * <code>optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;</code>
      */
@@ -31,7 +31,6 @@ public final class BuiltInsProtoBuf {
      */
     org.jetbrains.kotlin.serialization.ProtoBuf.StringTable getStrings();
 
-    // optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
     /**
      * <code>optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;</code>
      */
@@ -41,7 +40,6 @@ public final class BuiltInsProtoBuf {
      */
     org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable getQualifiedNames();
 
-    // optional .org.jetbrains.kotlin.serialization.Package package = 3;
     /**
      * <code>optional .org.jetbrains.kotlin.serialization.Package package = 3;</code>
      */
@@ -51,33 +49,33 @@ public final class BuiltInsProtoBuf {
      */
     org.jetbrains.kotlin.serialization.ProtoBuf.Package getPackage();
 
-    // repeated .org.jetbrains.kotlin.serialization.Class class = 4;
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
      */
     java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Class> 
-        getClassList();
+        getClass_List();
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Class getClass(int index);
+    org.jetbrains.kotlin.serialization.ProtoBuf.Class getClass_(int index);
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
      */
-    int getClassCount();
+    int getClass_Count();
   }
   /**
    * Protobuf type {@code org.jetbrains.kotlin.serialization.builtins.BuiltIns}
    */
   public static final class BuiltIns extends
-      org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-      implements BuiltInsOrBuilder {
+      org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.builtins.BuiltIns)
+      BuiltInsOrBuilder {
     // Use BuiltIns.newBuilder() to construct.
     private BuiltIns(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
       super(builder);
-
+      this.unknownFields = builder.getUnknownFields();
     }
-    private BuiltIns(boolean noInit) {}
+    private BuiltIns(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
 
     private static final BuiltIns defaultInstance;
     public static BuiltIns getDefaultInstance() {
@@ -88,12 +86,18 @@ public final class BuiltInsProtoBuf {
       return defaultInstance;
     }
 
+    private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
     private BuiltIns(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       initFields();
       int mutable_bitField0_ = 0;
+      org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput =
+          org.jetbrains.kotlin.protobuf.ByteString.newOutput();
+      org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput =
+          org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance(
+              unknownFieldsOutput);
       try {
         boolean done = false;
         while (!done) {
@@ -103,7 +107,7 @@ public final class BuiltInsProtoBuf {
               done = true;
               break;
             default: {
-              if (!parseUnknownField(input,
+              if (!parseUnknownField(input, unknownFieldsCodedOutput,
                                      extensionRegistry, tag)) {
                 done = true;
               }
@@ -150,10 +154,10 @@ public final class BuiltInsProtoBuf {
             }
             case 34: {
               if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-                class_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.ProtoBuf.Class>();
+                class__ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.ProtoBuf.Class>();
                 mutable_bitField0_ |= 0x00000008;
               }
-              class_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Class.PARSER, extensionRegistry));
+              class__.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Class.PARSER, extensionRegistry));
               break;
             }
           }
@@ -165,7 +169,14 @@ public final class BuiltInsProtoBuf {
             e.getMessage()).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-          class_ = java.util.Collections.unmodifiableList(class_);
+          class__ = java.util.Collections.unmodifiableList(class__);
+        }
+        try {
+          unknownFieldsCodedOutput.flush();
+        } catch (java.io.IOException e) {
+        // Should not happen
+        } finally {
+          unknownFields = unknownFieldsOutput.toByteString();
         }
         makeExtensionsImmutable();
       }
@@ -186,7 +197,6 @@ public final class BuiltInsProtoBuf {
     }
 
     private int bitField0_;
-    // optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
     public static final int STRINGS_FIELD_NUMBER = 1;
     private org.jetbrains.kotlin.serialization.ProtoBuf.StringTable strings_;
     /**
@@ -202,7 +212,6 @@ public final class BuiltInsProtoBuf {
       return strings_;
     }
 
-    // optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
     public static final int QUALIFIED_NAMES_FIELD_NUMBER = 2;
     private org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable qualifiedNames_;
     /**
@@ -218,7 +227,6 @@ public final class BuiltInsProtoBuf {
       return qualifiedNames_;
     }
 
-    // optional .org.jetbrains.kotlin.serialization.Package package = 3;
     public static final int PACKAGE_FIELD_NUMBER = 3;
     private org.jetbrains.kotlin.serialization.ProtoBuf.Package package_;
     /**
@@ -234,52 +242,52 @@ public final class BuiltInsProtoBuf {
       return package_;
     }
 
-    // repeated .org.jetbrains.kotlin.serialization.Class class = 4;
     public static final int CLASS_FIELD_NUMBER = 4;
-    private java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Class> class_;
+    private java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Class> class__;
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
      */
-    public java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Class> getClassList() {
-      return class_;
+    public java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Class> getClass_List() {
+      return class__;
     }
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
      */
     public java.util.List<? extends org.jetbrains.kotlin.serialization.ProtoBuf.ClassOrBuilder> 
-        getClassOrBuilderList() {
-      return class_;
+        getClass_OrBuilderList() {
+      return class__;
     }
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
      */
-    public int getClassCount() {
-      return class_.size();
+    public int getClass_Count() {
+      return class__.size();
     }
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Class getClass(int index) {
-      return class_.get(index);
+    public org.jetbrains.kotlin.serialization.ProtoBuf.Class getClass_(int index) {
+      return class__.get(index);
     }
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.ClassOrBuilder getClassOrBuilder(
+    public org.jetbrains.kotlin.serialization.ProtoBuf.ClassOrBuilder getClass_OrBuilder(
         int index) {
-      return class_.get(index);
+      return class__.get(index);
     }
 
     private void initFields() {
       strings_ = org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance();
       qualifiedNames_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance();
       package_ = org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance();
-      class_ = java.util.Collections.emptyList();
+      class__ = java.util.Collections.emptyList();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       if (hasQualifiedNames()) {
         if (!getQualifiedNames().isInitialized()) {
@@ -293,8 +301,8 @@ public final class BuiltInsProtoBuf {
           return false;
         }
       }
-      for (int i = 0; i < getClassCount(); i++) {
-        if (!getClass(i).isInitialized()) {
+      for (int i = 0; i < getClass_Count(); i++) {
+        if (!getClass_(i).isInitialized()) {
           memoizedIsInitialized = 0;
           return false;
         }
@@ -315,9 +323,10 @@ public final class BuiltInsProtoBuf {
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         output.writeMessage(3, package_);
       }
-      for (int i = 0; i < class_.size(); i++) {
-        output.writeMessage(4, class_.get(i));
+      for (int i = 0; i < class__.size(); i++) {
+        output.writeMessage(4, class__.get(i));
       }
+      output.writeRawBytes(unknownFields);
     }
 
     private int memoizedSerializedSize = -1;
@@ -338,10 +347,11 @@ public final class BuiltInsProtoBuf {
         size += org.jetbrains.kotlin.protobuf.CodedOutputStream
           .computeMessageSize(3, package_);
       }
-      for (int i = 0; i < class_.size(); i++) {
+      for (int i = 0; i < class__.size(); i++) {
         size += org.jetbrains.kotlin.protobuf.CodedOutputStream
-          .computeMessageSize(4, class_.get(i));
+          .computeMessageSize(4, class__.get(i));
       }
+      size += unknownFields.size();
       memoizedSerializedSize = size;
       return size;
     }
@@ -419,7 +429,9 @@ public final class BuiltInsProtoBuf {
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
           org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns, Builder>
-        implements org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltInsOrBuilder {
+        implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.builtins.BuiltIns)
+        org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltInsOrBuilder {
       // Construct using org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
@@ -439,7 +451,7 @@ public final class BuiltInsProtoBuf {
         bitField0_ = (bitField0_ & ~0x00000002);
         package_ = org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000004);
-        class_ = java.util.Collections.emptyList();
+        class__ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
@@ -477,10 +489,10 @@ public final class BuiltInsProtoBuf {
         }
         result.package_ = package_;
         if (((bitField0_ & 0x00000008) == 0x00000008)) {
-          class_ = java.util.Collections.unmodifiableList(class_);
+          class__ = java.util.Collections.unmodifiableList(class__);
           bitField0_ = (bitField0_ & ~0x00000008);
         }
-        result.class_ = class_;
+        result.class__ = class__;
         result.bitField0_ = to_bitField0_;
         return result;
       }
@@ -496,16 +508,18 @@ public final class BuiltInsProtoBuf {
         if (other.hasPackage()) {
           mergePackage(other.getPackage());
         }
-        if (!other.class_.isEmpty()) {
-          if (class_.isEmpty()) {
-            class_ = other.class_;
+        if (!other.class__.isEmpty()) {
+          if (class__.isEmpty()) {
+            class__ = other.class__;
             bitField0_ = (bitField0_ & ~0x00000008);
           } else {
-            ensureClassIsMutable();
-            class_.addAll(other.class_);
+            ensureClass_IsMutable();
+            class__.addAll(other.class__);
           }
           
         }
+        setUnknownFields(
+            getUnknownFields().concat(other.unknownFields));
         return this;
       }
 
@@ -522,8 +536,8 @@ public final class BuiltInsProtoBuf {
             return false;
           }
         }
-        for (int i = 0; i < getClassCount(); i++) {
-          if (!getClass(i).isInitialized()) {
+        for (int i = 0; i < getClass_Count(); i++) {
+          if (!getClass_(i).isInitialized()) {
             
             return false;
           }
@@ -550,7 +564,6 @@ public final class BuiltInsProtoBuf {
       }
       private int bitField0_;
 
-      // optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
       private org.jetbrains.kotlin.serialization.ProtoBuf.StringTable strings_ = org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance();
       /**
        * <code>optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;</code>
@@ -611,7 +624,6 @@ public final class BuiltInsProtoBuf {
         return this;
       }
 
-      // optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
       private org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable qualifiedNames_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance();
       /**
        * <code>optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;</code>
@@ -672,7 +684,6 @@ public final class BuiltInsProtoBuf {
         return this;
       }
 
-      // optional .org.jetbrains.kotlin.serialization.Package package = 3;
       private org.jetbrains.kotlin.serialization.ProtoBuf.Package package_ = org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance();
       /**
        * <code>optional .org.jetbrains.kotlin.serialization.Package package = 3;</code>
@@ -733,12 +744,11 @@ public final class BuiltInsProtoBuf {
         return this;
       }
 
-      // repeated .org.jetbrains.kotlin.serialization.Class class = 4;
-      private java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Class> class_ =
+      private java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Class> class__ =
         java.util.Collections.emptyList();
-      private void ensureClassIsMutable() {
+      private void ensureClass_IsMutable() {
         if (!((bitField0_ & 0x00000008) == 0x00000008)) {
-          class_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.ProtoBuf.Class>(class_);
+          class__ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.ProtoBuf.Class>(class__);
           bitField0_ |= 0x00000008;
          }
       }
@@ -746,104 +756,105 @@ public final class BuiltInsProtoBuf {
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Class> getClassList() {
-        return java.util.Collections.unmodifiableList(class_);
+      public java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Class> getClass_List() {
+        return java.util.Collections.unmodifiableList(class__);
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public int getClassCount() {
-        return class_.size();
+      public int getClass_Count() {
+        return class__.size();
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Class getClass(int index) {
-        return class_.get(index);
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Class getClass_(int index) {
+        return class__.get(index);
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public Builder setClass(
+      public Builder setClass_(
           int index, org.jetbrains.kotlin.serialization.ProtoBuf.Class value) {
         if (value == null) {
           throw new NullPointerException();
         }
-        ensureClassIsMutable();
-        class_.set(index, value);
+        ensureClass_IsMutable();
+        class__.set(index, value);
 
         return this;
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public Builder setClass(
+      public Builder setClass_(
           int index, org.jetbrains.kotlin.serialization.ProtoBuf.Class.Builder builderForValue) {
-        ensureClassIsMutable();
-        class_.set(index, builderForValue.build());
+        ensureClass_IsMutable();
+        class__.set(index, builderForValue.build());
 
         return this;
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public Builder addClass(org.jetbrains.kotlin.serialization.ProtoBuf.Class value) {
+      public Builder addClass_(org.jetbrains.kotlin.serialization.ProtoBuf.Class value) {
         if (value == null) {
           throw new NullPointerException();
         }
-        ensureClassIsMutable();
-        class_.add(value);
+        ensureClass_IsMutable();
+        class__.add(value);
 
         return this;
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public Builder addClass(
+      public Builder addClass_(
           int index, org.jetbrains.kotlin.serialization.ProtoBuf.Class value) {
         if (value == null) {
           throw new NullPointerException();
         }
-        ensureClassIsMutable();
-        class_.add(index, value);
+        ensureClass_IsMutable();
+        class__.add(index, value);
 
         return this;
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public Builder addClass(
+      public Builder addClass_(
           org.jetbrains.kotlin.serialization.ProtoBuf.Class.Builder builderForValue) {
-        ensureClassIsMutable();
-        class_.add(builderForValue.build());
+        ensureClass_IsMutable();
+        class__.add(builderForValue.build());
 
         return this;
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public Builder addClass(
+      public Builder addClass_(
           int index, org.jetbrains.kotlin.serialization.ProtoBuf.Class.Builder builderForValue) {
-        ensureClassIsMutable();
-        class_.add(index, builderForValue.build());
+        ensureClass_IsMutable();
+        class__.add(index, builderForValue.build());
 
         return this;
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public Builder addAllClass(
+      public Builder addAllClass_(
           java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.ProtoBuf.Class> values) {
-        ensureClassIsMutable();
-        super.addAll(values, class_);
+        ensureClass_IsMutable();
+        org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+            values, class__);
 
         return this;
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public Builder clearClass() {
-        class_ = java.util.Collections.emptyList();
+      public Builder clearClass_() {
+        class__ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000008);
 
         return this;
@@ -851,9 +862,9 @@ public final class BuiltInsProtoBuf {
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
        */
-      public Builder removeClass(int index) {
-        ensureClassIsMutable();
-        class_.remove(index);
+      public Builder removeClass_(int index) {
+        ensureClass_IsMutable();
+        class__.remove(index);
 
         return this;
       }
@@ -883,7 +894,8 @@ public final class BuiltInsProtoBuf {
         null,
         null,
         151,
-        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.INT32);
+        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.INT32,
+        java.lang.Integer.class);
   public static final int CLASS_ANNOTATION_FIELD_NUMBER = 150;
   /**
    * <code>extend .org.jetbrains.kotlin.serialization.Class { ... }</code>
@@ -898,7 +910,8 @@ public final class BuiltInsProtoBuf {
         null,
         150,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
+        false,
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
   public static final int CONSTRUCTOR_ANNOTATION_FIELD_NUMBER = 150;
   /**
    * <code>extend .org.jetbrains.kotlin.serialization.Constructor { ... }</code>
@@ -913,7 +926,8 @@ public final class BuiltInsProtoBuf {
         null,
         150,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
+        false,
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
   public static final int FUNCTION_ANNOTATION_FIELD_NUMBER = 150;
   /**
    * <code>extend .org.jetbrains.kotlin.serialization.Function { ... }</code>
@@ -928,7 +942,8 @@ public final class BuiltInsProtoBuf {
         null,
         150,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
+        false,
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
   public static final int PROPERTY_ANNOTATION_FIELD_NUMBER = 150;
   /**
    * <code>extend .org.jetbrains.kotlin.serialization.Property { ... }</code>
@@ -943,7 +958,8 @@ public final class BuiltInsProtoBuf {
         null,
         150,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
+        false,
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
   public static final int COMPILE_TIME_VALUE_FIELD_NUMBER = 151;
   /**
    * <code>extend .org.jetbrains.kotlin.serialization.Property { ... }</code>
@@ -958,7 +974,8 @@ public final class BuiltInsProtoBuf {
         org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance(),
         null,
         151,
-        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE);
+        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.class);
   public static final int ENUM_ENTRY_ANNOTATION_FIELD_NUMBER = 150;
   /**
    * <code>extend .org.jetbrains.kotlin.serialization.EnumEntry { ... }</code>
@@ -973,7 +990,8 @@ public final class BuiltInsProtoBuf {
         null,
         150,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
+        false,
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
   public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 150;
   /**
    * <code>extend .org.jetbrains.kotlin.serialization.ValueParameter { ... }</code>
@@ -988,7 +1006,8 @@ public final class BuiltInsProtoBuf {
         null,
         150,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
+        false,
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
   public static final int TYPE_ANNOTATION_FIELD_NUMBER = 150;
   /**
    * <code>extend .org.jetbrains.kotlin.serialization.Type { ... }</code>
@@ -1003,7 +1022,8 @@ public final class BuiltInsProtoBuf {
         null,
         150,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
+        false,
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
   public static final int TYPE_PARAMETER_ANNOTATION_FIELD_NUMBER = 150;
   /**
    * <code>extend .org.jetbrains.kotlin.serialization.TypeParameter { ... }</code>
@@ -1018,7 +1038,8 @@ public final class BuiltInsProtoBuf {
         null,
         150,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
+        false,
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
 
   static {
   }

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

@@ -23,7 +23,7 @@ import java.io.File
 import java.util.regex.Pattern
 
 // This file generates protobuf classes from formal description.
-// To run it, you'll need protoc (protobuf compiler) 2.5.0 installed.
+// To run it, you'll need protoc (protobuf compiler) 2.6.1 installed.
 //
 // * Windows: download and unpack from here: https://code.google.com/p/protobuf/downloads/list
 // * Ubuntu: install "protobuf-compiler" package
@@ -70,6 +70,7 @@ fun main(args: Array<String>) {
             modifyAndExecProtoc(protoPath)
         }
 
+        println()
         println("Do not forget to run GenerateProtoBufCompare")
     }
     catch (e: Throwable) {
@@ -89,8 +90,8 @@ private fun checkVersion() {
     if (version.isEmpty()) {
         throw AssertionError("Output is empty, stderr: ${processOutput.stderr}")
     }
-    if (version != "libprotoc 2.5.0") {
-        throw AssertionError("Expected protoc 2.5.0, but was: $version")
+    if (version != "libprotoc 2.6.1") {
+        throw AssertionError("Expected protoc 2.6.1, but was: $version")
     }
 }
 

idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDecompiler.kt

@@ -96,10 +96,10 @@ sealed class BuiltInDefinitionFile {
         val packageFqName = nameResolver.getPackageFqName(proto.`package`.getExtension(BuiltInsProtoBuf.packageFqName))
 
         val classesToDecompile =
-                if (FILTER_OUT_CLASSES_EXISTING_AS_JVM_CLASS_FILES) proto.classList.filter { classProto ->
+                if (FILTER_OUT_CLASSES_EXISTING_AS_JVM_CLASS_FILES) proto.class_List.filter { classProto ->
                     shouldDecompileBuiltInClass(nameResolver.getClassId(classProto.fqName))
                 }
-                else proto.classList
+                else proto.class_List
 
         private fun shouldDecompileBuiltInClass(classId: ClassId): Boolean {
             if (classId.isNestedClass) return false

js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JsProtoBuf.java

@@ -17,10 +17,10 @@ public final class JsProtoBuf {
     registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.typeAnnotation);
     registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.typeParameterAnnotation);
   }
-  public interface ClassesOrBuilder
-      extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
+  public interface ClassesOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.Classes)
+      org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
-    // repeated int32 class_name = 1 [packed = true];
     /**
      * <code>repeated int32 class_name = 1 [packed = true];</code>
      *
@@ -50,14 +50,15 @@ public final class JsProtoBuf {
    * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Classes}
    */
   public static final class Classes extends
-      org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-      implements ClassesOrBuilder {
+      org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.Classes)
+      ClassesOrBuilder {
     // Use Classes.newBuilder() to construct.
     private Classes(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
       super(builder);
-
+      this.unknownFields = builder.getUnknownFields();
     }
-    private Classes(boolean noInit) {}
+    private Classes(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
 
     private static final Classes defaultInstance;
     public static Classes getDefaultInstance() {
@@ -68,12 +69,18 @@ public final class JsProtoBuf {
       return defaultInstance;
     }
 
+    private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
     private Classes(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       initFields();
       int mutable_bitField0_ = 0;
+      org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput =
+          org.jetbrains.kotlin.protobuf.ByteString.newOutput();
+      org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput =
+          org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance(
+              unknownFieldsOutput);
       try {
         boolean done = false;
         while (!done) {
@@ -83,7 +90,7 @@ public final class JsProtoBuf {
               done = true;
               break;
             default: {
-              if (!parseUnknownField(input,
+              if (!parseUnknownField(input, unknownFieldsCodedOutput,
                                      extensionRegistry, tag)) {
                 done = true;
               }
@@ -121,6 +128,13 @@ public final class JsProtoBuf {
         if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
           className_ = java.util.Collections.unmodifiableList(className_);
         }
+        try {
+          unknownFieldsCodedOutput.flush();
+        } catch (java.io.IOException e) {
+        // Should not happen
+        } finally {
+          unknownFields = unknownFieldsOutput.toByteString();
+        }
         makeExtensionsImmutable();
       }
     }
@@ -139,7 +153,6 @@ public final class JsProtoBuf {
       return PARSER;
     }
 
-    // repeated int32 class_name = 1 [packed = true];
     public static final int CLASS_NAME_FIELD_NUMBER = 1;
     private java.util.List<java.lang.Integer> className_;
     /**
@@ -181,7 +194,8 @@ public final class JsProtoBuf {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       memoizedIsInitialized = 1;
       return true;
@@ -197,6 +211,7 @@ public final class JsProtoBuf {
       for (int i = 0; i < className_.size(); i++) {
         output.writeInt32NoTag(className_.get(i));
       }
+      output.writeRawBytes(unknownFields);
     }
 
     private int memoizedSerializedSize = -1;
@@ -219,6 +234,7 @@ public final class JsProtoBuf {
         }
         classNameMemoizedSerializedSize = dataSize;
       }
+      size += unknownFields.size();
       memoizedSerializedSize = size;
       return size;
     }
@@ -296,7 +312,9 @@ public final class JsProtoBuf {
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
           org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes, Builder>
-        implements org.jetbrains.kotlin.serialization.js.JsProtoBuf.ClassesOrBuilder {
+        implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.Classes)
+        org.jetbrains.kotlin.serialization.js.JsProtoBuf.ClassesOrBuilder {
       // Construct using org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
@@ -354,6 +372,8 @@ public final class JsProtoBuf {
           }
           
         }
+        setUnknownFields(
+            getUnknownFields().concat(other.unknownFields));
         return this;
       }
 
@@ -380,7 +400,6 @@ public final class JsProtoBuf {
       }
       private int bitField0_;
 
-      // repeated int32 class_name = 1 [packed = true];
       private java.util.List<java.lang.Integer> className_ = java.util.Collections.emptyList();
       private void ensureClassNameIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -456,7 +475,8 @@ public final class JsProtoBuf {
       public Builder addAllClassName(
           java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureClassNameIsMutable();
-        super.addAll(values, className_);
+        org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+            values, className_);
         
         return this;
       }
@@ -485,10 +505,10 @@ public final class JsProtoBuf {
     // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.Classes)
   }
 
-  public interface LibraryOrBuilder
-      extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
+  public interface LibraryOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.Library)
+      org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
-    // repeated .org.jetbrains.kotlin.serialization.js.Library.FileEntry entry = 1;
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.js.Library.FileEntry entry = 1;</code>
      */
@@ -503,7 +523,6 @@ public final class JsProtoBuf {
      */
     int getEntryCount();
 
-    // optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];
     /**
      * <code>optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];</code>
      */
@@ -513,12 +532,11 @@ public final class JsProtoBuf {
      */
     org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind getKind();
 
-    // repeated string importedModules = 3;
     /**
      * <code>repeated string importedModules = 3;</code>
      */
-    java.util.List<java.lang.String>
-    getImportedModulesList();
+    org.jetbrains.kotlin.protobuf.ProtocolStringList
+        getImportedModulesList();
     /**
      * <code>repeated string importedModules = 3;</code>
      */
@@ -537,14 +555,15 @@ public final class JsProtoBuf {
    * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library}
    */
   public static final class Library extends
-      org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-      implements LibraryOrBuilder {
+      org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.Library)
+      LibraryOrBuilder {
     // Use Library.newBuilder() to construct.
     private Library(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
       super(builder);
-
+      this.unknownFields = builder.getUnknownFields();
     }
-    private Library(boolean noInit) {}
+    private Library(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
 
     private static final Library defaultInstance;
     public static Library getDefaultInstance() {
@@ -555,12 +574,18 @@ public final class JsProtoBuf {
       return defaultInstance;
     }
 
+    private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
     private Library(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       initFields();
       int mutable_bitField0_ = 0;
+      org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput =
+          org.jetbrains.kotlin.protobuf.ByteString.newOutput();
+      org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput =
+          org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance(
+              unknownFieldsOutput);
       try {
         boolean done = false;
         while (!done) {
@@ -570,7 +595,7 @@ public final class JsProtoBuf {
               done = true;
               break;
             default: {
-              if (!parseUnknownField(input,
+              if (!parseUnknownField(input, unknownFieldsCodedOutput,
                                      extensionRegistry, tag)) {
                 done = true;
               }
@@ -587,18 +612,22 @@ public final class JsProtoBuf {
             case 16: {
               int rawValue = input.readEnum();
               org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind value = org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind.valueOf(rawValue);
-              if (value != null) {
+              if (value == null) {
+                unknownFieldsCodedOutput.writeRawVarint32(tag);
+                unknownFieldsCodedOutput.writeRawVarint32(rawValue);
+              } else {
                 bitField0_ |= 0x00000001;
                 kind_ = value;
               }
               break;
             }
             case 26: {
+              org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
               if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
                 importedModules_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000004;
               }
-              importedModules_.add(input.readBytes());
+              importedModules_.add(bs);
               break;
             }
           }
@@ -613,7 +642,14 @@ public final class JsProtoBuf {
           entry_ = java.util.Collections.unmodifiableList(entry_);
         }
         if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-          importedModules_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList(importedModules_);
+          importedModules_ = importedModules_.getUnmodifiableView();
+        }
+        try {
+          unknownFieldsCodedOutput.flush();
+        } catch (java.io.IOException e) {
+        // Should not happen
+        } finally {
+          unknownFields = unknownFieldsOutput.toByteString();
         }
         makeExtensionsImmutable();
       }
@@ -707,10 +743,10 @@ public final class JsProtoBuf {
       // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.js.Library.Kind)
     }
 
-    public interface FileEntryOrBuilder
-        extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
+    public interface FileEntryOrBuilder extends
+        // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.Library.FileEntry)
+        org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
-      // required string path = 1;
       /**
        * <code>required string path = 1;</code>
        */
@@ -725,7 +761,6 @@ public final class JsProtoBuf {
       org.jetbrains.kotlin.protobuf.ByteString
           getPathBytes();
 
-      // required bytes content = 2;
       /**
        * <code>required bytes content = 2;</code>
        */
@@ -739,14 +774,15 @@ public final class JsProtoBuf {
      * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library.FileEntry}
      */
     public static final class FileEntry extends
-        org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-        implements FileEntryOrBuilder {
+        org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
+        // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.Library.FileEntry)
+        FileEntryOrBuilder {
       // Use FileEntry.newBuilder() to construct.
       private FileEntry(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
         super(builder);
-
+        this.unknownFields = builder.getUnknownFields();
       }
-      private FileEntry(boolean noInit) {}
+      private FileEntry(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
 
       private static final FileEntry defaultInstance;
       public static FileEntry getDefaultInstance() {
@@ -757,12 +793,18 @@ public final class JsProtoBuf {
         return defaultInstance;
       }
 
+      private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
       private FileEntry(
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         initFields();
         int mutable_bitField0_ = 0;
+        org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput =
+            org.jetbrains.kotlin.protobuf.ByteString.newOutput();
+        org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput =
+            org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance(
+                unknownFieldsOutput);
         try {
           boolean done = false;
           while (!done) {
@@ -772,15 +814,16 @@ public final class JsProtoBuf {
                 done = true;
                 break;
               default: {
-                if (!parseUnknownField(input,
+                if (!parseUnknownField(input, unknownFieldsCodedOutput,
                                        extensionRegistry, tag)) {
                   done = true;
                 }
                 break;
               }
               case 10: {
+                org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
                 bitField0_ |= 0x00000001;
-                path_ = input.readBytes();
+                path_ = bs;
                 break;
               }
               case 18: {
@@ -796,6 +839,13 @@ public final class JsProtoBuf {
           throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException(
               e.getMessage()).setUnfinishedMessage(this);
         } finally {
+          try {
+            unknownFieldsCodedOutput.flush();
+          } catch (java.io.IOException e) {
+          // Should not happen
+          } finally {
+            unknownFields = unknownFieldsOutput.toByteString();
+          }
           makeExtensionsImmutable();
         }
       }
@@ -815,7 +865,6 @@ public final class JsProtoBuf {
       }
 
       private int bitField0_;
-      // required string path = 1;
       public static final int PATH_FIELD_NUMBER = 1;
       private java.lang.Object path_;
       /**
@@ -858,7 +907,6 @@ public final class JsProtoBuf {
         }
       }
 
-      // required bytes content = 2;
       public static final int CONTENT_FIELD_NUMBER = 2;
       private org.jetbrains.kotlin.protobuf.ByteString content_;
       /**
@@ -881,7 +929,8 @@ public final class JsProtoBuf {
       private byte memoizedIsInitialized = -1;
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
-        if (isInitialized != -1) return isInitialized == 1;
+        if (isInitialized == 1) return true;
+        if (isInitialized == 0) return false;
 
         if (!hasPath()) {
           memoizedIsInitialized = 0;
@@ -904,6 +953,7 @@ public final class JsProtoBuf {
         if (((bitField0_ & 0x00000002) == 0x00000002)) {
           output.writeBytes(2, content_);
         }
+        output.writeRawBytes(unknownFields);
       }
 
       private int memoizedSerializedSize = -1;
@@ -920,6 +970,7 @@ public final class JsProtoBuf {
           size += org.jetbrains.kotlin.protobuf.CodedOutputStream
             .computeBytesSize(2, content_);
         }
+        size += unknownFields.size();
         memoizedSerializedSize = size;
         return size;
       }
@@ -997,7 +1048,9 @@ public final class JsProtoBuf {
       public static final class Builder extends
           org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
             org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.FileEntry, Builder>
-          implements org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.FileEntryOrBuilder {
+          implements
+          // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.Library.FileEntry)
+          org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.FileEntryOrBuilder {
         // Construct using org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.FileEntry.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
@@ -1060,6 +1113,8 @@ public final class JsProtoBuf {
           if (other.hasContent()) {
             setContent(other.getContent());
           }
+          setUnknownFields(
+              getUnknownFields().concat(other.unknownFields));
           return this;
         }
 
@@ -1094,7 +1149,6 @@ public final class JsProtoBuf {
         }
         private int bitField0_;
 
-        // required string path = 1;
         private java.lang.Object path_ = "";
         /**
          * <code>required string path = 1;</code>
@@ -1108,9 +1162,12 @@ public final class JsProtoBuf {
         public java.lang.String getPath() {
           java.lang.Object ref = path_;
           if (!(ref instanceof java.lang.String)) {
-            java.lang.String s = ((org.jetbrains.kotlin.protobuf.ByteString) ref)
-                .toStringUtf8();
-            path_ = s;
+            org.jetbrains.kotlin.protobuf.ByteString bs =
+                (org.jetbrains.kotlin.protobuf.ByteString) ref;
+            java.lang.String s = bs.toStringUtf8();
+            if (bs.isValidUtf8()) {
+              path_ = s;
+            }
             return s;
           } else {
             return (java.lang.String) ref;
@@ -1168,7 +1225,6 @@ public final class JsProtoBuf {
           return this;
         }
 
-        // required bytes content = 2;
         private org.jetbrains.kotlin.protobuf.ByteString content_ = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;
         /**
          * <code>required bytes content = 2;</code>
@@ -1216,7 +1272,6 @@ public final class JsProtoBuf {
     }
 
     private int bitField0_;
-    // repeated .org.jetbrains.kotlin.serialization.js.Library.FileEntry entry = 1;
     public static final int ENTRY_FIELD_NUMBER = 1;
     private java.util.List<org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.FileEntry> entry_;
     /**
@@ -1252,7 +1307,6 @@ public final class JsProtoBuf {
       return entry_.get(index);
     }
 
-    // optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];
     public static final int KIND_FIELD_NUMBER = 2;
     private org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind kind_;
     /**
@@ -1268,13 +1322,12 @@ public final class JsProtoBuf {
       return kind_;
     }
 
-    // repeated string importedModules = 3;
     public static final int IMPORTEDMODULES_FIELD_NUMBER = 3;
     private org.jetbrains.kotlin.protobuf.LazyStringList importedModules_;
     /**
      * <code>repeated string importedModules = 3;</code>
      */
-    public java.util.List<java.lang.String>
+    public org.jetbrains.kotlin.protobuf.ProtocolStringList
         getImportedModulesList() {
       return importedModules_;
     }
@@ -1306,7 +1359,8 @@ public final class JsProtoBuf {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       for (int i = 0; i < getEntryCount(); i++) {
         if (!getEntry(i).isInitialized()) {
@@ -1330,6 +1384,7 @@ public final class JsProtoBuf {
       for (int i = 0; i < importedModules_.size(); i++) {
         output.writeBytes(3, importedModules_.getByteString(i));
       }
+      output.writeRawBytes(unknownFields);
     }
 
     private int memoizedSerializedSize = -1;
@@ -1355,6 +1410,7 @@ public final class JsProtoBuf {
         size += dataSize;
         size += 1 * getImportedModulesList().size();
       }
+      size += unknownFields.size();
       memoizedSerializedSize = size;
       return size;
     }
@@ -1432,7 +1488,9 @@ public final class JsProtoBuf {
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
           org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library, Builder>
-        implements org.jetbrains.kotlin.serialization.js.JsProtoBuf.LibraryOrBuilder {
+        implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.Library)
+        org.jetbrains.kotlin.serialization.js.JsProtoBuf.LibraryOrBuilder {
       // Construct using org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
@@ -1485,8 +1543,7 @@ public final class JsProtoBuf {
         }
         result.kind_ = kind_;
         if (((bitField0_ & 0x00000004) == 0x00000004)) {
-          importedModules_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList(
-              importedModules_);
+          importedModules_ = importedModules_.getUnmodifiableView();
           bitField0_ = (bitField0_ & ~0x00000004);
         }
         result.importedModules_ = importedModules_;
@@ -1519,6 +1576,8 @@ public final class JsProtoBuf {
           }
           
         }
+        setUnknownFields(
+            getUnknownFields().concat(other.unknownFields));
         return this;
       }
 
@@ -1551,7 +1610,6 @@ public final class JsProtoBuf {
       }
       private int bitField0_;
 
-      // repeated .org.jetbrains.kotlin.serialization.js.Library.FileEntry entry = 1;
       private java.util.List<org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.FileEntry> entry_ =
         java.util.Collections.emptyList();
       private void ensureEntryIsMutable() {
@@ -1653,7 +1711,8 @@ public final class JsProtoBuf {
       public Builder addAllEntry(
           java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.FileEntry> values) {
         ensureEntryIsMutable();
-        super.addAll(values, entry_);
+        org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+            values, entry_);
 
         return this;
       }
@@ -1676,7 +1735,6 @@ public final class JsProtoBuf {
         return this;
       }
 
-      // optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];
       private org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind kind_ = org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind.PLAIN;
       /**
        * <code>optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];</code>
@@ -1712,7 +1770,6 @@ public final class JsProtoBuf {
         return this;
       }
 
-      // repeated string importedModules = 3;
       private org.jetbrains.kotlin.protobuf.LazyStringList importedModules_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
       private void ensureImportedModulesIsMutable() {
         if (!((bitField0_ & 0x00000004) == 0x00000004)) {
@@ -1723,9 +1780,9 @@ public final class JsProtoBuf {
       /**
        * <code>repeated string importedModules = 3;</code>
        */
-      public java.util.List<java.lang.String>
+      public org.jetbrains.kotlin.protobuf.ProtocolStringList
           getImportedModulesList() {
-        return java.util.Collections.unmodifiableList(importedModules_);
+        return importedModules_.getUnmodifiableView();
       }
       /**
        * <code>repeated string importedModules = 3;</code>
@@ -1778,7 +1835,8 @@ public final class JsProtoBuf {
       public Builder addAllImportedModules(
           java.lang.Iterable<java.lang.String> values) {
         ensureImportedModulesIsMutable();
-        super.addAll(values, importedModules_);
+        org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+            values, importedModules_);
         
         return this;
       }
@@ -1830,7 +1888,8 @@ public final class JsProtoBuf {
         null,
         130,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
+        false,
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
   public static final int CONSTRUCTOR_ANNOTATION_FIELD_NUMBER = 130;
   /**
    * <code>extend .org.jetbrains.kotlin.serialization.Constructor { ... }</code>
@@ -1845,7 +1904,8 @@ public final class JsProtoBuf {
         null,
         130,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
+        false,
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
   public static final int FUNCTION_ANNOTATION_FIELD_NUMBER = 130;
   /**
    * <code>extend .org.jetbrains.kotlin.serialization.Function { ... }</code>
@@ -1860,7 +1920,8 @@ public final class JsProtoBuf {
         null,
         130,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
+        false,
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
   public static final int PROPERTY_ANNOTATION_FIELD_NUMBER = 130;
   /**
    * <code>extend .org.jetbrains.kotlin.serialization.Property { ... }</code>
@@ -1875,7 +1936,8 @@ public final class JsProtoBuf {
         null,
         130,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
+        false,
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
   public static final int COMPILE_TIME_VALUE_FIELD_NUMBER = 131;
   /**
    * <code>extend .org.jetbrains.kotlin.serialization.Property { ... }</code>
@@ -1890,7 +1952,8 @@ public final class JsProtoBuf {
         org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance(),
         null,
         131,
-        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE);
+        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.class);
   public static final int ENUM_ENTRY_ANNOTATION_FIELD_NUMBER = 130;
   /**
    * <code>extend .org.jetbrains.kotlin.serialization.EnumEntry { ... }</code>
@@ -1905,7 +1968,8 @@ public final class JsProtoBuf {
         null,
         130,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
+        false,
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
   public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 130;
   /**
    * <code>extend .org.jetbrains.kotlin.serialization.ValueParameter { ... }</code>
@@ -1920,7 +1984,8 @@ public final class JsProtoBuf {
         null,
         130,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
+        false,
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
   public static final int TYPE_ANNOTATION_FIELD_NUMBER = 130;
   /**
    * <code>extend .org.jetbrains.kotlin.serialization.Type { ... }</code>
@@ -1935,7 +2000,8 @@ public final class JsProtoBuf {
         null,
         130,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
+        false,
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
   public static final int TYPE_PARAMETER_ANNOTATION_FIELD_NUMBER = 130;
   /**
    * <code>extend .org.jetbrains.kotlin.serialization.TypeParameter { ... }</code>
@@ -1950,7 +2016,8 @@ public final class JsProtoBuf {
         null,
         130,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
+        false,
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
 
   static {
   }

ultimate/.idea/libraries/protobuf.xml

@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="protobuf">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/../dependencies/protobuf-2.5.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../dependencies/protobuf-2.6.1.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../dependencies/protobuf-2.5.0-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../dependencies/protobuf-2.6.1-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

update_dependencies.xml

@@ -435,27 +435,29 @@
                 </sequential>
             </macrodef>
 
+            <property name="protobuf.version" value="2.6.1"/>
+
             <!-- Download protobuf and rename packages -->
-            <get-maven-library prefix="com/google/protobuf" lib="protobuf-java" version="2.5.0"/>
-            <delete file="${dependencies}/protobuf-java-2.5.0.jar"/>
-            <delete file="${dependencies}/protobuf-java-2.5.0-sources.jar"/>
+            <get-maven-library prefix="com/google/protobuf" lib="protobuf-java" version="${protobuf.version}"/>
+            <delete file="${dependencies}/protobuf-java-${protobuf.version}.jar"/>
+            <delete file="${dependencies}/protobuf-java-${protobuf.version}-sources.jar"/>
 
             <rename-packages-in-binaries
-                source.jar="${dependencies}/download/protobuf-java-2.5.0.jar"
-                target.jar="${dependencies}/protobuf-2.5.0.jar"
+                source.jar="${dependencies}/download/protobuf-java-${protobuf.version}.jar"
+                target.jar="${dependencies}/protobuf-${protobuf.version}.jar"
             />
 
             <rename-packages-in-sources
-                source.jar="${dependencies}/download/protobuf-java-2.5.0-sources.jar"
-                target.jar="${dependencies}/protobuf-2.5.0-sources.jar"
+                source.jar="${dependencies}/download/protobuf-java-${protobuf.version}-sources.jar"
+                target.jar="${dependencies}/protobuf-${protobuf.version}-sources.jar"
             />
 
             <!-- Build protobuf lite jar -->
             <exec executable="${dependencies}/bootstrap-compiler/Kotlin/kotlinc/bin/${kotlinc.executable.path}" failonerror="true">
                 <arg value="-script"/>
                 <arg value="${generators}/infrastructure/build-protobuf-lite.kts"/>
-                <arg value="${dependencies}/protobuf-2.5.0.jar"/>
-                <arg value="${dependencies}/protobuf-2.5.0-lite.jar"/>
+                <arg value="${dependencies}/protobuf-${protobuf.version}.jar"/>
+                <arg value="${dependencies}/protobuf-${protobuf.version}-lite.jar"/>
             </exec>
         </sequential>
     </macrodef>