diff --git a/build-common/test/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java b/build-common/test/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java index d463410e840..fa46ac16a72 100644 --- a/build-common/test/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java +++ b/build-common/test/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java @@ -18,1288 +18,6 @@ public final class DebugBuiltInsProtoBuf { registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.typeAnnotation); registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.typeParameterAnnotation); } - public interface BuiltInsOrBuilder extends - // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.builtins.BuiltIns) - org.jetbrains.kotlin.protobuf.MessageOrBuilder { - - /** - * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1; - */ - boolean hasStrings(); - /** - * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1; - */ - org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable getStrings(); - /** - * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1; - */ - org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder getStringsOrBuilder(); - - /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2; - */ - boolean hasQualifiedNames(); - /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2; - */ - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable getQualifiedNames(); - /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2; - */ - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder getQualifiedNamesOrBuilder(); - - /** - * optional .org.jetbrains.kotlin.serialization.Package package = 3; - */ - boolean hasPackage(); - /** - * optional .org.jetbrains.kotlin.serialization.Package package = 3; - */ - org.jetbrains.kotlin.serialization.DebugProtoBuf.Package getPackage(); - /** - * optional .org.jetbrains.kotlin.serialization.Package package = 3; - */ - org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder getPackageOrBuilder(); - - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - java.util.List - getClass_List(); - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getClass_(int index); - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - int getClass_Count(); - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - java.util.List - getClass_OrBuilderList(); - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getClass_OrBuilder( - int index); - } - /** - * Protobuf type {@code org.jetbrains.kotlin.serialization.builtins.BuiltIns} - */ - public static final class BuiltIns extends - org.jetbrains.kotlin.protobuf.GeneratedMessage implements - // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.builtins.BuiltIns) - BuiltInsOrBuilder { - // Use BuiltIns.newBuilder() to construct. - private BuiltIns(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private BuiltIns(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.UnknownFieldSet.getDefaultInstance(); } - - private static final BuiltIns defaultInstance; - public static BuiltIns getDefaultInstance() { - return defaultInstance; - } - - public BuiltIns getDefaultInstanceForType() { - return defaultInstance; - } - - private final org.jetbrains.kotlin.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final org.jetbrains.kotlin.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private BuiltIns( - org.jetbrains.kotlin.protobuf.CodedInputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - org.jetbrains.kotlin.protobuf.UnknownFieldSet.Builder unknownFields = - org.jetbrains.kotlin.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.StringTable.Builder subBuilder = null; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - subBuilder = strings_.toBuilder(); - } - strings_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(strings_); - strings_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000001; - break; - } - case 18: { - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder subBuilder = null; - if (((bitField0_ & 0x00000002) == 0x00000002)) { - subBuilder = qualifiedNames_.toBuilder(); - } - qualifiedNames_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(qualifiedNames_); - qualifiedNames_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000002; - break; - } - case 26: { - org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.Builder subBuilder = null; - if (((bitField0_ & 0x00000004) == 0x00000004)) { - subBuilder = package_.toBuilder(); - } - package_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(package_); - package_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000004; - break; - } - case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { - class__ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000008; - } - class__.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PARSER, extensionRegistry)); - break; - } - } - } - } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { - class__ = java.util.Collections.unmodifiableList(class__); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_descriptor; - } - - protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns.class, org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns.Builder.class); - } - - public static org.jetbrains.kotlin.protobuf.Parser PARSER = - new org.jetbrains.kotlin.protobuf.AbstractParser() { - public BuiltIns parsePartialFrom( - org.jetbrains.kotlin.protobuf.CodedInputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return new BuiltIns(input, extensionRegistry); - } - }; - - @java.lang.Override - public org.jetbrains.kotlin.protobuf.Parser getParserForType() { - return PARSER; - } - - private int bitField0_; - public static final int STRINGS_FIELD_NUMBER = 1; - private org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable strings_; - /** - * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1; - */ - public boolean hasStrings() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1; - */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable getStrings() { - return strings_; - } - /** - * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1; - */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder getStringsOrBuilder() { - return strings_; - } - - public static final int QUALIFIED_NAMES_FIELD_NUMBER = 2; - private org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable qualifiedNames_; - /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2; - */ - public boolean hasQualifiedNames() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2; - */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable getQualifiedNames() { - return qualifiedNames_; - } - /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2; - */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder getQualifiedNamesOrBuilder() { - return qualifiedNames_; - } - - public static final int PACKAGE_FIELD_NUMBER = 3; - private org.jetbrains.kotlin.serialization.DebugProtoBuf.Package package_; - /** - * optional .org.jetbrains.kotlin.serialization.Package package = 3; - */ - public boolean hasPackage() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional .org.jetbrains.kotlin.serialization.Package package = 3; - */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.Package getPackage() { - return package_; - } - /** - * optional .org.jetbrains.kotlin.serialization.Package package = 3; - */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder getPackageOrBuilder() { - return package_; - } - - public static final int CLASS_FIELD_NUMBER = 4; - private java.util.List class__; - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public java.util.List getClass_List() { - return class__; - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public java.util.List - getClass_OrBuilderList() { - return class__; - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public int getClass_Count() { - return class__.size(); - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getClass_(int index) { - return class__.get(index); - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getClass_OrBuilder( - int index) { - return class__.get(index); - } - - private void initFields() { - strings_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance(); - qualifiedNames_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance(); - package_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.getDefaultInstance(); - class__ = java.util.Collections.emptyList(); - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; - - if (hasQualifiedNames()) { - if (!getQualifiedNames().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - if (hasPackage()) { - if (!getPackage().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - for (int i = 0; i < getClass_Count(); i++) { - if (!getClass_(i).isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(org.jetbrains.kotlin.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeMessage(1, strings_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeMessage(2, qualifiedNames_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeMessage(3, package_); - } - for (int i = 0; i < class__.size(); i++) { - output.writeMessage(4, class__.get(i)); - } - 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 += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(1, strings_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(2, qualifiedNames_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(3, package_); - } - for (int i = 0; i < class__.size(); i++) { - size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(4, class__.get(i)); - } - 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.builtins.DebugBuiltInsProtoBuf.BuiltIns parseFrom( - org.jetbrains.kotlin.protobuf.ByteString data) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns parseFrom( - org.jetbrains.kotlin.protobuf.ByteString data, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns parseFrom(byte[] data) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns parseFrom( - byte[] data, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns parseFrom( - java.io.InputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns parseDelimitedFrom( - java.io.InputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns parseFrom( - org.jetbrains.kotlin.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns parseFrom( - org.jetbrains.kotlin.protobuf.CodedInputStream input, - org.jetbrains.kotlin.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.builtins.DebugBuiltInsProtoBuf.BuiltIns prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - org.jetbrains.kotlin.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code org.jetbrains.kotlin.serialization.builtins.BuiltIns} - */ - public static final class Builder extends - org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements - // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.builtins.BuiltIns) - org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltInsOrBuilder { - public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_descriptor; - } - - protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns.class, org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns.Builder.class); - } - - // Construct using org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - org.jetbrains.kotlin.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (org.jetbrains.kotlin.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - getStringsFieldBuilder(); - getQualifiedNamesFieldBuilder(); - getPackageFieldBuilder(); - getClass_FieldBuilder(); - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - if (stringsBuilder_ == null) { - strings_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance(); - } else { - stringsBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000001); - if (qualifiedNamesBuilder_ == null) { - qualifiedNames_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance(); - } else { - qualifiedNamesBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000002); - if (packageBuilder_ == null) { - package_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.getDefaultInstance(); - } else { - packageBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000004); - if (class_Builder_ == null) { - class__ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000008); - } else { - class_Builder_.clear(); - } - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_descriptor; - } - - public org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns getDefaultInstanceForType() { - return org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns.getDefaultInstance(); - } - - public org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns build() { - org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns buildPartial() { - org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns result = new org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - if (stringsBuilder_ == null) { - result.strings_ = strings_; - } else { - result.strings_ = stringsBuilder_.build(); - } - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - if (qualifiedNamesBuilder_ == null) { - result.qualifiedNames_ = qualifiedNames_; - } else { - result.qualifiedNames_ = qualifiedNamesBuilder_.build(); - } - if (((from_bitField0_ & 0x00000004) == 0x00000004)) { - to_bitField0_ |= 0x00000004; - } - if (packageBuilder_ == null) { - result.package_ = package_; - } else { - result.package_ = packageBuilder_.build(); - } - if (class_Builder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { - class__ = java.util.Collections.unmodifiableList(class__); - bitField0_ = (bitField0_ & ~0x00000008); - } - result.class__ = class__; - } else { - result.class__ = class_Builder_.build(); - } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) { - if (other instanceof org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns) { - return mergeFrom((org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns other) { - if (other == org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns.getDefaultInstance()) return this; - if (other.hasStrings()) { - mergeStrings(other.getStrings()); - } - if (other.hasQualifiedNames()) { - mergeQualifiedNames(other.getQualifiedNames()); - } - if (other.hasPackage()) { - mergePackage(other.getPackage()); - } - if (class_Builder_ == null) { - if (!other.class__.isEmpty()) { - if (class__.isEmpty()) { - class__ = other.class__; - bitField0_ = (bitField0_ & ~0x00000008); - } else { - ensureClass_IsMutable(); - class__.addAll(other.class__); - } - onChanged(); - } - } else { - if (!other.class__.isEmpty()) { - if (class_Builder_.isEmpty()) { - class_Builder_.dispose(); - class_Builder_ = null; - class__ = other.class__; - bitField0_ = (bitField0_ & ~0x00000008); - class_Builder_ = - org.jetbrains.kotlin.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getClass_FieldBuilder() : null; - } else { - class_Builder_.addAllMessages(other.class__); - } - } - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - if (hasQualifiedNames()) { - if (!getQualifiedNames().isInitialized()) { - - return false; - } - } - if (hasPackage()) { - if (!getPackage().isInitialized()) { - - return false; - } - } - for (int i = 0; i < getClass_Count(); i++) { - if (!getClass_(i).isInitialized()) { - - return false; - } - } - return true; - } - - public Builder mergeFrom( - org.jetbrains.kotlin.protobuf.CodedInputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltIns) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - private org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable strings_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance(); - private org.jetbrains.kotlin.protobuf.SingleFieldBuilder< - org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder> stringsBuilder_; - /** - * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1; - */ - public boolean hasStrings() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1; - */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable getStrings() { - if (stringsBuilder_ == null) { - return strings_; - } else { - return stringsBuilder_.getMessage(); - } - } - /** - * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1; - */ - public Builder setStrings(org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable value) { - if (stringsBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - strings_ = value; - onChanged(); - } else { - stringsBuilder_.setMessage(value); - } - bitField0_ |= 0x00000001; - return this; - } - /** - * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1; - */ - public Builder setStrings( - org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder builderForValue) { - if (stringsBuilder_ == null) { - strings_ = builderForValue.build(); - onChanged(); - } else { - stringsBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000001; - return this; - } - /** - * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1; - */ - public Builder mergeStrings(org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable value) { - if (stringsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001) && - strings_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance()) { - strings_ = - org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.newBuilder(strings_).mergeFrom(value).buildPartial(); - } else { - strings_ = value; - } - onChanged(); - } else { - stringsBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000001; - return this; - } - /** - * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1; - */ - public Builder clearStrings() { - if (stringsBuilder_ == null) { - strings_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance(); - onChanged(); - } else { - stringsBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000001); - return this; - } - /** - * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1; - */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder getStringsBuilder() { - bitField0_ |= 0x00000001; - onChanged(); - return getStringsFieldBuilder().getBuilder(); - } - /** - * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1; - */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder getStringsOrBuilder() { - if (stringsBuilder_ != null) { - return stringsBuilder_.getMessageOrBuilder(); - } else { - return strings_; - } - } - /** - * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1; - */ - private org.jetbrains.kotlin.protobuf.SingleFieldBuilder< - org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder> - getStringsFieldBuilder() { - if (stringsBuilder_ == null) { - stringsBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder< - org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder>( - getStrings(), - getParentForChildren(), - isClean()); - strings_ = null; - } - return stringsBuilder_; - } - - private org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable qualifiedNames_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance(); - private org.jetbrains.kotlin.protobuf.SingleFieldBuilder< - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder> qualifiedNamesBuilder_; - /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2; - */ - public boolean hasQualifiedNames() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2; - */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable getQualifiedNames() { - if (qualifiedNamesBuilder_ == null) { - return qualifiedNames_; - } else { - return qualifiedNamesBuilder_.getMessage(); - } - } - /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2; - */ - public Builder setQualifiedNames(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable value) { - if (qualifiedNamesBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - qualifiedNames_ = value; - onChanged(); - } else { - qualifiedNamesBuilder_.setMessage(value); - } - bitField0_ |= 0x00000002; - return this; - } - /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2; - */ - public Builder setQualifiedNames( - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder builderForValue) { - if (qualifiedNamesBuilder_ == null) { - qualifiedNames_ = builderForValue.build(); - onChanged(); - } else { - qualifiedNamesBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000002; - return this; - } - /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2; - */ - public Builder mergeQualifiedNames(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable value) { - if (qualifiedNamesBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002) && - qualifiedNames_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance()) { - qualifiedNames_ = - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.newBuilder(qualifiedNames_).mergeFrom(value).buildPartial(); - } else { - qualifiedNames_ = value; - } - onChanged(); - } else { - qualifiedNamesBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000002; - return this; - } - /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2; - */ - public Builder clearQualifiedNames() { - if (qualifiedNamesBuilder_ == null) { - qualifiedNames_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance(); - onChanged(); - } else { - qualifiedNamesBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000002); - return this; - } - /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2; - */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder getQualifiedNamesBuilder() { - bitField0_ |= 0x00000002; - onChanged(); - return getQualifiedNamesFieldBuilder().getBuilder(); - } - /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2; - */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder getQualifiedNamesOrBuilder() { - if (qualifiedNamesBuilder_ != null) { - return qualifiedNamesBuilder_.getMessageOrBuilder(); - } else { - return qualifiedNames_; - } - } - /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2; - */ - private org.jetbrains.kotlin.protobuf.SingleFieldBuilder< - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder> - getQualifiedNamesFieldBuilder() { - if (qualifiedNamesBuilder_ == null) { - qualifiedNamesBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder< - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder>( - getQualifiedNames(), - getParentForChildren(), - isClean()); - qualifiedNames_ = null; - } - return qualifiedNamesBuilder_; - } - - private org.jetbrains.kotlin.serialization.DebugProtoBuf.Package package_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.getDefaultInstance(); - private org.jetbrains.kotlin.protobuf.SingleFieldBuilder< - org.jetbrains.kotlin.serialization.DebugProtoBuf.Package, org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder> packageBuilder_; - /** - * optional .org.jetbrains.kotlin.serialization.Package package = 3; - */ - public boolean hasPackage() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional .org.jetbrains.kotlin.serialization.Package package = 3; - */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.Package getPackage() { - if (packageBuilder_ == null) { - return package_; - } else { - return packageBuilder_.getMessage(); - } - } - /** - * optional .org.jetbrains.kotlin.serialization.Package package = 3; - */ - public Builder setPackage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Package value) { - if (packageBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - package_ = value; - onChanged(); - } else { - packageBuilder_.setMessage(value); - } - bitField0_ |= 0x00000004; - return this; - } - /** - * optional .org.jetbrains.kotlin.serialization.Package package = 3; - */ - public Builder setPackage( - org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.Builder builderForValue) { - if (packageBuilder_ == null) { - package_ = builderForValue.build(); - onChanged(); - } else { - packageBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000004; - return this; - } - /** - * optional .org.jetbrains.kotlin.serialization.Package package = 3; - */ - public Builder mergePackage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Package value) { - if (packageBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004) && - package_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.getDefaultInstance()) { - package_ = - org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.newBuilder(package_).mergeFrom(value).buildPartial(); - } else { - package_ = value; - } - onChanged(); - } else { - packageBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000004; - return this; - } - /** - * optional .org.jetbrains.kotlin.serialization.Package package = 3; - */ - public Builder clearPackage() { - if (packageBuilder_ == null) { - package_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.getDefaultInstance(); - onChanged(); - } else { - packageBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000004); - return this; - } - /** - * optional .org.jetbrains.kotlin.serialization.Package package = 3; - */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.Builder getPackageBuilder() { - bitField0_ |= 0x00000004; - onChanged(); - return getPackageFieldBuilder().getBuilder(); - } - /** - * optional .org.jetbrains.kotlin.serialization.Package package = 3; - */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder getPackageOrBuilder() { - if (packageBuilder_ != null) { - return packageBuilder_.getMessageOrBuilder(); - } else { - return package_; - } - } - /** - * optional .org.jetbrains.kotlin.serialization.Package package = 3; - */ - private org.jetbrains.kotlin.protobuf.SingleFieldBuilder< - org.jetbrains.kotlin.serialization.DebugProtoBuf.Package, org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder> - getPackageFieldBuilder() { - if (packageBuilder_ == null) { - packageBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder< - org.jetbrains.kotlin.serialization.DebugProtoBuf.Package, org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder>( - getPackage(), - getParentForChildren(), - isClean()); - package_ = null; - } - return packageBuilder_; - } - - private java.util.List class__ = - java.util.Collections.emptyList(); - private void ensureClass_IsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { - class__ = new java.util.ArrayList(class__); - bitField0_ |= 0x00000008; - } - } - - private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder< - org.jetbrains.kotlin.serialization.DebugProtoBuf.Class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder> class_Builder_; - - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public java.util.List getClass_List() { - if (class_Builder_ == null) { - return java.util.Collections.unmodifiableList(class__); - } else { - return class_Builder_.getMessageList(); - } - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public int getClass_Count() { - if (class_Builder_ == null) { - return class__.size(); - } else { - return class_Builder_.getCount(); - } - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getClass_(int index) { - if (class_Builder_ == null) { - return class__.get(index); - } else { - return class_Builder_.getMessage(index); - } - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public Builder setClass_( - int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class value) { - if (class_Builder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureClass_IsMutable(); - class__.set(index, value); - onChanged(); - } else { - class_Builder_.setMessage(index, value); - } - return this; - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public Builder setClass_( - int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder builderForValue) { - if (class_Builder_ == null) { - ensureClass_IsMutable(); - class__.set(index, builderForValue.build()); - onChanged(); - } else { - class_Builder_.setMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public Builder addClass_(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class value) { - if (class_Builder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureClass_IsMutable(); - class__.add(value); - onChanged(); - } else { - class_Builder_.addMessage(value); - } - return this; - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public Builder addClass_( - int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class value) { - if (class_Builder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureClass_IsMutable(); - class__.add(index, value); - onChanged(); - } else { - class_Builder_.addMessage(index, value); - } - return this; - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public Builder addClass_( - org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder builderForValue) { - if (class_Builder_ == null) { - ensureClass_IsMutable(); - class__.add(builderForValue.build()); - onChanged(); - } else { - class_Builder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public Builder addClass_( - int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder builderForValue) { - if (class_Builder_ == null) { - ensureClass_IsMutable(); - class__.add(index, builderForValue.build()); - onChanged(); - } else { - class_Builder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public Builder addAllClass_( - java.lang.Iterable values) { - if (class_Builder_ == null) { - ensureClass_IsMutable(); - org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll( - values, class__); - onChanged(); - } else { - class_Builder_.addAllMessages(values); - } - return this; - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public Builder clearClass_() { - if (class_Builder_ == null) { - class__ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000008); - onChanged(); - } else { - class_Builder_.clear(); - } - return this; - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public Builder removeClass_(int index) { - if (class_Builder_ == null) { - ensureClass_IsMutable(); - class__.remove(index); - onChanged(); - } else { - class_Builder_.remove(index); - } - return this; - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder getClass_Builder( - int index) { - return getClass_FieldBuilder().getBuilder(index); - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getClass_OrBuilder( - int index) { - if (class_Builder_ == null) { - return class__.get(index); } else { - return class_Builder_.getMessageOrBuilder(index); - } - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public java.util.List - getClass_OrBuilderList() { - if (class_Builder_ != null) { - return class_Builder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(class__); - } - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder addClass_Builder() { - return getClass_FieldBuilder().addBuilder( - org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.getDefaultInstance()); - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder addClass_Builder( - int index) { - return getClass_FieldBuilder().addBuilder( - index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.getDefaultInstance()); - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public java.util.List - getClass_BuilderList() { - return getClass_FieldBuilder().getBuilderList(); - } - private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder< - org.jetbrains.kotlin.serialization.DebugProtoBuf.Class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder> - getClass_FieldBuilder() { - if (class_Builder_ == null) { - class_Builder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder< - org.jetbrains.kotlin.serialization.DebugProtoBuf.Class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder>( - class__, - ((bitField0_ & 0x00000008) == 0x00000008), - getParentForChildren(), - isClean()); - class__ = null; - } - return class_Builder_; - } - - // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.builtins.BuiltIns) - } - - static { - defaultInstance = new BuiltIns(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.builtins.BuiltIns) - } - public static final int PACKAGE_FQ_NAME_FIELD_NUMBER = 151; /** * extend .org.jetbrains.kotlin.serialization.Package { ... } @@ -1410,11 +128,6 @@ public final class DebugBuiltInsProtoBuf { .newFileScopedGeneratedExtension( org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance()); - private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor - internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_descriptor; - private static - org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_fieldAccessorTable; public static org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -1427,43 +140,36 @@ public final class DebugBuiltInsProtoBuf { "\n-core/deserialization/src/builtins.debu" + "g.proto\022+org.jetbrains.kotlin.serializat" + "ion.builtins\0320core/deserialization/src/d" + - "escriptors.debug.proto\"\225\002\n\010BuiltIns\022@\n\007s" + - "trings\030\001 \001(\0132/.org.jetbrains.kotlin.seri" + - "alization.StringTable\022O\n\017qualified_names" + - "\030\002 \001(\01326.org.jetbrains.kotlin.serializat" + - "ion.QualifiedNameTable\022<\n\007package\030\003 \001(\0132" + - "+.org.jetbrains.kotlin.serialization.Pac" + - "kage\0228\n\005class\030\004 \003(\0132).org.jetbrains.kotl", - "in.serialization.Class:E\n\017package_fq_nam" + + "escriptors.debug.proto:E\n\017package_fq_nam" + "e\022+.org.jetbrains.kotlin.serialization.P" + "ackage\030\227\001 \001(\005:t\n\020class_annotation\022).org." + "jetbrains.kotlin.serialization.Class\030\226\001 " + "\003(\0132..org.jetbrains.kotlin.serialization" + ".Annotation:\200\001\n\026constructor_annotation\022/" + - ".org.jetbrains.kotlin.serialization.Cons" + + ".org.jetbrains.kotlin.serialization.Cons", "tructor\030\226\001 \003(\0132..org.jetbrains.kotlin.se" + "rialization.Annotation:z\n\023function_annot" + - "ation\022,.org.jetbrains.kotlin.serializati", + "ation\022,.org.jetbrains.kotlin.serializati" + "on.Function\030\226\001 \003(\0132..org.jetbrains.kotli" + "n.serialization.Annotation:z\n\023property_a" + "nnotation\022,.org.jetbrains.kotlin.seriali" + "zation.Property\030\226\001 \003(\0132..org.jetbrains.k" + "otlin.serialization.Annotation:\210\001\n\022compi" + "le_time_value\022,.org.jetbrains.kotlin.ser" + - "ialization.Property\030\227\001 \001(\0132=.org.jetbrai" + + "ialization.Property\030\227\001 \001(\0132=.org.jetbrai", "ns.kotlin.serialization.Annotation.Argum" + "ent.Value:}\n\025enum_entry_annotation\022-.org" + - ".jetbrains.kotlin.serialization.EnumEntr", + ".jetbrains.kotlin.serialization.EnumEntr" + "y\030\226\001 \003(\0132..org.jetbrains.kotlin.serializ" + "ation.Annotation:\201\001\n\024parameter_annotatio" + "n\0222.org.jetbrains.kotlin.serialization.V" + "alueParameter\030\226\001 \003(\0132..org.jetbrains.kot" + "lin.serialization.Annotation:r\n\017type_ann" + "otation\022(.org.jetbrains.kotlin.serializa" + - "tion.Type\030\226\001 \003(\0132..org.jetbrains.kotlin." + + "tion.Type\030\226\001 \003(\0132..org.jetbrains.kotlin.", "serialization.Annotation:\205\001\n\031type_parame" + "ter_annotation\0221.org.jetbrains.kotlin.se" + - "rialization.TypeParameter\030\226\001 \003(\0132..org.j", + "rialization.TypeParameter\030\226\001 \003(\0132..org.j" + "etbrains.kotlin.serialization.Annotation" + "B\027B\025DebugBuiltInsProtoBuf" }; @@ -1480,12 +186,6 @@ public final class DebugBuiltInsProtoBuf { new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] { org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor(), }, assigner); - internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_fieldAccessorTable = new - org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_descriptor, - new java.lang.String[] { "Strings", "QualifiedNames", "Package", "Class_", }); packageFqName.internalInit(descriptor.getExtensions().get(0)); classAnnotation.internalInit(descriptor.getExtensions().get(1)); constructorAnnotation.internalInit(descriptor.getExtensions().get(2)); diff --git a/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/MetadataSerializer.kt b/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/MetadataSerializer.kt index 5371260dc7c..e651dad1c8a 100644 --- a/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/MetadataSerializer.kt +++ b/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/MetadataSerializer.kt @@ -40,7 +40,6 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter -import org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf import org.jetbrains.kotlin.serialization.builtins.BuiltInsSerializerExtension import org.jetbrains.kotlin.serialization.deserialization.MetadataPackageFragment.Companion.DOT_METADATA_FILE_EXTENSION import org.jetbrains.kotlin.serialization.jvm.JvmPackageTable @@ -145,7 +144,7 @@ open class MetadataSerializer(private val dependOnOldBuiltIns: Boolean) { packageFqName: FqName, private val destFile: File ) { - private val proto = BuiltInsProtoBuf.BuiltIns.newBuilder() + private val proto = ProtoBuf.PackageFragment.newBuilder() private val extension = BuiltInsSerializerExtension(packageFqName) fun run() { diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsClassDataFinder.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsClassDataFinder.kt index 9691c279dcd..90d3bb38c00 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsClassDataFinder.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsClassDataFinder.kt @@ -20,12 +20,12 @@ import org.jetbrains.kotlin.descriptors.SourceElement import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.serialization.ClassData import org.jetbrains.kotlin.serialization.ClassDataWithSource -import org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf +import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder import org.jetbrains.kotlin.serialization.deserialization.NameResolver class BuiltInsClassDataFinder( - proto: BuiltInsProtoBuf.BuiltIns, + proto: ProtoBuf.PackageFragment, private val nameResolver: NameResolver ) : ClassDataFinder { private val classIdToProto = diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsPackageFragment.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsPackageFragment.kt index 3fcdd8d6aa0..f572400f5ab 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsPackageFragment.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsPackageFragment.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.builtins import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf +import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.ClassDeserializer import org.jetbrains.kotlin.serialization.deserialization.DeserializedPackageFragment import org.jetbrains.kotlin.serialization.deserialization.NameResolverImpl @@ -44,7 +44,7 @@ class BuiltInsPackageFragment( ) } - BuiltInsProtoBuf.BuiltIns.parseFrom(stream, BuiltInSerializerProtocol.extensionRegistry) + ProtoBuf.PackageFragment.parseFrom(stream, BuiltInSerializerProtocol.extensionRegistry) } private val nameResolver = NameResolverImpl(proto.strings, proto.qualifiedNames) diff --git a/core/deserialization/src/builtins.proto b/core/deserialization/src/builtins.proto index 4856d56f26a..cfed3e555eb 100644 --- a/core/deserialization/src/builtins.proto +++ b/core/deserialization/src/builtins.proto @@ -21,15 +21,6 @@ import "core/deserialization/src/descriptors.proto"; option java_outer_classname = "BuiltInsProtoBuf"; option optimize_for = LITE_RUNTIME; -message BuiltIns { - optional StringTable strings = 1; - optional QualifiedNameTable qualified_names = 2; - - optional Package package = 3; - - repeated Class class = 4; -} - extend Package { optional int32 package_fq_name = 151; } 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 3e7b1771aea..44315a312cf 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java @@ -18,868 +18,6 @@ public final class BuiltInsProtoBuf { registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.typeAnnotation); registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.typeParameterAnnotation); } - public interface BuiltInsOrBuilder extends - // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.builtins.BuiltIns) - org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { - - /** - * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1; - */ - boolean hasStrings(); - /** - * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1; - */ - org.jetbrains.kotlin.serialization.ProtoBuf.StringTable getStrings(); - - /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2; - */ - boolean hasQualifiedNames(); - /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2; - */ - org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable getQualifiedNames(); - - /** - * optional .org.jetbrains.kotlin.serialization.Package package = 3; - */ - boolean hasPackage(); - /** - * optional .org.jetbrains.kotlin.serialization.Package package = 3; - */ - org.jetbrains.kotlin.serialization.ProtoBuf.Package getPackage(); - - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - java.util.List - getClass_List(); - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - org.jetbrains.kotlin.serialization.ProtoBuf.Class getClass_(int index); - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - int getClass_Count(); - } - /** - * Protobuf type {@code org.jetbrains.kotlin.serialization.builtins.BuiltIns} - */ - public static final class BuiltIns extends - org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements - // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.builtins.BuiltIns) - BuiltInsOrBuilder { - // Use BuiltIns.newBuilder() to construct. - private BuiltIns(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private BuiltIns(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;} - - private static final BuiltIns defaultInstance; - public static BuiltIns getDefaultInstance() { - return defaultInstance; - } - - public BuiltIns getDefaultInstanceForType() { - return defaultInstance; - } - - private final org.jetbrains.kotlin.protobuf.ByteString unknownFields; - private BuiltIns( - org.jetbrains.kotlin.protobuf.CodedInputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput = - org.jetbrains.kotlin.protobuf.ByteString.newOutput(); - org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = - org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFieldsCodedOutput, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.Builder subBuilder = null; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - subBuilder = strings_.toBuilder(); - } - strings_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(strings_); - strings_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000001; - break; - } - case 18: { - org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.Builder subBuilder = null; - if (((bitField0_ & 0x00000002) == 0x00000002)) { - subBuilder = qualifiedNames_.toBuilder(); - } - qualifiedNames_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(qualifiedNames_); - qualifiedNames_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000002; - break; - } - case 26: { - org.jetbrains.kotlin.serialization.ProtoBuf.Package.Builder subBuilder = null; - if (((bitField0_ & 0x00000004) == 0x00000004)) { - subBuilder = package_.toBuilder(); - } - package_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Package.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(package_); - package_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000004; - break; - } - case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { - class__ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000008; - } - class__.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Class.PARSER, extensionRegistry)); - break; - } - } - } - } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { - class__ = java.util.Collections.unmodifiableList(class__); - } - try { - unknownFieldsCodedOutput.flush(); - } catch (java.io.IOException e) { - // Should not happen - } finally { - unknownFields = unknownFieldsOutput.toByteString(); - } - makeExtensionsImmutable(); - } - } - public static org.jetbrains.kotlin.protobuf.Parser PARSER = - new org.jetbrains.kotlin.protobuf.AbstractParser() { - public BuiltIns parsePartialFrom( - org.jetbrains.kotlin.protobuf.CodedInputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return new BuiltIns(input, extensionRegistry); - } - }; - - @java.lang.Override - public org.jetbrains.kotlin.protobuf.Parser getParserForType() { - return PARSER; - } - - private int bitField0_; - public static final int STRINGS_FIELD_NUMBER = 1; - private org.jetbrains.kotlin.serialization.ProtoBuf.StringTable strings_; - /** - * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1; - */ - public boolean hasStrings() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1; - */ - public org.jetbrains.kotlin.serialization.ProtoBuf.StringTable getStrings() { - return strings_; - } - - public static final int QUALIFIED_NAMES_FIELD_NUMBER = 2; - private org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable qualifiedNames_; - /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2; - */ - public boolean hasQualifiedNames() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2; - */ - public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable getQualifiedNames() { - return qualifiedNames_; - } - - public static final int PACKAGE_FIELD_NUMBER = 3; - private org.jetbrains.kotlin.serialization.ProtoBuf.Package package_; - /** - * optional .org.jetbrains.kotlin.serialization.Package package = 3; - */ - public boolean hasPackage() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional .org.jetbrains.kotlin.serialization.Package package = 3; - */ - public org.jetbrains.kotlin.serialization.ProtoBuf.Package getPackage() { - return package_; - } - - public static final int CLASS_FIELD_NUMBER = 4; - private java.util.List class__; - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public java.util.List getClass_List() { - return class__; - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public java.util.List - getClass_OrBuilderList() { - return class__; - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public int getClass_Count() { - return class__.size(); - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public org.jetbrains.kotlin.serialization.ProtoBuf.Class getClass_(int index) { - return class__.get(index); - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public org.jetbrains.kotlin.serialization.ProtoBuf.ClassOrBuilder getClass_OrBuilder( - int index) { - return class__.get(index); - } - - private void initFields() { - strings_ = org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance(); - qualifiedNames_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance(); - package_ = org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance(); - class__ = java.util.Collections.emptyList(); - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; - - if (hasQualifiedNames()) { - if (!getQualifiedNames().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - if (hasPackage()) { - if (!getPackage().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - for (int i = 0; i < getClass_Count(); i++) { - if (!getClass_(i).isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(org.jetbrains.kotlin.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeMessage(1, strings_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeMessage(2, qualifiedNames_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeMessage(3, package_); - } - for (int i = 0; i < class__.size(); i++) { - output.writeMessage(4, class__.get(i)); - } - output.writeRawBytes(unknownFields); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(1, strings_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(2, qualifiedNames_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(3, package_); - } - for (int i = 0; i < class__.size(); i++) { - size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(4, class__.get(i)); - } - size += unknownFields.size(); - 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.builtins.BuiltInsProtoBuf.BuiltIns parseFrom( - org.jetbrains.kotlin.protobuf.ByteString data) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns parseFrom( - org.jetbrains.kotlin.protobuf.ByteString data, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns parseFrom(byte[] data) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns parseFrom( - byte[] data, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns parseFrom( - java.io.InputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns parseDelimitedFrom( - java.io.InputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns parseFrom( - org.jetbrains.kotlin.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns parseFrom( - org.jetbrains.kotlin.protobuf.CodedInputStream input, - org.jetbrains.kotlin.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.builtins.BuiltInsProtoBuf.BuiltIns prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - /** - * Protobuf type {@code org.jetbrains.kotlin.serialization.builtins.BuiltIns} - */ - public static final class Builder extends - org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder< - org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns, Builder> - implements - // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.builtins.BuiltIns) - org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltInsOrBuilder { - // Construct using org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - strings_ = org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000001); - qualifiedNames_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000002); - package_ = org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000004); - class__ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000008); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns getDefaultInstanceForType() { - return org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns.getDefaultInstance(); - } - - public org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns build() { - org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns buildPartial() { - org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns result = new org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - result.strings_ = strings_; - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - result.qualifiedNames_ = qualifiedNames_; - if (((from_bitField0_ & 0x00000004) == 0x00000004)) { - to_bitField0_ |= 0x00000004; - } - result.package_ = package_; - if (((bitField0_ & 0x00000008) == 0x00000008)) { - class__ = java.util.Collections.unmodifiableList(class__); - bitField0_ = (bitField0_ & ~0x00000008); - } - result.class__ = class__; - result.bitField0_ = to_bitField0_; - return result; - } - - public Builder mergeFrom(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns other) { - if (other == org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns.getDefaultInstance()) return this; - if (other.hasStrings()) { - mergeStrings(other.getStrings()); - } - if (other.hasQualifiedNames()) { - mergeQualifiedNames(other.getQualifiedNames()); - } - if (other.hasPackage()) { - mergePackage(other.getPackage()); - } - if (!other.class__.isEmpty()) { - if (class__.isEmpty()) { - class__ = other.class__; - bitField0_ = (bitField0_ & ~0x00000008); - } else { - ensureClass_IsMutable(); - class__.addAll(other.class__); - } - - } - setUnknownFields( - getUnknownFields().concat(other.unknownFields)); - return this; - } - - public final boolean isInitialized() { - if (hasQualifiedNames()) { - if (!getQualifiedNames().isInitialized()) { - - return false; - } - } - if (hasPackage()) { - if (!getPackage().isInitialized()) { - - return false; - } - } - for (int i = 0; i < getClass_Count(); i++) { - if (!getClass_(i).isInitialized()) { - - return false; - } - } - return true; - } - - public Builder mergeFrom( - org.jetbrains.kotlin.protobuf.CodedInputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - private org.jetbrains.kotlin.serialization.ProtoBuf.StringTable strings_ = org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance(); - /** - * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1; - */ - public boolean hasStrings() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1; - */ - public org.jetbrains.kotlin.serialization.ProtoBuf.StringTable getStrings() { - return strings_; - } - /** - * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1; - */ - public Builder setStrings(org.jetbrains.kotlin.serialization.ProtoBuf.StringTable value) { - if (value == null) { - throw new NullPointerException(); - } - strings_ = value; - - bitField0_ |= 0x00000001; - return this; - } - /** - * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1; - */ - public Builder setStrings( - org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.Builder builderForValue) { - strings_ = builderForValue.build(); - - bitField0_ |= 0x00000001; - return this; - } - /** - * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1; - */ - public Builder mergeStrings(org.jetbrains.kotlin.serialization.ProtoBuf.StringTable value) { - if (((bitField0_ & 0x00000001) == 0x00000001) && - strings_ != org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance()) { - strings_ = - org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.newBuilder(strings_).mergeFrom(value).buildPartial(); - } else { - strings_ = value; - } - - bitField0_ |= 0x00000001; - return this; - } - /** - * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1; - */ - public Builder clearStrings() { - strings_ = org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance(); - - bitField0_ = (bitField0_ & ~0x00000001); - return this; - } - - private org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable qualifiedNames_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance(); - /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2; - */ - public boolean hasQualifiedNames() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2; - */ - public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable getQualifiedNames() { - return qualifiedNames_; - } - /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2; - */ - public Builder setQualifiedNames(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable value) { - if (value == null) { - throw new NullPointerException(); - } - qualifiedNames_ = value; - - bitField0_ |= 0x00000002; - return this; - } - /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2; - */ - public Builder setQualifiedNames( - org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.Builder builderForValue) { - qualifiedNames_ = builderForValue.build(); - - bitField0_ |= 0x00000002; - return this; - } - /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2; - */ - public Builder mergeQualifiedNames(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable value) { - if (((bitField0_ & 0x00000002) == 0x00000002) && - qualifiedNames_ != org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance()) { - qualifiedNames_ = - org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.newBuilder(qualifiedNames_).mergeFrom(value).buildPartial(); - } else { - qualifiedNames_ = value; - } - - bitField0_ |= 0x00000002; - return this; - } - /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2; - */ - public Builder clearQualifiedNames() { - qualifiedNames_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance(); - - bitField0_ = (bitField0_ & ~0x00000002); - return this; - } - - private org.jetbrains.kotlin.serialization.ProtoBuf.Package package_ = org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance(); - /** - * optional .org.jetbrains.kotlin.serialization.Package package = 3; - */ - public boolean hasPackage() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional .org.jetbrains.kotlin.serialization.Package package = 3; - */ - public org.jetbrains.kotlin.serialization.ProtoBuf.Package getPackage() { - return package_; - } - /** - * optional .org.jetbrains.kotlin.serialization.Package package = 3; - */ - public Builder setPackage(org.jetbrains.kotlin.serialization.ProtoBuf.Package value) { - if (value == null) { - throw new NullPointerException(); - } - package_ = value; - - bitField0_ |= 0x00000004; - return this; - } - /** - * optional .org.jetbrains.kotlin.serialization.Package package = 3; - */ - public Builder setPackage( - org.jetbrains.kotlin.serialization.ProtoBuf.Package.Builder builderForValue) { - package_ = builderForValue.build(); - - bitField0_ |= 0x00000004; - return this; - } - /** - * optional .org.jetbrains.kotlin.serialization.Package package = 3; - */ - public Builder mergePackage(org.jetbrains.kotlin.serialization.ProtoBuf.Package value) { - if (((bitField0_ & 0x00000004) == 0x00000004) && - package_ != org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance()) { - package_ = - org.jetbrains.kotlin.serialization.ProtoBuf.Package.newBuilder(package_).mergeFrom(value).buildPartial(); - } else { - package_ = value; - } - - bitField0_ |= 0x00000004; - return this; - } - /** - * optional .org.jetbrains.kotlin.serialization.Package package = 3; - */ - public Builder clearPackage() { - package_ = org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance(); - - bitField0_ = (bitField0_ & ~0x00000004); - return this; - } - - private java.util.List class__ = - java.util.Collections.emptyList(); - private void ensureClass_IsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { - class__ = new java.util.ArrayList(class__); - bitField0_ |= 0x00000008; - } - } - - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public java.util.List getClass_List() { - return java.util.Collections.unmodifiableList(class__); - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public int getClass_Count() { - return class__.size(); - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public org.jetbrains.kotlin.serialization.ProtoBuf.Class getClass_(int index) { - return class__.get(index); - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public Builder setClass_( - int index, org.jetbrains.kotlin.serialization.ProtoBuf.Class value) { - if (value == null) { - throw new NullPointerException(); - } - ensureClass_IsMutable(); - class__.set(index, value); - - return this; - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public Builder setClass_( - int index, org.jetbrains.kotlin.serialization.ProtoBuf.Class.Builder builderForValue) { - ensureClass_IsMutable(); - class__.set(index, builderForValue.build()); - - return this; - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public Builder addClass_(org.jetbrains.kotlin.serialization.ProtoBuf.Class value) { - if (value == null) { - throw new NullPointerException(); - } - ensureClass_IsMutable(); - class__.add(value); - - return this; - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public Builder addClass_( - int index, org.jetbrains.kotlin.serialization.ProtoBuf.Class value) { - if (value == null) { - throw new NullPointerException(); - } - ensureClass_IsMutable(); - class__.add(index, value); - - return this; - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public Builder addClass_( - org.jetbrains.kotlin.serialization.ProtoBuf.Class.Builder builderForValue) { - ensureClass_IsMutable(); - class__.add(builderForValue.build()); - - return this; - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public Builder addClass_( - int index, org.jetbrains.kotlin.serialization.ProtoBuf.Class.Builder builderForValue) { - ensureClass_IsMutable(); - class__.add(index, builderForValue.build()); - - return this; - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public Builder addAllClass_( - java.lang.Iterable values) { - ensureClass_IsMutable(); - org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll( - values, class__); - - return this; - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public Builder clearClass_() { - class__ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000008); - - return this; - } - /** - * repeated .org.jetbrains.kotlin.serialization.Class class = 4; - */ - public Builder removeClass_(int index) { - ensureClass_IsMutable(); - class__.remove(index); - - return this; - } - - // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.builtins.BuiltIns) - } - - static { - defaultInstance = new BuiltIns(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.builtins.BuiltIns) - } - public static final int PACKAGE_FQ_NAME_FIELD_NUMBER = 151; /** * extend .org.jetbrains.kotlin.serialization.Package { ... } diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MetadataPackageFragmentProvider.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MetadataPackageFragmentProvider.kt index a9b71164923..4f21e0a10fa 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MetadataPackageFragmentProvider.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MetadataPackageFragmentProvider.kt @@ -30,7 +30,6 @@ import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.serialization.ClassData import org.jetbrains.kotlin.serialization.ClassDataWithSource import org.jetbrains.kotlin.serialization.ProtoBuf -import org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope import org.jetbrains.kotlin.storage.StorageManager import java.io.InputStream @@ -114,7 +113,7 @@ class MetadataPackageFragment( return true } - private fun readProto(stream: InputStream): Pair { + private fun readProto(stream: InputStream): Pair { val version = BuiltInsBinaryVersion.readFrom(stream) if (!version.isCompatible()) { @@ -126,7 +125,7 @@ class MetadataPackageFragment( ) } - val message = BuiltInsProtoBuf.BuiltIns.parseFrom(stream, BuiltInSerializerProtocol.extensionRegistry) + val message = ProtoBuf.PackageFragment.parseFrom(stream, BuiltInSerializerProtocol.extensionRegistry) val nameResolver = NameResolverImpl(message.strings, message.qualifiedNames) return Pair(message, nameResolver) } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDecompiler.kt index cd5f2662efc..f902299e623 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDecompiler.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDecompiler.kt @@ -33,6 +33,7 @@ import org.jetbrains.kotlin.idea.decompiler.textBuilder.buildDecompiledText import org.jetbrains.kotlin.idea.decompiler.textBuilder.defaultDecompilerRendererOptions import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.renderer.DescriptorRenderer +import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf import org.jetbrains.kotlin.serialization.deserialization.ClassDeserializer import org.jetbrains.kotlin.serialization.deserialization.MetadataPackageFragment @@ -94,7 +95,7 @@ fun buildDecompiledTextForBuiltIns(builtInFile: VirtualFile): DecompiledText { sealed class BuiltInDefinitionFile { class Incompatible(val version: BuiltInsBinaryVersion) : BuiltInDefinitionFile() - class Compatible(val proto: BuiltInsProtoBuf.BuiltIns, + class Compatible(val proto: ProtoBuf.PackageFragment, val packageDirectory: VirtualFile, val isMetadata: Boolean) : BuiltInDefinitionFile() { val nameResolver = NameResolverImpl(proto.strings, proto.qualifiedNames) @@ -133,7 +134,7 @@ sealed class BuiltInDefinitionFile { return BuiltInDefinitionFile.Incompatible(version) } - val proto = BuiltInsProtoBuf.BuiltIns.parseFrom(stream, BuiltInSerializerProtocol.extensionRegistry) + val proto = ProtoBuf.PackageFragment.parseFrom(stream, BuiltInSerializerProtocol.extensionRegistry) val result = BuiltInDefinitionFile.Compatible(proto, file.parent, file.extension == MetadataPackageFragment.METADATA_FILE_EXTENSION) val packageProto = result.proto.`package` if (result.classesToDecompile.isEmpty() && diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDeserializerForDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDeserializerForDecompiler.kt index 42c5570842c..e28888275b8 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDeserializerForDecompiler.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDeserializerForDecompiler.kt @@ -28,13 +28,13 @@ import org.jetbrains.kotlin.idea.decompiler.textBuilder.ResolveEverythingToKotli import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.resolve.TargetPlatform -import org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf +import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.* import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope class KotlinBuiltInDeserializerForDecompiler( packageFqName: FqName, - private val proto: BuiltInsProtoBuf.BuiltIns, + private val proto: ProtoBuf.PackageFragment, private val nameResolver: NameResolver ) : DeserializerForDecompilerBase(packageFqName) { override val targetPlatform: TargetPlatform get() = TargetPlatform.Default