diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java
index bb23a1eb483..066225124de 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java
@@ -224,10 +224,10 @@ public class ClosureCodegen extends MemberCodegen<JetElement> {
         DescriptorSerializer serializer =
                 DescriptorSerializer.createTopLevel(new JvmSerializerExtension(v.getSerializationBindings(), typeMapper));
 
-        ProtoBuf.Callable callableProto = serializer.callableProto(funDescriptor).build();
+        ProtoBuf.Function functionProto = serializer.functionProto(funDescriptor).build();
 
         AnnotationVisitor av = v.getVisitor().visitAnnotation(asmDescByFqNameWithoutInnerClasses(JvmAnnotationNames.KOTLIN_CALLABLE), true);
-        writeAnnotationData(av, serializer, callableProto);
+        writeAnnotationData(av, serializer, functionProto);
         av.visitEnd();
     }
 
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt
index c355efb4424..fcb01fe0c31 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassPartCodegen.kt
@@ -88,8 +88,6 @@ public class MultifileClassPartCodegen(
         val serializer = DescriptorSerializer.createTopLevel(JvmSerializerExtension(bindings, state.typeMapper))
         val packageProto = serializer.packagePartProto(members).build()
 
-        if (packageProto.memberCount == 0) return
-
         val av = v.newAnnotation(AsmUtil.asmDescByFqNameWithoutInnerClasses(JvmAnnotationNames.KOTLIN_MULTIFILE_CLASS_PART), true)
         AsmUtil.writeAnnotationData(av, serializer, packageProto)
         av.visit(JvmAnnotationNames.MULTIFILE_CLASS_NAME_FIELD_NAME, multifileClassType.internalName)
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java
index 8465f9d1c7e..f19a5825484 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java
@@ -123,8 +123,6 @@ public class PackagePartCodegen extends MemberCodegen<JetFile> {
         DescriptorSerializer serializer = DescriptorSerializer.createTopLevel(new JvmSerializerExtension(bindings, state.getTypeMapper()));
         ProtoBuf.Package packageProto = serializer.packagePartProto(members).build();
 
-        if (packageProto.getMemberCount() == 0) return;
-
         AnnotationVisitor av = v.newAnnotation(asmDescByFqNameWithoutInnerClasses(JvmAnnotationNames.KOTLIN_FILE_FACADE), true);
         writeAnnotationData(av, serializer, packageProto);
         av.visitEnd();
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.java
index 0b818571e8d..c9666289d89 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.java
@@ -64,10 +64,6 @@ public class JvmSerializerExtension extends SerializerExtension {
         }
     }
 
-    @Override
-    public void serializeCallable(@NotNull CallableMemberDescriptor callable, @NotNull ProtoBuf.Callable.Builder proto) {
-    }
-
     @Override
     public void serializeValueParameter(@NotNull ValueParameterDescriptor descriptor, @NotNull ProtoBuf.ValueParameter.Builder proto) {
         Integer index = bindings.get(INDEX_FOR_VALUE_PARAMETER, descriptor);
@@ -175,10 +171,7 @@ public class JvmSerializerExtension extends SerializerExtension {
         if (name == null) return;
 
         int index = stringTable.getStringIndex(name);
-        if (proto instanceof ProtoBuf.Callable.Builder) {
-            ((ProtoBuf.Callable.Builder) proto).setExtension(JvmProtoBuf.oldImplClassName, index);
-        }
-        else if (proto instanceof ProtoBuf.Function.Builder) {
+        if (proto instanceof ProtoBuf.Function.Builder) {
             ((ProtoBuf.Function.Builder) proto).setExtension(JvmProtoBuf.methodImplClassName, index);
         }
         else if (proto instanceof ProtoBuf.Property.Builder) {
diff --git a/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerExtension.kt b/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerExtension.kt
index b9b4bee0914..9db3964a42c 100644
--- a/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerExtension.kt
+++ b/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerExtension.kt
@@ -44,18 +44,6 @@ public class BuiltInsSerializerExtension : SerializerExtension() {
         }
     }
 
-    override fun serializeCallable(callable: CallableMemberDescriptor, proto: ProtoBuf.Callable.Builder) {
-        for (annotation in callable.annotations) {
-            proto.addExtension(BuiltInsProtoBuf.oldCallableAnnotation, annotationSerializer.serializeAnnotation(annotation))
-        }
-        val propertyDescriptor = callable as? PropertyDescriptor ?: return
-        val compileTimeConstant = propertyDescriptor.compileTimeInitializer
-        if (compileTimeConstant != null && compileTimeConstant !is NullValue) {
-            val valueProto = annotationSerializer.valueProto(compileTimeConstant)
-            proto.setExtension(BuiltInsProtoBuf.oldCompileTimeValue, valueProto.build())
-        }
-    }
-
     override fun serializeConstructor(descriptor: ConstructorDescriptor, proto: ProtoBuf.Constructor.Builder) {
         for (annotation in descriptor.annotations) {
             proto.addExtension(BuiltInsProtoBuf.constructorAnnotation, annotationSerializer.serializeAnnotation(annotation))
diff --git a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
index 26f3d6a8432..91c22277def 100644
--- a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
+++ b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
@@ -25,7 +25,6 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.kotlin.descriptors.*;
 import org.jetbrains.kotlin.descriptors.annotations.Annotated;
 import org.jetbrains.kotlin.name.Name;
-import org.jetbrains.kotlin.resolve.DescriptorFactory;
 import org.jetbrains.kotlin.resolve.MemberComparator;
 import org.jetbrains.kotlin.resolve.constants.ConstantValue;
 import org.jetbrains.kotlin.resolve.constants.NullValue;
@@ -38,7 +37,6 @@ import java.io.IOException;
 import java.util.*;
 
 import static org.jetbrains.kotlin.resolve.DescriptorUtils.isEnumEntry;
-import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getSecondaryConstructors;
 
 public class DescriptorSerializer {
 
@@ -117,31 +115,14 @@ public class DescriptorSerializer {
             }
         }
 
-        ConstructorDescriptor primaryConstructor = classDescriptor.getUnsubstitutedPrimaryConstructor();
-        if (primaryConstructor != null) {
-            if (DescriptorFactory.isDefaultPrimaryConstructor(primaryConstructor)) {
-                builder.setPrimaryConstructor(ProtoBuf.Class.PrimaryConstructor.getDefaultInstance());
-            }
-            else {
-                ProtoBuf.Class.PrimaryConstructor.Builder constructorBuilder = ProtoBuf.Class.PrimaryConstructor.newBuilder();
-                constructorBuilder.setData(callableProto(primaryConstructor));
-                builder.setPrimaryConstructor(constructorBuilder);
-            }
-        }
-
         for (ConstructorDescriptor descriptor : classDescriptor.getConstructors()) {
             builder.addConstructor(constructorProto(descriptor));
         }
 
-        for (ConstructorDescriptor constructorDescriptor : getSecondaryConstructors(classDescriptor)) {
-            builder.addSecondaryConstructor(callableProto(constructorDescriptor));
-        }
-
         for (DeclarationDescriptor descriptor : sort(classDescriptor.getDefaultType().getMemberScope().getAllDescriptors())) {
             if (descriptor instanceof CallableMemberDescriptor) {
                 CallableMemberDescriptor member = (CallableMemberDescriptor) descriptor;
                 if (member.getKind() == CallableMemberDescriptor.Kind.FAKE_OVERRIDE) continue;
-                builder.addMember(callableProto(member));
 
                 if (descriptor instanceof PropertyDescriptor) {
                     builder.addProperty(propertyProto((PropertyDescriptor) descriptor));
@@ -309,108 +290,6 @@ public class DescriptorSerializer {
         return builder;
     }
 
-    @NotNull
-    public ProtoBuf.Callable.Builder callableProto(@NotNull CallableMemberDescriptor descriptor) {
-        ProtoBuf.Callable.Builder builder = ProtoBuf.Callable.newBuilder();
-
-        DescriptorSerializer local = createChildSerializer();
-
-        boolean hasGetter = false;
-        boolean hasSetter = false;
-        boolean hasConstant = false;
-        boolean lateInit = false;
-        boolean isConst = false;
-        boolean isOperator = false;
-        boolean isInfix = false;
-
-        if (descriptor instanceof FunctionDescriptor) {
-            FunctionDescriptor functionDescriptor = (FunctionDescriptor) descriptor;
-            isOperator = functionDescriptor.isOperator();
-            isInfix = functionDescriptor.isInfix();
-        }
-
-        if (descriptor instanceof PropertyDescriptor) {
-            PropertyDescriptor propertyDescriptor = (PropertyDescriptor) descriptor;
-            lateInit = propertyDescriptor.isLateInit();
-            isConst = propertyDescriptor.isConst();
-
-            int propertyFlags = Flags.getAccessorFlags(
-                    hasAnnotations(propertyDescriptor),
-                    propertyDescriptor.getVisibility(),
-                    propertyDescriptor.getModality(),
-                    false
-            );
-
-            PropertyGetterDescriptor getter = propertyDescriptor.getGetter();
-            if (getter != null) {
-                hasGetter = true;
-                int accessorFlags = getAccessorFlags(getter);
-                if (accessorFlags != propertyFlags) {
-                    builder.setGetterFlags(accessorFlags);
-                }
-            }
-
-            PropertySetterDescriptor setter = propertyDescriptor.getSetter();
-            if (setter != null) {
-                hasSetter = true;
-                int accessorFlags = getAccessorFlags(setter);
-                if (accessorFlags != propertyFlags) {
-                    builder.setSetterFlags(accessorFlags);
-                }
-
-                if (!setter.isDefault()) {
-                    for (ValueParameterDescriptor valueParameterDescriptor : setter.getValueParameters()) {
-                        builder.addValueParameter(local.valueParameter(valueParameterDescriptor));
-                    }
-                }
-            }
-
-            ConstantValue<?> compileTimeConstant = propertyDescriptor.getCompileTimeInitializer();
-            hasConstant = !(compileTimeConstant == null || compileTimeConstant instanceof NullValue);
-        }
-
-        boolean hasAnnotations = (descriptor instanceof PropertyDescriptor)
-                                 ? !descriptor.getAnnotations().getAllAnnotations().isEmpty()
-                                 : hasAnnotations(descriptor);
-
-        builder.setFlags(Flags.getCallableFlags(
-                hasAnnotations,
-                descriptor.getVisibility(),
-                descriptor.getModality(),
-                descriptor.getKind(),
-                callableKind(descriptor),
-                hasGetter,
-                hasSetter,
-                hasConstant,
-                lateInit,
-                isConst,
-                isOperator,
-                isInfix
-        ));
-
-        for (TypeParameterDescriptor typeParameterDescriptor : descriptor.getTypeParameters()) {
-            builder.addTypeParameter(local.typeParameter(typeParameterDescriptor));
-        }
-
-        ReceiverParameterDescriptor receiverParameter = descriptor.getExtensionReceiverParameter();
-        if (receiverParameter != null) {
-            builder.setReceiverType(local.type(receiverParameter.getType()));
-        }
-
-        builder.setName(getSimpleNameIndex(descriptor.getName()));
-
-        for (ValueParameterDescriptor valueParameterDescriptor : descriptor.getValueParameters()) {
-            builder.addValueParameter(local.valueParameter(valueParameterDescriptor));
-        }
-
-        //noinspection ConstantConditions
-        builder.setReturnType(local.type(descriptor.getReturnType()));
-
-        extension.serializeCallable(descriptor, builder);
-
-        return builder;
-    }
-
     private static int getAccessorFlags(@NotNull PropertyAccessorDescriptor accessor) {
         return Flags.getAccessorFlags(
                 hasAnnotations(accessor),
@@ -420,18 +299,6 @@ public class DescriptorSerializer {
         );
     }
 
-    @NotNull
-    private static ProtoBuf.CallableKind callableKind(@NotNull CallableMemberDescriptor descriptor) {
-        if (descriptor instanceof PropertyDescriptor) {
-            return ((PropertyDescriptor) descriptor).isVar() ? ProtoBuf.CallableKind.VAR : ProtoBuf.CallableKind.VAL;
-        }
-        if (descriptor instanceof ConstructorDescriptor) {
-            return ProtoBuf.CallableKind.CONSTRUCTOR;
-        }
-        assert descriptor instanceof FunctionDescriptor : "Unknown descriptor class: " + descriptor.getClass();
-        return ProtoBuf.CallableKind.FUN;
-    }
-
     @NotNull
     private ProtoBuf.ValueParameter.Builder valueParameter(@NotNull ValueParameterDescriptor descriptor) {
         ProtoBuf.ValueParameter.Builder builder = ProtoBuf.ValueParameter.newBuilder();
@@ -577,10 +444,6 @@ public class DescriptorSerializer {
         for (DeclarationDescriptor declaration : sort(members)) {
             if (skip != null && skip.invoke(declaration)) continue;
 
-            if (declaration instanceof PropertyDescriptor || declaration instanceof FunctionDescriptor) {
-                builder.addMember(callableProto((CallableMemberDescriptor) declaration));
-            }
-
             if (declaration instanceof PropertyDescriptor) {
                 builder.addProperty(propertyProto((PropertyDescriptor) declaration));
             }
@@ -599,10 +462,6 @@ public class DescriptorSerializer {
         ProtoBuf.Package.Builder builder = ProtoBuf.Package.newBuilder();
 
         for (DeclarationDescriptor declaration : sort(members)) {
-            if (declaration instanceof PropertyDescriptor || declaration instanceof FunctionDescriptor) {
-                builder.addMember(callableProto((CallableMemberDescriptor) declaration));
-            }
-
             if (declaration instanceof PropertyDescriptor) {
                 builder.addProperty(propertyProto((PropertyDescriptor) declaration));
             }
diff --git a/compiler/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.java b/compiler/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.java
index 239cebcf914..eff95f2f770 100644
--- a/compiler/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.java
+++ b/compiler/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.java
@@ -41,9 +41,6 @@ public abstract class SerializerExtension {
     public void serializeProperty(@NotNull PropertyDescriptor descriptor, @NotNull ProtoBuf.Property.Builder proto) {
     }
 
-    public void serializeCallable(@NotNull CallableMemberDescriptor callable, @NotNull ProtoBuf.Callable.Builder proto) {
-    }
-
     public void serializeValueParameter(@NotNull ValueParameterDescriptor descriptor, @NotNull ProtoBuf.ValueParameter.Builder proto) {
     }
 
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java
index 68f42826063..3fcffb0e0ea 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java
@@ -58,7 +58,11 @@ public class KotlinClassAnnotationTest extends CodegenTestCase {
         assertNotNull(strings);
         ClassData classData = JvmProtoBufUtil.readClassDataFrom(data, strings);
 
-        Set<String> callableNames = collectCallableNames(classData.getClassProto().getMemberList(), classData.getNameResolver());
+        Set<String> callableNames = collectCallableNames(
+                classData.getClassProto().getFunctionList(),
+                classData.getClassProto().getPropertyList(),
+                classData.getNameResolver()
+        );
         assertSameElements(Arrays.asList("foo", "bar"), callableNames);
     }
 }
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java
index 43cb171f3d6..c0fab9596ed 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java
@@ -64,7 +64,11 @@ public class KotlinPackageAnnotationTest extends CodegenTestCase {
         assertNotNull(strings);
         PackageData packageData = JvmProtoBufUtil.readPackageDataFrom(data, strings);
 
-        Set<String> callableNames = collectCallableNames(packageData.getPackageProto().getMemberList(), packageData.getNameResolver());
+        Set<String> callableNames = collectCallableNames(
+                packageData.getPackageProto().getFunctionList(),
+                packageData.getPackageProto().getPropertyList(),
+                packageData.getNameResolver()
+        );
         assertEmpty(callableNames);
     }
 
@@ -90,15 +94,26 @@ public class KotlinPackageAnnotationTest extends CodegenTestCase {
         assertNotNull(strings);
         PackageData packageData = JvmProtoBufUtil.readPackageDataFrom(data, strings);
 
-        Set<String> callableNames = collectCallableNames(packageData.getPackageProto().getMemberList(), packageData.getNameResolver());
+        Set<String> callableNames = collectCallableNames(
+                packageData.getPackageProto().getFunctionList(),
+                packageData.getPackageProto().getPropertyList(),
+                packageData.getNameResolver()
+        );
         assertSameElements(callableNames, Arrays.asList("foo", "bar"));
     }
 
     @NotNull
-    public static Set<String> collectCallableNames(@NotNull List<ProtoBuf.Callable> members, @NotNull NameResolver nameResolver) {
+    public static Set<String> collectCallableNames(
+            @NotNull List<ProtoBuf.Function> functions,
+            @NotNull List<ProtoBuf.Property> properties,
+            @NotNull NameResolver nameResolver
+    ) {
         Set<String> callableNames = new HashSet<String>();
-        for (ProtoBuf.Callable callable : members) {
-            callableNames.add(nameResolver.getName(callable.getName()).asString());
+        for (ProtoBuf.Function function : functions) {
+            callableNames.add(nameResolver.getName(function.getName()).asString());
+        }
+        for (ProtoBuf.Property property : properties) {
+            callableNames.add(nameResolver.getName(property.getName()).asString());
         }
         return callableNames;
     }
diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java b/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java
index 7ed0294b96f..da37279bf3a 100644
--- a/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java
@@ -242,114 +242,6 @@ public final class DebugProtoBuf {
     // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Visibility)
   }
 
-  /**
-   * Protobuf enum {@code org.jetbrains.kotlin.serialization.CallableKind}
-   */
-  public enum CallableKind
-      implements com.google.protobuf.ProtocolMessageEnum {
-    /**
-     * <code>FUN = 0;</code>
-     *
-     * <pre>
-     * 2 bits
-     * </pre>
-     */
-    FUN(0, 0),
-    /**
-     * <code>VAL = 1;</code>
-     */
-    VAL(1, 1),
-    /**
-     * <code>VAR = 2;</code>
-     */
-    VAR(2, 2),
-    /**
-     * <code>CONSTRUCTOR = 3;</code>
-     */
-    CONSTRUCTOR(3, 3),
-    ;
-
-    /**
-     * <code>FUN = 0;</code>
-     *
-     * <pre>
-     * 2 bits
-     * </pre>
-     */
-    public static final int FUN_VALUE = 0;
-    /**
-     * <code>VAL = 1;</code>
-     */
-    public static final int VAL_VALUE = 1;
-    /**
-     * <code>VAR = 2;</code>
-     */
-    public static final int VAR_VALUE = 2;
-    /**
-     * <code>CONSTRUCTOR = 3;</code>
-     */
-    public static final int CONSTRUCTOR_VALUE = 3;
-
-
-    public final int getNumber() { return value; }
-
-    public static CallableKind valueOf(int value) {
-      switch (value) {
-        case 0: return FUN;
-        case 1: return VAL;
-        case 2: return VAR;
-        case 3: return CONSTRUCTOR;
-        default: return null;
-      }
-    }
-
-    public static com.google.protobuf.Internal.EnumLiteMap<CallableKind>
-        internalGetValueMap() {
-      return internalValueMap;
-    }
-    private static com.google.protobuf.Internal.EnumLiteMap<CallableKind>
-        internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap<CallableKind>() {
-            public CallableKind findValueByNumber(int number) {
-              return CallableKind.valueOf(number);
-            }
-          };
-
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor
-        getValueDescriptor() {
-      return getDescriptor().getValues().get(index);
-    }
-    public final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptorForType() {
-      return getDescriptor();
-    }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptor() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor().getEnumTypes().get(2);
-    }
-
-    private static final CallableKind[] VALUES = values();
-
-    public static CallableKind valueOf(
-        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-      if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException(
-          "EnumValueDescriptor is not for this type.");
-      }
-      return VALUES[desc.getIndex()];
-    }
-
-    private final int index;
-    private final int value;
-
-    private CallableKind(int index, int value) {
-      this.index = index;
-      this.value = value;
-    }
-
-    // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.CallableKind)
-  }
-
   /**
    * Protobuf enum {@code org.jetbrains.kotlin.serialization.MemberKind}
    */
@@ -433,7 +325,7 @@ public final class DebugProtoBuf {
     }
     public static final com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor().getEnumTypes().get(3);
+      return org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor().getEnumTypes().get(2);
     }
 
     private static final MemberKind[] VALUES = values();
@@ -8852,31 +8744,6 @@ public final class DebugProtoBuf {
     org.jetbrains.kotlin.serialization.DebugProtoBuf.PropertyOrBuilder getPropertyOrBuilder(
         int index);
 
-    // repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-     */
-    java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable> 
-        getMemberList();
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-     */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getMember(int index);
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-     */
-    int getMemberCount();
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-     */
-    java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder> 
-        getMemberOrBuilderList();
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-     */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder(
-        int index);
-
     // repeated int32 enum_entry = 12 [packed = true];
     /**
      * <code>repeated int32 enum_entry = 12 [packed = true];</code>
@@ -8890,57 +8757,6 @@ public final class DebugProtoBuf {
      * <code>repeated int32 enum_entry = 12 [packed = true];</code>
      */
     int getEnumEntry(int index);
-
-    // optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
-    /**
-     * <code>optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
-     *
-     * <pre>
-     * This field is present if and only if the class has a primary constructor
-     * </pre>
-     */
-    boolean hasPrimaryConstructor();
-    /**
-     * <code>optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
-     *
-     * <pre>
-     * This field is present if and only if the class has a primary constructor
-     * </pre>
-     */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor getPrimaryConstructor();
-    /**
-     * <code>optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
-     *
-     * <pre>
-     * This field is present if and only if the class has a primary constructor
-     * </pre>
-     */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder getPrimaryConstructorOrBuilder();
-
-    // repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-     */
-    java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable> 
-        getSecondaryConstructorList();
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-     */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getSecondaryConstructor(int index);
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-     */
-    int getSecondaryConstructorCount();
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-     */
-    java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder> 
-        getSecondaryConstructorOrBuilderList();
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-     */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder getSecondaryConstructorOrBuilder(
-        int index);
   }
   /**
    * Protobuf type {@code org.jetbrains.kotlin.serialization.Class}
@@ -9069,18 +8885,10 @@ public final class DebugProtoBuf {
               property_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.PARSER, extensionRegistry));
               break;
             }
-            case 90: {
-              if (!((mutable_bitField0_ & 0x00000200) == 0x00000200)) {
-                member_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable>();
-                mutable_bitField0_ |= 0x00000200;
-              }
-              member_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.PARSER, extensionRegistry));
-              break;
-            }
             case 96: {
-              if (!((mutable_bitField0_ & 0x00000400) == 0x00000400)) {
+              if (!((mutable_bitField0_ & 0x00000200) == 0x00000200)) {
                 enumEntry_ = new java.util.ArrayList<java.lang.Integer>();
-                mutable_bitField0_ |= 0x00000400;
+                mutable_bitField0_ |= 0x00000200;
               }
               enumEntry_.add(input.readInt32());
               break;
@@ -9088,9 +8896,9 @@ public final class DebugProtoBuf {
             case 98: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000400) == 0x00000400) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000200) == 0x00000200) && input.getBytesUntilLimit() > 0) {
                 enumEntry_ = new java.util.ArrayList<java.lang.Integer>();
-                mutable_bitField0_ |= 0x00000400;
+                mutable_bitField0_ |= 0x00000200;
               }
               while (input.getBytesUntilLimit() > 0) {
                 enumEntry_.add(input.readInt32());
@@ -9098,27 +8906,6 @@ public final class DebugProtoBuf {
               input.popLimit(limit);
               break;
             }
-            case 106: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000008) == 0x00000008)) {
-                subBuilder = primaryConstructor_.toBuilder();
-              }
-              primaryConstructor_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(primaryConstructor_);
-                primaryConstructor_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000008;
-              break;
-            }
-            case 114: {
-              if (!((mutable_bitField0_ & 0x00001000) == 0x00001000)) {
-                secondaryConstructor_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable>();
-                mutable_bitField0_ |= 0x00001000;
-              }
-              secondaryConstructor_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.PARSER, extensionRegistry));
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -9146,14 +8933,8 @@ public final class DebugProtoBuf {
           property_ = java.util.Collections.unmodifiableList(property_);
         }
         if (((mutable_bitField0_ & 0x00000200) == 0x00000200)) {
-          member_ = java.util.Collections.unmodifiableList(member_);
-        }
-        if (((mutable_bitField0_ & 0x00000400) == 0x00000400)) {
           enumEntry_ = java.util.Collections.unmodifiableList(enumEntry_);
         }
-        if (((mutable_bitField0_ & 0x00001000) == 0x00001000)) {
-          secondaryConstructor_ = java.util.Collections.unmodifiableList(secondaryConstructor_);
-        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -9320,615 +9101,6 @@ public final class DebugProtoBuf {
       // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Class.Kind)
     }
 
-    public interface PrimaryConstructorOrBuilder
-        extends com.google.protobuf.MessageOrBuilder {
-
-      // optional .org.jetbrains.kotlin.serialization.Callable data = 1;
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Callable data = 1;</code>
-       *
-       * <pre>
-       * If this field is present, it contains serialized data for the primary constructor.
-       * Otherwise it's default and can be created manually upon deserialization
-       * Note: currently only objects have default primary constructor
-       * </pre>
-       */
-      boolean hasData();
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Callable data = 1;</code>
-       *
-       * <pre>
-       * If this field is present, it contains serialized data for the primary constructor.
-       * Otherwise it's default and can be created manually upon deserialization
-       * Note: currently only objects have default primary constructor
-       * </pre>
-       */
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getData();
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Callable data = 1;</code>
-       *
-       * <pre>
-       * If this field is present, it contains serialized data for the primary constructor.
-       * Otherwise it's default and can be created manually upon deserialization
-       * Note: currently only objects have default primary constructor
-       * </pre>
-       */
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder getDataOrBuilder();
-    }
-    /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Class.PrimaryConstructor}
-     */
-    public static final class PrimaryConstructor extends
-        com.google.protobuf.GeneratedMessage
-        implements PrimaryConstructorOrBuilder {
-      // Use PrimaryConstructor.newBuilder() to construct.
-      private PrimaryConstructor(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
-        super(builder);
-        this.unknownFields = builder.getUnknownFields();
-      }
-      private PrimaryConstructor(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-      private static final PrimaryConstructor defaultInstance;
-      public static PrimaryConstructor getDefaultInstance() {
-        return defaultInstance;
-      }
-
-      public PrimaryConstructor getDefaultInstanceForType() {
-        return defaultInstance;
-      }
-
-      private final com.google.protobuf.UnknownFieldSet unknownFields;
-      @java.lang.Override
-      public final com.google.protobuf.UnknownFieldSet
-          getUnknownFields() {
-        return this.unknownFields;
-      }
-      private PrimaryConstructor(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        initFields();
-        int mutable_bitField0_ = 0;
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-            com.google.protobuf.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              default: {
-                if (!parseUnknownField(input, unknownFields,
-                                       extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-              case 10: {
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000001) == 0x00000001)) {
-                  subBuilder = data_.toBuilder();
-                }
-                data_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(data_);
-                  data_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000001;
-                break;
-              }
-            }
-          }
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new com.google.protobuf.InvalidProtocolBufferException(
-              e.getMessage()).setUnfinishedMessage(this);
-        } finally {
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder.class);
-      }
-
-      public static com.google.protobuf.Parser<PrimaryConstructor> PARSER =
-          new com.google.protobuf.AbstractParser<PrimaryConstructor>() {
-        public PrimaryConstructor parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new PrimaryConstructor(input, extensionRegistry);
-        }
-      };
-
-      @java.lang.Override
-      public com.google.protobuf.Parser<PrimaryConstructor> getParserForType() {
-        return PARSER;
-      }
-
-      private int bitField0_;
-      // optional .org.jetbrains.kotlin.serialization.Callable data = 1;
-      public static final int DATA_FIELD_NUMBER = 1;
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable data_;
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Callable data = 1;</code>
-       *
-       * <pre>
-       * If this field is present, it contains serialized data for the primary constructor.
-       * Otherwise it's default and can be created manually upon deserialization
-       * Note: currently only objects have default primary constructor
-       * </pre>
-       */
-      public boolean hasData() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Callable data = 1;</code>
-       *
-       * <pre>
-       * If this field is present, it contains serialized data for the primary constructor.
-       * Otherwise it's default and can be created manually upon deserialization
-       * Note: currently only objects have default primary constructor
-       * </pre>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getData() {
-        return data_;
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Callable data = 1;</code>
-       *
-       * <pre>
-       * If this field is present, it contains serialized data for the primary constructor.
-       * Otherwise it's default and can be created manually upon deserialization
-       * Note: currently only objects have default primary constructor
-       * </pre>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder getDataOrBuilder() {
-        return data_;
-      }
-
-      private void initFields() {
-        data_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance();
-      }
-      private byte memoizedIsInitialized = -1;
-      public final boolean isInitialized() {
-        byte isInitialized = memoizedIsInitialized;
-        if (isInitialized != -1) return isInitialized == 1;
-
-        if (hasData()) {
-          if (!getData().isInitialized()) {
-            memoizedIsInitialized = 0;
-            return false;
-          }
-        }
-        memoizedIsInitialized = 1;
-        return true;
-      }
-
-      public void writeTo(com.google.protobuf.CodedOutputStream output)
-                          throws java.io.IOException {
-        getSerializedSize();
-        if (((bitField0_ & 0x00000001) == 0x00000001)) {
-          output.writeMessage(1, data_);
-        }
-        getUnknownFields().writeTo(output);
-      }
-
-      private int memoizedSerializedSize = -1;
-      public int getSerializedSize() {
-        int size = memoizedSerializedSize;
-        if (size != -1) return size;
-
-        size = 0;
-        if (((bitField0_ & 0x00000001) == 0x00000001)) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(1, data_);
-        }
-        size += getUnknownFields().getSerializedSize();
-        memoizedSerializedSize = size;
-        return size;
-      }
-
-      private static final long serialVersionUID = 0L;
-      @java.lang.Override
-      protected java.lang.Object writeReplace()
-          throws java.io.ObjectStreamException {
-        return super.writeReplace();
-      }
-
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom(
-          com.google.protobuf.ByteString data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom(
-          com.google.protobuf.ByteString data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom(byte[] data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom(
-          byte[] data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return PARSER.parseFrom(input);
-      }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom(
-          java.io.InputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return PARSER.parseFrom(input, extensionRegistry);
-      }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor parseDelimitedFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return PARSER.parseDelimitedFrom(input);
-      }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor parseDelimitedFrom(
-          java.io.InputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return PARSER.parseDelimitedFrom(input, extensionRegistry);
-      }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return PARSER.parseFrom(input);
-      }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return PARSER.parseFrom(input, extensionRegistry);
-      }
-
-      public static Builder newBuilder() { return Builder.create(); }
-      public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor prototype) {
-        return newBuilder().mergeFrom(prototype);
-      }
-      public Builder toBuilder() { return newBuilder(this); }
-
-      @java.lang.Override
-      protected Builder newBuilderForType(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-        Builder builder = new Builder(parent);
-        return builder;
-      }
-      /**
-       * Protobuf type {@code org.jetbrains.kotlin.serialization.Class.PrimaryConstructor}
-       */
-      public static final class Builder extends
-          com.google.protobuf.GeneratedMessage.Builder<Builder>
-         implements org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder {
-        public static final com.google.protobuf.Descriptors.Descriptor
-            getDescriptor() {
-          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_descriptor;
-        }
-
-        protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-            internalGetFieldAccessorTable() {
-          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_fieldAccessorTable
-              .ensureFieldAccessorsInitialized(
-                  org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder.class);
-        }
-
-        // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.newBuilder()
-        private Builder() {
-          maybeForceBuilderInitialization();
-        }
-
-        private Builder(
-            com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-          super(parent);
-          maybeForceBuilderInitialization();
-        }
-        private void maybeForceBuilderInitialization() {
-          if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-            getDataFieldBuilder();
-          }
-        }
-        private static Builder create() {
-          return new Builder();
-        }
-
-        public Builder clear() {
-          super.clear();
-          if (dataBuilder_ == null) {
-            data_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance();
-          } else {
-            dataBuilder_.clear();
-          }
-          bitField0_ = (bitField0_ & ~0x00000001);
-          return this;
-        }
-
-        public Builder clone() {
-          return create().mergeFrom(buildPartial());
-        }
-
-        public com.google.protobuf.Descriptors.Descriptor
-            getDescriptorForType() {
-          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_descriptor;
-        }
-
-        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor getDefaultInstanceForType() {
-          return org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
-        }
-
-        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor build() {
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor result = buildPartial();
-          if (!result.isInitialized()) {
-            throw newUninitializedMessageException(result);
-          }
-          return result;
-        }
-
-        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor buildPartial() {
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor(this);
-          int from_bitField0_ = bitField0_;
-          int to_bitField0_ = 0;
-          if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-            to_bitField0_ |= 0x00000001;
-          }
-          if (dataBuilder_ == null) {
-            result.data_ = data_;
-          } else {
-            result.data_ = dataBuilder_.build();
-          }
-          result.bitField0_ = to_bitField0_;
-          onBuilt();
-          return result;
-        }
-
-        public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor) {
-            return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor)other);
-          } else {
-            super.mergeFrom(other);
-            return this;
-          }
-        }
-
-        public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor other) {
-          if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance()) return this;
-          if (other.hasData()) {
-            mergeData(other.getData());
-          }
-          this.mergeUnknownFields(other.getUnknownFields());
-          return this;
-        }
-
-        public final boolean isInitialized() {
-          if (hasData()) {
-            if (!getData().isInitialized()) {
-              
-              return false;
-            }
-          }
-          return true;
-        }
-
-        public Builder mergeFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws java.io.IOException {
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor parsedMessage = null;
-          try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor) e.getUnfinishedMessage();
-            throw e;
-          } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
-          return this;
-        }
-        private int bitField0_;
-
-        // optional .org.jetbrains.kotlin.serialization.Callable data = 1;
-        private org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable data_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance();
-        private com.google.protobuf.SingleFieldBuilder<
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder> dataBuilder_;
-        /**
-         * <code>optional .org.jetbrains.kotlin.serialization.Callable data = 1;</code>
-         *
-         * <pre>
-         * If this field is present, it contains serialized data for the primary constructor.
-         * Otherwise it's default and can be created manually upon deserialization
-         * Note: currently only objects have default primary constructor
-         * </pre>
-         */
-        public boolean hasData() {
-          return ((bitField0_ & 0x00000001) == 0x00000001);
-        }
-        /**
-         * <code>optional .org.jetbrains.kotlin.serialization.Callable data = 1;</code>
-         *
-         * <pre>
-         * If this field is present, it contains serialized data for the primary constructor.
-         * Otherwise it's default and can be created manually upon deserialization
-         * Note: currently only objects have default primary constructor
-         * </pre>
-         */
-        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getData() {
-          if (dataBuilder_ == null) {
-            return data_;
-          } else {
-            return dataBuilder_.getMessage();
-          }
-        }
-        /**
-         * <code>optional .org.jetbrains.kotlin.serialization.Callable data = 1;</code>
-         *
-         * <pre>
-         * If this field is present, it contains serialized data for the primary constructor.
-         * Otherwise it's default and can be created manually upon deserialization
-         * Note: currently only objects have default primary constructor
-         * </pre>
-         */
-        public Builder setData(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable value) {
-          if (dataBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            data_ = value;
-            onChanged();
-          } else {
-            dataBuilder_.setMessage(value);
-          }
-          bitField0_ |= 0x00000001;
-          return this;
-        }
-        /**
-         * <code>optional .org.jetbrains.kotlin.serialization.Callable data = 1;</code>
-         *
-         * <pre>
-         * If this field is present, it contains serialized data for the primary constructor.
-         * Otherwise it's default and can be created manually upon deserialization
-         * Note: currently only objects have default primary constructor
-         * </pre>
-         */
-        public Builder setData(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder builderForValue) {
-          if (dataBuilder_ == null) {
-            data_ = builderForValue.build();
-            onChanged();
-          } else {
-            dataBuilder_.setMessage(builderForValue.build());
-          }
-          bitField0_ |= 0x00000001;
-          return this;
-        }
-        /**
-         * <code>optional .org.jetbrains.kotlin.serialization.Callable data = 1;</code>
-         *
-         * <pre>
-         * If this field is present, it contains serialized data for the primary constructor.
-         * Otherwise it's default and can be created manually upon deserialization
-         * Note: currently only objects have default primary constructor
-         * </pre>
-         */
-        public Builder mergeData(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable value) {
-          if (dataBuilder_ == null) {
-            if (((bitField0_ & 0x00000001) == 0x00000001) &&
-                data_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance()) {
-              data_ =
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.newBuilder(data_).mergeFrom(value).buildPartial();
-            } else {
-              data_ = value;
-            }
-            onChanged();
-          } else {
-            dataBuilder_.mergeFrom(value);
-          }
-          bitField0_ |= 0x00000001;
-          return this;
-        }
-        /**
-         * <code>optional .org.jetbrains.kotlin.serialization.Callable data = 1;</code>
-         *
-         * <pre>
-         * If this field is present, it contains serialized data for the primary constructor.
-         * Otherwise it's default and can be created manually upon deserialization
-         * Note: currently only objects have default primary constructor
-         * </pre>
-         */
-        public Builder clearData() {
-          if (dataBuilder_ == null) {
-            data_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance();
-            onChanged();
-          } else {
-            dataBuilder_.clear();
-          }
-          bitField0_ = (bitField0_ & ~0x00000001);
-          return this;
-        }
-        /**
-         * <code>optional .org.jetbrains.kotlin.serialization.Callable data = 1;</code>
-         *
-         * <pre>
-         * If this field is present, it contains serialized data for the primary constructor.
-         * Otherwise it's default and can be created manually upon deserialization
-         * Note: currently only objects have default primary constructor
-         * </pre>
-         */
-        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder getDataBuilder() {
-          bitField0_ |= 0x00000001;
-          onChanged();
-          return getDataFieldBuilder().getBuilder();
-        }
-        /**
-         * <code>optional .org.jetbrains.kotlin.serialization.Callable data = 1;</code>
-         *
-         * <pre>
-         * If this field is present, it contains serialized data for the primary constructor.
-         * Otherwise it's default and can be created manually upon deserialization
-         * Note: currently only objects have default primary constructor
-         * </pre>
-         */
-        public org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder getDataOrBuilder() {
-          if (dataBuilder_ != null) {
-            return dataBuilder_.getMessageOrBuilder();
-          } else {
-            return data_;
-          }
-        }
-        /**
-         * <code>optional .org.jetbrains.kotlin.serialization.Callable data = 1;</code>
-         *
-         * <pre>
-         * If this field is present, it contains serialized data for the primary constructor.
-         * Otherwise it's default and can be created manually upon deserialization
-         * Note: currently only objects have default primary constructor
-         * </pre>
-         */
-        private com.google.protobuf.SingleFieldBuilder<
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder> 
-            getDataFieldBuilder() {
-          if (dataBuilder_ == null) {
-            dataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder>(
-                    data_,
-                    getParentForChildren(),
-                    isClean());
-            data_ = null;
-          }
-          return dataBuilder_;
-        }
-
-        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Class.PrimaryConstructor)
-      }
-
-      static {
-        defaultInstance = new PrimaryConstructor(true);
-        defaultInstance.initFields();
-      }
-
-      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Class.PrimaryConstructor)
-    }
-
     private int bitField0_;
     // optional int32 flags = 1 [default = 0];
     public static final int FLAGS_FIELD_NUMBER = 1;
@@ -10200,42 +9372,6 @@ public final class DebugProtoBuf {
       return property_.get(index);
     }
 
-    // repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
-    public static final int MEMBER_FIELD_NUMBER = 11;
-    private java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable> member_;
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-     */
-    public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable> getMemberList() {
-      return member_;
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-     */
-    public java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder> 
-        getMemberOrBuilderList() {
-      return member_;
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-     */
-    public int getMemberCount() {
-      return member_.size();
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-     */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getMember(int index) {
-      return member_.get(index);
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-     */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder(
-        int index) {
-      return member_.get(index);
-    }
-
     // repeated int32 enum_entry = 12 [packed = true];
     public static final int ENUM_ENTRY_FIELD_NUMBER = 12;
     private java.util.List<java.lang.Integer> enumEntry_;
@@ -10260,76 +9396,6 @@ public final class DebugProtoBuf {
     }
     private int enumEntryMemoizedSerializedSize = -1;
 
-    // optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
-    public static final int PRIMARY_CONSTRUCTOR_FIELD_NUMBER = 13;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor primaryConstructor_;
-    /**
-     * <code>optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
-     *
-     * <pre>
-     * This field is present if and only if the class has a primary constructor
-     * </pre>
-     */
-    public boolean hasPrimaryConstructor() {
-      return ((bitField0_ & 0x00000008) == 0x00000008);
-    }
-    /**
-     * <code>optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
-     *
-     * <pre>
-     * This field is present if and only if the class has a primary constructor
-     * </pre>
-     */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor getPrimaryConstructor() {
-      return primaryConstructor_;
-    }
-    /**
-     * <code>optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
-     *
-     * <pre>
-     * This field is present if and only if the class has a primary constructor
-     * </pre>
-     */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder getPrimaryConstructorOrBuilder() {
-      return primaryConstructor_;
-    }
-
-    // repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;
-    public static final int SECONDARY_CONSTRUCTOR_FIELD_NUMBER = 14;
-    private java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable> secondaryConstructor_;
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-     */
-    public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable> getSecondaryConstructorList() {
-      return secondaryConstructor_;
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-     */
-    public java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder> 
-        getSecondaryConstructorOrBuilderList() {
-      return secondaryConstructor_;
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-     */
-    public int getSecondaryConstructorCount() {
-      return secondaryConstructor_.size();
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-     */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getSecondaryConstructor(int index) {
-      return secondaryConstructor_.get(index);
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-     */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder getSecondaryConstructorOrBuilder(
-        int index) {
-      return secondaryConstructor_.get(index);
-    }
-
     private void initFields() {
       flags_ = 0;
       fqName_ = 0;
@@ -10340,10 +9406,7 @@ public final class DebugProtoBuf {
       constructor_ = java.util.Collections.emptyList();
       function_ = java.util.Collections.emptyList();
       property_ = java.util.Collections.emptyList();
-      member_ = java.util.Collections.emptyList();
       enumEntry_ = java.util.Collections.emptyList();
-      primaryConstructor_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
-      secondaryConstructor_ = java.util.Collections.emptyList();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -10384,24 +9447,6 @@ public final class DebugProtoBuf {
           return false;
         }
       }
-      for (int i = 0; i < getMemberCount(); i++) {
-        if (!getMember(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      if (hasPrimaryConstructor()) {
-        if (!getPrimaryConstructor().isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      for (int i = 0; i < getSecondaryConstructorCount(); i++) {
-        if (!getSecondaryConstructor(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
       if (!extensionsAreInitialized()) {
         memoizedIsInitialized = 0;
         return false;
@@ -10447,9 +9492,6 @@ public final class DebugProtoBuf {
       for (int i = 0; i < property_.size(); i++) {
         output.writeMessage(10, property_.get(i));
       }
-      for (int i = 0; i < member_.size(); i++) {
-        output.writeMessage(11, member_.get(i));
-      }
       if (getEnumEntryList().size() > 0) {
         output.writeRawVarint32(98);
         output.writeRawVarint32(enumEntryMemoizedSerializedSize);
@@ -10457,12 +9499,6 @@ public final class DebugProtoBuf {
       for (int i = 0; i < enumEntry_.size(); i++) {
         output.writeInt32NoTag(enumEntry_.get(i));
       }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        output.writeMessage(13, primaryConstructor_);
-      }
-      for (int i = 0; i < secondaryConstructor_.size(); i++) {
-        output.writeMessage(14, secondaryConstructor_.get(i));
-      }
       extensionWriter.writeUntil(200, output);
       getUnknownFields().writeTo(output);
     }
@@ -10519,10 +9555,6 @@ public final class DebugProtoBuf {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(10, property_.get(i));
       }
-      for (int i = 0; i < member_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, member_.get(i));
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < enumEntry_.size(); i++) {
@@ -10537,14 +9569,6 @@ public final class DebugProtoBuf {
         }
         enumEntryMemoizedSerializedSize = dataSize;
       }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(13, primaryConstructor_);
-      }
-      for (int i = 0; i < secondaryConstructor_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, secondaryConstructor_.get(i));
-      }
       size += extensionsSerializedSize();
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
@@ -10659,9 +9683,6 @@ public final class DebugProtoBuf {
           getConstructorFieldBuilder();
           getFunctionFieldBuilder();
           getPropertyFieldBuilder();
-          getMemberFieldBuilder();
-          getPrimaryConstructorFieldBuilder();
-          getSecondaryConstructorFieldBuilder();
         }
       }
       private static Builder create() {
@@ -10708,26 +9729,8 @@ public final class DebugProtoBuf {
         } else {
           propertyBuilder_.clear();
         }
-        if (memberBuilder_ == null) {
-          member_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000200);
-        } else {
-          memberBuilder_.clear();
-        }
         enumEntry_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000400);
-        if (primaryConstructorBuilder_ == null) {
-          primaryConstructor_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
-        } else {
-          primaryConstructorBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000800);
-        if (secondaryConstructorBuilder_ == null) {
-          secondaryConstructor_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00001000);
-        } else {
-          secondaryConstructorBuilder_.clear();
-        }
+        bitField0_ = (bitField0_ & ~0x00000200);
         return this;
       }
 
@@ -10818,37 +9821,11 @@ public final class DebugProtoBuf {
         } else {
           result.property_ = propertyBuilder_.build();
         }
-        if (memberBuilder_ == null) {
-          if (((bitField0_ & 0x00000200) == 0x00000200)) {
-            member_ = java.util.Collections.unmodifiableList(member_);
-            bitField0_ = (bitField0_ & ~0x00000200);
-          }
-          result.member_ = member_;
-        } else {
-          result.member_ = memberBuilder_.build();
-        }
-        if (((bitField0_ & 0x00000400) == 0x00000400)) {
+        if (((bitField0_ & 0x00000200) == 0x00000200)) {
           enumEntry_ = java.util.Collections.unmodifiableList(enumEntry_);
-          bitField0_ = (bitField0_ & ~0x00000400);
+          bitField0_ = (bitField0_ & ~0x00000200);
         }
         result.enumEntry_ = enumEntry_;
-        if (((from_bitField0_ & 0x00000800) == 0x00000800)) {
-          to_bitField0_ |= 0x00000008;
-        }
-        if (primaryConstructorBuilder_ == null) {
-          result.primaryConstructor_ = primaryConstructor_;
-        } else {
-          result.primaryConstructor_ = primaryConstructorBuilder_.build();
-        }
-        if (secondaryConstructorBuilder_ == null) {
-          if (((bitField0_ & 0x00001000) == 0x00001000)) {
-            secondaryConstructor_ = java.util.Collections.unmodifiableList(secondaryConstructor_);
-            bitField0_ = (bitField0_ & ~0x00001000);
-          }
-          result.secondaryConstructor_ = secondaryConstructor_;
-        } else {
-          result.secondaryConstructor_ = secondaryConstructorBuilder_.build();
-        }
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -11014,71 +9991,16 @@ public final class DebugProtoBuf {
             }
           }
         }
-        if (memberBuilder_ == null) {
-          if (!other.member_.isEmpty()) {
-            if (member_.isEmpty()) {
-              member_ = other.member_;
-              bitField0_ = (bitField0_ & ~0x00000200);
-            } else {
-              ensureMemberIsMutable();
-              member_.addAll(other.member_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.member_.isEmpty()) {
-            if (memberBuilder_.isEmpty()) {
-              memberBuilder_.dispose();
-              memberBuilder_ = null;
-              member_ = other.member_;
-              bitField0_ = (bitField0_ & ~0x00000200);
-              memberBuilder_ = 
-                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getMemberFieldBuilder() : null;
-            } else {
-              memberBuilder_.addAllMessages(other.member_);
-            }
-          }
-        }
         if (!other.enumEntry_.isEmpty()) {
           if (enumEntry_.isEmpty()) {
             enumEntry_ = other.enumEntry_;
-            bitField0_ = (bitField0_ & ~0x00000400);
+            bitField0_ = (bitField0_ & ~0x00000200);
           } else {
             ensureEnumEntryIsMutable();
             enumEntry_.addAll(other.enumEntry_);
           }
           onChanged();
         }
-        if (other.hasPrimaryConstructor()) {
-          mergePrimaryConstructor(other.getPrimaryConstructor());
-        }
-        if (secondaryConstructorBuilder_ == null) {
-          if (!other.secondaryConstructor_.isEmpty()) {
-            if (secondaryConstructor_.isEmpty()) {
-              secondaryConstructor_ = other.secondaryConstructor_;
-              bitField0_ = (bitField0_ & ~0x00001000);
-            } else {
-              ensureSecondaryConstructorIsMutable();
-              secondaryConstructor_.addAll(other.secondaryConstructor_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.secondaryConstructor_.isEmpty()) {
-            if (secondaryConstructorBuilder_.isEmpty()) {
-              secondaryConstructorBuilder_.dispose();
-              secondaryConstructorBuilder_ = null;
-              secondaryConstructor_ = other.secondaryConstructor_;
-              bitField0_ = (bitField0_ & ~0x00001000);
-              secondaryConstructorBuilder_ = 
-                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getSecondaryConstructorFieldBuilder() : null;
-            } else {
-              secondaryConstructorBuilder_.addAllMessages(other.secondaryConstructor_);
-            }
-          }
-        }
         this.mergeExtensionFields(other);
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
@@ -11119,24 +10041,6 @@ public final class DebugProtoBuf {
             return false;
           }
         }
-        for (int i = 0; i < getMemberCount(); i++) {
-          if (!getMember(i).isInitialized()) {
-            
-            return false;
-          }
-        }
-        if (hasPrimaryConstructor()) {
-          if (!getPrimaryConstructor().isInitialized()) {
-            
-            return false;
-          }
-        }
-        for (int i = 0; i < getSecondaryConstructorCount(); i++) {
-          if (!getSecondaryConstructor(i).isInitialized()) {
-            
-            return false;
-          }
-        }
         if (!extensionsAreInitialized()) {
           
           return false;
@@ -12564,252 +11468,12 @@ public final class DebugProtoBuf {
         return propertyBuilder_;
       }
 
-      // repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
-      private java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable> member_ =
-        java.util.Collections.emptyList();
-      private void ensureMemberIsMutable() {
-        if (!((bitField0_ & 0x00000200) == 0x00000200)) {
-          member_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable>(member_);
-          bitField0_ |= 0x00000200;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder> memberBuilder_;
-
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable> getMemberList() {
-        if (memberBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(member_);
-        } else {
-          return memberBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public int getMemberCount() {
-        if (memberBuilder_ == null) {
-          return member_.size();
-        } else {
-          return memberBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getMember(int index) {
-        if (memberBuilder_ == null) {
-          return member_.get(index);
-        } else {
-          return memberBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public Builder setMember(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable value) {
-        if (memberBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureMemberIsMutable();
-          member_.set(index, value);
-          onChanged();
-        } else {
-          memberBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public Builder setMember(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder builderForValue) {
-        if (memberBuilder_ == null) {
-          ensureMemberIsMutable();
-          member_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          memberBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public Builder addMember(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable value) {
-        if (memberBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureMemberIsMutable();
-          member_.add(value);
-          onChanged();
-        } else {
-          memberBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public Builder addMember(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable value) {
-        if (memberBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureMemberIsMutable();
-          member_.add(index, value);
-          onChanged();
-        } else {
-          memberBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public Builder addMember(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder builderForValue) {
-        if (memberBuilder_ == null) {
-          ensureMemberIsMutable();
-          member_.add(builderForValue.build());
-          onChanged();
-        } else {
-          memberBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public Builder addMember(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder builderForValue) {
-        if (memberBuilder_ == null) {
-          ensureMemberIsMutable();
-          member_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          memberBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public Builder addAllMember(
-          java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable> values) {
-        if (memberBuilder_ == null) {
-          ensureMemberIsMutable();
-          super.addAll(values, member_);
-          onChanged();
-        } else {
-          memberBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public Builder clearMember() {
-        if (memberBuilder_ == null) {
-          member_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000200);
-          onChanged();
-        } else {
-          memberBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public Builder removeMember(int index) {
-        if (memberBuilder_ == null) {
-          ensureMemberIsMutable();
-          member_.remove(index);
-          onChanged();
-        } else {
-          memberBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder getMemberBuilder(
-          int index) {
-        return getMemberFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder(
-          int index) {
-        if (memberBuilder_ == null) {
-          return member_.get(index);  } else {
-          return memberBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder> 
-           getMemberOrBuilderList() {
-        if (memberBuilder_ != null) {
-          return memberBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(member_);
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder addMemberBuilder() {
-        return getMemberFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder addMemberBuilder(
-          int index) {
-        return getMemberFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder> 
-           getMemberBuilderList() {
-        return getMemberFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder> 
-          getMemberFieldBuilder() {
-        if (memberBuilder_ == null) {
-          memberBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder>(
-                  member_,
-                  ((bitField0_ & 0x00000200) == 0x00000200),
-                  getParentForChildren(),
-                  isClean());
-          member_ = null;
-        }
-        return memberBuilder_;
-      }
-
       // repeated int32 enum_entry = 12 [packed = true];
       private java.util.List<java.lang.Integer> enumEntry_ = java.util.Collections.emptyList();
       private void ensureEnumEntryIsMutable() {
-        if (!((bitField0_ & 0x00000400) == 0x00000400)) {
+        if (!((bitField0_ & 0x00000200) == 0x00000200)) {
           enumEntry_ = new java.util.ArrayList<java.lang.Integer>(enumEntry_);
-          bitField0_ |= 0x00000400;
+          bitField0_ |= 0x00000200;
          }
       }
       /**
@@ -12865,404 +11529,11 @@ public final class DebugProtoBuf {
        */
       public Builder clearEnumEntry() {
         enumEntry_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000400);
+        bitField0_ = (bitField0_ & ~0x00000200);
         onChanged();
         return this;
       }
 
-      // optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor primaryConstructor_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder> primaryConstructorBuilder_;
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
-       *
-       * <pre>
-       * This field is present if and only if the class has a primary constructor
-       * </pre>
-       */
-      public boolean hasPrimaryConstructor() {
-        return ((bitField0_ & 0x00000800) == 0x00000800);
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
-       *
-       * <pre>
-       * This field is present if and only if the class has a primary constructor
-       * </pre>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor getPrimaryConstructor() {
-        if (primaryConstructorBuilder_ == null) {
-          return primaryConstructor_;
-        } else {
-          return primaryConstructorBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
-       *
-       * <pre>
-       * This field is present if and only if the class has a primary constructor
-       * </pre>
-       */
-      public Builder setPrimaryConstructor(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor value) {
-        if (primaryConstructorBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          primaryConstructor_ = value;
-          onChanged();
-        } else {
-          primaryConstructorBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000800;
-        return this;
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
-       *
-       * <pre>
-       * This field is present if and only if the class has a primary constructor
-       * </pre>
-       */
-      public Builder setPrimaryConstructor(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder builderForValue) {
-        if (primaryConstructorBuilder_ == null) {
-          primaryConstructor_ = builderForValue.build();
-          onChanged();
-        } else {
-          primaryConstructorBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000800;
-        return this;
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
-       *
-       * <pre>
-       * This field is present if and only if the class has a primary constructor
-       * </pre>
-       */
-      public Builder mergePrimaryConstructor(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor value) {
-        if (primaryConstructorBuilder_ == null) {
-          if (((bitField0_ & 0x00000800) == 0x00000800) &&
-              primaryConstructor_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance()) {
-            primaryConstructor_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.newBuilder(primaryConstructor_).mergeFrom(value).buildPartial();
-          } else {
-            primaryConstructor_ = value;
-          }
-          onChanged();
-        } else {
-          primaryConstructorBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000800;
-        return this;
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
-       *
-       * <pre>
-       * This field is present if and only if the class has a primary constructor
-       * </pre>
-       */
-      public Builder clearPrimaryConstructor() {
-        if (primaryConstructorBuilder_ == null) {
-          primaryConstructor_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
-          onChanged();
-        } else {
-          primaryConstructorBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000800);
-        return this;
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
-       *
-       * <pre>
-       * This field is present if and only if the class has a primary constructor
-       * </pre>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder getPrimaryConstructorBuilder() {
-        bitField0_ |= 0x00000800;
-        onChanged();
-        return getPrimaryConstructorFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
-       *
-       * <pre>
-       * This field is present if and only if the class has a primary constructor
-       * </pre>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder getPrimaryConstructorOrBuilder() {
-        if (primaryConstructorBuilder_ != null) {
-          return primaryConstructorBuilder_.getMessageOrBuilder();
-        } else {
-          return primaryConstructor_;
-        }
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
-       *
-       * <pre>
-       * This field is present if and only if the class has a primary constructor
-       * </pre>
-       */
-      private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder> 
-          getPrimaryConstructorFieldBuilder() {
-        if (primaryConstructorBuilder_ == null) {
-          primaryConstructorBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder>(
-                  primaryConstructor_,
-                  getParentForChildren(),
-                  isClean());
-          primaryConstructor_ = null;
-        }
-        return primaryConstructorBuilder_;
-      }
-
-      // repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;
-      private java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable> secondaryConstructor_ =
-        java.util.Collections.emptyList();
-      private void ensureSecondaryConstructorIsMutable() {
-        if (!((bitField0_ & 0x00001000) == 0x00001000)) {
-          secondaryConstructor_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable>(secondaryConstructor_);
-          bitField0_ |= 0x00001000;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder> secondaryConstructorBuilder_;
-
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable> getSecondaryConstructorList() {
-        if (secondaryConstructorBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(secondaryConstructor_);
-        } else {
-          return secondaryConstructorBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public int getSecondaryConstructorCount() {
-        if (secondaryConstructorBuilder_ == null) {
-          return secondaryConstructor_.size();
-        } else {
-          return secondaryConstructorBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getSecondaryConstructor(int index) {
-        if (secondaryConstructorBuilder_ == null) {
-          return secondaryConstructor_.get(index);
-        } else {
-          return secondaryConstructorBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public Builder setSecondaryConstructor(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable value) {
-        if (secondaryConstructorBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureSecondaryConstructorIsMutable();
-          secondaryConstructor_.set(index, value);
-          onChanged();
-        } else {
-          secondaryConstructorBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public Builder setSecondaryConstructor(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder builderForValue) {
-        if (secondaryConstructorBuilder_ == null) {
-          ensureSecondaryConstructorIsMutable();
-          secondaryConstructor_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          secondaryConstructorBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public Builder addSecondaryConstructor(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable value) {
-        if (secondaryConstructorBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureSecondaryConstructorIsMutable();
-          secondaryConstructor_.add(value);
-          onChanged();
-        } else {
-          secondaryConstructorBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public Builder addSecondaryConstructor(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable value) {
-        if (secondaryConstructorBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureSecondaryConstructorIsMutable();
-          secondaryConstructor_.add(index, value);
-          onChanged();
-        } else {
-          secondaryConstructorBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public Builder addSecondaryConstructor(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder builderForValue) {
-        if (secondaryConstructorBuilder_ == null) {
-          ensureSecondaryConstructorIsMutable();
-          secondaryConstructor_.add(builderForValue.build());
-          onChanged();
-        } else {
-          secondaryConstructorBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public Builder addSecondaryConstructor(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder builderForValue) {
-        if (secondaryConstructorBuilder_ == null) {
-          ensureSecondaryConstructorIsMutable();
-          secondaryConstructor_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          secondaryConstructorBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public Builder addAllSecondaryConstructor(
-          java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable> values) {
-        if (secondaryConstructorBuilder_ == null) {
-          ensureSecondaryConstructorIsMutable();
-          super.addAll(values, secondaryConstructor_);
-          onChanged();
-        } else {
-          secondaryConstructorBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public Builder clearSecondaryConstructor() {
-        if (secondaryConstructorBuilder_ == null) {
-          secondaryConstructor_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00001000);
-          onChanged();
-        } else {
-          secondaryConstructorBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public Builder removeSecondaryConstructor(int index) {
-        if (secondaryConstructorBuilder_ == null) {
-          ensureSecondaryConstructorIsMutable();
-          secondaryConstructor_.remove(index);
-          onChanged();
-        } else {
-          secondaryConstructorBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder getSecondaryConstructorBuilder(
-          int index) {
-        return getSecondaryConstructorFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder getSecondaryConstructorOrBuilder(
-          int index) {
-        if (secondaryConstructorBuilder_ == null) {
-          return secondaryConstructor_.get(index);  } else {
-          return secondaryConstructorBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder> 
-           getSecondaryConstructorOrBuilderList() {
-        if (secondaryConstructorBuilder_ != null) {
-          return secondaryConstructorBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(secondaryConstructor_);
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder addSecondaryConstructorBuilder() {
-        return getSecondaryConstructorFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder addSecondaryConstructorBuilder(
-          int index) {
-        return getSecondaryConstructorFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder> 
-           getSecondaryConstructorBuilderList() {
-        return getSecondaryConstructorFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder> 
-          getSecondaryConstructorFieldBuilder() {
-        if (secondaryConstructorBuilder_ == null) {
-          secondaryConstructorBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder>(
-                  secondaryConstructor_,
-                  ((bitField0_ & 0x00001000) == 0x00001000),
-                  getParentForChildren(),
-                  isClean());
-          secondaryConstructor_ = null;
-        }
-        return secondaryConstructorBuilder_;
-      }
-
       // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Class)
     }
 
@@ -13278,56 +11549,6 @@ public final class DebugProtoBuf {
       com.google.protobuf.GeneratedMessage.
           ExtendableMessageOrBuilder<Package> {
 
-    // repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-     */
-    java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable> 
-        getMemberList();
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-     */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getMember(int index);
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-     */
-    int getMemberCount();
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-     */
-    java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder> 
-        getMemberOrBuilderList();
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-     */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder(
-        int index);
-
-    // repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-     */
-    java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor> 
-        getConstructorList();
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-     */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor getConstructor(int index);
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-     */
-    int getConstructorCount();
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-     */
-    java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.ConstructorOrBuilder> 
-        getConstructorOrBuilderList();
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-     */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.ConstructorOrBuilder getConstructorOrBuilder(
-        int index);
-
     // repeated .org.jetbrains.kotlin.serialization.Function function = 3;
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.Function function = 3;</code>
@@ -13429,34 +11650,18 @@ public final class DebugProtoBuf {
               }
               break;
             }
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                member_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable>();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              member_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.PARSER, extensionRegistry));
-              break;
-            }
-            case 18: {
-              if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-                constructor_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor>();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              constructor_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.PARSER, extensionRegistry));
-              break;
-            }
             case 26: {
-              if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
                 function_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.DebugProtoBuf.Function>();
-                mutable_bitField0_ |= 0x00000004;
+                mutable_bitField0_ |= 0x00000001;
               }
               function_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.PARSER, extensionRegistry));
               break;
             }
             case 34: {
-              if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+              if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
                 property_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.DebugProtoBuf.Property>();
-                mutable_bitField0_ |= 0x00000008;
+                mutable_bitField0_ |= 0x00000002;
               }
               property_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.PARSER, extensionRegistry));
               break;
@@ -13470,15 +11675,9 @@ public final class DebugProtoBuf {
             e.getMessage()).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-          member_ = java.util.Collections.unmodifiableList(member_);
-        }
-        if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-          constructor_ = java.util.Collections.unmodifiableList(constructor_);
-        }
-        if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
           function_ = java.util.Collections.unmodifiableList(function_);
         }
-        if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+        if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
           property_ = java.util.Collections.unmodifiableList(property_);
         }
         this.unknownFields = unknownFields.build();
@@ -13512,78 +11711,6 @@ public final class DebugProtoBuf {
       return PARSER;
     }
 
-    // repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
-    public static final int MEMBER_FIELD_NUMBER = 1;
-    private java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable> member_;
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-     */
-    public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable> getMemberList() {
-      return member_;
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-     */
-    public java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder> 
-        getMemberOrBuilderList() {
-      return member_;
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-     */
-    public int getMemberCount() {
-      return member_.size();
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-     */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getMember(int index) {
-      return member_.get(index);
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-     */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder(
-        int index) {
-      return member_.get(index);
-    }
-
-    // repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;
-    public static final int CONSTRUCTOR_FIELD_NUMBER = 2;
-    private java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor> constructor_;
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-     */
-    public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor> getConstructorList() {
-      return constructor_;
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-     */
-    public java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.ConstructorOrBuilder> 
-        getConstructorOrBuilderList() {
-      return constructor_;
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-     */
-    public int getConstructorCount() {
-      return constructor_.size();
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-     */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor getConstructor(int index) {
-      return constructor_.get(index);
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-     */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.ConstructorOrBuilder getConstructorOrBuilder(
-        int index) {
-      return constructor_.get(index);
-    }
-
     // repeated .org.jetbrains.kotlin.serialization.Function function = 3;
     public static final int FUNCTION_FIELD_NUMBER = 3;
     private java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Function> function_;
@@ -13657,8 +11784,6 @@ public final class DebugProtoBuf {
     }
 
     private void initFields() {
-      member_ = java.util.Collections.emptyList();
-      constructor_ = java.util.Collections.emptyList();
       function_ = java.util.Collections.emptyList();
       property_ = java.util.Collections.emptyList();
     }
@@ -13667,18 +11792,6 @@ public final class DebugProtoBuf {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
 
-      for (int i = 0; i < getMemberCount(); i++) {
-        if (!getMember(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      for (int i = 0; i < getConstructorCount(); i++) {
-        if (!getConstructor(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
       for (int i = 0; i < getFunctionCount(); i++) {
         if (!getFunction(i).isInitialized()) {
           memoizedIsInitialized = 0;
@@ -13705,12 +11818,6 @@ public final class DebugProtoBuf {
       com.google.protobuf.GeneratedMessage
         .ExtendableMessage<org.jetbrains.kotlin.serialization.DebugProtoBuf.Package>.ExtensionWriter extensionWriter =
           newExtensionWriter();
-      for (int i = 0; i < member_.size(); i++) {
-        output.writeMessage(1, member_.get(i));
-      }
-      for (int i = 0; i < constructor_.size(); i++) {
-        output.writeMessage(2, constructor_.get(i));
-      }
       for (int i = 0; i < function_.size(); i++) {
         output.writeMessage(3, function_.get(i));
       }
@@ -13727,14 +11834,6 @@ public final class DebugProtoBuf {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < member_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, member_.get(i));
-      }
-      for (int i = 0; i < constructor_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, constructor_.get(i));
-      }
       for (int i = 0; i < function_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(3, function_.get(i));
@@ -13852,8 +11951,6 @@ public final class DebugProtoBuf {
       }
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-          getMemberFieldBuilder();
-          getConstructorFieldBuilder();
           getFunctionFieldBuilder();
           getPropertyFieldBuilder();
         }
@@ -13864,27 +11961,15 @@ public final class DebugProtoBuf {
 
       public Builder clear() {
         super.clear();
-        if (memberBuilder_ == null) {
-          member_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          memberBuilder_.clear();
-        }
-        if (constructorBuilder_ == null) {
-          constructor_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
-        } else {
-          constructorBuilder_.clear();
-        }
         if (functionBuilder_ == null) {
           function_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           functionBuilder_.clear();
         }
         if (propertyBuilder_ == null) {
           property_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000008);
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           propertyBuilder_.clear();
         }
@@ -13915,37 +12000,19 @@ public final class DebugProtoBuf {
       public org.jetbrains.kotlin.serialization.DebugProtoBuf.Package buildPartial() {
         org.jetbrains.kotlin.serialization.DebugProtoBuf.Package result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Package(this);
         int from_bitField0_ = bitField0_;
-        if (memberBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) == 0x00000001)) {
-            member_ = java.util.Collections.unmodifiableList(member_);
-            bitField0_ = (bitField0_ & ~0x00000001);
-          }
-          result.member_ = member_;
-        } else {
-          result.member_ = memberBuilder_.build();
-        }
-        if (constructorBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) == 0x00000002)) {
-            constructor_ = java.util.Collections.unmodifiableList(constructor_);
-            bitField0_ = (bitField0_ & ~0x00000002);
-          }
-          result.constructor_ = constructor_;
-        } else {
-          result.constructor_ = constructorBuilder_.build();
-        }
         if (functionBuilder_ == null) {
-          if (((bitField0_ & 0x00000004) == 0x00000004)) {
+          if (((bitField0_ & 0x00000001) == 0x00000001)) {
             function_ = java.util.Collections.unmodifiableList(function_);
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.function_ = function_;
         } else {
           result.function_ = functionBuilder_.build();
         }
         if (propertyBuilder_ == null) {
-          if (((bitField0_ & 0x00000008) == 0x00000008)) {
+          if (((bitField0_ & 0x00000002) == 0x00000002)) {
             property_ = java.util.Collections.unmodifiableList(property_);
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000002);
           }
           result.property_ = property_;
         } else {
@@ -13966,63 +12033,11 @@ public final class DebugProtoBuf {
 
       public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Package other) {
         if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.getDefaultInstance()) return this;
-        if (memberBuilder_ == null) {
-          if (!other.member_.isEmpty()) {
-            if (member_.isEmpty()) {
-              member_ = other.member_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensureMemberIsMutable();
-              member_.addAll(other.member_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.member_.isEmpty()) {
-            if (memberBuilder_.isEmpty()) {
-              memberBuilder_.dispose();
-              memberBuilder_ = null;
-              member_ = other.member_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-              memberBuilder_ = 
-                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getMemberFieldBuilder() : null;
-            } else {
-              memberBuilder_.addAllMessages(other.member_);
-            }
-          }
-        }
-        if (constructorBuilder_ == null) {
-          if (!other.constructor_.isEmpty()) {
-            if (constructor_.isEmpty()) {
-              constructor_ = other.constructor_;
-              bitField0_ = (bitField0_ & ~0x00000002);
-            } else {
-              ensureConstructorIsMutable();
-              constructor_.addAll(other.constructor_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.constructor_.isEmpty()) {
-            if (constructorBuilder_.isEmpty()) {
-              constructorBuilder_.dispose();
-              constructorBuilder_ = null;
-              constructor_ = other.constructor_;
-              bitField0_ = (bitField0_ & ~0x00000002);
-              constructorBuilder_ = 
-                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getConstructorFieldBuilder() : null;
-            } else {
-              constructorBuilder_.addAllMessages(other.constructor_);
-            }
-          }
-        }
         if (functionBuilder_ == null) {
           if (!other.function_.isEmpty()) {
             if (function_.isEmpty()) {
               function_ = other.function_;
-              bitField0_ = (bitField0_ & ~0x00000004);
+              bitField0_ = (bitField0_ & ~0x00000001);
             } else {
               ensureFunctionIsMutable();
               function_.addAll(other.function_);
@@ -14035,7 +12050,7 @@ public final class DebugProtoBuf {
               functionBuilder_.dispose();
               functionBuilder_ = null;
               function_ = other.function_;
-              bitField0_ = (bitField0_ & ~0x00000004);
+              bitField0_ = (bitField0_ & ~0x00000001);
               functionBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
                    getFunctionFieldBuilder() : null;
@@ -14048,7 +12063,7 @@ public final class DebugProtoBuf {
           if (!other.property_.isEmpty()) {
             if (property_.isEmpty()) {
               property_ = other.property_;
-              bitField0_ = (bitField0_ & ~0x00000008);
+              bitField0_ = (bitField0_ & ~0x00000002);
             } else {
               ensurePropertyIsMutable();
               property_.addAll(other.property_);
@@ -14061,7 +12076,7 @@ public final class DebugProtoBuf {
               propertyBuilder_.dispose();
               propertyBuilder_ = null;
               property_ = other.property_;
-              bitField0_ = (bitField0_ & ~0x00000008);
+              bitField0_ = (bitField0_ & ~0x00000002);
               propertyBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
                    getPropertyFieldBuilder() : null;
@@ -14076,18 +12091,6 @@ public final class DebugProtoBuf {
       }
 
       public final boolean isInitialized() {
-        for (int i = 0; i < getMemberCount(); i++) {
-          if (!getMember(i).isInitialized()) {
-            
-            return false;
-          }
-        }
-        for (int i = 0; i < getConstructorCount(); i++) {
-          if (!getConstructor(i).isInitialized()) {
-            
-            return false;
-          }
-        }
         for (int i = 0; i < getFunctionCount(); i++) {
           if (!getFunction(i).isInitialized()) {
             
@@ -14126,493 +12129,13 @@ public final class DebugProtoBuf {
       }
       private int bitField0_;
 
-      // repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
-      private java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable> member_ =
-        java.util.Collections.emptyList();
-      private void ensureMemberIsMutable() {
-        if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          member_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable>(member_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder> memberBuilder_;
-
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable> getMemberList() {
-        if (memberBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(member_);
-        } else {
-          return memberBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public int getMemberCount() {
-        if (memberBuilder_ == null) {
-          return member_.size();
-        } else {
-          return memberBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getMember(int index) {
-        if (memberBuilder_ == null) {
-          return member_.get(index);
-        } else {
-          return memberBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public Builder setMember(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable value) {
-        if (memberBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureMemberIsMutable();
-          member_.set(index, value);
-          onChanged();
-        } else {
-          memberBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public Builder setMember(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder builderForValue) {
-        if (memberBuilder_ == null) {
-          ensureMemberIsMutable();
-          member_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          memberBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public Builder addMember(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable value) {
-        if (memberBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureMemberIsMutable();
-          member_.add(value);
-          onChanged();
-        } else {
-          memberBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public Builder addMember(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable value) {
-        if (memberBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureMemberIsMutable();
-          member_.add(index, value);
-          onChanged();
-        } else {
-          memberBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public Builder addMember(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder builderForValue) {
-        if (memberBuilder_ == null) {
-          ensureMemberIsMutable();
-          member_.add(builderForValue.build());
-          onChanged();
-        } else {
-          memberBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public Builder addMember(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder builderForValue) {
-        if (memberBuilder_ == null) {
-          ensureMemberIsMutable();
-          member_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          memberBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public Builder addAllMember(
-          java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable> values) {
-        if (memberBuilder_ == null) {
-          ensureMemberIsMutable();
-          super.addAll(values, member_);
-          onChanged();
-        } else {
-          memberBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public Builder clearMember() {
-        if (memberBuilder_ == null) {
-          member_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          memberBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public Builder removeMember(int index) {
-        if (memberBuilder_ == null) {
-          ensureMemberIsMutable();
-          member_.remove(index);
-          onChanged();
-        } else {
-          memberBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder getMemberBuilder(
-          int index) {
-        return getMemberFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder(
-          int index) {
-        if (memberBuilder_ == null) {
-          return member_.get(index);  } else {
-          return memberBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder> 
-           getMemberOrBuilderList() {
-        if (memberBuilder_ != null) {
-          return memberBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(member_);
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder addMemberBuilder() {
-        return getMemberFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder addMemberBuilder(
-          int index) {
-        return getMemberFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder> 
-           getMemberBuilderList() {
-        return getMemberFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder> 
-          getMemberFieldBuilder() {
-        if (memberBuilder_ == null) {
-          memberBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder>(
-                  member_,
-                  ((bitField0_ & 0x00000001) == 0x00000001),
-                  getParentForChildren(),
-                  isClean());
-          member_ = null;
-        }
-        return memberBuilder_;
-      }
-
-      // repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;
-      private java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor> constructor_ =
-        java.util.Collections.emptyList();
-      private void ensureConstructorIsMutable() {
-        if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          constructor_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor>(constructor_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor, org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ConstructorOrBuilder> constructorBuilder_;
-
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor> getConstructorList() {
-        if (constructorBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(constructor_);
-        } else {
-          return constructorBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public int getConstructorCount() {
-        if (constructorBuilder_ == null) {
-          return constructor_.size();
-        } else {
-          return constructorBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor getConstructor(int index) {
-        if (constructorBuilder_ == null) {
-          return constructor_.get(index);
-        } else {
-          return constructorBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public Builder setConstructor(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor value) {
-        if (constructorBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureConstructorIsMutable();
-          constructor_.set(index, value);
-          onChanged();
-        } else {
-          constructorBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public Builder setConstructor(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.Builder builderForValue) {
-        if (constructorBuilder_ == null) {
-          ensureConstructorIsMutable();
-          constructor_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          constructorBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public Builder addConstructor(org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor value) {
-        if (constructorBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureConstructorIsMutable();
-          constructor_.add(value);
-          onChanged();
-        } else {
-          constructorBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public Builder addConstructor(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor value) {
-        if (constructorBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureConstructorIsMutable();
-          constructor_.add(index, value);
-          onChanged();
-        } else {
-          constructorBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public Builder addConstructor(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.Builder builderForValue) {
-        if (constructorBuilder_ == null) {
-          ensureConstructorIsMutable();
-          constructor_.add(builderForValue.build());
-          onChanged();
-        } else {
-          constructorBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public Builder addConstructor(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.Builder builderForValue) {
-        if (constructorBuilder_ == null) {
-          ensureConstructorIsMutable();
-          constructor_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          constructorBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public Builder addAllConstructor(
-          java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor> values) {
-        if (constructorBuilder_ == null) {
-          ensureConstructorIsMutable();
-          super.addAll(values, constructor_);
-          onChanged();
-        } else {
-          constructorBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public Builder clearConstructor() {
-        if (constructorBuilder_ == null) {
-          constructor_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
-          onChanged();
-        } else {
-          constructorBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public Builder removeConstructor(int index) {
-        if (constructorBuilder_ == null) {
-          ensureConstructorIsMutable();
-          constructor_.remove(index);
-          onChanged();
-        } else {
-          constructorBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.Builder getConstructorBuilder(
-          int index) {
-        return getConstructorFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ConstructorOrBuilder getConstructorOrBuilder(
-          int index) {
-        if (constructorBuilder_ == null) {
-          return constructor_.get(index);  } else {
-          return constructorBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.ConstructorOrBuilder> 
-           getConstructorOrBuilderList() {
-        if (constructorBuilder_ != null) {
-          return constructorBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(constructor_);
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.Builder addConstructorBuilder() {
-        return getConstructorFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.Builder addConstructorBuilder(
-          int index) {
-        return getConstructorFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.Builder> 
-           getConstructorBuilderList() {
-        return getConstructorFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor, org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ConstructorOrBuilder> 
-          getConstructorFieldBuilder() {
-        if (constructorBuilder_ == null) {
-          constructorBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor, org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ConstructorOrBuilder>(
-                  constructor_,
-                  ((bitField0_ & 0x00000002) == 0x00000002),
-                  getParentForChildren(),
-                  isClean());
-          constructor_ = null;
-        }
-        return constructorBuilder_;
-      }
-
       // repeated .org.jetbrains.kotlin.serialization.Function function = 3;
       private java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Function> function_ =
         java.util.Collections.emptyList();
       private void ensureFunctionIsMutable() {
-        if (!((bitField0_ & 0x00000004) == 0x00000004)) {
+        if (!((bitField0_ & 0x00000001) == 0x00000001)) {
           function_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.DebugProtoBuf.Function>(function_);
-          bitField0_ |= 0x00000004;
+          bitField0_ |= 0x00000001;
          }
       }
 
@@ -14761,7 +12284,7 @@ public final class DebugProtoBuf {
       public Builder clearFunction() {
         if (functionBuilder_ == null) {
           function_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
         } else {
           functionBuilder_.clear();
@@ -14838,7 +12361,7 @@ public final class DebugProtoBuf {
           functionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.jetbrains.kotlin.serialization.DebugProtoBuf.Function, org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.FunctionOrBuilder>(
                   function_,
-                  ((bitField0_ & 0x00000004) == 0x00000004),
+                  ((bitField0_ & 0x00000001) == 0x00000001),
                   getParentForChildren(),
                   isClean());
           function_ = null;
@@ -14850,9 +12373,9 @@ public final class DebugProtoBuf {
       private java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Property> property_ =
         java.util.Collections.emptyList();
       private void ensurePropertyIsMutable() {
-        if (!((bitField0_ & 0x00000008) == 0x00000008)) {
+        if (!((bitField0_ & 0x00000002) == 0x00000002)) {
           property_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.DebugProtoBuf.Property>(property_);
-          bitField0_ |= 0x00000008;
+          bitField0_ |= 0x00000002;
          }
       }
 
@@ -15001,7 +12524,7 @@ public final class DebugProtoBuf {
       public Builder clearProperty() {
         if (propertyBuilder_ == null) {
           property_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000008);
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
         } else {
           propertyBuilder_.clear();
@@ -15078,7 +12601,7 @@ public final class DebugProtoBuf {
           propertyBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               org.jetbrains.kotlin.serialization.DebugProtoBuf.Property, org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.PropertyOrBuilder>(
                   property_,
-                  ((bitField0_ & 0x00000008) == 0x00000008),
+                  ((bitField0_ & 0x00000002) == 0x00000002),
                   getParentForChildren(),
                   isClean());
           property_ = null;
@@ -19506,2132 +17029,6 @@ public final class DebugProtoBuf {
     // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Property)
   }
 
-  public interface CallableOrBuilder extends
-      com.google.protobuf.GeneratedMessage.
-          ExtendableMessageOrBuilder<Callable> {
-
-    // optional int32 flags = 1;
-    /**
-     * <code>optional int32 flags = 1;</code>
-     *
-     * <pre>
-     *
-     *Visibility
-     *Modality
-     *hasAnnotations
-     *CallableKind
-     *MemberKind
-     *hasGetter
-     *hasSetter
-     *hasConstant
-     *isConst
-     *lateinit
-     *isOperator
-     *isInfix
-     * </pre>
-     */
-    boolean hasFlags();
-    /**
-     * <code>optional int32 flags = 1;</code>
-     *
-     * <pre>
-     *
-     *Visibility
-     *Modality
-     *hasAnnotations
-     *CallableKind
-     *MemberKind
-     *hasGetter
-     *hasSetter
-     *hasConstant
-     *isConst
-     *lateinit
-     *isOperator
-     *isInfix
-     * </pre>
-     */
-    int getFlags();
-
-    // optional int32 getter_flags = 9;
-    /**
-     * <code>optional int32 getter_flags = 9;</code>
-     *
-     * <pre>
-     *
-     *isNotDefault
-     *Visibility
-     *Modality
-     *hasAnnotations
-     * </pre>
-     */
-    boolean hasGetterFlags();
-    /**
-     * <code>optional int32 getter_flags = 9;</code>
-     *
-     * <pre>
-     *
-     *isNotDefault
-     *Visibility
-     *Modality
-     *hasAnnotations
-     * </pre>
-     */
-    int getGetterFlags();
-
-    // optional int32 setter_flags = 10;
-    /**
-     * <code>optional int32 setter_flags = 10;</code>
-     */
-    boolean hasSetterFlags();
-    /**
-     * <code>optional int32 setter_flags = 10;</code>
-     */
-    int getSetterFlags();
-
-    // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-     */
-    java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter> 
-        getTypeParameterList();
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-     */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index);
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-     */
-    int getTypeParameterCount();
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-     */
-    java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder> 
-        getTypeParameterOrBuilderList();
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-     */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
-        int index);
-
-    // optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
-    /**
-     * <code>optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;</code>
-     */
-    boolean hasReceiverType();
-    /**
-     * <code>optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;</code>
-     */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getReceiverType();
-    /**
-     * <code>optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;</code>
-     */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder();
-
-    // required int32 name = 6;
-    /**
-     * <code>required int32 name = 6;</code>
-     */
-    boolean hasName();
-    /**
-     * <code>required int32 name = 6;</code>
-     */
-    int getName();
-
-    // repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-     *
-     * <pre>
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     * </pre>
-     */
-    java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter> 
-        getValueParameterList();
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-     *
-     * <pre>
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     * </pre>
-     */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter getValueParameter(int index);
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-     *
-     * <pre>
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     * </pre>
-     */
-    int getValueParameterCount();
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-     *
-     * <pre>
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     * </pre>
-     */
-    java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder> 
-        getValueParameterOrBuilderList();
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-     *
-     * <pre>
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     * </pre>
-     */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder getValueParameterOrBuilder(
-        int index);
-
-    // required .org.jetbrains.kotlin.serialization.Type return_type = 8;
-    /**
-     * <code>required .org.jetbrains.kotlin.serialization.Type return_type = 8;</code>
-     */
-    boolean hasReturnType();
-    /**
-     * <code>required .org.jetbrains.kotlin.serialization.Type return_type = 8;</code>
-     */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getReturnType();
-    /**
-     * <code>required .org.jetbrains.kotlin.serialization.Type return_type = 8;</code>
-     */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder();
-  }
-  /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.Callable}
-   */
-  public static final class Callable extends
-      com.google.protobuf.GeneratedMessage.ExtendableMessage<
-        Callable> implements CallableOrBuilder {
-    // Use Callable.newBuilder() to construct.
-    private Callable(com.google.protobuf.GeneratedMessage.ExtendableBuilder<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, ?> builder) {
-      super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private Callable(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final Callable defaultInstance;
-    public static Callable getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public Callable getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Callable(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 8: {
-              bitField0_ |= 0x00000001;
-              flags_ = input.readInt32();
-              break;
-            }
-            case 34: {
-              if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-                typeParameter_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter>();
-                mutable_bitField0_ |= 0x00000008;
-              }
-              typeParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.PARSER, extensionRegistry));
-              break;
-            }
-            case 42: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000008) == 0x00000008)) {
-                subBuilder = receiverType_.toBuilder();
-              }
-              receiverType_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(receiverType_);
-                receiverType_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000008;
-              break;
-            }
-            case 48: {
-              bitField0_ |= 0x00000010;
-              name_ = input.readInt32();
-              break;
-            }
-            case 58: {
-              if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
-                valueParameter_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter>();
-                mutable_bitField0_ |= 0x00000040;
-              }
-              valueParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.PARSER, extensionRegistry));
-              break;
-            }
-            case 66: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000020) == 0x00000020)) {
-                subBuilder = returnType_.toBuilder();
-              }
-              returnType_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(returnType_);
-                returnType_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000020;
-              break;
-            }
-            case 72: {
-              bitField0_ |= 0x00000002;
-              getterFlags_ = input.readInt32();
-              break;
-            }
-            case 80: {
-              bitField0_ |= 0x00000004;
-              setterFlags_ = input.readInt32();
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-          typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_);
-        }
-        if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
-          valueParameter_ = java.util.Collections.unmodifiableList(valueParameter_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Callable_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Callable_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder.class);
-    }
-
-    public static com.google.protobuf.Parser<Callable> PARSER =
-        new com.google.protobuf.AbstractParser<Callable>() {
-      public Callable parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Callable(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Callable> getParserForType() {
-      return PARSER;
-    }
-
-    private int bitField0_;
-    // optional int32 flags = 1;
-    public static final int FLAGS_FIELD_NUMBER = 1;
-    private int flags_;
-    /**
-     * <code>optional int32 flags = 1;</code>
-     *
-     * <pre>
-     *
-     *Visibility
-     *Modality
-     *hasAnnotations
-     *CallableKind
-     *MemberKind
-     *hasGetter
-     *hasSetter
-     *hasConstant
-     *isConst
-     *lateinit
-     *isOperator
-     *isInfix
-     * </pre>
-     */
-    public boolean hasFlags() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    /**
-     * <code>optional int32 flags = 1;</code>
-     *
-     * <pre>
-     *
-     *Visibility
-     *Modality
-     *hasAnnotations
-     *CallableKind
-     *MemberKind
-     *hasGetter
-     *hasSetter
-     *hasConstant
-     *isConst
-     *lateinit
-     *isOperator
-     *isInfix
-     * </pre>
-     */
-    public int getFlags() {
-      return flags_;
-    }
-
-    // optional int32 getter_flags = 9;
-    public static final int GETTER_FLAGS_FIELD_NUMBER = 9;
-    private int getterFlags_;
-    /**
-     * <code>optional int32 getter_flags = 9;</code>
-     *
-     * <pre>
-     *
-     *isNotDefault
-     *Visibility
-     *Modality
-     *hasAnnotations
-     * </pre>
-     */
-    public boolean hasGetterFlags() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
-    }
-    /**
-     * <code>optional int32 getter_flags = 9;</code>
-     *
-     * <pre>
-     *
-     *isNotDefault
-     *Visibility
-     *Modality
-     *hasAnnotations
-     * </pre>
-     */
-    public int getGetterFlags() {
-      return getterFlags_;
-    }
-
-    // optional int32 setter_flags = 10;
-    public static final int SETTER_FLAGS_FIELD_NUMBER = 10;
-    private int setterFlags_;
-    /**
-     * <code>optional int32 setter_flags = 10;</code>
-     */
-    public boolean hasSetterFlags() {
-      return ((bitField0_ & 0x00000004) == 0x00000004);
-    }
-    /**
-     * <code>optional int32 setter_flags = 10;</code>
-     */
-    public int getSetterFlags() {
-      return setterFlags_;
-    }
-
-    // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
-    public static final int TYPE_PARAMETER_FIELD_NUMBER = 4;
-    private java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter> typeParameter_;
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-     */
-    public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter> getTypeParameterList() {
-      return typeParameter_;
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-     */
-    public java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder> 
-        getTypeParameterOrBuilderList() {
-      return typeParameter_;
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-     */
-    public int getTypeParameterCount() {
-      return typeParameter_.size();
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-     */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
-      return typeParameter_.get(index);
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-     */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
-        int index) {
-      return typeParameter_.get(index);
-    }
-
-    // optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
-    public static final int RECEIVER_TYPE_FIELD_NUMBER = 5;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type receiverType_;
-    /**
-     * <code>optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;</code>
-     */
-    public boolean hasReceiverType() {
-      return ((bitField0_ & 0x00000008) == 0x00000008);
-    }
-    /**
-     * <code>optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;</code>
-     */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getReceiverType() {
-      return receiverType_;
-    }
-    /**
-     * <code>optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;</code>
-     */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder() {
-      return receiverType_;
-    }
-
-    // required int32 name = 6;
-    public static final int NAME_FIELD_NUMBER = 6;
-    private int name_;
-    /**
-     * <code>required int32 name = 6;</code>
-     */
-    public boolean hasName() {
-      return ((bitField0_ & 0x00000010) == 0x00000010);
-    }
-    /**
-     * <code>required int32 name = 6;</code>
-     */
-    public int getName() {
-      return name_;
-    }
-
-    // repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
-    public static final int VALUE_PARAMETER_FIELD_NUMBER = 7;
-    private java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter> valueParameter_;
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-     *
-     * <pre>
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     * </pre>
-     */
-    public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter> getValueParameterList() {
-      return valueParameter_;
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-     *
-     * <pre>
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     * </pre>
-     */
-    public java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder> 
-        getValueParameterOrBuilderList() {
-      return valueParameter_;
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-     *
-     * <pre>
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     * </pre>
-     */
-    public int getValueParameterCount() {
-      return valueParameter_.size();
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-     *
-     * <pre>
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     * </pre>
-     */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter getValueParameter(int index) {
-      return valueParameter_.get(index);
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-     *
-     * <pre>
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     * </pre>
-     */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder getValueParameterOrBuilder(
-        int index) {
-      return valueParameter_.get(index);
-    }
-
-    // required .org.jetbrains.kotlin.serialization.Type return_type = 8;
-    public static final int RETURN_TYPE_FIELD_NUMBER = 8;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type returnType_;
-    /**
-     * <code>required .org.jetbrains.kotlin.serialization.Type return_type = 8;</code>
-     */
-    public boolean hasReturnType() {
-      return ((bitField0_ & 0x00000020) == 0x00000020);
-    }
-    /**
-     * <code>required .org.jetbrains.kotlin.serialization.Type return_type = 8;</code>
-     */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getReturnType() {
-      return returnType_;
-    }
-    /**
-     * <code>required .org.jetbrains.kotlin.serialization.Type return_type = 8;</code>
-     */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder() {
-      return returnType_;
-    }
-
-    private void initFields() {
-      flags_ = 0;
-      getterFlags_ = 0;
-      setterFlags_ = 0;
-      typeParameter_ = java.util.Collections.emptyList();
-      receiverType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
-      name_ = 0;
-      valueParameter_ = java.util.Collections.emptyList();
-      returnType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
-
-      if (!hasName()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasReturnType()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      for (int i = 0; i < getTypeParameterCount(); i++) {
-        if (!getTypeParameter(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      if (hasReceiverType()) {
-        if (!getReceiverType().isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      for (int i = 0; i < getValueParameterCount(); i++) {
-        if (!getValueParameter(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      if (!getReturnType().isInitialized()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!extensionsAreInitialized()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      com.google.protobuf.GeneratedMessage
-        .ExtendableMessage<org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable>.ExtensionWriter extensionWriter =
-          newExtensionWriter();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeInt32(1, flags_);
-      }
-      for (int i = 0; i < typeParameter_.size(); i++) {
-        output.writeMessage(4, typeParameter_.get(i));
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        output.writeMessage(5, receiverType_);
-      }
-      if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        output.writeInt32(6, name_);
-      }
-      for (int i = 0; i < valueParameter_.size(); i++) {
-        output.writeMessage(7, valueParameter_.get(i));
-      }
-      if (((bitField0_ & 0x00000020) == 0x00000020)) {
-        output.writeMessage(8, returnType_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeInt32(9, getterFlags_);
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeInt32(10, setterFlags_);
-      }
-      extensionWriter.writeUntil(200, output);
-      getUnknownFields().writeTo(output);
-    }
-
-    private int memoizedSerializedSize = -1;
-    public int getSerializedSize() {
-      int size = memoizedSerializedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(1, flags_);
-      }
-      for (int i = 0; i < typeParameter_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, typeParameter_.get(i));
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, receiverType_);
-      }
-      if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(6, name_);
-      }
-      for (int i = 0; i < valueParameter_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, valueParameter_.get(i));
-      }
-      if (((bitField0_ & 0x00000020) == 0x00000020)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, returnType_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(9, getterFlags_);
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(10, setterFlags_);
-      }
-      size += extensionsSerializedSize();
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
-    }
-
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input);
-    }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
-    }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
-    }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
-    }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input);
-    }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
-    }
-
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable prototype) {
-      return newBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() { return newBuilder(this); }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Callable}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.ExtendableBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, Builder> implements org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Callable_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Callable_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder.class);
-      }
-
-      // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-          getTypeParameterFieldBuilder();
-          getReceiverTypeFieldBuilder();
-          getValueParameterFieldBuilder();
-          getReturnTypeFieldBuilder();
-        }
-      }
-      private static Builder create() {
-        return new Builder();
-      }
-
-      public Builder clear() {
-        super.clear();
-        flags_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000001);
-        getterFlags_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
-        setterFlags_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000004);
-        if (typeParameterBuilder_ == null) {
-          typeParameter_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000008);
-        } else {
-          typeParameterBuilder_.clear();
-        }
-        if (receiverTypeBuilder_ == null) {
-          receiverType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
-        } else {
-          receiverTypeBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000010);
-        name_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000020);
-        if (valueParameterBuilder_ == null) {
-          valueParameter_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000040);
-        } else {
-          valueParameterBuilder_.clear();
-        }
-        if (returnTypeBuilder_ == null) {
-          returnType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
-        } else {
-          returnTypeBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000080);
-        return this;
-      }
-
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Callable_descriptor;
-      }
-
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance();
-      }
-
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable build() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable buildPartial() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        result.flags_ = flags_;
-        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-          to_bitField0_ |= 0x00000002;
-        }
-        result.getterFlags_ = getterFlags_;
-        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
-          to_bitField0_ |= 0x00000004;
-        }
-        result.setterFlags_ = setterFlags_;
-        if (typeParameterBuilder_ == null) {
-          if (((bitField0_ & 0x00000008) == 0x00000008)) {
-            typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_);
-            bitField0_ = (bitField0_ & ~0x00000008);
-          }
-          result.typeParameter_ = typeParameter_;
-        } else {
-          result.typeParameter_ = typeParameterBuilder_.build();
-        }
-        if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
-          to_bitField0_ |= 0x00000008;
-        }
-        if (receiverTypeBuilder_ == null) {
-          result.receiverType_ = receiverType_;
-        } else {
-          result.receiverType_ = receiverTypeBuilder_.build();
-        }
-        if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
-          to_bitField0_ |= 0x00000010;
-        }
-        result.name_ = name_;
-        if (valueParameterBuilder_ == null) {
-          if (((bitField0_ & 0x00000040) == 0x00000040)) {
-            valueParameter_ = java.util.Collections.unmodifiableList(valueParameter_);
-            bitField0_ = (bitField0_ & ~0x00000040);
-          }
-          result.valueParameter_ = valueParameter_;
-        } else {
-          result.valueParameter_ = valueParameterBuilder_.build();
-        }
-        if (((from_bitField0_ & 0x00000080) == 0x00000080)) {
-          to_bitField0_ |= 0x00000020;
-        }
-        if (returnTypeBuilder_ == null) {
-          result.returnType_ = returnType_;
-        } else {
-          result.returnType_ = returnTypeBuilder_.build();
-        }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable other) {
-        if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance()) return this;
-        if (other.hasFlags()) {
-          setFlags(other.getFlags());
-        }
-        if (other.hasGetterFlags()) {
-          setGetterFlags(other.getGetterFlags());
-        }
-        if (other.hasSetterFlags()) {
-          setSetterFlags(other.getSetterFlags());
-        }
-        if (typeParameterBuilder_ == null) {
-          if (!other.typeParameter_.isEmpty()) {
-            if (typeParameter_.isEmpty()) {
-              typeParameter_ = other.typeParameter_;
-              bitField0_ = (bitField0_ & ~0x00000008);
-            } else {
-              ensureTypeParameterIsMutable();
-              typeParameter_.addAll(other.typeParameter_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.typeParameter_.isEmpty()) {
-            if (typeParameterBuilder_.isEmpty()) {
-              typeParameterBuilder_.dispose();
-              typeParameterBuilder_ = null;
-              typeParameter_ = other.typeParameter_;
-              bitField0_ = (bitField0_ & ~0x00000008);
-              typeParameterBuilder_ = 
-                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getTypeParameterFieldBuilder() : null;
-            } else {
-              typeParameterBuilder_.addAllMessages(other.typeParameter_);
-            }
-          }
-        }
-        if (other.hasReceiverType()) {
-          mergeReceiverType(other.getReceiverType());
-        }
-        if (other.hasName()) {
-          setName(other.getName());
-        }
-        if (valueParameterBuilder_ == null) {
-          if (!other.valueParameter_.isEmpty()) {
-            if (valueParameter_.isEmpty()) {
-              valueParameter_ = other.valueParameter_;
-              bitField0_ = (bitField0_ & ~0x00000040);
-            } else {
-              ensureValueParameterIsMutable();
-              valueParameter_.addAll(other.valueParameter_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.valueParameter_.isEmpty()) {
-            if (valueParameterBuilder_.isEmpty()) {
-              valueParameterBuilder_.dispose();
-              valueParameterBuilder_ = null;
-              valueParameter_ = other.valueParameter_;
-              bitField0_ = (bitField0_ & ~0x00000040);
-              valueParameterBuilder_ = 
-                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getValueParameterFieldBuilder() : null;
-            } else {
-              valueParameterBuilder_.addAllMessages(other.valueParameter_);
-            }
-          }
-        }
-        if (other.hasReturnType()) {
-          mergeReturnType(other.getReturnType());
-        }
-        this.mergeExtensionFields(other);
-        this.mergeUnknownFields(other.getUnknownFields());
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        if (!hasName()) {
-          
-          return false;
-        }
-        if (!hasReturnType()) {
-          
-          return false;
-        }
-        for (int i = 0; i < getTypeParameterCount(); i++) {
-          if (!getTypeParameter(i).isInitialized()) {
-            
-            return false;
-          }
-        }
-        if (hasReceiverType()) {
-          if (!getReceiverType().isInitialized()) {
-            
-            return false;
-          }
-        }
-        for (int i = 0; i < getValueParameterCount(); i++) {
-          if (!getValueParameter(i).isInitialized()) {
-            
-            return false;
-          }
-        }
-        if (!getReturnType().isInitialized()) {
-          
-          return false;
-        }
-        if (!extensionsAreInitialized()) {
-          
-          return false;
-        }
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable) e.getUnfinishedMessage();
-          throw e;
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      // optional int32 flags = 1;
-      private int flags_ ;
-      /**
-       * <code>optional int32 flags = 1;</code>
-       *
-       * <pre>
-       *
-       *Visibility
-       *Modality
-       *hasAnnotations
-       *CallableKind
-       *MemberKind
-       *hasGetter
-       *hasSetter
-       *hasConstant
-       *isConst
-       *lateinit
-       *isOperator
-       *isInfix
-       * </pre>
-       */
-      public boolean hasFlags() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
-      }
-      /**
-       * <code>optional int32 flags = 1;</code>
-       *
-       * <pre>
-       *
-       *Visibility
-       *Modality
-       *hasAnnotations
-       *CallableKind
-       *MemberKind
-       *hasGetter
-       *hasSetter
-       *hasConstant
-       *isConst
-       *lateinit
-       *isOperator
-       *isInfix
-       * </pre>
-       */
-      public int getFlags() {
-        return flags_;
-      }
-      /**
-       * <code>optional int32 flags = 1;</code>
-       *
-       * <pre>
-       *
-       *Visibility
-       *Modality
-       *hasAnnotations
-       *CallableKind
-       *MemberKind
-       *hasGetter
-       *hasSetter
-       *hasConstant
-       *isConst
-       *lateinit
-       *isOperator
-       *isInfix
-       * </pre>
-       */
-      public Builder setFlags(int value) {
-        bitField0_ |= 0x00000001;
-        flags_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>optional int32 flags = 1;</code>
-       *
-       * <pre>
-       *
-       *Visibility
-       *Modality
-       *hasAnnotations
-       *CallableKind
-       *MemberKind
-       *hasGetter
-       *hasSetter
-       *hasConstant
-       *isConst
-       *lateinit
-       *isOperator
-       *isInfix
-       * </pre>
-       */
-      public Builder clearFlags() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        flags_ = 0;
-        onChanged();
-        return this;
-      }
-
-      // optional int32 getter_flags = 9;
-      private int getterFlags_ ;
-      /**
-       * <code>optional int32 getter_flags = 9;</code>
-       *
-       * <pre>
-       *
-       *isNotDefault
-       *Visibility
-       *Modality
-       *hasAnnotations
-       * </pre>
-       */
-      public boolean hasGetterFlags() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
-      }
-      /**
-       * <code>optional int32 getter_flags = 9;</code>
-       *
-       * <pre>
-       *
-       *isNotDefault
-       *Visibility
-       *Modality
-       *hasAnnotations
-       * </pre>
-       */
-      public int getGetterFlags() {
-        return getterFlags_;
-      }
-      /**
-       * <code>optional int32 getter_flags = 9;</code>
-       *
-       * <pre>
-       *
-       *isNotDefault
-       *Visibility
-       *Modality
-       *hasAnnotations
-       * </pre>
-       */
-      public Builder setGetterFlags(int value) {
-        bitField0_ |= 0x00000002;
-        getterFlags_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>optional int32 getter_flags = 9;</code>
-       *
-       * <pre>
-       *
-       *isNotDefault
-       *Visibility
-       *Modality
-       *hasAnnotations
-       * </pre>
-       */
-      public Builder clearGetterFlags() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        getterFlags_ = 0;
-        onChanged();
-        return this;
-      }
-
-      // optional int32 setter_flags = 10;
-      private int setterFlags_ ;
-      /**
-       * <code>optional int32 setter_flags = 10;</code>
-       */
-      public boolean hasSetterFlags() {
-        return ((bitField0_ & 0x00000004) == 0x00000004);
-      }
-      /**
-       * <code>optional int32 setter_flags = 10;</code>
-       */
-      public int getSetterFlags() {
-        return setterFlags_;
-      }
-      /**
-       * <code>optional int32 setter_flags = 10;</code>
-       */
-      public Builder setSetterFlags(int value) {
-        bitField0_ |= 0x00000004;
-        setterFlags_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>optional int32 setter_flags = 10;</code>
-       */
-      public Builder clearSetterFlags() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        setterFlags_ = 0;
-        onChanged();
-        return this;
-      }
-
-      // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
-      private java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter> typeParameter_ =
-        java.util.Collections.emptyList();
-      private void ensureTypeParameterIsMutable() {
-        if (!((bitField0_ & 0x00000008) == 0x00000008)) {
-          typeParameter_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter>(typeParameter_);
-          bitField0_ |= 0x00000008;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder> typeParameterBuilder_;
-
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter> getTypeParameterList() {
-        if (typeParameterBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(typeParameter_);
-        } else {
-          return typeParameterBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public int getTypeParameterCount() {
-        if (typeParameterBuilder_ == null) {
-          return typeParameter_.size();
-        } else {
-          return typeParameterBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
-        if (typeParameterBuilder_ == null) {
-          return typeParameter_.get(index);
-        } else {
-          return typeParameterBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public Builder setTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter value) {
-        if (typeParameterBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureTypeParameterIsMutable();
-          typeParameter_.set(index, value);
-          onChanged();
-        } else {
-          typeParameterBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public Builder setTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
-        if (typeParameterBuilder_ == null) {
-          ensureTypeParameterIsMutable();
-          typeParameter_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          typeParameterBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public Builder addTypeParameter(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter value) {
-        if (typeParameterBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureTypeParameterIsMutable();
-          typeParameter_.add(value);
-          onChanged();
-        } else {
-          typeParameterBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public Builder addTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter value) {
-        if (typeParameterBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureTypeParameterIsMutable();
-          typeParameter_.add(index, value);
-          onChanged();
-        } else {
-          typeParameterBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public Builder addTypeParameter(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
-        if (typeParameterBuilder_ == null) {
-          ensureTypeParameterIsMutable();
-          typeParameter_.add(builderForValue.build());
-          onChanged();
-        } else {
-          typeParameterBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public Builder addTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
-        if (typeParameterBuilder_ == null) {
-          ensureTypeParameterIsMutable();
-          typeParameter_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          typeParameterBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public Builder addAllTypeParameter(
-          java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter> values) {
-        if (typeParameterBuilder_ == null) {
-          ensureTypeParameterIsMutable();
-          super.addAll(values, typeParameter_);
-          onChanged();
-        } else {
-          typeParameterBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public Builder clearTypeParameter() {
-        if (typeParameterBuilder_ == null) {
-          typeParameter_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000008);
-          onChanged();
-        } else {
-          typeParameterBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public Builder removeTypeParameter(int index) {
-        if (typeParameterBuilder_ == null) {
-          ensureTypeParameterIsMutable();
-          typeParameter_.remove(index);
-          onChanged();
-        } else {
-          typeParameterBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder getTypeParameterBuilder(
-          int index) {
-        return getTypeParameterFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
-          int index) {
-        if (typeParameterBuilder_ == null) {
-          return typeParameter_.get(index);  } else {
-          return typeParameterBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder> 
-           getTypeParameterOrBuilderList() {
-        if (typeParameterBuilder_ != null) {
-          return typeParameterBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(typeParameter_);
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder() {
-        return getTypeParameterFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder(
-          int index) {
-        return getTypeParameterFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder> 
-           getTypeParameterBuilderList() {
-        return getTypeParameterFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder> 
-          getTypeParameterFieldBuilder() {
-        if (typeParameterBuilder_ == null) {
-          typeParameterBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder>(
-                  typeParameter_,
-                  ((bitField0_ & 0x00000008) == 0x00000008),
-                  getParentForChildren(),
-                  isClean());
-          typeParameter_ = null;
-        }
-        return typeParameterBuilder_;
-      }
-
-      // optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type receiverType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> receiverTypeBuilder_;
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;</code>
-       */
-      public boolean hasReceiverType() {
-        return ((bitField0_ & 0x00000010) == 0x00000010);
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getReceiverType() {
-        if (receiverTypeBuilder_ == null) {
-          return receiverType_;
-        } else {
-          return receiverTypeBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;</code>
-       */
-      public Builder setReceiverType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
-        if (receiverTypeBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          receiverType_ = value;
-          onChanged();
-        } else {
-          receiverTypeBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000010;
-        return this;
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;</code>
-       */
-      public Builder setReceiverType(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
-        if (receiverTypeBuilder_ == null) {
-          receiverType_ = builderForValue.build();
-          onChanged();
-        } else {
-          receiverTypeBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000010;
-        return this;
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;</code>
-       */
-      public Builder mergeReceiverType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
-        if (receiverTypeBuilder_ == null) {
-          if (((bitField0_ & 0x00000010) == 0x00000010) &&
-              receiverType_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
-            receiverType_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(receiverType_).mergeFrom(value).buildPartial();
-          } else {
-            receiverType_ = value;
-          }
-          onChanged();
-        } else {
-          receiverTypeBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000010;
-        return this;
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;</code>
-       */
-      public Builder clearReceiverType() {
-        if (receiverTypeBuilder_ == null) {
-          receiverType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
-          onChanged();
-        } else {
-          receiverTypeBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000010);
-        return this;
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getReceiverTypeBuilder() {
-        bitField0_ |= 0x00000010;
-        onChanged();
-        return getReceiverTypeFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder() {
-        if (receiverTypeBuilder_ != null) {
-          return receiverTypeBuilder_.getMessageOrBuilder();
-        } else {
-          return receiverType_;
-        }
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
-          getReceiverTypeFieldBuilder() {
-        if (receiverTypeBuilder_ == null) {
-          receiverTypeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
-                  receiverType_,
-                  getParentForChildren(),
-                  isClean());
-          receiverType_ = null;
-        }
-        return receiverTypeBuilder_;
-      }
-
-      // required int32 name = 6;
-      private int name_ ;
-      /**
-       * <code>required int32 name = 6;</code>
-       */
-      public boolean hasName() {
-        return ((bitField0_ & 0x00000020) == 0x00000020);
-      }
-      /**
-       * <code>required int32 name = 6;</code>
-       */
-      public int getName() {
-        return name_;
-      }
-      /**
-       * <code>required int32 name = 6;</code>
-       */
-      public Builder setName(int value) {
-        bitField0_ |= 0x00000020;
-        name_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>required int32 name = 6;</code>
-       */
-      public Builder clearName() {
-        bitField0_ = (bitField0_ & ~0x00000020);
-        name_ = 0;
-        onChanged();
-        return this;
-      }
-
-      // repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
-      private java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter> valueParameter_ =
-        java.util.Collections.emptyList();
-      private void ensureValueParameterIsMutable() {
-        if (!((bitField0_ & 0x00000040) == 0x00000040)) {
-          valueParameter_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter>(valueParameter_);
-          bitField0_ |= 0x00000040;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder> valueParameterBuilder_;
-
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter> getValueParameterList() {
-        if (valueParameterBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(valueParameter_);
-        } else {
-          return valueParameterBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public int getValueParameterCount() {
-        if (valueParameterBuilder_ == null) {
-          return valueParameter_.size();
-        } else {
-          return valueParameterBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter getValueParameter(int index) {
-        if (valueParameterBuilder_ == null) {
-          return valueParameter_.get(index);
-        } else {
-          return valueParameterBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public Builder setValueParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter value) {
-        if (valueParameterBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureValueParameterIsMutable();
-          valueParameter_.set(index, value);
-          onChanged();
-        } else {
-          valueParameterBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public Builder setValueParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder builderForValue) {
-        if (valueParameterBuilder_ == null) {
-          ensureValueParameterIsMutable();
-          valueParameter_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          valueParameterBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public Builder addValueParameter(org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter value) {
-        if (valueParameterBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureValueParameterIsMutable();
-          valueParameter_.add(value);
-          onChanged();
-        } else {
-          valueParameterBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public Builder addValueParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter value) {
-        if (valueParameterBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureValueParameterIsMutable();
-          valueParameter_.add(index, value);
-          onChanged();
-        } else {
-          valueParameterBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public Builder addValueParameter(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder builderForValue) {
-        if (valueParameterBuilder_ == null) {
-          ensureValueParameterIsMutable();
-          valueParameter_.add(builderForValue.build());
-          onChanged();
-        } else {
-          valueParameterBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public Builder addValueParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder builderForValue) {
-        if (valueParameterBuilder_ == null) {
-          ensureValueParameterIsMutable();
-          valueParameter_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          valueParameterBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public Builder addAllValueParameter(
-          java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter> values) {
-        if (valueParameterBuilder_ == null) {
-          ensureValueParameterIsMutable();
-          super.addAll(values, valueParameter_);
-          onChanged();
-        } else {
-          valueParameterBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public Builder clearValueParameter() {
-        if (valueParameterBuilder_ == null) {
-          valueParameter_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000040);
-          onChanged();
-        } else {
-          valueParameterBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public Builder removeValueParameter(int index) {
-        if (valueParameterBuilder_ == null) {
-          ensureValueParameterIsMutable();
-          valueParameter_.remove(index);
-          onChanged();
-        } else {
-          valueParameterBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder getValueParameterBuilder(
-          int index) {
-        return getValueParameterFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder getValueParameterOrBuilder(
-          int index) {
-        if (valueParameterBuilder_ == null) {
-          return valueParameter_.get(index);  } else {
-          return valueParameterBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder> 
-           getValueParameterOrBuilderList() {
-        if (valueParameterBuilder_ != null) {
-          return valueParameterBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(valueParameter_);
-        }
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder addValueParameterBuilder() {
-        return getValueParameterFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder addValueParameterBuilder(
-          int index) {
-        return getValueParameterFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder> 
-           getValueParameterBuilderList() {
-        return getValueParameterFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder> 
-          getValueParameterFieldBuilder() {
-        if (valueParameterBuilder_ == null) {
-          valueParameterBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder>(
-                  valueParameter_,
-                  ((bitField0_ & 0x00000040) == 0x00000040),
-                  getParentForChildren(),
-                  isClean());
-          valueParameter_ = null;
-        }
-        return valueParameterBuilder_;
-      }
-
-      // required .org.jetbrains.kotlin.serialization.Type return_type = 8;
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type returnType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> returnTypeBuilder_;
-      /**
-       * <code>required .org.jetbrains.kotlin.serialization.Type return_type = 8;</code>
-       */
-      public boolean hasReturnType() {
-        return ((bitField0_ & 0x00000080) == 0x00000080);
-      }
-      /**
-       * <code>required .org.jetbrains.kotlin.serialization.Type return_type = 8;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getReturnType() {
-        if (returnTypeBuilder_ == null) {
-          return returnType_;
-        } else {
-          return returnTypeBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>required .org.jetbrains.kotlin.serialization.Type return_type = 8;</code>
-       */
-      public Builder setReturnType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
-        if (returnTypeBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          returnType_ = value;
-          onChanged();
-        } else {
-          returnTypeBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000080;
-        return this;
-      }
-      /**
-       * <code>required .org.jetbrains.kotlin.serialization.Type return_type = 8;</code>
-       */
-      public Builder setReturnType(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
-        if (returnTypeBuilder_ == null) {
-          returnType_ = builderForValue.build();
-          onChanged();
-        } else {
-          returnTypeBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000080;
-        return this;
-      }
-      /**
-       * <code>required .org.jetbrains.kotlin.serialization.Type return_type = 8;</code>
-       */
-      public Builder mergeReturnType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
-        if (returnTypeBuilder_ == null) {
-          if (((bitField0_ & 0x00000080) == 0x00000080) &&
-              returnType_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
-            returnType_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(returnType_).mergeFrom(value).buildPartial();
-          } else {
-            returnType_ = value;
-          }
-          onChanged();
-        } else {
-          returnTypeBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000080;
-        return this;
-      }
-      /**
-       * <code>required .org.jetbrains.kotlin.serialization.Type return_type = 8;</code>
-       */
-      public Builder clearReturnType() {
-        if (returnTypeBuilder_ == null) {
-          returnType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
-          onChanged();
-        } else {
-          returnTypeBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000080);
-        return this;
-      }
-      /**
-       * <code>required .org.jetbrains.kotlin.serialization.Type return_type = 8;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getReturnTypeBuilder() {
-        bitField0_ |= 0x00000080;
-        onChanged();
-        return getReturnTypeFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>required .org.jetbrains.kotlin.serialization.Type return_type = 8;</code>
-       */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder() {
-        if (returnTypeBuilder_ != null) {
-          return returnTypeBuilder_.getMessageOrBuilder();
-        } else {
-          return returnType_;
-        }
-      }
-      /**
-       * <code>required .org.jetbrains.kotlin.serialization.Type return_type = 8;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
-          getReturnTypeFieldBuilder() {
-        if (returnTypeBuilder_ == null) {
-          returnTypeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
-                  returnType_,
-                  getParentForChildren(),
-                  isClean());
-          returnType_ = null;
-        }
-        return returnTypeBuilder_;
-      }
-
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Callable)
-    }
-
-    static {
-      defaultInstance = new Callable(true);
-      defaultInstance.initFields();
-    }
-
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Callable)
-  }
-
   public interface ValueParameterOrBuilder extends
       com.google.protobuf.GeneratedMessage.
           ExtendableMessageOrBuilder<ValueParameter> {
@@ -22642,11 +18039,6 @@ public final class DebugProtoBuf {
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_org_jetbrains_kotlin_serialization_Class_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
     internal_static_org_jetbrains_kotlin_serialization_Package_descriptor;
   private static
@@ -22667,11 +18059,6 @@ public final class DebugProtoBuf {
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_org_jetbrains_kotlin_serialization_Property_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_Callable_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_Callable_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
     internal_static_org_jetbrains_kotlin_serialization_ValueParameter_descriptor;
   private static
@@ -22736,7 +18123,7 @@ public final class DebugProtoBuf {
       "eParameter.Variance:\003INV\022=\n\013upper_bound\030" +
       "\005 \003(\0132(.org.jetbrains.kotlin.serializati" +
       "on.Type\"$\n\010Variance\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003",
-      "INV\020\002\"\233\007\n\005Class\022\020\n\005flags\030\001 \001(\005:\0010\022\025\n\007fq_" +
+      "INV\020\002\"\343\004\n\005Class\022\020\n\005flags\030\001 \001(\005:\0010\022\025\n\007fq_" +
       "name\030\003 \002(\005B\004\220\265\030\001\022#\n\025companion_object_nam" +
       "e\030\004 \001(\005B\004\210\265\030\001\022I\n\016type_parameter\030\005 \003(\01321." +
       "org.jetbrains.kotlin.serialization.TypeP" +
@@ -22747,69 +18134,47 @@ public final class DebugProtoBuf {
       "on.Constructor\022>\n\010function\030\t \003(\0132,.org.j" +
       "etbrains.kotlin.serialization.Function\022>",
       "\n\010property\030\n \003(\0132,.org.jetbrains.kotlin." +
-      "serialization.Property\022<\n\006member\030\013 \003(\0132," +
-      ".org.jetbrains.kotlin.serialization.Call" +
-      "able\022\032\n\nenum_entry\030\014 \003(\005B\006\020\001\210\265\030\001\022Y\n\023prim" +
-      "ary_constructor\030\r \001(\0132<.org.jetbrains.ko" +
-      "tlin.serialization.Class.PrimaryConstruc" +
-      "tor\022K\n\025secondary_constructor\030\016 \003(\0132,.org" +
-      ".jetbrains.kotlin.serialization.Callable" +
-      "\032P\n\022PrimaryConstructor\022:\n\004data\030\001 \001(\0132,.o" +
-      "rg.jetbrains.kotlin.serialization.Callab",
-      "le\"x\n\004Kind\022\t\n\005CLASS\020\000\022\r\n\tINTERFACE\020\001\022\016\n\n" +
-      "ENUM_CLASS\020\002\022\016\n\nENUM_ENTRY\020\003\022\024\n\020ANNOTATI" +
-      "ON_CLASS\020\004\022\n\n\006OBJECT\020\005\022\024\n\020COMPANION_OBJE" +
-      "CT\020\006*\005\010d\020\310\001\"\224\002\n\007Package\022<\n\006member\030\001 \003(\0132" +
-      ",.org.jetbrains.kotlin.serialization.Cal" +
-      "lable\022D\n\013constructor\030\002 \003(\0132/.org.jetbrai" +
-      "ns.kotlin.serialization.Constructor\022>\n\010f" +
-      "unction\030\003 \003(\0132,.org.jetbrains.kotlin.ser" +
-      "ialization.Function\022>\n\010property\030\004 \003(\0132,." +
-      "org.jetbrains.kotlin.serialization.Prope",
-      "rty*\005\010d\020\310\001\"p\n\013Constructor\022\r\n\005flags\030\001 \001(\005" +
-      "\022K\n\017value_parameter\030\002 \003(\01322.org.jetbrain" +
-      "s.kotlin.serialization.ValueParameter*\005\010" +
-      "d\020\310\001\"\314\002\n\010Function\022\r\n\005flags\030\001 \001(\005\022\022\n\004name" +
-      "\030\002 \002(\005B\004\210\265\030\001\022=\n\013return_type\030\003 \002(\0132(.org." +
-      "jetbrains.kotlin.serialization.Type\022I\n\016t" +
-      "ype_parameter\030\004 \003(\01321.org.jetbrains.kotl" +
-      "in.serialization.TypeParameter\022?\n\rreceiv" +
-      "er_type\030\005 \001(\0132(.org.jetbrains.kotlin.ser" +
-      "ialization.Type\022K\n\017value_parameter\030\006 \003(\013",
-      "22.org.jetbrains.kotlin.serialization.Va" +
-      "lueParameter*\005\010d\020\310\001\"\377\002\n\010Property\022\r\n\005flag" +
-      "s\030\001 \001(\005\022\022\n\004name\030\002 \002(\005B\004\210\265\030\001\022=\n\013return_ty" +
-      "pe\030\003 \002(\0132(.org.jetbrains.kotlin.serializ" +
-      "ation.Type\022I\n\016type_parameter\030\004 \003(\01321.org" +
-      ".jetbrains.kotlin.serialization.TypePara" +
-      "meter\022?\n\rreceiver_type\030\005 \001(\0132(.org.jetbr" +
-      "ains.kotlin.serialization.Type\022R\n\026setter" +
-      "_value_parameter\030\006 \001(\01322.org.jetbrains.k" +
-      "otlin.serialization.ValueParameter\022\024\n\014ge",
-      "tter_flags\030\007 \001(\005\022\024\n\014setter_flags\030\010 \001(\005*\005" +
-      "\010d\020\310\001\"\370\002\n\010Callable\022\r\n\005flags\030\001 \001(\005\022\024\n\014get" +
-      "ter_flags\030\t \001(\005\022\024\n\014setter_flags\030\n \001(\005\022I\n" +
-      "\016type_parameter\030\004 \003(\01321.org.jetbrains.ko" +
-      "tlin.serialization.TypeParameter\022?\n\rrece" +
-      "iver_type\030\005 \001(\0132(.org.jetbrains.kotlin.s" +
-      "erialization.Type\022\022\n\004name\030\006 \002(\005B\004\210\265\030\001\022K\n" +
-      "\017value_parameter\030\007 \003(\01322.org.jetbrains.k" +
-      "otlin.serialization.ValueParameter\022=\n\013re" +
-      "turn_type\030\010 \002(\0132(.org.jetbrains.kotlin.s",
-      "erialization.Type*\005\010d\020\310\001\"\271\001\n\016ValueParame" +
-      "ter\022\r\n\005flags\030\001 \001(\005\022\022\n\004name\030\002 \002(\005B\004\210\265\030\001\0226" +
-      "\n\004type\030\003 \002(\0132(.org.jetbrains.kotlin.seri" +
-      "alization.Type\022E\n\023vararg_element_type\030\004 " +
-      "\001(\0132(.org.jetbrains.kotlin.serialization" +
-      ".Type*\005\010d\020\310\001*9\n\010Modality\022\t\n\005FINAL\020\000\022\010\n\004O" +
-      "PEN\020\001\022\014\n\010ABSTRACT\020\002\022\n\n\006SEALED\020\003*b\n\nVisib" +
-      "ility\022\014\n\010INTERNAL\020\000\022\013\n\007PRIVATE\020\001\022\r\n\tPROT" +
-      "ECTED\020\002\022\n\n\006PUBLIC\020\003\022\023\n\017PRIVATE_TO_THIS\020\004" +
-      "\022\t\n\005LOCAL\020\005*:\n\014CallableKind\022\007\n\003FUN\020\000\022\007\n\003",
-      "VAL\020\001\022\007\n\003VAR\020\002\022\017\n\013CONSTRUCTOR\020\003*Q\n\nMembe" +
-      "rKind\022\017\n\013DECLARATION\020\000\022\021\n\rFAKE_OVERRIDE\020" +
-      "\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYNTHESIZED\020\003B\022B\rDe" +
-      "bugProtoBuf\210\001\000"
+      "serialization.Property\022\032\n\nenum_entry\030\014 \003" +
+      "(\005B\006\020\001\210\265\030\001\"x\n\004Kind\022\t\n\005CLASS\020\000\022\r\n\tINTERFA" +
+      "CE\020\001\022\016\n\nENUM_CLASS\020\002\022\016\n\nENUM_ENTRY\020\003\022\024\n\020" +
+      "ANNOTATION_CLASS\020\004\022\n\n\006OBJECT\020\005\022\024\n\020COMPAN" +
+      "ION_OBJECT\020\006*\005\010d\020\310\001\"\220\001\n\007Package\022>\n\010funct" +
+      "ion\030\003 \003(\0132,.org.jetbrains.kotlin.seriali" +
+      "zation.Function\022>\n\010property\030\004 \003(\0132,.org." +
+      "jetbrains.kotlin.serialization.Property*" +
+      "\005\010d\020\310\001\"p\n\013Constructor\022\r\n\005flags\030\001 \001(\005\022K\n\017",
+      "value_parameter\030\002 \003(\01322.org.jetbrains.ko" +
+      "tlin.serialization.ValueParameter*\005\010d\020\310\001" +
+      "\"\314\002\n\010Function\022\r\n\005flags\030\001 \001(\005\022\022\n\004name\030\002 \002" +
+      "(\005B\004\210\265\030\001\022=\n\013return_type\030\003 \002(\0132(.org.jetb" +
+      "rains.kotlin.serialization.Type\022I\n\016type_" +
+      "parameter\030\004 \003(\01321.org.jetbrains.kotlin.s" +
+      "erialization.TypeParameter\022?\n\rreceiver_t" +
+      "ype\030\005 \001(\0132(.org.jetbrains.kotlin.seriali" +
+      "zation.Type\022K\n\017value_parameter\030\006 \003(\01322.o" +
+      "rg.jetbrains.kotlin.serialization.ValueP",
+      "arameter*\005\010d\020\310\001\"\377\002\n\010Property\022\r\n\005flags\030\001 " +
+      "\001(\005\022\022\n\004name\030\002 \002(\005B\004\210\265\030\001\022=\n\013return_type\030\003" +
+      " \002(\0132(.org.jetbrains.kotlin.serializatio" +
+      "n.Type\022I\n\016type_parameter\030\004 \003(\01321.org.jet" +
+      "brains.kotlin.serialization.TypeParamete" +
+      "r\022?\n\rreceiver_type\030\005 \001(\0132(.org.jetbrains" +
+      ".kotlin.serialization.Type\022R\n\026setter_val" +
+      "ue_parameter\030\006 \001(\01322.org.jetbrains.kotli" +
+      "n.serialization.ValueParameter\022\024\n\014getter" +
+      "_flags\030\007 \001(\005\022\024\n\014setter_flags\030\010 \001(\005*\005\010d\020\310",
+      "\001\"\271\001\n\016ValueParameter\022\r\n\005flags\030\001 \001(\005\022\022\n\004n" +
+      "ame\030\002 \002(\005B\004\210\265\030\001\0226\n\004type\030\003 \002(\0132(.org.jetb" +
+      "rains.kotlin.serialization.Type\022E\n\023varar" +
+      "g_element_type\030\004 \001(\0132(.org.jetbrains.kot" +
+      "lin.serialization.Type*\005\010d\020\310\001*9\n\010Modalit" +
+      "y\022\t\n\005FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRACT\020\002\022\n\n\006" +
+      "SEALED\020\003*b\n\nVisibility\022\014\n\010INTERNAL\020\000\022\013\n\007" +
+      "PRIVATE\020\001\022\r\n\tPROTECTED\020\002\022\n\n\006PUBLIC\020\003\022\023\n\017" +
+      "PRIVATE_TO_THIS\020\004\022\t\n\005LOCAL\020\005*Q\n\nMemberKi" +
+      "nd\022\017\n\013DECLARATION\020\000\022\021\n\rFAKE_OVERRIDE\020\001\022\016",
+      "\n\nDELEGATION\020\002\022\017\n\013SYNTHESIZED\020\003B\022B\rDebug" +
+      "ProtoBuf\210\001\000"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -22875,19 +18240,13 @@ public final class DebugProtoBuf {
           internal_static_org_jetbrains_kotlin_serialization_Class_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_org_jetbrains_kotlin_serialization_Class_descriptor,
-              new java.lang.String[] { "Flags", "FqName", "CompanionObjectName", "TypeParameter", "Supertype", "NestedClassName", "Constructor", "Function", "Property", "Member", "EnumEntry", "PrimaryConstructor", "SecondaryConstructor", });
-          internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_descriptor =
-            internal_static_org_jetbrains_kotlin_serialization_Class_descriptor.getNestedTypes().get(0);
-          internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_descriptor,
-              new java.lang.String[] { "Data", });
+              new java.lang.String[] { "Flags", "FqName", "CompanionObjectName", "TypeParameter", "Supertype", "NestedClassName", "Constructor", "Function", "Property", "EnumEntry", });
           internal_static_org_jetbrains_kotlin_serialization_Package_descriptor =
             getDescriptor().getMessageTypes().get(6);
           internal_static_org_jetbrains_kotlin_serialization_Package_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_org_jetbrains_kotlin_serialization_Package_descriptor,
-              new java.lang.String[] { "Member", "Constructor", "Function", "Property", });
+              new java.lang.String[] { "Function", "Property", });
           internal_static_org_jetbrains_kotlin_serialization_Constructor_descriptor =
             getDescriptor().getMessageTypes().get(7);
           internal_static_org_jetbrains_kotlin_serialization_Constructor_fieldAccessorTable = new
@@ -22906,14 +18265,8 @@ public final class DebugProtoBuf {
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_org_jetbrains_kotlin_serialization_Property_descriptor,
               new java.lang.String[] { "Flags", "Name", "ReturnType", "TypeParameter", "ReceiverType", "SetterValueParameter", "GetterFlags", "SetterFlags", });
-          internal_static_org_jetbrains_kotlin_serialization_Callable_descriptor =
-            getDescriptor().getMessageTypes().get(10);
-          internal_static_org_jetbrains_kotlin_serialization_Callable_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_kotlin_serialization_Callable_descriptor,
-              new java.lang.String[] { "Flags", "GetterFlags", "SetterFlags", "TypeParameter", "ReceiverType", "Name", "ValueParameter", "ReturnType", });
           internal_static_org_jetbrains_kotlin_serialization_ValueParameter_descriptor =
-            getDescriptor().getMessageTypes().get(11);
+            getDescriptor().getMessageTypes().get(10);
           internal_static_org_jetbrains_kotlin_serialization_ValueParameter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_org_jetbrains_kotlin_serialization_ValueParameter_descriptor,
@@ -22935,7 +18288,6 @@ public final class DebugProtoBuf {
           registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
           registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
           registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
-          registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
           return registry;
         }
       };
diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java
index e7cd94767ad..4634d80048c 100644
--- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java
@@ -9,8 +9,6 @@ public final class DebugBuiltInsProtoBuf {
       com.google.protobuf.ExtensionRegistry registry) {
     registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.className);
     registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.classAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.oldCallableAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.oldCompileTimeValue);
     registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.constructorAnnotation);
     registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.functionAnnotation);
     registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.propertyAnnotation);
@@ -40,28 +38,6 @@ public final class DebugBuiltInsProtoBuf {
           .newFileScopedGeneratedExtension(
         org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
         org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
-  public static final int OLD_CALLABLE_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable,
-      java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation>> oldCallableAnnotation = com.google.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
-  public static final int OLD_COMPILE_TIME_VALUE_FIELD_NUMBER = 151;
-  /**
-   * <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable,
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value> oldCompileTimeValue = com.google.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance());
   public static final int CONSTRUCTOR_ANNOTATION_FIELD_NUMBER = 150;
   /**
    * <code>extend .org.jetbrains.kotlin.serialization.Constructor { ... }</code>
@@ -145,33 +121,27 @@ public final class DebugBuiltInsProtoBuf {
       "e\030\226\001 \003(\005B\002\020\001:t\n\020class_annotation\022).org.j" +
       "etbrains.kotlin.serialization.Class\030\226\001 \003" +
       "(\0132..org.jetbrains.kotlin.serialization." +
-      "Annotation:~\n\027old_callable_annotation\022,." +
-      "org.jetbrains.kotlin.serialization.Calla",
-      "ble\030\226\001 \003(\0132..org.jetbrains.kotlin.serial" +
-      "ization.Annotation:\214\001\n\026old_compile_time_" +
-      "value\022,.org.jetbrains.kotlin.serializati" +
-      "on.Callable\030\227\001 \001(\0132=.org.jetbrains.kotli" +
-      "n.serialization.Annotation.Argument.Valu" +
-      "e:\200\001\n\026constructor_annotation\022/.org.jetbr" +
-      "ains.kotlin.serialization.Constructor\030\226\001" +
-      " \003(\0132..org.jetbrains.kotlin.serializatio" +
-      "n.Annotation:z\n\023function_annotation\022,.or" +
-      "g.jetbrains.kotlin.serialization.Functio",
-      "n\030\226\001 \003(\0132..org.jetbrains.kotlin.serializ" +
-      "ation.Annotation:z\n\023property_annotation\022" +
-      ",.org.jetbrains.kotlin.serialization.Pro" +
-      "perty\030\226\001 \003(\0132..org.jetbrains.kotlin.seri" +
-      "alization.Annotation:\210\001\n\022compile_time_va" +
-      "lue\022,.org.jetbrains.kotlin.serialization" +
-      ".Property\030\227\001 \001(\0132=.org.jetbrains.kotlin." +
-      "serialization.Annotation.Argument.Value:" +
-      "\201\001\n\024parameter_annotation\0222.org.jetbrains" +
-      ".kotlin.serialization.ValueParameter\030\226\001 ",
-      "\003(\0132..org.jetbrains.kotlin.serialization" +
-      ".Annotation:r\n\017type_annotation\022(.org.jet" +
-      "brains.kotlin.serialization.Type\030\226\001 \003(\0132" +
-      "..org.jetbrains.kotlin.serialization.Ann" +
-      "otationB\027B\025DebugBuiltInsProtoBuf"
+      "Annotation:\200\001\n\026constructor_annotation\022/." +
+      "org.jetbrains.kotlin.serialization.Const",
+      "ructor\030\226\001 \003(\0132..org.jetbrains.kotlin.ser" +
+      "ialization.Annotation:z\n\023function_annota" +
+      "tion\022,.org.jetbrains.kotlin.serializatio" +
+      "n.Function\030\226\001 \003(\0132..org.jetbrains.kotlin" +
+      ".serialization.Annotation:z\n\023property_an" +
+      "notation\022,.org.jetbrains.kotlin.serializ" +
+      "ation.Property\030\226\001 \003(\0132..org.jetbrains.ko" +
+      "tlin.serialization.Annotation:\210\001\n\022compil" +
+      "e_time_value\022,.org.jetbrains.kotlin.seri" +
+      "alization.Property\030\227\001 \001(\0132=.org.jetbrain",
+      "s.kotlin.serialization.Annotation.Argume" +
+      "nt.Value:\201\001\n\024parameter_annotation\0222.org." +
+      "jetbrains.kotlin.serialization.ValuePara" +
+      "meter\030\226\001 \003(\0132..org.jetbrains.kotlin.seri" +
+      "alization.Annotation:r\n\017type_annotation\022" +
+      "(.org.jetbrains.kotlin.serialization.Typ" +
+      "e\030\226\001 \003(\0132..org.jetbrains.kotlin.serializ" +
+      "ation.AnnotationB\027B\025DebugBuiltInsProtoBu" +
+      "f"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -180,14 +150,12 @@ public final class DebugBuiltInsProtoBuf {
           descriptor = root;
           className.internalInit(descriptor.getExtensions().get(0));
           classAnnotation.internalInit(descriptor.getExtensions().get(1));
-          oldCallableAnnotation.internalInit(descriptor.getExtensions().get(2));
-          oldCompileTimeValue.internalInit(descriptor.getExtensions().get(3));
-          constructorAnnotation.internalInit(descriptor.getExtensions().get(4));
-          functionAnnotation.internalInit(descriptor.getExtensions().get(5));
-          propertyAnnotation.internalInit(descriptor.getExtensions().get(6));
-          compileTimeValue.internalInit(descriptor.getExtensions().get(7));
-          parameterAnnotation.internalInit(descriptor.getExtensions().get(8));
-          typeAnnotation.internalInit(descriptor.getExtensions().get(9));
+          constructorAnnotation.internalInit(descriptor.getExtensions().get(2));
+          functionAnnotation.internalInit(descriptor.getExtensions().get(3));
+          propertyAnnotation.internalInit(descriptor.getExtensions().get(4));
+          compileTimeValue.internalInit(descriptor.getExtensions().get(5));
+          parameterAnnotation.internalInit(descriptor.getExtensions().get(6));
+          typeAnnotation.internalInit(descriptor.getExtensions().get(7));
           return null;
         }
       };
diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java b/compiler/tests/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java
index c6a503edf52..6b278b96505 100644
--- a/compiler/tests/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java
@@ -8,8 +8,6 @@ public final class DebugJsProtoBuf {
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistry registry) {
     registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.classAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.oldCallableAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.oldCompileTimeValue);
     registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.constructorAnnotation);
     registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.functionAnnotation);
     registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.propertyAnnotation);
@@ -1816,28 +1814,6 @@ public final class DebugJsProtoBuf {
           .newFileScopedGeneratedExtension(
         org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
         org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
-  public static final int OLD_CALLABLE_ANNOTATION_FIELD_NUMBER = 130;
-  /**
-   * <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable,
-      java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation>> oldCallableAnnotation = com.google.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
-  public static final int OLD_COMPILE_TIME_VALUE_FIELD_NUMBER = 131;
-  /**
-   * <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable,
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value> oldCompileTimeValue = com.google.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance());
   public static final int CONSTRUCTOR_ANNOTATION_FIELD_NUMBER = 130;
   /**
    * <code>extend .org.jetbrains.kotlin.serialization.Constructor { ... }</code>
@@ -1938,33 +1914,26 @@ public final class DebugJsProtoBuf {
       "ent\030\002 \002(\014:t\n\020class_annotation\022).org.jetb" +
       "rains.kotlin.serialization.Class\030\202\001 \003(\0132" +
       "..org.jetbrains.kotlin.serialization.Ann",
-      "otation:~\n\027old_callable_annotation\022,.org" +
-      ".jetbrains.kotlin.serialization.Callable" +
-      "\030\202\001 \003(\0132..org.jetbrains.kotlin.serializa" +
-      "tion.Annotation:\214\001\n\026old_compile_time_val" +
-      "ue\022,.org.jetbrains.kotlin.serialization." +
-      "Callable\030\203\001 \001(\0132=.org.jetbrains.kotlin.s" +
-      "erialization.Annotation.Argument.Value:\200" +
-      "\001\n\026constructor_annotation\022/.org.jetbrain" +
-      "s.kotlin.serialization.Constructor\030\202\001 \003(" +
-      "\0132..org.jetbrains.kotlin.serialization.A",
-      "nnotation:z\n\023function_annotation\022,.org.j" +
-      "etbrains.kotlin.serialization.Function\030\202" +
+      "otation:\200\001\n\026constructor_annotation\022/.org" +
+      ".jetbrains.kotlin.serialization.Construc" +
+      "tor\030\202\001 \003(\0132..org.jetbrains.kotlin.serial" +
+      "ization.Annotation:z\n\023function_annotatio" +
+      "n\022,.org.jetbrains.kotlin.serialization.F" +
+      "unction\030\202\001 \003(\0132..org.jetbrains.kotlin.se" +
+      "rialization.Annotation:z\n\023property_annot" +
+      "ation\022,.org.jetbrains.kotlin.serializati" +
+      "on.Property\030\202\001 \003(\0132..org.jetbrains.kotli" +
+      "n.serialization.Annotation:\210\001\n\022compile_t",
+      "ime_value\022,.org.jetbrains.kotlin.seriali" +
+      "zation.Property\030\203\001 \001(\0132=.org.jetbrains.k" +
+      "otlin.serialization.Annotation.Argument." +
+      "Value:\201\001\n\024parameter_annotation\0222.org.jet" +
+      "brains.kotlin.serialization.ValueParamet" +
+      "er\030\202\001 \003(\0132..org.jetbrains.kotlin.seriali" +
+      "zation.Annotation:r\n\017type_annotation\022(.o" +
+      "rg.jetbrains.kotlin.serialization.Type\030\202" +
       "\001 \003(\0132..org.jetbrains.kotlin.serializati" +
-      "on.Annotation:z\n\023property_annotation\022,.o" +
-      "rg.jetbrains.kotlin.serialization.Proper" +
-      "ty\030\202\001 \003(\0132..org.jetbrains.kotlin.seriali" +
-      "zation.Annotation:\210\001\n\022compile_time_value" +
-      "\022,.org.jetbrains.kotlin.serialization.Pr" +
-      "operty\030\203\001 \001(\0132=.org.jetbrains.kotlin.ser" +
-      "ialization.Annotation.Argument.Value:\201\001\n",
-      "\024parameter_annotation\0222.org.jetbrains.ko" +
-      "tlin.serialization.ValueParameter\030\202\001 \003(\013" +
-      "2..org.jetbrains.kotlin.serialization.An" +
-      "notation:r\n\017type_annotation\022(.org.jetbra" +
-      "ins.kotlin.serialization.Type\030\202\001 \003(\0132..o" +
-      "rg.jetbrains.kotlin.serialization.Annota" +
-      "tionB\021B\017DebugJsProtoBuf"
+      "on.AnnotationB\021B\017DebugJsProtoBuf"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -1990,14 +1959,12 @@ public final class DebugJsProtoBuf {
               internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_descriptor,
               new java.lang.String[] { "Path", "Content", });
           classAnnotation.internalInit(descriptor.getExtensions().get(0));
-          oldCallableAnnotation.internalInit(descriptor.getExtensions().get(1));
-          oldCompileTimeValue.internalInit(descriptor.getExtensions().get(2));
-          constructorAnnotation.internalInit(descriptor.getExtensions().get(3));
-          functionAnnotation.internalInit(descriptor.getExtensions().get(4));
-          propertyAnnotation.internalInit(descriptor.getExtensions().get(5));
-          compileTimeValue.internalInit(descriptor.getExtensions().get(6));
-          parameterAnnotation.internalInit(descriptor.getExtensions().get(7));
-          typeAnnotation.internalInit(descriptor.getExtensions().get(8));
+          constructorAnnotation.internalInit(descriptor.getExtensions().get(1));
+          functionAnnotation.internalInit(descriptor.getExtensions().get(2));
+          propertyAnnotation.internalInit(descriptor.getExtensions().get(3));
+          compileTimeValue.internalInit(descriptor.getExtensions().get(4));
+          parameterAnnotation.internalInit(descriptor.getExtensions().get(5));
+          typeAnnotation.internalInit(descriptor.getExtensions().get(6));
           return null;
         }
       };
diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java b/compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
index fd30ffbcf72..cb26d0e07a5 100644
--- a/compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
@@ -12,9 +12,6 @@ public final class DebugJvmProtoBuf {
     registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.methodImplClassName);
     registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.propertySignature);
     registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.propertyImplClassName);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.oldMethodSignature);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.oldPropertySignature);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.oldImplClassName);
     registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.typeAnnotation);
     registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.isRaw);
     registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.index);
@@ -4581,39 +4578,6 @@ public final class DebugJvmProtoBuf {
           .newFileScopedGeneratedExtension(
         java.lang.Integer.class,
         null);
-  public static final int OLD_METHOD_SIGNATURE_FIELD_NUMBER = 100;
-  /**
-   * <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable,
-      org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature> oldMethodSignature = com.google.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.class,
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance());
-  public static final int OLD_PROPERTY_SIGNATURE_FIELD_NUMBER = 101;
-  /**
-   * <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable,
-      org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature> oldPropertySignature = com.google.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature.class,
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature.getDefaultInstance());
-  public static final int OLD_IMPL_CLASS_NAME_FIELD_NUMBER = 102;
-  /**
-   * <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable,
-      java.lang.Integer> oldImplClassName = com.google.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        java.lang.Integer.class,
-        null);
   public static final int TYPE_ANNOTATION_FIELD_NUMBER = 100;
   /**
    * <code>extend .org.jetbrains.kotlin.serialization.Type { ... }</code>
@@ -4734,25 +4698,16 @@ public final class DebugJvmProtoBuf {
       "serialization.jvm.JvmPropertySignature:T",
       "\n\030property_impl_class_name\022,.org.jetbrai" +
       "ns.kotlin.serialization.Property\030e \001(\005B\004" +
-      "\230\265\030\001:\206\001\n\024old_method_signature\022,.org.jetb" +
-      "rains.kotlin.serialization.Callable\030d \001(" +
-      "\0132:.org.jetbrains.kotlin.serialization.j" +
-      "vm.JvmMethodSignature:\212\001\n\026old_property_s" +
-      "ignature\022,.org.jetbrains.kotlin.serializ" +
-      "ation.Callable\030e \001(\0132<.org.jetbrains.kot" +
-      "lin.serialization.jvm.JvmPropertySignatu" +
-      "re:O\n\023old_impl_class_name\022,.org.jetbrain",
-      "s.kotlin.serialization.Callable\030f \001(\005B\004\210" +
-      "\265\030\001:q\n\017type_annotation\022(.org.jetbrains.k" +
-      "otlin.serialization.Type\030d \003(\0132..org.jet" +
-      "brains.kotlin.serialization.Annotation:8" +
-      "\n\006is_raw\022(.org.jetbrains.kotlin.serializ" +
-      "ation.Type\030e \001(\010:A\n\005index\0222.org.jetbrain" +
-      "s.kotlin.serialization.ValueParameter\030d " +
-      "\001(\005:s\n\020class_annotation\022).org.jetbrains." +
-      "kotlin.serialization.Class\030d \003(\0132..org.j" +
-      "etbrains.kotlin.serialization.Annotation",
-      "B\022B\020DebugJvmProtoBuf"
+      "\230\265\030\001:q\n\017type_annotation\022(.org.jetbrains." +
+      "kotlin.serialization.Type\030d \003(\0132..org.je" +
+      "tbrains.kotlin.serialization.Annotation:" +
+      "8\n\006is_raw\022(.org.jetbrains.kotlin.seriali" +
+      "zation.Type\030e \001(\010:A\n\005index\0222.org.jetbrai" +
+      "ns.kotlin.serialization.ValueParameter\030d" +
+      " \001(\005:s\n\020class_annotation\022).org.jetbrains" +
+      ".kotlin.serialization.Class\030d \003(\0132..org.",
+      "jetbrains.kotlin.serialization.Annotatio" +
+      "nB\022B\020DebugJvmProtoBuf"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -4794,13 +4749,10 @@ public final class DebugJvmProtoBuf {
           methodImplClassName.internalInit(descriptor.getExtensions().get(2));
           propertySignature.internalInit(descriptor.getExtensions().get(3));
           propertyImplClassName.internalInit(descriptor.getExtensions().get(4));
-          oldMethodSignature.internalInit(descriptor.getExtensions().get(5));
-          oldPropertySignature.internalInit(descriptor.getExtensions().get(6));
-          oldImplClassName.internalInit(descriptor.getExtensions().get(7));
-          typeAnnotation.internalInit(descriptor.getExtensions().get(8));
-          isRaw.internalInit(descriptor.getExtensions().get(9));
-          index.internalInit(descriptor.getExtensions().get(10));
-          classAnnotation.internalInit(descriptor.getExtensions().get(11));
+          typeAnnotation.internalInit(descriptor.getExtensions().get(5));
+          isRaw.internalInit(descriptor.getExtensions().get(6));
+          index.internalInit(descriptor.getExtensions().get(7));
+          classAnnotation.internalInit(descriptor.getExtensions().get(8));
           com.google.protobuf.ExtensionRegistry registry =
             com.google.protobuf.ExtensionRegistry.newInstance();
           registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
@@ -4809,7 +4761,6 @@ public final class DebugJvmProtoBuf {
           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.nameIdInTable);
           return registry;
         }
       };
diff --git a/core/descriptor.loader.java/src/jvm_descriptors.proto b/core/descriptor.loader.java/src/jvm_descriptors.proto
index a4ad8b416d9..f65226f8864 100644
--- a/core/descriptor.loader.java/src/jvm_descriptors.proto
+++ b/core/descriptor.loader.java/src/jvm_descriptors.proto
@@ -111,13 +111,6 @@ extend Property {
   optional int32 property_impl_class_name = 101 [(string_id_in_table) = true];
 }
 
-// TODO: drop
-extend Callable {
-  optional JvmMethodSignature old_method_signature = 100;
-  optional JvmPropertySignature old_property_signature = 101;
-  optional int32 old_impl_class_name = 102 [(name_id_in_table) = true];
-}
-
 extend Type {
   repeated Annotation type_annotation = 100;
   optional bool is_raw = 101;
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt
index 75a716d17e0..b2b6666a1bd 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt
@@ -104,25 +104,6 @@ public abstract class AbstractBinaryClassAnnotationAndConstantLoader<A : Any, C
 
                 loadPropertyAnnotations(propertyAnnotations, fieldAnnotations)
             }
-            is ProtoBuf.Callable -> {
-                val nameResolver = container.nameResolver
-                if (kind == AnnotatedCallableKind.PROPERTY) {
-                    val syntheticFunctionSignature = getPropertySignature(proto, nameResolver, synthetic = true)
-                    val fieldSignature = getPropertySignature(proto, nameResolver, field = true)
-
-                    val propertyAnnotations = syntheticFunctionSignature?.let { sig ->
-                        findClassAndLoadMemberAnnotations(container, proto, sig)
-                    } ?: listOf()
-
-                    val fieldAnnotations = fieldSignature?.let { sig ->
-                        findClassAndLoadMemberAnnotations(container, proto, sig, isStaticFieldInOuter(proto))
-                    } ?: listOf()
-
-                    return loadPropertyAnnotations(propertyAnnotations, fieldAnnotations)
-                }
-                val signature = getCallableSignature(proto, nameResolver, kind) ?: return emptyList()
-                transformAnnotations(findClassAndLoadMemberAnnotations(container, proto, signature))
-            }
             else -> emptyList()
         }
     }
@@ -231,19 +212,13 @@ public abstract class AbstractBinaryClassAnnotationAndConstantLoader<A : Any, C
                     nameResolver.getName(proto.getExtension(methodImplClassName))
                 proto is ProtoBuf.Property && proto.hasExtension(propertyImplClassName) ->
                     nameResolver.getName(proto.getExtension(propertyImplClassName))
-                proto is ProtoBuf.Callable && proto.hasExtension(oldImplClassName) ->
-                    nameResolver.getName(proto.getExtension(oldImplClassName))
                 else -> null
             }
 
     private fun isStaticFieldInOuter(proto: MessageLite): Boolean =
-            when {
-                proto is ProtoBuf.Property && proto.hasExtension(propertySignature) ->
-                    proto.getExtension(propertySignature).let { it.hasField() && it.field.isStaticInOuter }
-                proto is ProtoBuf.Callable && proto.hasExtension(oldPropertySignature) ->
-                    proto.getExtension(oldPropertySignature).let { it.hasField() && it.field.isStaticInOuter }
-                else -> false
-            }
+            if (proto is ProtoBuf.Property && proto.hasExtension(propertySignature))
+                proto.getExtension(propertySignature).let { it.hasField() && it.field.isStaticInOuter }
+            else false
 
     private fun loadAnnotationsAndInitializers(kotlinClass: KotlinJvmBinaryClass): Storage<A, C> {
         val memberAnnotations = HashMap<MemberSignature, MutableList<A>>()
@@ -300,16 +275,13 @@ public abstract class AbstractBinaryClassAnnotationAndConstantLoader<A : Any, C
     }
 
     private fun getPropertySignature(
-            proto: MessageLite,
+            proto: ProtoBuf.Property,
             nameResolver: NameResolver,
             field: Boolean = false,
             synthetic: Boolean = false
     ): MemberSignature? {
         val signature =
-                if (proto is ProtoBuf.Property && proto.hasExtension(propertySignature))
-                    proto.getExtension(propertySignature)
-                else if (proto is ProtoBuf.Callable && proto.hasExtension(oldPropertySignature))
-                    proto.getExtension(oldPropertySignature)
+                if (proto.hasExtension(propertySignature)) proto.getExtension(propertySignature)
                 else return null
 
         if (field && signature.hasField()) {
@@ -339,24 +311,6 @@ public abstract class AbstractBinaryClassAnnotationAndConstantLoader<A : Any, C
                     else -> null
                 }
             }
-            proto is ProtoBuf.Callable -> {
-                when (kind) {
-                    AnnotatedCallableKind.FUNCTION ->
-                        if (proto.hasExtension(oldMethodSignature))
-                            MemberSignature.fromMethod(nameResolver, proto.getExtension(oldMethodSignature))
-                        else null
-                    AnnotatedCallableKind.PROPERTY_GETTER ->
-                        if (proto.hasExtension(oldPropertySignature))
-                            MemberSignature.fromMethod(nameResolver, proto.getExtension(oldPropertySignature).getter)
-                        else null
-                    AnnotatedCallableKind.PROPERTY_SETTER ->
-                        if (proto.hasExtension(oldPropertySignature))
-                            MemberSignature.fromMethod(nameResolver, proto.getExtension(oldPropertySignature).setter)
-                        else null
-                    AnnotatedCallableKind.PROPERTY ->
-                        getPropertySignature(proto, nameResolver, true, true)
-                }
-            }
             else -> null
         }
     }
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java
index aa801594fe1..ca8ca511abd 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java
@@ -12,9 +12,6 @@ public final class JvmProtoBuf {
     registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.methodImplClassName);
     registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.propertySignature);
     registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.propertyImplClassName);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.oldMethodSignature);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.oldPropertySignature);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.oldImplClassName);
     registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.typeAnnotation);
     registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.isRaw);
     registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.index);
@@ -3788,51 +3785,6 @@ public final class JvmProtoBuf {
         null,
         101,
         com.google.protobuf.WireFormat.FieldType.INT32);
-  public static final int OLD_METHOD_SIGNATURE_FIELD_NUMBER = 100;
-  /**
-   * <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Callable,
-      org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature> oldMethodSignature = com.google.protobuf.GeneratedMessageLite
-          .newSingularGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance(),
-        null,
-        100,
-        com.google.protobuf.WireFormat.FieldType.MESSAGE);
-  public static final int OLD_PROPERTY_SIGNATURE_FIELD_NUMBER = 101;
-  /**
-   * <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Callable,
-      org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature> oldPropertySignature = com.google.protobuf.GeneratedMessageLite
-          .newSingularGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature.getDefaultInstance(),
-        null,
-        101,
-        com.google.protobuf.WireFormat.FieldType.MESSAGE);
-  public static final int OLD_IMPL_CLASS_NAME_FIELD_NUMBER = 102;
-  /**
-   * <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Callable,
-      java.lang.Integer> oldImplClassName = com.google.protobuf.GeneratedMessageLite
-          .newSingularGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance(),
-        0,
-        null,
-        null,
-        102,
-        com.google.protobuf.WireFormat.FieldType.INT32);
   public static final int TYPE_ANNOTATION_FIELD_NUMBER = 100;
   /**
    * <code>extend .org.jetbrains.kotlin.serialization.Type { ... }</code>
diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsAnnotationAndConstantLoader.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsAnnotationAndConstantLoader.kt
index 0dcae6c218e..cdaea82a188 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsAnnotationAndConstantLoader.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsAnnotationAndConstantLoader.kt
@@ -44,9 +44,12 @@ class BuiltInsAnnotationAndConstantLoader(
             proto: MessageLite,
             kind: AnnotatedCallableKind
     ): List<AnnotationWithTarget> {
-        proto as ProtoBuf.Callable // TODO
-
-        val annotations = proto.getExtension(BuiltInsProtoBuf.oldCallableAnnotation).orEmpty()
+        val annotations = when (proto) {
+            is ProtoBuf.Constructor -> proto.getExtension(BuiltInsProtoBuf.constructorAnnotation)
+            is ProtoBuf.Function -> proto.getExtension(BuiltInsProtoBuf.functionAnnotation)
+            is ProtoBuf.Property -> proto.getExtension(BuiltInsProtoBuf.propertyAnnotation)
+            else -> error("Unknown message: $proto")
+        }.orEmpty()
         return annotations.map { proto -> AnnotationWithTarget(deserializer.deserializeAnnotation(proto, container.nameResolver), null) }
     }
 
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java
index 6fda81be35a..2b6267aef6d 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java
@@ -110,10 +110,6 @@ public class DescriptorFactory {
         return new DefaultConstructorDescriptor(containingClass, source);
     }
 
-    public static boolean isDefaultPrimaryConstructor(@NotNull ConstructorDescriptor constructor) {
-        return constructor instanceof DefaultConstructorDescriptor;
-    }
-
     @NotNull
     public static SimpleFunctionDescriptor createEnumValuesMethod(@NotNull ClassDescriptor enumClass) {
         SimpleFunctionDescriptorImpl values =
diff --git a/core/deserialization/src/builtins.proto b/core/deserialization/src/builtins.proto
index 3f5b60ae717..cb996cc043a 100644
--- a/core/deserialization/src/builtins.proto
+++ b/core/deserialization/src/builtins.proto
@@ -30,11 +30,6 @@ extend Class {
   repeated Annotation class_annotation = 150;
 }
 
-extend Callable {
-  repeated Annotation old_callable_annotation = 150;
-  optional Annotation.Argument.Value old_compile_time_value = 151;
-}
-
 extend Constructor {
   repeated Annotation constructor_annotation = 150;
 }
diff --git a/core/deserialization/src/descriptors.proto b/core/deserialization/src/descriptors.proto
index 1d9a273813e..c5bbca8396c 100644
--- a/core/deserialization/src/descriptors.proto
+++ b/core/deserialization/src/descriptors.proto
@@ -177,28 +177,12 @@ message Class {
   repeated Function function = 9;
   repeated Property property = 10;
 
-  repeated Callable member = 11;
-
   repeated int32 enum_entry = 12 [packed = true, (name_id_in_table) = true];
 
-  message PrimaryConstructor {
-    // If this field is present, it contains serialized data for the primary constructor.
-    // Otherwise it's default and can be created manually upon deserialization
-    // Note: currently only objects have default primary constructor
-    optional Callable data = 1;
-  }
-
-  // This field is present if and only if the class has a primary constructor
-  optional PrimaryConstructor primary_constructor = 13;
-  repeated Callable secondary_constructor = 14;
-
   extensions 100 to 199;
 }
 
 message Package {
-  repeated Callable member = 1;
-
-  repeated Constructor constructor = 2;
   repeated Function function = 3;
   repeated Property property = 4;
 
@@ -279,46 +263,6 @@ message Property {
   extensions 100 to 199;
 }
 
-message Callable {
-  /*
-    Visibility
-    Modality
-    hasAnnotations
-    CallableKind
-    MemberKind
-    hasGetter
-    hasSetter
-    hasConstant
-    isConst
-    lateinit
-    isOperator
-    isInfix
-  */
-  optional int32 flags = 1;
-
-  /*
-    isNotDefault
-    Visibility
-    Modality
-    hasAnnotations
-  */
-  optional int32 getter_flags = 9 /* absent => same as property */;
-  optional int32 setter_flags = 10 /* absent => same as property */;
-
-  repeated TypeParameter type_parameter = 4;
-
-  optional Type receiver_type = 5;
-
-  required int32 name = 6 [(name_id_in_table) = true];
-
-  // Value parameters for functions and constructors, or setter value parameter for properties
-  repeated ValueParameter value_parameter = 7;
-
-  required Type return_type = 8;
-
-  extensions 100 to 199;
-}
-
 message ValueParameter {
   /*
     declaresDefault
@@ -353,14 +297,6 @@ enum Visibility {
   LOCAL = 0x05;
 }
 
-enum CallableKind {
-  // 2 bits
-  FUN = 0;
-  VAL = 1;
-  VAR = 2;
-  CONSTRUCTOR = 3;
-}
-
 enum MemberKind {
   // 2 bits
   DECLARATION = 0;
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java
index 1e46a8287a9..aec580b5629 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java
@@ -36,8 +36,11 @@ public class Flags {
 
     // Callables
 
-    public static final FlagField<ProtoBuf.CallableKind> CALLABLE_KIND = FlagField.after(MODALITY, ProtoBuf.CallableKind.values());
-    public static final FlagField<ProtoBuf.MemberKind> MEMBER_KIND = FlagField.after(CALLABLE_KIND, ProtoBuf.MemberKind.values());
+    // TODO: use these flags
+    public static final FlagField<Boolean> RESERVED_1 = FlagField.booleanAfter(MODALITY);
+    public static final FlagField<Boolean> RESERVED_2 = FlagField.booleanAfter(RESERVED_1);
+
+    public static final FlagField<ProtoBuf.MemberKind> MEMBER_KIND = FlagField.after(RESERVED_2, ProtoBuf.MemberKind.values());
 
     // Constructors
 
@@ -57,16 +60,6 @@ public class Flags {
     public static final FlagField<Boolean> LATE_INIT = FlagField.booleanAfter(IS_CONST);
     public static final FlagField<Boolean> HAS_CONSTANT = FlagField.booleanAfter(LATE_INIT);
 
-    // Old callables. TODO: delete
-
-    public static final FlagField<Boolean> OLD_HAS_GETTER = FlagField.booleanAfter(MEMBER_KIND);
-    public static final FlagField<Boolean> OLD_HAS_SETTER = FlagField.booleanAfter(OLD_HAS_GETTER);
-    public static final FlagField<Boolean> OLD_HAS_CONSTANT = FlagField.booleanAfter(OLD_HAS_SETTER);
-    public static final FlagField<Boolean> OLD_IS_CONST = FlagField.booleanAfter(OLD_HAS_CONSTANT);
-    public static final FlagField<Boolean> OLD_LATE_INIT = FlagField.booleanAfter(OLD_IS_CONST);
-    public static final FlagField<Boolean> OLD_IS_OPERATOR = FlagField.booleanAfter(OLD_LATE_INIT);
-    public static final FlagField<Boolean> OLD_IS_INFIX = FlagField.booleanAfter(OLD_IS_OPERATOR);
-
     // Parameters
 
     public static final FlagField<Boolean> DECLARES_DEFAULT_VALUE = FlagField.booleanAfter(HAS_ANNOTATIONS);
@@ -123,35 +116,6 @@ public class Flags {
         throw new IllegalArgumentException("Unknown class kind: " + kind);
     }
 
-    public static int getCallableFlags(
-            boolean hasAnnotations,
-            @NotNull Visibility visibility,
-            @NotNull Modality modality,
-            @NotNull CallableMemberDescriptor.Kind memberKind,
-            @NotNull ProtoBuf.CallableKind callableKind,
-            boolean hasGetter,
-            boolean hasSetter,
-            boolean hasConstant,
-            boolean lateInit,
-            boolean isConst,
-            boolean isOperator,
-            boolean isInfix
-    ) {
-        return HAS_ANNOTATIONS.toFlags(hasAnnotations)
-               | MODALITY.toFlags(modality(modality))
-               | VISIBILITY.toFlags(visibility(visibility))
-               | MEMBER_KIND.toFlags(memberKind(memberKind))
-               | CALLABLE_KIND.toFlags(callableKind)
-               | OLD_HAS_GETTER.toFlags(hasGetter)
-               | OLD_HAS_SETTER.toFlags(hasSetter)
-               | OLD_HAS_CONSTANT.toFlags(hasConstant)
-               | OLD_LATE_INIT.toFlags(lateInit)
-               | OLD_IS_CONST.toFlags(isConst)
-               | OLD_IS_OPERATOR.toFlags(isOperator)
-               | OLD_IS_INFIX.toFlags(isInfix)
-               ;
-    }
-
     public static int getConstructorFlags(
             boolean hasAnnotations,
             @NotNull Visibility visibility,
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
index b79f9a87a2c..ffe70df3370 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
@@ -190,88 +190,6 @@ public final class ProtoBuf {
     // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Visibility)
   }
 
-  /**
-   * Protobuf enum {@code org.jetbrains.kotlin.serialization.CallableKind}
-   */
-  public enum CallableKind
-      implements com.google.protobuf.Internal.EnumLite {
-    /**
-     * <code>FUN = 0;</code>
-     *
-     * <pre>
-     * 2 bits
-     * </pre>
-     */
-    FUN(0, 0),
-    /**
-     * <code>VAL = 1;</code>
-     */
-    VAL(1, 1),
-    /**
-     * <code>VAR = 2;</code>
-     */
-    VAR(2, 2),
-    /**
-     * <code>CONSTRUCTOR = 3;</code>
-     */
-    CONSTRUCTOR(3, 3),
-    ;
-
-    /**
-     * <code>FUN = 0;</code>
-     *
-     * <pre>
-     * 2 bits
-     * </pre>
-     */
-    public static final int FUN_VALUE = 0;
-    /**
-     * <code>VAL = 1;</code>
-     */
-    public static final int VAL_VALUE = 1;
-    /**
-     * <code>VAR = 2;</code>
-     */
-    public static final int VAR_VALUE = 2;
-    /**
-     * <code>CONSTRUCTOR = 3;</code>
-     */
-    public static final int CONSTRUCTOR_VALUE = 3;
-
-
-    public final int getNumber() { return value; }
-
-    public static CallableKind valueOf(int value) {
-      switch (value) {
-        case 0: return FUN;
-        case 1: return VAL;
-        case 2: return VAR;
-        case 3: return CONSTRUCTOR;
-        default: return null;
-      }
-    }
-
-    public static com.google.protobuf.Internal.EnumLiteMap<CallableKind>
-        internalGetValueMap() {
-      return internalValueMap;
-    }
-    private static com.google.protobuf.Internal.EnumLiteMap<CallableKind>
-        internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap<CallableKind>() {
-            public CallableKind findValueByNumber(int number) {
-              return CallableKind.valueOf(number);
-            }
-          };
-
-    private final int value;
-
-    private CallableKind(int index, int value) {
-      this.value = value;
-    }
-
-    // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.CallableKind)
-  }
-
   /**
    * Protobuf enum {@code org.jetbrains.kotlin.serialization.MemberKind}
    */
@@ -6948,21 +6866,6 @@ public final class ProtoBuf {
      */
     int getPropertyCount();
 
-    // repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-     */
-    java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Callable> 
-        getMemberList();
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-     */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Callable getMember(int index);
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-     */
-    int getMemberCount();
-
     // repeated int32 enum_entry = 12 [packed = true];
     /**
      * <code>repeated int32 enum_entry = 12 [packed = true];</code>
@@ -6976,39 +6879,6 @@ public final class ProtoBuf {
      * <code>repeated int32 enum_entry = 12 [packed = true];</code>
      */
     int getEnumEntry(int index);
-
-    // optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
-    /**
-     * <code>optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
-     *
-     * <pre>
-     * This field is present if and only if the class has a primary constructor
-     * </pre>
-     */
-    boolean hasPrimaryConstructor();
-    /**
-     * <code>optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
-     *
-     * <pre>
-     * This field is present if and only if the class has a primary constructor
-     * </pre>
-     */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor getPrimaryConstructor();
-
-    // repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-     */
-    java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Callable> 
-        getSecondaryConstructorList();
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-     */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Callable getSecondaryConstructor(int index);
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-     */
-    int getSecondaryConstructorCount();
   }
   /**
    * Protobuf type {@code org.jetbrains.kotlin.serialization.Class}
@@ -7129,18 +6999,10 @@ public final class ProtoBuf {
               property_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Property.PARSER, extensionRegistry));
               break;
             }
-            case 90: {
-              if (!((mutable_bitField0_ & 0x00000200) == 0x00000200)) {
-                member_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.ProtoBuf.Callable>();
-                mutable_bitField0_ |= 0x00000200;
-              }
-              member_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Callable.PARSER, extensionRegistry));
-              break;
-            }
             case 96: {
-              if (!((mutable_bitField0_ & 0x00000400) == 0x00000400)) {
+              if (!((mutable_bitField0_ & 0x00000200) == 0x00000200)) {
                 enumEntry_ = new java.util.ArrayList<java.lang.Integer>();
-                mutable_bitField0_ |= 0x00000400;
+                mutable_bitField0_ |= 0x00000200;
               }
               enumEntry_.add(input.readInt32());
               break;
@@ -7148,9 +7010,9 @@ public final class ProtoBuf {
             case 98: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000400) == 0x00000400) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000200) == 0x00000200) && input.getBytesUntilLimit() > 0) {
                 enumEntry_ = new java.util.ArrayList<java.lang.Integer>();
-                mutable_bitField0_ |= 0x00000400;
+                mutable_bitField0_ |= 0x00000200;
               }
               while (input.getBytesUntilLimit() > 0) {
                 enumEntry_.add(input.readInt32());
@@ -7158,27 +7020,6 @@ public final class ProtoBuf {
               input.popLimit(limit);
               break;
             }
-            case 106: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000008) == 0x00000008)) {
-                subBuilder = primaryConstructor_.toBuilder();
-              }
-              primaryConstructor_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(primaryConstructor_);
-                primaryConstructor_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000008;
-              break;
-            }
-            case 114: {
-              if (!((mutable_bitField0_ & 0x00001000) == 0x00001000)) {
-                secondaryConstructor_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.ProtoBuf.Callable>();
-                mutable_bitField0_ |= 0x00001000;
-              }
-              secondaryConstructor_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Callable.PARSER, extensionRegistry));
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -7206,14 +7047,8 @@ public final class ProtoBuf {
           property_ = java.util.Collections.unmodifiableList(property_);
         }
         if (((mutable_bitField0_ & 0x00000200) == 0x00000200)) {
-          member_ = java.util.Collections.unmodifiableList(member_);
-        }
-        if (((mutable_bitField0_ & 0x00000400) == 0x00000400)) {
           enumEntry_ = java.util.Collections.unmodifiableList(enumEntry_);
         }
-        if (((mutable_bitField0_ & 0x00001000) == 0x00001000)) {
-          secondaryConstructor_ = java.util.Collections.unmodifiableList(secondaryConstructor_);
-        }
         makeExtensionsImmutable();
       }
     }
@@ -7341,447 +7176,6 @@ public final class ProtoBuf {
       // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Class.Kind)
     }
 
-    public interface PrimaryConstructorOrBuilder
-        extends com.google.protobuf.MessageLiteOrBuilder {
-
-      // optional .org.jetbrains.kotlin.serialization.Callable data = 1;
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Callable data = 1;</code>
-       *
-       * <pre>
-       * If this field is present, it contains serialized data for the primary constructor.
-       * Otherwise it's default and can be created manually upon deserialization
-       * Note: currently only objects have default primary constructor
-       * </pre>
-       */
-      boolean hasData();
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Callable data = 1;</code>
-       *
-       * <pre>
-       * If this field is present, it contains serialized data for the primary constructor.
-       * Otherwise it's default and can be created manually upon deserialization
-       * Note: currently only objects have default primary constructor
-       * </pre>
-       */
-      org.jetbrains.kotlin.serialization.ProtoBuf.Callable getData();
-    }
-    /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Class.PrimaryConstructor}
-     */
-    public static final class PrimaryConstructor extends
-        com.google.protobuf.GeneratedMessageLite
-        implements PrimaryConstructorOrBuilder {
-      // Use PrimaryConstructor.newBuilder() to construct.
-      private PrimaryConstructor(com.google.protobuf.GeneratedMessageLite.Builder builder) {
-        super(builder);
-
-      }
-      private PrimaryConstructor(boolean noInit) {}
-
-      private static final PrimaryConstructor defaultInstance;
-      public static PrimaryConstructor getDefaultInstance() {
-        return defaultInstance;
-      }
-
-      public PrimaryConstructor getDefaultInstanceForType() {
-        return defaultInstance;
-      }
-
-      private PrimaryConstructor(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        initFields();
-        int mutable_bitField0_ = 0;
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              default: {
-                if (!parseUnknownField(input,
-                                       extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-              case 10: {
-                org.jetbrains.kotlin.serialization.ProtoBuf.Callable.Builder subBuilder = null;
-                if (((bitField0_ & 0x00000001) == 0x00000001)) {
-                  subBuilder = data_.toBuilder();
-                }
-                data_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Callable.PARSER, extensionRegistry);
-                if (subBuilder != null) {
-                  subBuilder.mergeFrom(data_);
-                  data_ = subBuilder.buildPartial();
-                }
-                bitField0_ |= 0x00000001;
-                break;
-              }
-            }
-          }
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new com.google.protobuf.InvalidProtocolBufferException(
-              e.getMessage()).setUnfinishedMessage(this);
-        } finally {
-          makeExtensionsImmutable();
-        }
-      }
-      public static com.google.protobuf.Parser<PrimaryConstructor> PARSER =
-          new com.google.protobuf.AbstractParser<PrimaryConstructor>() {
-        public PrimaryConstructor parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new PrimaryConstructor(input, extensionRegistry);
-        }
-      };
-
-      @java.lang.Override
-      public com.google.protobuf.Parser<PrimaryConstructor> getParserForType() {
-        return PARSER;
-      }
-
-      private int bitField0_;
-      // optional .org.jetbrains.kotlin.serialization.Callable data = 1;
-      public static final int DATA_FIELD_NUMBER = 1;
-      private org.jetbrains.kotlin.serialization.ProtoBuf.Callable data_;
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Callable data = 1;</code>
-       *
-       * <pre>
-       * If this field is present, it contains serialized data for the primary constructor.
-       * Otherwise it's default and can be created manually upon deserialization
-       * Note: currently only objects have default primary constructor
-       * </pre>
-       */
-      public boolean hasData() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Callable data = 1;</code>
-       *
-       * <pre>
-       * If this field is present, it contains serialized data for the primary constructor.
-       * Otherwise it's default and can be created manually upon deserialization
-       * Note: currently only objects have default primary constructor
-       * </pre>
-       */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Callable getData() {
-        return data_;
-      }
-
-      private void initFields() {
-        data_ = org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance();
-      }
-      private byte memoizedIsInitialized = -1;
-      public final boolean isInitialized() {
-        byte isInitialized = memoizedIsInitialized;
-        if (isInitialized != -1) return isInitialized == 1;
-
-        if (hasData()) {
-          if (!getData().isInitialized()) {
-            memoizedIsInitialized = 0;
-            return false;
-          }
-        }
-        memoizedIsInitialized = 1;
-        return true;
-      }
-
-      public void writeTo(com.google.protobuf.CodedOutputStream output)
-                          throws java.io.IOException {
-        getSerializedSize();
-        if (((bitField0_ & 0x00000001) == 0x00000001)) {
-          output.writeMessage(1, data_);
-        }
-      }
-
-      private int memoizedSerializedSize = -1;
-      public int getSerializedSize() {
-        int size = memoizedSerializedSize;
-        if (size != -1) return size;
-
-        size = 0;
-        if (((bitField0_ & 0x00000001) == 0x00000001)) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(1, data_);
-        }
-        memoizedSerializedSize = size;
-        return size;
-      }
-
-      private static final long serialVersionUID = 0L;
-      @java.lang.Override
-      protected java.lang.Object writeReplace()
-          throws java.io.ObjectStreamException {
-        return super.writeReplace();
-      }
-
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor parseFrom(
-          com.google.protobuf.ByteString data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor parseFrom(
-          com.google.protobuf.ByteString data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor parseFrom(byte[] data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor parseFrom(
-          byte[] data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor parseFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return PARSER.parseFrom(input);
-      }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor parseFrom(
-          java.io.InputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return PARSER.parseFrom(input, extensionRegistry);
-      }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor parseDelimitedFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return PARSER.parseDelimitedFrom(input);
-      }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor parseDelimitedFrom(
-          java.io.InputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return PARSER.parseDelimitedFrom(input, extensionRegistry);
-      }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor parseFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return PARSER.parseFrom(input);
-      }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor parseFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return PARSER.parseFrom(input, extensionRegistry);
-      }
-
-      public static Builder newBuilder() { return Builder.create(); }
-      public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor prototype) {
-        return newBuilder().mergeFrom(prototype);
-      }
-      public Builder toBuilder() { return newBuilder(this); }
-
-      /**
-       * Protobuf type {@code org.jetbrains.kotlin.serialization.Class.PrimaryConstructor}
-       */
-      public static final class Builder extends
-          com.google.protobuf.GeneratedMessageLite.Builder<
-            org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor, Builder>
-          implements org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructorOrBuilder {
-        // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.newBuilder()
-        private Builder() {
-          maybeForceBuilderInitialization();
-        }
-
-        private void maybeForceBuilderInitialization() {
-        }
-        private static Builder create() {
-          return new Builder();
-        }
-
-        public Builder clear() {
-          super.clear();
-          data_ = org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          return this;
-        }
-
-        public Builder clone() {
-          return create().mergeFrom(buildPartial());
-        }
-
-        public org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor getDefaultInstanceForType() {
-          return org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
-        }
-
-        public org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor build() {
-          org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor result = buildPartial();
-          if (!result.isInitialized()) {
-            throw newUninitializedMessageException(result);
-          }
-          return result;
-        }
-
-        public org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor buildPartial() {
-          org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor result = new org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor(this);
-          int from_bitField0_ = bitField0_;
-          int to_bitField0_ = 0;
-          if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-            to_bitField0_ |= 0x00000001;
-          }
-          result.data_ = data_;
-          result.bitField0_ = to_bitField0_;
-          return result;
-        }
-
-        public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor other) {
-          if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance()) return this;
-          if (other.hasData()) {
-            mergeData(other.getData());
-          }
-          return this;
-        }
-
-        public final boolean isInitialized() {
-          if (hasData()) {
-            if (!getData().isInitialized()) {
-              
-              return false;
-            }
-          }
-          return true;
-        }
-
-        public Builder mergeFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws java.io.IOException {
-          org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor parsedMessage = null;
-          try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor) e.getUnfinishedMessage();
-            throw e;
-          } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
-          return this;
-        }
-        private int bitField0_;
-
-        // optional .org.jetbrains.kotlin.serialization.Callable data = 1;
-        private org.jetbrains.kotlin.serialization.ProtoBuf.Callable data_ = org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance();
-        /**
-         * <code>optional .org.jetbrains.kotlin.serialization.Callable data = 1;</code>
-         *
-         * <pre>
-         * If this field is present, it contains serialized data for the primary constructor.
-         * Otherwise it's default and can be created manually upon deserialization
-         * Note: currently only objects have default primary constructor
-         * </pre>
-         */
-        public boolean hasData() {
-          return ((bitField0_ & 0x00000001) == 0x00000001);
-        }
-        /**
-         * <code>optional .org.jetbrains.kotlin.serialization.Callable data = 1;</code>
-         *
-         * <pre>
-         * If this field is present, it contains serialized data for the primary constructor.
-         * Otherwise it's default and can be created manually upon deserialization
-         * Note: currently only objects have default primary constructor
-         * </pre>
-         */
-        public org.jetbrains.kotlin.serialization.ProtoBuf.Callable getData() {
-          return data_;
-        }
-        /**
-         * <code>optional .org.jetbrains.kotlin.serialization.Callable data = 1;</code>
-         *
-         * <pre>
-         * If this field is present, it contains serialized data for the primary constructor.
-         * Otherwise it's default and can be created manually upon deserialization
-         * Note: currently only objects have default primary constructor
-         * </pre>
-         */
-        public Builder setData(org.jetbrains.kotlin.serialization.ProtoBuf.Callable value) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          data_ = value;
-
-          bitField0_ |= 0x00000001;
-          return this;
-        }
-        /**
-         * <code>optional .org.jetbrains.kotlin.serialization.Callable data = 1;</code>
-         *
-         * <pre>
-         * If this field is present, it contains serialized data for the primary constructor.
-         * Otherwise it's default and can be created manually upon deserialization
-         * Note: currently only objects have default primary constructor
-         * </pre>
-         */
-        public Builder setData(
-            org.jetbrains.kotlin.serialization.ProtoBuf.Callable.Builder builderForValue) {
-          data_ = builderForValue.build();
-
-          bitField0_ |= 0x00000001;
-          return this;
-        }
-        /**
-         * <code>optional .org.jetbrains.kotlin.serialization.Callable data = 1;</code>
-         *
-         * <pre>
-         * If this field is present, it contains serialized data for the primary constructor.
-         * Otherwise it's default and can be created manually upon deserialization
-         * Note: currently only objects have default primary constructor
-         * </pre>
-         */
-        public Builder mergeData(org.jetbrains.kotlin.serialization.ProtoBuf.Callable value) {
-          if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              data_ != org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance()) {
-            data_ =
-              org.jetbrains.kotlin.serialization.ProtoBuf.Callable.newBuilder(data_).mergeFrom(value).buildPartial();
-          } else {
-            data_ = value;
-          }
-
-          bitField0_ |= 0x00000001;
-          return this;
-        }
-        /**
-         * <code>optional .org.jetbrains.kotlin.serialization.Callable data = 1;</code>
-         *
-         * <pre>
-         * If this field is present, it contains serialized data for the primary constructor.
-         * Otherwise it's default and can be created manually upon deserialization
-         * Note: currently only objects have default primary constructor
-         * </pre>
-         */
-        public Builder clearData() {
-          data_ = org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance();
-
-          bitField0_ = (bitField0_ & ~0x00000001);
-          return this;
-        }
-
-        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Class.PrimaryConstructor)
-      }
-
-      static {
-        defaultInstance = new PrimaryConstructor(true);
-        defaultInstance.initFields();
-      }
-
-      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Class.PrimaryConstructor)
-    }
-
     private int bitField0_;
     // optional int32 flags = 1 [default = 0];
     public static final int FLAGS_FIELD_NUMBER = 1;
@@ -8053,42 +7447,6 @@ public final class ProtoBuf {
       return property_.get(index);
     }
 
-    // repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
-    public static final int MEMBER_FIELD_NUMBER = 11;
-    private java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Callable> member_;
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-     */
-    public java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Callable> getMemberList() {
-      return member_;
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-     */
-    public java.util.List<? extends org.jetbrains.kotlin.serialization.ProtoBuf.CallableOrBuilder> 
-        getMemberOrBuilderList() {
-      return member_;
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-     */
-    public int getMemberCount() {
-      return member_.size();
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-     */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Callable getMember(int index) {
-      return member_.get(index);
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-     */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.CallableOrBuilder getMemberOrBuilder(
-        int index) {
-      return member_.get(index);
-    }
-
     // repeated int32 enum_entry = 12 [packed = true];
     public static final int ENUM_ENTRY_FIELD_NUMBER = 12;
     private java.util.List<java.lang.Integer> enumEntry_;
@@ -8113,66 +7471,6 @@ public final class ProtoBuf {
     }
     private int enumEntryMemoizedSerializedSize = -1;
 
-    // optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
-    public static final int PRIMARY_CONSTRUCTOR_FIELD_NUMBER = 13;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor primaryConstructor_;
-    /**
-     * <code>optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
-     *
-     * <pre>
-     * This field is present if and only if the class has a primary constructor
-     * </pre>
-     */
-    public boolean hasPrimaryConstructor() {
-      return ((bitField0_ & 0x00000008) == 0x00000008);
-    }
-    /**
-     * <code>optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
-     *
-     * <pre>
-     * This field is present if and only if the class has a primary constructor
-     * </pre>
-     */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor getPrimaryConstructor() {
-      return primaryConstructor_;
-    }
-
-    // repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;
-    public static final int SECONDARY_CONSTRUCTOR_FIELD_NUMBER = 14;
-    private java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Callable> secondaryConstructor_;
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-     */
-    public java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Callable> getSecondaryConstructorList() {
-      return secondaryConstructor_;
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-     */
-    public java.util.List<? extends org.jetbrains.kotlin.serialization.ProtoBuf.CallableOrBuilder> 
-        getSecondaryConstructorOrBuilderList() {
-      return secondaryConstructor_;
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-     */
-    public int getSecondaryConstructorCount() {
-      return secondaryConstructor_.size();
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-     */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Callable getSecondaryConstructor(int index) {
-      return secondaryConstructor_.get(index);
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-     */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.CallableOrBuilder getSecondaryConstructorOrBuilder(
-        int index) {
-      return secondaryConstructor_.get(index);
-    }
-
     private void initFields() {
       flags_ = 0;
       fqName_ = 0;
@@ -8183,10 +7481,7 @@ public final class ProtoBuf {
       constructor_ = java.util.Collections.emptyList();
       function_ = java.util.Collections.emptyList();
       property_ = java.util.Collections.emptyList();
-      member_ = java.util.Collections.emptyList();
       enumEntry_ = java.util.Collections.emptyList();
-      primaryConstructor_ = org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
-      secondaryConstructor_ = java.util.Collections.emptyList();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -8227,24 +7522,6 @@ public final class ProtoBuf {
           return false;
         }
       }
-      for (int i = 0; i < getMemberCount(); i++) {
-        if (!getMember(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      if (hasPrimaryConstructor()) {
-        if (!getPrimaryConstructor().isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      for (int i = 0; i < getSecondaryConstructorCount(); i++) {
-        if (!getSecondaryConstructor(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
       if (!extensionsAreInitialized()) {
         memoizedIsInitialized = 0;
         return false;
@@ -8290,9 +7567,6 @@ public final class ProtoBuf {
       for (int i = 0; i < property_.size(); i++) {
         output.writeMessage(10, property_.get(i));
       }
-      for (int i = 0; i < member_.size(); i++) {
-        output.writeMessage(11, member_.get(i));
-      }
       if (getEnumEntryList().size() > 0) {
         output.writeRawVarint32(98);
         output.writeRawVarint32(enumEntryMemoizedSerializedSize);
@@ -8300,12 +7574,6 @@ public final class ProtoBuf {
       for (int i = 0; i < enumEntry_.size(); i++) {
         output.writeInt32NoTag(enumEntry_.get(i));
       }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        output.writeMessage(13, primaryConstructor_);
-      }
-      for (int i = 0; i < secondaryConstructor_.size(); i++) {
-        output.writeMessage(14, secondaryConstructor_.get(i));
-      }
       extensionWriter.writeUntil(200, output);
     }
 
@@ -8361,10 +7629,6 @@ public final class ProtoBuf {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(10, property_.get(i));
       }
-      for (int i = 0; i < member_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, member_.get(i));
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < enumEntry_.size(); i++) {
@@ -8379,14 +7643,6 @@ public final class ProtoBuf {
         }
         enumEntryMemoizedSerializedSize = dataSize;
       }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(13, primaryConstructor_);
-      }
-      for (int i = 0; i < secondaryConstructor_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, secondaryConstructor_.get(i));
-      }
       size += extensionsSerializedSize();
       memoizedSerializedSize = size;
       return size;
@@ -8496,14 +7752,8 @@ public final class ProtoBuf {
         bitField0_ = (bitField0_ & ~0x00000080);
         property_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000100);
-        member_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000200);
         enumEntry_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000400);
-        primaryConstructor_ = org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
-        bitField0_ = (bitField0_ & ~0x00000800);
-        secondaryConstructor_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00001000);
+        bitField0_ = (bitField0_ & ~0x00000200);
         return this;
       }
 
@@ -8570,24 +7820,10 @@ public final class ProtoBuf {
         }
         result.property_ = property_;
         if (((bitField0_ & 0x00000200) == 0x00000200)) {
-          member_ = java.util.Collections.unmodifiableList(member_);
+          enumEntry_ = java.util.Collections.unmodifiableList(enumEntry_);
           bitField0_ = (bitField0_ & ~0x00000200);
         }
-        result.member_ = member_;
-        if (((bitField0_ & 0x00000400) == 0x00000400)) {
-          enumEntry_ = java.util.Collections.unmodifiableList(enumEntry_);
-          bitField0_ = (bitField0_ & ~0x00000400);
-        }
         result.enumEntry_ = enumEntry_;
-        if (((from_bitField0_ & 0x00000800) == 0x00000800)) {
-          to_bitField0_ |= 0x00000008;
-        }
-        result.primaryConstructor_ = primaryConstructor_;
-        if (((bitField0_ & 0x00001000) == 0x00001000)) {
-          secondaryConstructor_ = java.util.Collections.unmodifiableList(secondaryConstructor_);
-          bitField0_ = (bitField0_ & ~0x00001000);
-        }
-        result.secondaryConstructor_ = secondaryConstructor_;
         result.bitField0_ = to_bitField0_;
         return result;
       }
@@ -8662,39 +7898,16 @@ public final class ProtoBuf {
             property_.addAll(other.property_);
           }
           
-        }
-        if (!other.member_.isEmpty()) {
-          if (member_.isEmpty()) {
-            member_ = other.member_;
-            bitField0_ = (bitField0_ & ~0x00000200);
-          } else {
-            ensureMemberIsMutable();
-            member_.addAll(other.member_);
-          }
-          
         }
         if (!other.enumEntry_.isEmpty()) {
           if (enumEntry_.isEmpty()) {
             enumEntry_ = other.enumEntry_;
-            bitField0_ = (bitField0_ & ~0x00000400);
+            bitField0_ = (bitField0_ & ~0x00000200);
           } else {
             ensureEnumEntryIsMutable();
             enumEntry_.addAll(other.enumEntry_);
           }
           
-        }
-        if (other.hasPrimaryConstructor()) {
-          mergePrimaryConstructor(other.getPrimaryConstructor());
-        }
-        if (!other.secondaryConstructor_.isEmpty()) {
-          if (secondaryConstructor_.isEmpty()) {
-            secondaryConstructor_ = other.secondaryConstructor_;
-            bitField0_ = (bitField0_ & ~0x00001000);
-          } else {
-            ensureSecondaryConstructorIsMutable();
-            secondaryConstructor_.addAll(other.secondaryConstructor_);
-          }
-          
         }
         this.mergeExtensionFields(other);
         return this;
@@ -8735,24 +7948,6 @@ public final class ProtoBuf {
             return false;
           }
         }
-        for (int i = 0; i < getMemberCount(); i++) {
-          if (!getMember(i).isInitialized()) {
-            
-            return false;
-          }
-        }
-        if (hasPrimaryConstructor()) {
-          if (!getPrimaryConstructor().isInitialized()) {
-            
-            return false;
-          }
-        }
-        for (int i = 0; i < getSecondaryConstructorCount(); i++) {
-          if (!getSecondaryConstructor(i).isInitialized()) {
-            
-            return false;
-          }
-        }
         if (!extensionsAreInitialized()) {
           
           return false;
@@ -9605,137 +8800,12 @@ public final class ProtoBuf {
         return this;
       }
 
-      // repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
-      private java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Callable> member_ =
-        java.util.Collections.emptyList();
-      private void ensureMemberIsMutable() {
-        if (!((bitField0_ & 0x00000200) == 0x00000200)) {
-          member_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.ProtoBuf.Callable>(member_);
-          bitField0_ |= 0x00000200;
-         }
-      }
-
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Callable> getMemberList() {
-        return java.util.Collections.unmodifiableList(member_);
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public int getMemberCount() {
-        return member_.size();
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Callable getMember(int index) {
-        return member_.get(index);
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public Builder setMember(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureMemberIsMutable();
-        member_.set(index, value);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public Builder setMember(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable.Builder builderForValue) {
-        ensureMemberIsMutable();
-        member_.set(index, builderForValue.build());
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public Builder addMember(org.jetbrains.kotlin.serialization.ProtoBuf.Callable value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureMemberIsMutable();
-        member_.add(value);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public Builder addMember(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureMemberIsMutable();
-        member_.add(index, value);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public Builder addMember(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Callable.Builder builderForValue) {
-        ensureMemberIsMutable();
-        member_.add(builderForValue.build());
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public Builder addMember(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable.Builder builderForValue) {
-        ensureMemberIsMutable();
-        member_.add(index, builderForValue.build());
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public Builder addAllMember(
-          java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.ProtoBuf.Callable> values) {
-        ensureMemberIsMutable();
-        super.addAll(values, member_);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public Builder clearMember() {
-        member_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000200);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 11;</code>
-       */
-      public Builder removeMember(int index) {
-        ensureMemberIsMutable();
-        member_.remove(index);
-
-        return this;
-      }
-
       // repeated int32 enum_entry = 12 [packed = true];
       private java.util.List<java.lang.Integer> enumEntry_ = java.util.Collections.emptyList();
       private void ensureEnumEntryIsMutable() {
-        if (!((bitField0_ & 0x00000400) == 0x00000400)) {
+        if (!((bitField0_ & 0x00000200) == 0x00000200)) {
           enumEntry_ = new java.util.ArrayList<java.lang.Integer>(enumEntry_);
-          bitField0_ |= 0x00000400;
+          bitField0_ |= 0x00000200;
          }
       }
       /**
@@ -9791,221 +8861,11 @@ public final class ProtoBuf {
        */
       public Builder clearEnumEntry() {
         enumEntry_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000400);
+        bitField0_ = (bitField0_ & ~0x00000200);
         
         return this;
       }
 
-      // optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
-      private org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor primaryConstructor_ = org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
-       *
-       * <pre>
-       * This field is present if and only if the class has a primary constructor
-       * </pre>
-       */
-      public boolean hasPrimaryConstructor() {
-        return ((bitField0_ & 0x00000800) == 0x00000800);
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
-       *
-       * <pre>
-       * This field is present if and only if the class has a primary constructor
-       * </pre>
-       */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor getPrimaryConstructor() {
-        return primaryConstructor_;
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
-       *
-       * <pre>
-       * This field is present if and only if the class has a primary constructor
-       * </pre>
-       */
-      public Builder setPrimaryConstructor(org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        primaryConstructor_ = value;
-
-        bitField0_ |= 0x00000800;
-        return this;
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
-       *
-       * <pre>
-       * This field is present if and only if the class has a primary constructor
-       * </pre>
-       */
-      public Builder setPrimaryConstructor(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.Builder builderForValue) {
-        primaryConstructor_ = builderForValue.build();
-
-        bitField0_ |= 0x00000800;
-        return this;
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
-       *
-       * <pre>
-       * This field is present if and only if the class has a primary constructor
-       * </pre>
-       */
-      public Builder mergePrimaryConstructor(org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor value) {
-        if (((bitField0_ & 0x00000800) == 0x00000800) &&
-            primaryConstructor_ != org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance()) {
-          primaryConstructor_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.newBuilder(primaryConstructor_).mergeFrom(value).buildPartial();
-        } else {
-          primaryConstructor_ = value;
-        }
-
-        bitField0_ |= 0x00000800;
-        return this;
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;</code>
-       *
-       * <pre>
-       * This field is present if and only if the class has a primary constructor
-       * </pre>
-       */
-      public Builder clearPrimaryConstructor() {
-        primaryConstructor_ = org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
-
-        bitField0_ = (bitField0_ & ~0x00000800);
-        return this;
-      }
-
-      // repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;
-      private java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Callable> secondaryConstructor_ =
-        java.util.Collections.emptyList();
-      private void ensureSecondaryConstructorIsMutable() {
-        if (!((bitField0_ & 0x00001000) == 0x00001000)) {
-          secondaryConstructor_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.ProtoBuf.Callable>(secondaryConstructor_);
-          bitField0_ |= 0x00001000;
-         }
-      }
-
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Callable> getSecondaryConstructorList() {
-        return java.util.Collections.unmodifiableList(secondaryConstructor_);
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public int getSecondaryConstructorCount() {
-        return secondaryConstructor_.size();
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Callable getSecondaryConstructor(int index) {
-        return secondaryConstructor_.get(index);
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public Builder setSecondaryConstructor(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureSecondaryConstructorIsMutable();
-        secondaryConstructor_.set(index, value);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public Builder setSecondaryConstructor(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable.Builder builderForValue) {
-        ensureSecondaryConstructorIsMutable();
-        secondaryConstructor_.set(index, builderForValue.build());
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public Builder addSecondaryConstructor(org.jetbrains.kotlin.serialization.ProtoBuf.Callable value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureSecondaryConstructorIsMutable();
-        secondaryConstructor_.add(value);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public Builder addSecondaryConstructor(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureSecondaryConstructorIsMutable();
-        secondaryConstructor_.add(index, value);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public Builder addSecondaryConstructor(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Callable.Builder builderForValue) {
-        ensureSecondaryConstructorIsMutable();
-        secondaryConstructor_.add(builderForValue.build());
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public Builder addSecondaryConstructor(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable.Builder builderForValue) {
-        ensureSecondaryConstructorIsMutable();
-        secondaryConstructor_.add(index, builderForValue.build());
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public Builder addAllSecondaryConstructor(
-          java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.ProtoBuf.Callable> values) {
-        ensureSecondaryConstructorIsMutable();
-        super.addAll(values, secondaryConstructor_);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public Builder clearSecondaryConstructor() {
-        secondaryConstructor_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00001000);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14;</code>
-       */
-      public Builder removeSecondaryConstructor(int index) {
-        ensureSecondaryConstructorIsMutable();
-        secondaryConstructor_.remove(index);
-
-        return this;
-      }
-
       // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Class)
     }
 
@@ -10021,36 +8881,6 @@ public final class ProtoBuf {
        com.google.protobuf.GeneratedMessageLite.
             ExtendableMessageOrBuilder<Package> {
 
-    // repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-     */
-    java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Callable> 
-        getMemberList();
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-     */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Callable getMember(int index);
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-     */
-    int getMemberCount();
-
-    // repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-     */
-    java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Constructor> 
-        getConstructorList();
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-     */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Constructor getConstructor(int index);
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-     */
-    int getConstructorCount();
-
     // repeated .org.jetbrains.kotlin.serialization.Function function = 3;
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.Function function = 3;</code>
@@ -10124,34 +8954,18 @@ public final class ProtoBuf {
               }
               break;
             }
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                member_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.ProtoBuf.Callable>();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              member_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Callable.PARSER, extensionRegistry));
-              break;
-            }
-            case 18: {
-              if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-                constructor_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.ProtoBuf.Constructor>();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              constructor_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Constructor.PARSER, extensionRegistry));
-              break;
-            }
             case 26: {
-              if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
                 function_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.ProtoBuf.Function>();
-                mutable_bitField0_ |= 0x00000004;
+                mutable_bitField0_ |= 0x00000001;
               }
               function_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Function.PARSER, extensionRegistry));
               break;
             }
             case 34: {
-              if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+              if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
                 property_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.ProtoBuf.Property>();
-                mutable_bitField0_ |= 0x00000008;
+                mutable_bitField0_ |= 0x00000002;
               }
               property_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Property.PARSER, extensionRegistry));
               break;
@@ -10165,15 +8979,9 @@ public final class ProtoBuf {
             e.getMessage()).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-          member_ = java.util.Collections.unmodifiableList(member_);
-        }
-        if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-          constructor_ = java.util.Collections.unmodifiableList(constructor_);
-        }
-        if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
           function_ = java.util.Collections.unmodifiableList(function_);
         }
-        if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+        if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
           property_ = java.util.Collections.unmodifiableList(property_);
         }
         makeExtensionsImmutable();
@@ -10194,78 +9002,6 @@ public final class ProtoBuf {
       return PARSER;
     }
 
-    // repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
-    public static final int MEMBER_FIELD_NUMBER = 1;
-    private java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Callable> member_;
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-     */
-    public java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Callable> getMemberList() {
-      return member_;
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-     */
-    public java.util.List<? extends org.jetbrains.kotlin.serialization.ProtoBuf.CallableOrBuilder> 
-        getMemberOrBuilderList() {
-      return member_;
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-     */
-    public int getMemberCount() {
-      return member_.size();
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-     */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Callable getMember(int index) {
-      return member_.get(index);
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-     */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.CallableOrBuilder getMemberOrBuilder(
-        int index) {
-      return member_.get(index);
-    }
-
-    // repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;
-    public static final int CONSTRUCTOR_FIELD_NUMBER = 2;
-    private java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Constructor> constructor_;
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-     */
-    public java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Constructor> getConstructorList() {
-      return constructor_;
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-     */
-    public java.util.List<? extends org.jetbrains.kotlin.serialization.ProtoBuf.ConstructorOrBuilder> 
-        getConstructorOrBuilderList() {
-      return constructor_;
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-     */
-    public int getConstructorCount() {
-      return constructor_.size();
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-     */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Constructor getConstructor(int index) {
-      return constructor_.get(index);
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-     */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.ConstructorOrBuilder getConstructorOrBuilder(
-        int index) {
-      return constructor_.get(index);
-    }
-
     // repeated .org.jetbrains.kotlin.serialization.Function function = 3;
     public static final int FUNCTION_FIELD_NUMBER = 3;
     private java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Function> function_;
@@ -10339,8 +9075,6 @@ public final class ProtoBuf {
     }
 
     private void initFields() {
-      member_ = java.util.Collections.emptyList();
-      constructor_ = java.util.Collections.emptyList();
       function_ = java.util.Collections.emptyList();
       property_ = java.util.Collections.emptyList();
     }
@@ -10349,18 +9083,6 @@ public final class ProtoBuf {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
 
-      for (int i = 0; i < getMemberCount(); i++) {
-        if (!getMember(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      for (int i = 0; i < getConstructorCount(); i++) {
-        if (!getConstructor(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
       for (int i = 0; i < getFunctionCount(); i++) {
         if (!getFunction(i).isInitialized()) {
           memoizedIsInitialized = 0;
@@ -10387,12 +9109,6 @@ public final class ProtoBuf {
       com.google.protobuf.GeneratedMessageLite
         .ExtendableMessage<org.jetbrains.kotlin.serialization.ProtoBuf.Package>.ExtensionWriter extensionWriter =
           newExtensionWriter();
-      for (int i = 0; i < member_.size(); i++) {
-        output.writeMessage(1, member_.get(i));
-      }
-      for (int i = 0; i < constructor_.size(); i++) {
-        output.writeMessage(2, constructor_.get(i));
-      }
       for (int i = 0; i < function_.size(); i++) {
         output.writeMessage(3, function_.get(i));
       }
@@ -10408,14 +9124,6 @@ public final class ProtoBuf {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < member_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, member_.get(i));
-      }
-      for (int i = 0; i < constructor_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, constructor_.get(i));
-      }
       for (int i = 0; i < function_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(3, function_.get(i));
@@ -10515,14 +9223,10 @@ public final class ProtoBuf {
 
       public Builder clear() {
         super.clear();
-        member_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        constructor_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
         function_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000001);
         property_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -10546,23 +9250,13 @@ public final class ProtoBuf {
         org.jetbrains.kotlin.serialization.ProtoBuf.Package result = new org.jetbrains.kotlin.serialization.ProtoBuf.Package(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
-          member_ = java.util.Collections.unmodifiableList(member_);
+          function_ = java.util.Collections.unmodifiableList(function_);
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.member_ = member_;
-        if (((bitField0_ & 0x00000002) == 0x00000002)) {
-          constructor_ = java.util.Collections.unmodifiableList(constructor_);
-          bitField0_ = (bitField0_ & ~0x00000002);
-        }
-        result.constructor_ = constructor_;
-        if (((bitField0_ & 0x00000004) == 0x00000004)) {
-          function_ = java.util.Collections.unmodifiableList(function_);
-          bitField0_ = (bitField0_ & ~0x00000004);
-        }
         result.function_ = function_;
-        if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        if (((bitField0_ & 0x00000002) == 0x00000002)) {
           property_ = java.util.Collections.unmodifiableList(property_);
-          bitField0_ = (bitField0_ & ~0x00000008);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.property_ = property_;
         return result;
@@ -10570,30 +9264,10 @@ public final class ProtoBuf {
 
       public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Package other) {
         if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance()) return this;
-        if (!other.member_.isEmpty()) {
-          if (member_.isEmpty()) {
-            member_ = other.member_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureMemberIsMutable();
-            member_.addAll(other.member_);
-          }
-          
-        }
-        if (!other.constructor_.isEmpty()) {
-          if (constructor_.isEmpty()) {
-            constructor_ = other.constructor_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureConstructorIsMutable();
-            constructor_.addAll(other.constructor_);
-          }
-          
-        }
         if (!other.function_.isEmpty()) {
           if (function_.isEmpty()) {
             function_ = other.function_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureFunctionIsMutable();
             function_.addAll(other.function_);
@@ -10603,7 +9277,7 @@ public final class ProtoBuf {
         if (!other.property_.isEmpty()) {
           if (property_.isEmpty()) {
             property_ = other.property_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensurePropertyIsMutable();
             property_.addAll(other.property_);
@@ -10615,18 +9289,6 @@ public final class ProtoBuf {
       }
 
       public final boolean isInitialized() {
-        for (int i = 0; i < getMemberCount(); i++) {
-          if (!getMember(i).isInitialized()) {
-            
-            return false;
-          }
-        }
-        for (int i = 0; i < getConstructorCount(); i++) {
-          if (!getConstructor(i).isInitialized()) {
-            
-            return false;
-          }
-        }
         for (int i = 0; i < getFunctionCount(); i++) {
           if (!getFunction(i).isInitialized()) {
             
@@ -10665,263 +9327,13 @@ public final class ProtoBuf {
       }
       private int bitField0_;
 
-      // repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
-      private java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Callable> member_ =
-        java.util.Collections.emptyList();
-      private void ensureMemberIsMutable() {
-        if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          member_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.ProtoBuf.Callable>(member_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Callable> getMemberList() {
-        return java.util.Collections.unmodifiableList(member_);
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public int getMemberCount() {
-        return member_.size();
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Callable getMember(int index) {
-        return member_.get(index);
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public Builder setMember(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureMemberIsMutable();
-        member_.set(index, value);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public Builder setMember(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable.Builder builderForValue) {
-        ensureMemberIsMutable();
-        member_.set(index, builderForValue.build());
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public Builder addMember(org.jetbrains.kotlin.serialization.ProtoBuf.Callable value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureMemberIsMutable();
-        member_.add(value);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public Builder addMember(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureMemberIsMutable();
-        member_.add(index, value);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public Builder addMember(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Callable.Builder builderForValue) {
-        ensureMemberIsMutable();
-        member_.add(builderForValue.build());
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public Builder addMember(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable.Builder builderForValue) {
-        ensureMemberIsMutable();
-        member_.add(index, builderForValue.build());
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public Builder addAllMember(
-          java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.ProtoBuf.Callable> values) {
-        ensureMemberIsMutable();
-        super.addAll(values, member_);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public Builder clearMember() {
-        member_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Callable member = 1;</code>
-       */
-      public Builder removeMember(int index) {
-        ensureMemberIsMutable();
-        member_.remove(index);
-
-        return this;
-      }
-
-      // repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;
-      private java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Constructor> constructor_ =
-        java.util.Collections.emptyList();
-      private void ensureConstructorIsMutable() {
-        if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          constructor_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.ProtoBuf.Constructor>(constructor_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Constructor> getConstructorList() {
-        return java.util.Collections.unmodifiableList(constructor_);
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public int getConstructorCount() {
-        return constructor_.size();
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Constructor getConstructor(int index) {
-        return constructor_.get(index);
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public Builder setConstructor(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Constructor value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureConstructorIsMutable();
-        constructor_.set(index, value);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public Builder setConstructor(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Constructor.Builder builderForValue) {
-        ensureConstructorIsMutable();
-        constructor_.set(index, builderForValue.build());
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public Builder addConstructor(org.jetbrains.kotlin.serialization.ProtoBuf.Constructor value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureConstructorIsMutable();
-        constructor_.add(value);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public Builder addConstructor(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Constructor value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureConstructorIsMutable();
-        constructor_.add(index, value);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public Builder addConstructor(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Constructor.Builder builderForValue) {
-        ensureConstructorIsMutable();
-        constructor_.add(builderForValue.build());
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public Builder addConstructor(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Constructor.Builder builderForValue) {
-        ensureConstructorIsMutable();
-        constructor_.add(index, builderForValue.build());
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public Builder addAllConstructor(
-          java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.ProtoBuf.Constructor> values) {
-        ensureConstructorIsMutable();
-        super.addAll(values, constructor_);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public Builder clearConstructor() {
-        constructor_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 2;</code>
-       */
-      public Builder removeConstructor(int index) {
-        ensureConstructorIsMutable();
-        constructor_.remove(index);
-
-        return this;
-      }
-
       // repeated .org.jetbrains.kotlin.serialization.Function function = 3;
       private java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Function> function_ =
         java.util.Collections.emptyList();
       private void ensureFunctionIsMutable() {
-        if (!((bitField0_ & 0x00000004) == 0x00000004)) {
+        if (!((bitField0_ & 0x00000001) == 0x00000001)) {
           function_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.ProtoBuf.Function>(function_);
-          bitField0_ |= 0x00000004;
+          bitField0_ |= 0x00000001;
          }
       }
 
@@ -11026,7 +9438,7 @@ public final class ProtoBuf {
        */
       public Builder clearFunction() {
         function_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000001);
 
         return this;
       }
@@ -11044,9 +9456,9 @@ public final class ProtoBuf {
       private java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Property> property_ =
         java.util.Collections.emptyList();
       private void ensurePropertyIsMutable() {
-        if (!((bitField0_ & 0x00000008) == 0x00000008)) {
+        if (!((bitField0_ & 0x00000002) == 0x00000002)) {
           property_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.ProtoBuf.Property>(property_);
-          bitField0_ |= 0x00000008;
+          bitField0_ |= 0x00000002;
          }
       }
 
@@ -11151,7 +9563,7 @@ public final class ProtoBuf {
        */
       public Builder clearProperty() {
         property_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000002);
 
         return this;
       }
@@ -14418,1586 +12830,6 @@ public final class ProtoBuf {
     // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Property)
   }
 
-  public interface CallableOrBuilder extends 
-       com.google.protobuf.GeneratedMessageLite.
-            ExtendableMessageOrBuilder<Callable> {
-
-    // optional int32 flags = 1;
-    /**
-     * <code>optional int32 flags = 1;</code>
-     *
-     * <pre>
-     *
-     *Visibility
-     *Modality
-     *hasAnnotations
-     *CallableKind
-     *MemberKind
-     *hasGetter
-     *hasSetter
-     *hasConstant
-     *isConst
-     *lateinit
-     *isOperator
-     *isInfix
-     * </pre>
-     */
-    boolean hasFlags();
-    /**
-     * <code>optional int32 flags = 1;</code>
-     *
-     * <pre>
-     *
-     *Visibility
-     *Modality
-     *hasAnnotations
-     *CallableKind
-     *MemberKind
-     *hasGetter
-     *hasSetter
-     *hasConstant
-     *isConst
-     *lateinit
-     *isOperator
-     *isInfix
-     * </pre>
-     */
-    int getFlags();
-
-    // optional int32 getter_flags = 9;
-    /**
-     * <code>optional int32 getter_flags = 9;</code>
-     *
-     * <pre>
-     *
-     *isNotDefault
-     *Visibility
-     *Modality
-     *hasAnnotations
-     * </pre>
-     */
-    boolean hasGetterFlags();
-    /**
-     * <code>optional int32 getter_flags = 9;</code>
-     *
-     * <pre>
-     *
-     *isNotDefault
-     *Visibility
-     *Modality
-     *hasAnnotations
-     * </pre>
-     */
-    int getGetterFlags();
-
-    // optional int32 setter_flags = 10;
-    /**
-     * <code>optional int32 setter_flags = 10;</code>
-     */
-    boolean hasSetterFlags();
-    /**
-     * <code>optional int32 setter_flags = 10;</code>
-     */
-    int getSetterFlags();
-
-    // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-     */
-    java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter> 
-        getTypeParameterList();
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-     */
-    org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter getTypeParameter(int index);
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-     */
-    int getTypeParameterCount();
-
-    // optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
-    /**
-     * <code>optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;</code>
-     */
-    boolean hasReceiverType();
-    /**
-     * <code>optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;</code>
-     */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Type getReceiverType();
-
-    // required int32 name = 6;
-    /**
-     * <code>required int32 name = 6;</code>
-     */
-    boolean hasName();
-    /**
-     * <code>required int32 name = 6;</code>
-     */
-    int getName();
-
-    // repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-     *
-     * <pre>
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     * </pre>
-     */
-    java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter> 
-        getValueParameterList();
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-     *
-     * <pre>
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     * </pre>
-     */
-    org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter getValueParameter(int index);
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-     *
-     * <pre>
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     * </pre>
-     */
-    int getValueParameterCount();
-
-    // required .org.jetbrains.kotlin.serialization.Type return_type = 8;
-    /**
-     * <code>required .org.jetbrains.kotlin.serialization.Type return_type = 8;</code>
-     */
-    boolean hasReturnType();
-    /**
-     * <code>required .org.jetbrains.kotlin.serialization.Type return_type = 8;</code>
-     */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Type getReturnType();
-  }
-  /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.Callable}
-   */
-  public static final class Callable extends
-      com.google.protobuf.GeneratedMessageLite.ExtendableMessage<
-        Callable> implements CallableOrBuilder {
-    // Use Callable.newBuilder() to construct.
-    private Callable(com.google.protobuf.GeneratedMessageLite.ExtendableBuilder<org.jetbrains.kotlin.serialization.ProtoBuf.Callable, ?> builder) {
-      super(builder);
-
-    }
-    private Callable(boolean noInit) {}
-
-    private static final Callable defaultInstance;
-    public static Callable getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public Callable getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-
-    private Callable(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
-      int mutable_bitField0_ = 0;
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownField(input,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 8: {
-              bitField0_ |= 0x00000001;
-              flags_ = input.readInt32();
-              break;
-            }
-            case 34: {
-              if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-                typeParameter_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter>();
-                mutable_bitField0_ |= 0x00000008;
-              }
-              typeParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.PARSER, extensionRegistry));
-              break;
-            }
-            case 42: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000008) == 0x00000008)) {
-                subBuilder = receiverType_.toBuilder();
-              }
-              receiverType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(receiverType_);
-                receiverType_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000008;
-              break;
-            }
-            case 48: {
-              bitField0_ |= 0x00000010;
-              name_ = input.readInt32();
-              break;
-            }
-            case 58: {
-              if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
-                valueParameter_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter>();
-                mutable_bitField0_ |= 0x00000040;
-              }
-              valueParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.PARSER, extensionRegistry));
-              break;
-            }
-            case 66: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000020) == 0x00000020)) {
-                subBuilder = returnType_.toBuilder();
-              }
-              returnType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(returnType_);
-                returnType_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000020;
-              break;
-            }
-            case 72: {
-              bitField0_ |= 0x00000002;
-              getterFlags_ = input.readInt32();
-              break;
-            }
-            case 80: {
-              bitField0_ |= 0x00000004;
-              setterFlags_ = input.readInt32();
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-          typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_);
-        }
-        if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
-          valueParameter_ = java.util.Collections.unmodifiableList(valueParameter_);
-        }
-        makeExtensionsImmutable();
-      }
-    }
-    public static com.google.protobuf.Parser<Callable> PARSER =
-        new com.google.protobuf.AbstractParser<Callable>() {
-      public Callable parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Callable(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Callable> getParserForType() {
-      return PARSER;
-    }
-
-    private int bitField0_;
-    // optional int32 flags = 1;
-    public static final int FLAGS_FIELD_NUMBER = 1;
-    private int flags_;
-    /**
-     * <code>optional int32 flags = 1;</code>
-     *
-     * <pre>
-     *
-     *Visibility
-     *Modality
-     *hasAnnotations
-     *CallableKind
-     *MemberKind
-     *hasGetter
-     *hasSetter
-     *hasConstant
-     *isConst
-     *lateinit
-     *isOperator
-     *isInfix
-     * </pre>
-     */
-    public boolean hasFlags() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    /**
-     * <code>optional int32 flags = 1;</code>
-     *
-     * <pre>
-     *
-     *Visibility
-     *Modality
-     *hasAnnotations
-     *CallableKind
-     *MemberKind
-     *hasGetter
-     *hasSetter
-     *hasConstant
-     *isConst
-     *lateinit
-     *isOperator
-     *isInfix
-     * </pre>
-     */
-    public int getFlags() {
-      return flags_;
-    }
-
-    // optional int32 getter_flags = 9;
-    public static final int GETTER_FLAGS_FIELD_NUMBER = 9;
-    private int getterFlags_;
-    /**
-     * <code>optional int32 getter_flags = 9;</code>
-     *
-     * <pre>
-     *
-     *isNotDefault
-     *Visibility
-     *Modality
-     *hasAnnotations
-     * </pre>
-     */
-    public boolean hasGetterFlags() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
-    }
-    /**
-     * <code>optional int32 getter_flags = 9;</code>
-     *
-     * <pre>
-     *
-     *isNotDefault
-     *Visibility
-     *Modality
-     *hasAnnotations
-     * </pre>
-     */
-    public int getGetterFlags() {
-      return getterFlags_;
-    }
-
-    // optional int32 setter_flags = 10;
-    public static final int SETTER_FLAGS_FIELD_NUMBER = 10;
-    private int setterFlags_;
-    /**
-     * <code>optional int32 setter_flags = 10;</code>
-     */
-    public boolean hasSetterFlags() {
-      return ((bitField0_ & 0x00000004) == 0x00000004);
-    }
-    /**
-     * <code>optional int32 setter_flags = 10;</code>
-     */
-    public int getSetterFlags() {
-      return setterFlags_;
-    }
-
-    // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
-    public static final int TYPE_PARAMETER_FIELD_NUMBER = 4;
-    private java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter> typeParameter_;
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-     */
-    public java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter> getTypeParameterList() {
-      return typeParameter_;
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-     */
-    public java.util.List<? extends org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameterOrBuilder> 
-        getTypeParameterOrBuilderList() {
-      return typeParameter_;
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-     */
-    public int getTypeParameterCount() {
-      return typeParameter_.size();
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-     */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter getTypeParameter(int index) {
-      return typeParameter_.get(index);
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-     */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
-        int index) {
-      return typeParameter_.get(index);
-    }
-
-    // optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
-    public static final int RECEIVER_TYPE_FIELD_NUMBER = 5;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.Type receiverType_;
-    /**
-     * <code>optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;</code>
-     */
-    public boolean hasReceiverType() {
-      return ((bitField0_ & 0x00000008) == 0x00000008);
-    }
-    /**
-     * <code>optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;</code>
-     */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Type getReceiverType() {
-      return receiverType_;
-    }
-
-    // required int32 name = 6;
-    public static final int NAME_FIELD_NUMBER = 6;
-    private int name_;
-    /**
-     * <code>required int32 name = 6;</code>
-     */
-    public boolean hasName() {
-      return ((bitField0_ & 0x00000010) == 0x00000010);
-    }
-    /**
-     * <code>required int32 name = 6;</code>
-     */
-    public int getName() {
-      return name_;
-    }
-
-    // repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
-    public static final int VALUE_PARAMETER_FIELD_NUMBER = 7;
-    private java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter> valueParameter_;
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-     *
-     * <pre>
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     * </pre>
-     */
-    public java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter> getValueParameterList() {
-      return valueParameter_;
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-     *
-     * <pre>
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     * </pre>
-     */
-    public java.util.List<? extends org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameterOrBuilder> 
-        getValueParameterOrBuilderList() {
-      return valueParameter_;
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-     *
-     * <pre>
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     * </pre>
-     */
-    public int getValueParameterCount() {
-      return valueParameter_.size();
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-     *
-     * <pre>
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     * </pre>
-     */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter getValueParameter(int index) {
-      return valueParameter_.get(index);
-    }
-    /**
-     * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-     *
-     * <pre>
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     * </pre>
-     */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameterOrBuilder getValueParameterOrBuilder(
-        int index) {
-      return valueParameter_.get(index);
-    }
-
-    // required .org.jetbrains.kotlin.serialization.Type return_type = 8;
-    public static final int RETURN_TYPE_FIELD_NUMBER = 8;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.Type returnType_;
-    /**
-     * <code>required .org.jetbrains.kotlin.serialization.Type return_type = 8;</code>
-     */
-    public boolean hasReturnType() {
-      return ((bitField0_ & 0x00000020) == 0x00000020);
-    }
-    /**
-     * <code>required .org.jetbrains.kotlin.serialization.Type return_type = 8;</code>
-     */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Type getReturnType() {
-      return returnType_;
-    }
-
-    private void initFields() {
-      flags_ = 0;
-      getterFlags_ = 0;
-      setterFlags_ = 0;
-      typeParameter_ = java.util.Collections.emptyList();
-      receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
-      name_ = 0;
-      valueParameter_ = java.util.Collections.emptyList();
-      returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
-
-      if (!hasName()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasReturnType()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      for (int i = 0; i < getTypeParameterCount(); i++) {
-        if (!getTypeParameter(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      if (hasReceiverType()) {
-        if (!getReceiverType().isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      for (int i = 0; i < getValueParameterCount(); i++) {
-        if (!getValueParameter(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      if (!getReturnType().isInitialized()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!extensionsAreInitialized()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      com.google.protobuf.GeneratedMessageLite
-        .ExtendableMessage<org.jetbrains.kotlin.serialization.ProtoBuf.Callable>.ExtensionWriter extensionWriter =
-          newExtensionWriter();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeInt32(1, flags_);
-      }
-      for (int i = 0; i < typeParameter_.size(); i++) {
-        output.writeMessage(4, typeParameter_.get(i));
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        output.writeMessage(5, receiverType_);
-      }
-      if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        output.writeInt32(6, name_);
-      }
-      for (int i = 0; i < valueParameter_.size(); i++) {
-        output.writeMessage(7, valueParameter_.get(i));
-      }
-      if (((bitField0_ & 0x00000020) == 0x00000020)) {
-        output.writeMessage(8, returnType_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeInt32(9, getterFlags_);
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeInt32(10, setterFlags_);
-      }
-      extensionWriter.writeUntil(200, output);
-    }
-
-    private int memoizedSerializedSize = -1;
-    public int getSerializedSize() {
-      int size = memoizedSerializedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(1, flags_);
-      }
-      for (int i = 0; i < typeParameter_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, typeParameter_.get(i));
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, receiverType_);
-      }
-      if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(6, name_);
-      }
-      for (int i = 0; i < valueParameter_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, valueParameter_.get(i));
-      }
-      if (((bitField0_ & 0x00000020) == 0x00000020)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, returnType_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(9, getterFlags_);
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(10, setterFlags_);
-      }
-      size += extensionsSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
-    }
-
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input);
-    }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
-    }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
-    }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
-    }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input);
-    }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
-    }
-
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Callable prototype) {
-      return newBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() { return newBuilder(this); }
-
-    /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Callable}
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessageLite.ExtendableBuilder<
-          org.jetbrains.kotlin.serialization.ProtoBuf.Callable, Builder> implements org.jetbrains.kotlin.serialization.ProtoBuf.CallableOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Callable.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-      }
-      private static Builder create() {
-        return new Builder();
-      }
-
-      public Builder clear() {
-        super.clear();
-        flags_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000001);
-        getterFlags_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
-        setterFlags_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000004);
-        typeParameter_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
-        receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
-        bitField0_ = (bitField0_ & ~0x00000010);
-        name_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000020);
-        valueParameter_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000040);
-        returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
-        bitField0_ = (bitField0_ & ~0x00000080);
-        return this;
-      }
-
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Callable getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance();
-      }
-
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Callable build() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Callable result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Callable buildPartial() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Callable result = new org.jetbrains.kotlin.serialization.ProtoBuf.Callable(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        result.flags_ = flags_;
-        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-          to_bitField0_ |= 0x00000002;
-        }
-        result.getterFlags_ = getterFlags_;
-        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
-          to_bitField0_ |= 0x00000004;
-        }
-        result.setterFlags_ = setterFlags_;
-        if (((bitField0_ & 0x00000008) == 0x00000008)) {
-          typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_);
-          bitField0_ = (bitField0_ & ~0x00000008);
-        }
-        result.typeParameter_ = typeParameter_;
-        if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
-          to_bitField0_ |= 0x00000008;
-        }
-        result.receiverType_ = receiverType_;
-        if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
-          to_bitField0_ |= 0x00000010;
-        }
-        result.name_ = name_;
-        if (((bitField0_ & 0x00000040) == 0x00000040)) {
-          valueParameter_ = java.util.Collections.unmodifiableList(valueParameter_);
-          bitField0_ = (bitField0_ & ~0x00000040);
-        }
-        result.valueParameter_ = valueParameter_;
-        if (((from_bitField0_ & 0x00000080) == 0x00000080)) {
-          to_bitField0_ |= 0x00000020;
-        }
-        result.returnType_ = returnType_;
-        result.bitField0_ = to_bitField0_;
-        return result;
-      }
-
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Callable other) {
-        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance()) return this;
-        if (other.hasFlags()) {
-          setFlags(other.getFlags());
-        }
-        if (other.hasGetterFlags()) {
-          setGetterFlags(other.getGetterFlags());
-        }
-        if (other.hasSetterFlags()) {
-          setSetterFlags(other.getSetterFlags());
-        }
-        if (!other.typeParameter_.isEmpty()) {
-          if (typeParameter_.isEmpty()) {
-            typeParameter_ = other.typeParameter_;
-            bitField0_ = (bitField0_ & ~0x00000008);
-          } else {
-            ensureTypeParameterIsMutable();
-            typeParameter_.addAll(other.typeParameter_);
-          }
-          
-        }
-        if (other.hasReceiverType()) {
-          mergeReceiverType(other.getReceiverType());
-        }
-        if (other.hasName()) {
-          setName(other.getName());
-        }
-        if (!other.valueParameter_.isEmpty()) {
-          if (valueParameter_.isEmpty()) {
-            valueParameter_ = other.valueParameter_;
-            bitField0_ = (bitField0_ & ~0x00000040);
-          } else {
-            ensureValueParameterIsMutable();
-            valueParameter_.addAll(other.valueParameter_);
-          }
-          
-        }
-        if (other.hasReturnType()) {
-          mergeReturnType(other.getReturnType());
-        }
-        this.mergeExtensionFields(other);
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        if (!hasName()) {
-          
-          return false;
-        }
-        if (!hasReturnType()) {
-          
-          return false;
-        }
-        for (int i = 0; i < getTypeParameterCount(); i++) {
-          if (!getTypeParameter(i).isInitialized()) {
-            
-            return false;
-          }
-        }
-        if (hasReceiverType()) {
-          if (!getReceiverType().isInitialized()) {
-            
-            return false;
-          }
-        }
-        for (int i = 0; i < getValueParameterCount(); i++) {
-          if (!getValueParameter(i).isInitialized()) {
-            
-            return false;
-          }
-        }
-        if (!getReturnType().isInitialized()) {
-          
-          return false;
-        }
-        if (!extensionsAreInitialized()) {
-          
-          return false;
-        }
-        return true;
-      }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Callable parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Callable) e.getUnfinishedMessage();
-          throw e;
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      // optional int32 flags = 1;
-      private int flags_ ;
-      /**
-       * <code>optional int32 flags = 1;</code>
-       *
-       * <pre>
-       *
-       *Visibility
-       *Modality
-       *hasAnnotations
-       *CallableKind
-       *MemberKind
-       *hasGetter
-       *hasSetter
-       *hasConstant
-       *isConst
-       *lateinit
-       *isOperator
-       *isInfix
-       * </pre>
-       */
-      public boolean hasFlags() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
-      }
-      /**
-       * <code>optional int32 flags = 1;</code>
-       *
-       * <pre>
-       *
-       *Visibility
-       *Modality
-       *hasAnnotations
-       *CallableKind
-       *MemberKind
-       *hasGetter
-       *hasSetter
-       *hasConstant
-       *isConst
-       *lateinit
-       *isOperator
-       *isInfix
-       * </pre>
-       */
-      public int getFlags() {
-        return flags_;
-      }
-      /**
-       * <code>optional int32 flags = 1;</code>
-       *
-       * <pre>
-       *
-       *Visibility
-       *Modality
-       *hasAnnotations
-       *CallableKind
-       *MemberKind
-       *hasGetter
-       *hasSetter
-       *hasConstant
-       *isConst
-       *lateinit
-       *isOperator
-       *isInfix
-       * </pre>
-       */
-      public Builder setFlags(int value) {
-        bitField0_ |= 0x00000001;
-        flags_ = value;
-        
-        return this;
-      }
-      /**
-       * <code>optional int32 flags = 1;</code>
-       *
-       * <pre>
-       *
-       *Visibility
-       *Modality
-       *hasAnnotations
-       *CallableKind
-       *MemberKind
-       *hasGetter
-       *hasSetter
-       *hasConstant
-       *isConst
-       *lateinit
-       *isOperator
-       *isInfix
-       * </pre>
-       */
-      public Builder clearFlags() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        flags_ = 0;
-        
-        return this;
-      }
-
-      // optional int32 getter_flags = 9;
-      private int getterFlags_ ;
-      /**
-       * <code>optional int32 getter_flags = 9;</code>
-       *
-       * <pre>
-       *
-       *isNotDefault
-       *Visibility
-       *Modality
-       *hasAnnotations
-       * </pre>
-       */
-      public boolean hasGetterFlags() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
-      }
-      /**
-       * <code>optional int32 getter_flags = 9;</code>
-       *
-       * <pre>
-       *
-       *isNotDefault
-       *Visibility
-       *Modality
-       *hasAnnotations
-       * </pre>
-       */
-      public int getGetterFlags() {
-        return getterFlags_;
-      }
-      /**
-       * <code>optional int32 getter_flags = 9;</code>
-       *
-       * <pre>
-       *
-       *isNotDefault
-       *Visibility
-       *Modality
-       *hasAnnotations
-       * </pre>
-       */
-      public Builder setGetterFlags(int value) {
-        bitField0_ |= 0x00000002;
-        getterFlags_ = value;
-        
-        return this;
-      }
-      /**
-       * <code>optional int32 getter_flags = 9;</code>
-       *
-       * <pre>
-       *
-       *isNotDefault
-       *Visibility
-       *Modality
-       *hasAnnotations
-       * </pre>
-       */
-      public Builder clearGetterFlags() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        getterFlags_ = 0;
-        
-        return this;
-      }
-
-      // optional int32 setter_flags = 10;
-      private int setterFlags_ ;
-      /**
-       * <code>optional int32 setter_flags = 10;</code>
-       */
-      public boolean hasSetterFlags() {
-        return ((bitField0_ & 0x00000004) == 0x00000004);
-      }
-      /**
-       * <code>optional int32 setter_flags = 10;</code>
-       */
-      public int getSetterFlags() {
-        return setterFlags_;
-      }
-      /**
-       * <code>optional int32 setter_flags = 10;</code>
-       */
-      public Builder setSetterFlags(int value) {
-        bitField0_ |= 0x00000004;
-        setterFlags_ = value;
-        
-        return this;
-      }
-      /**
-       * <code>optional int32 setter_flags = 10;</code>
-       */
-      public Builder clearSetterFlags() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        setterFlags_ = 0;
-        
-        return this;
-      }
-
-      // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
-      private java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter> typeParameter_ =
-        java.util.Collections.emptyList();
-      private void ensureTypeParameterIsMutable() {
-        if (!((bitField0_ & 0x00000008) == 0x00000008)) {
-          typeParameter_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter>(typeParameter_);
-          bitField0_ |= 0x00000008;
-         }
-      }
-
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter> getTypeParameterList() {
-        return java.util.Collections.unmodifiableList(typeParameter_);
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public int getTypeParameterCount() {
-        return typeParameter_.size();
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter getTypeParameter(int index) {
-        return typeParameter_.get(index);
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public Builder setTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureTypeParameterIsMutable();
-        typeParameter_.set(index, value);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public Builder setTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
-        ensureTypeParameterIsMutable();
-        typeParameter_.set(index, builderForValue.build());
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public Builder addTypeParameter(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureTypeParameterIsMutable();
-        typeParameter_.add(value);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public Builder addTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureTypeParameterIsMutable();
-        typeParameter_.add(index, value);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public Builder addTypeParameter(
-          org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
-        ensureTypeParameterIsMutable();
-        typeParameter_.add(builderForValue.build());
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public Builder addTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
-        ensureTypeParameterIsMutable();
-        typeParameter_.add(index, builderForValue.build());
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public Builder addAllTypeParameter(
-          java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter> values) {
-        ensureTypeParameterIsMutable();
-        super.addAll(values, typeParameter_);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public Builder clearTypeParameter() {
-        typeParameter_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000008);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;</code>
-       */
-      public Builder removeTypeParameter(int index) {
-        ensureTypeParameterIsMutable();
-        typeParameter_.remove(index);
-
-        return this;
-      }
-
-      // optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
-      private org.jetbrains.kotlin.serialization.ProtoBuf.Type receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;</code>
-       */
-      public boolean hasReceiverType() {
-        return ((bitField0_ & 0x00000010) == 0x00000010);
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;</code>
-       */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getReceiverType() {
-        return receiverType_;
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;</code>
-       */
-      public Builder setReceiverType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        receiverType_ = value;
-
-        bitField0_ |= 0x00000010;
-        return this;
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;</code>
-       */
-      public Builder setReceiverType(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
-        receiverType_ = builderForValue.build();
-
-        bitField0_ |= 0x00000010;
-        return this;
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;</code>
-       */
-      public Builder mergeReceiverType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
-        if (((bitField0_ & 0x00000010) == 0x00000010) &&
-            receiverType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
-          receiverType_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(receiverType_).mergeFrom(value).buildPartial();
-        } else {
-          receiverType_ = value;
-        }
-
-        bitField0_ |= 0x00000010;
-        return this;
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;</code>
-       */
-      public Builder clearReceiverType() {
-        receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
-
-        bitField0_ = (bitField0_ & ~0x00000010);
-        return this;
-      }
-
-      // required int32 name = 6;
-      private int name_ ;
-      /**
-       * <code>required int32 name = 6;</code>
-       */
-      public boolean hasName() {
-        return ((bitField0_ & 0x00000020) == 0x00000020);
-      }
-      /**
-       * <code>required int32 name = 6;</code>
-       */
-      public int getName() {
-        return name_;
-      }
-      /**
-       * <code>required int32 name = 6;</code>
-       */
-      public Builder setName(int value) {
-        bitField0_ |= 0x00000020;
-        name_ = value;
-        
-        return this;
-      }
-      /**
-       * <code>required int32 name = 6;</code>
-       */
-      public Builder clearName() {
-        bitField0_ = (bitField0_ & ~0x00000020);
-        name_ = 0;
-        
-        return this;
-      }
-
-      // repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
-      private java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter> valueParameter_ =
-        java.util.Collections.emptyList();
-      private void ensureValueParameterIsMutable() {
-        if (!((bitField0_ & 0x00000040) == 0x00000040)) {
-          valueParameter_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter>(valueParameter_);
-          bitField0_ |= 0x00000040;
-         }
-      }
-
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter> getValueParameterList() {
-        return java.util.Collections.unmodifiableList(valueParameter_);
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public int getValueParameterCount() {
-        return valueParameter_.size();
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter getValueParameter(int index) {
-        return valueParameter_.get(index);
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public Builder setValueParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureValueParameterIsMutable();
-        valueParameter_.set(index, value);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public Builder setValueParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.Builder builderForValue) {
-        ensureValueParameterIsMutable();
-        valueParameter_.set(index, builderForValue.build());
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public Builder addValueParameter(org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureValueParameterIsMutable();
-        valueParameter_.add(value);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public Builder addValueParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureValueParameterIsMutable();
-        valueParameter_.add(index, value);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public Builder addValueParameter(
-          org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.Builder builderForValue) {
-        ensureValueParameterIsMutable();
-        valueParameter_.add(builderForValue.build());
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public Builder addValueParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.Builder builderForValue) {
-        ensureValueParameterIsMutable();
-        valueParameter_.add(index, builderForValue.build());
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public Builder addAllValueParameter(
-          java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter> values) {
-        ensureValueParameterIsMutable();
-        super.addAll(values, valueParameter_);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public Builder clearValueParameter() {
-        valueParameter_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000040);
-
-        return this;
-      }
-      /**
-       * <code>repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;</code>
-       *
-       * <pre>
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       * </pre>
-       */
-      public Builder removeValueParameter(int index) {
-        ensureValueParameterIsMutable();
-        valueParameter_.remove(index);
-
-        return this;
-      }
-
-      // required .org.jetbrains.kotlin.serialization.Type return_type = 8;
-      private org.jetbrains.kotlin.serialization.ProtoBuf.Type returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
-      /**
-       * <code>required .org.jetbrains.kotlin.serialization.Type return_type = 8;</code>
-       */
-      public boolean hasReturnType() {
-        return ((bitField0_ & 0x00000080) == 0x00000080);
-      }
-      /**
-       * <code>required .org.jetbrains.kotlin.serialization.Type return_type = 8;</code>
-       */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getReturnType() {
-        return returnType_;
-      }
-      /**
-       * <code>required .org.jetbrains.kotlin.serialization.Type return_type = 8;</code>
-       */
-      public Builder setReturnType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        returnType_ = value;
-
-        bitField0_ |= 0x00000080;
-        return this;
-      }
-      /**
-       * <code>required .org.jetbrains.kotlin.serialization.Type return_type = 8;</code>
-       */
-      public Builder setReturnType(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
-        returnType_ = builderForValue.build();
-
-        bitField0_ |= 0x00000080;
-        return this;
-      }
-      /**
-       * <code>required .org.jetbrains.kotlin.serialization.Type return_type = 8;</code>
-       */
-      public Builder mergeReturnType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
-        if (((bitField0_ & 0x00000080) == 0x00000080) &&
-            returnType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
-          returnType_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(returnType_).mergeFrom(value).buildPartial();
-        } else {
-          returnType_ = value;
-        }
-
-        bitField0_ |= 0x00000080;
-        return this;
-      }
-      /**
-       * <code>required .org.jetbrains.kotlin.serialization.Type return_type = 8;</code>
-       */
-      public Builder clearReturnType() {
-        returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
-
-        bitField0_ = (bitField0_ & ~0x00000080);
-        return this;
-      }
-
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Callable)
-    }
-
-    static {
-      defaultInstance = new Callable(true);
-      defaultInstance.initFields();
-    }
-
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Callable)
-  }
-
   public interface ValueParameterOrBuilder extends 
        com.google.protobuf.GeneratedMessageLite.
             ExtendableMessageOrBuilder<ValueParameter> {
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java
index 3701f36eb2f..996de331a37 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java
@@ -9,8 +9,6 @@ public final class BuiltInsProtoBuf {
       com.google.protobuf.ExtensionRegistryLite registry) {
     registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.className);
     registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.classAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.oldCallableAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.oldCompileTimeValue);
     registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.constructorAnnotation);
     registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.functionAnnotation);
     registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.propertyAnnotation);
@@ -48,36 +46,6 @@ public final class BuiltInsProtoBuf {
         150,
         com.google.protobuf.WireFormat.FieldType.MESSAGE,
         false);
-  public static final int OLD_CALLABLE_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Callable,
-      java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Annotation>> oldCallableAnnotation = com.google.protobuf.GeneratedMessageLite
-          .newRepeatedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
-        null,
-        150,
-        com.google.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
-  public static final int OLD_COMPILE_TIME_VALUE_FIELD_NUMBER = 151;
-  /**
-   * <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Callable,
-      org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value> oldCompileTimeValue = com.google.protobuf.GeneratedMessageLite
-          .newSingularGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance(),
-        null,
-        151,
-        com.google.protobuf.WireFormat.FieldType.MESSAGE);
   public static final int CONSTRUCTOR_ANNOTATION_FIELD_NUMBER = 150;
   /**
    * <code>extend .org.jetbrains.kotlin.serialization.Constructor { ... }</code>
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
index afa7d2d15d6..b022aa7ca2d 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
@@ -39,18 +39,18 @@ public class MemberDeserializer(private val c: DeserializationContext) {
                 getAnnotations(proto, flags, AnnotatedCallableKind.PROPERTY),
                 Deserialization.modality(Flags.MODALITY.get(flags)),
                 Deserialization.visibility(Flags.VISIBILITY.get(flags)),
-                Flags.CALLABLE_KIND.get(flags) == ProtoBuf.CallableKind.VAR,
+                Flags.IS_VAR.get(flags),
                 c.nameResolver.getName(proto.getName()),
                 Deserialization.memberKind(Flags.MEMBER_KIND.get(flags)),
                 proto,
                 c.nameResolver,
-                Flags.OLD_LATE_INIT.get(flags),
-                Flags.OLD_IS_CONST.get(flags)
+                Flags.LATE_INIT.get(flags),
+                Flags.IS_CONST.get(flags)
         )
 
         val local = c.childContext(property, proto.getTypeParameterList())
 
-        val hasGetter = Flags.OLD_HAS_GETTER.get(flags)
+        val hasGetter = Flags.HAS_GETTER.get(flags)
         val receiverAnnotations = if (hasGetter && proto.hasReceiverType())
             getReceiverParameterAnnotations(proto, AnnotatedCallableKind.PROPERTY_GETTER)
         else
@@ -87,7 +87,7 @@ public class MemberDeserializer(private val c: DeserializationContext) {
             null
         }
 
-        val setter = if (Flags.OLD_HAS_SETTER.get(flags)) {
+        val setter = if (Flags.HAS_SETTER.get(flags)) {
             val setterFlags = proto.getSetterFlags()
             val isNotDefault = proto.hasSetterFlags() && Flags.IS_NOT_DEFAULT.get(setterFlags)
             if (isNotDefault) {
@@ -115,7 +115,7 @@ public class MemberDeserializer(private val c: DeserializationContext) {
             null
         }
 
-        if (Flags.OLD_HAS_CONSTANT.get(flags)) {
+        if (Flags.HAS_CONSTANT.get(flags)) {
             property.setCompileTimeInitializer(
                     c.storageManager.createNullableLazyValue {
                         val container = c.containingDeclaration.asProtoContainer()!!
@@ -145,8 +145,8 @@ public class MemberDeserializer(private val c: DeserializationContext) {
                 Deserialization.modality(Flags.MODALITY.get(proto.flags)),
                 Deserialization.visibility(Flags.VISIBILITY.get(proto.flags))
         )
-        function.isOperator = Flags.OLD_IS_OPERATOR.get(proto.flags)
-        function.isInfix = Flags.OLD_IS_INFIX.get(proto.flags)
+        function.isOperator = Flags.IS_OPERATOR.get(proto.flags)
+        function.isInfix = Flags.IS_INFIX.get(proto.flags)
         return function
     }
 
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
index f2028aa99a6..9e3969bae84 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
@@ -322,7 +322,8 @@ public class DeserializedClassDescriptor(
             }
 
             val nameResolver = c.nameResolver
-            return classProto.getMemberList().mapTo(result) { nameResolver.getName(it.getName()) }
+            return classProto.functionList.mapTo(result) { nameResolver.getName(it.name) } +
+                   classProto.propertyList.mapTo(result) { nameResolver.getName(it.name) }
         }
 
         fun all(): Collection<ClassDescriptor> {
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt
index 2448adb56ba..da4adbf258f 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt
@@ -35,10 +35,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
     private val classIds = Interner<ClassId>()
 
     open fun checkEquals(old: ProtoBuf.Package, new: ProtoBuf.Package): Boolean {
-        if (!checkEqualsPackageMember(old, new)) return false
-
-        if (!checkEqualsPackageConstructor(old, new)) return false
-
         if (!checkEqualsPackageFunction(old, new)) return false
 
         if (!checkEqualsPackageProperty(old, new)) return false
@@ -46,8 +42,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
         return true
     }
     public enum class ProtoBufPackageKind {
-        MEMBER_LIST,
-        CONSTRUCTOR_LIST,
         FUNCTION_LIST,
         PROPERTY_LIST
     }
@@ -55,10 +49,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
     public fun difference(old: ProtoBuf.Package, new: ProtoBuf.Package): EnumSet<ProtoBufPackageKind> {
         val result = EnumSet.noneOf(ProtoBufPackageKind::class.java)
 
-        if (!checkEqualsPackageMember(old, new)) result.add(ProtoBufPackageKind.MEMBER_LIST)
-
-        if (!checkEqualsPackageConstructor(old, new)) result.add(ProtoBufPackageKind.CONSTRUCTOR_LIST)
-
         if (!checkEqualsPackageFunction(old, new)) result.add(ProtoBufPackageKind.FUNCTION_LIST)
 
         if (!checkEqualsPackageProperty(old, new)) result.add(ProtoBufPackageKind.PROPERTY_LIST)
@@ -91,17 +81,8 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
 
         if (!checkEqualsClassProperty(old, new)) return false
 
-        if (!checkEqualsClassMember(old, new)) return false
-
         if (!checkEqualsClassEnumEntry(old, new)) return false
 
-        if (old.hasPrimaryConstructor() != new.hasPrimaryConstructor()) return false
-        if (old.hasPrimaryConstructor()) {
-            if (!checkEquals(old.primaryConstructor, new.primaryConstructor)) return false
-        }
-
-        if (!checkEqualsClassSecondaryConstructor(old, new)) return false
-
         if (old.getExtensionCount(JvmProtoBuf.classAnnotation) != new.getExtensionCount(JvmProtoBuf.classAnnotation)) return false
 
         for(i in 0..old.getExtensionCount(JvmProtoBuf.classAnnotation) - 1) {
@@ -120,10 +101,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
         CONSTRUCTOR_LIST,
         FUNCTION_LIST,
         PROPERTY_LIST,
-        MEMBER_LIST,
         ENUM_ENTRY_LIST,
-        PRIMARY_CONSTRUCTOR,
-        SECONDARY_CONSTRUCTOR_LIST,
         CLASS_ANNOTATION_LIST
     }
 
@@ -154,17 +132,8 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
 
         if (!checkEqualsClassProperty(old, new)) result.add(ProtoBufClassKind.PROPERTY_LIST)
 
-        if (!checkEqualsClassMember(old, new)) result.add(ProtoBufClassKind.MEMBER_LIST)
-
         if (!checkEqualsClassEnumEntry(old, new)) result.add(ProtoBufClassKind.ENUM_ENTRY_LIST)
 
-        if (old.hasPrimaryConstructor() != new.hasPrimaryConstructor()) result.add(ProtoBufClassKind.PRIMARY_CONSTRUCTOR)
-        if (old.hasPrimaryConstructor()) {
-            if (!checkEquals(old.primaryConstructor, new.primaryConstructor)) result.add(ProtoBufClassKind.PRIMARY_CONSTRUCTOR)
-        }
-
-        if (!checkEqualsClassSecondaryConstructor(old, new)) result.add(ProtoBufClassKind.SECONDARY_CONSTRUCTOR_LIST)
-
         if (old.getExtensionCount(JvmProtoBuf.classAnnotation) != new.getExtensionCount(JvmProtoBuf.classAnnotation)) result.add(ProtoBufClassKind.CLASS_ANNOTATION_LIST)
 
         for(i in 0..old.getExtensionCount(JvmProtoBuf.classAnnotation) - 1) {
@@ -174,69 +143,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
         return result
     }
 
-    open fun checkEquals(old: ProtoBuf.Callable, new: ProtoBuf.Callable): Boolean {
-        if (old.hasFlags() != new.hasFlags()) return false
-        if (old.hasFlags()) {
-            if (old.flags != new.flags) return false
-        }
-
-        if (old.hasGetterFlags() != new.hasGetterFlags()) return false
-        if (old.hasGetterFlags()) {
-            if (old.getterFlags != new.getterFlags) return false
-        }
-
-        if (old.hasSetterFlags() != new.hasSetterFlags()) return false
-        if (old.hasSetterFlags()) {
-            if (old.setterFlags != new.setterFlags) return false
-        }
-
-        if (!checkEqualsCallableTypeParameter(old, new)) return false
-
-        if (old.hasReceiverType() != new.hasReceiverType()) return false
-        if (old.hasReceiverType()) {
-            if (!checkEquals(old.receiverType, new.receiverType)) return false
-        }
-
-        if (!checkStringEquals(old.name, new.name)) return false
-
-        if (!checkEqualsCallableValueParameter(old, new)) return false
-
-        if (!checkEquals(old.returnType, new.returnType)) return false
-
-        if (old.hasExtension(JvmProtoBuf.oldMethodSignature) != new.hasExtension(JvmProtoBuf.oldMethodSignature)) return false
-        if (old.hasExtension(JvmProtoBuf.oldMethodSignature)) {
-            if (!checkEquals(old.getExtension(JvmProtoBuf.oldMethodSignature), new.getExtension(JvmProtoBuf.oldMethodSignature))) return false
-        }
-
-        if (old.hasExtension(JvmProtoBuf.oldPropertySignature) != new.hasExtension(JvmProtoBuf.oldPropertySignature)) return false
-        if (old.hasExtension(JvmProtoBuf.oldPropertySignature)) {
-            if (!checkEquals(old.getExtension(JvmProtoBuf.oldPropertySignature), new.getExtension(JvmProtoBuf.oldPropertySignature))) return false
-        }
-
-        if (old.hasExtension(JvmProtoBuf.oldImplClassName) != new.hasExtension(JvmProtoBuf.oldImplClassName)) return false
-        if (old.hasExtension(JvmProtoBuf.oldImplClassName)) {
-            if (!checkStringEquals(old.getExtension(JvmProtoBuf.oldImplClassName), new.getExtension(JvmProtoBuf.oldImplClassName))) return false
-        }
-
-        return true
-    }
-
-    open fun checkEquals(old: ProtoBuf.Constructor, new: ProtoBuf.Constructor): Boolean {
-        if (old.hasFlags() != new.hasFlags()) return false
-        if (old.hasFlags()) {
-            if (old.flags != new.flags) return false
-        }
-
-        if (!checkEqualsConstructorValueParameter(old, new)) return false
-
-        if (old.hasExtension(JvmProtoBuf.constructorSignature) != new.hasExtension(JvmProtoBuf.constructorSignature)) return false
-        if (old.hasExtension(JvmProtoBuf.constructorSignature)) {
-            if (!checkEquals(old.getExtension(JvmProtoBuf.constructorSignature), new.getExtension(JvmProtoBuf.constructorSignature))) return false
-        }
-
-        return true
-    }
-
     open fun checkEquals(old: ProtoBuf.Function, new: ProtoBuf.Function): Boolean {
         if (old.hasFlags() != new.hasFlags()) return false
         if (old.hasFlags()) {
@@ -376,10 +282,17 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
         return true
     }
 
-    open fun checkEquals(old: ProtoBuf.Class.PrimaryConstructor, new: ProtoBuf.Class.PrimaryConstructor): Boolean {
-        if (old.hasData() != new.hasData()) return false
-        if (old.hasData()) {
-            if (!checkEquals(old.data, new.data)) return false
+    open fun checkEquals(old: ProtoBuf.Constructor, new: ProtoBuf.Constructor): Boolean {
+        if (old.hasFlags() != new.hasFlags()) return false
+        if (old.hasFlags()) {
+            if (old.flags != new.flags) return false
+        }
+
+        if (!checkEqualsConstructorValueParameter(old, new)) return false
+
+        if (old.hasExtension(JvmProtoBuf.constructorSignature) != new.hasExtension(JvmProtoBuf.constructorSignature)) return false
+        if (old.hasExtension(JvmProtoBuf.constructorSignature)) {
+            if (!checkEquals(old.getExtension(JvmProtoBuf.constructorSignature), new.getExtension(JvmProtoBuf.constructorSignature))) return false
         }
 
         return true
@@ -529,26 +442,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
         return true
     }
 
-    open fun checkEqualsPackageMember(old: ProtoBuf.Package, new: ProtoBuf.Package): Boolean {
-        if (old.memberCount != new.memberCount) return false
-
-        for(i in 0..old.memberCount - 1) {
-            if (!checkEquals(old.getMember(i), new.getMember(i))) return false
-        }
-
-        return true
-    }
-
-    open fun checkEqualsPackageConstructor(old: ProtoBuf.Package, new: ProtoBuf.Package): Boolean {
-        if (old.constructorCount != new.constructorCount) return false
-
-        for(i in 0..old.constructorCount - 1) {
-            if (!checkEquals(old.getConstructor(i), new.getConstructor(i))) return false
-        }
-
-        return true
-    }
-
     open fun checkEqualsPackageFunction(old: ProtoBuf.Package, new: ProtoBuf.Package): Boolean {
         if (old.functionCount != new.functionCount) return false
 
@@ -629,16 +522,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
         return true
     }
 
-    open fun checkEqualsClassMember(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean {
-        if (old.memberCount != new.memberCount) return false
-
-        for(i in 0..old.memberCount - 1) {
-            if (!checkEquals(old.getMember(i), new.getMember(i))) return false
-        }
-
-        return true
-    }
-
     open fun checkEqualsClassEnumEntry(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean {
         if (old.enumEntryCount != new.enumEntryCount) return false
 
@@ -649,46 +532,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
         return true
     }
 
-    open fun checkEqualsClassSecondaryConstructor(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean {
-        if (old.secondaryConstructorCount != new.secondaryConstructorCount) return false
-
-        for(i in 0..old.secondaryConstructorCount - 1) {
-            if (!checkEquals(old.getSecondaryConstructor(i), new.getSecondaryConstructor(i))) return false
-        }
-
-        return true
-    }
-
-    open fun checkEqualsCallableTypeParameter(old: ProtoBuf.Callable, new: ProtoBuf.Callable): Boolean {
-        if (old.typeParameterCount != new.typeParameterCount) return false
-
-        for(i in 0..old.typeParameterCount - 1) {
-            if (!checkEquals(old.getTypeParameter(i), new.getTypeParameter(i))) return false
-        }
-
-        return true
-    }
-
-    open fun checkEqualsCallableValueParameter(old: ProtoBuf.Callable, new: ProtoBuf.Callable): Boolean {
-        if (old.valueParameterCount != new.valueParameterCount) return false
-
-        for(i in 0..old.valueParameterCount - 1) {
-            if (!checkEquals(old.getValueParameter(i), new.getValueParameter(i))) return false
-        }
-
-        return true
-    }
-
-    open fun checkEqualsConstructorValueParameter(old: ProtoBuf.Constructor, new: ProtoBuf.Constructor): Boolean {
-        if (old.valueParameterCount != new.valueParameterCount) return false
-
-        for(i in 0..old.valueParameterCount - 1) {
-            if (!checkEquals(old.getValueParameter(i), new.getValueParameter(i))) return false
-        }
-
-        return true
-    }
-
     open fun checkEqualsFunctionTypeParameter(old: ProtoBuf.Function, new: ProtoBuf.Function): Boolean {
         if (old.typeParameterCount != new.typeParameterCount) return false
 
@@ -739,6 +582,16 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
         return true
     }
 
+    open fun checkEqualsConstructorValueParameter(old: ProtoBuf.Constructor, new: ProtoBuf.Constructor): Boolean {
+        if (old.valueParameterCount != new.valueParameterCount) return false
+
+        for(i in 0..old.valueParameterCount - 1) {
+            if (!checkEquals(old.getValueParameter(i), new.getValueParameter(i))) return false
+        }
+
+        return true
+    }
+
     open fun checkEqualsAnnotationArgument(old: ProtoBuf.Annotation, new: ProtoBuf.Annotation): Boolean {
         if (old.argumentCount != new.argumentCount) return false
 
@@ -793,14 +646,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
 public fun ProtoBuf.Package.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
     var hashCode = 1
 
-    for(i in 0..memberCount - 1) {
-        hashCode = 31 * hashCode + getMember(i).hashCode(stringIndexes, fqNameIndexes)
-    }
-
-    for(i in 0..constructorCount - 1) {
-        hashCode = 31 * hashCode + getConstructor(i).hashCode(stringIndexes, fqNameIndexes)
-    }
-
     for(i in 0..functionCount - 1) {
         hashCode = 31 * hashCode + getFunction(i).hashCode(stringIndexes, fqNameIndexes)
     }
@@ -849,22 +694,10 @@ public fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (
         hashCode = 31 * hashCode + getProperty(i).hashCode(stringIndexes, fqNameIndexes)
     }
 
-    for(i in 0..memberCount - 1) {
-        hashCode = 31 * hashCode + getMember(i).hashCode(stringIndexes, fqNameIndexes)
-    }
-
     for(i in 0..enumEntryCount - 1) {
         hashCode = 31 * hashCode + stringIndexes(getEnumEntry(i))
     }
 
-    if (hasPrimaryConstructor()) {
-        hashCode = 31 * hashCode + primaryConstructor.hashCode(stringIndexes, fqNameIndexes)
-    }
-
-    for(i in 0..secondaryConstructorCount - 1) {
-        hashCode = 31 * hashCode + getSecondaryConstructor(i).hashCode(stringIndexes, fqNameIndexes)
-    }
-
     for(i in 0..getExtensionCount(JvmProtoBuf.classAnnotation) - 1) {
         hashCode = 31 * hashCode + getExtension(JvmProtoBuf.classAnnotation, i).hashCode(stringIndexes, fqNameIndexes)
     }
@@ -872,70 +705,6 @@ public fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (
     return hashCode
 }
 
-public fun ProtoBuf.Callable.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
-    var hashCode = 1
-
-    if (hasFlags()) {
-        hashCode = 31 * hashCode + flags
-    }
-
-    if (hasGetterFlags()) {
-        hashCode = 31 * hashCode + getterFlags
-    }
-
-    if (hasSetterFlags()) {
-        hashCode = 31 * hashCode + setterFlags
-    }
-
-    for(i in 0..typeParameterCount - 1) {
-        hashCode = 31 * hashCode + getTypeParameter(i).hashCode(stringIndexes, fqNameIndexes)
-    }
-
-    if (hasReceiverType()) {
-        hashCode = 31 * hashCode + receiverType.hashCode(stringIndexes, fqNameIndexes)
-    }
-
-    hashCode = 31 * hashCode + stringIndexes(name)
-
-    for(i in 0..valueParameterCount - 1) {
-        hashCode = 31 * hashCode + getValueParameter(i).hashCode(stringIndexes, fqNameIndexes)
-    }
-
-    hashCode = 31 * hashCode + returnType.hashCode(stringIndexes, fqNameIndexes)
-
-    if (hasExtension(JvmProtoBuf.oldMethodSignature)) {
-        hashCode = 31 * hashCode + getExtension(JvmProtoBuf.oldMethodSignature).hashCode(stringIndexes, fqNameIndexes)
-    }
-
-    if (hasExtension(JvmProtoBuf.oldPropertySignature)) {
-        hashCode = 31 * hashCode + getExtension(JvmProtoBuf.oldPropertySignature).hashCode(stringIndexes, fqNameIndexes)
-    }
-
-    if (hasExtension(JvmProtoBuf.oldImplClassName)) {
-        hashCode = 31 * hashCode + stringIndexes(getExtension(JvmProtoBuf.oldImplClassName))
-    }
-
-    return hashCode
-}
-
-public fun ProtoBuf.Constructor.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
-    var hashCode = 1
-
-    if (hasFlags()) {
-        hashCode = 31 * hashCode + flags
-    }
-
-    for(i in 0..valueParameterCount - 1) {
-        hashCode = 31 * hashCode + getValueParameter(i).hashCode(stringIndexes, fqNameIndexes)
-    }
-
-    if (hasExtension(JvmProtoBuf.constructorSignature)) {
-        hashCode = 31 * hashCode + getExtension(JvmProtoBuf.constructorSignature).hashCode(stringIndexes, fqNameIndexes)
-    }
-
-    return hashCode
-}
-
 public fun ProtoBuf.Function.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
     var hashCode = 1
 
@@ -1072,11 +841,19 @@ public fun ProtoBuf.Type.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (I
     return hashCode
 }
 
-public fun ProtoBuf.Class.PrimaryConstructor.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
+public fun ProtoBuf.Constructor.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
     var hashCode = 1
 
-    if (hasData()) {
-        hashCode = 31 * hashCode + data.hashCode(stringIndexes, fqNameIndexes)
+    if (hasFlags()) {
+        hashCode = 31 * hashCode + flags
+    }
+
+    for(i in 0..valueParameterCount - 1) {
+        hashCode = 31 * hashCode + getValueParameter(i).hashCode(stringIndexes, fqNameIndexes)
+    }
+
+    if (hasExtension(JvmProtoBuf.constructorSignature)) {
+        hashCode = 31 * hashCode + getExtension(JvmProtoBuf.constructorSignature).hashCode(stringIndexes, fqNameIndexes)
     }
 
     return hashCode
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt
index 33b4b30916f..f80ba52a0cf 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt
@@ -118,7 +118,6 @@ private abstract class DifferenceCalculator() {
     protected val MessageLite.isPrivate: Boolean
         get() = Visibilities.isPrivate(Deserialization.visibility(
                 when (this) {
-                    is ProtoBuf.Callable -> Flags.VISIBILITY.get(flags)
                     is ProtoBuf.Constructor -> Flags.VISIBILITY.get(flags)
                     is ProtoBuf.Function -> Flags.VISIBILITY.get(flags)
                     is ProtoBuf.Property -> Flags.VISIBILITY.get(flags)
@@ -127,7 +126,6 @@ private abstract class DifferenceCalculator() {
 
     private fun MessageLite.getHashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
         return when (this) {
-            is ProtoBuf.Callable -> hashCode(stringIndexes, fqNameIndexes)
             is ProtoBuf.Constructor -> hashCode(stringIndexes, fqNameIndexes)
             is ProtoBuf.Function -> hashCode(stringIndexes, fqNameIndexes)
             is ProtoBuf.Property -> hashCode(stringIndexes, fqNameIndexes)
@@ -137,7 +135,6 @@ private abstract class DifferenceCalculator() {
 
     private fun MessageLite.name(nameResolver: NameResolver): String {
         return when (this) {
-            is ProtoBuf.Callable -> nameResolver.getString(name)
             is ProtoBuf.Constructor -> "<init>"
             is ProtoBuf.Function -> nameResolver.getString(name)
             is ProtoBuf.Property -> nameResolver.getString(name)
@@ -147,7 +144,6 @@ private abstract class DifferenceCalculator() {
 
     private fun ProtoCompareGenerated.checkEquals(old: MessageLite, new: MessageLite): Boolean {
         return when {
-            old is ProtoBuf.Callable && new is ProtoBuf.Callable -> checkEquals(old, new)
             old is ProtoBuf.Constructor && new is ProtoBuf.Constructor -> checkEquals(old, new)
             old is ProtoBuf.Function && new is ProtoBuf.Function -> checkEquals(old, new)
             old is ProtoBuf.Property && new is ProtoBuf.Property -> checkEquals(old, new)
@@ -158,8 +154,6 @@ private abstract class DifferenceCalculator() {
 
 private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: ProtoMapValue) : DifferenceCalculator() {
     companion object {
-        private val CONSTRUCTOR = "<init>"
-
         private val CLASS_SIGNATURE_ENUMS = EnumSet.of(
                 ProtoBufClassKind.FLAGS,
                 ProtoBufClassKind.FQ_NAME,
@@ -214,18 +208,8 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot
                     names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getFunctionList))
                 ProtoBufClassKind.PROPERTY_LIST ->
                     names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getPropertyList))
-                ProtoBufClassKind.MEMBER_LIST ->
-                    names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getMemberList))
                 ProtoBufClassKind.ENUM_ENTRY_LIST ->
                     names.addAll(calcDifferenceForNames(oldProto.enumEntryList, newProto.enumEntryList))
-                ProtoBufClassKind.PRIMARY_CONSTRUCTOR ->
-                    if (areNonPrivatePrimaryConstructorsDifferent()) {
-                        names.add(CONSTRUCTOR)
-                    }
-                ProtoBufClassKind.SECONDARY_CONSTRUCTOR_LIST ->
-                    if (areNonPrivateSecondaryConstructorsDifferent()) {
-                        names.add(CONSTRUCTOR)
-                    }
                 ProtoBufClassKind.FLAGS,
                 ProtoBufClassKind.FQ_NAME,
                 ProtoBufClassKind.TYPE_PARAMETER_LIST,
@@ -238,30 +222,6 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot
         }
         return names
     }
-
-    private fun areNonPrivatePrimaryConstructorsDifferent(): Boolean {
-        val oldPrimaryConstructor = oldProto.getNonPrivatePrimaryConstructor
-        val newPrimaryConstructor = newProto.getNonPrivatePrimaryConstructor
-        if (oldPrimaryConstructor == null && newPrimaryConstructor == null) return false
-
-        if (oldPrimaryConstructor == null || newPrimaryConstructor == null) return true
-
-        return !compareObject.checkEquals(oldPrimaryConstructor, newPrimaryConstructor)
-    }
-
-    private fun areNonPrivateSecondaryConstructorsDifferent(): Boolean {
-        val oldSecondaryConstructors = oldProto.secondaryConstructorList.filter { !it.isPrivate }
-        val newSecondaryConstructors = newProto.secondaryConstructorList.filter { !it.isPrivate }
-        return (oldSecondaryConstructors.size() != newSecondaryConstructors.size() ||
-            oldSecondaryConstructors.indices.any { !compareObject.checkEquals(oldSecondaryConstructors[it], newSecondaryConstructors[it]) })
-    }
-
-    private val ProtoBuf.Class.getNonPrivatePrimaryConstructor: ProtoBuf.Class.PrimaryConstructor?
-        get() {
-            if (!hasPrimaryConstructor()) return null
-
-            return if (primaryConstructor?.data?.isPrivate ?: false) null else primaryConstructor
-        }
 }
 
 private class DifferenceCalculatorForPackageFacade(oldData: ProtoMapValue, newData: ProtoMapValue) : DifferenceCalculator() {
@@ -293,14 +253,10 @@ private class DifferenceCalculatorForPackageFacade(oldData: ProtoMapValue, newDa
 
         for (kind in diff) {
             when (kind!!) {
-                ProtoBufPackageKind.CONSTRUCTOR_LIST ->
-                    names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Package::getConstructorList))
                 ProtoBufPackageKind.FUNCTION_LIST ->
                     names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Package::getFunctionList))
                 ProtoBufPackageKind.PROPERTY_LIST ->
                     names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Package::getPropertyList))
-                ProtoBufPackageKind.MEMBER_LIST ->
-                    names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Package::getMemberList))
                 else ->
                     throw IllegalArgumentException("Unsupported kind: $kind")
             }
diff --git a/js/js.serializer/src/js.proto b/js/js.serializer/src/js.proto
index faef76debbc..3584e88b66e 100644
--- a/js/js.serializer/src/js.proto
+++ b/js/js.serializer/src/js.proto
@@ -25,11 +25,6 @@ extend Class {
   repeated Annotation class_annotation = 130;
 }
 
-extend Callable {
-  repeated Annotation old_callable_annotation = 130;
-  optional Annotation.Argument.Value old_compile_time_value = 131;
-}
-
 extend Constructor {
   repeated Annotation constructor_annotation = 130;
 }
diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JsProtoBuf.java b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JsProtoBuf.java
index fbfecbcf42f..1d3031bb3c2 100644
--- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JsProtoBuf.java
+++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JsProtoBuf.java
@@ -8,8 +8,6 @@ public final class JsProtoBuf {
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
     registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.classAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.oldCallableAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.oldCompileTimeValue);
     registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.constructorAnnotation);
     registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.functionAnnotation);
     registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.propertyAnnotation);
@@ -1481,36 +1479,6 @@ public final class JsProtoBuf {
         130,
         com.google.protobuf.WireFormat.FieldType.MESSAGE,
         false);
-  public static final int OLD_CALLABLE_ANNOTATION_FIELD_NUMBER = 130;
-  /**
-   * <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Callable,
-      java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Annotation>> oldCallableAnnotation = com.google.protobuf.GeneratedMessageLite
-          .newRepeatedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
-        null,
-        130,
-        com.google.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
-  public static final int OLD_COMPILE_TIME_VALUE_FIELD_NUMBER = 131;
-  /**
-   * <code>extend .org.jetbrains.kotlin.serialization.Callable { ... }</code>
-   */
-  public static final
-    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Callable,
-      org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value> oldCompileTimeValue = com.google.protobuf.GeneratedMessageLite
-          .newSingularGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance(),
-        null,
-        131,
-        com.google.protobuf.WireFormat.FieldType.MESSAGE);
   public static final int CONSTRUCTOR_ANNOTATION_FIELD_NUMBER = 130;
   /**
    * <code>extend .org.jetbrains.kotlin.serialization.Constructor { ... }</code>
diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt
index 0059d8d7ca6..80dd8697480 100644
--- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt
+++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt
@@ -119,7 +119,7 @@ public object KotlinJavascriptSerializationUtil {
         val packageStream = ByteArrayOutputStream()
         val fragments = packageView.fragments
         val packageProto = serializer.packageProto(fragments, skip).build() ?: error("Package fragments not serialized: $fragments")
-        if (packageProto.memberCount > 0) {
+        if (packageProto.functionCount > 0 || packageProto.propertyCount > 0) {
             packageProto.writeTo(packageStream)
             writeFun(KotlinJavascriptSerializedResourcePaths.getPackageFilePath(fqName), packageStream.toByteArray())
         }