From 693a9c945300a2bf93c0b9cdb26af796e59d04e8 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 11 Jan 2016 22:11:14 +0300 Subject: [PATCH] Write new flags to proto messages for callables This is needed to get rid of two unused bits: Flags.RESERVED_1 and Flags.RESERVED_2. The old flags are still there temporarily because of the bootstrap dependency on built-ins. Soon the old flags will be dropped and the current flags will be transformed to the new format --- .../serialization/DescriptorSerializer.java | 8 + .../kotlin/serialization/DebugProtoBuf.java | 641 +++++++++++------- core/deserialization/src/descriptors.proto | 6 +- .../kotlin/serialization/ProtoBuf.java | 536 ++++++++++----- .../jps/incremental/ProtoCompareGenerated.kt | 18 + 5 files changed, 781 insertions(+), 428 deletions(-) diff --git a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java index 89d8184b06a..a29e2961ad2 100644 --- a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java +++ b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java @@ -252,6 +252,10 @@ public class DescriptorSerializer { if (flags != builder.getFlags()) { builder.setFlags(flags); } + int newFlags = (flags & 0x3f) + ((flags >> 2) & ~0x3f); + if (newFlags != builder.getNewFlags()) { + builder.setNewFlags(newFlags); + } builder.setName(getSimpleNameIndex(descriptor.getName())); @@ -295,6 +299,10 @@ public class DescriptorSerializer { if (flags != builder.getFlags()) { builder.setFlags(flags); } + int newFlags = (flags & 0x3f) + ((flags >> 2) & ~0x3f); + if (newFlags != builder.getNewFlags()) { + builder.setNewFlags(newFlags); + } builder.setName(getSimpleNameIndex(descriptor.getName())); diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java b/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java index 6cc9bece8e3..b9c8d6a33d9 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java +++ b/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java @@ -15836,6 +15836,16 @@ public final class DebugProtoBuf { */ int getFlags(); + // optional int32 new_flags = 9 [default = 6]; + /** + * optional int32 new_flags = 9 [default = 6]; + */ + boolean hasNewFlags(); + /** + * optional int32 new_flags = 9 [default = 6]; + */ + int getNewFlags(); + // required int32 name = 2; /** * required int32 name = 2; @@ -16015,13 +16025,13 @@ public final class DebugProtoBuf { break; } case 16: { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; name_ = input.readInt32(); break; } case 26: { org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null; - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000008) == 0x00000008)) { subBuilder = returnType_.toBuilder(); } returnType_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry); @@ -16029,20 +16039,20 @@ public final class DebugProtoBuf { subBuilder.mergeFrom(returnType_); returnType_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; break; } case 34: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { typeParameter_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000010; + mutable_bitField0_ |= 0x00000020; } typeParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.PARSER, extensionRegistry)); break; } case 42: { org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null; - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000020) == 0x00000020)) { subBuilder = receiverType_.toBuilder(); } receiverType_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry); @@ -16050,30 +16060,35 @@ public final class DebugProtoBuf { subBuilder.mergeFrom(receiverType_); receiverType_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; break; } case 50: { - if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) { valueParameter_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000080; + mutable_bitField0_ |= 0x00000100; } valueParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.PARSER, extensionRegistry)); break; } case 56: { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; returnTypeId_ = input.readInt32(); break; } case 64: { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; receiverTypeId_ = input.readInt32(); break; } + case 72: { + bitField0_ |= 0x00000002; + newFlags_ = input.readInt32(); + break; + } case 242: { org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder subBuilder = null; - if (((bitField0_ & 0x00000040) == 0x00000040)) { + if (((bitField0_ & 0x00000080) == 0x00000080)) { subBuilder = typeTable_.toBuilder(); } typeTable_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.PARSER, extensionRegistry); @@ -16081,7 +16096,7 @@ public final class DebugProtoBuf { subBuilder.mergeFrom(typeTable_); typeTable_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; break; } } @@ -16092,10 +16107,10 @@ public final class DebugProtoBuf { throw new com.google.protobuf.InvalidProtocolBufferException( e.getMessage()).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_); } - if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) { valueParameter_ = java.util.Collections.unmodifiableList(valueParameter_); } this.unknownFields = unknownFields.build(); @@ -16172,6 +16187,22 @@ public final class DebugProtoBuf { return flags_; } + // optional int32 new_flags = 9 [default = 6]; + public static final int NEW_FLAGS_FIELD_NUMBER = 9; + private int newFlags_; + /** + * optional int32 new_flags = 9 [default = 6]; + */ + public boolean hasNewFlags() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional int32 new_flags = 9 [default = 6]; + */ + public int getNewFlags() { + return newFlags_; + } + // required int32 name = 2; public static final int NAME_FIELD_NUMBER = 2; private int name_; @@ -16179,7 +16210,7 @@ public final class DebugProtoBuf { * required int32 name = 2; */ public boolean hasName() { - return ((bitField0_ & 0x00000002) == 0x00000002); + return ((bitField0_ & 0x00000004) == 0x00000004); } /** * required int32 name = 2; @@ -16195,7 +16226,7 @@ public final class DebugProtoBuf { * optional .org.jetbrains.kotlin.serialization.Type return_type = 3; */ public boolean hasReturnType() { - return ((bitField0_ & 0x00000004) == 0x00000004); + return ((bitField0_ & 0x00000008) == 0x00000008); } /** * optional .org.jetbrains.kotlin.serialization.Type return_type = 3; @@ -16217,7 +16248,7 @@ public final class DebugProtoBuf { * optional int32 return_type_id = 7; */ public boolean hasReturnTypeId() { - return ((bitField0_ & 0x00000008) == 0x00000008); + return ((bitField0_ & 0x00000010) == 0x00000010); } /** * optional int32 return_type_id = 7; @@ -16269,7 +16300,7 @@ public final class DebugProtoBuf { * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5; */ public boolean hasReceiverType() { - return ((bitField0_ & 0x00000010) == 0x00000010); + return ((bitField0_ & 0x00000020) == 0x00000020); } /** * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5; @@ -16291,7 +16322,7 @@ public final class DebugProtoBuf { * optional int32 receiver_type_id = 8; */ public boolean hasReceiverTypeId() { - return ((bitField0_ & 0x00000020) == 0x00000020); + return ((bitField0_ & 0x00000040) == 0x00000040); } /** * optional int32 receiver_type_id = 8; @@ -16343,7 +16374,7 @@ public final class DebugProtoBuf { * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30; */ public boolean hasTypeTable() { - return ((bitField0_ & 0x00000040) == 0x00000040); + return ((bitField0_ & 0x00000080) == 0x00000080); } /** * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30; @@ -16360,6 +16391,7 @@ public final class DebugProtoBuf { private void initFields() { flags_ = 6; + newFlags_ = 6; name_ = 0; returnType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance(); returnTypeId_ = 0; @@ -16425,28 +16457,31 @@ public final class DebugProtoBuf { if (((bitField0_ & 0x00000001) == 0x00000001)) { output.writeInt32(1, flags_); } - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000004) == 0x00000004)) { output.writeInt32(2, name_); } - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000008) == 0x00000008)) { output.writeMessage(3, returnType_); } for (int i = 0; i < typeParameter_.size(); i++) { output.writeMessage(4, typeParameter_.get(i)); } - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000020) == 0x00000020)) { output.writeMessage(5, receiverType_); } for (int i = 0; i < valueParameter_.size(); i++) { output.writeMessage(6, valueParameter_.get(i)); } - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000010) == 0x00000010)) { output.writeInt32(7, returnTypeId_); } - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000040) == 0x00000040)) { output.writeInt32(8, receiverTypeId_); } - if (((bitField0_ & 0x00000040) == 0x00000040)) { + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeInt32(9, newFlags_); + } + if (((bitField0_ & 0x00000080) == 0x00000080)) { output.writeMessage(30, typeTable_); } extensionWriter.writeUntil(200, output); @@ -16463,11 +16498,11 @@ public final class DebugProtoBuf { size += com.google.protobuf.CodedOutputStream .computeInt32Size(1, flags_); } - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream .computeInt32Size(2, name_); } - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000008) == 0x00000008)) { size += com.google.protobuf.CodedOutputStream .computeMessageSize(3, returnType_); } @@ -16475,7 +16510,7 @@ public final class DebugProtoBuf { size += com.google.protobuf.CodedOutputStream .computeMessageSize(4, typeParameter_.get(i)); } - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000020) == 0x00000020)) { size += com.google.protobuf.CodedOutputStream .computeMessageSize(5, receiverType_); } @@ -16483,15 +16518,19 @@ public final class DebugProtoBuf { size += com.google.protobuf.CodedOutputStream .computeMessageSize(6, valueParameter_.get(i)); } - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000010) == 0x00000010)) { size += com.google.protobuf.CodedOutputStream .computeInt32Size(7, returnTypeId_); } - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000040) == 0x00000040)) { size += com.google.protobuf.CodedOutputStream .computeInt32Size(8, receiverTypeId_); } - if (((bitField0_ & 0x00000040) == 0x00000040)) { + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(9, newFlags_); + } + if (((bitField0_ & 0x00000080) == 0x00000080)) { size += com.google.protobuf.CodedOutputStream .computeMessageSize(30, typeTable_); } @@ -16619,19 +16658,21 @@ public final class DebugProtoBuf { super.clear(); flags_ = 6; bitField0_ = (bitField0_ & ~0x00000001); - name_ = 0; + newFlags_ = 6; bitField0_ = (bitField0_ & ~0x00000002); + name_ = 0; + bitField0_ = (bitField0_ & ~0x00000004); if (returnTypeBuilder_ == null) { returnType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance(); } else { returnTypeBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000004); - returnTypeId_ = 0; bitField0_ = (bitField0_ & ~0x00000008); + returnTypeId_ = 0; + bitField0_ = (bitField0_ & ~0x00000010); if (typeParameterBuilder_ == null) { typeParameter_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); } else { typeParameterBuilder_.clear(); } @@ -16640,12 +16681,12 @@ public final class DebugProtoBuf { } else { receiverTypeBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000020); - receiverTypeId_ = 0; bitField0_ = (bitField0_ & ~0x00000040); + receiverTypeId_ = 0; + bitField0_ = (bitField0_ & ~0x00000080); if (valueParameterBuilder_ == null) { valueParameter_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000080); + bitField0_ = (bitField0_ & ~0x00000100); } else { valueParameterBuilder_.clear(); } @@ -16654,7 +16695,7 @@ public final class DebugProtoBuf { } else { typeTableBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000100); + bitField0_ = (bitField0_ & ~0x00000200); return this; } @@ -16690,51 +16731,55 @@ public final class DebugProtoBuf { if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } - result.name_ = name_; + result.newFlags_ = newFlags_; if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } + result.name_ = name_; + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000008; + } if (returnTypeBuilder_ == null) { result.returnType_ = returnType_; } else { result.returnType_ = returnTypeBuilder_.build(); } - if (((from_bitField0_ & 0x00000008) == 0x00000008)) { - to_bitField0_ |= 0x00000008; + if (((from_bitField0_ & 0x00000010) == 0x00000010)) { + to_bitField0_ |= 0x00000010; } result.returnTypeId_ = returnTypeId_; if (typeParameterBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000020) == 0x00000020)) { typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_); - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); } result.typeParameter_ = typeParameter_; } else { result.typeParameter_ = typeParameterBuilder_.build(); } - if (((from_bitField0_ & 0x00000020) == 0x00000020)) { - to_bitField0_ |= 0x00000010; + if (((from_bitField0_ & 0x00000040) == 0x00000040)) { + to_bitField0_ |= 0x00000020; } if (receiverTypeBuilder_ == null) { result.receiverType_ = receiverType_; } else { result.receiverType_ = receiverTypeBuilder_.build(); } - if (((from_bitField0_ & 0x00000040) == 0x00000040)) { - to_bitField0_ |= 0x00000020; + if (((from_bitField0_ & 0x00000080) == 0x00000080)) { + to_bitField0_ |= 0x00000040; } result.receiverTypeId_ = receiverTypeId_; if (valueParameterBuilder_ == null) { - if (((bitField0_ & 0x00000080) == 0x00000080)) { + if (((bitField0_ & 0x00000100) == 0x00000100)) { valueParameter_ = java.util.Collections.unmodifiableList(valueParameter_); - bitField0_ = (bitField0_ & ~0x00000080); + bitField0_ = (bitField0_ & ~0x00000100); } result.valueParameter_ = valueParameter_; } else { result.valueParameter_ = valueParameterBuilder_.build(); } - if (((from_bitField0_ & 0x00000100) == 0x00000100)) { - to_bitField0_ |= 0x00000040; + if (((from_bitField0_ & 0x00000200) == 0x00000200)) { + to_bitField0_ |= 0x00000080; } if (typeTableBuilder_ == null) { result.typeTable_ = typeTable_; @@ -16760,6 +16805,9 @@ public final class DebugProtoBuf { if (other.hasFlags()) { setFlags(other.getFlags()); } + if (other.hasNewFlags()) { + setNewFlags(other.getNewFlags()); + } if (other.hasName()) { setName(other.getName()); } @@ -16773,7 +16821,7 @@ public final class DebugProtoBuf { if (!other.typeParameter_.isEmpty()) { if (typeParameter_.isEmpty()) { typeParameter_ = other.typeParameter_; - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); } else { ensureTypeParameterIsMutable(); typeParameter_.addAll(other.typeParameter_); @@ -16786,7 +16834,7 @@ public final class DebugProtoBuf { typeParameterBuilder_.dispose(); typeParameterBuilder_ = null; typeParameter_ = other.typeParameter_; - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); typeParameterBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? getTypeParameterFieldBuilder() : null; @@ -16805,7 +16853,7 @@ public final class DebugProtoBuf { if (!other.valueParameter_.isEmpty()) { if (valueParameter_.isEmpty()) { valueParameter_ = other.valueParameter_; - bitField0_ = (bitField0_ & ~0x00000080); + bitField0_ = (bitField0_ & ~0x00000100); } else { ensureValueParameterIsMutable(); valueParameter_.addAll(other.valueParameter_); @@ -16818,7 +16866,7 @@ public final class DebugProtoBuf { valueParameterBuilder_.dispose(); valueParameterBuilder_ = null; valueParameter_ = other.valueParameter_; - bitField0_ = (bitField0_ & ~0x00000080); + bitField0_ = (bitField0_ & ~0x00000100); valueParameterBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? getValueParameterFieldBuilder() : null; @@ -16981,13 +17029,46 @@ public final class DebugProtoBuf { return this; } + // optional int32 new_flags = 9 [default = 6]; + private int newFlags_ = 6; + /** + * optional int32 new_flags = 9 [default = 6]; + */ + public boolean hasNewFlags() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional int32 new_flags = 9 [default = 6]; + */ + public int getNewFlags() { + return newFlags_; + } + /** + * optional int32 new_flags = 9 [default = 6]; + */ + public Builder setNewFlags(int value) { + bitField0_ |= 0x00000002; + newFlags_ = value; + onChanged(); + return this; + } + /** + * optional int32 new_flags = 9 [default = 6]; + */ + public Builder clearNewFlags() { + bitField0_ = (bitField0_ & ~0x00000002); + newFlags_ = 6; + onChanged(); + return this; + } + // required int32 name = 2; private int name_ ; /** * required int32 name = 2; */ public boolean hasName() { - return ((bitField0_ & 0x00000002) == 0x00000002); + return ((bitField0_ & 0x00000004) == 0x00000004); } /** * required int32 name = 2; @@ -16999,7 +17080,7 @@ public final class DebugProtoBuf { * required int32 name = 2; */ public Builder setName(int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; name_ = value; onChanged(); return this; @@ -17008,7 +17089,7 @@ public final class DebugProtoBuf { * required int32 name = 2; */ public Builder clearName() { - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000004); name_ = 0; onChanged(); return this; @@ -17022,7 +17103,7 @@ public final class DebugProtoBuf { * optional .org.jetbrains.kotlin.serialization.Type return_type = 3; */ public boolean hasReturnType() { - return ((bitField0_ & 0x00000004) == 0x00000004); + return ((bitField0_ & 0x00000008) == 0x00000008); } /** * optional .org.jetbrains.kotlin.serialization.Type return_type = 3; @@ -17047,7 +17128,7 @@ public final class DebugProtoBuf { } else { returnTypeBuilder_.setMessage(value); } - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; return this; } /** @@ -17061,7 +17142,7 @@ public final class DebugProtoBuf { } else { returnTypeBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; return this; } /** @@ -17069,7 +17150,7 @@ public final class DebugProtoBuf { */ public Builder mergeReturnType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) { if (returnTypeBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004) && + if (((bitField0_ & 0x00000008) == 0x00000008) && returnType_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) { returnType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(returnType_).mergeFrom(value).buildPartial(); @@ -17080,7 +17161,7 @@ public final class DebugProtoBuf { } else { returnTypeBuilder_.mergeFrom(value); } - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; return this; } /** @@ -17093,14 +17174,14 @@ public final class DebugProtoBuf { } else { returnTypeBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000008); return this; } /** * optional .org.jetbrains.kotlin.serialization.Type return_type = 3; */ public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getReturnTypeBuilder() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; onChanged(); return getReturnTypeFieldBuilder().getBuilder(); } @@ -17137,7 +17218,7 @@ public final class DebugProtoBuf { * optional int32 return_type_id = 7; */ public boolean hasReturnTypeId() { - return ((bitField0_ & 0x00000008) == 0x00000008); + return ((bitField0_ & 0x00000010) == 0x00000010); } /** * optional int32 return_type_id = 7; @@ -17149,7 +17230,7 @@ public final class DebugProtoBuf { * optional int32 return_type_id = 7; */ public Builder setReturnTypeId(int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; returnTypeId_ = value; onChanged(); return this; @@ -17158,7 +17239,7 @@ public final class DebugProtoBuf { * optional int32 return_type_id = 7; */ public Builder clearReturnTypeId() { - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000010); returnTypeId_ = 0; onChanged(); return this; @@ -17168,9 +17249,9 @@ public final class DebugProtoBuf { private java.util.List typeParameter_ = java.util.Collections.emptyList(); private void ensureTypeParameterIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000020) == 0x00000020)) { typeParameter_ = new java.util.ArrayList(typeParameter_); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; } } @@ -17319,7 +17400,7 @@ public final class DebugProtoBuf { public Builder clearTypeParameter() { if (typeParameterBuilder_ == null) { typeParameter_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); onChanged(); } else { typeParameterBuilder_.clear(); @@ -17396,7 +17477,7 @@ public final class DebugProtoBuf { typeParameterBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder>( typeParameter_, - ((bitField0_ & 0x00000010) == 0x00000010), + ((bitField0_ & 0x00000020) == 0x00000020), getParentForChildren(), isClean()); typeParameter_ = null; @@ -17412,7 +17493,7 @@ public final class DebugProtoBuf { * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5; */ public boolean hasReceiverType() { - return ((bitField0_ & 0x00000020) == 0x00000020); + return ((bitField0_ & 0x00000040) == 0x00000040); } /** * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5; @@ -17437,7 +17518,7 @@ public final class DebugProtoBuf { } else { receiverTypeBuilder_.setMessage(value); } - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; return this; } /** @@ -17451,7 +17532,7 @@ public final class DebugProtoBuf { } else { receiverTypeBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; return this; } /** @@ -17459,7 +17540,7 @@ public final class DebugProtoBuf { */ public Builder mergeReceiverType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) { if (receiverTypeBuilder_ == null) { - if (((bitField0_ & 0x00000020) == 0x00000020) && + if (((bitField0_ & 0x00000040) == 0x00000040) && receiverType_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) { receiverType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(receiverType_).mergeFrom(value).buildPartial(); @@ -17470,7 +17551,7 @@ public final class DebugProtoBuf { } else { receiverTypeBuilder_.mergeFrom(value); } - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; return this; } /** @@ -17483,14 +17564,14 @@ public final class DebugProtoBuf { } else { receiverTypeBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000040); return this; } /** * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5; */ public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getReceiverTypeBuilder() { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; onChanged(); return getReceiverTypeFieldBuilder().getBuilder(); } @@ -17527,7 +17608,7 @@ public final class DebugProtoBuf { * optional int32 receiver_type_id = 8; */ public boolean hasReceiverTypeId() { - return ((bitField0_ & 0x00000040) == 0x00000040); + return ((bitField0_ & 0x00000080) == 0x00000080); } /** * optional int32 receiver_type_id = 8; @@ -17539,7 +17620,7 @@ public final class DebugProtoBuf { * optional int32 receiver_type_id = 8; */ public Builder setReceiverTypeId(int value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; receiverTypeId_ = value; onChanged(); return this; @@ -17548,7 +17629,7 @@ public final class DebugProtoBuf { * optional int32 receiver_type_id = 8; */ public Builder clearReceiverTypeId() { - bitField0_ = (bitField0_ & ~0x00000040); + bitField0_ = (bitField0_ & ~0x00000080); receiverTypeId_ = 0; onChanged(); return this; @@ -17558,9 +17639,9 @@ public final class DebugProtoBuf { private java.util.List valueParameter_ = java.util.Collections.emptyList(); private void ensureValueParameterIsMutable() { - if (!((bitField0_ & 0x00000080) == 0x00000080)) { + if (!((bitField0_ & 0x00000100) == 0x00000100)) { valueParameter_ = new java.util.ArrayList(valueParameter_); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; } } @@ -17709,7 +17790,7 @@ public final class DebugProtoBuf { public Builder clearValueParameter() { if (valueParameterBuilder_ == null) { valueParameter_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000080); + bitField0_ = (bitField0_ & ~0x00000100); onChanged(); } else { valueParameterBuilder_.clear(); @@ -17786,7 +17867,7 @@ public final class DebugProtoBuf { valueParameterBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder>( valueParameter_, - ((bitField0_ & 0x00000080) == 0x00000080), + ((bitField0_ & 0x00000100) == 0x00000100), getParentForChildren(), isClean()); valueParameter_ = null; @@ -17802,7 +17883,7 @@ public final class DebugProtoBuf { * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30; */ public boolean hasTypeTable() { - return ((bitField0_ & 0x00000100) == 0x00000100); + return ((bitField0_ & 0x00000200) == 0x00000200); } /** * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30; @@ -17827,7 +17908,7 @@ public final class DebugProtoBuf { } else { typeTableBuilder_.setMessage(value); } - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; return this; } /** @@ -17841,7 +17922,7 @@ public final class DebugProtoBuf { } else { typeTableBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; return this; } /** @@ -17849,7 +17930,7 @@ public final class DebugProtoBuf { */ public Builder mergeTypeTable(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable value) { if (typeTableBuilder_ == null) { - if (((bitField0_ & 0x00000100) == 0x00000100) && + if (((bitField0_ & 0x00000200) == 0x00000200) && typeTable_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.getDefaultInstance()) { typeTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.newBuilder(typeTable_).mergeFrom(value).buildPartial(); @@ -17860,7 +17941,7 @@ public final class DebugProtoBuf { } else { typeTableBuilder_.mergeFrom(value); } - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; return this; } /** @@ -17873,14 +17954,14 @@ public final class DebugProtoBuf { } else { typeTableBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000100); + bitField0_ = (bitField0_ & ~0x00000200); return this; } /** * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30; */ public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder getTypeTableBuilder() { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; onChanged(); return getTypeTableFieldBuilder().getBuilder(); } @@ -17964,6 +18045,16 @@ public final class DebugProtoBuf { */ int getFlags(); + // optional int32 new_flags = 11 [default = 518]; + /** + * optional int32 new_flags = 11 [default = 518]; + */ + boolean hasNewFlags(); + /** + * optional int32 new_flags = 11 [default = 518]; + */ + int getNewFlags(); + // required int32 name = 2; /** * required int32 name = 2; @@ -18156,13 +18247,13 @@ public final class DebugProtoBuf { break; } case 16: { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; name_ = input.readInt32(); break; } case 26: { org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null; - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000008) == 0x00000008)) { subBuilder = returnType_.toBuilder(); } returnType_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry); @@ -18170,20 +18261,20 @@ public final class DebugProtoBuf { subBuilder.mergeFrom(returnType_); returnType_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; break; } case 34: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { typeParameter_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000010; + mutable_bitField0_ |= 0x00000020; } typeParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.PARSER, extensionRegistry)); break; } case 42: { org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null; - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000020) == 0x00000020)) { subBuilder = receiverType_.toBuilder(); } receiverType_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry); @@ -18191,12 +18282,12 @@ public final class DebugProtoBuf { subBuilder.mergeFrom(receiverType_); receiverType_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; break; } case 50: { org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder subBuilder = null; - if (((bitField0_ & 0x00000040) == 0x00000040)) { + if (((bitField0_ & 0x00000080) == 0x00000080)) { subBuilder = setterValueParameter_.toBuilder(); } setterValueParameter_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.PARSER, extensionRegistry); @@ -18204,29 +18295,34 @@ public final class DebugProtoBuf { subBuilder.mergeFrom(setterValueParameter_); setterValueParameter_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; break; } case 56: { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; getterFlags_ = input.readInt32(); break; } case 64: { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; setterFlags_ = input.readInt32(); break; } case 72: { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; returnTypeId_ = input.readInt32(); break; } case 80: { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; receiverTypeId_ = input.readInt32(); break; } + case 88: { + bitField0_ |= 0x00000002; + newFlags_ = input.readInt32(); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -18235,7 +18331,7 @@ public final class DebugProtoBuf { throw new com.google.protobuf.InvalidProtocolBufferException( e.getMessage()).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_); } this.unknownFields = unknownFields.build(); @@ -18314,6 +18410,22 @@ public final class DebugProtoBuf { return flags_; } + // optional int32 new_flags = 11 [default = 518]; + public static final int NEW_FLAGS_FIELD_NUMBER = 11; + private int newFlags_; + /** + * optional int32 new_flags = 11 [default = 518]; + */ + public boolean hasNewFlags() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional int32 new_flags = 11 [default = 518]; + */ + public int getNewFlags() { + return newFlags_; + } + // required int32 name = 2; public static final int NAME_FIELD_NUMBER = 2; private int name_; @@ -18321,7 +18433,7 @@ public final class DebugProtoBuf { * required int32 name = 2; */ public boolean hasName() { - return ((bitField0_ & 0x00000002) == 0x00000002); + return ((bitField0_ & 0x00000004) == 0x00000004); } /** * required int32 name = 2; @@ -18337,7 +18449,7 @@ public final class DebugProtoBuf { * optional .org.jetbrains.kotlin.serialization.Type return_type = 3; */ public boolean hasReturnType() { - return ((bitField0_ & 0x00000004) == 0x00000004); + return ((bitField0_ & 0x00000008) == 0x00000008); } /** * optional .org.jetbrains.kotlin.serialization.Type return_type = 3; @@ -18359,7 +18471,7 @@ public final class DebugProtoBuf { * optional int32 return_type_id = 9; */ public boolean hasReturnTypeId() { - return ((bitField0_ & 0x00000008) == 0x00000008); + return ((bitField0_ & 0x00000010) == 0x00000010); } /** * optional int32 return_type_id = 9; @@ -18411,7 +18523,7 @@ public final class DebugProtoBuf { * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5; */ public boolean hasReceiverType() { - return ((bitField0_ & 0x00000010) == 0x00000010); + return ((bitField0_ & 0x00000020) == 0x00000020); } /** * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5; @@ -18433,7 +18545,7 @@ public final class DebugProtoBuf { * optional int32 receiver_type_id = 10; */ public boolean hasReceiverTypeId() { - return ((bitField0_ & 0x00000020) == 0x00000020); + return ((bitField0_ & 0x00000040) == 0x00000040); } /** * optional int32 receiver_type_id = 10; @@ -18449,7 +18561,7 @@ public final class DebugProtoBuf { * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6; */ public boolean hasSetterValueParameter() { - return ((bitField0_ & 0x00000040) == 0x00000040); + return ((bitField0_ & 0x00000080) == 0x00000080); } /** * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6; @@ -18480,7 +18592,7 @@ public final class DebugProtoBuf { * */ public boolean hasGetterFlags() { - return ((bitField0_ & 0x00000080) == 0x00000080); + return ((bitField0_ & 0x00000100) == 0x00000100); } /** * optional int32 getter_flags = 7; @@ -18505,7 +18617,7 @@ public final class DebugProtoBuf { * optional int32 setter_flags = 8; */ public boolean hasSetterFlags() { - return ((bitField0_ & 0x00000100) == 0x00000100); + return ((bitField0_ & 0x00000200) == 0x00000200); } /** * optional int32 setter_flags = 8; @@ -18516,6 +18628,7 @@ public final class DebugProtoBuf { private void initFields() { flags_ = 262; + newFlags_ = 518; name_ = 0; returnType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance(); returnTypeId_ = 0; @@ -18576,33 +18689,36 @@ public final class DebugProtoBuf { if (((bitField0_ & 0x00000001) == 0x00000001)) { output.writeInt32(1, flags_); } - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000004) == 0x00000004)) { output.writeInt32(2, name_); } - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000008) == 0x00000008)) { output.writeMessage(3, returnType_); } for (int i = 0; i < typeParameter_.size(); i++) { output.writeMessage(4, typeParameter_.get(i)); } - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000020) == 0x00000020)) { output.writeMessage(5, receiverType_); } - if (((bitField0_ & 0x00000040) == 0x00000040)) { + if (((bitField0_ & 0x00000080) == 0x00000080)) { output.writeMessage(6, setterValueParameter_); } - if (((bitField0_ & 0x00000080) == 0x00000080)) { + if (((bitField0_ & 0x00000100) == 0x00000100)) { output.writeInt32(7, getterFlags_); } - if (((bitField0_ & 0x00000100) == 0x00000100)) { + if (((bitField0_ & 0x00000200) == 0x00000200)) { output.writeInt32(8, setterFlags_); } - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000010) == 0x00000010)) { output.writeInt32(9, returnTypeId_); } - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000040) == 0x00000040)) { output.writeInt32(10, receiverTypeId_); } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeInt32(11, newFlags_); + } extensionWriter.writeUntil(200, output); getUnknownFields().writeTo(output); } @@ -18617,11 +18733,11 @@ public final class DebugProtoBuf { size += com.google.protobuf.CodedOutputStream .computeInt32Size(1, flags_); } - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream .computeInt32Size(2, name_); } - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000008) == 0x00000008)) { size += com.google.protobuf.CodedOutputStream .computeMessageSize(3, returnType_); } @@ -18629,30 +18745,34 @@ public final class DebugProtoBuf { size += com.google.protobuf.CodedOutputStream .computeMessageSize(4, typeParameter_.get(i)); } - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000020) == 0x00000020)) { size += com.google.protobuf.CodedOutputStream .computeMessageSize(5, receiverType_); } - if (((bitField0_ & 0x00000040) == 0x00000040)) { + if (((bitField0_ & 0x00000080) == 0x00000080)) { size += com.google.protobuf.CodedOutputStream .computeMessageSize(6, setterValueParameter_); } - if (((bitField0_ & 0x00000080) == 0x00000080)) { + if (((bitField0_ & 0x00000100) == 0x00000100)) { size += com.google.protobuf.CodedOutputStream .computeInt32Size(7, getterFlags_); } - if (((bitField0_ & 0x00000100) == 0x00000100)) { + if (((bitField0_ & 0x00000200) == 0x00000200)) { size += com.google.protobuf.CodedOutputStream .computeInt32Size(8, setterFlags_); } - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000010) == 0x00000010)) { size += com.google.protobuf.CodedOutputStream .computeInt32Size(9, returnTypeId_); } - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000040) == 0x00000040)) { size += com.google.protobuf.CodedOutputStream .computeInt32Size(10, receiverTypeId_); } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(11, newFlags_); + } size += extensionsSerializedSize(); size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; @@ -18776,19 +18896,21 @@ public final class DebugProtoBuf { super.clear(); flags_ = 262; bitField0_ = (bitField0_ & ~0x00000001); - name_ = 0; + newFlags_ = 518; bitField0_ = (bitField0_ & ~0x00000002); + name_ = 0; + bitField0_ = (bitField0_ & ~0x00000004); if (returnTypeBuilder_ == null) { returnType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance(); } else { returnTypeBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000004); - returnTypeId_ = 0; bitField0_ = (bitField0_ & ~0x00000008); + returnTypeId_ = 0; + bitField0_ = (bitField0_ & ~0x00000010); if (typeParameterBuilder_ == null) { typeParameter_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); } else { typeParameterBuilder_.clear(); } @@ -18797,19 +18919,19 @@ public final class DebugProtoBuf { } else { receiverTypeBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000020); - receiverTypeId_ = 0; bitField0_ = (bitField0_ & ~0x00000040); + receiverTypeId_ = 0; + bitField0_ = (bitField0_ & ~0x00000080); if (setterValueParameterBuilder_ == null) { setterValueParameter_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.getDefaultInstance(); } else { setterValueParameterBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000080); - getterFlags_ = 0; bitField0_ = (bitField0_ & ~0x00000100); - setterFlags_ = 0; + getterFlags_ = 0; bitField0_ = (bitField0_ & ~0x00000200); + setterFlags_ = 0; + bitField0_ = (bitField0_ & ~0x00000400); return this; } @@ -18845,55 +18967,59 @@ public final class DebugProtoBuf { if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } - result.name_ = name_; + result.newFlags_ = newFlags_; if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } + result.name_ = name_; + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000008; + } if (returnTypeBuilder_ == null) { result.returnType_ = returnType_; } else { result.returnType_ = returnTypeBuilder_.build(); } - if (((from_bitField0_ & 0x00000008) == 0x00000008)) { - to_bitField0_ |= 0x00000008; + if (((from_bitField0_ & 0x00000010) == 0x00000010)) { + to_bitField0_ |= 0x00000010; } result.returnTypeId_ = returnTypeId_; if (typeParameterBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000020) == 0x00000020)) { typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_); - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); } result.typeParameter_ = typeParameter_; } else { result.typeParameter_ = typeParameterBuilder_.build(); } - if (((from_bitField0_ & 0x00000020) == 0x00000020)) { - to_bitField0_ |= 0x00000010; + if (((from_bitField0_ & 0x00000040) == 0x00000040)) { + to_bitField0_ |= 0x00000020; } if (receiverTypeBuilder_ == null) { result.receiverType_ = receiverType_; } else { result.receiverType_ = receiverTypeBuilder_.build(); } - if (((from_bitField0_ & 0x00000040) == 0x00000040)) { - to_bitField0_ |= 0x00000020; - } - result.receiverTypeId_ = receiverTypeId_; if (((from_bitField0_ & 0x00000080) == 0x00000080)) { to_bitField0_ |= 0x00000040; } + result.receiverTypeId_ = receiverTypeId_; + if (((from_bitField0_ & 0x00000100) == 0x00000100)) { + to_bitField0_ |= 0x00000080; + } if (setterValueParameterBuilder_ == null) { result.setterValueParameter_ = setterValueParameter_; } else { result.setterValueParameter_ = setterValueParameterBuilder_.build(); } - if (((from_bitField0_ & 0x00000100) == 0x00000100)) { - to_bitField0_ |= 0x00000080; - } - result.getterFlags_ = getterFlags_; if (((from_bitField0_ & 0x00000200) == 0x00000200)) { to_bitField0_ |= 0x00000100; } + result.getterFlags_ = getterFlags_; + if (((from_bitField0_ & 0x00000400) == 0x00000400)) { + to_bitField0_ |= 0x00000200; + } result.setterFlags_ = setterFlags_; result.bitField0_ = to_bitField0_; onBuilt(); @@ -18914,6 +19040,9 @@ public final class DebugProtoBuf { if (other.hasFlags()) { setFlags(other.getFlags()); } + if (other.hasNewFlags()) { + setNewFlags(other.getNewFlags()); + } if (other.hasName()) { setName(other.getName()); } @@ -18927,7 +19056,7 @@ public final class DebugProtoBuf { if (!other.typeParameter_.isEmpty()) { if (typeParameter_.isEmpty()) { typeParameter_ = other.typeParameter_; - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); } else { ensureTypeParameterIsMutable(); typeParameter_.addAll(other.typeParameter_); @@ -18940,7 +19069,7 @@ public final class DebugProtoBuf { typeParameterBuilder_.dispose(); typeParameterBuilder_ = null; typeParameter_ = other.typeParameter_; - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); typeParameterBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? getTypeParameterFieldBuilder() : null; @@ -19113,13 +19242,46 @@ public final class DebugProtoBuf { return this; } + // optional int32 new_flags = 11 [default = 518]; + private int newFlags_ = 518; + /** + * optional int32 new_flags = 11 [default = 518]; + */ + public boolean hasNewFlags() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional int32 new_flags = 11 [default = 518]; + */ + public int getNewFlags() { + return newFlags_; + } + /** + * optional int32 new_flags = 11 [default = 518]; + */ + public Builder setNewFlags(int value) { + bitField0_ |= 0x00000002; + newFlags_ = value; + onChanged(); + return this; + } + /** + * optional int32 new_flags = 11 [default = 518]; + */ + public Builder clearNewFlags() { + bitField0_ = (bitField0_ & ~0x00000002); + newFlags_ = 518; + onChanged(); + return this; + } + // required int32 name = 2; private int name_ ; /** * required int32 name = 2; */ public boolean hasName() { - return ((bitField0_ & 0x00000002) == 0x00000002); + return ((bitField0_ & 0x00000004) == 0x00000004); } /** * required int32 name = 2; @@ -19131,7 +19293,7 @@ public final class DebugProtoBuf { * required int32 name = 2; */ public Builder setName(int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; name_ = value; onChanged(); return this; @@ -19140,7 +19302,7 @@ public final class DebugProtoBuf { * required int32 name = 2; */ public Builder clearName() { - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000004); name_ = 0; onChanged(); return this; @@ -19154,7 +19316,7 @@ public final class DebugProtoBuf { * optional .org.jetbrains.kotlin.serialization.Type return_type = 3; */ public boolean hasReturnType() { - return ((bitField0_ & 0x00000004) == 0x00000004); + return ((bitField0_ & 0x00000008) == 0x00000008); } /** * optional .org.jetbrains.kotlin.serialization.Type return_type = 3; @@ -19179,7 +19341,7 @@ public final class DebugProtoBuf { } else { returnTypeBuilder_.setMessage(value); } - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; return this; } /** @@ -19193,7 +19355,7 @@ public final class DebugProtoBuf { } else { returnTypeBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; return this; } /** @@ -19201,7 +19363,7 @@ public final class DebugProtoBuf { */ public Builder mergeReturnType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) { if (returnTypeBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004) && + if (((bitField0_ & 0x00000008) == 0x00000008) && returnType_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) { returnType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(returnType_).mergeFrom(value).buildPartial(); @@ -19212,7 +19374,7 @@ public final class DebugProtoBuf { } else { returnTypeBuilder_.mergeFrom(value); } - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; return this; } /** @@ -19225,14 +19387,14 @@ public final class DebugProtoBuf { } else { returnTypeBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000008); return this; } /** * optional .org.jetbrains.kotlin.serialization.Type return_type = 3; */ public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getReturnTypeBuilder() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; onChanged(); return getReturnTypeFieldBuilder().getBuilder(); } @@ -19269,7 +19431,7 @@ public final class DebugProtoBuf { * optional int32 return_type_id = 9; */ public boolean hasReturnTypeId() { - return ((bitField0_ & 0x00000008) == 0x00000008); + return ((bitField0_ & 0x00000010) == 0x00000010); } /** * optional int32 return_type_id = 9; @@ -19281,7 +19443,7 @@ public final class DebugProtoBuf { * optional int32 return_type_id = 9; */ public Builder setReturnTypeId(int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; returnTypeId_ = value; onChanged(); return this; @@ -19290,7 +19452,7 @@ public final class DebugProtoBuf { * optional int32 return_type_id = 9; */ public Builder clearReturnTypeId() { - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000010); returnTypeId_ = 0; onChanged(); return this; @@ -19300,9 +19462,9 @@ public final class DebugProtoBuf { private java.util.List typeParameter_ = java.util.Collections.emptyList(); private void ensureTypeParameterIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000020) == 0x00000020)) { typeParameter_ = new java.util.ArrayList(typeParameter_); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; } } @@ -19451,7 +19613,7 @@ public final class DebugProtoBuf { public Builder clearTypeParameter() { if (typeParameterBuilder_ == null) { typeParameter_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); onChanged(); } else { typeParameterBuilder_.clear(); @@ -19528,7 +19690,7 @@ public final class DebugProtoBuf { typeParameterBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder>( typeParameter_, - ((bitField0_ & 0x00000010) == 0x00000010), + ((bitField0_ & 0x00000020) == 0x00000020), getParentForChildren(), isClean()); typeParameter_ = null; @@ -19544,7 +19706,7 @@ public final class DebugProtoBuf { * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5; */ public boolean hasReceiverType() { - return ((bitField0_ & 0x00000020) == 0x00000020); + return ((bitField0_ & 0x00000040) == 0x00000040); } /** * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5; @@ -19569,7 +19731,7 @@ public final class DebugProtoBuf { } else { receiverTypeBuilder_.setMessage(value); } - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; return this; } /** @@ -19583,7 +19745,7 @@ public final class DebugProtoBuf { } else { receiverTypeBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; return this; } /** @@ -19591,7 +19753,7 @@ public final class DebugProtoBuf { */ public Builder mergeReceiverType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) { if (receiverTypeBuilder_ == null) { - if (((bitField0_ & 0x00000020) == 0x00000020) && + if (((bitField0_ & 0x00000040) == 0x00000040) && receiverType_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) { receiverType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(receiverType_).mergeFrom(value).buildPartial(); @@ -19602,7 +19764,7 @@ public final class DebugProtoBuf { } else { receiverTypeBuilder_.mergeFrom(value); } - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; return this; } /** @@ -19615,14 +19777,14 @@ public final class DebugProtoBuf { } else { receiverTypeBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000040); return this; } /** * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5; */ public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getReceiverTypeBuilder() { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; onChanged(); return getReceiverTypeFieldBuilder().getBuilder(); } @@ -19659,7 +19821,7 @@ public final class DebugProtoBuf { * optional int32 receiver_type_id = 10; */ public boolean hasReceiverTypeId() { - return ((bitField0_ & 0x00000040) == 0x00000040); + return ((bitField0_ & 0x00000080) == 0x00000080); } /** * optional int32 receiver_type_id = 10; @@ -19671,7 +19833,7 @@ public final class DebugProtoBuf { * optional int32 receiver_type_id = 10; */ public Builder setReceiverTypeId(int value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; receiverTypeId_ = value; onChanged(); return this; @@ -19680,7 +19842,7 @@ public final class DebugProtoBuf { * optional int32 receiver_type_id = 10; */ public Builder clearReceiverTypeId() { - bitField0_ = (bitField0_ & ~0x00000040); + bitField0_ = (bitField0_ & ~0x00000080); receiverTypeId_ = 0; onChanged(); return this; @@ -19694,7 +19856,7 @@ public final class DebugProtoBuf { * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6; */ public boolean hasSetterValueParameter() { - return ((bitField0_ & 0x00000080) == 0x00000080); + return ((bitField0_ & 0x00000100) == 0x00000100); } /** * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6; @@ -19719,7 +19881,7 @@ public final class DebugProtoBuf { } else { setterValueParameterBuilder_.setMessage(value); } - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; return this; } /** @@ -19733,7 +19895,7 @@ public final class DebugProtoBuf { } else { setterValueParameterBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; return this; } /** @@ -19741,7 +19903,7 @@ public final class DebugProtoBuf { */ public Builder mergeSetterValueParameter(org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter value) { if (setterValueParameterBuilder_ == null) { - if (((bitField0_ & 0x00000080) == 0x00000080) && + if (((bitField0_ & 0x00000100) == 0x00000100) && setterValueParameter_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.getDefaultInstance()) { setterValueParameter_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.newBuilder(setterValueParameter_).mergeFrom(value).buildPartial(); @@ -19752,7 +19914,7 @@ public final class DebugProtoBuf { } else { setterValueParameterBuilder_.mergeFrom(value); } - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; return this; } /** @@ -19765,14 +19927,14 @@ public final class DebugProtoBuf { } else { setterValueParameterBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000080); + bitField0_ = (bitField0_ & ~0x00000100); return this; } /** * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6; */ public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder getSetterValueParameterBuilder() { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; onChanged(); return getSetterValueParameterFieldBuilder().getBuilder(); } @@ -19818,7 +19980,7 @@ public final class DebugProtoBuf { * */ public boolean hasGetterFlags() { - return ((bitField0_ & 0x00000100) == 0x00000100); + return ((bitField0_ & 0x00000200) == 0x00000200); } /** * optional int32 getter_flags = 7; @@ -19848,7 +20010,7 @@ public final class DebugProtoBuf { * */ public Builder setGetterFlags(int value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; getterFlags_ = value; onChanged(); return this; @@ -19866,7 +20028,7 @@ public final class DebugProtoBuf { * */ public Builder clearGetterFlags() { - bitField0_ = (bitField0_ & ~0x00000100); + bitField0_ = (bitField0_ & ~0x00000200); getterFlags_ = 0; onChanged(); return this; @@ -19878,7 +20040,7 @@ public final class DebugProtoBuf { * optional int32 setter_flags = 8; */ public boolean hasSetterFlags() { - return ((bitField0_ & 0x00000200) == 0x00000200); + return ((bitField0_ & 0x00000400) == 0x00000400); } /** * optional int32 setter_flags = 8; @@ -19890,7 +20052,7 @@ public final class DebugProtoBuf { * optional int32 setter_flags = 8; */ public Builder setSetterFlags(int value) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000400; setterFlags_ = value; onChanged(); return this; @@ -19899,7 +20061,7 @@ public final class DebugProtoBuf { * optional int32 setter_flags = 8; */ public Builder clearSetterFlags() { - bitField0_ = (bitField0_ & ~0x00000200); + bitField0_ = (bitField0_ & ~0x00000400); setterFlags_ = 0; onChanged(); return this; @@ -21639,43 +21801,44 @@ public final class DebugProtoBuf { "irst_nullable\030\002 \001(\005:\002-1\"s\n\013Constructor\022\020" + "\n\005flags\030\001 \001(\005:\0016\022K\n\017value_parameter\030\002 \003(" + "\01322.org.jetbrains.kotlin.serialization.V" + - "alueParameter*\005\010d\020\310\001\"\304\003\n\010Function\022\020\n\005fla" + - "gs\030\001 \001(\005:\0016\022\022\n\004name\030\002 \002(\005B\004\210\265\030\001\022=\n\013retur" + - "n_type\030\003 \001(\0132(.org.jetbrains.kotlin.seri" + - "alization.Type\022\026\n\016return_type_id\030\007 \001(\005\022I" + - "\n\016type_parameter\030\004 \003(\01321.org.jetbrains.k" + - "otlin.serialization.TypeParameter\022?\n\rrec", - "eiver_type\030\005 \001(\0132(.org.jetbrains.kotlin." + - "serialization.Type\022\030\n\020receiver_type_id\030\010" + - " \001(\005\022K\n\017value_parameter\030\006 \003(\01322.org.jetb" + - "rains.kotlin.serialization.ValueParamete" + - "r\022A\n\ntype_table\030\036 \001(\0132-.org.jetbrains.ko" + - "tlin.serialization.TypeTable*\005\010d\020\310\001\"\266\003\n\010" + - "Property\022\022\n\005flags\030\001 \001(\005:\003262\022\022\n\004name\030\002 \002" + - "(\005B\004\210\265\030\001\022=\n\013return_type\030\003 \001(\0132(.org.jetb" + - "rains.kotlin.serialization.Type\022\026\n\016retur" + - "n_type_id\030\t \001(\005\022I\n\016type_parameter\030\004 \003(\0132", - "1.org.jetbrains.kotlin.serialization.Typ" + - "eParameter\022?\n\rreceiver_type\030\005 \001(\0132(.org." + - "jetbrains.kotlin.serialization.Type\022\030\n\020r" + - "eceiver_type_id\030\n \001(\005\022R\n\026setter_value_pa" + - "rameter\030\006 \001(\01322.org.jetbrains.kotlin.ser" + - "ialization.ValueParameter\022\024\n\014getter_flag" + - "s\030\007 \001(\005\022\024\n\014setter_flags\030\010 \001(\005*\005\010d\020\310\001\"\355\001\n" + - "\016ValueParameter\022\020\n\005flags\030\001 \001(\005:\0010\022\022\n\004nam" + - "e\030\002 \002(\005B\004\210\265\030\001\0226\n\004type\030\003 \001(\0132(.org.jetbra" + - "ins.kotlin.serialization.Type\022\017\n\007type_id", - "\030\005 \001(\005\022E\n\023vararg_element_type\030\004 \001(\0132(.or" + - "g.jetbrains.kotlin.serialization.Type\022\036\n" + - "\026vararg_element_type_id\030\006 \001(\005*\005\010d\020\310\001\"&\n\t" + - "EnumEntry\022\022\n\004name\030\001 \001(\005B\004\210\265\030\001*\005\010d\020\310\001*9\n\010" + - "Modality\022\t\n\005FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRAC" + - "T\020\002\022\n\n\006SEALED\020\003*b\n\nVisibility\022\014\n\010INTERNA" + - "L\020\000\022\013\n\007PRIVATE\020\001\022\r\n\tPROTECTED\020\002\022\n\n\006PUBLI" + - "C\020\003\022\023\n\017PRIVATE_TO_THIS\020\004\022\t\n\005LOCAL\020\005*Q\n\nM" + - "emberKind\022\017\n\013DECLARATION\020\000\022\021\n\rFAKE_OVERR" + - "IDE\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYNTHESIZED\020\003B\022", - "B\rDebugProtoBuf\210\001\000" + "alueParameter*\005\010d\020\310\001\"\332\003\n\010Function\022\020\n\005fla" + + "gs\030\001 \001(\005:\0016\022\024\n\tnew_flags\030\t \001(\005:\0016\022\022\n\004nam" + + "e\030\002 \002(\005B\004\210\265\030\001\022=\n\013return_type\030\003 \001(\0132(.org" + + ".jetbrains.kotlin.serialization.Type\022\026\n\016" + + "return_type_id\030\007 \001(\005\022I\n\016type_parameter\030\004" + + " \003(\01321.org.jetbrains.kotlin.serializatio", + "n.TypeParameter\022?\n\rreceiver_type\030\005 \001(\0132(" + + ".org.jetbrains.kotlin.serialization.Type" + + "\022\030\n\020receiver_type_id\030\010 \001(\005\022K\n\017value_para" + + "meter\030\006 \003(\01322.org.jetbrains.kotlin.seria" + + "lization.ValueParameter\022A\n\ntype_table\030\036 " + + "\001(\0132-.org.jetbrains.kotlin.serialization" + + ".TypeTable*\005\010d\020\310\001\"\316\003\n\010Property\022\022\n\005flags\030" + + "\001 \001(\005:\003262\022\026\n\tnew_flags\030\013 \001(\005:\003518\022\022\n\004na" + + "me\030\002 \002(\005B\004\210\265\030\001\022=\n\013return_type\030\003 \001(\0132(.or" + + "g.jetbrains.kotlin.serialization.Type\022\026\n", + "\016return_type_id\030\t \001(\005\022I\n\016type_parameter\030" + + "\004 \003(\01321.org.jetbrains.kotlin.serializati" + + "on.TypeParameter\022?\n\rreceiver_type\030\005 \001(\0132" + + "(.org.jetbrains.kotlin.serialization.Typ" + + "e\022\030\n\020receiver_type_id\030\n \001(\005\022R\n\026setter_va" + + "lue_parameter\030\006 \001(\01322.org.jetbrains.kotl" + + "in.serialization.ValueParameter\022\024\n\014gette" + + "r_flags\030\007 \001(\005\022\024\n\014setter_flags\030\010 \001(\005*\005\010d\020" + + "\310\001\"\355\001\n\016ValueParameter\022\020\n\005flags\030\001 \001(\005:\0010\022" + + "\022\n\004name\030\002 \002(\005B\004\210\265\030\001\0226\n\004type\030\003 \001(\0132(.org.", + "jetbrains.kotlin.serialization.Type\022\017\n\007t" + + "ype_id\030\005 \001(\005\022E\n\023vararg_element_type\030\004 \001(" + + "\0132(.org.jetbrains.kotlin.serialization.T" + + "ype\022\036\n\026vararg_element_type_id\030\006 \001(\005*\005\010d\020" + + "\310\001\"&\n\tEnumEntry\022\022\n\004name\030\001 \001(\005B\004\210\265\030\001*\005\010d\020" + + "\310\001*9\n\010Modality\022\t\n\005FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010A" + + "BSTRACT\020\002\022\n\n\006SEALED\020\003*b\n\nVisibility\022\014\n\010I" + + "NTERNAL\020\000\022\013\n\007PRIVATE\020\001\022\r\n\tPROTECTED\020\002\022\n\n" + + "\006PUBLIC\020\003\022\023\n\017PRIVATE_TO_THIS\020\004\022\t\n\005LOCAL\020" + + "\005*Q\n\nMemberKind\022\017\n\013DECLARATION\020\000\022\021\n\rFAKE", + "_OVERRIDE\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYNTHESIZ" + + "ED\020\003B\022B\rDebugProtoBuf\210\001\000" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -21765,13 +21928,13 @@ public final class DebugProtoBuf { internal_static_org_jetbrains_kotlin_serialization_Function_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_org_jetbrains_kotlin_serialization_Function_descriptor, - new java.lang.String[] { "Flags", "Name", "ReturnType", "ReturnTypeId", "TypeParameter", "ReceiverType", "ReceiverTypeId", "ValueParameter", "TypeTable", }); + new java.lang.String[] { "Flags", "NewFlags", "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 com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_org_jetbrains_kotlin_serialization_Property_descriptor, - new java.lang.String[] { "Flags", "Name", "ReturnType", "ReturnTypeId", "TypeParameter", "ReceiverType", "ReceiverTypeId", "SetterValueParameter", "GetterFlags", "SetterFlags", }); + new java.lang.String[] { "Flags", "NewFlags", "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 diff --git a/core/deserialization/src/descriptors.proto b/core/deserialization/src/descriptors.proto index 6a8d7665bdc..c4c90025dc3 100644 --- a/core/deserialization/src/descriptors.proto +++ b/core/deserialization/src/descriptors.proto @@ -222,7 +222,7 @@ message Constructor { Visibility isSecondary */ - optional int32 flags = 1 [default = 6]; + optional int32 flags = 1 [default = 6 /* public constructor, no annotations */]; repeated ValueParameter value_parameter = 2; @@ -242,6 +242,7 @@ message Function { isExternal */ optional int32 flags = 1 [default = 6]; + optional int32 new_flags = 9 [default = 6 /* public final function, no annotations */]; required int32 name = 2 [(name_id_in_table) = true]; @@ -273,7 +274,8 @@ message Property { lateinit hasConstant */ - optional int32 flags = 1 [default = 262 /* public (6) final property with getter (256) */]; + optional int32 flags = 1 [default = 262]; + optional int32 new_flags = 11 [default = 518 /* public (6) final property with getter (512) */]; required int32 name = 2 [(name_id_in_table) = true]; diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java index 3c988071ca6..2dd06d4743e 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java @@ -12001,6 +12001,16 @@ public final class ProtoBuf { */ int getFlags(); + // optional int32 new_flags = 9 [default = 6]; + /** + * optional int32 new_flags = 9 [default = 6]; + */ + boolean hasNewFlags(); + /** + * optional int32 new_flags = 9 [default = 6]; + */ + int getNewFlags(); + // required int32 name = 2; /** * required int32 name = 2; @@ -12140,13 +12150,13 @@ public final class ProtoBuf { break; } case 16: { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; name_ = input.readInt32(); break; } case 26: { org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null; - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000008) == 0x00000008)) { subBuilder = returnType_.toBuilder(); } returnType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry); @@ -12154,20 +12164,20 @@ public final class ProtoBuf { subBuilder.mergeFrom(returnType_); returnType_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; break; } case 34: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { typeParameter_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000010; + mutable_bitField0_ |= 0x00000020; } typeParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.PARSER, extensionRegistry)); break; } case 42: { org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null; - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000020) == 0x00000020)) { subBuilder = receiverType_.toBuilder(); } receiverType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry); @@ -12175,30 +12185,35 @@ public final class ProtoBuf { subBuilder.mergeFrom(receiverType_); receiverType_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; break; } case 50: { - if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) { valueParameter_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000080; + mutable_bitField0_ |= 0x00000100; } valueParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.PARSER, extensionRegistry)); break; } case 56: { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; returnTypeId_ = input.readInt32(); break; } case 64: { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; receiverTypeId_ = input.readInt32(); break; } + case 72: { + bitField0_ |= 0x00000002; + newFlags_ = input.readInt32(); + break; + } case 242: { org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.Builder subBuilder = null; - if (((bitField0_ & 0x00000040) == 0x00000040)) { + if (((bitField0_ & 0x00000080) == 0x00000080)) { subBuilder = typeTable_.toBuilder(); } typeTable_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.PARSER, extensionRegistry); @@ -12206,7 +12221,7 @@ public final class ProtoBuf { subBuilder.mergeFrom(typeTable_); typeTable_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; break; } } @@ -12217,10 +12232,10 @@ public final class ProtoBuf { throw new com.google.protobuf.InvalidProtocolBufferException( e.getMessage()).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_); } - if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) { valueParameter_ = java.util.Collections.unmodifiableList(valueParameter_); } makeExtensionsImmutable(); @@ -12284,6 +12299,22 @@ public final class ProtoBuf { return flags_; } + // optional int32 new_flags = 9 [default = 6]; + public static final int NEW_FLAGS_FIELD_NUMBER = 9; + private int newFlags_; + /** + * optional int32 new_flags = 9 [default = 6]; + */ + public boolean hasNewFlags() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional int32 new_flags = 9 [default = 6]; + */ + public int getNewFlags() { + return newFlags_; + } + // required int32 name = 2; public static final int NAME_FIELD_NUMBER = 2; private int name_; @@ -12291,7 +12322,7 @@ public final class ProtoBuf { * required int32 name = 2; */ public boolean hasName() { - return ((bitField0_ & 0x00000002) == 0x00000002); + return ((bitField0_ & 0x00000004) == 0x00000004); } /** * required int32 name = 2; @@ -12307,7 +12338,7 @@ public final class ProtoBuf { * optional .org.jetbrains.kotlin.serialization.Type return_type = 3; */ public boolean hasReturnType() { - return ((bitField0_ & 0x00000004) == 0x00000004); + return ((bitField0_ & 0x00000008) == 0x00000008); } /** * optional .org.jetbrains.kotlin.serialization.Type return_type = 3; @@ -12323,7 +12354,7 @@ public final class ProtoBuf { * optional int32 return_type_id = 7; */ public boolean hasReturnTypeId() { - return ((bitField0_ & 0x00000008) == 0x00000008); + return ((bitField0_ & 0x00000010) == 0x00000010); } /** * optional int32 return_type_id = 7; @@ -12375,7 +12406,7 @@ public final class ProtoBuf { * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5; */ public boolean hasReceiverType() { - return ((bitField0_ & 0x00000010) == 0x00000010); + return ((bitField0_ & 0x00000020) == 0x00000020); } /** * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5; @@ -12391,7 +12422,7 @@ public final class ProtoBuf { * optional int32 receiver_type_id = 8; */ public boolean hasReceiverTypeId() { - return ((bitField0_ & 0x00000020) == 0x00000020); + return ((bitField0_ & 0x00000040) == 0x00000040); } /** * optional int32 receiver_type_id = 8; @@ -12443,7 +12474,7 @@ public final class ProtoBuf { * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30; */ public boolean hasTypeTable() { - return ((bitField0_ & 0x00000040) == 0x00000040); + return ((bitField0_ & 0x00000080) == 0x00000080); } /** * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30; @@ -12454,6 +12485,7 @@ public final class ProtoBuf { private void initFields() { flags_ = 6; + newFlags_ = 6; name_ = 0; returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance(); returnTypeId_ = 0; @@ -12519,28 +12551,31 @@ public final class ProtoBuf { if (((bitField0_ & 0x00000001) == 0x00000001)) { output.writeInt32(1, flags_); } - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000004) == 0x00000004)) { output.writeInt32(2, name_); } - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000008) == 0x00000008)) { output.writeMessage(3, returnType_); } for (int i = 0; i < typeParameter_.size(); i++) { output.writeMessage(4, typeParameter_.get(i)); } - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000020) == 0x00000020)) { output.writeMessage(5, receiverType_); } for (int i = 0; i < valueParameter_.size(); i++) { output.writeMessage(6, valueParameter_.get(i)); } - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000010) == 0x00000010)) { output.writeInt32(7, returnTypeId_); } - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000040) == 0x00000040)) { output.writeInt32(8, receiverTypeId_); } - if (((bitField0_ & 0x00000040) == 0x00000040)) { + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeInt32(9, newFlags_); + } + if (((bitField0_ & 0x00000080) == 0x00000080)) { output.writeMessage(30, typeTable_); } extensionWriter.writeUntil(200, output); @@ -12556,11 +12591,11 @@ public final class ProtoBuf { size += com.google.protobuf.CodedOutputStream .computeInt32Size(1, flags_); } - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream .computeInt32Size(2, name_); } - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000008) == 0x00000008)) { size += com.google.protobuf.CodedOutputStream .computeMessageSize(3, returnType_); } @@ -12568,7 +12603,7 @@ public final class ProtoBuf { size += com.google.protobuf.CodedOutputStream .computeMessageSize(4, typeParameter_.get(i)); } - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000020) == 0x00000020)) { size += com.google.protobuf.CodedOutputStream .computeMessageSize(5, receiverType_); } @@ -12576,15 +12611,19 @@ public final class ProtoBuf { size += com.google.protobuf.CodedOutputStream .computeMessageSize(6, valueParameter_.get(i)); } - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000010) == 0x00000010)) { size += com.google.protobuf.CodedOutputStream .computeInt32Size(7, returnTypeId_); } - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000040) == 0x00000040)) { size += com.google.protobuf.CodedOutputStream .computeInt32Size(8, receiverTypeId_); } - if (((bitField0_ & 0x00000040) == 0x00000040)) { + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(9, newFlags_); + } + if (((bitField0_ & 0x00000080) == 0x00000080)) { size += com.google.protobuf.CodedOutputStream .computeMessageSize(30, typeTable_); } @@ -12681,22 +12720,24 @@ public final class ProtoBuf { super.clear(); flags_ = 6; bitField0_ = (bitField0_ & ~0x00000001); - name_ = 0; + newFlags_ = 6; bitField0_ = (bitField0_ & ~0x00000002); - returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance(); + name_ = 0; bitField0_ = (bitField0_ & ~0x00000004); - returnTypeId_ = 0; + returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000008); - typeParameter_ = java.util.Collections.emptyList(); + returnTypeId_ = 0; bitField0_ = (bitField0_ & ~0x00000010); - receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance(); + typeParameter_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000020); - receiverTypeId_ = 0; + receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000040); - valueParameter_ = java.util.Collections.emptyList(); + receiverTypeId_ = 0; bitField0_ = (bitField0_ & ~0x00000080); - typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance(); + valueParameter_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000100); + typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance(); + bitField0_ = (bitField0_ & ~0x00000200); return this; } @@ -12727,35 +12768,39 @@ public final class ProtoBuf { if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } - result.name_ = name_; + result.newFlags_ = newFlags_; if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } - result.returnType_ = returnType_; + result.name_ = name_; if (((from_bitField0_ & 0x00000008) == 0x00000008)) { to_bitField0_ |= 0x00000008; } - result.returnTypeId_ = returnTypeId_; - if (((bitField0_ & 0x00000010) == 0x00000010)) { - typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_); - bitField0_ = (bitField0_ & ~0x00000010); - } - result.typeParameter_ = typeParameter_; - if (((from_bitField0_ & 0x00000020) == 0x00000020)) { + result.returnType_ = returnType_; + if (((from_bitField0_ & 0x00000010) == 0x00000010)) { to_bitField0_ |= 0x00000010; } - result.receiverType_ = receiverType_; + result.returnTypeId_ = returnTypeId_; + if (((bitField0_ & 0x00000020) == 0x00000020)) { + typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_); + bitField0_ = (bitField0_ & ~0x00000020); + } + result.typeParameter_ = typeParameter_; if (((from_bitField0_ & 0x00000040) == 0x00000040)) { to_bitField0_ |= 0x00000020; } + result.receiverType_ = receiverType_; + if (((from_bitField0_ & 0x00000080) == 0x00000080)) { + to_bitField0_ |= 0x00000040; + } result.receiverTypeId_ = receiverTypeId_; - if (((bitField0_ & 0x00000080) == 0x00000080)) { + if (((bitField0_ & 0x00000100) == 0x00000100)) { valueParameter_ = java.util.Collections.unmodifiableList(valueParameter_); - bitField0_ = (bitField0_ & ~0x00000080); + bitField0_ = (bitField0_ & ~0x00000100); } result.valueParameter_ = valueParameter_; - if (((from_bitField0_ & 0x00000100) == 0x00000100)) { - to_bitField0_ |= 0x00000040; + if (((from_bitField0_ & 0x00000200) == 0x00000200)) { + to_bitField0_ |= 0x00000080; } result.typeTable_ = typeTable_; result.bitField0_ = to_bitField0_; @@ -12767,6 +12812,9 @@ public final class ProtoBuf { if (other.hasFlags()) { setFlags(other.getFlags()); } + if (other.hasNewFlags()) { + setNewFlags(other.getNewFlags()); + } if (other.hasName()) { setName(other.getName()); } @@ -12779,7 +12827,7 @@ public final class ProtoBuf { if (!other.typeParameter_.isEmpty()) { if (typeParameter_.isEmpty()) { typeParameter_ = other.typeParameter_; - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); } else { ensureTypeParameterIsMutable(); typeParameter_.addAll(other.typeParameter_); @@ -12795,7 +12843,7 @@ public final class ProtoBuf { if (!other.valueParameter_.isEmpty()) { if (valueParameter_.isEmpty()) { valueParameter_ = other.valueParameter_; - bitField0_ = (bitField0_ & ~0x00000080); + bitField0_ = (bitField0_ & ~0x00000100); } else { ensureValueParameterIsMutable(); valueParameter_.addAll(other.valueParameter_); @@ -12955,13 +13003,46 @@ public final class ProtoBuf { return this; } + // optional int32 new_flags = 9 [default = 6]; + private int newFlags_ = 6; + /** + * optional int32 new_flags = 9 [default = 6]; + */ + public boolean hasNewFlags() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional int32 new_flags = 9 [default = 6]; + */ + public int getNewFlags() { + return newFlags_; + } + /** + * optional int32 new_flags = 9 [default = 6]; + */ + public Builder setNewFlags(int value) { + bitField0_ |= 0x00000002; + newFlags_ = value; + + return this; + } + /** + * optional int32 new_flags = 9 [default = 6]; + */ + public Builder clearNewFlags() { + bitField0_ = (bitField0_ & ~0x00000002); + newFlags_ = 6; + + return this; + } + // required int32 name = 2; private int name_ ; /** * required int32 name = 2; */ public boolean hasName() { - return ((bitField0_ & 0x00000002) == 0x00000002); + return ((bitField0_ & 0x00000004) == 0x00000004); } /** * required int32 name = 2; @@ -12973,7 +13054,7 @@ public final class ProtoBuf { * required int32 name = 2; */ public Builder setName(int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; name_ = value; return this; @@ -12982,7 +13063,7 @@ public final class ProtoBuf { * required int32 name = 2; */ public Builder clearName() { - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000004); name_ = 0; return this; @@ -12994,7 +13075,7 @@ public final class ProtoBuf { * optional .org.jetbrains.kotlin.serialization.Type return_type = 3; */ public boolean hasReturnType() { - return ((bitField0_ & 0x00000004) == 0x00000004); + return ((bitField0_ & 0x00000008) == 0x00000008); } /** * optional .org.jetbrains.kotlin.serialization.Type return_type = 3; @@ -13011,7 +13092,7 @@ public final class ProtoBuf { } returnType_ = value; - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; return this; } /** @@ -13021,14 +13102,14 @@ public final class ProtoBuf { org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) { returnType_ = builderForValue.build(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; return this; } /** * optional .org.jetbrains.kotlin.serialization.Type return_type = 3; */ public Builder mergeReturnType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) { - if (((bitField0_ & 0x00000004) == 0x00000004) && + if (((bitField0_ & 0x00000008) == 0x00000008) && returnType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) { returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(returnType_).mergeFrom(value).buildPartial(); @@ -13036,7 +13117,7 @@ public final class ProtoBuf { returnType_ = value; } - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; return this; } /** @@ -13045,7 +13126,7 @@ public final class ProtoBuf { public Builder clearReturnType() { returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000008); return this; } @@ -13055,7 +13136,7 @@ public final class ProtoBuf { * optional int32 return_type_id = 7; */ public boolean hasReturnTypeId() { - return ((bitField0_ & 0x00000008) == 0x00000008); + return ((bitField0_ & 0x00000010) == 0x00000010); } /** * optional int32 return_type_id = 7; @@ -13067,7 +13148,7 @@ public final class ProtoBuf { * optional int32 return_type_id = 7; */ public Builder setReturnTypeId(int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; returnTypeId_ = value; return this; @@ -13076,7 +13157,7 @@ public final class ProtoBuf { * optional int32 return_type_id = 7; */ public Builder clearReturnTypeId() { - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000010); returnTypeId_ = 0; return this; @@ -13086,9 +13167,9 @@ public final class ProtoBuf { private java.util.List typeParameter_ = java.util.Collections.emptyList(); private void ensureTypeParameterIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000020) == 0x00000020)) { typeParameter_ = new java.util.ArrayList(typeParameter_); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; } } @@ -13193,7 +13274,7 @@ public final class ProtoBuf { */ public Builder clearTypeParameter() { typeParameter_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); return this; } @@ -13213,7 +13294,7 @@ public final class ProtoBuf { * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5; */ public boolean hasReceiverType() { - return ((bitField0_ & 0x00000020) == 0x00000020); + return ((bitField0_ & 0x00000040) == 0x00000040); } /** * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5; @@ -13230,7 +13311,7 @@ public final class ProtoBuf { } receiverType_ = value; - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; return this; } /** @@ -13240,14 +13321,14 @@ public final class ProtoBuf { org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) { receiverType_ = builderForValue.build(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; return this; } /** * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5; */ public Builder mergeReceiverType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) { - if (((bitField0_ & 0x00000020) == 0x00000020) && + if (((bitField0_ & 0x00000040) == 0x00000040) && receiverType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) { receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(receiverType_).mergeFrom(value).buildPartial(); @@ -13255,7 +13336,7 @@ public final class ProtoBuf { receiverType_ = value; } - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; return this; } /** @@ -13264,7 +13345,7 @@ public final class ProtoBuf { public Builder clearReceiverType() { receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000040); return this; } @@ -13274,7 +13355,7 @@ public final class ProtoBuf { * optional int32 receiver_type_id = 8; */ public boolean hasReceiverTypeId() { - return ((bitField0_ & 0x00000040) == 0x00000040); + return ((bitField0_ & 0x00000080) == 0x00000080); } /** * optional int32 receiver_type_id = 8; @@ -13286,7 +13367,7 @@ public final class ProtoBuf { * optional int32 receiver_type_id = 8; */ public Builder setReceiverTypeId(int value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; receiverTypeId_ = value; return this; @@ -13295,7 +13376,7 @@ public final class ProtoBuf { * optional int32 receiver_type_id = 8; */ public Builder clearReceiverTypeId() { - bitField0_ = (bitField0_ & ~0x00000040); + bitField0_ = (bitField0_ & ~0x00000080); receiverTypeId_ = 0; return this; @@ -13305,9 +13386,9 @@ public final class ProtoBuf { private java.util.List valueParameter_ = java.util.Collections.emptyList(); private void ensureValueParameterIsMutable() { - if (!((bitField0_ & 0x00000080) == 0x00000080)) { + if (!((bitField0_ & 0x00000100) == 0x00000100)) { valueParameter_ = new java.util.ArrayList(valueParameter_); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; } } @@ -13412,7 +13493,7 @@ public final class ProtoBuf { */ public Builder clearValueParameter() { valueParameter_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000080); + bitField0_ = (bitField0_ & ~0x00000100); return this; } @@ -13432,7 +13513,7 @@ public final class ProtoBuf { * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30; */ public boolean hasTypeTable() { - return ((bitField0_ & 0x00000100) == 0x00000100); + return ((bitField0_ & 0x00000200) == 0x00000200); } /** * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30; @@ -13449,7 +13530,7 @@ public final class ProtoBuf { } typeTable_ = value; - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; return this; } /** @@ -13459,14 +13540,14 @@ public final class ProtoBuf { org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.Builder builderForValue) { typeTable_ = builderForValue.build(); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; return this; } /** * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30; */ public Builder mergeTypeTable(org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable value) { - if (((bitField0_ & 0x00000100) == 0x00000100) && + if (((bitField0_ & 0x00000200) == 0x00000200) && typeTable_ != org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance()) { typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.newBuilder(typeTable_).mergeFrom(value).buildPartial(); @@ -13474,7 +13555,7 @@ public final class ProtoBuf { typeTable_ = value; } - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; return this; } /** @@ -13483,7 +13564,7 @@ public final class ProtoBuf { public Builder clearTypeTable() { typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000100); + bitField0_ = (bitField0_ & ~0x00000200); return this; } @@ -13540,6 +13621,16 @@ public final class ProtoBuf { */ int getFlags(); + // optional int32 new_flags = 11 [default = 518]; + /** + * optional int32 new_flags = 11 [default = 518]; + */ + boolean hasNewFlags(); + /** + * optional int32 new_flags = 11 [default = 518]; + */ + int getNewFlags(); + // required int32 name = 2; /** * required int32 name = 2; @@ -13702,13 +13793,13 @@ public final class ProtoBuf { break; } case 16: { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; name_ = input.readInt32(); break; } case 26: { org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null; - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000008) == 0x00000008)) { subBuilder = returnType_.toBuilder(); } returnType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry); @@ -13716,20 +13807,20 @@ public final class ProtoBuf { subBuilder.mergeFrom(returnType_); returnType_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; break; } case 34: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { typeParameter_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000010; + mutable_bitField0_ |= 0x00000020; } typeParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.PARSER, extensionRegistry)); break; } case 42: { org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null; - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000020) == 0x00000020)) { subBuilder = receiverType_.toBuilder(); } receiverType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry); @@ -13737,12 +13828,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(receiverType_); receiverType_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; break; } case 50: { org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.Builder subBuilder = null; - if (((bitField0_ & 0x00000040) == 0x00000040)) { + if (((bitField0_ & 0x00000080) == 0x00000080)) { subBuilder = setterValueParameter_.toBuilder(); } setterValueParameter_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.PARSER, extensionRegistry); @@ -13750,29 +13841,34 @@ public final class ProtoBuf { subBuilder.mergeFrom(setterValueParameter_); setterValueParameter_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; break; } case 56: { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; getterFlags_ = input.readInt32(); break; } case 64: { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; setterFlags_ = input.readInt32(); break; } case 72: { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; returnTypeId_ = input.readInt32(); break; } case 80: { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; receiverTypeId_ = input.readInt32(); break; } + case 88: { + bitField0_ |= 0x00000002; + newFlags_ = input.readInt32(); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -13781,7 +13877,7 @@ public final class ProtoBuf { throw new com.google.protobuf.InvalidProtocolBufferException( e.getMessage()).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_); } makeExtensionsImmutable(); @@ -13847,6 +13943,22 @@ public final class ProtoBuf { return flags_; } + // optional int32 new_flags = 11 [default = 518]; + public static final int NEW_FLAGS_FIELD_NUMBER = 11; + private int newFlags_; + /** + * optional int32 new_flags = 11 [default = 518]; + */ + public boolean hasNewFlags() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional int32 new_flags = 11 [default = 518]; + */ + public int getNewFlags() { + return newFlags_; + } + // required int32 name = 2; public static final int NAME_FIELD_NUMBER = 2; private int name_; @@ -13854,7 +13966,7 @@ public final class ProtoBuf { * required int32 name = 2; */ public boolean hasName() { - return ((bitField0_ & 0x00000002) == 0x00000002); + return ((bitField0_ & 0x00000004) == 0x00000004); } /** * required int32 name = 2; @@ -13870,7 +13982,7 @@ public final class ProtoBuf { * optional .org.jetbrains.kotlin.serialization.Type return_type = 3; */ public boolean hasReturnType() { - return ((bitField0_ & 0x00000004) == 0x00000004); + return ((bitField0_ & 0x00000008) == 0x00000008); } /** * optional .org.jetbrains.kotlin.serialization.Type return_type = 3; @@ -13886,7 +13998,7 @@ public final class ProtoBuf { * optional int32 return_type_id = 9; */ public boolean hasReturnTypeId() { - return ((bitField0_ & 0x00000008) == 0x00000008); + return ((bitField0_ & 0x00000010) == 0x00000010); } /** * optional int32 return_type_id = 9; @@ -13938,7 +14050,7 @@ public final class ProtoBuf { * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5; */ public boolean hasReceiverType() { - return ((bitField0_ & 0x00000010) == 0x00000010); + return ((bitField0_ & 0x00000020) == 0x00000020); } /** * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5; @@ -13954,7 +14066,7 @@ public final class ProtoBuf { * optional int32 receiver_type_id = 10; */ public boolean hasReceiverTypeId() { - return ((bitField0_ & 0x00000020) == 0x00000020); + return ((bitField0_ & 0x00000040) == 0x00000040); } /** * optional int32 receiver_type_id = 10; @@ -13970,7 +14082,7 @@ public final class ProtoBuf { * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6; */ public boolean hasSetterValueParameter() { - return ((bitField0_ & 0x00000040) == 0x00000040); + return ((bitField0_ & 0x00000080) == 0x00000080); } /** * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6; @@ -13995,7 +14107,7 @@ public final class ProtoBuf { * */ public boolean hasGetterFlags() { - return ((bitField0_ & 0x00000080) == 0x00000080); + return ((bitField0_ & 0x00000100) == 0x00000100); } /** * optional int32 getter_flags = 7; @@ -14020,7 +14132,7 @@ public final class ProtoBuf { * optional int32 setter_flags = 8; */ public boolean hasSetterFlags() { - return ((bitField0_ & 0x00000100) == 0x00000100); + return ((bitField0_ & 0x00000200) == 0x00000200); } /** * optional int32 setter_flags = 8; @@ -14031,6 +14143,7 @@ public final class ProtoBuf { private void initFields() { flags_ = 262; + newFlags_ = 518; name_ = 0; returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance(); returnTypeId_ = 0; @@ -14091,33 +14204,36 @@ public final class ProtoBuf { if (((bitField0_ & 0x00000001) == 0x00000001)) { output.writeInt32(1, flags_); } - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000004) == 0x00000004)) { output.writeInt32(2, name_); } - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000008) == 0x00000008)) { output.writeMessage(3, returnType_); } for (int i = 0; i < typeParameter_.size(); i++) { output.writeMessage(4, typeParameter_.get(i)); } - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000020) == 0x00000020)) { output.writeMessage(5, receiverType_); } - if (((bitField0_ & 0x00000040) == 0x00000040)) { + if (((bitField0_ & 0x00000080) == 0x00000080)) { output.writeMessage(6, setterValueParameter_); } - if (((bitField0_ & 0x00000080) == 0x00000080)) { + if (((bitField0_ & 0x00000100) == 0x00000100)) { output.writeInt32(7, getterFlags_); } - if (((bitField0_ & 0x00000100) == 0x00000100)) { + if (((bitField0_ & 0x00000200) == 0x00000200)) { output.writeInt32(8, setterFlags_); } - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000010) == 0x00000010)) { output.writeInt32(9, returnTypeId_); } - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000040) == 0x00000040)) { output.writeInt32(10, receiverTypeId_); } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeInt32(11, newFlags_); + } extensionWriter.writeUntil(200, output); } @@ -14131,11 +14247,11 @@ public final class ProtoBuf { size += com.google.protobuf.CodedOutputStream .computeInt32Size(1, flags_); } - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream .computeInt32Size(2, name_); } - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000008) == 0x00000008)) { size += com.google.protobuf.CodedOutputStream .computeMessageSize(3, returnType_); } @@ -14143,30 +14259,34 @@ public final class ProtoBuf { size += com.google.protobuf.CodedOutputStream .computeMessageSize(4, typeParameter_.get(i)); } - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000020) == 0x00000020)) { size += com.google.protobuf.CodedOutputStream .computeMessageSize(5, receiverType_); } - if (((bitField0_ & 0x00000040) == 0x00000040)) { + if (((bitField0_ & 0x00000080) == 0x00000080)) { size += com.google.protobuf.CodedOutputStream .computeMessageSize(6, setterValueParameter_); } - if (((bitField0_ & 0x00000080) == 0x00000080)) { + if (((bitField0_ & 0x00000100) == 0x00000100)) { size += com.google.protobuf.CodedOutputStream .computeInt32Size(7, getterFlags_); } - if (((bitField0_ & 0x00000100) == 0x00000100)) { + if (((bitField0_ & 0x00000200) == 0x00000200)) { size += com.google.protobuf.CodedOutputStream .computeInt32Size(8, setterFlags_); } - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000010) == 0x00000010)) { size += com.google.protobuf.CodedOutputStream .computeInt32Size(9, returnTypeId_); } - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000040) == 0x00000040)) { size += com.google.protobuf.CodedOutputStream .computeInt32Size(10, receiverTypeId_); } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(11, newFlags_); + } size += extensionsSerializedSize(); memoizedSerializedSize = size; return size; @@ -14260,24 +14380,26 @@ public final class ProtoBuf { super.clear(); flags_ = 262; bitField0_ = (bitField0_ & ~0x00000001); - name_ = 0; + newFlags_ = 518; bitField0_ = (bitField0_ & ~0x00000002); - returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance(); + name_ = 0; bitField0_ = (bitField0_ & ~0x00000004); - returnTypeId_ = 0; + returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000008); - typeParameter_ = java.util.Collections.emptyList(); + returnTypeId_ = 0; bitField0_ = (bitField0_ & ~0x00000010); - receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance(); + typeParameter_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000020); - receiverTypeId_ = 0; + receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000040); - setterValueParameter_ = org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.getDefaultInstance(); + receiverTypeId_ = 0; bitField0_ = (bitField0_ & ~0x00000080); - getterFlags_ = 0; + setterValueParameter_ = org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000100); - setterFlags_ = 0; + getterFlags_ = 0; bitField0_ = (bitField0_ & ~0x00000200); + setterFlags_ = 0; + bitField0_ = (bitField0_ & ~0x00000400); return this; } @@ -14308,39 +14430,43 @@ public final class ProtoBuf { if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } - result.name_ = name_; + result.newFlags_ = newFlags_; if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } - result.returnType_ = returnType_; + result.name_ = name_; if (((from_bitField0_ & 0x00000008) == 0x00000008)) { to_bitField0_ |= 0x00000008; } - result.returnTypeId_ = returnTypeId_; - if (((bitField0_ & 0x00000010) == 0x00000010)) { - typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_); - bitField0_ = (bitField0_ & ~0x00000010); - } - result.typeParameter_ = typeParameter_; - if (((from_bitField0_ & 0x00000020) == 0x00000020)) { + result.returnType_ = returnType_; + if (((from_bitField0_ & 0x00000010) == 0x00000010)) { to_bitField0_ |= 0x00000010; } - result.receiverType_ = receiverType_; + result.returnTypeId_ = returnTypeId_; + if (((bitField0_ & 0x00000020) == 0x00000020)) { + typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_); + bitField0_ = (bitField0_ & ~0x00000020); + } + result.typeParameter_ = typeParameter_; if (((from_bitField0_ & 0x00000040) == 0x00000040)) { to_bitField0_ |= 0x00000020; } - result.receiverTypeId_ = receiverTypeId_; + result.receiverType_ = receiverType_; if (((from_bitField0_ & 0x00000080) == 0x00000080)) { to_bitField0_ |= 0x00000040; } - result.setterValueParameter_ = setterValueParameter_; + result.receiverTypeId_ = receiverTypeId_; if (((from_bitField0_ & 0x00000100) == 0x00000100)) { to_bitField0_ |= 0x00000080; } - result.getterFlags_ = getterFlags_; + result.setterValueParameter_ = setterValueParameter_; if (((from_bitField0_ & 0x00000200) == 0x00000200)) { to_bitField0_ |= 0x00000100; } + result.getterFlags_ = getterFlags_; + if (((from_bitField0_ & 0x00000400) == 0x00000400)) { + to_bitField0_ |= 0x00000200; + } result.setterFlags_ = setterFlags_; result.bitField0_ = to_bitField0_; return result; @@ -14351,6 +14477,9 @@ public final class ProtoBuf { if (other.hasFlags()) { setFlags(other.getFlags()); } + if (other.hasNewFlags()) { + setNewFlags(other.getNewFlags()); + } if (other.hasName()) { setName(other.getName()); } @@ -14363,7 +14492,7 @@ public final class ProtoBuf { if (!other.typeParameter_.isEmpty()) { if (typeParameter_.isEmpty()) { typeParameter_ = other.typeParameter_; - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); } else { ensureTypeParameterIsMutable(); typeParameter_.addAll(other.typeParameter_); @@ -14533,13 +14662,46 @@ public final class ProtoBuf { return this; } + // optional int32 new_flags = 11 [default = 518]; + private int newFlags_ = 518; + /** + * optional int32 new_flags = 11 [default = 518]; + */ + public boolean hasNewFlags() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional int32 new_flags = 11 [default = 518]; + */ + public int getNewFlags() { + return newFlags_; + } + /** + * optional int32 new_flags = 11 [default = 518]; + */ + public Builder setNewFlags(int value) { + bitField0_ |= 0x00000002; + newFlags_ = value; + + return this; + } + /** + * optional int32 new_flags = 11 [default = 518]; + */ + public Builder clearNewFlags() { + bitField0_ = (bitField0_ & ~0x00000002); + newFlags_ = 518; + + return this; + } + // required int32 name = 2; private int name_ ; /** * required int32 name = 2; */ public boolean hasName() { - return ((bitField0_ & 0x00000002) == 0x00000002); + return ((bitField0_ & 0x00000004) == 0x00000004); } /** * required int32 name = 2; @@ -14551,7 +14713,7 @@ public final class ProtoBuf { * required int32 name = 2; */ public Builder setName(int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; name_ = value; return this; @@ -14560,7 +14722,7 @@ public final class ProtoBuf { * required int32 name = 2; */ public Builder clearName() { - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000004); name_ = 0; return this; @@ -14572,7 +14734,7 @@ public final class ProtoBuf { * optional .org.jetbrains.kotlin.serialization.Type return_type = 3; */ public boolean hasReturnType() { - return ((bitField0_ & 0x00000004) == 0x00000004); + return ((bitField0_ & 0x00000008) == 0x00000008); } /** * optional .org.jetbrains.kotlin.serialization.Type return_type = 3; @@ -14589,7 +14751,7 @@ public final class ProtoBuf { } returnType_ = value; - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; return this; } /** @@ -14599,14 +14761,14 @@ public final class ProtoBuf { org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) { returnType_ = builderForValue.build(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; return this; } /** * optional .org.jetbrains.kotlin.serialization.Type return_type = 3; */ public Builder mergeReturnType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) { - if (((bitField0_ & 0x00000004) == 0x00000004) && + if (((bitField0_ & 0x00000008) == 0x00000008) && returnType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) { returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(returnType_).mergeFrom(value).buildPartial(); @@ -14614,7 +14776,7 @@ public final class ProtoBuf { returnType_ = value; } - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; return this; } /** @@ -14623,7 +14785,7 @@ public final class ProtoBuf { public Builder clearReturnType() { returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000008); return this; } @@ -14633,7 +14795,7 @@ public final class ProtoBuf { * optional int32 return_type_id = 9; */ public boolean hasReturnTypeId() { - return ((bitField0_ & 0x00000008) == 0x00000008); + return ((bitField0_ & 0x00000010) == 0x00000010); } /** * optional int32 return_type_id = 9; @@ -14645,7 +14807,7 @@ public final class ProtoBuf { * optional int32 return_type_id = 9; */ public Builder setReturnTypeId(int value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; returnTypeId_ = value; return this; @@ -14654,7 +14816,7 @@ public final class ProtoBuf { * optional int32 return_type_id = 9; */ public Builder clearReturnTypeId() { - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000010); returnTypeId_ = 0; return this; @@ -14664,9 +14826,9 @@ public final class ProtoBuf { private java.util.List typeParameter_ = java.util.Collections.emptyList(); private void ensureTypeParameterIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000020) == 0x00000020)) { typeParameter_ = new java.util.ArrayList(typeParameter_); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; } } @@ -14771,7 +14933,7 @@ public final class ProtoBuf { */ public Builder clearTypeParameter() { typeParameter_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); return this; } @@ -14791,7 +14953,7 @@ public final class ProtoBuf { * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5; */ public boolean hasReceiverType() { - return ((bitField0_ & 0x00000020) == 0x00000020); + return ((bitField0_ & 0x00000040) == 0x00000040); } /** * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5; @@ -14808,7 +14970,7 @@ public final class ProtoBuf { } receiverType_ = value; - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; return this; } /** @@ -14818,14 +14980,14 @@ public final class ProtoBuf { org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) { receiverType_ = builderForValue.build(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; return this; } /** * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5; */ public Builder mergeReceiverType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) { - if (((bitField0_ & 0x00000020) == 0x00000020) && + if (((bitField0_ & 0x00000040) == 0x00000040) && receiverType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) { receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(receiverType_).mergeFrom(value).buildPartial(); @@ -14833,7 +14995,7 @@ public final class ProtoBuf { receiverType_ = value; } - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; return this; } /** @@ -14842,7 +15004,7 @@ public final class ProtoBuf { public Builder clearReceiverType() { receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000040); return this; } @@ -14852,7 +15014,7 @@ public final class ProtoBuf { * optional int32 receiver_type_id = 10; */ public boolean hasReceiverTypeId() { - return ((bitField0_ & 0x00000040) == 0x00000040); + return ((bitField0_ & 0x00000080) == 0x00000080); } /** * optional int32 receiver_type_id = 10; @@ -14864,7 +15026,7 @@ public final class ProtoBuf { * optional int32 receiver_type_id = 10; */ public Builder setReceiverTypeId(int value) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; receiverTypeId_ = value; return this; @@ -14873,7 +15035,7 @@ public final class ProtoBuf { * optional int32 receiver_type_id = 10; */ public Builder clearReceiverTypeId() { - bitField0_ = (bitField0_ & ~0x00000040); + bitField0_ = (bitField0_ & ~0x00000080); receiverTypeId_ = 0; return this; @@ -14885,7 +15047,7 @@ public final class ProtoBuf { * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6; */ public boolean hasSetterValueParameter() { - return ((bitField0_ & 0x00000080) == 0x00000080); + return ((bitField0_ & 0x00000100) == 0x00000100); } /** * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6; @@ -14902,7 +15064,7 @@ public final class ProtoBuf { } setterValueParameter_ = value; - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; return this; } /** @@ -14912,14 +15074,14 @@ public final class ProtoBuf { org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.Builder builderForValue) { setterValueParameter_ = builderForValue.build(); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; return this; } /** * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6; */ public Builder mergeSetterValueParameter(org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter value) { - if (((bitField0_ & 0x00000080) == 0x00000080) && + if (((bitField0_ & 0x00000100) == 0x00000100) && setterValueParameter_ != org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.getDefaultInstance()) { setterValueParameter_ = org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.newBuilder(setterValueParameter_).mergeFrom(value).buildPartial(); @@ -14927,7 +15089,7 @@ public final class ProtoBuf { setterValueParameter_ = value; } - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; return this; } /** @@ -14936,7 +15098,7 @@ public final class ProtoBuf { public Builder clearSetterValueParameter() { setterValueParameter_ = org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000080); + bitField0_ = (bitField0_ & ~0x00000100); return this; } @@ -14955,7 +15117,7 @@ public final class ProtoBuf { * */ public boolean hasGetterFlags() { - return ((bitField0_ & 0x00000100) == 0x00000100); + return ((bitField0_ & 0x00000200) == 0x00000200); } /** * optional int32 getter_flags = 7; @@ -14985,7 +15147,7 @@ public final class ProtoBuf { * */ public Builder setGetterFlags(int value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; getterFlags_ = value; return this; @@ -15003,7 +15165,7 @@ public final class ProtoBuf { * */ public Builder clearGetterFlags() { - bitField0_ = (bitField0_ & ~0x00000100); + bitField0_ = (bitField0_ & ~0x00000200); getterFlags_ = 0; return this; @@ -15015,7 +15177,7 @@ public final class ProtoBuf { * optional int32 setter_flags = 8; */ public boolean hasSetterFlags() { - return ((bitField0_ & 0x00000200) == 0x00000200); + return ((bitField0_ & 0x00000400) == 0x00000400); } /** * optional int32 setter_flags = 8; @@ -15027,7 +15189,7 @@ public final class ProtoBuf { * optional int32 setter_flags = 8; */ public Builder setSetterFlags(int value) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000400; setterFlags_ = value; return this; @@ -15036,7 +15198,7 @@ public final class ProtoBuf { * optional int32 setter_flags = 8; */ public Builder clearSetterFlags() { - bitField0_ = (bitField0_ & ~0x00000200); + bitField0_ = (bitField0_ & ~0x00000400); setterFlags_ = 0; return this; diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index 1768649095e..4a3907764d2 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -198,6 +198,11 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR if (old.flags != new.flags) return false } + if (old.hasNewFlags() != new.hasNewFlags()) return false + if (old.hasNewFlags()) { + if (old.newFlags != new.newFlags) return false + } + if (!checkStringEquals(old.name, new.name)) return false if (old.hasReturnType() != new.hasReturnType()) return false @@ -243,6 +248,11 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR if (old.flags != new.flags) return false } + if (old.hasNewFlags() != new.hasNewFlags()) return false + if (old.hasNewFlags()) { + if (old.newFlags != new.newFlags) return false + } + if (!checkStringEquals(old.name, new.name)) return false if (old.hasReturnType() != new.hasReturnType()) return false @@ -900,6 +910,10 @@ fun ProtoBuf.Function.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) hashCode = 31 * hashCode + flags } + if (hasNewFlags()) { + hashCode = 31 * hashCode + newFlags + } + hashCode = 31 * hashCode + stringIndexes(name) if (hasReturnType()) { @@ -944,6 +958,10 @@ fun ProtoBuf.Property.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) hashCode = 31 * hashCode + flags } + if (hasNewFlags()) { + hashCode = 31 * hashCode + newFlags + } + hashCode = 31 * hashCode + stringIndexes(name) if (hasReturnType()) {