{
- // optional int32 flags = 1 [default = 6];
/**
* optional int32 flags = 1 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -9674,7 +9600,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 1 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -9685,7 +9610,6 @@ public final class DebugProtoBuf {
*/
int getFlags();
- // required int32 fq_name = 3;
/**
* required int32 fq_name = 3;
*/
@@ -9695,7 +9619,6 @@ public final class DebugProtoBuf {
*/
int getFqName();
- // optional int32 companion_object_name = 4;
/**
* optional int32 companion_object_name = 4;
*/
@@ -9705,7 +9628,6 @@ public final class DebugProtoBuf {
*/
int getCompanionObjectName();
- // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
/**
* repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
*/
@@ -9730,7 +9652,6 @@ public final class DebugProtoBuf {
org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
int index);
- // repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
/**
* repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
*/
@@ -9755,7 +9676,6 @@ public final class DebugProtoBuf {
org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getSupertypeOrBuilder(
int index);
- // repeated int32 supertype_id = 2 [packed = true];
/**
* repeated int32 supertype_id = 2 [packed = true];
*/
@@ -9769,7 +9689,6 @@ public final class DebugProtoBuf {
*/
int getSupertypeId(int index);
- // repeated int32 nested_class_name = 7 [packed = true];
/**
* repeated int32 nested_class_name = 7 [packed = true];
*/
@@ -9783,7 +9702,6 @@ public final class DebugProtoBuf {
*/
int getNestedClassName(int index);
- // repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
/**
* repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
*/
@@ -9808,7 +9726,6 @@ public final class DebugProtoBuf {
org.jetbrains.kotlin.serialization.DebugProtoBuf.ConstructorOrBuilder getConstructorOrBuilder(
int index);
- // repeated .org.jetbrains.kotlin.serialization.Function function = 9;
/**
* repeated .org.jetbrains.kotlin.serialization.Function function = 9;
*/
@@ -9833,7 +9750,6 @@ public final class DebugProtoBuf {
org.jetbrains.kotlin.serialization.DebugProtoBuf.FunctionOrBuilder getFunctionOrBuilder(
int index);
- // repeated .org.jetbrains.kotlin.serialization.Property property = 10;
/**
* repeated .org.jetbrains.kotlin.serialization.Property property = 10;
*/
@@ -9858,7 +9774,6 @@ public final class DebugProtoBuf {
org.jetbrains.kotlin.serialization.DebugProtoBuf.PropertyOrBuilder getPropertyOrBuilder(
int index);
- // repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
/**
* repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
*/
@@ -9883,7 +9798,6 @@ public final class DebugProtoBuf {
org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAliasOrBuilder getTypeAliasOrBuilder(
int index);
- // repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
/**
* repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
*/
@@ -9908,7 +9822,6 @@ public final class DebugProtoBuf {
org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntryOrBuilder getEnumEntryOrBuilder(
int index);
- // optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
/**
* optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
*/
@@ -9927,7 +9840,9 @@ public final class DebugProtoBuf {
*/
public static final class Class extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableMessage<
- Class> implements ClassOrBuilder {
+ Class> implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Class)
+ ClassOrBuilder {
// Use Class.newBuilder() to construct.
private Class(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
super(builder);
@@ -10301,14 +10216,12 @@ public final class DebugProtoBuf {
}
private int bitField0_;
- // optional int32 flags = 1 [default = 6];
public static final int FLAGS_FIELD_NUMBER = 1;
private int flags_;
/**
* optional int32 flags = 1 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -10324,7 +10237,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 1 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -10337,7 +10249,6 @@ public final class DebugProtoBuf {
return flags_;
}
- // required int32 fq_name = 3;
public static final int FQ_NAME_FIELD_NUMBER = 3;
private int fqName_;
/**
@@ -10353,7 +10264,6 @@ public final class DebugProtoBuf {
return fqName_;
}
- // optional int32 companion_object_name = 4;
public static final int COMPANION_OBJECT_NAME_FIELD_NUMBER = 4;
private int companionObjectName_;
/**
@@ -10369,7 +10279,6 @@ public final class DebugProtoBuf {
return companionObjectName_;
}
- // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
public static final int TYPE_PARAMETER_FIELD_NUMBER = 5;
private java.util.List typeParameter_;
/**
@@ -10405,7 +10314,6 @@ public final class DebugProtoBuf {
return typeParameter_.get(index);
}
- // repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
public static final int SUPERTYPE_FIELD_NUMBER = 6;
private java.util.List supertype_;
/**
@@ -10441,7 +10349,6 @@ public final class DebugProtoBuf {
return supertype_.get(index);
}
- // repeated int32 supertype_id = 2 [packed = true];
public static final int SUPERTYPE_ID_FIELD_NUMBER = 2;
private java.util.List supertypeId_;
/**
@@ -10465,7 +10372,6 @@ public final class DebugProtoBuf {
}
private int supertypeIdMemoizedSerializedSize = -1;
- // repeated int32 nested_class_name = 7 [packed = true];
public static final int NESTED_CLASS_NAME_FIELD_NUMBER = 7;
private java.util.List nestedClassName_;
/**
@@ -10489,7 +10395,6 @@ public final class DebugProtoBuf {
}
private int nestedClassNameMemoizedSerializedSize = -1;
- // repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
public static final int CONSTRUCTOR_FIELD_NUMBER = 8;
private java.util.List constructor_;
/**
@@ -10525,7 +10430,6 @@ public final class DebugProtoBuf {
return constructor_.get(index);
}
- // repeated .org.jetbrains.kotlin.serialization.Function function = 9;
public static final int FUNCTION_FIELD_NUMBER = 9;
private java.util.List function_;
/**
@@ -10561,7 +10465,6 @@ public final class DebugProtoBuf {
return function_.get(index);
}
- // repeated .org.jetbrains.kotlin.serialization.Property property = 10;
public static final int PROPERTY_FIELD_NUMBER = 10;
private java.util.List property_;
/**
@@ -10597,7 +10500,6 @@ public final class DebugProtoBuf {
return property_.get(index);
}
- // repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
public static final int TYPE_ALIAS_FIELD_NUMBER = 11;
private java.util.List typeAlias_;
/**
@@ -10633,7 +10535,6 @@ public final class DebugProtoBuf {
return typeAlias_.get(index);
}
- // repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
public static final int ENUM_ENTRY_FIELD_NUMBER = 13;
private java.util.List enumEntry_;
/**
@@ -10669,7 +10570,6 @@ public final class DebugProtoBuf {
return enumEntry_.get(index);
}
- // optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
public static final int TYPE_TABLE_FIELD_NUMBER = 30;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable typeTable_;
/**
@@ -10709,7 +10609,8 @@ public final class DebugProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (!hasFqName()) {
memoizedIsInitialized = 0;
@@ -10990,7 +10891,9 @@ public final class DebugProtoBuf {
*/
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder<
- org.jetbrains.kotlin.serialization.DebugProtoBuf.Class, Builder> implements org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder {
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.Class, Builder> implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Class)
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_descriptor;
@@ -11524,13 +11427,11 @@ public final class DebugProtoBuf {
}
private int bitField0_;
- // optional int32 flags = 1 [default = 6];
private int flags_ = 6;
/**
* optional int32 flags = 1 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -11546,7 +11447,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 1 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -11562,7 +11462,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 1 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -11581,7 +11480,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 1 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -11597,7 +11495,6 @@ public final class DebugProtoBuf {
return this;
}
- // required int32 fq_name = 3;
private int fqName_ ;
/**
* required int32 fq_name = 3;
@@ -11630,7 +11527,6 @@ public final class DebugProtoBuf {
return this;
}
- // optional int32 companion_object_name = 4;
private int companionObjectName_ ;
/**
* optional int32 companion_object_name = 4;
@@ -11663,7 +11559,6 @@ public final class DebugProtoBuf {
return this;
}
- // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
private java.util.List typeParameter_ =
java.util.Collections.emptyList();
private void ensureTypeParameterIsMutable() {
@@ -11805,7 +11700,8 @@ public final class DebugProtoBuf {
java.lang.Iterable values) {
if (typeParameterBuilder_ == null) {
ensureTypeParameterIsMutable();
- super.addAll(values, typeParameter_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, typeParameter_);
onChanged();
} else {
typeParameterBuilder_.addAllMessages(values);
@@ -11903,7 +11799,6 @@ public final class DebugProtoBuf {
return typeParameterBuilder_;
}
- // repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
private java.util.List supertype_ =
java.util.Collections.emptyList();
private void ensureSupertypeIsMutable() {
@@ -12045,7 +11940,8 @@ public final class DebugProtoBuf {
java.lang.Iterable values) {
if (supertypeBuilder_ == null) {
ensureSupertypeIsMutable();
- super.addAll(values, supertype_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, supertype_);
onChanged();
} else {
supertypeBuilder_.addAllMessages(values);
@@ -12143,7 +12039,6 @@ public final class DebugProtoBuf {
return supertypeBuilder_;
}
- // repeated int32 supertype_id = 2 [packed = true];
private java.util.List supertypeId_ = java.util.Collections.emptyList();
private void ensureSupertypeIdIsMutable() {
if (!((bitField0_ & 0x00000020) == 0x00000020)) {
@@ -12195,7 +12090,8 @@ public final class DebugProtoBuf {
public Builder addAllSupertypeId(
java.lang.Iterable values) {
ensureSupertypeIdIsMutable();
- super.addAll(values, supertypeId_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, supertypeId_);
onChanged();
return this;
}
@@ -12209,7 +12105,6 @@ public final class DebugProtoBuf {
return this;
}
- // repeated int32 nested_class_name = 7 [packed = true];
private java.util.List nestedClassName_ = java.util.Collections.emptyList();
private void ensureNestedClassNameIsMutable() {
if (!((bitField0_ & 0x00000040) == 0x00000040)) {
@@ -12261,7 +12156,8 @@ public final class DebugProtoBuf {
public Builder addAllNestedClassName(
java.lang.Iterable values) {
ensureNestedClassNameIsMutable();
- super.addAll(values, nestedClassName_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, nestedClassName_);
onChanged();
return this;
}
@@ -12275,7 +12171,6 @@ public final class DebugProtoBuf {
return this;
}
- // repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
private java.util.List constructor_ =
java.util.Collections.emptyList();
private void ensureConstructorIsMutable() {
@@ -12417,7 +12312,8 @@ public final class DebugProtoBuf {
java.lang.Iterable values) {
if (constructorBuilder_ == null) {
ensureConstructorIsMutable();
- super.addAll(values, constructor_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, constructor_);
onChanged();
} else {
constructorBuilder_.addAllMessages(values);
@@ -12515,7 +12411,6 @@ public final class DebugProtoBuf {
return constructorBuilder_;
}
- // repeated .org.jetbrains.kotlin.serialization.Function function = 9;
private java.util.List function_ =
java.util.Collections.emptyList();
private void ensureFunctionIsMutable() {
@@ -12657,7 +12552,8 @@ public final class DebugProtoBuf {
java.lang.Iterable values) {
if (functionBuilder_ == null) {
ensureFunctionIsMutable();
- super.addAll(values, function_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, function_);
onChanged();
} else {
functionBuilder_.addAllMessages(values);
@@ -12755,7 +12651,6 @@ public final class DebugProtoBuf {
return functionBuilder_;
}
- // repeated .org.jetbrains.kotlin.serialization.Property property = 10;
private java.util.List property_ =
java.util.Collections.emptyList();
private void ensurePropertyIsMutable() {
@@ -12897,7 +12792,8 @@ public final class DebugProtoBuf {
java.lang.Iterable values) {
if (propertyBuilder_ == null) {
ensurePropertyIsMutable();
- super.addAll(values, property_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, property_);
onChanged();
} else {
propertyBuilder_.addAllMessages(values);
@@ -12995,7 +12891,6 @@ public final class DebugProtoBuf {
return propertyBuilder_;
}
- // repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
private java.util.List typeAlias_ =
java.util.Collections.emptyList();
private void ensureTypeAliasIsMutable() {
@@ -13137,7 +13032,8 @@ public final class DebugProtoBuf {
java.lang.Iterable values) {
if (typeAliasBuilder_ == null) {
ensureTypeAliasIsMutable();
- super.addAll(values, typeAlias_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, typeAlias_);
onChanged();
} else {
typeAliasBuilder_.addAllMessages(values);
@@ -13235,7 +13131,6 @@ public final class DebugProtoBuf {
return typeAliasBuilder_;
}
- // repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
private java.util.List enumEntry_ =
java.util.Collections.emptyList();
private void ensureEnumEntryIsMutable() {
@@ -13377,7 +13272,8 @@ public final class DebugProtoBuf {
java.lang.Iterable values) {
if (enumEntryBuilder_ == null) {
ensureEnumEntryIsMutable();
- super.addAll(values, enumEntry_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, enumEntry_);
onChanged();
} else {
enumEntryBuilder_.addAllMessages(values);
@@ -13475,7 +13371,6 @@ public final class DebugProtoBuf {
return enumEntryBuilder_;
}
- // optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable typeTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.getDefaultInstance();
private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder> typeTableBuilder_;
@@ -13584,7 +13479,7 @@ public final class DebugProtoBuf {
if (typeTableBuilder_ == null) {
typeTableBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder>(
- typeTable_,
+ getTypeTable(),
getParentForChildren(),
isClean());
typeTable_ = null;
@@ -13604,10 +13499,10 @@ public final class DebugProtoBuf {
}
public interface PackageOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Package)
org.jetbrains.kotlin.protobuf.GeneratedMessage.
ExtendableMessageOrBuilder {
- // repeated .org.jetbrains.kotlin.serialization.Function function = 3;
/**
* repeated .org.jetbrains.kotlin.serialization.Function function = 3;
*/
@@ -13632,7 +13527,6 @@ public final class DebugProtoBuf {
org.jetbrains.kotlin.serialization.DebugProtoBuf.FunctionOrBuilder getFunctionOrBuilder(
int index);
- // repeated .org.jetbrains.kotlin.serialization.Property property = 4;
/**
* repeated .org.jetbrains.kotlin.serialization.Property property = 4;
*/
@@ -13657,7 +13551,6 @@ public final class DebugProtoBuf {
org.jetbrains.kotlin.serialization.DebugProtoBuf.PropertyOrBuilder getPropertyOrBuilder(
int index);
- // repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
/**
* repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
*/
@@ -13682,7 +13575,6 @@ public final class DebugProtoBuf {
org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAliasOrBuilder getTypeAliasOrBuilder(
int index);
- // optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
/**
* optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
*/
@@ -13701,7 +13593,9 @@ public final class DebugProtoBuf {
*/
public static final class Package extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableMessage<
- Package> implements PackageOrBuilder {
+ Package> implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Package)
+ PackageOrBuilder {
// Use Package.newBuilder() to construct.
private Package(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
super(builder);
@@ -13833,7 +13727,6 @@ public final class DebugProtoBuf {
}
private int bitField0_;
- // repeated .org.jetbrains.kotlin.serialization.Function function = 3;
public static final int FUNCTION_FIELD_NUMBER = 3;
private java.util.List function_;
/**
@@ -13869,7 +13762,6 @@ public final class DebugProtoBuf {
return function_.get(index);
}
- // repeated .org.jetbrains.kotlin.serialization.Property property = 4;
public static final int PROPERTY_FIELD_NUMBER = 4;
private java.util.List property_;
/**
@@ -13905,7 +13797,6 @@ public final class DebugProtoBuf {
return property_.get(index);
}
- // repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
public static final int TYPE_ALIAS_FIELD_NUMBER = 5;
private java.util.List typeAlias_;
/**
@@ -13941,7 +13832,6 @@ public final class DebugProtoBuf {
return typeAlias_.get(index);
}
- // optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
public static final int TYPE_TABLE_FIELD_NUMBER = 30;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable typeTable_;
/**
@@ -13972,7 +13862,8 @@ public final class DebugProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
for (int i = 0; i < getFunctionCount(); i++) {
if (!getFunction(i).isInitialized()) {
@@ -14134,7 +14025,9 @@ public final class DebugProtoBuf {
*/
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder<
- org.jetbrains.kotlin.serialization.DebugProtoBuf.Package, Builder> implements org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder {
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.Package, Builder> implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Package)
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Package_descriptor;
@@ -14411,7 +14304,6 @@ public final class DebugProtoBuf {
}
private int bitField0_;
- // repeated .org.jetbrains.kotlin.serialization.Function function = 3;
private java.util.List function_ =
java.util.Collections.emptyList();
private void ensureFunctionIsMutable() {
@@ -14553,7 +14445,8 @@ public final class DebugProtoBuf {
java.lang.Iterable values) {
if (functionBuilder_ == null) {
ensureFunctionIsMutable();
- super.addAll(values, function_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, function_);
onChanged();
} else {
functionBuilder_.addAllMessages(values);
@@ -14651,7 +14544,6 @@ public final class DebugProtoBuf {
return functionBuilder_;
}
- // repeated .org.jetbrains.kotlin.serialization.Property property = 4;
private java.util.List property_ =
java.util.Collections.emptyList();
private void ensurePropertyIsMutable() {
@@ -14793,7 +14685,8 @@ public final class DebugProtoBuf {
java.lang.Iterable values) {
if (propertyBuilder_ == null) {
ensurePropertyIsMutable();
- super.addAll(values, property_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, property_);
onChanged();
} else {
propertyBuilder_.addAllMessages(values);
@@ -14891,7 +14784,6 @@ public final class DebugProtoBuf {
return propertyBuilder_;
}
- // repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
private java.util.List typeAlias_ =
java.util.Collections.emptyList();
private void ensureTypeAliasIsMutable() {
@@ -15033,7 +14925,8 @@ public final class DebugProtoBuf {
java.lang.Iterable values) {
if (typeAliasBuilder_ == null) {
ensureTypeAliasIsMutable();
- super.addAll(values, typeAlias_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, typeAlias_);
onChanged();
} else {
typeAliasBuilder_.addAllMessages(values);
@@ -15131,7 +15024,6 @@ public final class DebugProtoBuf {
return typeAliasBuilder_;
}
- // optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable typeTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.getDefaultInstance();
private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder> typeTableBuilder_;
@@ -15240,7 +15132,7 @@ public final class DebugProtoBuf {
if (typeTableBuilder_ == null) {
typeTableBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder>(
- typeTable_,
+ getTypeTable(),
getParentForChildren(),
isClean());
typeTable_ = null;
@@ -15259,10 +15151,10 @@ public final class DebugProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Package)
}
- public interface TypeTableOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageOrBuilder {
+ public interface TypeTableOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.TypeTable)
+ org.jetbrains.kotlin.protobuf.MessageOrBuilder {
- // repeated .org.jetbrains.kotlin.serialization.Type type = 1;
/**
* repeated .org.jetbrains.kotlin.serialization.Type type = 1;
*/
@@ -15287,7 +15179,6 @@ public final class DebugProtoBuf {
org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder(
int index);
- // optional int32 first_nullable = 2 [default = -1];
/**
* optional int32 first_nullable = 2 [default = -1];
*
@@ -15311,8 +15202,9 @@ public final class DebugProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.TypeTable}
*/
public static final class TypeTable extends
- org.jetbrains.kotlin.protobuf.GeneratedMessage
- implements TypeTableOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.TypeTable)
+ TypeTableOrBuilder {
// Use TypeTable.newBuilder() to construct.
private TypeTable(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
super(builder);
@@ -15414,7 +15306,6 @@ public final class DebugProtoBuf {
}
private int bitField0_;
- // repeated .org.jetbrains.kotlin.serialization.Type type = 1;
public static final int TYPE_FIELD_NUMBER = 1;
private java.util.List type_;
/**
@@ -15450,7 +15341,6 @@ public final class DebugProtoBuf {
return type_.get(index);
}
- // optional int32 first_nullable = 2 [default = -1];
public static final int FIRST_NULLABLE_FIELD_NUMBER = 2;
private int firstNullable_;
/**
@@ -15483,7 +15373,8 @@ public final class DebugProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
for (int i = 0; i < getTypeCount(); i++) {
if (!getType(i).isInitialized()) {
@@ -15603,8 +15494,9 @@ public final class DebugProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.TypeTable}
*/
public static final class Builder extends
- org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder
- implements org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.TypeTable)
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_TypeTable_descriptor;
@@ -15765,7 +15657,6 @@ public final class DebugProtoBuf {
}
private int bitField0_;
- // repeated .org.jetbrains.kotlin.serialization.Type type = 1;
private java.util.List type_ =
java.util.Collections.emptyList();
private void ensureTypeIsMutable() {
@@ -15907,7 +15798,8 @@ public final class DebugProtoBuf {
java.lang.Iterable values) {
if (typeBuilder_ == null) {
ensureTypeIsMutable();
- super.addAll(values, type_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, type_);
onChanged();
} else {
typeBuilder_.addAllMessages(values);
@@ -16005,7 +15897,6 @@ public final class DebugProtoBuf {
return typeBuilder_;
}
- // optional int32 first_nullable = 2 [default = -1];
private int firstNullable_ = -1;
/**
* optional int32 first_nullable = 2 [default = -1];
@@ -16070,15 +15961,14 @@ public final class DebugProtoBuf {
}
public interface ConstructorOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Constructor)
org.jetbrains.kotlin.protobuf.GeneratedMessage.
ExtendableMessageOrBuilder {
- // optional int32 flags = 1 [default = 6];
/**
* optional int32 flags = 1 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*isSecondary
@@ -16089,7 +15979,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 1 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*isSecondary
@@ -16097,7 +15986,6 @@ public final class DebugProtoBuf {
*/
int getFlags();
- // repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
/**
* repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
*/
@@ -16127,7 +16015,9 @@ public final class DebugProtoBuf {
*/
public static final class Constructor extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableMessage<
- Constructor> implements ConstructorOrBuilder {
+ Constructor> implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Constructor)
+ ConstructorOrBuilder {
// Use Constructor.newBuilder() to construct.
private Constructor(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
super(builder);
@@ -16229,14 +16119,12 @@ public final class DebugProtoBuf {
}
private int bitField0_;
- // optional int32 flags = 1 [default = 6];
public static final int FLAGS_FIELD_NUMBER = 1;
private int flags_;
/**
* optional int32 flags = 1 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*isSecondary
@@ -16249,7 +16137,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 1 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*isSecondary
@@ -16259,7 +16146,6 @@ public final class DebugProtoBuf {
return flags_;
}
- // repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
public static final int VALUE_PARAMETER_FIELD_NUMBER = 2;
private java.util.List valueParameter_;
/**
@@ -16302,7 +16188,8 @@ public final class DebugProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
for (int i = 0; i < getValueParameterCount(); i++) {
if (!getValueParameter(i).isInitialized()) {
@@ -16432,7 +16319,9 @@ public final class DebugProtoBuf {
*/
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder<
- org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor, Builder> implements org.jetbrains.kotlin.serialization.DebugProtoBuf.ConstructorOrBuilder {
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor, Builder> implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Constructor)
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.ConstructorOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Constructor_descriptor;
@@ -16598,13 +16487,11 @@ public final class DebugProtoBuf {
}
private int bitField0_;
- // optional int32 flags = 1 [default = 6];
private int flags_ = 6;
/**
* optional int32 flags = 1 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*isSecondary
@@ -16617,7 +16504,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 1 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*isSecondary
@@ -16630,7 +16516,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 1 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*isSecondary
@@ -16646,7 +16531,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 1 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*isSecondary
@@ -16659,7 +16543,6 @@ public final class DebugProtoBuf {
return this;
}
- // repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
private java.util.List valueParameter_ =
java.util.Collections.emptyList();
private void ensureValueParameterIsMutable() {
@@ -16801,7 +16684,8 @@ public final class DebugProtoBuf {
java.lang.Iterable values) {
if (valueParameterBuilder_ == null) {
ensureValueParameterIsMutable();
- super.addAll(values, valueParameter_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, valueParameter_);
onChanged();
} else {
valueParameterBuilder_.addAllMessages(values);
@@ -16911,15 +16795,14 @@ public final class DebugProtoBuf {
}
public interface FunctionOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Function)
org.jetbrains.kotlin.protobuf.GeneratedMessage.
ExtendableMessageOrBuilder {
- // optional int32 flags = 9 [default = 6];
/**
* optional int32 flags = 9 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -16936,7 +16819,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 9 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -16950,7 +16832,6 @@ public final class DebugProtoBuf {
*/
int getFlags();
- // optional int32 old_flags = 1 [default = 6];
/**
* optional int32 old_flags = 1 [default = 6];
*/
@@ -16960,7 +16841,6 @@ public final class DebugProtoBuf {
*/
int getOldFlags();
- // required int32 name = 2;
/**
* required int32 name = 2;
*/
@@ -16970,7 +16850,6 @@ public final class DebugProtoBuf {
*/
int getName();
- // optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
/**
* optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
*/
@@ -16984,7 +16863,6 @@ public final class DebugProtoBuf {
*/
org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder();
- // optional int32 return_type_id = 7;
/**
* optional int32 return_type_id = 7;
*/
@@ -16994,7 +16872,6 @@ public final class DebugProtoBuf {
*/
int getReturnTypeId();
- // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
/**
* repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
*/
@@ -17019,7 +16896,6 @@ public final class DebugProtoBuf {
org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
int index);
- // optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
/**
* optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
*/
@@ -17033,7 +16909,6 @@ public final class DebugProtoBuf {
*/
org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder();
- // optional int32 receiver_type_id = 8;
/**
* optional int32 receiver_type_id = 8;
*/
@@ -17043,7 +16918,6 @@ public final class DebugProtoBuf {
*/
int getReceiverTypeId();
- // repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
/**
* repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
*/
@@ -17068,7 +16942,6 @@ public final class DebugProtoBuf {
org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder getValueParameterOrBuilder(
int index);
- // optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
/**
* optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
*/
@@ -17087,7 +16960,9 @@ public final class DebugProtoBuf {
*/
public static final class Function extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableMessage<
- Function> implements FunctionOrBuilder {
+ Function> implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Function)
+ FunctionOrBuilder {
// Use Function.newBuilder() to construct.
private Function(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
super(builder);
@@ -17259,14 +17134,12 @@ public final class DebugProtoBuf {
}
private int bitField0_;
- // optional int32 flags = 9 [default = 6];
public static final int FLAGS_FIELD_NUMBER = 9;
private int flags_;
/**
* optional int32 flags = 9 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -17285,7 +17158,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 9 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -17301,7 +17173,6 @@ public final class DebugProtoBuf {
return flags_;
}
- // optional int32 old_flags = 1 [default = 6];
public static final int OLD_FLAGS_FIELD_NUMBER = 1;
private int oldFlags_;
/**
@@ -17317,7 +17188,6 @@ public final class DebugProtoBuf {
return oldFlags_;
}
- // required int32 name = 2;
public static final int NAME_FIELD_NUMBER = 2;
private int name_;
/**
@@ -17333,7 +17203,6 @@ public final class DebugProtoBuf {
return name_;
}
- // optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
public static final int RETURN_TYPE_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type returnType_;
/**
@@ -17355,7 +17224,6 @@ public final class DebugProtoBuf {
return returnType_;
}
- // optional int32 return_type_id = 7;
public static final int RETURN_TYPE_ID_FIELD_NUMBER = 7;
private int returnTypeId_;
/**
@@ -17371,7 +17239,6 @@ public final class DebugProtoBuf {
return returnTypeId_;
}
- // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
public static final int TYPE_PARAMETER_FIELD_NUMBER = 4;
private java.util.List typeParameter_;
/**
@@ -17407,7 +17274,6 @@ public final class DebugProtoBuf {
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_;
/**
@@ -17429,7 +17295,6 @@ public final class DebugProtoBuf {
return receiverType_;
}
- // optional int32 receiver_type_id = 8;
public static final int RECEIVER_TYPE_ID_FIELD_NUMBER = 8;
private int receiverTypeId_;
/**
@@ -17445,7 +17310,6 @@ public final class DebugProtoBuf {
return receiverTypeId_;
}
- // repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
public static final int VALUE_PARAMETER_FIELD_NUMBER = 6;
private java.util.List valueParameter_;
/**
@@ -17481,7 +17345,6 @@ public final class DebugProtoBuf {
return valueParameter_.get(index);
}
- // optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
public static final int TYPE_TABLE_FIELD_NUMBER = 30;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable typeTable_;
/**
@@ -17518,7 +17381,8 @@ public final class DebugProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (!hasName()) {
memoizedIsInitialized = 0;
@@ -17732,7 +17596,9 @@ public final class DebugProtoBuf {
*/
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder<
- org.jetbrains.kotlin.serialization.DebugProtoBuf.Function, Builder> implements org.jetbrains.kotlin.serialization.DebugProtoBuf.FunctionOrBuilder {
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.Function, Builder> implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Function)
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.FunctionOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Function_descriptor;
@@ -18058,13 +17924,11 @@ public final class DebugProtoBuf {
}
private int bitField0_;
- // optional int32 flags = 9 [default = 6];
private int flags_ = 6;
/**
* optional int32 flags = 9 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -18083,7 +17947,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 9 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -18102,7 +17965,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 9 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -18124,7 +17986,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 9 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -18143,7 +18004,6 @@ public final class DebugProtoBuf {
return this;
}
- // optional int32 old_flags = 1 [default = 6];
private int oldFlags_ = 6;
/**
* optional int32 old_flags = 1 [default = 6];
@@ -18176,7 +18036,6 @@ public final class DebugProtoBuf {
return this;
}
- // required int32 name = 2;
private int name_ ;
/**
* required int32 name = 2;
@@ -18209,7 +18068,6 @@ public final class DebugProtoBuf {
return this;
}
- // optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type returnType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> returnTypeBuilder_;
@@ -18318,7 +18176,7 @@ public final class DebugProtoBuf {
if (returnTypeBuilder_ == null) {
returnTypeBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
- returnType_,
+ getReturnType(),
getParentForChildren(),
isClean());
returnType_ = null;
@@ -18326,7 +18184,6 @@ public final class DebugProtoBuf {
return returnTypeBuilder_;
}
- // optional int32 return_type_id = 7;
private int returnTypeId_ ;
/**
* optional int32 return_type_id = 7;
@@ -18359,7 +18216,6 @@ public final class DebugProtoBuf {
return this;
}
- // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
private java.util.List typeParameter_ =
java.util.Collections.emptyList();
private void ensureTypeParameterIsMutable() {
@@ -18501,7 +18357,8 @@ public final class DebugProtoBuf {
java.lang.Iterable values) {
if (typeParameterBuilder_ == null) {
ensureTypeParameterIsMutable();
- super.addAll(values, typeParameter_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, typeParameter_);
onChanged();
} else {
typeParameterBuilder_.addAllMessages(values);
@@ -18599,7 +18456,6 @@ public final class DebugProtoBuf {
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 org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> receiverTypeBuilder_;
@@ -18708,7 +18564,7 @@ public final class DebugProtoBuf {
if (receiverTypeBuilder_ == null) {
receiverTypeBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
- receiverType_,
+ getReceiverType(),
getParentForChildren(),
isClean());
receiverType_ = null;
@@ -18716,7 +18572,6 @@ public final class DebugProtoBuf {
return receiverTypeBuilder_;
}
- // optional int32 receiver_type_id = 8;
private int receiverTypeId_ ;
/**
* optional int32 receiver_type_id = 8;
@@ -18749,7 +18604,6 @@ public final class DebugProtoBuf {
return this;
}
- // repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
private java.util.List valueParameter_ =
java.util.Collections.emptyList();
private void ensureValueParameterIsMutable() {
@@ -18891,7 +18745,8 @@ public final class DebugProtoBuf {
java.lang.Iterable values) {
if (valueParameterBuilder_ == null) {
ensureValueParameterIsMutable();
- super.addAll(values, valueParameter_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, valueParameter_);
onChanged();
} else {
valueParameterBuilder_.addAllMessages(values);
@@ -18989,7 +18844,6 @@ public final class DebugProtoBuf {
return valueParameterBuilder_;
}
- // optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable typeTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.getDefaultInstance();
private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder> typeTableBuilder_;
@@ -19098,7 +18952,7 @@ public final class DebugProtoBuf {
if (typeTableBuilder_ == null) {
typeTableBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder>(
- typeTable_,
+ getTypeTable(),
getParentForChildren(),
isClean());
typeTable_ = null;
@@ -19118,15 +18972,14 @@ public final class DebugProtoBuf {
}
public interface PropertyOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Property)
org.jetbrains.kotlin.protobuf.GeneratedMessage.
ExtendableMessageOrBuilder {
- // optional int32 flags = 11 [default = 518];
/**
* optional int32 flags = 11 [default = 518];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -19144,7 +18997,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 11 [default = 518];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -19159,7 +19011,6 @@ public final class DebugProtoBuf {
*/
int getFlags();
- // optional int32 old_flags = 1 [default = 2054];
/**
* optional int32 old_flags = 1 [default = 2054];
*/
@@ -19169,7 +19020,6 @@ public final class DebugProtoBuf {
*/
int getOldFlags();
- // required int32 name = 2;
/**
* required int32 name = 2;
*/
@@ -19179,7 +19029,6 @@ public final class DebugProtoBuf {
*/
int getName();
- // optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
/**
* optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
*/
@@ -19193,7 +19042,6 @@ public final class DebugProtoBuf {
*/
org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder();
- // optional int32 return_type_id = 9;
/**
* optional int32 return_type_id = 9;
*/
@@ -19203,7 +19051,6 @@ public final class DebugProtoBuf {
*/
int getReturnTypeId();
- // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
/**
* repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
*/
@@ -19228,7 +19075,6 @@ public final class DebugProtoBuf {
org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
int index);
- // optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
/**
* optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
*/
@@ -19242,7 +19088,6 @@ public final class DebugProtoBuf {
*/
org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder();
- // optional int32 receiver_type_id = 10;
/**
* optional int32 receiver_type_id = 10;
*/
@@ -19252,7 +19097,6 @@ public final class DebugProtoBuf {
*/
int getReceiverTypeId();
- // optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
/**
* optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
*/
@@ -19266,17 +19110,16 @@ public final class DebugProtoBuf {
*/
org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder getSetterValueParameterOrBuilder();
- // optional int32 getter_flags = 7;
/**
* optional int32 getter_flags = 7;
*
*
- *
*hasAnnotations
*Visibility
*Modality
*isNotDefault
*isExternal
+ *isInline
*
*/
boolean hasGetterFlags();
@@ -19284,17 +19127,16 @@ public final class DebugProtoBuf {
* optional int32 getter_flags = 7;
*
*
- *
*hasAnnotations
*Visibility
*Modality
*isNotDefault
*isExternal
+ *isInline
*
*/
int getGetterFlags();
- // optional int32 setter_flags = 8;
/**
* optional int32 setter_flags = 8;
*/
@@ -19309,7 +19151,9 @@ public final class DebugProtoBuf {
*/
public static final class Property extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableMessage<
- Property> implements PropertyOrBuilder {
+ Property> implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Property)
+ PropertyOrBuilder {
// Use Property.newBuilder() to construct.
private Property(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
super(builder);
@@ -19480,14 +19324,12 @@ public final class DebugProtoBuf {
}
private int bitField0_;
- // optional int32 flags = 11 [default = 518];
public static final int FLAGS_FIELD_NUMBER = 11;
private int flags_;
/**
* optional int32 flags = 11 [default = 518];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -19507,7 +19349,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 11 [default = 518];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -19524,7 +19365,6 @@ public final class DebugProtoBuf {
return flags_;
}
- // optional int32 old_flags = 1 [default = 2054];
public static final int OLD_FLAGS_FIELD_NUMBER = 1;
private int oldFlags_;
/**
@@ -19540,7 +19380,6 @@ public final class DebugProtoBuf {
return oldFlags_;
}
- // required int32 name = 2;
public static final int NAME_FIELD_NUMBER = 2;
private int name_;
/**
@@ -19556,7 +19395,6 @@ public final class DebugProtoBuf {
return name_;
}
- // optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
public static final int RETURN_TYPE_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type returnType_;
/**
@@ -19578,7 +19416,6 @@ public final class DebugProtoBuf {
return returnType_;
}
- // optional int32 return_type_id = 9;
public static final int RETURN_TYPE_ID_FIELD_NUMBER = 9;
private int returnTypeId_;
/**
@@ -19594,7 +19431,6 @@ public final class DebugProtoBuf {
return returnTypeId_;
}
- // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
public static final int TYPE_PARAMETER_FIELD_NUMBER = 4;
private java.util.List typeParameter_;
/**
@@ -19630,7 +19466,6 @@ public final class DebugProtoBuf {
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_;
/**
@@ -19652,7 +19487,6 @@ public final class DebugProtoBuf {
return receiverType_;
}
- // optional int32 receiver_type_id = 10;
public static final int RECEIVER_TYPE_ID_FIELD_NUMBER = 10;
private int receiverTypeId_;
/**
@@ -19668,7 +19502,6 @@ public final class DebugProtoBuf {
return receiverTypeId_;
}
- // optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
public static final int SETTER_VALUE_PARAMETER_FIELD_NUMBER = 6;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter setterValueParameter_;
/**
@@ -19690,19 +19523,18 @@ public final class DebugProtoBuf {
return setterValueParameter_;
}
- // optional int32 getter_flags = 7;
public static final int GETTER_FLAGS_FIELD_NUMBER = 7;
private int getterFlags_;
/**
* optional int32 getter_flags = 7;
*
*
- *
*hasAnnotations
*Visibility
*Modality
*isNotDefault
*isExternal
+ *isInline
*
*/
public boolean hasGetterFlags() {
@@ -19712,19 +19544,18 @@ public final class DebugProtoBuf {
* optional int32 getter_flags = 7;
*
*
- *
*hasAnnotations
*Visibility
*Modality
*isNotDefault
*isExternal
+ *isInline
*
*/
public int getGetterFlags() {
return getterFlags_;
}
- // optional int32 setter_flags = 8;
public static final int SETTER_FLAGS_FIELD_NUMBER = 8;
private int setterFlags_;
/**
@@ -19756,7 +19587,8 @@ public final class DebugProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (!hasName()) {
memoizedIsInitialized = 0;
@@ -19971,7 +19803,9 @@ public final class DebugProtoBuf {
*/
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder<
- org.jetbrains.kotlin.serialization.DebugProtoBuf.Property, Builder> implements org.jetbrains.kotlin.serialization.DebugProtoBuf.PropertyOrBuilder {
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.Property, Builder> implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Property)
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.PropertyOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Property_descriptor;
@@ -20267,13 +20101,11 @@ public final class DebugProtoBuf {
}
private int bitField0_;
- // optional int32 flags = 11 [default = 518];
private int flags_ = 518;
/**
* optional int32 flags = 11 [default = 518];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -20293,7 +20125,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 11 [default = 518];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -20313,7 +20144,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 11 [default = 518];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -20336,7 +20166,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 11 [default = 518];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -20356,7 +20185,6 @@ public final class DebugProtoBuf {
return this;
}
- // optional int32 old_flags = 1 [default = 2054];
private int oldFlags_ = 2054;
/**
* optional int32 old_flags = 1 [default = 2054];
@@ -20389,7 +20217,6 @@ public final class DebugProtoBuf {
return this;
}
- // required int32 name = 2;
private int name_ ;
/**
* required int32 name = 2;
@@ -20422,7 +20249,6 @@ public final class DebugProtoBuf {
return this;
}
- // optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type returnType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> returnTypeBuilder_;
@@ -20531,7 +20357,7 @@ public final class DebugProtoBuf {
if (returnTypeBuilder_ == null) {
returnTypeBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
- returnType_,
+ getReturnType(),
getParentForChildren(),
isClean());
returnType_ = null;
@@ -20539,7 +20365,6 @@ public final class DebugProtoBuf {
return returnTypeBuilder_;
}
- // optional int32 return_type_id = 9;
private int returnTypeId_ ;
/**
* optional int32 return_type_id = 9;
@@ -20572,7 +20397,6 @@ public final class DebugProtoBuf {
return this;
}
- // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
private java.util.List typeParameter_ =
java.util.Collections.emptyList();
private void ensureTypeParameterIsMutable() {
@@ -20714,7 +20538,8 @@ public final class DebugProtoBuf {
java.lang.Iterable values) {
if (typeParameterBuilder_ == null) {
ensureTypeParameterIsMutable();
- super.addAll(values, typeParameter_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, typeParameter_);
onChanged();
} else {
typeParameterBuilder_.addAllMessages(values);
@@ -20812,7 +20637,6 @@ public final class DebugProtoBuf {
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 org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> receiverTypeBuilder_;
@@ -20921,7 +20745,7 @@ public final class DebugProtoBuf {
if (receiverTypeBuilder_ == null) {
receiverTypeBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
- receiverType_,
+ getReceiverType(),
getParentForChildren(),
isClean());
receiverType_ = null;
@@ -20929,7 +20753,6 @@ public final class DebugProtoBuf {
return receiverTypeBuilder_;
}
- // optional int32 receiver_type_id = 10;
private int receiverTypeId_ ;
/**
* optional int32 receiver_type_id = 10;
@@ -20962,7 +20785,6 @@ public final class DebugProtoBuf {
return this;
}
- // optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter setterValueParameter_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.getDefaultInstance();
private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder> setterValueParameterBuilder_;
@@ -21071,7 +20893,7 @@ public final class DebugProtoBuf {
if (setterValueParameterBuilder_ == null) {
setterValueParameterBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder>(
- setterValueParameter_,
+ getSetterValueParameter(),
getParentForChildren(),
isClean());
setterValueParameter_ = null;
@@ -21079,18 +20901,17 @@ public final class DebugProtoBuf {
return setterValueParameterBuilder_;
}
- // optional int32 getter_flags = 7;
private int getterFlags_ ;
/**
* optional int32 getter_flags = 7;
*
*
- *
*hasAnnotations
*Visibility
*Modality
*isNotDefault
*isExternal
+ *isInline
*
*/
public boolean hasGetterFlags() {
@@ -21100,12 +20921,12 @@ public final class DebugProtoBuf {
* optional int32 getter_flags = 7;
*
*
- *
*hasAnnotations
*Visibility
*Modality
*isNotDefault
*isExternal
+ *isInline
*
*/
public int getGetterFlags() {
@@ -21115,12 +20936,12 @@ public final class DebugProtoBuf {
* optional int32 getter_flags = 7;
*
*
- *
*hasAnnotations
*Visibility
*Modality
*isNotDefault
*isExternal
+ *isInline
*
*/
public Builder setGetterFlags(int value) {
@@ -21133,12 +20954,12 @@ public final class DebugProtoBuf {
* optional int32 getter_flags = 7;
*
*
- *
*hasAnnotations
*Visibility
*Modality
*isNotDefault
*isExternal
+ *isInline
*
*/
public Builder clearGetterFlags() {
@@ -21148,7 +20969,6 @@ public final class DebugProtoBuf {
return this;
}
- // optional int32 setter_flags = 8;
private int setterFlags_ ;
/**
* optional int32 setter_flags = 8;
@@ -21193,15 +21013,14 @@ public final class DebugProtoBuf {
}
public interface ValueParameterOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.ValueParameter)
org.jetbrains.kotlin.protobuf.GeneratedMessage.
ExtendableMessageOrBuilder {
- // optional int32 flags = 1 [default = 0];
/**
* optional int32 flags = 1 [default = 0];
*
*
- *
*declaresDefault
*hasAnnotations
*isCrossinline
@@ -21213,7 +21032,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 1 [default = 0];
*
*
- *
*declaresDefault
*hasAnnotations
*isCrossinline
@@ -21222,7 +21040,6 @@ public final class DebugProtoBuf {
*/
int getFlags();
- // required int32 name = 2;
/**
* required int32 name = 2;
*/
@@ -21232,7 +21049,6 @@ public final class DebugProtoBuf {
*/
int getName();
- // optional .org.jetbrains.kotlin.serialization.Type type = 3;
/**
* optional .org.jetbrains.kotlin.serialization.Type type = 3;
*/
@@ -21246,7 +21062,6 @@ public final class DebugProtoBuf {
*/
org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder();
- // optional int32 type_id = 5;
/**
* optional int32 type_id = 5;
*/
@@ -21256,7 +21071,6 @@ public final class DebugProtoBuf {
*/
int getTypeId();
- // optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
/**
* optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
*/
@@ -21270,7 +21084,6 @@ public final class DebugProtoBuf {
*/
org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getVarargElementTypeOrBuilder();
- // optional int32 vararg_element_type_id = 6;
/**
* optional int32 vararg_element_type_id = 6;
*/
@@ -21285,7 +21098,9 @@ public final class DebugProtoBuf {
*/
public static final class ValueParameter extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableMessage<
- ValueParameter> implements ValueParameterOrBuilder {
+ ValueParameter> implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.ValueParameter)
+ ValueParameterOrBuilder {
// Use ValueParameter.newBuilder() to construct.
private ValueParameter(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
super(builder);
@@ -21417,14 +21232,12 @@ public final class DebugProtoBuf {
}
private int bitField0_;
- // optional int32 flags = 1 [default = 0];
public static final int FLAGS_FIELD_NUMBER = 1;
private int flags_;
/**
* optional int32 flags = 1 [default = 0];
*
*
- *
*declaresDefault
*hasAnnotations
*isCrossinline
@@ -21438,7 +21251,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 1 [default = 0];
*
*
- *
*declaresDefault
*hasAnnotations
*isCrossinline
@@ -21449,7 +21261,6 @@ public final class DebugProtoBuf {
return flags_;
}
- // required int32 name = 2;
public static final int NAME_FIELD_NUMBER = 2;
private int name_;
/**
@@ -21465,7 +21276,6 @@ public final class DebugProtoBuf {
return name_;
}
- // optional .org.jetbrains.kotlin.serialization.Type type = 3;
public static final int TYPE_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type type_;
/**
@@ -21487,7 +21297,6 @@ public final class DebugProtoBuf {
return type_;
}
- // optional int32 type_id = 5;
public static final int TYPE_ID_FIELD_NUMBER = 5;
private int typeId_;
/**
@@ -21503,7 +21312,6 @@ public final class DebugProtoBuf {
return typeId_;
}
- // optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
public static final int VARARG_ELEMENT_TYPE_FIELD_NUMBER = 4;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type varargElementType_;
/**
@@ -21525,7 +21333,6 @@ public final class DebugProtoBuf {
return varargElementType_;
}
- // optional int32 vararg_element_type_id = 6;
public static final int VARARG_ELEMENT_TYPE_ID_FIELD_NUMBER = 6;
private int varargElementTypeId_;
/**
@@ -21552,7 +21359,8 @@ public final class DebugProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (!hasName()) {
memoizedIsInitialized = 0;
@@ -21720,7 +21528,9 @@ public final class DebugProtoBuf {
*/
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder<
- org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter, Builder> implements org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder {
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter, Builder> implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.ValueParameter)
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_ValueParameter_descriptor;
@@ -21917,13 +21727,11 @@ public final class DebugProtoBuf {
}
private int bitField0_;
- // optional int32 flags = 1 [default = 0];
private int flags_ ;
/**
* optional int32 flags = 1 [default = 0];
*
*
- *
*declaresDefault
*hasAnnotations
*isCrossinline
@@ -21937,7 +21745,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 1 [default = 0];
*
*
- *
*declaresDefault
*hasAnnotations
*isCrossinline
@@ -21951,7 +21758,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 1 [default = 0];
*
*
- *
*declaresDefault
*hasAnnotations
*isCrossinline
@@ -21968,7 +21774,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 1 [default = 0];
*
*
- *
*declaresDefault
*hasAnnotations
*isCrossinline
@@ -21982,7 +21787,6 @@ public final class DebugProtoBuf {
return this;
}
- // required int32 name = 2;
private int name_ ;
/**
* required int32 name = 2;
@@ -22015,7 +21819,6 @@ public final class DebugProtoBuf {
return this;
}
- // optional .org.jetbrains.kotlin.serialization.Type type = 3;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> typeBuilder_;
@@ -22124,7 +21927,7 @@ public final class DebugProtoBuf {
if (typeBuilder_ == null) {
typeBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
- type_,
+ getType(),
getParentForChildren(),
isClean());
type_ = null;
@@ -22132,7 +21935,6 @@ public final class DebugProtoBuf {
return typeBuilder_;
}
- // optional int32 type_id = 5;
private int typeId_ ;
/**
* optional int32 type_id = 5;
@@ -22165,7 +21967,6 @@ public final class DebugProtoBuf {
return this;
}
- // optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type varargElementType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> varargElementTypeBuilder_;
@@ -22274,7 +22075,7 @@ public final class DebugProtoBuf {
if (varargElementTypeBuilder_ == null) {
varargElementTypeBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
- varargElementType_,
+ getVarargElementType(),
getParentForChildren(),
isClean());
varargElementType_ = null;
@@ -22282,7 +22083,6 @@ public final class DebugProtoBuf {
return varargElementTypeBuilder_;
}
- // optional int32 vararg_element_type_id = 6;
private int varargElementTypeId_ ;
/**
* optional int32 vararg_element_type_id = 6;
@@ -22327,15 +22127,14 @@ public final class DebugProtoBuf {
}
public interface TypeAliasOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.TypeAlias)
org.jetbrains.kotlin.protobuf.GeneratedMessage.
ExtendableMessageOrBuilder {
- // optional int32 flags = 1 [default = 0];
/**
* optional int32 flags = 1 [default = 0];
*
*
- *
*hasAnnotations
*Visibility
*
@@ -22345,14 +22144,12 @@ public final class DebugProtoBuf {
* optional int32 flags = 1 [default = 0];
*
*
- *
*hasAnnotations
*Visibility
*
*/
int getFlags();
- // required int32 name = 2;
/**
* required int32 name = 2;
*/
@@ -22362,7 +22159,6 @@ public final class DebugProtoBuf {
*/
int getName();
- // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
/**
* repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
*/
@@ -22387,7 +22183,6 @@ public final class DebugProtoBuf {
org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
int index);
- // optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
/**
* optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
*/
@@ -22401,7 +22196,6 @@ public final class DebugProtoBuf {
*/
org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getUnderlyingTypeOrBuilder();
- // optional int32 underlying_type_id = 5;
/**
* optional int32 underlying_type_id = 5;
*/
@@ -22411,7 +22205,6 @@ public final class DebugProtoBuf {
*/
int getUnderlyingTypeId();
- // optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
/**
* optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
*/
@@ -22425,7 +22218,6 @@ public final class DebugProtoBuf {
*/
org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getExpandedTypeOrBuilder();
- // optional int32 expanded_type_id = 7;
/**
* optional int32 expanded_type_id = 7;
*/
@@ -22440,7 +22232,9 @@ public final class DebugProtoBuf {
*/
public static final class TypeAlias extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableMessage<
- TypeAlias> implements TypeAliasOrBuilder {
+ TypeAlias> implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.TypeAlias)
+ TypeAliasOrBuilder {
// Use TypeAlias.newBuilder() to construct.
private TypeAlias(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
super(builder);
@@ -22583,14 +22377,12 @@ public final class DebugProtoBuf {
}
private int bitField0_;
- // optional int32 flags = 1 [default = 0];
public static final int FLAGS_FIELD_NUMBER = 1;
private int flags_;
/**
* optional int32 flags = 1 [default = 0];
*
*
- *
*hasAnnotations
*Visibility
*
@@ -22602,7 +22394,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 1 [default = 0];
*
*
- *
*hasAnnotations
*Visibility
*
@@ -22611,7 +22402,6 @@ public final class DebugProtoBuf {
return flags_;
}
- // required int32 name = 2;
public static final int NAME_FIELD_NUMBER = 2;
private int name_;
/**
@@ -22627,7 +22417,6 @@ public final class DebugProtoBuf {
return name_;
}
- // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
public static final int TYPE_PARAMETER_FIELD_NUMBER = 3;
private java.util.List typeParameter_;
/**
@@ -22663,7 +22452,6 @@ public final class DebugProtoBuf {
return typeParameter_.get(index);
}
- // optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
public static final int UNDERLYING_TYPE_FIELD_NUMBER = 4;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type underlyingType_;
/**
@@ -22685,7 +22473,6 @@ public final class DebugProtoBuf {
return underlyingType_;
}
- // optional int32 underlying_type_id = 5;
public static final int UNDERLYING_TYPE_ID_FIELD_NUMBER = 5;
private int underlyingTypeId_;
/**
@@ -22701,7 +22488,6 @@ public final class DebugProtoBuf {
return underlyingTypeId_;
}
- // optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
public static final int EXPANDED_TYPE_FIELD_NUMBER = 6;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type expandedType_;
/**
@@ -22723,7 +22509,6 @@ public final class DebugProtoBuf {
return expandedType_;
}
- // optional int32 expanded_type_id = 7;
public static final int EXPANDED_TYPE_ID_FIELD_NUMBER = 7;
private int expandedTypeId_;
/**
@@ -22751,7 +22536,8 @@ public final class DebugProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (!hasName()) {
memoizedIsInitialized = 0;
@@ -22932,7 +22718,9 @@ public final class DebugProtoBuf {
*/
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder<
- org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias, Builder> implements org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAliasOrBuilder {
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias, Builder> implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.TypeAlias)
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAliasOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_TypeAlias_descriptor;
@@ -23177,13 +22965,11 @@ public final class DebugProtoBuf {
}
private int bitField0_;
- // optional int32 flags = 1 [default = 0];
private int flags_ ;
/**
* optional int32 flags = 1 [default = 0];
*
*
- *
*hasAnnotations
*Visibility
*
@@ -23195,7 +22981,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 1 [default = 0];
*
*
- *
*hasAnnotations
*Visibility
*
@@ -23207,7 +22992,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 1 [default = 0];
*
*
- *
*hasAnnotations
*Visibility
*
@@ -23222,7 +23006,6 @@ public final class DebugProtoBuf {
* optional int32 flags = 1 [default = 0];
*
*
- *
*hasAnnotations
*Visibility
*
@@ -23234,7 +23017,6 @@ public final class DebugProtoBuf {
return this;
}
- // required int32 name = 2;
private int name_ ;
/**
* required int32 name = 2;
@@ -23267,7 +23049,6 @@ public final class DebugProtoBuf {
return this;
}
- // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
private java.util.List typeParameter_ =
java.util.Collections.emptyList();
private void ensureTypeParameterIsMutable() {
@@ -23409,7 +23190,8 @@ public final class DebugProtoBuf {
java.lang.Iterable values) {
if (typeParameterBuilder_ == null) {
ensureTypeParameterIsMutable();
- super.addAll(values, typeParameter_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, typeParameter_);
onChanged();
} else {
typeParameterBuilder_.addAllMessages(values);
@@ -23507,7 +23289,6 @@ public final class DebugProtoBuf {
return typeParameterBuilder_;
}
- // optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type underlyingType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> underlyingTypeBuilder_;
@@ -23616,7 +23397,7 @@ public final class DebugProtoBuf {
if (underlyingTypeBuilder_ == null) {
underlyingTypeBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
- underlyingType_,
+ getUnderlyingType(),
getParentForChildren(),
isClean());
underlyingType_ = null;
@@ -23624,7 +23405,6 @@ public final class DebugProtoBuf {
return underlyingTypeBuilder_;
}
- // optional int32 underlying_type_id = 5;
private int underlyingTypeId_ ;
/**
* optional int32 underlying_type_id = 5;
@@ -23657,7 +23437,6 @@ public final class DebugProtoBuf {
return this;
}
- // optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type expandedType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> expandedTypeBuilder_;
@@ -23766,7 +23545,7 @@ public final class DebugProtoBuf {
if (expandedTypeBuilder_ == null) {
expandedTypeBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
- expandedType_,
+ getExpandedType(),
getParentForChildren(),
isClean());
expandedType_ = null;
@@ -23774,7 +23553,6 @@ public final class DebugProtoBuf {
return expandedTypeBuilder_;
}
- // optional int32 expanded_type_id = 7;
private int expandedTypeId_ ;
/**
* optional int32 expanded_type_id = 7;
@@ -23819,10 +23597,10 @@ public final class DebugProtoBuf {
}
public interface EnumEntryOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.EnumEntry)
org.jetbrains.kotlin.protobuf.GeneratedMessage.
ExtendableMessageOrBuilder {
- // optional int32 name = 1;
/**
* optional int32 name = 1;
*/
@@ -23837,7 +23615,9 @@ public final class DebugProtoBuf {
*/
public static final class EnumEntry extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableMessage<
- EnumEntry> implements EnumEntryOrBuilder {
+ EnumEntry> implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.EnumEntry)
+ EnumEntryOrBuilder {
// Use EnumEntry.newBuilder() to construct.
private EnumEntry(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
super(builder);
@@ -23928,7 +23708,6 @@ public final class DebugProtoBuf {
}
private int bitField0_;
- // optional int32 name = 1;
public static final int NAME_FIELD_NUMBER = 1;
private int name_;
/**
@@ -23950,7 +23729,8 @@ public final class DebugProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (!extensionsAreInitialized()) {
memoizedIsInitialized = 0;
@@ -24067,7 +23847,9 @@ public final class DebugProtoBuf {
*/
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder<
- org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry, Builder> implements org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntryOrBuilder {
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry, Builder> implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.EnumEntry)
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntryOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_EnumEntry_descriptor;
@@ -24185,7 +23967,6 @@ public final class DebugProtoBuf {
}
private int bitField0_;
- // optional int32 name = 1;
private int name_ ;
/**
* optional int32 name = 1;
@@ -24229,92 +24010,92 @@ public final class DebugProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.EnumEntry)
}
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_StringTable_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_StringTable_fieldAccessorTable;
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_fieldAccessorTable;
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_fieldAccessorTable;
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_Annotation_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_Annotation_fieldAccessorTable;
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_fieldAccessorTable;
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_fieldAccessorTable;
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_Type_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_Type_fieldAccessorTable;
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_Type_Argument_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_Type_Argument_fieldAccessorTable;
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_TypeParameter_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_TypeParameter_fieldAccessorTable;
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_Class_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_Class_fieldAccessorTable;
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_Package_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_Package_fieldAccessorTable;
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_TypeTable_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_TypeTable_fieldAccessorTable;
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_Constructor_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_Constructor_fieldAccessorTable;
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_Function_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_Function_fieldAccessorTable;
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_Property_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_Property_fieldAccessorTable;
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_ValueParameter_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_ValueParameter_fieldAccessorTable;
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_TypeAlias_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_TypeAlias_fieldAccessorTable;
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_EnumEntry_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
@@ -24467,146 +24248,149 @@ public final class DebugProtoBuf {
"oBuf"
};
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
- new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
- public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
- org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
- descriptor = root;
- internal_static_org_jetbrains_kotlin_serialization_StringTable_descriptor =
- getDescriptor().getMessageTypes().get(0);
- internal_static_org_jetbrains_kotlin_serialization_StringTable_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_StringTable_descriptor,
- new java.lang.String[] { "String", });
- internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_descriptor =
- getDescriptor().getMessageTypes().get(1);
- internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_descriptor,
- new java.lang.String[] { "QualifiedName", });
- internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_descriptor =
- internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_descriptor.getNestedTypes().get(0);
- internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_descriptor,
- new java.lang.String[] { "ParentQualifiedName", "ShortName", "Kind", });
- internal_static_org_jetbrains_kotlin_serialization_Annotation_descriptor =
- getDescriptor().getMessageTypes().get(2);
- internal_static_org_jetbrains_kotlin_serialization_Annotation_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_Annotation_descriptor,
- new java.lang.String[] { "Id", "Argument", });
- internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_descriptor =
- internal_static_org_jetbrains_kotlin_serialization_Annotation_descriptor.getNestedTypes().get(0);
- internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_descriptor,
- new java.lang.String[] { "NameId", "Value", });
- internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_descriptor =
- internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_descriptor.getNestedTypes().get(0);
- internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_descriptor,
- new java.lang.String[] { "Type", "IntValue", "FloatValue", "DoubleValue", "StringValue", "ClassId", "EnumValueId", "Annotation", "ArrayElement", });
- internal_static_org_jetbrains_kotlin_serialization_Type_descriptor =
- getDescriptor().getMessageTypes().get(3);
- internal_static_org_jetbrains_kotlin_serialization_Type_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_Type_descriptor,
- new java.lang.String[] { "Argument", "Nullable", "FlexibleTypeCapabilitiesId", "FlexibleUpperBound", "FlexibleUpperBoundId", "ClassName", "TypeParameter", "TypeParameterName", "TypeAliasName", "OuterType", "OuterTypeId", "AbbreviatedType", "AbbreviatedTypeId", });
- internal_static_org_jetbrains_kotlin_serialization_Type_Argument_descriptor =
- internal_static_org_jetbrains_kotlin_serialization_Type_descriptor.getNestedTypes().get(0);
- internal_static_org_jetbrains_kotlin_serialization_Type_Argument_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_Type_Argument_descriptor,
- new java.lang.String[] { "Projection", "Type", "TypeId", });
- internal_static_org_jetbrains_kotlin_serialization_TypeParameter_descriptor =
- getDescriptor().getMessageTypes().get(4);
- internal_static_org_jetbrains_kotlin_serialization_TypeParameter_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_TypeParameter_descriptor,
- new java.lang.String[] { "Id", "Name", "Reified", "Variance", "UpperBound", "UpperBoundId", });
- internal_static_org_jetbrains_kotlin_serialization_Class_descriptor =
- getDescriptor().getMessageTypes().get(5);
- internal_static_org_jetbrains_kotlin_serialization_Class_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_Class_descriptor,
- new java.lang.String[] { "Flags", "FqName", "CompanionObjectName", "TypeParameter", "Supertype", "SupertypeId", "NestedClassName", "Constructor", "Function", "Property", "TypeAlias", "EnumEntry", "TypeTable", });
- internal_static_org_jetbrains_kotlin_serialization_Package_descriptor =
- getDescriptor().getMessageTypes().get(6);
- internal_static_org_jetbrains_kotlin_serialization_Package_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_Package_descriptor,
- new java.lang.String[] { "Function", "Property", "TypeAlias", "TypeTable", });
- internal_static_org_jetbrains_kotlin_serialization_TypeTable_descriptor =
- getDescriptor().getMessageTypes().get(7);
- internal_static_org_jetbrains_kotlin_serialization_TypeTable_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_TypeTable_descriptor,
- new java.lang.String[] { "Type", "FirstNullable", });
- internal_static_org_jetbrains_kotlin_serialization_Constructor_descriptor =
- getDescriptor().getMessageTypes().get(8);
- internal_static_org_jetbrains_kotlin_serialization_Constructor_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_Constructor_descriptor,
- new java.lang.String[] { "Flags", "ValueParameter", });
- internal_static_org_jetbrains_kotlin_serialization_Function_descriptor =
- getDescriptor().getMessageTypes().get(9);
- internal_static_org_jetbrains_kotlin_serialization_Function_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_Function_descriptor,
- new java.lang.String[] { "Flags", "OldFlags", "Name", "ReturnType", "ReturnTypeId", "TypeParameter", "ReceiverType", "ReceiverTypeId", "ValueParameter", "TypeTable", });
- internal_static_org_jetbrains_kotlin_serialization_Property_descriptor =
- getDescriptor().getMessageTypes().get(10);
- internal_static_org_jetbrains_kotlin_serialization_Property_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_Property_descriptor,
- new java.lang.String[] { "Flags", "OldFlags", "Name", "ReturnType", "ReturnTypeId", "TypeParameter", "ReceiverType", "ReceiverTypeId", "SetterValueParameter", "GetterFlags", "SetterFlags", });
- internal_static_org_jetbrains_kotlin_serialization_ValueParameter_descriptor =
- getDescriptor().getMessageTypes().get(11);
- internal_static_org_jetbrains_kotlin_serialization_ValueParameter_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_ValueParameter_descriptor,
- new java.lang.String[] { "Flags", "Name", "Type", "TypeId", "VarargElementType", "VarargElementTypeId", });
- internal_static_org_jetbrains_kotlin_serialization_TypeAlias_descriptor =
- getDescriptor().getMessageTypes().get(12);
- internal_static_org_jetbrains_kotlin_serialization_TypeAlias_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_TypeAlias_descriptor,
- new java.lang.String[] { "Flags", "Name", "TypeParameter", "UnderlyingType", "UnderlyingTypeId", "ExpandedType", "ExpandedTypeId", });
- internal_static_org_jetbrains_kotlin_serialization_EnumEntry_descriptor =
- getDescriptor().getMessageTypes().get(13);
- internal_static_org_jetbrains_kotlin_serialization_EnumEntry_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_EnumEntry_descriptor,
- new java.lang.String[] { "Name", });
- org.jetbrains.kotlin.protobuf.ExtensionRegistry registry =
- org.jetbrains.kotlin.protobuf.ExtensionRegistry.newInstance();
- registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.fqNameIdInTable);
- registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
- registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
- registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.fqNameIdInTable);
- registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
- registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
- registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.fqNameIdInTable);
- registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
- registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
- registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
- registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.fqNameIdInTable);
- registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
- registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
- registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.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);
- registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
- return registry;
- }
- };
+ new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
+ public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
+ org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
+ descriptor = root;
+ return null;
+ }
+ };
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.getDescriptor(),
}, assigner);
+ internal_static_org_jetbrains_kotlin_serialization_StringTable_descriptor =
+ getDescriptor().getMessageTypes().get(0);
+ internal_static_org_jetbrains_kotlin_serialization_StringTable_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_StringTable_descriptor,
+ new java.lang.String[] { "String", });
+ internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_descriptor =
+ getDescriptor().getMessageTypes().get(1);
+ internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_descriptor,
+ new java.lang.String[] { "QualifiedName", });
+ internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_descriptor =
+ internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_descriptor.getNestedTypes().get(0);
+ internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_descriptor,
+ new java.lang.String[] { "ParentQualifiedName", "ShortName", "Kind", });
+ internal_static_org_jetbrains_kotlin_serialization_Annotation_descriptor =
+ getDescriptor().getMessageTypes().get(2);
+ internal_static_org_jetbrains_kotlin_serialization_Annotation_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_Annotation_descriptor,
+ new java.lang.String[] { "Id", "Argument", });
+ internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_descriptor =
+ internal_static_org_jetbrains_kotlin_serialization_Annotation_descriptor.getNestedTypes().get(0);
+ internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_descriptor,
+ new java.lang.String[] { "NameId", "Value", });
+ internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_descriptor =
+ internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_descriptor.getNestedTypes().get(0);
+ internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_descriptor,
+ new java.lang.String[] { "Type", "IntValue", "FloatValue", "DoubleValue", "StringValue", "ClassId", "EnumValueId", "Annotation", "ArrayElement", });
+ internal_static_org_jetbrains_kotlin_serialization_Type_descriptor =
+ getDescriptor().getMessageTypes().get(3);
+ internal_static_org_jetbrains_kotlin_serialization_Type_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_Type_descriptor,
+ new java.lang.String[] { "Argument", "Nullable", "FlexibleTypeCapabilitiesId", "FlexibleUpperBound", "FlexibleUpperBoundId", "ClassName", "TypeParameter", "TypeParameterName", "TypeAliasName", "OuterType", "OuterTypeId", "AbbreviatedType", "AbbreviatedTypeId", });
+ internal_static_org_jetbrains_kotlin_serialization_Type_Argument_descriptor =
+ internal_static_org_jetbrains_kotlin_serialization_Type_descriptor.getNestedTypes().get(0);
+ internal_static_org_jetbrains_kotlin_serialization_Type_Argument_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_Type_Argument_descriptor,
+ new java.lang.String[] { "Projection", "Type", "TypeId", });
+ internal_static_org_jetbrains_kotlin_serialization_TypeParameter_descriptor =
+ getDescriptor().getMessageTypes().get(4);
+ internal_static_org_jetbrains_kotlin_serialization_TypeParameter_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_TypeParameter_descriptor,
+ new java.lang.String[] { "Id", "Name", "Reified", "Variance", "UpperBound", "UpperBoundId", });
+ internal_static_org_jetbrains_kotlin_serialization_Class_descriptor =
+ getDescriptor().getMessageTypes().get(5);
+ internal_static_org_jetbrains_kotlin_serialization_Class_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_Class_descriptor,
+ new java.lang.String[] { "Flags", "FqName", "CompanionObjectName", "TypeParameter", "Supertype", "SupertypeId", "NestedClassName", "Constructor", "Function", "Property", "TypeAlias", "EnumEntry", "TypeTable", });
+ internal_static_org_jetbrains_kotlin_serialization_Package_descriptor =
+ getDescriptor().getMessageTypes().get(6);
+ internal_static_org_jetbrains_kotlin_serialization_Package_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_Package_descriptor,
+ new java.lang.String[] { "Function", "Property", "TypeAlias", "TypeTable", });
+ internal_static_org_jetbrains_kotlin_serialization_TypeTable_descriptor =
+ getDescriptor().getMessageTypes().get(7);
+ internal_static_org_jetbrains_kotlin_serialization_TypeTable_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_TypeTable_descriptor,
+ new java.lang.String[] { "Type", "FirstNullable", });
+ internal_static_org_jetbrains_kotlin_serialization_Constructor_descriptor =
+ getDescriptor().getMessageTypes().get(8);
+ internal_static_org_jetbrains_kotlin_serialization_Constructor_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_Constructor_descriptor,
+ new java.lang.String[] { "Flags", "ValueParameter", });
+ internal_static_org_jetbrains_kotlin_serialization_Function_descriptor =
+ getDescriptor().getMessageTypes().get(9);
+ internal_static_org_jetbrains_kotlin_serialization_Function_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_Function_descriptor,
+ new java.lang.String[] { "Flags", "OldFlags", "Name", "ReturnType", "ReturnTypeId", "TypeParameter", "ReceiverType", "ReceiverTypeId", "ValueParameter", "TypeTable", });
+ internal_static_org_jetbrains_kotlin_serialization_Property_descriptor =
+ getDescriptor().getMessageTypes().get(10);
+ internal_static_org_jetbrains_kotlin_serialization_Property_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_Property_descriptor,
+ new java.lang.String[] { "Flags", "OldFlags", "Name", "ReturnType", "ReturnTypeId", "TypeParameter", "ReceiverType", "ReceiverTypeId", "SetterValueParameter", "GetterFlags", "SetterFlags", });
+ internal_static_org_jetbrains_kotlin_serialization_ValueParameter_descriptor =
+ getDescriptor().getMessageTypes().get(11);
+ internal_static_org_jetbrains_kotlin_serialization_ValueParameter_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_ValueParameter_descriptor,
+ new java.lang.String[] { "Flags", "Name", "Type", "TypeId", "VarargElementType", "VarargElementTypeId", });
+ internal_static_org_jetbrains_kotlin_serialization_TypeAlias_descriptor =
+ getDescriptor().getMessageTypes().get(12);
+ internal_static_org_jetbrains_kotlin_serialization_TypeAlias_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_TypeAlias_descriptor,
+ new java.lang.String[] { "Flags", "Name", "TypeParameter", "UnderlyingType", "UnderlyingTypeId", "ExpandedType", "ExpandedTypeId", });
+ internal_static_org_jetbrains_kotlin_serialization_EnumEntry_descriptor =
+ getDescriptor().getMessageTypes().get(13);
+ internal_static_org_jetbrains_kotlin_serialization_EnumEntry_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_EnumEntry_descriptor,
+ new java.lang.String[] { "Name", });
+ org.jetbrains.kotlin.protobuf.ExtensionRegistry registry =
+ org.jetbrains.kotlin.protobuf.ExtensionRegistry.newInstance();
+ registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.fqNameIdInTable);
+ registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
+ registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
+ registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.fqNameIdInTable);
+ registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
+ registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
+ registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.fqNameIdInTable);
+ registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
+ registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
+ registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
+ registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.fqNameIdInTable);
+ registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
+ registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
+ registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.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);
+ registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
+ org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
+ .internalUpdateFileDescriptor(descriptor, registry);
+ org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.getDescriptor();
}
// @@protoc_insertion_point(outer_class_scope)
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 8492e8da7d6..d463410e840 100644
--- a/build-common/test/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java
@@ -18,10 +18,10 @@ public final class DebugBuiltInsProtoBuf {
registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.typeAnnotation);
registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.typeParameterAnnotation);
}
- public interface BuiltInsOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageOrBuilder {
+ public interface BuiltInsOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.builtins.BuiltIns)
+ org.jetbrains.kotlin.protobuf.MessageOrBuilder {
- // optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
/**
* optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
*/
@@ -35,7 +35,6 @@ public final class DebugBuiltInsProtoBuf {
*/
org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder getStringsOrBuilder();
- // optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
/**
* optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
*/
@@ -49,7 +48,6 @@ public final class DebugBuiltInsProtoBuf {
*/
org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder getQualifiedNamesOrBuilder();
- // optional .org.jetbrains.kotlin.serialization.Package package = 3;
/**
* optional .org.jetbrains.kotlin.serialization.Package package = 3;
*/
@@ -63,37 +61,37 @@ public final class DebugBuiltInsProtoBuf {
*/
org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder getPackageOrBuilder();
- // repeated .org.jetbrains.kotlin.serialization.Class class = 4;
/**
* repeated .org.jetbrains.kotlin.serialization.Class class = 4;
*/
java.util.List
- getClassList();
+ getClass_List();
/**
* repeated .org.jetbrains.kotlin.serialization.Class class = 4;
*/
- org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getClass(int index);
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getClass_(int index);
/**
* repeated .org.jetbrains.kotlin.serialization.Class class = 4;
*/
- int getClassCount();
+ int getClass_Count();
/**
* repeated .org.jetbrains.kotlin.serialization.Class class = 4;
*/
java.util.List
- getClassOrBuilderList();
+ getClass_OrBuilderList();
/**
* repeated .org.jetbrains.kotlin.serialization.Class class = 4;
*/
- org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getClassOrBuilder(
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getClass_OrBuilder(
int index);
}
/**
* Protobuf type {@code org.jetbrains.kotlin.serialization.builtins.BuiltIns}
*/
public static final class BuiltIns extends
- org.jetbrains.kotlin.protobuf.GeneratedMessage
- implements BuiltInsOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.builtins.BuiltIns)
+ BuiltInsOrBuilder {
// Use BuiltIns.newBuilder() to construct.
private BuiltIns(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
super(builder);
@@ -180,10 +178,10 @@ public final class DebugBuiltInsProtoBuf {
}
case 34: {
if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
- class_ = new java.util.ArrayList();
+ class__ = new java.util.ArrayList();
mutable_bitField0_ |= 0x00000008;
}
- class_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PARSER, extensionRegistry));
+ class__.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PARSER, extensionRegistry));
break;
}
}
@@ -195,7 +193,7 @@ public final class DebugBuiltInsProtoBuf {
e.getMessage()).setUnfinishedMessage(this);
} finally {
if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
- class_ = java.util.Collections.unmodifiableList(class_);
+ class__ = java.util.Collections.unmodifiableList(class__);
}
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
@@ -229,7 +227,6 @@ public final class DebugBuiltInsProtoBuf {
}
private int bitField0_;
- // optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
public static final int STRINGS_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable strings_;
/**
@@ -251,7 +248,6 @@ public final class DebugBuiltInsProtoBuf {
return strings_;
}
- // optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
public static final int QUALIFIED_NAMES_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable qualifiedNames_;
/**
@@ -273,7 +269,6 @@ public final class DebugBuiltInsProtoBuf {
return qualifiedNames_;
}
- // optional .org.jetbrains.kotlin.serialization.Package package = 3;
public static final int PACKAGE_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.Package package_;
/**
@@ -295,52 +290,52 @@ public final class DebugBuiltInsProtoBuf {
return package_;
}
- // repeated .org.jetbrains.kotlin.serialization.Class class = 4;
public static final int CLASS_FIELD_NUMBER = 4;
- private java.util.List class_;
+ private java.util.List class__;
/**
* repeated .org.jetbrains.kotlin.serialization.Class class = 4;
*/
- public java.util.List getClassList() {
- return class_;
+ public java.util.List getClass_List() {
+ return class__;
}
/**
* repeated .org.jetbrains.kotlin.serialization.Class class = 4;
*/
public java.util.List
- getClassOrBuilderList() {
- return class_;
+ getClass_OrBuilderList() {
+ return class__;
}
/**
* repeated .org.jetbrains.kotlin.serialization.Class class = 4;
*/
- public int getClassCount() {
- return class_.size();
+ 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);
+ 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 getClassOrBuilder(
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getClass_OrBuilder(
int index) {
- return class_.get(index);
+ return class__.get(index);
}
private void initFields() {
strings_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance();
qualifiedNames_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
package_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.getDefaultInstance();
- class_ = java.util.Collections.emptyList();
+ class__ = java.util.Collections.emptyList();
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (hasQualifiedNames()) {
if (!getQualifiedNames().isInitialized()) {
@@ -354,8 +349,8 @@ public final class DebugBuiltInsProtoBuf {
return false;
}
}
- for (int i = 0; i < getClassCount(); i++) {
- if (!getClass(i).isInitialized()) {
+ for (int i = 0; i < getClass_Count(); i++) {
+ if (!getClass_(i).isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
@@ -376,8 +371,8 @@ public final class DebugBuiltInsProtoBuf {
if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeMessage(3, package_);
}
- for (int i = 0; i < class_.size(); i++) {
- output.writeMessage(4, class_.get(i));
+ for (int i = 0; i < class__.size(); i++) {
+ output.writeMessage(4, class__.get(i));
}
getUnknownFields().writeTo(output);
}
@@ -400,9 +395,9 @@ public final class DebugBuiltInsProtoBuf {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(3, package_);
}
- for (int i = 0; i < class_.size(); i++) {
+ for (int i = 0; i < class__.size(); i++) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
- .computeMessageSize(4, class_.get(i));
+ .computeMessageSize(4, class__.get(i));
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
@@ -486,8 +481,9 @@ public final class DebugBuiltInsProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.builtins.BuiltIns}
*/
public static final class Builder extends
- org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder
- implements org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltInsOrBuilder {
+ 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;
@@ -515,7 +511,7 @@ public final class DebugBuiltInsProtoBuf {
getStringsFieldBuilder();
getQualifiedNamesFieldBuilder();
getPackageFieldBuilder();
- getClassFieldBuilder();
+ getClass_FieldBuilder();
}
}
private static Builder create() {
@@ -542,11 +538,11 @@ public final class DebugBuiltInsProtoBuf {
packageBuilder_.clear();
}
bitField0_ = (bitField0_ & ~0x00000004);
- if (classBuilder_ == null) {
- class_ = java.util.Collections.emptyList();
+ if (class_Builder_ == null) {
+ class__ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000008);
} else {
- classBuilder_.clear();
+ class_Builder_.clear();
}
return this;
}
@@ -600,14 +596,14 @@ public final class DebugBuiltInsProtoBuf {
} else {
result.package_ = packageBuilder_.build();
}
- if (classBuilder_ == null) {
+ if (class_Builder_ == null) {
if (((bitField0_ & 0x00000008) == 0x00000008)) {
- class_ = java.util.Collections.unmodifiableList(class_);
+ class__ = java.util.Collections.unmodifiableList(class__);
bitField0_ = (bitField0_ & ~0x00000008);
}
- result.class_ = class_;
+ result.class__ = class__;
} else {
- result.class_ = classBuilder_.build();
+ result.class__ = class_Builder_.build();
}
result.bitField0_ = to_bitField0_;
onBuilt();
@@ -634,29 +630,29 @@ public final class DebugBuiltInsProtoBuf {
if (other.hasPackage()) {
mergePackage(other.getPackage());
}
- if (classBuilder_ == null) {
- if (!other.class_.isEmpty()) {
- if (class_.isEmpty()) {
- class_ = other.class_;
+ if (class_Builder_ == null) {
+ if (!other.class__.isEmpty()) {
+ if (class__.isEmpty()) {
+ class__ = other.class__;
bitField0_ = (bitField0_ & ~0x00000008);
} else {
- ensureClassIsMutable();
- class_.addAll(other.class_);
+ ensureClass_IsMutable();
+ class__.addAll(other.class__);
}
onChanged();
}
} else {
- if (!other.class_.isEmpty()) {
- if (classBuilder_.isEmpty()) {
- classBuilder_.dispose();
- classBuilder_ = null;
- class_ = other.class_;
+ if (!other.class__.isEmpty()) {
+ if (class_Builder_.isEmpty()) {
+ class_Builder_.dispose();
+ class_Builder_ = null;
+ class__ = other.class__;
bitField0_ = (bitField0_ & ~0x00000008);
- classBuilder_ =
+ class_Builder_ =
org.jetbrains.kotlin.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
- getClassFieldBuilder() : null;
+ getClass_FieldBuilder() : null;
} else {
- classBuilder_.addAllMessages(other.class_);
+ class_Builder_.addAllMessages(other.class__);
}
}
}
@@ -677,8 +673,8 @@ public final class DebugBuiltInsProtoBuf {
return false;
}
}
- for (int i = 0; i < getClassCount(); i++) {
- if (!getClass(i).isInitialized()) {
+ for (int i = 0; i < getClass_Count(); i++) {
+ if (!getClass_(i).isInitialized()) {
return false;
}
@@ -705,7 +701,6 @@ public final class DebugBuiltInsProtoBuf {
}
private int bitField0_;
- // optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable strings_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance();
private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder> stringsBuilder_;
@@ -814,7 +809,7 @@ public final class DebugBuiltInsProtoBuf {
if (stringsBuilder_ == null) {
stringsBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder>(
- strings_,
+ getStrings(),
getParentForChildren(),
isClean());
strings_ = null;
@@ -822,7 +817,6 @@ public final class DebugBuiltInsProtoBuf {
return stringsBuilder_;
}
- // optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable qualifiedNames_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder> qualifiedNamesBuilder_;
@@ -931,7 +925,7 @@ public final class DebugBuiltInsProtoBuf {
if (qualifiedNamesBuilder_ == null) {
qualifiedNamesBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder>(
- qualifiedNames_,
+ getQualifiedNames(),
getParentForChildren(),
isClean());
qualifiedNames_ = null;
@@ -939,7 +933,6 @@ public final class DebugBuiltInsProtoBuf {
return qualifiedNamesBuilder_;
}
- // optional .org.jetbrains.kotlin.serialization.Package package = 3;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.Package package_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.getDefaultInstance();
private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Package, org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder> packageBuilder_;
@@ -1048,7 +1041,7 @@ public final class DebugBuiltInsProtoBuf {
if (packageBuilder_ == null) {
packageBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Package, org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder>(
- package_,
+ getPackage(),
getParentForChildren(),
isClean());
package_ = null;
@@ -1056,244 +1049,244 @@ public final class DebugBuiltInsProtoBuf {
return packageBuilder_;
}
- // repeated .org.jetbrains.kotlin.serialization.Class class = 4;
- private java.util.List class_ =
+ private java.util.List class__ =
java.util.Collections.emptyList();
- private void ensureClassIsMutable() {
+ private void ensureClass_IsMutable() {
if (!((bitField0_ & 0x00000008) == 0x00000008)) {
- class_ = new java.util.ArrayList(class_);
+ 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> classBuilder_;
+ 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 getClassList() {
- if (classBuilder_ == null) {
- return java.util.Collections.unmodifiableList(class_);
+ public java.util.List getClass_List() {
+ if (class_Builder_ == null) {
+ return java.util.Collections.unmodifiableList(class__);
} else {
- return classBuilder_.getMessageList();
+ return class_Builder_.getMessageList();
}
}
/**
* repeated .org.jetbrains.kotlin.serialization.Class class = 4;
*/
- public int getClassCount() {
- if (classBuilder_ == null) {
- return class_.size();
+ public int getClass_Count() {
+ if (class_Builder_ == null) {
+ return class__.size();
} else {
- return classBuilder_.getCount();
+ return class_Builder_.getCount();
}
}
/**
* repeated .org.jetbrains.kotlin.serialization.Class class = 4;
*/
- public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getClass(int index) {
- if (classBuilder_ == null) {
- return class_.get(index);
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getClass_(int index) {
+ if (class_Builder_ == null) {
+ return class__.get(index);
} else {
- return classBuilder_.getMessage(index);
+ return class_Builder_.getMessage(index);
}
}
/**
* repeated .org.jetbrains.kotlin.serialization.Class class = 4;
*/
- public Builder setClass(
+ public Builder setClass_(
int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class value) {
- if (classBuilder_ == null) {
+ if (class_Builder_ == null) {
if (value == null) {
throw new NullPointerException();
}
- ensureClassIsMutable();
- class_.set(index, value);
+ ensureClass_IsMutable();
+ class__.set(index, value);
onChanged();
} else {
- classBuilder_.setMessage(index, value);
+ class_Builder_.setMessage(index, value);
}
return this;
}
/**
* repeated .org.jetbrains.kotlin.serialization.Class class = 4;
*/
- public Builder setClass(
+ public Builder setClass_(
int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder builderForValue) {
- if (classBuilder_ == null) {
- ensureClassIsMutable();
- class_.set(index, builderForValue.build());
+ if (class_Builder_ == null) {
+ ensureClass_IsMutable();
+ class__.set(index, builderForValue.build());
onChanged();
} else {
- classBuilder_.setMessage(index, builderForValue.build());
+ class_Builder_.setMessage(index, builderForValue.build());
}
return this;
}
/**
* repeated .org.jetbrains.kotlin.serialization.Class class = 4;
*/
- public Builder addClass(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class value) {
- if (classBuilder_ == null) {
+ public Builder addClass_(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class value) {
+ if (class_Builder_ == null) {
if (value == null) {
throw new NullPointerException();
}
- ensureClassIsMutable();
- class_.add(value);
+ ensureClass_IsMutable();
+ class__.add(value);
onChanged();
} else {
- classBuilder_.addMessage(value);
+ class_Builder_.addMessage(value);
}
return this;
}
/**
* repeated .org.jetbrains.kotlin.serialization.Class class = 4;
*/
- public Builder addClass(
+ public Builder addClass_(
int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class value) {
- if (classBuilder_ == null) {
+ if (class_Builder_ == null) {
if (value == null) {
throw new NullPointerException();
}
- ensureClassIsMutable();
- class_.add(index, value);
+ ensureClass_IsMutable();
+ class__.add(index, value);
onChanged();
} else {
- classBuilder_.addMessage(index, value);
+ class_Builder_.addMessage(index, value);
}
return this;
}
/**
* repeated .org.jetbrains.kotlin.serialization.Class class = 4;
*/
- public Builder addClass(
+ public Builder addClass_(
org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder builderForValue) {
- if (classBuilder_ == null) {
- ensureClassIsMutable();
- class_.add(builderForValue.build());
+ if (class_Builder_ == null) {
+ ensureClass_IsMutable();
+ class__.add(builderForValue.build());
onChanged();
} else {
- classBuilder_.addMessage(builderForValue.build());
+ class_Builder_.addMessage(builderForValue.build());
}
return this;
}
/**
* repeated .org.jetbrains.kotlin.serialization.Class class = 4;
*/
- public Builder addClass(
+ public Builder addClass_(
int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder builderForValue) {
- if (classBuilder_ == null) {
- ensureClassIsMutable();
- class_.add(index, builderForValue.build());
+ if (class_Builder_ == null) {
+ ensureClass_IsMutable();
+ class__.add(index, builderForValue.build());
onChanged();
} else {
- classBuilder_.addMessage(index, builderForValue.build());
+ class_Builder_.addMessage(index, builderForValue.build());
}
return this;
}
/**
* repeated .org.jetbrains.kotlin.serialization.Class class = 4;
*/
- public Builder addAllClass(
+ public Builder addAllClass_(
java.lang.Iterable values) {
- if (classBuilder_ == null) {
- ensureClassIsMutable();
- super.addAll(values, class_);
+ if (class_Builder_ == null) {
+ ensureClass_IsMutable();
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, class__);
onChanged();
} else {
- classBuilder_.addAllMessages(values);
+ class_Builder_.addAllMessages(values);
}
return this;
}
/**
* repeated .org.jetbrains.kotlin.serialization.Class class = 4;
*/
- public Builder clearClass() {
- if (classBuilder_ == null) {
- class_ = java.util.Collections.emptyList();
+ public Builder clearClass_() {
+ if (class_Builder_ == null) {
+ class__ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000008);
onChanged();
} else {
- classBuilder_.clear();
+ class_Builder_.clear();
}
return this;
}
/**
* repeated .org.jetbrains.kotlin.serialization.Class class = 4;
*/
- public Builder removeClass(int index) {
- if (classBuilder_ == null) {
- ensureClassIsMutable();
- class_.remove(index);
+ public Builder removeClass_(int index) {
+ if (class_Builder_ == null) {
+ ensureClass_IsMutable();
+ class__.remove(index);
onChanged();
} else {
- classBuilder_.remove(index);
+ class_Builder_.remove(index);
}
return this;
}
/**
* repeated .org.jetbrains.kotlin.serialization.Class class = 4;
*/
- public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder getClassBuilder(
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder getClass_Builder(
int index) {
- return getClassFieldBuilder().getBuilder(index);
+ return getClass_FieldBuilder().getBuilder(index);
}
/**
* repeated .org.jetbrains.kotlin.serialization.Class class = 4;
*/
- public org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getClassOrBuilder(
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getClass_OrBuilder(
int index) {
- if (classBuilder_ == null) {
- return class_.get(index); } else {
- return classBuilder_.getMessageOrBuilder(index);
+ if (class_Builder_ == null) {
+ return class__.get(index); } else {
+ return class_Builder_.getMessageOrBuilder(index);
}
}
/**
* repeated .org.jetbrains.kotlin.serialization.Class class = 4;
*/
public java.util.List
- getClassOrBuilderList() {
- if (classBuilder_ != null) {
- return classBuilder_.getMessageOrBuilderList();
+ getClass_OrBuilderList() {
+ if (class_Builder_ != null) {
+ return class_Builder_.getMessageOrBuilderList();
} else {
- return java.util.Collections.unmodifiableList(class_);
+ return java.util.Collections.unmodifiableList(class__);
}
}
/**
* repeated .org.jetbrains.kotlin.serialization.Class class = 4;
*/
- public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder addClassBuilder() {
- return getClassFieldBuilder().addBuilder(
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder addClass_Builder() {
+ return getClass_FieldBuilder().addBuilder(
org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.getDefaultInstance());
}
/**
* repeated .org.jetbrains.kotlin.serialization.Class class = 4;
*/
- public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder addClassBuilder(
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder addClass_Builder(
int index) {
- return getClassFieldBuilder().addBuilder(
+ return getClass_FieldBuilder().addBuilder(
index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.getDefaultInstance());
}
/**
* repeated .org.jetbrains.kotlin.serialization.Class class = 4;
*/
public java.util.List
- getClassBuilderList() {
- return getClassFieldBuilder().getBuilderList();
+ getClass_BuilderList() {
+ return getClass_FieldBuilder().getBuilderList();
}
private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder>
- getClassFieldBuilder() {
- if (classBuilder_ == null) {
- classBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
+ getClass_FieldBuilder() {
+ if (class_Builder_ == null) {
+ class_Builder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder>(
- class_,
+ class__,
((bitField0_ & 0x00000008) == 0x00000008),
getParentForChildren(),
isClean());
- class_ = null;
+ class__ = null;
}
- return classBuilder_;
+ return class_Builder_;
}
// @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.builtins.BuiltIns)
@@ -1417,7 +1410,7 @@ public final class DebugBuiltInsProtoBuf {
.newFileScopedGeneratedExtension(
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
@@ -1475,34 +1468,35 @@ public final class DebugBuiltInsProtoBuf {
"B\027B\025DebugBuiltInsProtoBuf"
};
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
- new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
- public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
- org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
- descriptor = root;
- internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_descriptor =
- getDescriptor().getMessageTypes().get(0);
- internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_descriptor,
- new java.lang.String[] { "Strings", "QualifiedNames", "Package", "Class", });
- packageFqName.internalInit(descriptor.getExtensions().get(0));
- classAnnotation.internalInit(descriptor.getExtensions().get(1));
- constructorAnnotation.internalInit(descriptor.getExtensions().get(2));
- functionAnnotation.internalInit(descriptor.getExtensions().get(3));
- propertyAnnotation.internalInit(descriptor.getExtensions().get(4));
- compileTimeValue.internalInit(descriptor.getExtensions().get(5));
- enumEntryAnnotation.internalInit(descriptor.getExtensions().get(6));
- parameterAnnotation.internalInit(descriptor.getExtensions().get(7));
- typeAnnotation.internalInit(descriptor.getExtensions().get(8));
- typeParameterAnnotation.internalInit(descriptor.getExtensions().get(9));
- return null;
- }
- };
+ new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
+ public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
+ org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
+ descriptor = root;
+ return null;
+ }
+ };
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor(),
}, assigner);
+ internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_descriptor =
+ getDescriptor().getMessageTypes().get(0);
+ internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_descriptor,
+ new java.lang.String[] { "Strings", "QualifiedNames", "Package", "Class_", });
+ packageFqName.internalInit(descriptor.getExtensions().get(0));
+ classAnnotation.internalInit(descriptor.getExtensions().get(1));
+ constructorAnnotation.internalInit(descriptor.getExtensions().get(2));
+ functionAnnotation.internalInit(descriptor.getExtensions().get(3));
+ propertyAnnotation.internalInit(descriptor.getExtensions().get(4));
+ compileTimeValue.internalInit(descriptor.getExtensions().get(5));
+ enumEntryAnnotation.internalInit(descriptor.getExtensions().get(6));
+ parameterAnnotation.internalInit(descriptor.getExtensions().get(7));
+ typeAnnotation.internalInit(descriptor.getExtensions().get(8));
+ typeParameterAnnotation.internalInit(descriptor.getExtensions().get(9));
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor();
}
// @@protoc_insertion_point(outer_class_scope)
diff --git a/build-common/test/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java b/build-common/test/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java
index 77397409943..26bf5c252e8 100644
--- a/build-common/test/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java
@@ -17,10 +17,10 @@ public final class DebugJsProtoBuf {
registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.typeAnnotation);
registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.typeParameterAnnotation);
}
- public interface ClassesOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageOrBuilder {
+ public interface ClassesOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.Classes)
+ org.jetbrains.kotlin.protobuf.MessageOrBuilder {
- // repeated int32 class_name = 1 [packed = true];
/**
* repeated int32 class_name = 1 [packed = true];
*
@@ -50,8 +50,9 @@ public final class DebugJsProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.js.Classes}
*/
public static final class Classes extends
- org.jetbrains.kotlin.protobuf.GeneratedMessage
- implements ClassesOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.Classes)
+ ClassesOrBuilder {
// Use Classes.newBuilder() to construct.
private Classes(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
super(builder);
@@ -160,7 +161,6 @@ public final class DebugJsProtoBuf {
return PARSER;
}
- // repeated int32 class_name = 1 [packed = true];
public static final int CLASS_NAME_FIELD_NUMBER = 1;
private java.util.List className_;
/**
@@ -202,7 +202,8 @@ public final class DebugJsProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
return true;
@@ -323,8 +324,9 @@ public final class DebugJsProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.js.Classes}
*/
public static final class Builder extends
- org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder
- implements org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.ClassesOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.Classes)
+ org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.ClassesOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor;
@@ -443,7 +445,6 @@ public final class DebugJsProtoBuf {
}
private int bitField0_;
- // repeated int32 class_name = 1 [packed = true];
private java.util.List className_ = java.util.Collections.emptyList();
private void ensureClassNameIsMutable() {
if (!((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -519,7 +520,8 @@ public final class DebugJsProtoBuf {
public Builder addAllClassName(
java.lang.Iterable values) {
ensureClassNameIsMutable();
- super.addAll(values, className_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, className_);
onChanged();
return this;
}
@@ -548,10 +550,10 @@ public final class DebugJsProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.Classes)
}
- public interface LibraryOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageOrBuilder {
+ public interface LibraryOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.Library)
+ org.jetbrains.kotlin.protobuf.MessageOrBuilder {
- // repeated .org.jetbrains.kotlin.serialization.js.Library.FileEntry entry = 1;
/**
* repeated .org.jetbrains.kotlin.serialization.js.Library.FileEntry entry = 1;
*/
@@ -576,7 +578,6 @@ public final class DebugJsProtoBuf {
org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.FileEntryOrBuilder getEntryOrBuilder(
int index);
- // optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];
/**
* optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];
*/
@@ -586,12 +587,11 @@ public final class DebugJsProtoBuf {
*/
org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind getKind();
- // repeated string importedModules = 3;
/**
* repeated string importedModules = 3;
*/
- java.util.List
- getImportedModulesList();
+ org.jetbrains.kotlin.protobuf.ProtocolStringList
+ getImportedModulesList();
/**
* repeated string importedModules = 3;
*/
@@ -610,8 +610,9 @@ public final class DebugJsProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library}
*/
public static final class Library extends
- org.jetbrains.kotlin.protobuf.GeneratedMessage
- implements LibraryOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.Library)
+ LibraryOrBuilder {
// Use Library.newBuilder() to construct.
private Library(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
super(builder);
@@ -677,11 +678,12 @@ public final class DebugJsProtoBuf {
break;
}
case 26: {
+ org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
importedModules_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
mutable_bitField0_ |= 0x00000004;
}
- importedModules_.add(input.readBytes());
+ importedModules_.add(bs);
break;
}
}
@@ -696,7 +698,7 @@ public final class DebugJsProtoBuf {
entry_ = java.util.Collections.unmodifiableList(entry_);
}
if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
- importedModules_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList(importedModules_);
+ importedModules_ = importedModules_.getUnmodifiableView();
}
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
@@ -829,10 +831,10 @@ public final class DebugJsProtoBuf {
// @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.js.Library.Kind)
}
- public interface FileEntryOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageOrBuilder {
+ public interface FileEntryOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.Library.FileEntry)
+ org.jetbrains.kotlin.protobuf.MessageOrBuilder {
- // required string path = 1;
/**
* required string path = 1;
*/
@@ -847,7 +849,6 @@ public final class DebugJsProtoBuf {
org.jetbrains.kotlin.protobuf.ByteString
getPathBytes();
- // required bytes content = 2;
/**
* required bytes content = 2;
*/
@@ -861,8 +862,9 @@ public final class DebugJsProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library.FileEntry}
*/
public static final class FileEntry extends
- org.jetbrains.kotlin.protobuf.GeneratedMessage
- implements FileEntryOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.Library.FileEntry)
+ FileEntryOrBuilder {
// Use FileEntry.newBuilder() to construct.
private FileEntry(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
super(builder);
@@ -909,8 +911,9 @@ public final class DebugJsProtoBuf {
break;
}
case 10: {
+ org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000001;
- path_ = input.readBytes();
+ path_ = bs;
break;
}
case 18: {
@@ -958,7 +961,6 @@ public final class DebugJsProtoBuf {
}
private int bitField0_;
- // required string path = 1;
public static final int PATH_FIELD_NUMBER = 1;
private java.lang.Object path_;
/**
@@ -1001,7 +1003,6 @@ public final class DebugJsProtoBuf {
}
}
- // required bytes content = 2;
public static final int CONTENT_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.protobuf.ByteString content_;
/**
@@ -1024,7 +1025,8 @@ public final class DebugJsProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (!hasPath()) {
memoizedIsInitialized = 0;
@@ -1146,8 +1148,9 @@ public final class DebugJsProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library.FileEntry}
*/
public static final class Builder extends
- org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder
- implements org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.FileEntryOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.Library.FileEntry)
+ org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.FileEntryOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_descriptor;
@@ -1279,7 +1282,6 @@ public final class DebugJsProtoBuf {
}
private int bitField0_;
- // required string path = 1;
private java.lang.Object path_ = "";
/**
* required string path = 1;
@@ -1293,9 +1295,12 @@ public final class DebugJsProtoBuf {
public java.lang.String getPath() {
java.lang.Object ref = path_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((org.jetbrains.kotlin.protobuf.ByteString) ref)
- .toStringUtf8();
- path_ = s;
+ org.jetbrains.kotlin.protobuf.ByteString bs =
+ (org.jetbrains.kotlin.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ path_ = s;
+ }
return s;
} else {
return (java.lang.String) ref;
@@ -1353,7 +1358,6 @@ public final class DebugJsProtoBuf {
return this;
}
- // required bytes content = 2;
private org.jetbrains.kotlin.protobuf.ByteString content_ = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;
/**
* required bytes content = 2;
@@ -1401,7 +1405,6 @@ public final class DebugJsProtoBuf {
}
private int bitField0_;
- // repeated .org.jetbrains.kotlin.serialization.js.Library.FileEntry entry = 1;
public static final int ENTRY_FIELD_NUMBER = 1;
private java.util.List entry_;
/**
@@ -1437,7 +1440,6 @@ public final class DebugJsProtoBuf {
return entry_.get(index);
}
- // optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];
public static final int KIND_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind kind_;
/**
@@ -1453,13 +1455,12 @@ public final class DebugJsProtoBuf {
return kind_;
}
- // repeated string importedModules = 3;
public static final int IMPORTEDMODULES_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.protobuf.LazyStringList importedModules_;
/**
* repeated string importedModules = 3;
*/
- public java.util.List
+ public org.jetbrains.kotlin.protobuf.ProtocolStringList
getImportedModulesList() {
return importedModules_;
}
@@ -1491,7 +1492,8 @@ public final class DebugJsProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
for (int i = 0; i < getEntryCount(); i++) {
if (!getEntry(i).isInitialized()) {
@@ -1623,8 +1625,9 @@ public final class DebugJsProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library}
*/
public static final class Builder extends
- org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder
- implements org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.LibraryOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.Library)
+ org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.LibraryOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor;
@@ -1710,8 +1713,7 @@ public final class DebugJsProtoBuf {
}
result.kind_ = kind_;
if (((bitField0_ & 0x00000004) == 0x00000004)) {
- importedModules_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList(
- importedModules_);
+ importedModules_ = importedModules_.getUnmodifiableView();
bitField0_ = (bitField0_ & ~0x00000004);
}
result.importedModules_ = importedModules_;
@@ -1803,7 +1805,6 @@ public final class DebugJsProtoBuf {
}
private int bitField0_;
- // repeated .org.jetbrains.kotlin.serialization.js.Library.FileEntry entry = 1;
private java.util.List entry_ =
java.util.Collections.emptyList();
private void ensureEntryIsMutable() {
@@ -1945,7 +1946,8 @@ public final class DebugJsProtoBuf {
java.lang.Iterable values) {
if (entryBuilder_ == null) {
ensureEntryIsMutable();
- super.addAll(values, entry_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, entry_);
onChanged();
} else {
entryBuilder_.addAllMessages(values);
@@ -2043,7 +2045,6 @@ public final class DebugJsProtoBuf {
return entryBuilder_;
}
- // optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];
private org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind kind_ = org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind.PLAIN;
/**
* optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];
@@ -2079,7 +2080,6 @@ public final class DebugJsProtoBuf {
return this;
}
- // repeated string importedModules = 3;
private org.jetbrains.kotlin.protobuf.LazyStringList importedModules_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
private void ensureImportedModulesIsMutable() {
if (!((bitField0_ & 0x00000004) == 0x00000004)) {
@@ -2090,9 +2090,9 @@ public final class DebugJsProtoBuf {
/**
* repeated string importedModules = 3;
*/
- public java.util.List
+ public org.jetbrains.kotlin.protobuf.ProtocolStringList
getImportedModulesList() {
- return java.util.Collections.unmodifiableList(importedModules_);
+ return importedModules_.getUnmodifiableView();
}
/**
* repeated string importedModules = 3;
@@ -2145,7 +2145,8 @@ public final class DebugJsProtoBuf {
public Builder addAllImportedModules(
java.lang.Iterable values) {
ensureImportedModulesIsMutable();
- super.addAll(values, importedModules_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, importedModules_);
onChanged();
return this;
}
@@ -2282,17 +2283,17 @@ public final class DebugJsProtoBuf {
.newFileScopedGeneratedExtension(
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_js_Classes_fieldAccessorTable;
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_js_Library_fieldAccessorTable;
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
@@ -2349,45 +2350,46 @@ public final class DebugJsProtoBuf {
"rotoBuf"
};
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
- new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
- public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
- org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
- descriptor = root;
- internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor =
- getDescriptor().getMessageTypes().get(0);
- internal_static_org_jetbrains_kotlin_serialization_js_Classes_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor,
- new java.lang.String[] { "ClassName", });
- internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor =
- getDescriptor().getMessageTypes().get(1);
- internal_static_org_jetbrains_kotlin_serialization_js_Library_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor,
- new java.lang.String[] { "Entry", "Kind", "ImportedModules", });
- internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_descriptor =
- internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor.getNestedTypes().get(0);
- internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_descriptor,
- new java.lang.String[] { "Path", "Content", });
- classAnnotation.internalInit(descriptor.getExtensions().get(0));
- constructorAnnotation.internalInit(descriptor.getExtensions().get(1));
- functionAnnotation.internalInit(descriptor.getExtensions().get(2));
- propertyAnnotation.internalInit(descriptor.getExtensions().get(3));
- compileTimeValue.internalInit(descriptor.getExtensions().get(4));
- enumEntryAnnotation.internalInit(descriptor.getExtensions().get(5));
- parameterAnnotation.internalInit(descriptor.getExtensions().get(6));
- typeAnnotation.internalInit(descriptor.getExtensions().get(7));
- typeParameterAnnotation.internalInit(descriptor.getExtensions().get(8));
- return null;
- }
- };
+ new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
+ public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
+ org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
+ descriptor = root;
+ return null;
+ }
+ };
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor(),
}, assigner);
+ internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor =
+ getDescriptor().getMessageTypes().get(0);
+ internal_static_org_jetbrains_kotlin_serialization_js_Classes_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor,
+ new java.lang.String[] { "ClassName", });
+ internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor =
+ getDescriptor().getMessageTypes().get(1);
+ internal_static_org_jetbrains_kotlin_serialization_js_Library_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor,
+ new java.lang.String[] { "Entry", "Kind", "ImportedModules", });
+ internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_descriptor =
+ internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor.getNestedTypes().get(0);
+ internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_descriptor,
+ new java.lang.String[] { "Path", "Content", });
+ classAnnotation.internalInit(descriptor.getExtensions().get(0));
+ constructorAnnotation.internalInit(descriptor.getExtensions().get(1));
+ functionAnnotation.internalInit(descriptor.getExtensions().get(2));
+ propertyAnnotation.internalInit(descriptor.getExtensions().get(3));
+ compileTimeValue.internalInit(descriptor.getExtensions().get(4));
+ enumEntryAnnotation.internalInit(descriptor.getExtensions().get(5));
+ parameterAnnotation.internalInit(descriptor.getExtensions().get(6));
+ typeAnnotation.internalInit(descriptor.getExtensions().get(7));
+ typeParameterAnnotation.internalInit(descriptor.getExtensions().get(8));
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor();
}
// @@protoc_insertion_point(outer_class_scope)
diff --git a/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmPackageTable.java b/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmPackageTable.java
index 7cab401f986..ca1af3b4371 100644
--- a/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmPackageTable.java
+++ b/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmPackageTable.java
@@ -8,10 +8,10 @@ public final class DebugJvmPackageTable {
public static void registerAllExtensions(
org.jetbrains.kotlin.protobuf.ExtensionRegistry registry) {
}
- public interface PackageTableOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageOrBuilder {
+ public interface PackageTableOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.PackageTable)
+ org.jetbrains.kotlin.protobuf.MessageOrBuilder {
- // repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
/**
* repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
*/
@@ -40,8 +40,9 @@ public final class DebugJvmPackageTable {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageTable}
*/
public static final class PackageTable extends
- org.jetbrains.kotlin.protobuf.GeneratedMessage
- implements PackageTableOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.PackageTable)
+ PackageTableOrBuilder {
// Use PackageTable.newBuilder() to construct.
private PackageTable(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
super(builder);
@@ -137,7 +138,6 @@ public final class DebugJvmPackageTable {
return PARSER;
}
- // repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
public static final int PACKAGE_PARTS_FIELD_NUMBER = 1;
private java.util.List packageParts_;
/**
@@ -179,7 +179,8 @@ public final class DebugJvmPackageTable {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
for (int i = 0; i < getPackagePartsCount(); i++) {
if (!getPackageParts(i).isInitialized()) {
@@ -292,8 +293,9 @@ public final class DebugJvmPackageTable {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageTable}
*/
public static final class Builder extends
- org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder
- implements org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTableOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.PackageTable)
+ org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTableOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor;
@@ -443,7 +445,6 @@ public final class DebugJvmPackageTable {
}
private int bitField0_;
- // repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
private java.util.List packageParts_ =
java.util.Collections.emptyList();
private void ensurePackagePartsIsMutable() {
@@ -585,7 +586,8 @@ public final class DebugJvmPackageTable {
java.lang.Iterable values) {
if (packagePartsBuilder_ == null) {
ensurePackagePartsIsMutable();
- super.addAll(values, packageParts_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, packageParts_);
onChanged();
} else {
packagePartsBuilder_.addAllMessages(values);
@@ -694,10 +696,10 @@ public final class DebugJvmPackageTable {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.PackageTable)
}
- public interface PackagePartsOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageOrBuilder {
+ public interface PackagePartsOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+ org.jetbrains.kotlin.protobuf.MessageOrBuilder {
- // required string package_fq_name = 1;
/**
* required string package_fq_name = 1;
*/
@@ -712,12 +714,11 @@ public final class DebugJvmPackageTable {
org.jetbrains.kotlin.protobuf.ByteString
getPackageFqNameBytes();
- // repeated string class_name = 2;
/**
* repeated string class_name = 2;
*/
- java.util.List
- getClassNameList();
+ org.jetbrains.kotlin.protobuf.ProtocolStringList
+ getClassNameList();
/**
* repeated string class_name = 2;
*/
@@ -736,8 +737,9 @@ public final class DebugJvmPackageTable {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageParts}
*/
public static final class PackageParts extends
- org.jetbrains.kotlin.protobuf.GeneratedMessage
- implements PackagePartsOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+ PackagePartsOrBuilder {
// Use PackageParts.newBuilder() to construct.
private PackageParts(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
super(builder);
@@ -784,16 +786,18 @@ public final class DebugJvmPackageTable {
break;
}
case 10: {
+ org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000001;
- packageFqName_ = input.readBytes();
+ packageFqName_ = bs;
break;
}
case 18: {
+ org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
className_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
mutable_bitField0_ |= 0x00000002;
}
- className_.add(input.readBytes());
+ className_.add(bs);
break;
}
}
@@ -805,7 +809,7 @@ public final class DebugJvmPackageTable {
e.getMessage()).setUnfinishedMessage(this);
} finally {
if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
- className_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList(className_);
+ className_ = className_.getUnmodifiableView();
}
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
@@ -839,7 +843,6 @@ public final class DebugJvmPackageTable {
}
private int bitField0_;
- // required string package_fq_name = 1;
public static final int PACKAGE_FQ_NAME_FIELD_NUMBER = 1;
private java.lang.Object packageFqName_;
/**
@@ -882,13 +885,12 @@ public final class DebugJvmPackageTable {
}
}
- // repeated string class_name = 2;
public static final int CLASS_NAME_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.protobuf.LazyStringList className_;
/**
* repeated string class_name = 2;
*/
- public java.util.List
+ public org.jetbrains.kotlin.protobuf.ProtocolStringList
getClassNameList() {
return className_;
}
@@ -919,7 +921,8 @@ public final class DebugJvmPackageTable {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (!hasPackageFqName()) {
memoizedIsInitialized = 0;
@@ -1042,8 +1045,9 @@ public final class DebugJvmPackageTable {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageParts}
*/
public static final class Builder extends
- org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder
- implements org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+ org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
@@ -1113,8 +1117,7 @@ public final class DebugJvmPackageTable {
}
result.packageFqName_ = packageFqName_;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- className_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList(
- className_);
+ className_ = className_.getUnmodifiableView();
bitField0_ = (bitField0_ & ~0x00000002);
}
result.className_ = className_;
@@ -1180,7 +1183,6 @@ public final class DebugJvmPackageTable {
}
private int bitField0_;
- // required string package_fq_name = 1;
private java.lang.Object packageFqName_ = "";
/**
* required string package_fq_name = 1;
@@ -1194,9 +1196,12 @@ public final class DebugJvmPackageTable {
public java.lang.String getPackageFqName() {
java.lang.Object ref = packageFqName_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((org.jetbrains.kotlin.protobuf.ByteString) ref)
- .toStringUtf8();
- packageFqName_ = s;
+ org.jetbrains.kotlin.protobuf.ByteString bs =
+ (org.jetbrains.kotlin.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ packageFqName_ = s;
+ }
return s;
} else {
return (java.lang.String) ref;
@@ -1254,7 +1259,6 @@ public final class DebugJvmPackageTable {
return this;
}
- // repeated string class_name = 2;
private org.jetbrains.kotlin.protobuf.LazyStringList className_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
private void ensureClassNameIsMutable() {
if (!((bitField0_ & 0x00000002) == 0x00000002)) {
@@ -1265,9 +1269,9 @@ public final class DebugJvmPackageTable {
/**
* repeated string class_name = 2;
*/
- public java.util.List
+ public org.jetbrains.kotlin.protobuf.ProtocolStringList
getClassNameList() {
- return java.util.Collections.unmodifiableList(className_);
+ return className_.getUnmodifiableView();
}
/**
* repeated string class_name = 2;
@@ -1320,7 +1324,8 @@ public final class DebugJvmPackageTable {
public Builder addAllClassName(
java.lang.Iterable values) {
ensureClassNameIsMutable();
- super.addAll(values, className_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, className_);
onChanged();
return this;
}
@@ -1358,12 +1363,12 @@ public final class DebugJvmPackageTable {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.PackageParts)
}
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_fieldAccessorTable;
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
@@ -1387,29 +1392,29 @@ public final class DebugJvmPackageTable {
"e"
};
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
- new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
- public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
- org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
- descriptor = root;
- internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor =
- getDescriptor().getMessageTypes().get(0);
- internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor,
- new java.lang.String[] { "PackageParts", });
- internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor =
- getDescriptor().getMessageTypes().get(1);
- internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor,
- new java.lang.String[] { "PackageFqName", "ClassName", });
- return null;
- }
- };
+ new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
+ public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
+ org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
+ descriptor = root;
+ return null;
+ }
+ };
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
}, assigner);
+ internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor =
+ getDescriptor().getMessageTypes().get(0);
+ internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor,
+ new java.lang.String[] { "PackageParts", });
+ internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor =
+ getDescriptor().getMessageTypes().get(1);
+ internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor,
+ new java.lang.String[] { "PackageFqName", "ClassName", });
}
// @@protoc_insertion_point(outer_class_scope)
diff --git a/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java b/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
index b878113b8fb..e9c9a889511 100644
--- a/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
@@ -16,10 +16,10 @@ public final class DebugJvmProtoBuf {
registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.classModuleName);
registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.packageModuleName);
}
- public interface StringTableTypesOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageOrBuilder {
+ public interface StringTableTypesOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
+ org.jetbrains.kotlin.protobuf.MessageOrBuilder {
- // repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
/**
* repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
*/
@@ -44,7 +44,6 @@ public final class DebugJvmProtoBuf {
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.RecordOrBuilder getRecordOrBuilder(
int index);
- // repeated int32 local_name = 5 [packed = true];
/**
* repeated int32 local_name = 5 [packed = true];
*
@@ -74,8 +73,9 @@ public final class DebugJvmProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes}
*/
public static final class StringTableTypes extends
- org.jetbrains.kotlin.protobuf.GeneratedMessage
- implements StringTableTypesOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
+ StringTableTypesOrBuilder {
// Use StringTableTypes.newBuilder() to construct.
private StringTableTypes(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
super(builder);
@@ -195,10 +195,10 @@ public final class DebugJvmProtoBuf {
return PARSER;
}
- public interface RecordOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageOrBuilder {
+ public interface RecordOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
+ org.jetbrains.kotlin.protobuf.MessageOrBuilder {
- // optional int32 range = 1 [default = 1];
/**
* optional int32 range = 1 [default = 1];
*
@@ -216,7 +216,6 @@ public final class DebugJvmProtoBuf {
*/
int getRange();
- // optional int32 predefined_index = 2;
/**
* optional int32 predefined_index = 2;
*
@@ -234,7 +233,6 @@ public final class DebugJvmProtoBuf {
*/
int getPredefinedIndex();
- // optional string string = 6;
/**
* optional string string = 6;
*
@@ -261,7 +259,6 @@ public final class DebugJvmProtoBuf {
org.jetbrains.kotlin.protobuf.ByteString
getStringBytes();
- // optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
/**
* optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
*
@@ -279,7 +276,6 @@ public final class DebugJvmProtoBuf {
*/
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation getOperation();
- // repeated int32 substring_index = 4 [packed = true];
/**
* repeated int32 substring_index = 4 [packed = true];
*
@@ -311,7 +307,6 @@ public final class DebugJvmProtoBuf {
*/
int getSubstringIndex(int index);
- // repeated int32 replace_char = 5 [packed = true];
/**
* repeated int32 replace_char = 5 [packed = true];
*
@@ -344,8 +339,9 @@ public final class DebugJvmProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record}
*/
public static final class Record extends
- org.jetbrains.kotlin.protobuf.GeneratedMessage
- implements RecordOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
+ RecordOrBuilder {
// Use Record.newBuilder() to construct.
private Record(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
super(builder);
@@ -455,8 +451,9 @@ public final class DebugJvmProtoBuf {
break;
}
case 50: {
+ org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000004;
- string_ = input.readBytes();
+ string_ = bs;
break;
}
}
@@ -616,7 +613,6 @@ public final class DebugJvmProtoBuf {
}
private int bitField0_;
- // optional int32 range = 1 [default = 1];
public static final int RANGE_FIELD_NUMBER = 1;
private int range_;
/**
@@ -640,7 +636,6 @@ public final class DebugJvmProtoBuf {
return range_;
}
- // optional int32 predefined_index = 2;
public static final int PREDEFINED_INDEX_FIELD_NUMBER = 2;
private int predefinedIndex_;
/**
@@ -664,7 +659,6 @@ public final class DebugJvmProtoBuf {
return predefinedIndex_;
}
- // optional string string = 6;
public static final int STRING_FIELD_NUMBER = 6;
private java.lang.Object string_;
/**
@@ -719,7 +713,6 @@ public final class DebugJvmProtoBuf {
}
}
- // optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
public static final int OPERATION_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation operation_;
/**
@@ -743,7 +736,6 @@ public final class DebugJvmProtoBuf {
return operation_;
}
- // repeated int32 substring_index = 4 [packed = true];
public static final int SUBSTRING_INDEX_FIELD_NUMBER = 4;
private java.util.List substringIndex_;
/**
@@ -785,7 +777,6 @@ public final class DebugJvmProtoBuf {
}
private int substringIndexMemoizedSerializedSize = -1;
- // repeated int32 replace_char = 5 [packed = true];
public static final int REPLACE_CHAR_FIELD_NUMBER = 5;
private java.util.List replaceChar_;
/**
@@ -835,7 +826,8 @@ public final class DebugJvmProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
return true;
@@ -1005,8 +997,9 @@ public final class DebugJvmProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record}
*/
public static final class Builder extends
- org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder
- implements org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.RecordOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
+ org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.RecordOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor;
@@ -1182,7 +1175,6 @@ public final class DebugJvmProtoBuf {
}
private int bitField0_;
- // optional int32 range = 1 [default = 1];
private int range_ = 1;
/**
* optional int32 range = 1 [default = 1];
@@ -1231,7 +1223,6 @@ public final class DebugJvmProtoBuf {
return this;
}
- // optional int32 predefined_index = 2;
private int predefinedIndex_ ;
/**
* optional int32 predefined_index = 2;
@@ -1280,7 +1271,6 @@ public final class DebugJvmProtoBuf {
return this;
}
- // optional string string = 6;
private java.lang.Object string_ = "";
/**
* optional string string = 6;
@@ -1302,9 +1292,12 @@ public final class DebugJvmProtoBuf {
public java.lang.String getString() {
java.lang.Object ref = string_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((org.jetbrains.kotlin.protobuf.ByteString) ref)
- .toStringUtf8();
- string_ = s;
+ org.jetbrains.kotlin.protobuf.ByteString bs =
+ (org.jetbrains.kotlin.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ string_ = s;
+ }
return s;
} else {
return (java.lang.String) ref;
@@ -1378,7 +1371,6 @@ public final class DebugJvmProtoBuf {
return this;
}
- // optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation operation_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation.NONE;
/**
* optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
@@ -1430,7 +1422,6 @@ public final class DebugJvmProtoBuf {
return this;
}
- // repeated int32 substring_index = 4 [packed = true];
private java.util.List substringIndex_ = java.util.Collections.emptyList();
private void ensureSubstringIndexIsMutable() {
if (!((bitField0_ & 0x00000010) == 0x00000010)) {
@@ -1518,7 +1509,8 @@ public final class DebugJvmProtoBuf {
public Builder addAllSubstringIndex(
java.lang.Iterable values) {
ensureSubstringIndexIsMutable();
- super.addAll(values, substringIndex_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, substringIndex_);
onChanged();
return this;
}
@@ -1538,7 +1530,6 @@ public final class DebugJvmProtoBuf {
return this;
}
- // repeated int32 replace_char = 5 [packed = true];
private java.util.List replaceChar_ = java.util.Collections.emptyList();
private void ensureReplaceCharIsMutable() {
if (!((bitField0_ & 0x00000020) == 0x00000020)) {
@@ -1620,7 +1611,8 @@ public final class DebugJvmProtoBuf {
public Builder addAllReplaceChar(
java.lang.Iterable values) {
ensureReplaceCharIsMutable();
- super.addAll(values, replaceChar_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, replaceChar_);
onChanged();
return this;
}
@@ -1650,7 +1642,6 @@ public final class DebugJvmProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
}
- // repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
public static final int RECORD_FIELD_NUMBER = 1;
private java.util.List record_;
/**
@@ -1686,7 +1677,6 @@ public final class DebugJvmProtoBuf {
return record_.get(index);
}
- // repeated int32 local_name = 5 [packed = true];
public static final int LOCAL_NAME_FIELD_NUMBER = 5;
private java.util.List localName_;
/**
@@ -1729,7 +1719,8 @@ public final class DebugJvmProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
return true;
@@ -1857,8 +1848,9 @@ public final class DebugJvmProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes}
*/
public static final class Builder extends
- org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder
- implements org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypesOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
+ org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypesOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor;
@@ -2019,7 +2011,6 @@ public final class DebugJvmProtoBuf {
}
private int bitField0_;
- // repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
private java.util.List record_ =
java.util.Collections.emptyList();
private void ensureRecordIsMutable() {
@@ -2161,7 +2152,8 @@ public final class DebugJvmProtoBuf {
java.lang.Iterable values) {
if (recordBuilder_ == null) {
ensureRecordIsMutable();
- super.addAll(values, record_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, record_);
onChanged();
} else {
recordBuilder_.addAllMessages(values);
@@ -2259,7 +2251,6 @@ public final class DebugJvmProtoBuf {
return recordBuilder_;
}
- // repeated int32 local_name = 5 [packed = true];
private java.util.List localName_ = java.util.Collections.emptyList();
private void ensureLocalNameIsMutable() {
if (!((bitField0_ & 0x00000002) == 0x00000002)) {
@@ -2335,7 +2326,8 @@ public final class DebugJvmProtoBuf {
public Builder addAllLocalName(
java.lang.Iterable values) {
ensureLocalNameIsMutable();
- super.addAll(values, localName_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, localName_);
onChanged();
return this;
}
@@ -2364,10 +2356,10 @@ public final class DebugJvmProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
}
- public interface JvmMethodSignatureOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageOrBuilder {
+ public interface JvmMethodSignatureOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
+ org.jetbrains.kotlin.protobuf.MessageOrBuilder {
- // optional int32 name = 1;
/**
* optional int32 name = 1;
*/
@@ -2377,7 +2369,6 @@ public final class DebugJvmProtoBuf {
*/
int getName();
- // optional int32 desc = 2;
/**
* optional int32 desc = 2;
*
@@ -2399,8 +2390,9 @@ public final class DebugJvmProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature}
*/
public static final class JvmMethodSignature extends
- org.jetbrains.kotlin.protobuf.GeneratedMessage
- implements JvmMethodSignatureOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
+ JvmMethodSignatureOrBuilder {
// Use JvmMethodSignature.newBuilder() to construct.
private JvmMethodSignature(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
super(builder);
@@ -2496,7 +2488,6 @@ public final class DebugJvmProtoBuf {
}
private int bitField0_;
- // optional int32 name = 1;
public static final int NAME_FIELD_NUMBER = 1;
private int name_;
/**
@@ -2512,7 +2503,6 @@ public final class DebugJvmProtoBuf {
return name_;
}
- // optional int32 desc = 2;
public static final int DESC_FIELD_NUMBER = 2;
private int desc_;
/**
@@ -2543,7 +2533,8 @@ public final class DebugJvmProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
return true;
@@ -2657,8 +2648,9 @@ public final class DebugJvmProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature}
*/
public static final class Builder extends
- org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder
- implements org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
+ org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor;
@@ -2780,7 +2772,6 @@ public final class DebugJvmProtoBuf {
}
private int bitField0_;
- // optional int32 name = 1;
private int name_ ;
/**
* optional int32 name = 1;
@@ -2813,7 +2804,6 @@ public final class DebugJvmProtoBuf {
return this;
}
- // optional int32 desc = 2;
private int desc_ ;
/**
* optional int32 desc = 2;
@@ -2873,10 +2863,10 @@ public final class DebugJvmProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
}
- public interface JvmFieldSignatureOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageOrBuilder {
+ public interface JvmFieldSignatureOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
+ org.jetbrains.kotlin.protobuf.MessageOrBuilder {
- // optional int32 name = 1;
/**
* optional int32 name = 1;
*/
@@ -2886,7 +2876,6 @@ public final class DebugJvmProtoBuf {
*/
int getName();
- // optional int32 desc = 2;
/**
* optional int32 desc = 2;
*
@@ -2908,8 +2897,9 @@ public final class DebugJvmProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature}
*/
public static final class JvmFieldSignature extends
- org.jetbrains.kotlin.protobuf.GeneratedMessage
- implements JvmFieldSignatureOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
+ JvmFieldSignatureOrBuilder {
// Use JvmFieldSignature.newBuilder() to construct.
private JvmFieldSignature(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
super(builder);
@@ -3005,7 +2995,6 @@ public final class DebugJvmProtoBuf {
}
private int bitField0_;
- // optional int32 name = 1;
public static final int NAME_FIELD_NUMBER = 1;
private int name_;
/**
@@ -3021,7 +3010,6 @@ public final class DebugJvmProtoBuf {
return name_;
}
- // optional int32 desc = 2;
public static final int DESC_FIELD_NUMBER = 2;
private int desc_;
/**
@@ -3052,7 +3040,8 @@ public final class DebugJvmProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
return true;
@@ -3166,8 +3155,9 @@ public final class DebugJvmProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature}
*/
public static final class Builder extends
- org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder
- implements org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
+ org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor;
@@ -3289,7 +3279,6 @@ public final class DebugJvmProtoBuf {
}
private int bitField0_;
- // optional int32 name = 1;
private int name_ ;
/**
* optional int32 name = 1;
@@ -3322,7 +3311,6 @@ public final class DebugJvmProtoBuf {
return this;
}
- // optional int32 desc = 2;
private int desc_ ;
/**
* optional int32 desc = 2;
@@ -3382,10 +3370,10 @@ public final class DebugJvmProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
}
- public interface JvmPropertySignatureOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageOrBuilder {
+ public interface JvmPropertySignatureOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
+ org.jetbrains.kotlin.protobuf.MessageOrBuilder {
- // optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
/**
* optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
*/
@@ -3399,7 +3387,6 @@ public final class DebugJvmProtoBuf {
*/
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder getFieldOrBuilder();
- // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
/**
* optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
*
@@ -3425,7 +3412,6 @@ public final class DebugJvmProtoBuf {
*/
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getSyntheticMethodOrBuilder();
- // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
/**
* optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
*/
@@ -3439,7 +3425,6 @@ public final class DebugJvmProtoBuf {
*/
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getGetterOrBuilder();
- // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
/**
* optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
*/
@@ -3457,8 +3442,9 @@ public final class DebugJvmProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature}
*/
public static final class JvmPropertySignature extends
- org.jetbrains.kotlin.protobuf.GeneratedMessage
- implements JvmPropertySignatureOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
+ JvmPropertySignatureOrBuilder {
// Use JvmPropertySignature.newBuilder() to construct.
private JvmPropertySignature(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
super(builder);
@@ -3596,7 +3582,6 @@ public final class DebugJvmProtoBuf {
}
private int bitField0_;
- // optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
public static final int FIELD_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature field_;
/**
@@ -3618,7 +3603,6 @@ public final class DebugJvmProtoBuf {
return field_;
}
- // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
public static final int SYNTHETIC_METHOD_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature syntheticMethod_;
/**
@@ -3652,7 +3636,6 @@ public final class DebugJvmProtoBuf {
return syntheticMethod_;
}
- // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
public static final int GETTER_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getter_;
/**
@@ -3674,7 +3657,6 @@ public final class DebugJvmProtoBuf {
return getter_;
}
- // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
public static final int SETTER_FIELD_NUMBER = 4;
private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature setter_;
/**
@@ -3705,7 +3687,8 @@ public final class DebugJvmProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
return true;
@@ -3833,8 +3816,9 @@ public final class DebugJvmProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature}
*/
public static final class Builder extends
- org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder
- implements org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignatureOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
+ org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignatureOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor;
@@ -4010,7 +3994,6 @@ public final class DebugJvmProtoBuf {
}
private int bitField0_;
- // optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature field_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.getDefaultInstance();
private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder> fieldBuilder_;
@@ -4119,7 +4102,7 @@ public final class DebugJvmProtoBuf {
if (fieldBuilder_ == null) {
fieldBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder>(
- field_,
+ getField(),
getParentForChildren(),
isClean());
field_ = null;
@@ -4127,7 +4110,6 @@ public final class DebugJvmProtoBuf {
return fieldBuilder_;
}
- // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature syntheticMethod_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> syntheticMethodBuilder_;
@@ -4272,7 +4254,7 @@ public final class DebugJvmProtoBuf {
if (syntheticMethodBuilder_ == null) {
syntheticMethodBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder>(
- syntheticMethod_,
+ getSyntheticMethod(),
getParentForChildren(),
isClean());
syntheticMethod_ = null;
@@ -4280,7 +4262,6 @@ public final class DebugJvmProtoBuf {
return syntheticMethodBuilder_;
}
- // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getter_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> getterBuilder_;
@@ -4389,7 +4370,7 @@ public final class DebugJvmProtoBuf {
if (getterBuilder_ == null) {
getterBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder>(
- getter_,
+ getGetter(),
getParentForChildren(),
isClean());
getter_ = null;
@@ -4397,7 +4378,6 @@ public final class DebugJvmProtoBuf {
return getterBuilder_;
}
- // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature setter_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> setterBuilder_;
@@ -4506,7 +4486,7 @@ public final class DebugJvmProtoBuf {
if (setterBuilder_ == null) {
setterBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder>(
- setter_,
+ getSetter(),
getParentForChildren(),
isClean());
setter_ = null;
@@ -4594,6 +4574,10 @@ public final class DebugJvmProtoBuf {
public static final int CLASS_MODULE_NAME_FIELD_NUMBER = 101;
/**
* extend .org.jetbrains.kotlin.serialization.Class { ... }
+ *
+ *
+ * If absent, assumed to be JvmAbi.DEFAULT_MODULE_NAME
+ *
*/
public static final
org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
@@ -4613,27 +4597,27 @@ public final class DebugJvmProtoBuf {
.newFileScopedGeneratedExtension(
java.lang.Integer.class,
null);
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_fieldAccessorTable;
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_fieldAccessorTable;
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_fieldAccessorTable;
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_fieldAccessorTable;
- private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+ private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
@@ -4699,65 +4683,69 @@ public final class DebugJvmProtoBuf {
"\022B\020DebugJvmProtoBuf"
};
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
- new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
- public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
- org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
- descriptor = root;
- internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor =
- getDescriptor().getMessageTypes().get(0);
- internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor,
- new java.lang.String[] { "Record", "LocalName", });
- internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor =
- internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor.getNestedTypes().get(0);
- internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor,
- new java.lang.String[] { "Range", "PredefinedIndex", "String", "Operation", "SubstringIndex", "ReplaceChar", });
- internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor =
- getDescriptor().getMessageTypes().get(1);
- internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor,
- new java.lang.String[] { "Name", "Desc", });
- internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor =
- getDescriptor().getMessageTypes().get(2);
- internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor,
- new java.lang.String[] { "Name", "Desc", });
- internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor =
- getDescriptor().getMessageTypes().get(3);
- internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_fieldAccessorTable = new
- org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor,
- new java.lang.String[] { "Field", "SyntheticMethod", "Getter", "Setter", });
- constructorSignature.internalInit(descriptor.getExtensions().get(0));
- methodSignature.internalInit(descriptor.getExtensions().get(1));
- propertySignature.internalInit(descriptor.getExtensions().get(2));
- typeAnnotation.internalInit(descriptor.getExtensions().get(3));
- isRaw.internalInit(descriptor.getExtensions().get(4));
- typeParameterAnnotation.internalInit(descriptor.getExtensions().get(5));
- classModuleName.internalInit(descriptor.getExtensions().get(6));
- packageModuleName.internalInit(descriptor.getExtensions().get(7));
- org.jetbrains.kotlin.protobuf.ExtensionRegistry registry =
- org.jetbrains.kotlin.protobuf.ExtensionRegistry.newInstance();
- registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
- registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
- registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
- registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
- registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
- registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
- return registry;
- }
- };
+ new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
+ public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
+ org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
+ descriptor = root;
+ return null;
+ }
+ };
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.getDescriptor(),
org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor(),
}, assigner);
+ internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor =
+ getDescriptor().getMessageTypes().get(0);
+ internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor,
+ new java.lang.String[] { "Record", "LocalName", });
+ internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor =
+ internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor.getNestedTypes().get(0);
+ internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor,
+ new java.lang.String[] { "Range", "PredefinedIndex", "String", "Operation", "SubstringIndex", "ReplaceChar", });
+ internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor =
+ getDescriptor().getMessageTypes().get(1);
+ internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor,
+ new java.lang.String[] { "Name", "Desc", });
+ internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor =
+ getDescriptor().getMessageTypes().get(2);
+ internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor,
+ new java.lang.String[] { "Name", "Desc", });
+ internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor =
+ getDescriptor().getMessageTypes().get(3);
+ internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_fieldAccessorTable = new
+ org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor,
+ new java.lang.String[] { "Field", "SyntheticMethod", "Getter", "Setter", });
+ constructorSignature.internalInit(descriptor.getExtensions().get(0));
+ methodSignature.internalInit(descriptor.getExtensions().get(1));
+ propertySignature.internalInit(descriptor.getExtensions().get(2));
+ typeAnnotation.internalInit(descriptor.getExtensions().get(3));
+ isRaw.internalInit(descriptor.getExtensions().get(4));
+ typeParameterAnnotation.internalInit(descriptor.getExtensions().get(5));
+ classModuleName.internalInit(descriptor.getExtensions().get(6));
+ packageModuleName.internalInit(descriptor.getExtensions().get(7));
+ org.jetbrains.kotlin.protobuf.ExtensionRegistry registry =
+ org.jetbrains.kotlin.protobuf.ExtensionRegistry.newInstance();
+ registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
+ registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
+ registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
+ registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
+ registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
+ registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
+ org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
+ .internalUpdateFileDescriptor(descriptor, registry);
+ org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.getDescriptor();
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor();
}
// @@protoc_insertion_point(outer_class_scope)
diff --git a/build.xml b/build.xml
index 46f5f9385cc..110eea8a85b 100644
--- a/build.xml
+++ b/build.xml
@@ -24,8 +24,8 @@
-
-
+
+
diff --git a/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt b/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt
index b40bee69c0b..1b3bfdfe9f1 100644
--- a/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt
+++ b/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt
@@ -133,7 +133,7 @@ class BuiltInsSerializer(private val dependOnOldBuiltIns: Boolean) {
private fun serializeClass(classDescriptor: ClassDescriptor) {
val classProto = DescriptorSerializer.createTopLevel(extension).classProto(classDescriptor).build()
- proto.addClass(classProto)
+ proto.addClass_(classProto)
serializeClasses(classDescriptor.unsubstitutedInnerClassesScope)
}
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmPackageTable.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmPackageTable.java
index af33d711988..e1a7a391816 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmPackageTable.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmPackageTable.java
@@ -8,10 +8,10 @@ public final class JvmPackageTable {
public static void registerAllExtensions(
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite registry) {
}
- public interface PackageTableOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
+ public interface PackageTableOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.PackageTable)
+ org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
- // repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
/**
* repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
*/
@@ -30,14 +30,15 @@ public final class JvmPackageTable {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageTable}
*/
public static final class PackageTable extends
- org.jetbrains.kotlin.protobuf.GeneratedMessageLite
- implements PackageTableOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.PackageTable)
+ PackageTableOrBuilder {
// Use PackageTable.newBuilder() to construct.
private PackageTable(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
+ this.unknownFields = builder.getUnknownFields();
}
- private PackageTable(boolean noInit) {}
+ private PackageTable(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final PackageTable defaultInstance;
public static PackageTable getDefaultInstance() {
@@ -48,12 +49,18 @@ public final class JvmPackageTable {
return defaultInstance;
}
+ private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private PackageTable(
org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
+ org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput =
+ org.jetbrains.kotlin.protobuf.ByteString.newOutput();
+ org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput =
+ org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance(
+ unknownFieldsOutput);
try {
boolean done = false;
while (!done) {
@@ -63,7 +70,7 @@ public final class JvmPackageTable {
done = true;
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
}
@@ -88,6 +95,13 @@ public final class JvmPackageTable {
if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
packageParts_ = java.util.Collections.unmodifiableList(packageParts_);
}
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
}
@@ -106,7 +120,6 @@ public final class JvmPackageTable {
return PARSER;
}
- // repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
public static final int PACKAGE_PARTS_FIELD_NUMBER = 1;
private java.util.List packageParts_;
/**
@@ -148,7 +161,8 @@ public final class JvmPackageTable {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
for (int i = 0; i < getPackagePartsCount(); i++) {
if (!getPackageParts(i).isInitialized()) {
@@ -166,6 +180,7 @@ public final class JvmPackageTable {
for (int i = 0; i < packageParts_.size(); i++) {
output.writeMessage(1, packageParts_.get(i));
}
+ output.writeRawBytes(unknownFields);
}
private int memoizedSerializedSize = -1;
@@ -178,6 +193,7 @@ public final class JvmPackageTable {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(1, packageParts_.get(i));
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
}
@@ -255,7 +271,9 @@ public final class JvmPackageTable {
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable, Builder>
- implements org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTableOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.PackageTable)
+ org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTableOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
@@ -313,6 +331,8 @@ public final class JvmPackageTable {
}
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -345,7 +365,6 @@ public final class JvmPackageTable {
}
private int bitField0_;
- // repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
private java.util.List packageParts_ =
java.util.Collections.emptyList();
private void ensurePackagePartsIsMutable() {
@@ -447,7 +466,8 @@ public final class JvmPackageTable {
public Builder addAllPackageParts(
java.lang.Iterable values) {
ensurePackagePartsIsMutable();
- super.addAll(values, packageParts_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, packageParts_);
return this;
}
@@ -481,10 +501,10 @@ public final class JvmPackageTable {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.PackageTable)
}
- public interface PackagePartsOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
+ public interface PackagePartsOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+ org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
- // required string package_fq_name = 1;
/**
* required string package_fq_name = 1;
*/
@@ -499,12 +519,11 @@ public final class JvmPackageTable {
org.jetbrains.kotlin.protobuf.ByteString
getPackageFqNameBytes();
- // repeated string class_name = 2;
/**
* repeated string class_name = 2;
*/
- java.util.List
- getClassNameList();
+ org.jetbrains.kotlin.protobuf.ProtocolStringList
+ getClassNameList();
/**
* repeated string class_name = 2;
*/
@@ -523,14 +542,15 @@ public final class JvmPackageTable {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageParts}
*/
public static final class PackageParts extends
- org.jetbrains.kotlin.protobuf.GeneratedMessageLite
- implements PackagePartsOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+ PackagePartsOrBuilder {
// Use PackageParts.newBuilder() to construct.
private PackageParts(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
+ this.unknownFields = builder.getUnknownFields();
}
- private PackageParts(boolean noInit) {}
+ private PackageParts(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final PackageParts defaultInstance;
public static PackageParts getDefaultInstance() {
@@ -541,12 +561,18 @@ public final class JvmPackageTable {
return defaultInstance;
}
+ private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private PackageParts(
org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
+ org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput =
+ org.jetbrains.kotlin.protobuf.ByteString.newOutput();
+ org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput =
+ org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance(
+ unknownFieldsOutput);
try {
boolean done = false;
while (!done) {
@@ -556,23 +582,25 @@ public final class JvmPackageTable {
done = true;
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
}
break;
}
case 10: {
+ org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000001;
- packageFqName_ = input.readBytes();
+ packageFqName_ = bs;
break;
}
case 18: {
+ org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
className_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
mutable_bitField0_ |= 0x00000002;
}
- className_.add(input.readBytes());
+ className_.add(bs);
break;
}
}
@@ -584,7 +612,14 @@ public final class JvmPackageTable {
e.getMessage()).setUnfinishedMessage(this);
} finally {
if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
- className_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList(className_);
+ className_ = className_.getUnmodifiableView();
+ }
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
}
makeExtensionsImmutable();
}
@@ -605,7 +640,6 @@ public final class JvmPackageTable {
}
private int bitField0_;
- // required string package_fq_name = 1;
public static final int PACKAGE_FQ_NAME_FIELD_NUMBER = 1;
private java.lang.Object packageFqName_;
/**
@@ -648,13 +682,12 @@ public final class JvmPackageTable {
}
}
- // repeated string class_name = 2;
public static final int CLASS_NAME_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.protobuf.LazyStringList className_;
/**
* repeated string class_name = 2;
*/
- public java.util.List
+ public org.jetbrains.kotlin.protobuf.ProtocolStringList
getClassNameList() {
return className_;
}
@@ -685,7 +718,8 @@ public final class JvmPackageTable {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (!hasPackageFqName()) {
memoizedIsInitialized = 0;
@@ -704,6 +738,7 @@ public final class JvmPackageTable {
for (int i = 0; i < className_.size(); i++) {
output.writeBytes(2, className_.getByteString(i));
}
+ output.writeRawBytes(unknownFields);
}
private int memoizedSerializedSize = -1;
@@ -725,6 +760,7 @@ public final class JvmPackageTable {
size += dataSize;
size += 1 * getClassNameList().size();
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
}
@@ -802,7 +838,9 @@ public final class JvmPackageTable {
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts, Builder>
- implements org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackagePartsOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+ org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackagePartsOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
@@ -848,8 +886,7 @@ public final class JvmPackageTable {
}
result.packageFqName_ = packageFqName_;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- className_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList(
- className_);
+ className_ = className_.getUnmodifiableView();
bitField0_ = (bitField0_ & ~0x00000002);
}
result.className_ = className_;
@@ -874,6 +911,8 @@ public final class JvmPackageTable {
}
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -904,7 +943,6 @@ public final class JvmPackageTable {
}
private int bitField0_;
- // required string package_fq_name = 1;
private java.lang.Object packageFqName_ = "";
/**
* required string package_fq_name = 1;
@@ -918,9 +956,12 @@ public final class JvmPackageTable {
public java.lang.String getPackageFqName() {
java.lang.Object ref = packageFqName_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((org.jetbrains.kotlin.protobuf.ByteString) ref)
- .toStringUtf8();
- packageFqName_ = s;
+ org.jetbrains.kotlin.protobuf.ByteString bs =
+ (org.jetbrains.kotlin.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ packageFqName_ = s;
+ }
return s;
} else {
return (java.lang.String) ref;
@@ -978,7 +1019,6 @@ public final class JvmPackageTable {
return this;
}
- // repeated string class_name = 2;
private org.jetbrains.kotlin.protobuf.LazyStringList className_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
private void ensureClassNameIsMutable() {
if (!((bitField0_ & 0x00000002) == 0x00000002)) {
@@ -989,9 +1029,9 @@ public final class JvmPackageTable {
/**
* repeated string class_name = 2;
*/
- public java.util.List
+ public org.jetbrains.kotlin.protobuf.ProtocolStringList
getClassNameList() {
- return java.util.Collections.unmodifiableList(className_);
+ return className_.getUnmodifiableView();
}
/**
* repeated string class_name = 2;
@@ -1044,7 +1084,8 @@ public final class JvmPackageTable {
public Builder addAllClassName(
java.lang.Iterable values) {
ensureClassNameIsMutable();
- super.addAll(values, className_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, className_);
return this;
}
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 37e5a3ecc59..5f0d082bcc1 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
@@ -16,10 +16,10 @@ public final class JvmProtoBuf {
registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.classModuleName);
registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.packageModuleName);
}
- public interface StringTableTypesOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
+ public interface StringTableTypesOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
+ org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
- // repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
/**
* repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
*/
@@ -34,7 +34,6 @@ public final class JvmProtoBuf {
*/
int getRecordCount();
- // repeated int32 local_name = 5 [packed = true];
/**
* repeated int32 local_name = 5 [packed = true];
*
@@ -64,14 +63,15 @@ public final class JvmProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes}
*/
public static final class StringTableTypes extends
- org.jetbrains.kotlin.protobuf.GeneratedMessageLite
- implements StringTableTypesOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
+ StringTableTypesOrBuilder {
// Use StringTableTypes.newBuilder() to construct.
private StringTableTypes(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
+ this.unknownFields = builder.getUnknownFields();
}
- private StringTableTypes(boolean noInit) {}
+ private StringTableTypes(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final StringTableTypes defaultInstance;
public static StringTableTypes getDefaultInstance() {
@@ -82,12 +82,18 @@ public final class JvmProtoBuf {
return defaultInstance;
}
+ private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private StringTableTypes(
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) {
@@ -97,7 +103,7 @@ public final class JvmProtoBuf {
done = true;
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
}
@@ -146,6 +152,13 @@ public final class JvmProtoBuf {
if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
localName_ = java.util.Collections.unmodifiableList(localName_);
}
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
}
@@ -164,10 +177,10 @@ public final class JvmProtoBuf {
return PARSER;
}
- public interface RecordOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
+ public interface RecordOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
+ org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
- // optional int32 range = 1 [default = 1];
/**
* optional int32 range = 1 [default = 1];
*
@@ -185,7 +198,6 @@ public final class JvmProtoBuf {
*/
int getRange();
- // optional int32 predefined_index = 2;
/**
* optional int32 predefined_index = 2;
*
@@ -203,7 +215,6 @@ public final class JvmProtoBuf {
*/
int getPredefinedIndex();
- // optional string string = 6;
/**
* optional string string = 6;
*
@@ -230,7 +241,6 @@ public final class JvmProtoBuf {
org.jetbrains.kotlin.protobuf.ByteString
getStringBytes();
- // optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
/**
* optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
*
@@ -248,7 +258,6 @@ public final class JvmProtoBuf {
*/
org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.Operation getOperation();
- // repeated int32 substring_index = 4 [packed = true];
/**
* repeated int32 substring_index = 4 [packed = true];
*
@@ -280,7 +289,6 @@ public final class JvmProtoBuf {
*/
int getSubstringIndex(int index);
- // repeated int32 replace_char = 5 [packed = true];
/**
* repeated int32 replace_char = 5 [packed = true];
*
@@ -313,14 +321,15 @@ public final class JvmProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record}
*/
public static final class Record extends
- org.jetbrains.kotlin.protobuf.GeneratedMessageLite
- implements RecordOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
+ RecordOrBuilder {
// Use Record.newBuilder() to construct.
private Record(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
+ this.unknownFields = builder.getUnknownFields();
}
- private Record(boolean noInit) {}
+ private Record(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final Record defaultInstance;
public static Record getDefaultInstance() {
@@ -331,12 +340,18 @@ public final class JvmProtoBuf {
return defaultInstance;
}
+ private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private Record(
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) {
@@ -346,7 +361,7 @@ public final class JvmProtoBuf {
done = true;
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
}
@@ -365,7 +380,10 @@ public final class JvmProtoBuf {
case 24: {
int rawValue = input.readEnum();
org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.Operation value = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.Operation.valueOf(rawValue);
- if (value != null) {
+ if (value == null) {
+ unknownFieldsCodedOutput.writeRawVarint32(tag);
+ unknownFieldsCodedOutput.writeRawVarint32(rawValue);
+ } else {
bitField0_ |= 0x00000008;
operation_ = value;
}
@@ -414,8 +432,9 @@ public final class JvmProtoBuf {
break;
}
case 50: {
+ org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000004;
- string_ = input.readBytes();
+ string_ = bs;
break;
}
}
@@ -432,6 +451,13 @@ public final class JvmProtoBuf {
if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
replaceChar_ = java.util.Collections.unmodifiableList(replaceChar_);
}
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
}
@@ -536,7 +562,6 @@ public final class JvmProtoBuf {
}
private int bitField0_;
- // optional int32 range = 1 [default = 1];
public static final int RANGE_FIELD_NUMBER = 1;
private int range_;
/**
@@ -560,7 +585,6 @@ public final class JvmProtoBuf {
return range_;
}
- // optional int32 predefined_index = 2;
public static final int PREDEFINED_INDEX_FIELD_NUMBER = 2;
private int predefinedIndex_;
/**
@@ -584,7 +608,6 @@ public final class JvmProtoBuf {
return predefinedIndex_;
}
- // optional string string = 6;
public static final int STRING_FIELD_NUMBER = 6;
private java.lang.Object string_;
/**
@@ -639,7 +662,6 @@ public final class JvmProtoBuf {
}
}
- // optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
public static final int OPERATION_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.Operation operation_;
/**
@@ -663,7 +685,6 @@ public final class JvmProtoBuf {
return operation_;
}
- // repeated int32 substring_index = 4 [packed = true];
public static final int SUBSTRING_INDEX_FIELD_NUMBER = 4;
private java.util.List substringIndex_;
/**
@@ -705,7 +726,6 @@ public final class JvmProtoBuf {
}
private int substringIndexMemoizedSerializedSize = -1;
- // repeated int32 replace_char = 5 [packed = true];
public static final int REPLACE_CHAR_FIELD_NUMBER = 5;
private java.util.List replaceChar_;
/**
@@ -755,7 +775,8 @@ public final class JvmProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
return true;
@@ -790,6 +811,7 @@ public final class JvmProtoBuf {
if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeBytes(6, getStringBytes());
}
+ output.writeRawBytes(unknownFields);
}
private int memoizedSerializedSize = -1;
@@ -842,6 +864,7 @@ public final class JvmProtoBuf {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeBytesSize(6, getStringBytes());
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
}
@@ -919,7 +942,9 @@ public final class JvmProtoBuf {
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record, Builder>
- implements org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.RecordOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
+ org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.RecordOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
@@ -1034,6 +1059,8 @@ public final class JvmProtoBuf {
}
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -1060,7 +1087,6 @@ public final class JvmProtoBuf {
}
private int bitField0_;
- // optional int32 range = 1 [default = 1];
private int range_ = 1;
/**
* optional int32 range = 1 [default = 1];
@@ -1109,7 +1135,6 @@ public final class JvmProtoBuf {
return this;
}
- // optional int32 predefined_index = 2;
private int predefinedIndex_ ;
/**
* optional int32 predefined_index = 2;
@@ -1158,7 +1183,6 @@ public final class JvmProtoBuf {
return this;
}
- // optional string string = 6;
private java.lang.Object string_ = "";
/**
* optional string string = 6;
@@ -1180,9 +1204,12 @@ public final class JvmProtoBuf {
public java.lang.String getString() {
java.lang.Object ref = string_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((org.jetbrains.kotlin.protobuf.ByteString) ref)
- .toStringUtf8();
- string_ = s;
+ org.jetbrains.kotlin.protobuf.ByteString bs =
+ (org.jetbrains.kotlin.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ string_ = s;
+ }
return s;
} else {
return (java.lang.String) ref;
@@ -1256,7 +1283,6 @@ public final class JvmProtoBuf {
return this;
}
- // optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.Operation operation_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.Operation.NONE;
/**
* optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
@@ -1308,7 +1334,6 @@ public final class JvmProtoBuf {
return this;
}
- // repeated int32 substring_index = 4 [packed = true];
private java.util.List substringIndex_ = java.util.Collections.emptyList();
private void ensureSubstringIndexIsMutable() {
if (!((bitField0_ & 0x00000010) == 0x00000010)) {
@@ -1396,7 +1421,8 @@ public final class JvmProtoBuf {
public Builder addAllSubstringIndex(
java.lang.Iterable values) {
ensureSubstringIndexIsMutable();
- super.addAll(values, substringIndex_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, substringIndex_);
return this;
}
@@ -1416,7 +1442,6 @@ public final class JvmProtoBuf {
return this;
}
- // repeated int32 replace_char = 5 [packed = true];
private java.util.List replaceChar_ = java.util.Collections.emptyList();
private void ensureReplaceCharIsMutable() {
if (!((bitField0_ & 0x00000020) == 0x00000020)) {
@@ -1498,7 +1523,8 @@ public final class JvmProtoBuf {
public Builder addAllReplaceChar(
java.lang.Iterable values) {
ensureReplaceCharIsMutable();
- super.addAll(values, replaceChar_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, replaceChar_);
return this;
}
@@ -1528,7 +1554,6 @@ public final class JvmProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
}
- // repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
public static final int RECORD_FIELD_NUMBER = 1;
private java.util.List record_;
/**
@@ -1564,7 +1589,6 @@ public final class JvmProtoBuf {
return record_.get(index);
}
- // repeated int32 local_name = 5 [packed = true];
public static final int LOCAL_NAME_FIELD_NUMBER = 5;
private java.util.List localName_;
/**
@@ -1607,7 +1631,8 @@ public final class JvmProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
return true;
@@ -1626,6 +1651,7 @@ public final class JvmProtoBuf {
for (int i = 0; i < localName_.size(); i++) {
output.writeInt32NoTag(localName_.get(i));
}
+ output.writeRawBytes(unknownFields);
}
private int memoizedSerializedSize = -1;
@@ -1652,6 +1678,7 @@ public final class JvmProtoBuf {
}
localNameMemoizedSerializedSize = dataSize;
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
}
@@ -1729,7 +1756,9 @@ public final class JvmProtoBuf {
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes, Builder>
- implements org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypesOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
+ org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypesOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
@@ -1804,6 +1833,8 @@ public final class JvmProtoBuf {
}
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -1830,7 +1861,6 @@ public final class JvmProtoBuf {
}
private int bitField0_;
- // repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
private java.util.List record_ =
java.util.Collections.emptyList();
private void ensureRecordIsMutable() {
@@ -1932,7 +1962,8 @@ public final class JvmProtoBuf {
public Builder addAllRecord(
java.lang.Iterable values) {
ensureRecordIsMutable();
- super.addAll(values, record_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, record_);
return this;
}
@@ -1955,7 +1986,6 @@ public final class JvmProtoBuf {
return this;
}
- // repeated int32 local_name = 5 [packed = true];
private java.util.List localName_ = java.util.Collections.emptyList();
private void ensureLocalNameIsMutable() {
if (!((bitField0_ & 0x00000002) == 0x00000002)) {
@@ -2031,7 +2061,8 @@ public final class JvmProtoBuf {
public Builder addAllLocalName(
java.lang.Iterable values) {
ensureLocalNameIsMutable();
- super.addAll(values, localName_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, localName_);
return this;
}
@@ -2060,10 +2091,10 @@ public final class JvmProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
}
- public interface JvmMethodSignatureOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
+ public interface JvmMethodSignatureOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
+ org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
- // optional int32 name = 1;
/**
* optional int32 name = 1;
*/
@@ -2073,7 +2104,6 @@ public final class JvmProtoBuf {
*/
int getName();
- // optional int32 desc = 2;
/**
* optional int32 desc = 2;
*
@@ -2095,14 +2125,15 @@ public final class JvmProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature}
*/
public static final class JvmMethodSignature extends
- org.jetbrains.kotlin.protobuf.GeneratedMessageLite
- implements JvmMethodSignatureOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
+ JvmMethodSignatureOrBuilder {
// Use JvmMethodSignature.newBuilder() to construct.
private JvmMethodSignature(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
+ this.unknownFields = builder.getUnknownFields();
}
- private JvmMethodSignature(boolean noInit) {}
+ private JvmMethodSignature(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final JvmMethodSignature defaultInstance;
public static JvmMethodSignature getDefaultInstance() {
@@ -2113,12 +2144,18 @@ public final class JvmProtoBuf {
return defaultInstance;
}
+ private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private JvmMethodSignature(
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) {
@@ -2128,7 +2165,7 @@ public final class JvmProtoBuf {
done = true;
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
}
@@ -2152,6 +2189,13 @@ public final class JvmProtoBuf {
throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
}
@@ -2171,7 +2215,6 @@ public final class JvmProtoBuf {
}
private int bitField0_;
- // optional int32 name = 1;
public static final int NAME_FIELD_NUMBER = 1;
private int name_;
/**
@@ -2187,7 +2230,6 @@ public final class JvmProtoBuf {
return name_;
}
- // optional int32 desc = 2;
public static final int DESC_FIELD_NUMBER = 2;
private int desc_;
/**
@@ -2218,7 +2260,8 @@ public final class JvmProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
return true;
@@ -2233,6 +2276,7 @@ public final class JvmProtoBuf {
if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeInt32(2, desc_);
}
+ output.writeRawBytes(unknownFields);
}
private int memoizedSerializedSize = -1;
@@ -2249,6 +2293,7 @@ public final class JvmProtoBuf {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeInt32Size(2, desc_);
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
}
@@ -2326,7 +2371,9 @@ public final class JvmProtoBuf {
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature, Builder>
- implements org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignatureOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
+ org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignatureOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
@@ -2387,6 +2434,8 @@ public final class JvmProtoBuf {
if (other.hasDesc()) {
setDesc(other.getDesc());
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -2413,7 +2462,6 @@ public final class JvmProtoBuf {
}
private int bitField0_;
- // optional int32 name = 1;
private int name_ ;
/**
* optional int32 name = 1;
@@ -2446,7 +2494,6 @@ public final class JvmProtoBuf {
return this;
}
- // optional int32 desc = 2;
private int desc_ ;
/**
* optional int32 desc = 2;
@@ -2506,10 +2553,10 @@ public final class JvmProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
}
- public interface JvmFieldSignatureOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
+ public interface JvmFieldSignatureOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
+ org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
- // optional int32 name = 1;
/**
* optional int32 name = 1;
*/
@@ -2519,7 +2566,6 @@ public final class JvmProtoBuf {
*/
int getName();
- // optional int32 desc = 2;
/**
* optional int32 desc = 2;
*
@@ -2541,14 +2587,15 @@ public final class JvmProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature}
*/
public static final class JvmFieldSignature extends
- org.jetbrains.kotlin.protobuf.GeneratedMessageLite
- implements JvmFieldSignatureOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
+ JvmFieldSignatureOrBuilder {
// Use JvmFieldSignature.newBuilder() to construct.
private JvmFieldSignature(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
+ this.unknownFields = builder.getUnknownFields();
}
- private JvmFieldSignature(boolean noInit) {}
+ private JvmFieldSignature(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final JvmFieldSignature defaultInstance;
public static JvmFieldSignature getDefaultInstance() {
@@ -2559,12 +2606,18 @@ public final class JvmProtoBuf {
return defaultInstance;
}
+ private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private JvmFieldSignature(
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) {
@@ -2574,7 +2627,7 @@ public final class JvmProtoBuf {
done = true;
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
}
@@ -2598,6 +2651,13 @@ public final class JvmProtoBuf {
throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
}
@@ -2617,7 +2677,6 @@ public final class JvmProtoBuf {
}
private int bitField0_;
- // optional int32 name = 1;
public static final int NAME_FIELD_NUMBER = 1;
private int name_;
/**
@@ -2633,7 +2692,6 @@ public final class JvmProtoBuf {
return name_;
}
- // optional int32 desc = 2;
public static final int DESC_FIELD_NUMBER = 2;
private int desc_;
/**
@@ -2664,7 +2722,8 @@ public final class JvmProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
return true;
@@ -2679,6 +2738,7 @@ public final class JvmProtoBuf {
if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeInt32(2, desc_);
}
+ output.writeRawBytes(unknownFields);
}
private int memoizedSerializedSize = -1;
@@ -2695,6 +2755,7 @@ public final class JvmProtoBuf {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeInt32Size(2, desc_);
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
}
@@ -2772,7 +2833,9 @@ public final class JvmProtoBuf {
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature, Builder>
- implements org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignatureOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
+ org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignatureOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
@@ -2833,6 +2896,8 @@ public final class JvmProtoBuf {
if (other.hasDesc()) {
setDesc(other.getDesc());
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -2859,7 +2924,6 @@ public final class JvmProtoBuf {
}
private int bitField0_;
- // optional int32 name = 1;
private int name_ ;
/**
* optional int32 name = 1;
@@ -2892,7 +2956,6 @@ public final class JvmProtoBuf {
return this;
}
- // optional int32 desc = 2;
private int desc_ ;
/**
* optional int32 desc = 2;
@@ -2952,10 +3015,10 @@ public final class JvmProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
}
- public interface JvmPropertySignatureOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
+ public interface JvmPropertySignatureOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
+ org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
- // optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
/**
* optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
*/
@@ -2965,7 +3028,6 @@ public final class JvmProtoBuf {
*/
org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature getField();
- // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
/**
* optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
*
@@ -2983,7 +3045,6 @@ public final class JvmProtoBuf {
*/
org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getSyntheticMethod();
- // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
/**
* optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
*/
@@ -2993,7 +3054,6 @@ public final class JvmProtoBuf {
*/
org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getGetter();
- // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
/**
* optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
*/
@@ -3007,14 +3067,15 @@ public final class JvmProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature}
*/
public static final class JvmPropertySignature extends
- org.jetbrains.kotlin.protobuf.GeneratedMessageLite
- implements JvmPropertySignatureOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
+ JvmPropertySignatureOrBuilder {
// Use JvmPropertySignature.newBuilder() to construct.
private JvmPropertySignature(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
+ this.unknownFields = builder.getUnknownFields();
}
- private JvmPropertySignature(boolean noInit) {}
+ private JvmPropertySignature(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final JvmPropertySignature defaultInstance;
public static JvmPropertySignature getDefaultInstance() {
@@ -3025,12 +3086,18 @@ public final class JvmProtoBuf {
return defaultInstance;
}
+ private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private JvmPropertySignature(
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) {
@@ -3040,7 +3107,7 @@ public final class JvmProtoBuf {
done = true;
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
}
@@ -3106,6 +3173,13 @@ public final class JvmProtoBuf {
throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
}
@@ -3125,7 +3199,6 @@ public final class JvmProtoBuf {
}
private int bitField0_;
- // optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
public static final int FIELD_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature field_;
/**
@@ -3141,7 +3214,6 @@ public final class JvmProtoBuf {
return field_;
}
- // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
public static final int SYNTHETIC_METHOD_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature syntheticMethod_;
/**
@@ -3165,7 +3237,6 @@ public final class JvmProtoBuf {
return syntheticMethod_;
}
- // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
public static final int GETTER_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getter_;
/**
@@ -3181,7 +3252,6 @@ public final class JvmProtoBuf {
return getter_;
}
- // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
public static final int SETTER_FIELD_NUMBER = 4;
private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature setter_;
/**
@@ -3206,7 +3276,8 @@ public final class JvmProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
return true;
@@ -3227,6 +3298,7 @@ public final class JvmProtoBuf {
if (((bitField0_ & 0x00000008) == 0x00000008)) {
output.writeMessage(4, setter_);
}
+ output.writeRawBytes(unknownFields);
}
private int memoizedSerializedSize = -1;
@@ -3251,6 +3323,7 @@ public final class JvmProtoBuf {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(4, setter_);
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
}
@@ -3328,7 +3401,9 @@ public final class JvmProtoBuf {
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature, Builder>
- implements org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignatureOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
+ org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignatureOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
@@ -3407,6 +3482,8 @@ public final class JvmProtoBuf {
if (other.hasSetter()) {
mergeSetter(other.getSetter());
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -3433,7 +3510,6 @@ public final class JvmProtoBuf {
}
private int bitField0_;
- // optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature field_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.getDefaultInstance();
/**
* optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
@@ -3494,7 +3570,6 @@ public final class JvmProtoBuf {
return this;
}
- // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature syntheticMethod_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
/**
* optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
@@ -3579,7 +3654,6 @@ public final class JvmProtoBuf {
return this;
}
- // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getter_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
/**
* optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
@@ -3640,7 +3714,6 @@ public final class JvmProtoBuf {
return this;
}
- // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature setter_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
/**
* optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
@@ -3726,7 +3799,8 @@ public final class JvmProtoBuf {
org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance(),
null,
100,
- org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE);
+ org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
+ org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.class);
public static final int METHOD_SIGNATURE_FIELD_NUMBER = 100;
/**
* extend .org.jetbrains.kotlin.serialization.Function { ... }
@@ -3741,7 +3815,8 @@ public final class JvmProtoBuf {
org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance(),
null,
100,
- org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE);
+ org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
+ org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.class);
public static final int PROPERTY_SIGNATURE_FIELD_NUMBER = 100;
/**
* extend .org.jetbrains.kotlin.serialization.Property { ... }
@@ -3756,7 +3831,8 @@ public final class JvmProtoBuf {
org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature.getDefaultInstance(),
null,
100,
- org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE);
+ org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
+ org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature.class);
public static final int TYPE_ANNOTATION_FIELD_NUMBER = 100;
/**
* extend .org.jetbrains.kotlin.serialization.Type { ... }
@@ -3771,7 +3847,8 @@ public final class JvmProtoBuf {
null,
100,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
- false);
+ false,
+ org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
public static final int IS_RAW_FIELD_NUMBER = 101;
/**
* extend .org.jetbrains.kotlin.serialization.Type { ... }
@@ -3786,7 +3863,8 @@ public final class JvmProtoBuf {
null,
null,
101,
- org.jetbrains.kotlin.protobuf.WireFormat.FieldType.BOOL);
+ org.jetbrains.kotlin.protobuf.WireFormat.FieldType.BOOL,
+ java.lang.Boolean.class);
public static final int TYPE_PARAMETER_ANNOTATION_FIELD_NUMBER = 100;
/**
* extend .org.jetbrains.kotlin.serialization.TypeParameter { ... }
@@ -3801,10 +3879,15 @@ public final class JvmProtoBuf {
null,
100,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
- false);
+ false,
+ org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
public static final int CLASS_MODULE_NAME_FIELD_NUMBER = 101;
/**
* extend .org.jetbrains.kotlin.serialization.Class { ... }
+ *
+ *
+ * If absent, assumed to be JvmAbi.DEFAULT_MODULE_NAME
+ *
*/
public static final
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
@@ -3816,7 +3899,8 @@ public final class JvmProtoBuf {
null,
null,
101,
- org.jetbrains.kotlin.protobuf.WireFormat.FieldType.INT32);
+ org.jetbrains.kotlin.protobuf.WireFormat.FieldType.INT32,
+ java.lang.Integer.class);
public static final int PACKAGE_MODULE_NAME_FIELD_NUMBER = 101;
/**
* extend .org.jetbrains.kotlin.serialization.Package { ... }
@@ -3831,7 +3915,8 @@ public final class JvmProtoBuf {
null,
null,
101,
- org.jetbrains.kotlin.protobuf.WireFormat.FieldType.INT32);
+ org.jetbrains.kotlin.protobuf.WireFormat.FieldType.INT32,
+ java.lang.Integer.class);
static {
}
diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsClassDataFinder.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsClassDataFinder.kt
index 2116e97e46d..9691c279dcd 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsClassDataFinder.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsClassDataFinder.kt
@@ -29,7 +29,7 @@ class BuiltInsClassDataFinder(
private val nameResolver: NameResolver
) : ClassDataFinder {
private val classIdToProto =
- proto.classList.associateBy { klass ->
+ proto.class_List.associateBy { klass ->
nameResolver.getClassId(klass.fqName)
}
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
index 7b93963111a..a77fa2ad0e4 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
@@ -272,15 +272,15 @@ public final class ProtoBuf {
// @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.MemberKind)
}
- public interface StringTableOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
+ public interface StringTableOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.StringTable)
+ org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
- // repeated string string = 1;
/**
* repeated string string = 1;
*/
- java.util.List
- getStringList();
+ org.jetbrains.kotlin.protobuf.ProtocolStringList
+ getStringList();
/**
* repeated string string = 1;
*/
@@ -299,14 +299,15 @@ public final class ProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.StringTable}
*/
public static final class StringTable extends
- org.jetbrains.kotlin.protobuf.GeneratedMessageLite
- implements StringTableOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.StringTable)
+ StringTableOrBuilder {
// Use StringTable.newBuilder() to construct.
private StringTable(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
+ this.unknownFields = builder.getUnknownFields();
}
- private StringTable(boolean noInit) {}
+ private StringTable(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final StringTable defaultInstance;
public static StringTable getDefaultInstance() {
@@ -317,12 +318,18 @@ public final class ProtoBuf {
return defaultInstance;
}
+ private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private StringTable(
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) {
@@ -332,18 +339,19 @@ public final class ProtoBuf {
done = true;
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
}
break;
}
case 10: {
+ org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
string_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
mutable_bitField0_ |= 0x00000001;
}
- string_.add(input.readBytes());
+ string_.add(bs);
break;
}
}
@@ -355,7 +363,14 @@ public final class ProtoBuf {
e.getMessage()).setUnfinishedMessage(this);
} finally {
if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
- string_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList(string_);
+ string_ = string_.getUnmodifiableView();
+ }
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
}
makeExtensionsImmutable();
}
@@ -375,13 +390,12 @@ public final class ProtoBuf {
return PARSER;
}
- // repeated string string = 1;
public static final int STRING_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.protobuf.LazyStringList string_;
/**
* repeated string string = 1;
*/
- public java.util.List
+ public org.jetbrains.kotlin.protobuf.ProtocolStringList
getStringList() {
return string_;
}
@@ -411,7 +425,8 @@ public final class ProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
memoizedIsInitialized = 1;
return true;
@@ -423,6 +438,7 @@ public final class ProtoBuf {
for (int i = 0; i < string_.size(); i++) {
output.writeBytes(1, string_.getByteString(i));
}
+ output.writeRawBytes(unknownFields);
}
private int memoizedSerializedSize = -1;
@@ -440,6 +456,7 @@ public final class ProtoBuf {
size += dataSize;
size += 1 * getStringList().size();
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
}
@@ -517,7 +534,9 @@ public final class ProtoBuf {
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
org.jetbrains.kotlin.serialization.ProtoBuf.StringTable, Builder>
- implements org.jetbrains.kotlin.serialization.ProtoBuf.StringTableOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.StringTable)
+ org.jetbrains.kotlin.serialization.ProtoBuf.StringTableOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
@@ -556,8 +575,7 @@ public final class ProtoBuf {
org.jetbrains.kotlin.serialization.ProtoBuf.StringTable result = new org.jetbrains.kotlin.serialization.ProtoBuf.StringTable(this);
int from_bitField0_ = bitField0_;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- string_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList(
- string_);
+ string_ = string_.getUnmodifiableView();
bitField0_ = (bitField0_ & ~0x00000001);
}
result.string_ = string_;
@@ -576,6 +594,8 @@ public final class ProtoBuf {
}
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -602,7 +622,6 @@ public final class ProtoBuf {
}
private int bitField0_;
- // repeated string string = 1;
private org.jetbrains.kotlin.protobuf.LazyStringList string_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
private void ensureStringIsMutable() {
if (!((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -613,9 +632,9 @@ public final class ProtoBuf {
/**
* repeated string string = 1;
*/
- public java.util.List
+ public org.jetbrains.kotlin.protobuf.ProtocolStringList
getStringList() {
- return java.util.Collections.unmodifiableList(string_);
+ return string_.getUnmodifiableView();
}
/**
* repeated string string = 1;
@@ -668,7 +687,8 @@ public final class ProtoBuf {
public Builder addAllString(
java.lang.Iterable values) {
ensureStringIsMutable();
- super.addAll(values, string_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, string_);
return this;
}
@@ -706,10 +726,10 @@ public final class ProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.StringTable)
}
- public interface QualifiedNameTableOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
+ public interface QualifiedNameTableOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.QualifiedNameTable)
+ org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
- // repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
/**
* repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
*/
@@ -728,14 +748,15 @@ public final class ProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.QualifiedNameTable}
*/
public static final class QualifiedNameTable extends
- org.jetbrains.kotlin.protobuf.GeneratedMessageLite
- implements QualifiedNameTableOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.QualifiedNameTable)
+ QualifiedNameTableOrBuilder {
// Use QualifiedNameTable.newBuilder() to construct.
private QualifiedNameTable(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
+ this.unknownFields = builder.getUnknownFields();
}
- private QualifiedNameTable(boolean noInit) {}
+ private QualifiedNameTable(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final QualifiedNameTable defaultInstance;
public static QualifiedNameTable getDefaultInstance() {
@@ -746,12 +767,18 @@ public final class ProtoBuf {
return defaultInstance;
}
+ private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private QualifiedNameTable(
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) {
@@ -761,7 +788,7 @@ public final class ProtoBuf {
done = true;
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
}
@@ -786,6 +813,13 @@ public final class ProtoBuf {
if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
qualifiedName_ = java.util.Collections.unmodifiableList(qualifiedName_);
}
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
}
@@ -804,10 +838,10 @@ public final class ProtoBuf {
return PARSER;
}
- public interface QualifiedNameOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
+ public interface QualifiedNameOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName)
+ org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
- // optional int32 parent_qualified_name = 1 [default = -1];
/**
* optional int32 parent_qualified_name = 1 [default = -1];
*/
@@ -817,7 +851,6 @@ public final class ProtoBuf {
*/
int getParentQualifiedName();
- // required int32 short_name = 2;
/**
* required int32 short_name = 2;
*
@@ -835,7 +868,6 @@ public final class ProtoBuf {
*/
int getShortName();
- // optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
/**
* optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
*/
@@ -849,14 +881,15 @@ public final class ProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName}
*/
public static final class QualifiedName extends
- org.jetbrains.kotlin.protobuf.GeneratedMessageLite
- implements QualifiedNameOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName)
+ QualifiedNameOrBuilder {
// Use QualifiedName.newBuilder() to construct.
private QualifiedName(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
+ this.unknownFields = builder.getUnknownFields();
}
- private QualifiedName(boolean noInit) {}
+ private QualifiedName(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final QualifiedName defaultInstance;
public static QualifiedName getDefaultInstance() {
@@ -867,12 +900,18 @@ public final class ProtoBuf {
return defaultInstance;
}
+ private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private QualifiedName(
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) {
@@ -882,7 +921,7 @@ public final class ProtoBuf {
done = true;
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
}
@@ -901,7 +940,10 @@ public final class ProtoBuf {
case 24: {
int rawValue = input.readEnum();
org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind value = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind.valueOf(rawValue);
- if (value != null) {
+ if (value == null) {
+ unknownFieldsCodedOutput.writeRawVarint32(tag);
+ unknownFieldsCodedOutput.writeRawVarint32(rawValue);
+ } else {
bitField0_ |= 0x00000004;
kind_ = value;
}
@@ -915,6 +957,13 @@ public final class ProtoBuf {
throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
}
@@ -999,7 +1048,6 @@ public final class ProtoBuf {
}
private int bitField0_;
- // optional int32 parent_qualified_name = 1 [default = -1];
public static final int PARENT_QUALIFIED_NAME_FIELD_NUMBER = 1;
private int parentQualifiedName_;
/**
@@ -1015,7 +1063,6 @@ public final class ProtoBuf {
return parentQualifiedName_;
}
- // required int32 short_name = 2;
public static final int SHORT_NAME_FIELD_NUMBER = 2;
private int shortName_;
/**
@@ -1039,7 +1086,6 @@ public final class ProtoBuf {
return shortName_;
}
- // optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
public static final int KIND_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind kind_;
/**
@@ -1063,7 +1109,8 @@ public final class ProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (!hasShortName()) {
memoizedIsInitialized = 0;
@@ -1085,6 +1132,7 @@ public final class ProtoBuf {
if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeEnum(3, kind_.getNumber());
}
+ output.writeRawBytes(unknownFields);
}
private int memoizedSerializedSize = -1;
@@ -1105,6 +1153,7 @@ public final class ProtoBuf {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeEnumSize(3, kind_.getNumber());
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
}
@@ -1182,7 +1231,9 @@ public final class ProtoBuf {
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName, Builder>
- implements org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName)
+ org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
@@ -1252,6 +1303,8 @@ public final class ProtoBuf {
if (other.hasKind()) {
setKind(other.getKind());
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -1282,7 +1335,6 @@ public final class ProtoBuf {
}
private int bitField0_;
- // optional int32 parent_qualified_name = 1 [default = -1];
private int parentQualifiedName_ = -1;
/**
* optional int32 parent_qualified_name = 1 [default = -1];
@@ -1315,7 +1367,6 @@ public final class ProtoBuf {
return this;
}
- // required int32 short_name = 2;
private int shortName_ ;
/**
* required int32 short_name = 2;
@@ -1364,7 +1415,6 @@ public final class ProtoBuf {
return this;
}
- // optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
private org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind kind_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE;
/**
* optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
@@ -1411,7 +1461,6 @@ public final class ProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName)
}
- // repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
public static final int QUALIFIED_NAME_FIELD_NUMBER = 1;
private java.util.List qualifiedName_;
/**
@@ -1453,7 +1502,8 @@ public final class ProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
for (int i = 0; i < getQualifiedNameCount(); i++) {
if (!getQualifiedName(i).isInitialized()) {
@@ -1471,6 +1521,7 @@ public final class ProtoBuf {
for (int i = 0; i < qualifiedName_.size(); i++) {
output.writeMessage(1, qualifiedName_.get(i));
}
+ output.writeRawBytes(unknownFields);
}
private int memoizedSerializedSize = -1;
@@ -1483,6 +1534,7 @@ public final class ProtoBuf {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(1, qualifiedName_.get(i));
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
}
@@ -1560,7 +1612,9 @@ public final class ProtoBuf {
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable, Builder>
- implements org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTableOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.QualifiedNameTable)
+ org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTableOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
@@ -1618,6 +1672,8 @@ public final class ProtoBuf {
}
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -1650,7 +1706,6 @@ public final class ProtoBuf {
}
private int bitField0_;
- // repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
private java.util.List qualifiedName_ =
java.util.Collections.emptyList();
private void ensureQualifiedNameIsMutable() {
@@ -1752,7 +1807,8 @@ public final class ProtoBuf {
public Builder addAllQualifiedName(
java.lang.Iterable values) {
ensureQualifiedNameIsMutable();
- super.addAll(values, qualifiedName_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, qualifiedName_);
return this;
}
@@ -1786,10 +1842,10 @@ public final class ProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.QualifiedNameTable)
}
- public interface AnnotationOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
+ public interface AnnotationOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Annotation)
+ org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
- // required int32 id = 1;
/**
* required int32 id = 1;
*/
@@ -1799,7 +1855,6 @@ public final class ProtoBuf {
*/
int getId();
- // repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
/**
* repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
*/
@@ -1818,14 +1873,15 @@ public final class ProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation}
*/
public static final class Annotation extends
- org.jetbrains.kotlin.protobuf.GeneratedMessageLite
- implements AnnotationOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Annotation)
+ AnnotationOrBuilder {
// Use Annotation.newBuilder() to construct.
private Annotation(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
+ this.unknownFields = builder.getUnknownFields();
}
- private Annotation(boolean noInit) {}
+ private Annotation(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final Annotation defaultInstance;
public static Annotation getDefaultInstance() {
@@ -1836,12 +1892,18 @@ public final class ProtoBuf {
return defaultInstance;
}
+ private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private Annotation(
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) {
@@ -1851,7 +1913,7 @@ public final class ProtoBuf {
done = true;
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
}
@@ -1881,6 +1943,13 @@ public final class ProtoBuf {
if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
argument_ = java.util.Collections.unmodifiableList(argument_);
}
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
}
@@ -1899,10 +1968,10 @@ public final class ProtoBuf {
return PARSER;
}
- public interface ArgumentOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
+ public interface ArgumentOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Annotation.Argument)
+ org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
- // required int32 name_id = 1;
/**
* required int32 name_id = 1;
*/
@@ -1912,7 +1981,6 @@ public final class ProtoBuf {
*/
int getNameId();
- // required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
/**
* required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
*/
@@ -1926,14 +1994,15 @@ public final class ProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation.Argument}
*/
public static final class Argument extends
- org.jetbrains.kotlin.protobuf.GeneratedMessageLite
- implements ArgumentOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Annotation.Argument)
+ ArgumentOrBuilder {
// Use Argument.newBuilder() to construct.
private Argument(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
+ this.unknownFields = builder.getUnknownFields();
}
- private Argument(boolean noInit) {}
+ private Argument(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final Argument defaultInstance;
public static Argument getDefaultInstance() {
@@ -1944,12 +2013,18 @@ public final class ProtoBuf {
return defaultInstance;
}
+ private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private Argument(
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) {
@@ -1959,7 +2034,7 @@ public final class ProtoBuf {
done = true;
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
}
@@ -1991,6 +2066,13 @@ public final class ProtoBuf {
throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
}
@@ -2009,10 +2091,10 @@ public final class ProtoBuf {
return PARSER;
}
- public interface ValueOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
+ public interface ValueOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Annotation.Argument.Value)
+ org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
- // optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
/**
* optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
*
@@ -2034,7 +2116,6 @@ public final class ProtoBuf {
*/
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type getType();
- // optional sint64 int_value = 2;
/**
* optional sint64 int_value = 2;
*/
@@ -2044,7 +2125,6 @@ public final class ProtoBuf {
*/
long getIntValue();
- // optional float float_value = 3;
/**
* optional float float_value = 3;
*/
@@ -2054,7 +2134,6 @@ public final class ProtoBuf {
*/
float getFloatValue();
- // optional double double_value = 4;
/**
* optional double double_value = 4;
*/
@@ -2064,7 +2143,6 @@ public final class ProtoBuf {
*/
double getDoubleValue();
- // optional int32 string_value = 5;
/**
* optional int32 string_value = 5;
*/
@@ -2074,7 +2152,6 @@ public final class ProtoBuf {
*/
int getStringValue();
- // optional int32 class_id = 6;
/**
* optional int32 class_id = 6;
*
@@ -2092,7 +2169,6 @@ public final class ProtoBuf {
*/
int getClassId();
- // optional int32 enum_value_id = 7;
/**
* optional int32 enum_value_id = 7;
*/
@@ -2102,7 +2178,6 @@ public final class ProtoBuf {
*/
int getEnumValueId();
- // optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
/**
* optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
*/
@@ -2112,7 +2187,6 @@ public final class ProtoBuf {
*/
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation getAnnotation();
- // repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
/**
* repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
*/
@@ -2131,14 +2205,15 @@ public final class ProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation.Argument.Value}
*/
public static final class Value extends
- org.jetbrains.kotlin.protobuf.GeneratedMessageLite
- implements ValueOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Annotation.Argument.Value)
+ ValueOrBuilder {
// Use Value.newBuilder() to construct.
private Value(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
+ this.unknownFields = builder.getUnknownFields();
}
- private Value(boolean noInit) {}
+ private Value(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final Value defaultInstance;
public static Value getDefaultInstance() {
@@ -2149,12 +2224,18 @@ public final class ProtoBuf {
return defaultInstance;
}
+ private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private Value(
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) {
@@ -2164,7 +2245,7 @@ public final class ProtoBuf {
done = true;
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
}
@@ -2173,7 +2254,10 @@ public final class ProtoBuf {
case 8: {
int rawValue = input.readEnum();
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type value = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type.valueOf(rawValue);
- if (value != null) {
+ if (value == null) {
+ unknownFieldsCodedOutput.writeRawVarint32(tag);
+ unknownFieldsCodedOutput.writeRawVarint32(rawValue);
+ } else {
bitField0_ |= 0x00000001;
type_ = value;
}
@@ -2241,6 +2325,13 @@ public final class ProtoBuf {
if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
arrayElement_ = java.util.Collections.unmodifiableList(arrayElement_);
}
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
}
@@ -2415,7 +2506,6 @@ public final class ProtoBuf {
}
private int bitField0_;
- // optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
public static final int TYPE_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type type_;
/**
@@ -2443,7 +2533,6 @@ public final class ProtoBuf {
return type_;
}
- // optional sint64 int_value = 2;
public static final int INT_VALUE_FIELD_NUMBER = 2;
private long intValue_;
/**
@@ -2459,7 +2548,6 @@ public final class ProtoBuf {
return intValue_;
}
- // optional float float_value = 3;
public static final int FLOAT_VALUE_FIELD_NUMBER = 3;
private float floatValue_;
/**
@@ -2475,7 +2563,6 @@ public final class ProtoBuf {
return floatValue_;
}
- // optional double double_value = 4;
public static final int DOUBLE_VALUE_FIELD_NUMBER = 4;
private double doubleValue_;
/**
@@ -2491,7 +2578,6 @@ public final class ProtoBuf {
return doubleValue_;
}
- // optional int32 string_value = 5;
public static final int STRING_VALUE_FIELD_NUMBER = 5;
private int stringValue_;
/**
@@ -2507,7 +2593,6 @@ public final class ProtoBuf {
return stringValue_;
}
- // optional int32 class_id = 6;
public static final int CLASS_ID_FIELD_NUMBER = 6;
private int classId_;
/**
@@ -2531,7 +2616,6 @@ public final class ProtoBuf {
return classId_;
}
- // optional int32 enum_value_id = 7;
public static final int ENUM_VALUE_ID_FIELD_NUMBER = 7;
private int enumValueId_;
/**
@@ -2547,7 +2631,6 @@ public final class ProtoBuf {
return enumValueId_;
}
- // optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
public static final int ANNOTATION_FIELD_NUMBER = 8;
private org.jetbrains.kotlin.serialization.ProtoBuf.Annotation annotation_;
/**
@@ -2563,7 +2646,6 @@ public final class ProtoBuf {
return annotation_;
}
- // repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
public static final int ARRAY_ELEMENT_FIELD_NUMBER = 9;
private java.util.List arrayElement_;
/**
@@ -2613,7 +2695,8 @@ public final class ProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (hasAnnotation()) {
if (!getAnnotation().isInitialized()) {
@@ -2661,6 +2744,7 @@ public final class ProtoBuf {
for (int i = 0; i < arrayElement_.size(); i++) {
output.writeMessage(9, arrayElement_.get(i));
}
+ output.writeRawBytes(unknownFields);
}
private int memoizedSerializedSize = -1;
@@ -2705,6 +2789,7 @@ public final class ProtoBuf {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(9, arrayElement_.get(i));
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
}
@@ -2782,7 +2867,9 @@ public final class ProtoBuf {
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value, Builder>
- implements org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.ValueOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Annotation.Argument.Value)
+ org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.ValueOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
@@ -2914,6 +3001,8 @@ public final class ProtoBuf {
}
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -2952,7 +3041,6 @@ public final class ProtoBuf {
}
private int bitField0_;
- // optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
private org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type.BYTE;
/**
* optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
@@ -3012,7 +3100,6 @@ public final class ProtoBuf {
return this;
}
- // optional sint64 int_value = 2;
private long intValue_ ;
/**
* optional sint64 int_value = 2;
@@ -3045,7 +3132,6 @@ public final class ProtoBuf {
return this;
}
- // optional float float_value = 3;
private float floatValue_ ;
/**
* optional float float_value = 3;
@@ -3078,7 +3164,6 @@ public final class ProtoBuf {
return this;
}
- // optional double double_value = 4;
private double doubleValue_ ;
/**
* optional double double_value = 4;
@@ -3111,7 +3196,6 @@ public final class ProtoBuf {
return this;
}
- // optional int32 string_value = 5;
private int stringValue_ ;
/**
* optional int32 string_value = 5;
@@ -3144,7 +3228,6 @@ public final class ProtoBuf {
return this;
}
- // optional int32 class_id = 6;
private int classId_ ;
/**
* optional int32 class_id = 6;
@@ -3193,7 +3276,6 @@ public final class ProtoBuf {
return this;
}
- // optional int32 enum_value_id = 7;
private int enumValueId_ ;
/**
* optional int32 enum_value_id = 7;
@@ -3226,7 +3308,6 @@ public final class ProtoBuf {
return this;
}
- // optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
private org.jetbrains.kotlin.serialization.ProtoBuf.Annotation annotation_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance();
/**
* optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
@@ -3287,7 +3368,6 @@ public final class ProtoBuf {
return this;
}
- // repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
private java.util.List arrayElement_ =
java.util.Collections.emptyList();
private void ensureArrayElementIsMutable() {
@@ -3389,7 +3469,8 @@ public final class ProtoBuf {
public Builder addAllArrayElement(
java.lang.Iterable values) {
ensureArrayElementIsMutable();
- super.addAll(values, arrayElement_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, arrayElement_);
return this;
}
@@ -3424,7 +3505,6 @@ public final class ProtoBuf {
}
private int bitField0_;
- // required int32 name_id = 1;
public static final int NAME_ID_FIELD_NUMBER = 1;
private int nameId_;
/**
@@ -3440,7 +3520,6 @@ public final class ProtoBuf {
return nameId_;
}
- // required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
public static final int VALUE_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value value_;
/**
@@ -3463,7 +3542,8 @@ public final class ProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (!hasNameId()) {
memoizedIsInitialized = 0;
@@ -3490,6 +3570,7 @@ public final class ProtoBuf {
if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, value_);
}
+ output.writeRawBytes(unknownFields);
}
private int memoizedSerializedSize = -1;
@@ -3506,6 +3587,7 @@ public final class ProtoBuf {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, value_);
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
}
@@ -3583,7 +3665,9 @@ public final class ProtoBuf {
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument, Builder>
- implements org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.ArgumentOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Annotation.Argument)
+ org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.ArgumentOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
@@ -3644,6 +3728,8 @@ public final class ProtoBuf {
if (other.hasValue()) {
mergeValue(other.getValue());
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -3682,7 +3768,6 @@ public final class ProtoBuf {
}
private int bitField0_;
- // required int32 name_id = 1;
private int nameId_ ;
/**
* required int32 name_id = 1;
@@ -3715,7 +3800,6 @@ public final class ProtoBuf {
return this;
}
- // required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
private org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value value_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance();
/**
* required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
@@ -3788,7 +3872,6 @@ public final class ProtoBuf {
}
private int bitField0_;
- // required int32 id = 1;
public static final int ID_FIELD_NUMBER = 1;
private int id_;
/**
@@ -3804,7 +3887,6 @@ public final class ProtoBuf {
return id_;
}
- // repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
public static final int ARGUMENT_FIELD_NUMBER = 2;
private java.util.List argument_;
/**
@@ -3847,7 +3929,8 @@ public final class ProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (!hasId()) {
memoizedIsInitialized = 0;
@@ -3872,6 +3955,7 @@ public final class ProtoBuf {
for (int i = 0; i < argument_.size(); i++) {
output.writeMessage(2, argument_.get(i));
}
+ output.writeRawBytes(unknownFields);
}
private int memoizedSerializedSize = -1;
@@ -3888,6 +3972,7 @@ public final class ProtoBuf {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, argument_.get(i));
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
}
@@ -3965,7 +4050,9 @@ public final class ProtoBuf {
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation, Builder>
- implements org.jetbrains.kotlin.serialization.ProtoBuf.AnnotationOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Annotation)
+ org.jetbrains.kotlin.serialization.ProtoBuf.AnnotationOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
@@ -4034,6 +4121,8 @@ public final class ProtoBuf {
}
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -4070,7 +4159,6 @@ public final class ProtoBuf {
}
private int bitField0_;
- // required int32 id = 1;
private int id_ ;
/**
* required int32 id = 1;
@@ -4103,7 +4191,6 @@ public final class ProtoBuf {
return this;
}
- // repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
private java.util.List argument_ =
java.util.Collections.emptyList();
private void ensureArgumentIsMutable() {
@@ -4205,7 +4292,8 @@ public final class ProtoBuf {
public Builder addAllArgument(
java.lang.Iterable values) {
ensureArgumentIsMutable();
- super.addAll(values, argument_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, argument_);
return this;
}
@@ -4240,10 +4328,10 @@ public final class ProtoBuf {
}
public interface TypeOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Type)
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.
ExtendableMessageOrBuilder {
- // repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
/**
* repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
*/
@@ -4258,7 +4346,6 @@ public final class ProtoBuf {
*/
int getArgumentCount();
- // optional bool nullable = 3 [default = false];
/**
* optional bool nullable = 3 [default = false];
*/
@@ -4268,7 +4355,6 @@ public final class ProtoBuf {
*/
boolean getNullable();
- // optional int32 flexible_type_capabilities_id = 4;
/**
* optional int32 flexible_type_capabilities_id = 4;
*
@@ -4288,7 +4374,6 @@ public final class ProtoBuf {
*/
int getFlexibleTypeCapabilitiesId();
- // optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
/**
* optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
*/
@@ -4298,7 +4383,6 @@ public final class ProtoBuf {
*/
org.jetbrains.kotlin.serialization.ProtoBuf.Type getFlexibleUpperBound();
- // optional int32 flexible_upper_bound_id = 8;
/**
* optional int32 flexible_upper_bound_id = 8;
*/
@@ -4308,7 +4392,6 @@ public final class ProtoBuf {
*/
int getFlexibleUpperBoundId();
- // optional int32 class_name = 6;
/**
* optional int32 class_name = 6;
*/
@@ -4318,7 +4401,6 @@ public final class ProtoBuf {
*/
int getClassName();
- // optional int32 type_parameter = 7;
/**
* optional int32 type_parameter = 7;
*
@@ -4336,7 +4418,6 @@ public final class ProtoBuf {
*/
int getTypeParameter();
- // optional int32 type_parameter_name = 9;
/**
* optional int32 type_parameter_name = 9;
*
@@ -4354,7 +4435,6 @@ public final class ProtoBuf {
*/
int getTypeParameterName();
- // optional int32 type_alias_name = 12;
/**
* optional int32 type_alias_name = 12;
*/
@@ -4364,7 +4444,6 @@ public final class ProtoBuf {
*/
int getTypeAliasName();
- // optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
/**
* optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
*/
@@ -4374,7 +4453,6 @@ public final class ProtoBuf {
*/
org.jetbrains.kotlin.serialization.ProtoBuf.Type getOuterType();
- // optional int32 outer_type_id = 11;
/**
* optional int32 outer_type_id = 11;
*/
@@ -4384,7 +4462,6 @@ public final class ProtoBuf {
*/
int getOuterTypeId();
- // optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
/**
* optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
*/
@@ -4394,7 +4471,6 @@ public final class ProtoBuf {
*/
org.jetbrains.kotlin.serialization.ProtoBuf.Type getAbbreviatedType();
- // optional int32 abbreviated_type_id = 14;
/**
* optional int32 abbreviated_type_id = 14;
*/
@@ -4409,13 +4485,15 @@ public final class ProtoBuf {
*/
public static final class Type extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableMessage<
- Type> implements TypeOrBuilder {
+ Type> implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Type)
+ TypeOrBuilder {
// Use Type.newBuilder() to construct.
private Type(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
super(builder);
-
+ this.unknownFields = builder.getUnknownFields();
}
- private Type(boolean noInit) {}
+ private Type(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final Type defaultInstance;
public static Type getDefaultInstance() {
@@ -4426,12 +4504,18 @@ public final class ProtoBuf {
return defaultInstance;
}
+ private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private Type(
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) {
@@ -4441,7 +4525,7 @@ public final class ProtoBuf {
done = true;
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
}
@@ -4550,6 +4634,13 @@ public final class ProtoBuf {
if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
argument_ = java.util.Collections.unmodifiableList(argument_);
}
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
}
@@ -4568,10 +4659,10 @@ public final class ProtoBuf {
return PARSER;
}
- public interface ArgumentOrBuilder
- extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
+ public interface ArgumentOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Type.Argument)
+ org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
- // optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
/**
* optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
*/
@@ -4581,7 +4672,6 @@ public final class ProtoBuf {
*/
org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection getProjection();
- // optional .org.jetbrains.kotlin.serialization.Type type = 2;
/**
* optional .org.jetbrains.kotlin.serialization.Type type = 2;
*
@@ -4599,7 +4689,6 @@ public final class ProtoBuf {
*/
org.jetbrains.kotlin.serialization.ProtoBuf.Type getType();
- // optional int32 type_id = 3;
/**
* optional int32 type_id = 3;
*/
@@ -4613,14 +4702,15 @@ public final class ProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.Type.Argument}
*/
public static final class Argument extends
- org.jetbrains.kotlin.protobuf.GeneratedMessageLite
- implements ArgumentOrBuilder {
+ org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Type.Argument)
+ ArgumentOrBuilder {
// Use Argument.newBuilder() to construct.
private Argument(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
-
+ this.unknownFields = builder.getUnknownFields();
}
- private Argument(boolean noInit) {}
+ private Argument(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final Argument defaultInstance;
public static Argument getDefaultInstance() {
@@ -4631,12 +4721,18 @@ public final class ProtoBuf {
return defaultInstance;
}
+ private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private Argument(
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) {
@@ -4646,7 +4742,7 @@ public final class ProtoBuf {
done = true;
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
}
@@ -4655,7 +4751,10 @@ public final class ProtoBuf {
case 8: {
int rawValue = input.readEnum();
org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection value = org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection.valueOf(rawValue);
- if (value != null) {
+ if (value == null) {
+ unknownFieldsCodedOutput.writeRawVarint32(tag);
+ unknownFieldsCodedOutput.writeRawVarint32(rawValue);
+ } else {
bitField0_ |= 0x00000001;
projection_ = value;
}
@@ -4687,6 +4786,13 @@ public final class ProtoBuf {
throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
}
@@ -4780,7 +4886,6 @@ public final class ProtoBuf {
}
private int bitField0_;
- // optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
public static final int PROJECTION_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection projection_;
/**
@@ -4796,7 +4901,6 @@ public final class ProtoBuf {
return projection_;
}
- // optional .org.jetbrains.kotlin.serialization.Type type = 2;
public static final int TYPE_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.serialization.ProtoBuf.Type type_;
/**
@@ -4820,7 +4924,6 @@ public final class ProtoBuf {
return type_;
}
- // optional int32 type_id = 3;
public static final int TYPE_ID_FIELD_NUMBER = 3;
private int typeId_;
/**
@@ -4844,7 +4947,8 @@ public final class ProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (hasType()) {
if (!getType().isInitialized()) {
@@ -4868,6 +4972,7 @@ public final class ProtoBuf {
if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeInt32(3, typeId_);
}
+ output.writeRawBytes(unknownFields);
}
private int memoizedSerializedSize = -1;
@@ -4888,6 +4993,7 @@ public final class ProtoBuf {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeInt32Size(3, typeId_);
}
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
}
@@ -4965,7 +5071,9 @@ public final class ProtoBuf {
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument, Builder>
- implements org.jetbrains.kotlin.serialization.ProtoBuf.Type.ArgumentOrBuilder {
+ implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Type.Argument)
+ org.jetbrains.kotlin.serialization.ProtoBuf.Type.ArgumentOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
@@ -5035,6 +5143,8 @@ public final class ProtoBuf {
if (other.hasTypeId()) {
setTypeId(other.getTypeId());
}
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -5067,7 +5177,6 @@ public final class ProtoBuf {
}
private int bitField0_;
- // optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
private org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection projection_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection.INV;
/**
* optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
@@ -5103,7 +5212,6 @@ public final class ProtoBuf {
return this;
}
- // optional .org.jetbrains.kotlin.serialization.Type type = 2;
private org.jetbrains.kotlin.serialization.ProtoBuf.Type type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
/**
* optional .org.jetbrains.kotlin.serialization.Type type = 2;
@@ -5188,7 +5296,6 @@ public final class ProtoBuf {
return this;
}
- // optional int32 type_id = 3;
private int typeId_ ;
/**
* optional int32 type_id = 3;
@@ -5233,7 +5340,6 @@ public final class ProtoBuf {
}
private int bitField0_;
- // repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
public static final int ARGUMENT_FIELD_NUMBER = 2;
private java.util.List argument_;
/**
@@ -5269,7 +5375,6 @@ public final class ProtoBuf {
return argument_.get(index);
}
- // optional bool nullable = 3 [default = false];
public static final int NULLABLE_FIELD_NUMBER = 3;
private boolean nullable_;
/**
@@ -5285,7 +5390,6 @@ public final class ProtoBuf {
return nullable_;
}
- // optional int32 flexible_type_capabilities_id = 4;
public static final int FLEXIBLE_TYPE_CAPABILITIES_ID_FIELD_NUMBER = 4;
private int flexibleTypeCapabilitiesId_;
/**
@@ -5311,7 +5415,6 @@ public final class ProtoBuf {
return flexibleTypeCapabilitiesId_;
}
- // optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
public static final int FLEXIBLE_UPPER_BOUND_FIELD_NUMBER = 5;
private org.jetbrains.kotlin.serialization.ProtoBuf.Type flexibleUpperBound_;
/**
@@ -5327,7 +5430,6 @@ public final class ProtoBuf {
return flexibleUpperBound_;
}
- // optional int32 flexible_upper_bound_id = 8;
public static final int FLEXIBLE_UPPER_BOUND_ID_FIELD_NUMBER = 8;
private int flexibleUpperBoundId_;
/**
@@ -5343,7 +5445,6 @@ public final class ProtoBuf {
return flexibleUpperBoundId_;
}
- // optional int32 class_name = 6;
public static final int CLASS_NAME_FIELD_NUMBER = 6;
private int className_;
/**
@@ -5359,7 +5460,6 @@ public final class ProtoBuf {
return className_;
}
- // optional int32 type_parameter = 7;
public static final int TYPE_PARAMETER_FIELD_NUMBER = 7;
private int typeParameter_;
/**
@@ -5383,7 +5483,6 @@ public final class ProtoBuf {
return typeParameter_;
}
- // optional int32 type_parameter_name = 9;
public static final int TYPE_PARAMETER_NAME_FIELD_NUMBER = 9;
private int typeParameterName_;
/**
@@ -5407,7 +5506,6 @@ public final class ProtoBuf {
return typeParameterName_;
}
- // optional int32 type_alias_name = 12;
public static final int TYPE_ALIAS_NAME_FIELD_NUMBER = 12;
private int typeAliasName_;
/**
@@ -5423,7 +5521,6 @@ public final class ProtoBuf {
return typeAliasName_;
}
- // optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
public static final int OUTER_TYPE_FIELD_NUMBER = 10;
private org.jetbrains.kotlin.serialization.ProtoBuf.Type outerType_;
/**
@@ -5439,7 +5536,6 @@ public final class ProtoBuf {
return outerType_;
}
- // optional int32 outer_type_id = 11;
public static final int OUTER_TYPE_ID_FIELD_NUMBER = 11;
private int outerTypeId_;
/**
@@ -5455,7 +5551,6 @@ public final class ProtoBuf {
return outerTypeId_;
}
- // optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
public static final int ABBREVIATED_TYPE_FIELD_NUMBER = 13;
private org.jetbrains.kotlin.serialization.ProtoBuf.Type abbreviatedType_;
/**
@@ -5471,7 +5566,6 @@ public final class ProtoBuf {
return abbreviatedType_;
}
- // optional int32 abbreviated_type_id = 14;
public static final int ABBREVIATED_TYPE_ID_FIELD_NUMBER = 14;
private int abbreviatedTypeId_;
/**
@@ -5505,7 +5599,8 @@ public final class ProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
for (int i = 0; i < getArgumentCount(); i++) {
if (!getArgument(i).isInitialized()) {
@@ -5585,6 +5680,7 @@ public final class ProtoBuf {
output.writeInt32(14, abbreviatedTypeId_);
}
extensionWriter.writeUntil(200, output);
+ output.writeRawBytes(unknownFields);
}
private int memoizedSerializedSize = -1;
@@ -5646,6 +5742,7 @@ public final class ProtoBuf {
.computeInt32Size(14, abbreviatedTypeId_);
}
size += extensionsSerializedSize();
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
}
@@ -5722,7 +5819,9 @@ public final class ProtoBuf {
*/
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder<
- org.jetbrains.kotlin.serialization.ProtoBuf.Type, Builder> implements org.jetbrains.kotlin.serialization.ProtoBuf.TypeOrBuilder {
+ org.jetbrains.kotlin.serialization.ProtoBuf.Type, Builder> implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Type)
+ org.jetbrains.kotlin.serialization.ProtoBuf.TypeOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
@@ -5891,6 +5990,8 @@ public final class ProtoBuf {
setAbbreviatedTypeId(other.getAbbreviatedTypeId());
}
this.mergeExtensionFields(other);
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -5945,7 +6046,6 @@ public final class ProtoBuf {
}
private int bitField0_;
- // repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
private java.util.List argument_ =
java.util.Collections.emptyList();
private void ensureArgumentIsMutable() {
@@ -6047,7 +6147,8 @@ public final class ProtoBuf {
public Builder addAllArgument(
java.lang.Iterable values) {
ensureArgumentIsMutable();
- super.addAll(values, argument_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, argument_);
return this;
}
@@ -6070,7 +6171,6 @@ public final class ProtoBuf {
return this;
}
- // optional bool nullable = 3 [default = false];
private boolean nullable_ ;
/**
* optional bool nullable = 3 [default = false];
@@ -6103,7 +6203,6 @@ public final class ProtoBuf {
return this;
}
- // optional int32 flexible_type_capabilities_id = 4;
private int flexibleTypeCapabilitiesId_ ;
/**
* optional int32 flexible_type_capabilities_id = 4;
@@ -6156,7 +6255,6 @@ public final class ProtoBuf {
return this;
}
- // optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
private org.jetbrains.kotlin.serialization.ProtoBuf.Type flexibleUpperBound_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
/**
* optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
@@ -6217,7 +6315,6 @@ public final class ProtoBuf {
return this;
}
- // optional int32 flexible_upper_bound_id = 8;
private int flexibleUpperBoundId_ ;
/**
* optional int32 flexible_upper_bound_id = 8;
@@ -6250,7 +6347,6 @@ public final class ProtoBuf {
return this;
}
- // optional int32 class_name = 6;
private int className_ ;
/**
* optional int32 class_name = 6;
@@ -6283,7 +6379,6 @@ public final class ProtoBuf {
return this;
}
- // optional int32 type_parameter = 7;
private int typeParameter_ ;
/**
* optional int32 type_parameter = 7;
@@ -6332,7 +6427,6 @@ public final class ProtoBuf {
return this;
}
- // optional int32 type_parameter_name = 9;
private int typeParameterName_ ;
/**
* optional int32 type_parameter_name = 9;
@@ -6381,7 +6475,6 @@ public final class ProtoBuf {
return this;
}
- // optional int32 type_alias_name = 12;
private int typeAliasName_ ;
/**
* optional int32 type_alias_name = 12;
@@ -6414,7 +6507,6 @@ public final class ProtoBuf {
return this;
}
- // optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
private org.jetbrains.kotlin.serialization.ProtoBuf.Type outerType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
/**
* optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
@@ -6475,7 +6567,6 @@ public final class ProtoBuf {
return this;
}
- // optional int32 outer_type_id = 11;
private int outerTypeId_ ;
/**
* optional int32 outer_type_id = 11;
@@ -6508,7 +6599,6 @@ public final class ProtoBuf {
return this;
}
- // optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
private org.jetbrains.kotlin.serialization.ProtoBuf.Type abbreviatedType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
/**
* optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
@@ -6569,7 +6659,6 @@ public final class ProtoBuf {
return this;
}
- // optional int32 abbreviated_type_id = 14;
private int abbreviatedTypeId_ ;
/**
* optional int32 abbreviated_type_id = 14;
@@ -6614,10 +6703,10 @@ public final class ProtoBuf {
}
public interface TypeParameterOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.TypeParameter)
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.
ExtendableMessageOrBuilder {
- // required int32 id = 1;
/**
* required int32 id = 1;
*/
@@ -6627,7 +6716,6 @@ public final class ProtoBuf {
*/
int getId();
- // required int32 name = 2;
/**
* required int32 name = 2;
*/
@@ -6637,7 +6725,6 @@ public final class ProtoBuf {
*/
int getName();
- // optional bool reified = 3 [default = false];
/**
* optional bool reified = 3 [default = false];
*/
@@ -6647,7 +6734,6 @@ public final class ProtoBuf {
*/
boolean getReified();
- // optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
/**
* optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
*/
@@ -6657,7 +6743,6 @@ public final class ProtoBuf {
*/
org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance getVariance();
- // repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
/**
* repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
*/
@@ -6672,7 +6757,6 @@ public final class ProtoBuf {
*/
int getUpperBoundCount();
- // repeated int32 upper_bound_id = 6;
/**
* repeated int32 upper_bound_id = 6;
*/
@@ -6691,13 +6775,15 @@ public final class ProtoBuf {
*/
public static final class TypeParameter extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableMessage<
- TypeParameter> implements TypeParameterOrBuilder {
+ TypeParameter> implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.TypeParameter)
+ TypeParameterOrBuilder {
// Use TypeParameter.newBuilder() to construct.
private TypeParameter(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
super(builder);
-
+ this.unknownFields = builder.getUnknownFields();
}
- private TypeParameter(boolean noInit) {}
+ private TypeParameter(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final TypeParameter defaultInstance;
public static TypeParameter getDefaultInstance() {
@@ -6708,12 +6794,18 @@ public final class ProtoBuf {
return defaultInstance;
}
+ private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private TypeParameter(
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) {
@@ -6723,7 +6815,7 @@ public final class ProtoBuf {
done = true;
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
}
@@ -6747,7 +6839,10 @@ public final class ProtoBuf {
case 32: {
int rawValue = input.readEnum();
org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance value = org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance.valueOf(rawValue);
- if (value != null) {
+ if (value == null) {
+ unknownFieldsCodedOutput.writeRawVarint32(tag);
+ unknownFieldsCodedOutput.writeRawVarint32(rawValue);
+ } else {
bitField0_ |= 0x00000008;
variance_ = value;
}
@@ -6796,6 +6891,13 @@ public final class ProtoBuf {
if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
upperBoundId_ = java.util.Collections.unmodifiableList(upperBoundId_);
}
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
}
@@ -6880,7 +6982,6 @@ public final class ProtoBuf {
}
private int bitField0_;
- // required int32 id = 1;
public static final int ID_FIELD_NUMBER = 1;
private int id_;
/**
@@ -6896,7 +6997,6 @@ public final class ProtoBuf {
return id_;
}
- // required int32 name = 2;
public static final int NAME_FIELD_NUMBER = 2;
private int name_;
/**
@@ -6912,7 +7012,6 @@ public final class ProtoBuf {
return name_;
}
- // optional bool reified = 3 [default = false];
public static final int REIFIED_FIELD_NUMBER = 3;
private boolean reified_;
/**
@@ -6928,7 +7027,6 @@ public final class ProtoBuf {
return reified_;
}
- // optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
public static final int VARIANCE_FIELD_NUMBER = 4;
private org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance variance_;
/**
@@ -6944,7 +7042,6 @@ public final class ProtoBuf {
return variance_;
}
- // repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
public static final int UPPER_BOUND_FIELD_NUMBER = 5;
private java.util.List upperBound_;
/**
@@ -6980,7 +7077,6 @@ public final class ProtoBuf {
return upperBound_.get(index);
}
- // repeated int32 upper_bound_id = 6;
public static final int UPPER_BOUND_ID_FIELD_NUMBER = 6;
private java.util.List upperBoundId_;
/**
@@ -7014,7 +7110,8 @@ public final class ProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (!hasId()) {
memoizedIsInitialized = 0;
@@ -7063,6 +7160,7 @@ public final class ProtoBuf {
output.writeInt32(6, upperBoundId_.get(i));
}
extensionWriter.writeUntil(1000, output);
+ output.writeRawBytes(unknownFields);
}
private int memoizedSerializedSize = -1;
@@ -7101,6 +7199,7 @@ public final class ProtoBuf {
size += 1 * getUpperBoundIdList().size();
}
size += extensionsSerializedSize();
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
}
@@ -7177,7 +7276,9 @@ public final class ProtoBuf {
*/
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder<
- org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter, Builder> implements org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameterOrBuilder {
+ org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter, Builder> implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.TypeParameter)
+ org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameterOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
@@ -7291,6 +7392,8 @@ public final class ProtoBuf {
}
this.mergeExtensionFields(other);
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -7335,7 +7438,6 @@ public final class ProtoBuf {
}
private int bitField0_;
- // required int32 id = 1;
private int id_ ;
/**
* required int32 id = 1;
@@ -7368,7 +7470,6 @@ public final class ProtoBuf {
return this;
}
- // required int32 name = 2;
private int name_ ;
/**
* required int32 name = 2;
@@ -7401,7 +7502,6 @@ public final class ProtoBuf {
return this;
}
- // optional bool reified = 3 [default = false];
private boolean reified_ ;
/**
* optional bool reified = 3 [default = false];
@@ -7434,7 +7534,6 @@ public final class ProtoBuf {
return this;
}
- // optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
private org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance variance_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance.INV;
/**
* optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
@@ -7470,7 +7569,6 @@ public final class ProtoBuf {
return this;
}
- // repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
private java.util.List upperBound_ =
java.util.Collections.emptyList();
private void ensureUpperBoundIsMutable() {
@@ -7572,7 +7670,8 @@ public final class ProtoBuf {
public Builder addAllUpperBound(
java.lang.Iterable values) {
ensureUpperBoundIsMutable();
- super.addAll(values, upperBound_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, upperBound_);
return this;
}
@@ -7595,7 +7694,6 @@ public final class ProtoBuf {
return this;
}
- // repeated int32 upper_bound_id = 6;
private java.util.List upperBoundId_ = java.util.Collections.emptyList();
private void ensureUpperBoundIdIsMutable() {
if (!((bitField0_ & 0x00000020) == 0x00000020)) {
@@ -7647,7 +7745,8 @@ public final class ProtoBuf {
public Builder addAllUpperBoundId(
java.lang.Iterable values) {
ensureUpperBoundIdIsMutable();
- super.addAll(values, upperBoundId_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, upperBoundId_);
return this;
}
@@ -7673,15 +7772,14 @@ public final class ProtoBuf {
}
public interface ClassOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Class)
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.
ExtendableMessageOrBuilder {
- // optional int32 flags = 1 [default = 6];
/**
* optional int32 flags = 1 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -7695,7 +7793,6 @@ public final class ProtoBuf {
* optional int32 flags = 1 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -7706,7 +7803,6 @@ public final class ProtoBuf {
*/
int getFlags();
- // required int32 fq_name = 3;
/**
* required int32 fq_name = 3;
*/
@@ -7716,7 +7812,6 @@ public final class ProtoBuf {
*/
int getFqName();
- // optional int32 companion_object_name = 4;
/**
* optional int32 companion_object_name = 4;
*/
@@ -7726,7 +7821,6 @@ public final class ProtoBuf {
*/
int getCompanionObjectName();
- // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
/**
* repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
*/
@@ -7741,7 +7835,6 @@ public final class ProtoBuf {
*/
int getTypeParameterCount();
- // repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
/**
* repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
*/
@@ -7756,7 +7849,6 @@ public final class ProtoBuf {
*/
int getSupertypeCount();
- // repeated int32 supertype_id = 2 [packed = true];
/**
* repeated int32 supertype_id = 2 [packed = true];
*/
@@ -7770,7 +7862,6 @@ public final class ProtoBuf {
*/
int getSupertypeId(int index);
- // repeated int32 nested_class_name = 7 [packed = true];
/**
* repeated int32 nested_class_name = 7 [packed = true];
*/
@@ -7784,7 +7875,6 @@ public final class ProtoBuf {
*/
int getNestedClassName(int index);
- // repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
/**
* repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
*/
@@ -7799,7 +7889,6 @@ public final class ProtoBuf {
*/
int getConstructorCount();
- // repeated .org.jetbrains.kotlin.serialization.Function function = 9;
/**
* repeated .org.jetbrains.kotlin.serialization.Function function = 9;
*/
@@ -7814,7 +7903,6 @@ public final class ProtoBuf {
*/
int getFunctionCount();
- // repeated .org.jetbrains.kotlin.serialization.Property property = 10;
/**
* repeated .org.jetbrains.kotlin.serialization.Property property = 10;
*/
@@ -7829,7 +7917,6 @@ public final class ProtoBuf {
*/
int getPropertyCount();
- // repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
/**
* repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
*/
@@ -7844,7 +7931,6 @@ public final class ProtoBuf {
*/
int getTypeAliasCount();
- // repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
/**
* repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
*/
@@ -7859,7 +7945,6 @@ public final class ProtoBuf {
*/
int getEnumEntryCount();
- // optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
/**
* optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
*/
@@ -7874,13 +7959,15 @@ public final class ProtoBuf {
*/
public static final class Class extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableMessage<
- Class> implements ClassOrBuilder {
+ Class> implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Class)
+ ClassOrBuilder {
// Use Class.newBuilder() to construct.
private Class(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
super(builder);
-
+ this.unknownFields = builder.getUnknownFields();
}
- private Class(boolean noInit) {}
+ private Class(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final Class defaultInstance;
public static Class getDefaultInstance() {
@@ -7891,12 +7978,18 @@ public final class ProtoBuf {
return defaultInstance;
}
+ private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private Class(
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) {
@@ -7906,7 +7999,7 @@ public final class ProtoBuf {
done = true;
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
}
@@ -8073,6 +8166,13 @@ public final class ProtoBuf {
if (((mutable_bitField0_ & 0x00000800) == 0x00000800)) {
enumEntry_ = java.util.Collections.unmodifiableList(enumEntry_);
}
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
}
@@ -8201,14 +8301,12 @@ public final class ProtoBuf {
}
private int bitField0_;
- // optional int32 flags = 1 [default = 6];
public static final int FLAGS_FIELD_NUMBER = 1;
private int flags_;
/**
* optional int32 flags = 1 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -8224,7 +8322,6 @@ public final class ProtoBuf {
* optional int32 flags = 1 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -8237,7 +8334,6 @@ public final class ProtoBuf {
return flags_;
}
- // required int32 fq_name = 3;
public static final int FQ_NAME_FIELD_NUMBER = 3;
private int fqName_;
/**
@@ -8253,7 +8349,6 @@ public final class ProtoBuf {
return fqName_;
}
- // optional int32 companion_object_name = 4;
public static final int COMPANION_OBJECT_NAME_FIELD_NUMBER = 4;
private int companionObjectName_;
/**
@@ -8269,7 +8364,6 @@ public final class ProtoBuf {
return companionObjectName_;
}
- // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
public static final int TYPE_PARAMETER_FIELD_NUMBER = 5;
private java.util.List typeParameter_;
/**
@@ -8305,7 +8399,6 @@ public final class ProtoBuf {
return typeParameter_.get(index);
}
- // repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
public static final int SUPERTYPE_FIELD_NUMBER = 6;
private java.util.List supertype_;
/**
@@ -8341,7 +8434,6 @@ public final class ProtoBuf {
return supertype_.get(index);
}
- // repeated int32 supertype_id = 2 [packed = true];
public static final int SUPERTYPE_ID_FIELD_NUMBER = 2;
private java.util.List supertypeId_;
/**
@@ -8365,7 +8457,6 @@ public final class ProtoBuf {
}
private int supertypeIdMemoizedSerializedSize = -1;
- // repeated int32 nested_class_name = 7 [packed = true];
public static final int NESTED_CLASS_NAME_FIELD_NUMBER = 7;
private java.util.List nestedClassName_;
/**
@@ -8389,7 +8480,6 @@ public final class ProtoBuf {
}
private int nestedClassNameMemoizedSerializedSize = -1;
- // repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
public static final int CONSTRUCTOR_FIELD_NUMBER = 8;
private java.util.List constructor_;
/**
@@ -8425,7 +8515,6 @@ public final class ProtoBuf {
return constructor_.get(index);
}
- // repeated .org.jetbrains.kotlin.serialization.Function function = 9;
public static final int FUNCTION_FIELD_NUMBER = 9;
private java.util.List function_;
/**
@@ -8461,7 +8550,6 @@ public final class ProtoBuf {
return function_.get(index);
}
- // repeated .org.jetbrains.kotlin.serialization.Property property = 10;
public static final int PROPERTY_FIELD_NUMBER = 10;
private java.util.List property_;
/**
@@ -8497,7 +8585,6 @@ public final class ProtoBuf {
return property_.get(index);
}
- // repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
public static final int TYPE_ALIAS_FIELD_NUMBER = 11;
private java.util.List typeAlias_;
/**
@@ -8533,7 +8620,6 @@ public final class ProtoBuf {
return typeAlias_.get(index);
}
- // repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
public static final int ENUM_ENTRY_FIELD_NUMBER = 13;
private java.util.List enumEntry_;
/**
@@ -8569,7 +8655,6 @@ public final class ProtoBuf {
return enumEntry_.get(index);
}
- // optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
public static final int TYPE_TABLE_FIELD_NUMBER = 30;
private org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable typeTable_;
/**
@@ -8603,7 +8688,8 @@ public final class ProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
if (!hasFqName()) {
memoizedIsInitialized = 0;
@@ -8719,6 +8805,7 @@ public final class ProtoBuf {
output.writeMessage(30, typeTable_);
}
extensionWriter.writeUntil(200, output);
+ output.writeRawBytes(unknownFields);
}
private int memoizedSerializedSize = -1;
@@ -8800,6 +8887,7 @@ public final class ProtoBuf {
.computeMessageSize(30, typeTable_);
}
size += extensionsSerializedSize();
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
}
@@ -8876,7 +8964,9 @@ public final class ProtoBuf {
*/
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder<
- org.jetbrains.kotlin.serialization.ProtoBuf.Class, Builder> implements org.jetbrains.kotlin.serialization.ProtoBuf.ClassOrBuilder {
+ org.jetbrains.kotlin.serialization.ProtoBuf.Class, Builder> implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Class)
+ org.jetbrains.kotlin.serialization.ProtoBuf.ClassOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Class.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
@@ -9109,6 +9199,8 @@ public final class ProtoBuf {
mergeTypeTable(other.getTypeTable());
}
this.mergeExtensionFields(other);
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -9191,13 +9283,11 @@ public final class ProtoBuf {
}
private int bitField0_;
- // optional int32 flags = 1 [default = 6];
private int flags_ = 6;
/**
* optional int32 flags = 1 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -9213,7 +9303,6 @@ public final class ProtoBuf {
* optional int32 flags = 1 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -9229,7 +9318,6 @@ public final class ProtoBuf {
* optional int32 flags = 1 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -9248,7 +9336,6 @@ public final class ProtoBuf {
* optional int32 flags = 1 [default = 6];
*
*
- *
*hasAnnotations
*Visibility
*Modality
@@ -9264,7 +9351,6 @@ public final class ProtoBuf {
return this;
}
- // required int32 fq_name = 3;
private int fqName_ ;
/**
* required int32 fq_name = 3;
@@ -9297,7 +9383,6 @@ public final class ProtoBuf {
return this;
}
- // optional int32 companion_object_name = 4;
private int companionObjectName_ ;
/**
* optional int32 companion_object_name = 4;
@@ -9330,7 +9415,6 @@ public final class ProtoBuf {
return this;
}
- // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
private java.util.List typeParameter_ =
java.util.Collections.emptyList();
private void ensureTypeParameterIsMutable() {
@@ -9432,7 +9516,8 @@ public final class ProtoBuf {
public Builder addAllTypeParameter(
java.lang.Iterable values) {
ensureTypeParameterIsMutable();
- super.addAll(values, typeParameter_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, typeParameter_);
return this;
}
@@ -9455,7 +9540,6 @@ public final class ProtoBuf {
return this;
}
- // repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
private java.util.List supertype_ =
java.util.Collections.emptyList();
private void ensureSupertypeIsMutable() {
@@ -9557,7 +9641,8 @@ public final class ProtoBuf {
public Builder addAllSupertype(
java.lang.Iterable values) {
ensureSupertypeIsMutable();
- super.addAll(values, supertype_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, supertype_);
return this;
}
@@ -9580,7 +9665,6 @@ public final class ProtoBuf {
return this;
}
- // repeated int32 supertype_id = 2 [packed = true];
private java.util.List supertypeId_ = java.util.Collections.emptyList();
private void ensureSupertypeIdIsMutable() {
if (!((bitField0_ & 0x00000020) == 0x00000020)) {
@@ -9632,7 +9716,8 @@ public final class ProtoBuf {
public Builder addAllSupertypeId(
java.lang.Iterable values) {
ensureSupertypeIdIsMutable();
- super.addAll(values, supertypeId_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, supertypeId_);
return this;
}
@@ -9646,7 +9731,6 @@ public final class ProtoBuf {
return this;
}
- // repeated int32 nested_class_name = 7 [packed = true];
private java.util.List nestedClassName_ = java.util.Collections.emptyList();
private void ensureNestedClassNameIsMutable() {
if (!((bitField0_ & 0x00000040) == 0x00000040)) {
@@ -9698,7 +9782,8 @@ public final class ProtoBuf {
public Builder addAllNestedClassName(
java.lang.Iterable values) {
ensureNestedClassNameIsMutable();
- super.addAll(values, nestedClassName_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, nestedClassName_);
return this;
}
@@ -9712,7 +9797,6 @@ public final class ProtoBuf {
return this;
}
- // repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
private java.util.List constructor_ =
java.util.Collections.emptyList();
private void ensureConstructorIsMutable() {
@@ -9814,7 +9898,8 @@ public final class ProtoBuf {
public Builder addAllConstructor(
java.lang.Iterable values) {
ensureConstructorIsMutable();
- super.addAll(values, constructor_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, constructor_);
return this;
}
@@ -9837,7 +9922,6 @@ public final class ProtoBuf {
return this;
}
- // repeated .org.jetbrains.kotlin.serialization.Function function = 9;
private java.util.List function_ =
java.util.Collections.emptyList();
private void ensureFunctionIsMutable() {
@@ -9939,7 +10023,8 @@ public final class ProtoBuf {
public Builder addAllFunction(
java.lang.Iterable values) {
ensureFunctionIsMutable();
- super.addAll(values, function_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, function_);
return this;
}
@@ -9962,7 +10047,6 @@ public final class ProtoBuf {
return this;
}
- // repeated .org.jetbrains.kotlin.serialization.Property property = 10;
private java.util.List property_ =
java.util.Collections.emptyList();
private void ensurePropertyIsMutable() {
@@ -10064,7 +10148,8 @@ public final class ProtoBuf {
public Builder addAllProperty(
java.lang.Iterable values) {
ensurePropertyIsMutable();
- super.addAll(values, property_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, property_);
return this;
}
@@ -10087,7 +10172,6 @@ public final class ProtoBuf {
return this;
}
- // repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
private java.util.List typeAlias_ =
java.util.Collections.emptyList();
private void ensureTypeAliasIsMutable() {
@@ -10189,7 +10273,8 @@ public final class ProtoBuf {
public Builder addAllTypeAlias(
java.lang.Iterable values) {
ensureTypeAliasIsMutable();
- super.addAll(values, typeAlias_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, typeAlias_);
return this;
}
@@ -10212,7 +10297,6 @@ public final class ProtoBuf {
return this;
}
- // repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
private java.util.List enumEntry_ =
java.util.Collections.emptyList();
private void ensureEnumEntryIsMutable() {
@@ -10314,7 +10398,8 @@ public final class ProtoBuf {
public Builder addAllEnumEntry(
java.lang.Iterable values) {
ensureEnumEntryIsMutable();
- super.addAll(values, enumEntry_);
+ org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+ values, enumEntry_);
return this;
}
@@ -10337,7 +10422,6 @@ public final class ProtoBuf {
return this;
}
- // optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
private org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
/**
* optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
@@ -10410,10 +10494,10 @@ public final class ProtoBuf {
}
public interface PackageOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Package)
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.
ExtendableMessageOrBuilder {
- // repeated .org.jetbrains.kotlin.serialization.Function function = 3;
/**
* repeated .org.jetbrains.kotlin.serialization.Function function = 3;
*/
@@ -10428,7 +10512,6 @@ public final class ProtoBuf {
*/
int getFunctionCount();
- // repeated .org.jetbrains.kotlin.serialization.Property property = 4;
/**
* repeated .org.jetbrains.kotlin.serialization.Property property = 4;
*/
@@ -10443,7 +10526,6 @@ public final class ProtoBuf {
*/
int getPropertyCount();
- // repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
/**
* repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
*/
@@ -10458,7 +10540,6 @@ public final class ProtoBuf {
*/
int getTypeAliasCount();
- // optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
/**
* optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
*/
@@ -10473,13 +10554,15 @@ public final class ProtoBuf {
*/
public static final class Package extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableMessage<
- Package> implements PackageOrBuilder {
+ Package> implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Package)
+ PackageOrBuilder {
// Use Package.newBuilder() to construct.
private Package(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
super(builder);
-
+ this.unknownFields = builder.getUnknownFields();
}
- private Package(boolean noInit) {}
+ private Package(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final Package defaultInstance;
public static Package getDefaultInstance() {
@@ -10490,12 +10573,18 @@ public final class ProtoBuf {
return defaultInstance;
}
+ private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private Package(
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) {
@@ -10505,7 +10594,7 @@ public final class ProtoBuf {
done = true;
break;
default: {
- if (!parseUnknownField(input,
+ if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
}
@@ -10565,6 +10654,13 @@ public final class ProtoBuf {
if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
typeAlias_ = java.util.Collections.unmodifiableList(typeAlias_);
}
+ try {
+ unknownFieldsCodedOutput.flush();
+ } catch (java.io.IOException e) {
+ // Should not happen
+ } finally {
+ unknownFields = unknownFieldsOutput.toByteString();
+ }
makeExtensionsImmutable();
}
}
@@ -10584,7 +10680,6 @@ public final class ProtoBuf {
}
private int bitField0_;
- // repeated .org.jetbrains.kotlin.serialization.Function function = 3;
public static final int FUNCTION_FIELD_NUMBER = 3;
private java.util.List function_;
/**
@@ -10620,7 +10715,6 @@ public final class ProtoBuf {
return function_.get(index);
}
- // repeated .org.jetbrains.kotlin.serialization.Property property = 4;
public static final int PROPERTY_FIELD_NUMBER = 4;
private java.util.List property_;
/**
@@ -10656,7 +10750,6 @@ public final class ProtoBuf {
return property_.get(index);
}
- // repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
public static final int TYPE_ALIAS_FIELD_NUMBER = 5;
private java.util.List typeAlias_;
/**
@@ -10692,7 +10785,6 @@ public final class ProtoBuf {
return typeAlias_.get(index);
}
- // optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
public static final int TYPE_TABLE_FIELD_NUMBER = 30;
private org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable typeTable_;
/**
@@ -10717,7 +10809,8 @@ public final class ProtoBuf {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
for (int i = 0; i < getFunctionCount(); i++) {
if (!getFunction(i).isInitialized()) {
@@ -10770,6 +10863,7 @@ public final class ProtoBuf {
output.writeMessage(30, typeTable_);
}
extensionWriter.writeUntil(200, output);
+ output.writeRawBytes(unknownFields);
}
private int memoizedSerializedSize = -1;
@@ -10795,6 +10889,7 @@ public final class ProtoBuf {
.computeMessageSize(30, typeTable_);
}
size += extensionsSerializedSize();
+ size += unknownFields.size();
memoizedSerializedSize = size;
return size;
}
@@ -10871,7 +10966,9 @@ public final class ProtoBuf {
*/
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder<
- org.jetbrains.kotlin.serialization.ProtoBuf.Package, Builder> implements org.jetbrains.kotlin.serialization.ProtoBuf.PackageOrBuilder {
+ org.jetbrains.kotlin.serialization.ProtoBuf.Package, Builder> implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Package)
+ org.jetbrains.kotlin.serialization.ProtoBuf.PackageOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Package.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
@@ -10975,6 +11072,8 @@ public final class ProtoBuf {
mergeTypeTable(other.getTypeTable());
}
this.mergeExtensionFields(other);
+ setUnknownFields(
+ getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -11029,7 +11128,6 @@ public final class ProtoBuf {
}
private int bitField0_;
- // repeated .org.jetbrains.kotlin.serialization.Function function = 3;
private java.util.List