fix KT-8648 Exception from incremental compilation

#KT-8648 Fixed

compiler/tests/org/jetbrains/kotlin/serialization/DebugExtOptionsProtoBuf.java

@@ -10,6 +10,7 @@ public final class DebugExtOptionsProtoBuf {
     registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.skipInComparison);
     registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
     registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.fqNameIdInTable);
+    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
   }
   public static final int SKIP_IN_COMPARISON_FIELD_NUMBER = 50000;
   /**
@@ -44,6 +45,17 @@ public final class DebugExtOptionsProtoBuf {
           .newFileScopedGeneratedExtension(
         java.lang.Boolean.class,
         null);
+  public static final int STRING_ID_IN_TABLE_FIELD_NUMBER = 50003;
+  /**
+   * <code>extend .google.protobuf.FieldOptions { ... }</code>
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      com.google.protobuf.DescriptorProtos.FieldOptions,
+      java.lang.Boolean> stringIdInTable = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.Boolean.class,
+        null);
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -60,8 +72,9 @@ public final class DebugExtOptionsProtoBuf {
       ".FieldOptions\030\320\206\003 \001(\010:9\n\020name_id_in_tabl" +
       "e\022\035.google.protobuf.FieldOptions\030\321\206\003 \001(\010" +
       ":<\n\023fq_name_id_in_table\022\035.google.protobu" +
-      "f.FieldOptions\030\322\206\003 \001(\010B\034B\027DebugExtOption" +
-      "sProtoBuf\210\001\000"
+      "f.FieldOptions\030\322\206\003 \001(\010:;\n\022string_id_in_t" +
+      "able\022\035.google.protobuf.FieldOptions\030\323\206\003 " +
+      "\001(\010B\034B\027DebugExtOptionsProtoBuf\210\001\000"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -71,6 +84,7 @@ public final class DebugExtOptionsProtoBuf {
           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;
         }
       };

compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java

@@ -17280,7 +17280,7 @@ public final class DebugProtoBuf {
       ".kotlin.serialization.Annotation.Argumen",
       "t.Value.Type\022\021\n\tint_value\030\002 \001(\022\022\023\n\013float" +
       "_value\030\003 \001(\002\022\024\n\014double_value\030\004 \001(\001\022\032\n\014st" +
-      "ring_value\030\005 \001(\005B\004\210\265\030\001\022\026\n\010class_id\030\006 \001(\005" +
+      "ring_value\030\005 \001(\005B\004\230\265\030\001\022\026\n\010class_id\030\006 \001(\005" +
       "B\004\220\265\030\001\022\033\n\renum_value_id\030\007 \001(\005B\004\210\265\030\001\022B\n\na" +
       "nnotation\030\010 \001(\0132..org.jetbrains.kotlin.s" +
       "erialization.Annotation\022T\n\rarray_element" +
@@ -17295,7 +17295,7 @@ public final class DebugProtoBuf {
       "\030\002 \003(\01321.org.jetbrains.kotlin.serializat" +
       "ion.Type.Argument\022\027\n\010nullable\030\003 \001(\010:\005fal" +
       "se\022+\n\035flexible_type_capabilities_id\030\004 \001(" +
-      "\005B\004\210\265\030\001\022F\n\024flexible_upper_bound\030\005 \001(\0132(." +
+      "\005B\004\230\265\030\001\022F\n\024flexible_upper_bound\030\005 \001(\0132(." +
       "org.jetbrains.kotlin.serialization.Type\022" +
       "$\n\026constructor_class_name\030\006 \001(\005B\004\220\265\030\001\022\"\n",
       "\032constructor_type_parameter\030\007 \001(\005\032\234\001\n\013Co" +
@@ -17458,10 +17458,10 @@ public final class DebugProtoBuf {
             com.google.protobuf.ExtensionRegistry.newInstance();
           registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.fqNameIdInTable);
           registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
-          registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
+          registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
           registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.fqNameIdInTable);
           registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
-          registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
+          registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
           registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.fqNameIdInTable);
           registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.skipInComparison);
           registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.skipInComparison);

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

@@ -3838,12 +3838,12 @@ public final class DebugJvmProtoBuf {
       "\rPrimitiveType\022\010\n\004VOID\020\000\022\013\n\007BOOLEAN\020\001\022\010\n",
       "\004CHAR\020\002\022\010\n\004BYTE\020\003\022\t\n\005SHORT\020\004\022\007\n\003INT\020\005\022\t\n" +
       "\005FLOAT\020\006\022\010\n\004LONG\020\007\022\n\n\006DOUBLE\020\010\"\267\001\n\022JvmMe" +
-      "thodSignature\022\022\n\004name\030\001 \002(\005B\004\210\265\030\001\022D\n\013ret" +
+      "thodSignature\022\022\n\004name\030\001 \002(\005B\004\230\265\030\001\022D\n\013ret" +
       "urn_type\030\002 \002(\0132/.org.jetbrains.kotlin.se" +
       "rialization.jvm.JvmType\022G\n\016parameter_typ" +
       "e\030\003 \003(\0132/.org.jetbrains.kotlin.serializa" +
       "tion.jvm.JvmType\"\211\001\n\021JvmFieldSignature\022\022" +
-      "\n\004name\030\001 \002(\005B\004\210\265\030\001\022=\n\004type\030\002 \002(\0132/.org.j" +
+      "\n\004name\030\001 \002(\005B\004\230\265\030\001\022=\n\004type\030\002 \002(\0132/.org.j" +
       "etbrains.kotlin.serialization.jvm.JvmTyp" +
       "e\022!\n\022is_static_in_outer\030\003 \001(\010:\005false\"\316\002\n",
       "\024JvmPropertySignature\022H\n\005field\030\001 \001(\01329.o" +
@@ -3911,8 +3911,8 @@ public final class DebugJvmProtoBuf {
           com.google.protobuf.ExtensionRegistry registry =
             com.google.protobuf.ExtensionRegistry.newInstance();
           registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.fqNameIdInTable);
-          registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
-          registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
+          registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
+          registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
           registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
           return registry;
         }