Merge cached_has_bits instead of inidividually setting has_bit.
PiperOrigin-RevId: 582497327
diff --git a/src/google/protobuf/compiler/cpp/field.cc b/src/google/protobuf/compiler/cpp/field.cc
index d2fee86..a8a73ec 100644
--- a/src/google/protobuf/compiler/cpp/field.cc
+++ b/src/google/protobuf/compiler/cpp/field.cc
@@ -262,9 +262,8 @@
void HasBitVars(const FieldDescriptor* field, const Options& opts,
absl::optional<uint32_t> idx, std::vector<Sub>& vars) {
if (!idx.has_value()) {
- vars.emplace_back("set_hasbit", "");
- vars.emplace_back("this_set_hasbit", "");
- vars.emplace_back("clear_hasbit", "");
+ vars.emplace_back(Sub("set_hasbit", "").WithSuffix(";"));
+ vars.emplace_back(Sub("clear_hasbit", "").WithSuffix(";"));
return;
}
@@ -284,9 +283,6 @@
vars.emplace_back("has_hasbit", has);
vars.emplace_back(Sub("set_hasbit", set).WithSuffix(";"));
vars.emplace_back(Sub("clear_hasbit", clr).WithSuffix(";"));
-
- set = absl::StrFormat("_this->%s[%d] |= %s;", has_bits, index, mask);
- vars.emplace_back(Sub("this_set_hasbit", set).WithSuffix(";"));
}
void InlinedStringVars(const FieldDescriptor* field, const Options& opts,
@@ -297,7 +293,7 @@
}
// The first bit is the tracking bit for on demand registering ArenaDtor.
- ABSL_CHECK_GT(*idx, 0)
+ ABSL_CHECK_GT(*idx, 0u)
<< "_inlined_string_donated_'s bit 0 is reserved for arena dtor tracking";
int32_t index = *idx / 32;
diff --git a/src/google/protobuf/compiler/cpp/field_generators/enum_field.cc b/src/google/protobuf/compiler/cpp/field_generators/enum_field.cc
index 51a20ce..3cbdb77 100644
--- a/src/google/protobuf/compiler/cpp/field_generators/enum_field.cc
+++ b/src/google/protobuf/compiler/cpp/field_generators/enum_field.cc
@@ -169,16 +169,16 @@
// @@protoc_insertion_point(field_get:$pkg.Msg.field$)
return _internal_$name$();
}
- inline void $Msg$::set_$name$($Enum$ value) {
- $PrepareSplitMessageForWrite$;
- _internal_set_$name$(value);
- $annotate_set$;
- // @@protoc_insertion_point(field_set:$pkg.Msg.field$)
- }
)cc");
if (is_oneof()) {
p->Emit(R"cc(
+ inline void $Msg$::set_$name$($Enum$ value) {
+ $PrepareSplitMessageForWrite$;
+ _internal_set_$name$(value);
+ $annotate_set$;
+ // @@protoc_insertion_point(field_set:$pkg.Msg.field$)
+ }
inline $Enum$ $Msg$::_internal_$name$() const {
if ($has_field$) {
return static_cast<$Enum$>($field_$);
@@ -196,6 +196,13 @@
)cc");
} else {
p->Emit(R"cc(
+ inline void $Msg$::set_$name$($Enum$ value) {
+ $PrepareSplitMessageForWrite$;
+ _internal_set_$name$(value);
+ $set_hasbit$;
+ $annotate_set$;
+ // @@protoc_insertion_point(field_set:$pkg.Msg.field$)
+ }
inline $Enum$ $Msg$::_internal_$name$() const {
$TsanDetectConcurrentRead$;
return static_cast<$Enum$>($field_$);
@@ -203,7 +210,6 @@
inline void $Msg$::_internal_set_$name$($Enum$ value) {
$TsanDetectConcurrentMutation$;
$assert_valid$;
- $set_hasbit$;
$field_$ = value;
}
)cc");
diff --git a/src/google/protobuf/compiler/cpp/field_generators/message_field.cc b/src/google/protobuf/compiler/cpp/field_generators/message_field.cc
index e5ac613..fcf23f2 100644
--- a/src/google/protobuf/compiler/cpp/field_generators/message_field.cc
+++ b/src/google/protobuf/compiler/cpp/field_generators/message_field.cc
@@ -261,7 +261,6 @@
inline $Submsg$* $Msg$::_internal_mutable_$name$() {
$TsanDetectConcurrentMutation$;
$StrongRef$;
- $set_hasbit$;
if ($field_$ == nullptr) {
auto* p = $superclass$::DefaultConstruct<$Submsg$>(GetArena());
$field_$ = reinterpret_cast<$MemberType$*>(p);
@@ -272,6 +271,7 @@
//~ TODO: add tests to make sure all write accessors are
//~ able to prepare split message allocation.
$PrepareSplitMessageForWrite$;
+ $set_hasbit$;
$Submsg$* _msg = _internal_mutable_$name$();
$annotate_mutable$;
// @@protoc_insertion_point(field_mutable:$pkg.Msg.field$)
@@ -309,15 +309,9 @@
void SingularMessage::GenerateInternalAccessorDeclarations(
io::Printer* p) const {
- if (!is_weak()) {
- p->Emit(R"cc(
- static const $Submsg$& $name$(const $Msg$* msg);
- )cc");
- return;
- }
+ if (!is_weak()) return;
p->Emit(R"cc(
- static const $pb$::MessageLite& $name$(const $Msg$* msg);
static $pb$::MessageLite* mutable_$name$($Msg$* msg);
)cc");
}
@@ -328,17 +322,7 @@
// practice, the linker is then not able to throw them out making implicit
// weak dependencies not work at all.
- if (!is_weak()) {
- // This inline accessor directly returns member field and is used in
- // Serialize such that AFDO profile correctly captures access information to
- // message fields under serialize.
- p->Emit(R"cc(
- const $Submsg$& $Msg$::_Internal::$name$(const $Msg$* msg) {
- return *msg->$field_$;
- }
- )cc");
- return;
- }
+ if (!is_weak()) return;
// These private accessors are used by MergeFrom and
// MergePartialFromCodedStream, and their purpose is to provide access to
@@ -370,13 +354,6 @@
}},
},
R"cc(
- const $pb$::MessageLite& $Msg$::_Internal::$name$(const $Msg$* msg) {
- if (msg->$field_$ != nullptr) {
- return *msg->$field_$;
- } else {
- return *$kDefaultPtr$;
- }
- }
$pb$::MessageLite* $Msg$::_Internal::mutable_$name$($Msg$* msg) {
$update_hasbit$;
if ($is_already_set$) {
@@ -430,7 +407,7 @@
if (is_weak()) {
p->Emit(
"_Internal::mutable_$name$(_this)->CheckTypeAndMergeFrom(\n"
- " _Internal::$name$(&from));\n");
+ " *from.$field_$);\n");
} else if (is_oneof() || should_split()) {
p->Emit(
"_this->_internal_mutable_$name$()->$Submsg$::MergeFrom(\n"
@@ -449,7 +426,6 @@
} else {
_this->$field_$->MergeFrom(*from.$field_$);
}
- $this_set_hasbit$;
)cc");
}
}
@@ -495,14 +471,13 @@
if (!is_group()) {
p->Emit(R"cc(
target = $pbi$::WireFormatLite::InternalWrite$declared_type$(
- $number$, _Internal::$name$(this),
- _Internal::$name$(this).GetCachedSize(), target, stream);
+ $number$, *$field_$, $field_$->GetCachedSize(), target, stream);
)cc");
} else {
p->Emit(R"cc(
target = stream->EnsureSpace(target);
target = $pbi$::WireFormatLite::InternalWrite$declared_type$(
- $number$, _Internal::$name$(this), target, stream);
+ $number$, *$field_$, target, stream);
)cc");
}
}
diff --git a/src/google/protobuf/compiler/cpp/field_generators/primitive_field.cc b/src/google/protobuf/compiler/cpp/field_generators/primitive_field.cc
index f58b9b3..617f61f 100644
--- a/src/google/protobuf/compiler/cpp/field_generators/primitive_field.cc
+++ b/src/google/protobuf/compiler/cpp/field_generators/primitive_field.cc
@@ -192,16 +192,16 @@
// @@protoc_insertion_point(field_get:$pkg.Msg.field$)
return _internal_$name$();
}
- inline void $Msg$::set_$name$($Type$ value) {
- $PrepareSplitMessageForWrite$;
- _internal_set_$name$(value);
- $annotate_set$;
- // @@protoc_insertion_point(field_set:$pkg.Msg.field$)
- }
)cc");
if (is_oneof()) {
p->Emit(R"cc(
+ inline void $Msg$::set_$name$($Type$ value) {
+ $PrepareSplitMessageForWrite$;
+ _internal_set_$name$(value);
+ $annotate_set$;
+ // @@protoc_insertion_point(field_set:$pkg.Msg.field$)
+ }
inline $Type$ $Msg$::_internal_$name$() const {
if ($has_field$) {
return $field_$;
@@ -218,13 +218,19 @@
)cc");
} else {
p->Emit(R"cc(
+ inline void $Msg$::set_$name$($Type$ value) {
+ $PrepareSplitMessageForWrite$;
+ _internal_set_$name$(value);
+ $set_hasbit$;
+ $annotate_set$;
+ // @@protoc_insertion_point(field_set:$pkg.Msg.field$)
+ }
inline $Type$ $Msg$::_internal_$name$() const {
$TsanDetectConcurrentRead$;
return $field_$;
}
inline void $Msg$::_internal_set_$name$($Type$ value) {
$TsanDetectConcurrentMutation$;
- $set_hasbit$;
$field_$ = value;
}
)cc");
diff --git a/src/google/protobuf/compiler/cpp/message.cc b/src/google/protobuf/compiler/cpp/message.cc
index 62273f3..4935b40 100644
--- a/src/google/protobuf/compiler/cpp/message.cc
+++ b/src/google/protobuf/compiler/cpp/message.cc
@@ -2121,15 +2121,6 @@
for (auto field : FieldRange(descriptor_)) {
auto t = p->WithVars(MakeTrackerCalls(field, options_));
field_generators_.get(field).GenerateInternalAccessorDeclarations(p);
- if (HasHasbit(field)) {
- int has_bit_index = HasBitIndex(field);
- ABSL_CHECK_NE(has_bit_index, kNoHasbit) << field->full_name();
- format(
- "static void set_has_$1$(HasBits* has_bits) {\n"
- " (*has_bits)[$2$] |= $3$u;\n"
- "}\n",
- FieldName(field), has_bit_index / 32, (1u << (has_bit_index % 32)));
- }
}
if (num_required_fields_ > 0) {
const std::vector<uint32_t> masks_for_has_bits = RequiredFieldsBitMask();
@@ -3668,10 +3659,17 @@
while (it != next) {
const std::vector<const FieldDescriptor*>& fields = it->fields;
- const bool check_has_byte = fields.size() > 1 &&
- HasByteIndex(fields.front()) != kNoHasbit &&
+ const bool cache_has_bits = HasByteIndex(fields.front()) != kNoHasbit;
+ const bool check_has_byte = cache_has_bits && fields.size() > 1 &&
!IsLikelyPresent(fields.back(), options_);
+ if (cache_has_bits &&
+ cached_has_word_index != HasWordIndex(fields.front())) {
+ cached_has_word_index = HasWordIndex(fields.front());
+ format("cached_has_bits = from.$has_bits$[$1$];\n",
+ cached_has_word_index);
+ }
+
if (check_has_byte) {
// Emit an if() that will let us skip the whole chunk if none are set.
uint32_t chunk_mask = GenChunkMask(fields, has_bit_indices_);
@@ -3684,18 +3682,11 @@
ABSL_DCHECK_LE(2, popcnt(chunk_mask));
ABSL_DCHECK_GE(8, popcnt(chunk_mask));
- if (cached_has_word_index != HasWordIndex(fields.front())) {
- cached_has_word_index = HasWordIndex(fields.front());
- format("cached_has_bits = from.$has_bits$[$1$];\n",
- cached_has_word_index);
- }
-
format("if (cached_has_bits & 0x$1$u) {\n", chunk_mask_str);
format.Indent();
}
// Go back and emit merging code for each of the fields we processed.
- bool deferred_has_bit_changes = false;
for (const auto* field : fields) {
const auto& generator = field_generators_.get(field);
@@ -3733,10 +3724,6 @@
format.Indent();
if (check_has_byte && IsPOD(field)) {
- // Defer hasbit modification until the end of chunk.
- // This can reduce the number of loads/stores by up to 7 per 8
- // fields.
- deferred_has_bit_changes = true;
generator.GenerateCopyConstructorCode(p);
} else {
generator.GenerateMergingCode(p);
@@ -3748,13 +3735,6 @@
}
if (check_has_byte) {
- if (deferred_has_bit_changes) {
- // Flush the has bits for the primitives we deferred.
- ABSL_CHECK_LE(0, cached_has_word_index);
- format("_this->$has_bits$[$1$] |= cached_has_bits;\n",
- cached_has_word_index);
- }
-
format.Outdent();
format("}\n");
}
@@ -3774,6 +3754,18 @@
}
}
+ if (HasBitsSize() == 1) {
+ // Optimization to avoid a load. Assuming that most messages have fewer than
+ // 32 fields, this seems useful.
+ p->Emit(R"cc(
+ _this->$has_bits$[0] |= cached_has_bits;
+ )cc");
+ } else if (HasBitsSize() > 1) {
+ p->Emit(R"cc(
+ _this->$has_bits$.Or(from.$has_bits$);
+ )cc");
+ }
+
// Merge oneof fields. Oneof field requires oneof case check.
for (auto oneof : OneOfRange(descriptor_)) {
format("switch (from.$1$_case()) {\n", oneof->name());
diff --git a/src/google/protobuf/compiler/java/java_features.pb.cc b/src/google/protobuf/compiler/java/java_features.pb.cc
index 6f9dbd6..9e1d960 100644
--- a/src/google/protobuf/compiler/java/java_features.pb.cc
+++ b/src/google/protobuf/compiler/java/java_features.pb.cc
@@ -155,12 +155,6 @@
using HasBits = decltype(std::declval<JavaFeatures>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(JavaFeatures, _impl_._has_bits_);
- static void set_has_legacy_closed_enum(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
- static void set_has_utf8_validation(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
};
JavaFeatures::JavaFeatures(::google::protobuf::Arena* arena)
@@ -344,8 +338,8 @@
if (cached_has_bits & 0x00000002u) {
_this->_impl_.utf8_validation_ = from._impl_.utf8_validation_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
diff --git a/src/google/protobuf/compiler/java/java_features.pb.h b/src/google/protobuf/compiler/java/java_features.pb.h
index b31fdf4..17dbae0 100644
--- a/src/google/protobuf/compiler/java/java_features.pb.h
+++ b/src/google/protobuf/compiler/java/java_features.pb.h
@@ -339,6 +339,7 @@
}
inline void JavaFeatures::set_legacy_closed_enum(bool value) {
_internal_set_legacy_closed_enum(value);
+ _impl_._has_bits_[0] |= 0x00000001u;
// @@protoc_insertion_point(field_set:pb.JavaFeatures.legacy_closed_enum)
}
inline bool JavaFeatures::_internal_legacy_closed_enum() const {
@@ -347,7 +348,6 @@
}
inline void JavaFeatures::_internal_set_legacy_closed_enum(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000001u;
_impl_.legacy_closed_enum_ = value;
}
@@ -367,6 +367,7 @@
}
inline void JavaFeatures::set_utf8_validation(::pb::JavaFeatures_Utf8Validation value) {
_internal_set_utf8_validation(value);
+ _impl_._has_bits_[0] |= 0x00000002u;
// @@protoc_insertion_point(field_set:pb.JavaFeatures.utf8_validation)
}
inline ::pb::JavaFeatures_Utf8Validation JavaFeatures::_internal_utf8_validation() const {
@@ -376,7 +377,6 @@
inline void JavaFeatures::_internal_set_utf8_validation(::pb::JavaFeatures_Utf8Validation value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
assert(::pb::JavaFeatures_Utf8Validation_IsValid(value));
- _impl_._has_bits_[0] |= 0x00000002u;
_impl_.utf8_validation_ = value;
}
diff --git a/src/google/protobuf/compiler/plugin.pb.cc b/src/google/protobuf/compiler/plugin.pb.cc
index 84e1a72..e9bc8d7 100644
--- a/src/google/protobuf/compiler/plugin.pb.cc
+++ b/src/google/protobuf/compiler/plugin.pb.cc
@@ -311,18 +311,6 @@
using HasBits = decltype(std::declval<Version>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(Version, _impl_._has_bits_);
- static void set_has_major(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
- static void set_has_minor(HasBits* has_bits) {
- (*has_bits)[0] |= 4u;
- }
- static void set_has_patch(HasBits* has_bits) {
- (*has_bits)[0] |= 8u;
- }
- static void set_has_suffix(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
};
Version::Version(::google::protobuf::Arena* arena)
@@ -581,8 +569,8 @@
if (cached_has_bits & 0x00000008u) {
_this->_impl_.patch_ = from._impl_.patch_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -624,18 +612,8 @@
using HasBits = decltype(std::declval<CodeGeneratorRequest>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(CodeGeneratorRequest, _impl_._has_bits_);
- static void set_has_parameter(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
- static const ::google::protobuf::compiler::Version& compiler_version(const CodeGeneratorRequest* msg);
- static void set_has_compiler_version(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
};
-const ::google::protobuf::compiler::Version& CodeGeneratorRequest::_Internal::compiler_version(const CodeGeneratorRequest* msg) {
- return *msg->_impl_.compiler_version_;
-}
void CodeGeneratorRequest::clear_proto_file() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
_impl_.proto_file_.Clear();
@@ -833,8 +811,7 @@
// optional .google.protobuf.compiler.Version compiler_version = 3;
if (cached_has_bits & 0x00000002u) {
target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
- 3, _Internal::compiler_version(this),
- _Internal::compiler_version(this).GetCachedSize(), target, stream);
+ 3, *_impl_.compiler_version_, _impl_.compiler_version_->GetCachedSize(), target, stream);
}
// repeated .google.protobuf.FileDescriptorProto proto_file = 15;
@@ -934,9 +911,9 @@
} else {
_this->_impl_.compiler_version_->MergeFrom(*from._impl_.compiler_version_);
}
- _this->_impl_._has_bits_[0] |= 0x00000002u;
}
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -980,24 +957,8 @@
using HasBits = decltype(std::declval<CodeGeneratorResponse_File>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(CodeGeneratorResponse_File, _impl_._has_bits_);
- static void set_has_name(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
- static void set_has_insertion_point(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
- static void set_has_content(HasBits* has_bits) {
- (*has_bits)[0] |= 4u;
- }
- static const ::google::protobuf::GeneratedCodeInfo& generated_code_info(const CodeGeneratorResponse_File* msg);
- static void set_has_generated_code_info(HasBits* has_bits) {
- (*has_bits)[0] |= 8u;
- }
};
-const ::google::protobuf::GeneratedCodeInfo& CodeGeneratorResponse_File::_Internal::generated_code_info(const CodeGeneratorResponse_File* msg) {
- return *msg->_impl_.generated_code_info_;
-}
void CodeGeneratorResponse_File::clear_generated_code_info() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
if (_impl_.generated_code_info_ != nullptr) _impl_.generated_code_info_->Clear();
@@ -1195,8 +1156,7 @@
// optional .google.protobuf.GeneratedCodeInfo generated_code_info = 16;
if (cached_has_bits & 0x00000008u) {
target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
- 16, _Internal::generated_code_info(this),
- _Internal::generated_code_info(this).GetCachedSize(), target, stream);
+ 16, *_impl_.generated_code_info_, _impl_.generated_code_info_->GetCachedSize(), target, stream);
}
if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
@@ -1275,9 +1235,9 @@
} else {
_this->_impl_.generated_code_info_->MergeFrom(*from._impl_.generated_code_info_);
}
- _this->_impl_._has_bits_[0] |= 0x00000008u;
}
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -1316,12 +1276,6 @@
using HasBits = decltype(std::declval<CodeGeneratorResponse>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(CodeGeneratorResponse, _impl_._has_bits_);
- static void set_has_error(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
- static void set_has_supported_features(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
};
CodeGeneratorResponse::CodeGeneratorResponse(::google::protobuf::Arena* arena)
@@ -1547,8 +1501,8 @@
if (cached_has_bits & 0x00000002u) {
_this->_impl_.supported_features_ = from._impl_.supported_features_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h
index b5833e8..80fc7fd 100644
--- a/src/google/protobuf/compiler/plugin.pb.h
+++ b/src/google/protobuf/compiler/plugin.pb.h
@@ -1075,6 +1075,7 @@
}
inline void Version::set_major(::int32_t value) {
_internal_set_major(value);
+ _impl_._has_bits_[0] |= 0x00000002u;
// @@protoc_insertion_point(field_set:google.protobuf.compiler.Version.major)
}
inline ::int32_t Version::_internal_major() const {
@@ -1083,7 +1084,6 @@
}
inline void Version::_internal_set_major(::int32_t value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000002u;
_impl_.major_ = value;
}
@@ -1103,6 +1103,7 @@
}
inline void Version::set_minor(::int32_t value) {
_internal_set_minor(value);
+ _impl_._has_bits_[0] |= 0x00000004u;
// @@protoc_insertion_point(field_set:google.protobuf.compiler.Version.minor)
}
inline ::int32_t Version::_internal_minor() const {
@@ -1111,7 +1112,6 @@
}
inline void Version::_internal_set_minor(::int32_t value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000004u;
_impl_.minor_ = value;
}
@@ -1131,6 +1131,7 @@
}
inline void Version::set_patch(::int32_t value) {
_internal_set_patch(value);
+ _impl_._has_bits_[0] |= 0x00000008u;
// @@protoc_insertion_point(field_set:google.protobuf.compiler.Version.patch)
}
inline ::int32_t Version::_internal_patch() const {
@@ -1139,7 +1140,6 @@
}
inline void Version::_internal_set_patch(::int32_t value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000008u;
_impl_.patch_ = value;
}
@@ -1543,7 +1543,6 @@
}
inline ::google::protobuf::compiler::Version* CodeGeneratorRequest::_internal_mutable_compiler_version() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000002u;
if (_impl_.compiler_version_ == nullptr) {
auto* p = ::google::protobuf::Message::DefaultConstruct<::google::protobuf::compiler::Version>(GetArena());
_impl_.compiler_version_ = reinterpret_cast<::google::protobuf::compiler::Version*>(p);
@@ -1551,6 +1550,7 @@
return _impl_.compiler_version_;
}
inline ::google::protobuf::compiler::Version* CodeGeneratorRequest::mutable_compiler_version() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+ _impl_._has_bits_[0] |= 0x00000002u;
::google::protobuf::compiler::Version* _msg = _internal_mutable_compiler_version();
// @@protoc_insertion_point(field_mutable:google.protobuf.compiler.CodeGeneratorRequest.compiler_version)
return _msg;
@@ -1851,7 +1851,6 @@
}
inline ::google::protobuf::GeneratedCodeInfo* CodeGeneratorResponse_File::_internal_mutable_generated_code_info() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000008u;
if (_impl_.generated_code_info_ == nullptr) {
auto* p = ::google::protobuf::Message::DefaultConstruct<::google::protobuf::GeneratedCodeInfo>(GetArena());
_impl_.generated_code_info_ = reinterpret_cast<::google::protobuf::GeneratedCodeInfo*>(p);
@@ -1859,6 +1858,7 @@
return _impl_.generated_code_info_;
}
inline ::google::protobuf::GeneratedCodeInfo* CodeGeneratorResponse_File::mutable_generated_code_info() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+ _impl_._has_bits_[0] |= 0x00000008u;
::google::protobuf::GeneratedCodeInfo* _msg = _internal_mutable_generated_code_info();
// @@protoc_insertion_point(field_mutable:google.protobuf.compiler.CodeGeneratorResponse.File.generated_code_info)
return _msg;
@@ -1975,6 +1975,7 @@
}
inline void CodeGeneratorResponse::set_supported_features(::uint64_t value) {
_internal_set_supported_features(value);
+ _impl_._has_bits_[0] |= 0x00000002u;
// @@protoc_insertion_point(field_set:google.protobuf.compiler.CodeGeneratorResponse.supported_features)
}
inline ::uint64_t CodeGeneratorResponse::_internal_supported_features() const {
@@ -1983,7 +1984,6 @@
}
inline void CodeGeneratorResponse::_internal_set_supported_features(::uint64_t value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000002u;
_impl_.supported_features_ = value;
}
diff --git a/src/google/protobuf/cpp_features.pb.cc b/src/google/protobuf/cpp_features.pb.cc
index 6e77d54..3e96ced 100644
--- a/src/google/protobuf/cpp_features.pb.cc
+++ b/src/google/protobuf/cpp_features.pb.cc
@@ -124,9 +124,6 @@
using HasBits = decltype(std::declval<CppFeatures>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(CppFeatures, _impl_._has_bits_);
- static void set_has_legacy_closed_enum(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
};
CppFeatures::CppFeatures(::google::protobuf::Arena* arena)
@@ -271,9 +268,11 @@
::uint32_t cached_has_bits = 0;
(void) cached_has_bits;
- if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
+ cached_has_bits = from._impl_._has_bits_[0];
+ if (cached_has_bits & 0x00000001u) {
_this->_internal_set_legacy_closed_enum(from._internal_legacy_closed_enum());
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
diff --git a/src/google/protobuf/cpp_features.pb.h b/src/google/protobuf/cpp_features.pb.h
index 46c7342..bf0c77f 100644
--- a/src/google/protobuf/cpp_features.pb.h
+++ b/src/google/protobuf/cpp_features.pb.h
@@ -275,6 +275,7 @@
}
inline void CppFeatures::set_legacy_closed_enum(bool value) {
_internal_set_legacy_closed_enum(value);
+ _impl_._has_bits_[0] |= 0x00000001u;
// @@protoc_insertion_point(field_set:pb.CppFeatures.legacy_closed_enum)
}
inline bool CppFeatures::_internal_legacy_closed_enum() const {
@@ -283,7 +284,6 @@
}
inline void CppFeatures::_internal_set_legacy_closed_enum(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000001u;
_impl_.legacy_closed_enum_ = value;
}
diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc
index 9fcfdea..5f34ccf 100644
--- a/src/google/protobuf/descriptor.pb.cc
+++ b/src/google/protobuf/descriptor.pb.cc
@@ -2544,34 +2544,8 @@
using HasBits = decltype(std::declval<FileDescriptorProto>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(FileDescriptorProto, _impl_._has_bits_);
- static void set_has_name(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
- static void set_has_package(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
- static const ::google::protobuf::FileOptions& options(const FileDescriptorProto* msg);
- static void set_has_options(HasBits* has_bits) {
- (*has_bits)[0] |= 8u;
- }
- static const ::google::protobuf::SourceCodeInfo& source_code_info(const FileDescriptorProto* msg);
- static void set_has_source_code_info(HasBits* has_bits) {
- (*has_bits)[0] |= 16u;
- }
- static void set_has_syntax(HasBits* has_bits) {
- (*has_bits)[0] |= 4u;
- }
- static void set_has_edition(HasBits* has_bits) {
- (*has_bits)[0] |= 32u;
- }
};
-const ::google::protobuf::FileOptions& FileDescriptorProto::_Internal::options(const FileDescriptorProto* msg) {
- return *msg->_impl_.options_;
-}
-const ::google::protobuf::SourceCodeInfo& FileDescriptorProto::_Internal::source_code_info(const FileDescriptorProto* msg) {
- return *msg->_impl_.source_code_info_;
-}
FileDescriptorProto::FileDescriptorProto(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(arena) {
SharedCtor(arena);
@@ -2895,15 +2869,13 @@
// optional .google.protobuf.FileOptions options = 8;
if (cached_has_bits & 0x00000008u) {
target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
- 8, _Internal::options(this),
- _Internal::options(this).GetCachedSize(), target, stream);
+ 8, *_impl_.options_, _impl_.options_->GetCachedSize(), target, stream);
}
// optional .google.protobuf.SourceCodeInfo source_code_info = 9;
if (cached_has_bits & 0x00000010u) {
target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
- 9, _Internal::source_code_info(this),
- _Internal::source_code_info(this).GetCachedSize(), target, stream);
+ 9, *_impl_.source_code_info_, _impl_.source_code_info_->GetCachedSize(), target, stream);
}
// repeated int32 public_dependency = 10;
@@ -3084,7 +3056,6 @@
} else {
_this->_impl_.options_->MergeFrom(*from._impl_.options_);
}
- _this->_impl_._has_bits_[0] |= 0x00000008u;
}
if (cached_has_bits & 0x00000010u) {
ABSL_DCHECK(from._impl_.source_code_info_ != nullptr);
@@ -3094,13 +3065,12 @@
} else {
_this->_impl_.source_code_info_->MergeFrom(*from._impl_.source_code_info_);
}
- _this->_impl_._has_bits_[0] |= 0x00000010u;
}
if (cached_has_bits & 0x00000020u) {
_this->_impl_.edition_ = from._impl_.edition_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -3162,21 +3132,8 @@
using HasBits = decltype(std::declval<DescriptorProto_ExtensionRange>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(DescriptorProto_ExtensionRange, _impl_._has_bits_);
- static void set_has_start(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
- static void set_has_end(HasBits* has_bits) {
- (*has_bits)[0] |= 4u;
- }
- static const ::google::protobuf::ExtensionRangeOptions& options(const DescriptorProto_ExtensionRange* msg);
- static void set_has_options(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
};
-const ::google::protobuf::ExtensionRangeOptions& DescriptorProto_ExtensionRange::_Internal::options(const DescriptorProto_ExtensionRange* msg) {
- return *msg->_impl_.options_;
-}
DescriptorProto_ExtensionRange::DescriptorProto_ExtensionRange(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(arena) {
SharedCtor(arena);
@@ -3345,8 +3302,7 @@
// optional .google.protobuf.ExtensionRangeOptions options = 3;
if (cached_has_bits & 0x00000001u) {
target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
- 3, _Internal::options(this),
- _Internal::options(this).GetCachedSize(), target, stream);
+ 3, *_impl_.options_, _impl_.options_->GetCachedSize(), target, stream);
}
if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
@@ -3410,7 +3366,6 @@
} else {
_this->_impl_.options_->MergeFrom(*from._impl_.options_);
}
- _this->_impl_._has_bits_[0] |= 0x00000001u;
}
if (cached_has_bits & 0x00000002u) {
_this->_impl_.start_ = from._impl_.start_;
@@ -3418,8 +3373,8 @@
if (cached_has_bits & 0x00000004u) {
_this->_impl_.end_ = from._impl_.end_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -3461,12 +3416,6 @@
using HasBits = decltype(std::declval<DescriptorProto_ReservedRange>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(DescriptorProto_ReservedRange, _impl_._has_bits_);
- static void set_has_start(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
- static void set_has_end(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
};
DescriptorProto_ReservedRange::DescriptorProto_ReservedRange(::google::protobuf::Arena* arena)
@@ -3650,8 +3599,8 @@
if (cached_has_bits & 0x00000002u) {
_this->_impl_.end_ = from._impl_.end_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -3690,18 +3639,8 @@
using HasBits = decltype(std::declval<DescriptorProto>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(DescriptorProto, _impl_._has_bits_);
- static void set_has_name(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
- static const ::google::protobuf::MessageOptions& options(const DescriptorProto* msg);
- static void set_has_options(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
};
-const ::google::protobuf::MessageOptions& DescriptorProto::_Internal::options(const DescriptorProto* msg) {
- return *msg->_impl_.options_;
-}
DescriptorProto::DescriptorProto(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(arena) {
SharedCtor(arena);
@@ -3977,8 +3916,7 @@
// optional .google.protobuf.MessageOptions options = 7;
if (cached_has_bits & 0x00000002u) {
target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
- 7, _Internal::options(this),
- _Internal::options(this).GetCachedSize(), target, stream);
+ 7, *_impl_.options_, _impl_.options_->GetCachedSize(), target, stream);
}
// repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8;
@@ -4126,9 +4064,9 @@
} else {
_this->_impl_.options_->MergeFrom(*from._impl_.options_);
}
- _this->_impl_._has_bits_[0] |= 0x00000002u;
}
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -4188,21 +4126,6 @@
using HasBits = decltype(std::declval<ExtensionRangeOptions_Declaration>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(ExtensionRangeOptions_Declaration, _impl_._has_bits_);
- static void set_has_number(HasBits* has_bits) {
- (*has_bits)[0] |= 4u;
- }
- static void set_has_full_name(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
- static void set_has_type(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
- static void set_has_reserved(HasBits* has_bits) {
- (*has_bits)[0] |= 8u;
- }
- static void set_has_repeated(HasBits* has_bits) {
- (*has_bits)[0] |= 16u;
- }
};
ExtensionRangeOptions_Declaration::ExtensionRangeOptions_Declaration(::google::protobuf::Arena* arena)
@@ -4493,8 +4416,8 @@
if (cached_has_bits & 0x00000010u) {
_this->_impl_.repeated_ = from._impl_.repeated_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -4537,18 +4460,8 @@
using HasBits = decltype(std::declval<ExtensionRangeOptions>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(ExtensionRangeOptions, _impl_._has_bits_);
- static const ::google::protobuf::FeatureSet& features(const ExtensionRangeOptions* msg);
- static void set_has_features(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
- static void set_has_verification(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
};
-const ::google::protobuf::FeatureSet& ExtensionRangeOptions::_Internal::features(const ExtensionRangeOptions* msg) {
- return *msg->_impl_.features_;
-}
ExtensionRangeOptions::ExtensionRangeOptions(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(arena) {
SharedCtor(arena);
@@ -4729,8 +4642,7 @@
// optional .google.protobuf.FeatureSet features = 50;
if (cached_has_bits & 0x00000001u) {
target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
- 50, _Internal::features(this),
- _Internal::features(this).GetCachedSize(), target, stream);
+ 50, *_impl_.features_, _impl_.features_->GetCachedSize(), target, stream);
}
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
@@ -4817,13 +4729,12 @@
} else {
_this->_impl_.features_->MergeFrom(*from._impl_.features_);
}
- _this->_impl_._has_bits_[0] |= 0x00000001u;
}
if (cached_has_bits & 0x00000002u) {
_this->_impl_.verification_ = from._impl_.verification_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -4874,45 +4785,8 @@
using HasBits = decltype(std::declval<FieldDescriptorProto>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_._has_bits_);
- static void set_has_name(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
- static void set_has_number(HasBits* has_bits) {
- (*has_bits)[0] |= 64u;
- }
- static void set_has_label(HasBits* has_bits) {
- (*has_bits)[0] |= 512u;
- }
- static void set_has_type(HasBits* has_bits) {
- (*has_bits)[0] |= 1024u;
- }
- static void set_has_type_name(HasBits* has_bits) {
- (*has_bits)[0] |= 4u;
- }
- static void set_has_extendee(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
- static void set_has_default_value(HasBits* has_bits) {
- (*has_bits)[0] |= 8u;
- }
- static void set_has_oneof_index(HasBits* has_bits) {
- (*has_bits)[0] |= 128u;
- }
- static void set_has_json_name(HasBits* has_bits) {
- (*has_bits)[0] |= 16u;
- }
- static const ::google::protobuf::FieldOptions& options(const FieldDescriptorProto* msg);
- static void set_has_options(HasBits* has_bits) {
- (*has_bits)[0] |= 32u;
- }
- static void set_has_proto3_optional(HasBits* has_bits) {
- (*has_bits)[0] |= 256u;
- }
};
-const ::google::protobuf::FieldOptions& FieldDescriptorProto::_Internal::options(const FieldDescriptorProto* msg) {
- return *msg->_impl_.options_;
-}
FieldDescriptorProto::FieldDescriptorProto(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(arena) {
SharedCtor(arena);
@@ -5218,8 +5092,7 @@
// optional .google.protobuf.FieldOptions options = 8;
if (cached_has_bits & 0x00000020u) {
target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
- 8, _Internal::options(this),
- _Internal::options(this).GetCachedSize(), target, stream);
+ 8, *_impl_.options_, _impl_.options_->GetCachedSize(), target, stream);
}
// optional int32 oneof_index = 9;
@@ -5369,7 +5242,6 @@
} else {
_this->_impl_.options_->MergeFrom(*from._impl_.options_);
}
- _this->_impl_._has_bits_[0] |= 0x00000020u;
}
if (cached_has_bits & 0x00000040u) {
_this->_impl_.number_ = from._impl_.number_;
@@ -5377,7 +5249,6 @@
if (cached_has_bits & 0x00000080u) {
_this->_impl_.oneof_index_ = from._impl_.oneof_index_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
if (cached_has_bits & 0x00000700u) {
if (cached_has_bits & 0x00000100u) {
@@ -5389,8 +5260,8 @@
if (cached_has_bits & 0x00000400u) {
_this->_impl_.type_ = from._impl_.type_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -5439,18 +5310,8 @@
using HasBits = decltype(std::declval<OneofDescriptorProto>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(OneofDescriptorProto, _impl_._has_bits_);
- static void set_has_name(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
- static const ::google::protobuf::OneofOptions& options(const OneofDescriptorProto* msg);
- static void set_has_options(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
};
-const ::google::protobuf::OneofOptions& OneofDescriptorProto::_Internal::options(const OneofDescriptorProto* msg) {
- return *msg->_impl_.options_;
-}
OneofDescriptorProto::OneofDescriptorProto(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(arena) {
SharedCtor(arena);
@@ -5600,8 +5461,7 @@
// optional .google.protobuf.OneofOptions options = 2;
if (cached_has_bits & 0x00000002u) {
target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
- 2, _Internal::options(this),
- _Internal::options(this).GetCachedSize(), target, stream);
+ 2, *_impl_.options_, _impl_.options_->GetCachedSize(), target, stream);
}
if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
@@ -5662,9 +5522,9 @@
} else {
_this->_impl_.options_->MergeFrom(*from._impl_.options_);
}
- _this->_impl_._has_bits_[0] |= 0x00000002u;
}
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -5704,12 +5564,6 @@
using HasBits = decltype(std::declval<EnumDescriptorProto_EnumReservedRange>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(EnumDescriptorProto_EnumReservedRange, _impl_._has_bits_);
- static void set_has_start(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
- static void set_has_end(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
};
EnumDescriptorProto_EnumReservedRange::EnumDescriptorProto_EnumReservedRange(::google::protobuf::Arena* arena)
@@ -5893,8 +5747,8 @@
if (cached_has_bits & 0x00000002u) {
_this->_impl_.end_ = from._impl_.end_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -5933,18 +5787,8 @@
using HasBits = decltype(std::declval<EnumDescriptorProto>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(EnumDescriptorProto, _impl_._has_bits_);
- static void set_has_name(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
- static const ::google::protobuf::EnumOptions& options(const EnumDescriptorProto* msg);
- static void set_has_options(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
};
-const ::google::protobuf::EnumOptions& EnumDescriptorProto::_Internal::options(const EnumDescriptorProto* msg) {
- return *msg->_impl_.options_;
-}
EnumDescriptorProto::EnumDescriptorProto(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(arena) {
SharedCtor(arena);
@@ -6135,8 +5979,7 @@
// optional .google.protobuf.EnumOptions options = 3;
if (cached_has_bits & 0x00000002u) {
target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
- 3, _Internal::options(this),
- _Internal::options(this).GetCachedSize(), target, stream);
+ 3, *_impl_.options_, _impl_.options_->GetCachedSize(), target, stream);
}
// repeated .google.protobuf.EnumDescriptorProto.EnumReservedRange reserved_range = 4;
@@ -6236,9 +6079,9 @@
} else {
_this->_impl_.options_->MergeFrom(*from._impl_.options_);
}
- _this->_impl_._has_bits_[0] |= 0x00000002u;
}
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -6283,21 +6126,8 @@
using HasBits = decltype(std::declval<EnumValueDescriptorProto>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(EnumValueDescriptorProto, _impl_._has_bits_);
- static void set_has_name(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
- static void set_has_number(HasBits* has_bits) {
- (*has_bits)[0] |= 4u;
- }
- static const ::google::protobuf::EnumValueOptions& options(const EnumValueDescriptorProto* msg);
- static void set_has_options(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
};
-const ::google::protobuf::EnumValueOptions& EnumValueDescriptorProto::_Internal::options(const EnumValueDescriptorProto* msg) {
- return *msg->_impl_.options_;
-}
EnumValueDescriptorProto::EnumValueDescriptorProto(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(arena) {
SharedCtor(arena);
@@ -6468,8 +6298,7 @@
// optional .google.protobuf.EnumValueOptions options = 3;
if (cached_has_bits & 0x00000002u) {
target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
- 3, _Internal::options(this),
- _Internal::options(this).GetCachedSize(), target, stream);
+ 3, *_impl_.options_, _impl_.options_->GetCachedSize(), target, stream);
}
if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
@@ -6536,13 +6365,12 @@
} else {
_this->_impl_.options_->MergeFrom(*from._impl_.options_);
}
- _this->_impl_._has_bits_[0] |= 0x00000002u;
}
if (cached_has_bits & 0x00000004u) {
_this->_impl_.number_ = from._impl_.number_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -6587,18 +6415,8 @@
using HasBits = decltype(std::declval<ServiceDescriptorProto>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(ServiceDescriptorProto, _impl_._has_bits_);
- static void set_has_name(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
- static const ::google::protobuf::ServiceOptions& options(const ServiceDescriptorProto* msg);
- static void set_has_options(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
};
-const ::google::protobuf::ServiceOptions& ServiceDescriptorProto::_Internal::options(const ServiceDescriptorProto* msg) {
- return *msg->_impl_.options_;
-}
ServiceDescriptorProto::ServiceDescriptorProto(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(arena) {
SharedCtor(arena);
@@ -6767,8 +6585,7 @@
// optional .google.protobuf.ServiceOptions options = 3;
if (cached_has_bits & 0x00000002u) {
target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
- 3, _Internal::options(this),
- _Internal::options(this).GetCachedSize(), target, stream);
+ 3, *_impl_.options_, _impl_.options_->GetCachedSize(), target, stream);
}
if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
@@ -6837,9 +6654,9 @@
} else {
_this->_impl_.options_->MergeFrom(*from._impl_.options_);
}
- _this->_impl_._has_bits_[0] |= 0x00000002u;
}
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -6882,30 +6699,8 @@
using HasBits = decltype(std::declval<MethodDescriptorProto>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(MethodDescriptorProto, _impl_._has_bits_);
- static void set_has_name(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
- static void set_has_input_type(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
- static void set_has_output_type(HasBits* has_bits) {
- (*has_bits)[0] |= 4u;
- }
- static const ::google::protobuf::MethodOptions& options(const MethodDescriptorProto* msg);
- static void set_has_options(HasBits* has_bits) {
- (*has_bits)[0] |= 8u;
- }
- static void set_has_client_streaming(HasBits* has_bits) {
- (*has_bits)[0] |= 16u;
- }
- static void set_has_server_streaming(HasBits* has_bits) {
- (*has_bits)[0] |= 32u;
- }
};
-const ::google::protobuf::MethodOptions& MethodDescriptorProto::_Internal::options(const MethodDescriptorProto* msg) {
- return *msg->_impl_.options_;
-}
MethodDescriptorProto::MethodDescriptorProto(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(arena) {
SharedCtor(arena);
@@ -7126,8 +6921,7 @@
// optional .google.protobuf.MethodOptions options = 4;
if (cached_has_bits & 0x00000008u) {
target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
- 4, _Internal::options(this),
- _Internal::options(this).GetCachedSize(), target, stream);
+ 4, *_impl_.options_, _impl_.options_->GetCachedSize(), target, stream);
}
// optional bool client_streaming = 5 [default = false];
@@ -7230,7 +7024,6 @@
} else {
_this->_impl_.options_->MergeFrom(*from._impl_.options_);
}
- _this->_impl_._has_bits_[0] |= 0x00000008u;
}
if (cached_has_bits & 0x00000010u) {
_this->_impl_.client_streaming_ = from._impl_.client_streaming_;
@@ -7238,8 +7031,8 @@
if (cached_has_bits & 0x00000020u) {
_this->_impl_.server_streaming_ = from._impl_.server_streaming_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -7286,75 +7079,8 @@
using HasBits = decltype(std::declval<FileOptions>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(FileOptions, _impl_._has_bits_);
- static void set_has_java_package(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
- static void set_has_java_outer_classname(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
- static void set_has_java_multiple_files(HasBits* has_bits) {
- (*has_bits)[0] |= 2048u;
- }
- static void set_has_java_generate_equals_and_hash(HasBits* has_bits) {
- (*has_bits)[0] |= 4096u;
- }
- static void set_has_java_string_check_utf8(HasBits* has_bits) {
- (*has_bits)[0] |= 8192u;
- }
- static void set_has_optimize_for(HasBits* has_bits) {
- (*has_bits)[0] |= 524288u;
- }
- static void set_has_go_package(HasBits* has_bits) {
- (*has_bits)[0] |= 4u;
- }
- static void set_has_cc_generic_services(HasBits* has_bits) {
- (*has_bits)[0] |= 16384u;
- }
- static void set_has_java_generic_services(HasBits* has_bits) {
- (*has_bits)[0] |= 32768u;
- }
- static void set_has_py_generic_services(HasBits* has_bits) {
- (*has_bits)[0] |= 65536u;
- }
- static void set_has_php_generic_services(HasBits* has_bits) {
- (*has_bits)[0] |= 131072u;
- }
- static void set_has_deprecated(HasBits* has_bits) {
- (*has_bits)[0] |= 262144u;
- }
- static void set_has_cc_enable_arenas(HasBits* has_bits) {
- (*has_bits)[0] |= 1048576u;
- }
- static void set_has_objc_class_prefix(HasBits* has_bits) {
- (*has_bits)[0] |= 8u;
- }
- static void set_has_csharp_namespace(HasBits* has_bits) {
- (*has_bits)[0] |= 16u;
- }
- static void set_has_swift_prefix(HasBits* has_bits) {
- (*has_bits)[0] |= 32u;
- }
- static void set_has_php_class_prefix(HasBits* has_bits) {
- (*has_bits)[0] |= 64u;
- }
- static void set_has_php_namespace(HasBits* has_bits) {
- (*has_bits)[0] |= 128u;
- }
- static void set_has_php_metadata_namespace(HasBits* has_bits) {
- (*has_bits)[0] |= 256u;
- }
- static void set_has_ruby_package(HasBits* has_bits) {
- (*has_bits)[0] |= 512u;
- }
- static const ::google::protobuf::FeatureSet& features(const FileOptions* msg);
- static void set_has_features(HasBits* has_bits) {
- (*has_bits)[0] |= 1024u;
- }
};
-const ::google::protobuf::FeatureSet& FileOptions::_Internal::features(const FileOptions* msg) {
- return *msg->_impl_.features_;
-}
FileOptions::FileOptions(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(arena) {
SharedCtor(arena);
@@ -7871,8 +7597,7 @@
// optional .google.protobuf.FeatureSet features = 50;
if (cached_has_bits & 0x00000400u) {
target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
- 50, _Internal::features(this),
- _Internal::features(this).GetCachedSize(), target, stream);
+ 50, *_impl_.features_, _impl_.features_->GetCachedSize(), target, stream);
}
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
@@ -8092,7 +7817,6 @@
} else {
_this->_impl_.features_->MergeFrom(*from._impl_.features_);
}
- _this->_impl_._has_bits_[0] |= 0x00000400u;
}
if (cached_has_bits & 0x00000800u) {
_this->_impl_.java_multiple_files_ = from._impl_.java_multiple_files_;
@@ -8109,7 +7833,6 @@
if (cached_has_bits & 0x00008000u) {
_this->_impl_.java_generic_services_ = from._impl_.java_generic_services_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
if (cached_has_bits & 0x001f0000u) {
if (cached_has_bits & 0x00010000u) {
@@ -8127,8 +7850,8 @@
if (cached_has_bits & 0x00100000u) {
_this->_impl_.cc_enable_arenas_ = from._impl_.cc_enable_arenas_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -8190,30 +7913,8 @@
using HasBits = decltype(std::declval<MessageOptions>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(MessageOptions, _impl_._has_bits_);
- static void set_has_message_set_wire_format(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
- static void set_has_no_standard_descriptor_accessor(HasBits* has_bits) {
- (*has_bits)[0] |= 4u;
- }
- static void set_has_deprecated(HasBits* has_bits) {
- (*has_bits)[0] |= 8u;
- }
- static void set_has_map_entry(HasBits* has_bits) {
- (*has_bits)[0] |= 16u;
- }
- static void set_has_deprecated_legacy_json_field_conflicts(HasBits* has_bits) {
- (*has_bits)[0] |= 32u;
- }
- static const ::google::protobuf::FeatureSet& features(const MessageOptions* msg);
- static void set_has_features(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
};
-const ::google::protobuf::FeatureSet& MessageOptions::_Internal::features(const MessageOptions* msg) {
- return *msg->_impl_.features_;
-}
MessageOptions::MessageOptions(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(arena) {
SharedCtor(arena);
@@ -8433,8 +8134,7 @@
// optional .google.protobuf.FeatureSet features = 12;
if (cached_has_bits & 0x00000001u) {
target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
- 12, _Internal::features(this),
- _Internal::features(this).GetCachedSize(), target, stream);
+ 12, *_impl_.features_, _impl_.features_->GetCachedSize(), target, stream);
}
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
@@ -8532,7 +8232,6 @@
} else {
_this->_impl_.features_->MergeFrom(*from._impl_.features_);
}
- _this->_impl_._has_bits_[0] |= 0x00000001u;
}
if (cached_has_bits & 0x00000002u) {
_this->_impl_.message_set_wire_format_ = from._impl_.message_set_wire_format_;
@@ -8549,8 +8248,8 @@
if (cached_has_bits & 0x00000020u) {
_this->_impl_.deprecated_legacy_json_field_conflicts_ = from._impl_.deprecated_legacy_json_field_conflicts_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -8600,12 +8299,6 @@
using HasBits = decltype(std::declval<FieldOptions_EditionDefault>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(FieldOptions_EditionDefault, _impl_._has_bits_);
- static void set_has_edition(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
- static void set_has_value(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
};
FieldOptions_EditionDefault::FieldOptions_EditionDefault(::google::protobuf::Arena* arena)
@@ -8804,8 +8497,8 @@
if (cached_has_bits & 0x00000002u) {
_this->_impl_.edition_ = from._impl_.edition_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -8842,42 +8535,8 @@
using HasBits = decltype(std::declval<FieldOptions>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_._has_bits_);
- static void set_has_ctype(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
- static void set_has_packed(HasBits* has_bits) {
- (*has_bits)[0] |= 8u;
- }
- static void set_has_jstype(HasBits* has_bits) {
- (*has_bits)[0] |= 4u;
- }
- static void set_has_lazy(HasBits* has_bits) {
- (*has_bits)[0] |= 16u;
- }
- static void set_has_unverified_lazy(HasBits* has_bits) {
- (*has_bits)[0] |= 32u;
- }
- static void set_has_deprecated(HasBits* has_bits) {
- (*has_bits)[0] |= 64u;
- }
- static void set_has_weak(HasBits* has_bits) {
- (*has_bits)[0] |= 128u;
- }
- static void set_has_debug_redact(HasBits* has_bits) {
- (*has_bits)[0] |= 256u;
- }
- static void set_has_retention(HasBits* has_bits) {
- (*has_bits)[0] |= 512u;
- }
- static const ::google::protobuf::FeatureSet& features(const FieldOptions* msg);
- static void set_has_features(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
};
-const ::google::protobuf::FeatureSet& FieldOptions::_Internal::features(const FieldOptions* msg) {
- return *msg->_impl_.features_;
-}
FieldOptions::FieldOptions(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(arena) {
SharedCtor(arena);
@@ -9193,8 +8852,7 @@
// optional .google.protobuf.FeatureSet features = 21;
if (cached_has_bits & 0x00000001u) {
target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
- 21, _Internal::features(this),
- _Internal::features(this).GetCachedSize(), target, stream);
+ 21, *_impl_.features_, _impl_.features_->GetCachedSize(), target, stream);
}
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
@@ -9338,7 +8996,6 @@
} else {
_this->_impl_.features_->MergeFrom(*from._impl_.features_);
}
- _this->_impl_._has_bits_[0] |= 0x00000001u;
}
if (cached_has_bits & 0x00000002u) {
_this->_impl_.ctype_ = from._impl_.ctype_;
@@ -9361,7 +9018,6 @@
if (cached_has_bits & 0x00000080u) {
_this->_impl_.weak_ = from._impl_.weak_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
if (cached_has_bits & 0x00000300u) {
if (cached_has_bits & 0x00000100u) {
@@ -9370,8 +9026,8 @@
if (cached_has_bits & 0x00000200u) {
_this->_impl_.retention_ = from._impl_.retention_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -9423,15 +9079,8 @@
using HasBits = decltype(std::declval<OneofOptions>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(OneofOptions, _impl_._has_bits_);
- static const ::google::protobuf::FeatureSet& features(const OneofOptions* msg);
- static void set_has_features(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
};
-const ::google::protobuf::FeatureSet& OneofOptions::_Internal::features(const OneofOptions* msg) {
- return *msg->_impl_.features_;
-}
OneofOptions::OneofOptions(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(arena) {
SharedCtor(arena);
@@ -9574,8 +9223,7 @@
// optional .google.protobuf.FeatureSet features = 1;
if (cached_has_bits & 0x00000001u) {
target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
- 1, _Internal::features(this),
- _Internal::features(this).GetCachedSize(), target, stream);
+ 1, *_impl_.features_, _impl_.features_->GetCachedSize(), target, stream);
}
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
@@ -9636,7 +9284,8 @@
_this->_internal_mutable_uninterpreted_option()->MergeFrom(
from._internal_uninterpreted_option());
- if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
+ cached_has_bits = from._impl_._has_bits_[0];
+ if (cached_has_bits & 0x00000001u) {
ABSL_DCHECK(from._impl_.features_ != nullptr);
if (_this->_impl_.features_ == nullptr) {
_this->_impl_.features_ =
@@ -9644,8 +9293,8 @@
} else {
_this->_impl_.features_->MergeFrom(*from._impl_.features_);
}
- _this->_impl_._has_bits_[0] |= 0x00000001u;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -9690,24 +9339,8 @@
using HasBits = decltype(std::declval<EnumOptions>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(EnumOptions, _impl_._has_bits_);
- static void set_has_allow_alias(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
- static void set_has_deprecated(HasBits* has_bits) {
- (*has_bits)[0] |= 4u;
- }
- static void set_has_deprecated_legacy_json_field_conflicts(HasBits* has_bits) {
- (*has_bits)[0] |= 8u;
- }
- static const ::google::protobuf::FeatureSet& features(const EnumOptions* msg);
- static void set_has_features(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
};
-const ::google::protobuf::FeatureSet& EnumOptions::_Internal::features(const EnumOptions* msg) {
- return *msg->_impl_.features_;
-}
EnumOptions::EnumOptions(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(arena) {
SharedCtor(arena);
@@ -9903,8 +9536,7 @@
// optional .google.protobuf.FeatureSet features = 7;
if (cached_has_bits & 0x00000001u) {
target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
- 7, _Internal::features(this),
- _Internal::features(this).GetCachedSize(), target, stream);
+ 7, *_impl_.features_, _impl_.features_->GetCachedSize(), target, stream);
}
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
@@ -9992,7 +9624,6 @@
} else {
_this->_impl_.features_->MergeFrom(*from._impl_.features_);
}
- _this->_impl_._has_bits_[0] |= 0x00000001u;
}
if (cached_has_bits & 0x00000002u) {
_this->_impl_.allow_alias_ = from._impl_.allow_alias_;
@@ -10003,8 +9634,8 @@
if (cached_has_bits & 0x00000008u) {
_this->_impl_.deprecated_legacy_json_field_conflicts_ = from._impl_.deprecated_legacy_json_field_conflicts_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -10054,21 +9685,8 @@
using HasBits = decltype(std::declval<EnumValueOptions>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(EnumValueOptions, _impl_._has_bits_);
- static void set_has_deprecated(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
- static const ::google::protobuf::FeatureSet& features(const EnumValueOptions* msg);
- static void set_has_features(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
- static void set_has_debug_redact(HasBits* has_bits) {
- (*has_bits)[0] |= 4u;
- }
};
-const ::google::protobuf::FeatureSet& EnumValueOptions::_Internal::features(const EnumValueOptions* msg) {
- return *msg->_impl_.features_;
-}
EnumValueOptions::EnumValueOptions(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(arena) {
SharedCtor(arena);
@@ -10247,8 +9865,7 @@
// optional .google.protobuf.FeatureSet features = 2;
if (cached_has_bits & 0x00000001u) {
target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
- 2, _Internal::features(this),
- _Internal::features(this).GetCachedSize(), target, stream);
+ 2, *_impl_.features_, _impl_.features_->GetCachedSize(), target, stream);
}
// optional bool debug_redact = 3 [default = false];
@@ -10338,7 +9955,6 @@
} else {
_this->_impl_.features_->MergeFrom(*from._impl_.features_);
}
- _this->_impl_._has_bits_[0] |= 0x00000001u;
}
if (cached_has_bits & 0x00000002u) {
_this->_impl_.deprecated_ = from._impl_.deprecated_;
@@ -10346,8 +9962,8 @@
if (cached_has_bits & 0x00000004u) {
_this->_impl_.debug_redact_ = from._impl_.debug_redact_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -10397,18 +10013,8 @@
using HasBits = decltype(std::declval<ServiceOptions>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(ServiceOptions, _impl_._has_bits_);
- static const ::google::protobuf::FeatureSet& features(const ServiceOptions* msg);
- static void set_has_features(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
- static void set_has_deprecated(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
};
-const ::google::protobuf::FeatureSet& ServiceOptions::_Internal::features(const ServiceOptions* msg) {
- return *msg->_impl_.features_;
-}
ServiceOptions::ServiceOptions(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(arena) {
SharedCtor(arena);
@@ -10571,8 +10177,7 @@
// optional .google.protobuf.FeatureSet features = 34;
if (cached_has_bits & 0x00000001u) {
target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
- 34, _Internal::features(this),
- _Internal::features(this).GetCachedSize(), target, stream);
+ 34, *_impl_.features_, _impl_.features_->GetCachedSize(), target, stream);
}
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
@@ -10650,13 +10255,12 @@
} else {
_this->_impl_.features_->MergeFrom(*from._impl_.features_);
}
- _this->_impl_._has_bits_[0] |= 0x00000001u;
}
if (cached_has_bits & 0x00000002u) {
_this->_impl_.deprecated_ = from._impl_.deprecated_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -10706,21 +10310,8 @@
using HasBits = decltype(std::declval<MethodOptions>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(MethodOptions, _impl_._has_bits_);
- static void set_has_deprecated(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
- static void set_has_idempotency_level(HasBits* has_bits) {
- (*has_bits)[0] |= 4u;
- }
- static const ::google::protobuf::FeatureSet& features(const MethodOptions* msg);
- static void set_has_features(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
};
-const ::google::protobuf::FeatureSet& MethodOptions::_Internal::features(const MethodOptions* msg) {
- return *msg->_impl_.features_;
-}
MethodOptions::MethodOptions(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(arena) {
SharedCtor(arena);
@@ -10910,8 +10501,7 @@
// optional .google.protobuf.FeatureSet features = 35;
if (cached_has_bits & 0x00000001u) {
target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
- 35, _Internal::features(this),
- _Internal::features(this).GetCachedSize(), target, stream);
+ 35, *_impl_.features_, _impl_.features_->GetCachedSize(), target, stream);
}
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
@@ -10995,7 +10585,6 @@
} else {
_this->_impl_.features_->MergeFrom(*from._impl_.features_);
}
- _this->_impl_._has_bits_[0] |= 0x00000001u;
}
if (cached_has_bits & 0x00000002u) {
_this->_impl_.deprecated_ = from._impl_.deprecated_;
@@ -11003,8 +10592,8 @@
if (cached_has_bits & 0x00000004u) {
_this->_impl_.idempotency_level_ = from._impl_.idempotency_level_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -11054,12 +10643,6 @@
using HasBits = decltype(std::declval<UninterpretedOption_NamePart>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(UninterpretedOption_NamePart, _impl_._has_bits_);
- static void set_has_name_part(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
- static void set_has_is_extension(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
static bool MissingRequiredFields(const HasBits& has_bits) {
return ((has_bits[0] & 0x00000003) ^ 0x00000003) != 0;
}
@@ -11260,8 +10843,8 @@
if (cached_has_bits & 0x00000002u) {
_this->_impl_.is_extension_ = from._impl_.is_extension_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -11301,24 +10884,6 @@
using HasBits = decltype(std::declval<UninterpretedOption>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(UninterpretedOption, _impl_._has_bits_);
- static void set_has_identifier_value(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
- static void set_has_positive_int_value(HasBits* has_bits) {
- (*has_bits)[0] |= 8u;
- }
- static void set_has_negative_int_value(HasBits* has_bits) {
- (*has_bits)[0] |= 16u;
- }
- static void set_has_double_value(HasBits* has_bits) {
- (*has_bits)[0] |= 32u;
- }
- static void set_has_string_value(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
- static void set_has_aggregate_value(HasBits* has_bits) {
- (*has_bits)[0] |= 4u;
- }
};
UninterpretedOption::UninterpretedOption(::google::protobuf::Arena* arena)
@@ -11660,8 +11225,8 @@
if (cached_has_bits & 0x00000020u) {
_this->_impl_.double_value_ = from._impl_.double_value_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -11708,24 +11273,6 @@
using HasBits = decltype(std::declval<FeatureSet>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(FeatureSet, _impl_._has_bits_);
- static void set_has_field_presence(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
- static void set_has_enum_type(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
- static void set_has_repeated_field_encoding(HasBits* has_bits) {
- (*has_bits)[0] |= 4u;
- }
- static void set_has_utf8_validation(HasBits* has_bits) {
- (*has_bits)[0] |= 8u;
- }
- static void set_has_message_encoding(HasBits* has_bits) {
- (*has_bits)[0] |= 16u;
- }
- static void set_has_json_format(HasBits* has_bits) {
- (*has_bits)[0] |= 32u;
- }
};
FeatureSet::FeatureSet(::google::protobuf::Arena* arena)
@@ -12033,8 +11580,8 @@
if (cached_has_bits & 0x00000020u) {
_this->_impl_.json_format_ = from._impl_.json_format_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -12078,18 +11625,8 @@
using HasBits = decltype(std::declval<FeatureSetDefaults_FeatureSetEditionDefault>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(FeatureSetDefaults_FeatureSetEditionDefault, _impl_._has_bits_);
- static void set_has_edition(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
- static const ::google::protobuf::FeatureSet& features(const FeatureSetDefaults_FeatureSetEditionDefault* msg);
- static void set_has_features(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
};
-const ::google::protobuf::FeatureSet& FeatureSetDefaults_FeatureSetEditionDefault::_Internal::features(const FeatureSetDefaults_FeatureSetEditionDefault* msg) {
- return *msg->_impl_.features_;
-}
FeatureSetDefaults_FeatureSetEditionDefault::FeatureSetDefaults_FeatureSetEditionDefault(::google::protobuf::Arena* arena)
: ::google::protobuf::Message(arena) {
SharedCtor(arena);
@@ -12228,8 +11765,7 @@
// optional .google.protobuf.FeatureSet features = 2;
if (cached_has_bits & 0x00000001u) {
target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
- 2, _Internal::features(this),
- _Internal::features(this).GetCachedSize(), target, stream);
+ 2, *_impl_.features_, _impl_.features_->GetCachedSize(), target, stream);
}
// optional .google.protobuf.Edition edition = 3;
@@ -12294,13 +11830,12 @@
} else {
_this->_impl_.features_->MergeFrom(*from._impl_.features_);
}
- _this->_impl_._has_bits_[0] |= 0x00000001u;
}
if (cached_has_bits & 0x00000002u) {
_this->_impl_.edition_ = from._impl_.edition_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -12342,12 +11877,6 @@
using HasBits = decltype(std::declval<FeatureSetDefaults>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(FeatureSetDefaults, _impl_._has_bits_);
- static void set_has_minimum_edition(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
- static void set_has_maximum_edition(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
};
FeatureSetDefaults::FeatureSetDefaults(::google::protobuf::Arena* arena)
@@ -12575,8 +12104,8 @@
if (cached_has_bits & 0x00000002u) {
_this->_impl_.maximum_edition_ = from._impl_.maximum_edition_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -12618,12 +12147,6 @@
using HasBits = decltype(std::declval<SourceCodeInfo_Location>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(SourceCodeInfo_Location, _impl_._has_bits_);
- static void set_has_leading_comments(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
- static void set_has_trailing_comments(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
};
SourceCodeInfo_Location::SourceCodeInfo_Location(::google::protobuf::Arena* arena)
@@ -12926,6 +12449,7 @@
_this->_internal_set_trailing_comments(from._internal_trailing_comments());
}
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
@@ -13151,18 +12675,6 @@
using HasBits = decltype(std::declval<GeneratedCodeInfo_Annotation>()._impl_._has_bits_);
static constexpr ::int32_t kHasBitsOffset =
8 * PROTOBUF_FIELD_OFFSET(GeneratedCodeInfo_Annotation, _impl_._has_bits_);
- static void set_has_source_file(HasBits* has_bits) {
- (*has_bits)[0] |= 1u;
- }
- static void set_has_begin(HasBits* has_bits) {
- (*has_bits)[0] |= 2u;
- }
- static void set_has_end(HasBits* has_bits) {
- (*has_bits)[0] |= 4u;
- }
- static void set_has_semantic(HasBits* has_bits) {
- (*has_bits)[0] |= 8u;
- }
};
GeneratedCodeInfo_Annotation::GeneratedCodeInfo_Annotation(::google::protobuf::Arena* arena)
@@ -13457,8 +12969,8 @@
if (cached_has_bits & 0x00000008u) {
_this->_impl_.semantic_ = from._impl_.semantic_;
}
- _this->_impl_._has_bits_[0] |= cached_has_bits;
}
+ _this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
}
diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h
index 846ae3a..5df7856 100644
--- a/src/google/protobuf/descriptor.pb.h
+++ b/src/google/protobuf/descriptor.pb.h
@@ -11138,7 +11138,6 @@
}
inline ::google::protobuf::FileOptions* FileDescriptorProto::_internal_mutable_options() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000008u;
if (_impl_.options_ == nullptr) {
auto* p = ::google::protobuf::Message::DefaultConstruct<::google::protobuf::FileOptions>(GetArena());
_impl_.options_ = reinterpret_cast<::google::protobuf::FileOptions*>(p);
@@ -11146,6 +11145,7 @@
return _impl_.options_;
}
inline ::google::protobuf::FileOptions* FileDescriptorProto::mutable_options() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+ _impl_._has_bits_[0] |= 0x00000008u;
::google::protobuf::FileOptions* _msg = _internal_mutable_options();
// @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.options)
return _msg;
@@ -11234,7 +11234,6 @@
}
inline ::google::protobuf::SourceCodeInfo* FileDescriptorProto::_internal_mutable_source_code_info() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000010u;
if (_impl_.source_code_info_ == nullptr) {
auto* p = ::google::protobuf::Message::DefaultConstruct<::google::protobuf::SourceCodeInfo>(GetArena());
_impl_.source_code_info_ = reinterpret_cast<::google::protobuf::SourceCodeInfo*>(p);
@@ -11242,6 +11241,7 @@
return _impl_.source_code_info_;
}
inline ::google::protobuf::SourceCodeInfo* FileDescriptorProto::mutable_source_code_info() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+ _impl_._has_bits_[0] |= 0x00000010u;
::google::protobuf::SourceCodeInfo* _msg = _internal_mutable_source_code_info();
// @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.source_code_info)
return _msg;
@@ -11354,6 +11354,7 @@
}
inline void FileDescriptorProto::set_edition(::google::protobuf::Edition value) {
_internal_set_edition(value);
+ _impl_._has_bits_[0] |= 0x00000020u;
// @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.edition)
}
inline ::google::protobuf::Edition FileDescriptorProto::_internal_edition() const {
@@ -11363,7 +11364,6 @@
inline void FileDescriptorProto::_internal_set_edition(::google::protobuf::Edition value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
assert(::google::protobuf::Edition_IsValid(value));
- _impl_._has_bits_[0] |= 0x00000020u;
_impl_.edition_ = value;
}
@@ -11387,6 +11387,7 @@
}
inline void DescriptorProto_ExtensionRange::set_start(::int32_t value) {
_internal_set_start(value);
+ _impl_._has_bits_[0] |= 0x00000002u;
// @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ExtensionRange.start)
}
inline ::int32_t DescriptorProto_ExtensionRange::_internal_start() const {
@@ -11395,7 +11396,6 @@
}
inline void DescriptorProto_ExtensionRange::_internal_set_start(::int32_t value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000002u;
_impl_.start_ = value;
}
@@ -11415,6 +11415,7 @@
}
inline void DescriptorProto_ExtensionRange::set_end(::int32_t value) {
_internal_set_end(value);
+ _impl_._has_bits_[0] |= 0x00000004u;
// @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ExtensionRange.end)
}
inline ::int32_t DescriptorProto_ExtensionRange::_internal_end() const {
@@ -11423,7 +11424,6 @@
}
inline void DescriptorProto_ExtensionRange::_internal_set_end(::int32_t value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000004u;
_impl_.end_ = value;
}
@@ -11490,7 +11490,6 @@
}
inline ::google::protobuf::ExtensionRangeOptions* DescriptorProto_ExtensionRange::_internal_mutable_options() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000001u;
if (_impl_.options_ == nullptr) {
auto* p = ::google::protobuf::Message::DefaultConstruct<::google::protobuf::ExtensionRangeOptions>(GetArena());
_impl_.options_ = reinterpret_cast<::google::protobuf::ExtensionRangeOptions*>(p);
@@ -11498,6 +11497,7 @@
return _impl_.options_;
}
inline ::google::protobuf::ExtensionRangeOptions* DescriptorProto_ExtensionRange::mutable_options() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+ _impl_._has_bits_[0] |= 0x00000001u;
::google::protobuf::ExtensionRangeOptions* _msg = _internal_mutable_options();
// @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.ExtensionRange.options)
return _msg;
@@ -11543,6 +11543,7 @@
}
inline void DescriptorProto_ReservedRange::set_start(::int32_t value) {
_internal_set_start(value);
+ _impl_._has_bits_[0] |= 0x00000001u;
// @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ReservedRange.start)
}
inline ::int32_t DescriptorProto_ReservedRange::_internal_start() const {
@@ -11551,7 +11552,6 @@
}
inline void DescriptorProto_ReservedRange::_internal_set_start(::int32_t value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000001u;
_impl_.start_ = value;
}
@@ -11571,6 +11571,7 @@
}
inline void DescriptorProto_ReservedRange::set_end(::int32_t value) {
_internal_set_end(value);
+ _impl_._has_bits_[0] |= 0x00000002u;
// @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ReservedRange.end)
}
inline ::int32_t DescriptorProto_ReservedRange::_internal_end() const {
@@ -11579,7 +11580,6 @@
}
inline void DescriptorProto_ReservedRange::_internal_set_end(::int32_t value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000002u;
_impl_.end_ = value;
}
@@ -12015,7 +12015,6 @@
}
inline ::google::protobuf::MessageOptions* DescriptorProto::_internal_mutable_options() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000002u;
if (_impl_.options_ == nullptr) {
auto* p = ::google::protobuf::Message::DefaultConstruct<::google::protobuf::MessageOptions>(GetArena());
_impl_.options_ = reinterpret_cast<::google::protobuf::MessageOptions*>(p);
@@ -12023,6 +12022,7 @@
return _impl_.options_;
}
inline ::google::protobuf::MessageOptions* DescriptorProto::mutable_options() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+ _impl_._has_bits_[0] |= 0x00000002u;
::google::protobuf::MessageOptions* _msg = _internal_mutable_options();
// @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.options)
return _msg;
@@ -12218,6 +12218,7 @@
}
inline void ExtensionRangeOptions_Declaration::set_number(::int32_t value) {
_internal_set_number(value);
+ _impl_._has_bits_[0] |= 0x00000004u;
// @@protoc_insertion_point(field_set:google.protobuf.ExtensionRangeOptions.Declaration.number)
}
inline ::int32_t ExtensionRangeOptions_Declaration::_internal_number() const {
@@ -12226,7 +12227,6 @@
}
inline void ExtensionRangeOptions_Declaration::_internal_set_number(::int32_t value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000004u;
_impl_.number_ = value;
}
@@ -12388,6 +12388,7 @@
}
inline void ExtensionRangeOptions_Declaration::set_reserved(bool value) {
_internal_set_reserved(value);
+ _impl_._has_bits_[0] |= 0x00000008u;
// @@protoc_insertion_point(field_set:google.protobuf.ExtensionRangeOptions.Declaration.reserved)
}
inline bool ExtensionRangeOptions_Declaration::_internal_reserved() const {
@@ -12396,7 +12397,6 @@
}
inline void ExtensionRangeOptions_Declaration::_internal_set_reserved(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000008u;
_impl_.reserved_ = value;
}
@@ -12416,6 +12416,7 @@
}
inline void ExtensionRangeOptions_Declaration::set_repeated(bool value) {
_internal_set_repeated(value);
+ _impl_._has_bits_[0] |= 0x00000010u;
// @@protoc_insertion_point(field_set:google.protobuf.ExtensionRangeOptions.Declaration.repeated)
}
inline bool ExtensionRangeOptions_Declaration::_internal_repeated() const {
@@ -12424,7 +12425,6 @@
}
inline void ExtensionRangeOptions_Declaration::_internal_set_repeated(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000010u;
_impl_.repeated_ = value;
}
@@ -12593,7 +12593,6 @@
}
inline ::google::protobuf::FeatureSet* ExtensionRangeOptions::_internal_mutable_features() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000001u;
if (_impl_.features_ == nullptr) {
auto* p = ::google::protobuf::Message::DefaultConstruct<::google::protobuf::FeatureSet>(GetArena());
_impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(p);
@@ -12601,6 +12600,7 @@
return _impl_.features_;
}
inline ::google::protobuf::FeatureSet* ExtensionRangeOptions::mutable_features() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+ _impl_._has_bits_[0] |= 0x00000001u;
::google::protobuf::FeatureSet* _msg = _internal_mutable_features();
// @@protoc_insertion_point(field_mutable:google.protobuf.ExtensionRangeOptions.features)
return _msg;
@@ -12642,6 +12642,7 @@
}
inline void ExtensionRangeOptions::set_verification(::google::protobuf::ExtensionRangeOptions_VerificationState value) {
_internal_set_verification(value);
+ _impl_._has_bits_[0] |= 0x00000002u;
// @@protoc_insertion_point(field_set:google.protobuf.ExtensionRangeOptions.verification)
}
inline ::google::protobuf::ExtensionRangeOptions_VerificationState ExtensionRangeOptions::_internal_verification() const {
@@ -12651,7 +12652,6 @@
inline void ExtensionRangeOptions::_internal_set_verification(::google::protobuf::ExtensionRangeOptions_VerificationState value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
assert(::google::protobuf::ExtensionRangeOptions_VerificationState_IsValid(value));
- _impl_._has_bits_[0] |= 0x00000002u;
_impl_.verification_ = value;
}
@@ -12746,6 +12746,7 @@
}
inline void FieldDescriptorProto::set_number(::int32_t value) {
_internal_set_number(value);
+ _impl_._has_bits_[0] |= 0x00000040u;
// @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.number)
}
inline ::int32_t FieldDescriptorProto::_internal_number() const {
@@ -12754,7 +12755,6 @@
}
inline void FieldDescriptorProto::_internal_set_number(::int32_t value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000040u;
_impl_.number_ = value;
}
@@ -12774,6 +12774,7 @@
}
inline void FieldDescriptorProto::set_label(::google::protobuf::FieldDescriptorProto_Label value) {
_internal_set_label(value);
+ _impl_._has_bits_[0] |= 0x00000200u;
// @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.label)
}
inline ::google::protobuf::FieldDescriptorProto_Label FieldDescriptorProto::_internal_label() const {
@@ -12783,7 +12784,6 @@
inline void FieldDescriptorProto::_internal_set_label(::google::protobuf::FieldDescriptorProto_Label value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
assert(::google::protobuf::FieldDescriptorProto_Label_IsValid(value));
- _impl_._has_bits_[0] |= 0x00000200u;
_impl_.label_ = value;
}
@@ -12803,6 +12803,7 @@
}
inline void FieldDescriptorProto::set_type(::google::protobuf::FieldDescriptorProto_Type value) {
_internal_set_type(value);
+ _impl_._has_bits_[0] |= 0x00000400u;
// @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.type)
}
inline ::google::protobuf::FieldDescriptorProto_Type FieldDescriptorProto::_internal_type() const {
@@ -12812,7 +12813,6 @@
inline void FieldDescriptorProto::_internal_set_type(::google::protobuf::FieldDescriptorProto_Type value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
assert(::google::protobuf::FieldDescriptorProto_Type_IsValid(value));
- _impl_._has_bits_[0] |= 0x00000400u;
_impl_.type_ = value;
}
@@ -13045,6 +13045,7 @@
}
inline void FieldDescriptorProto::set_oneof_index(::int32_t value) {
_internal_set_oneof_index(value);
+ _impl_._has_bits_[0] |= 0x00000080u;
// @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.oneof_index)
}
inline ::int32_t FieldDescriptorProto::_internal_oneof_index() const {
@@ -13053,7 +13054,6 @@
}
inline void FieldDescriptorProto::_internal_set_oneof_index(::int32_t value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000080u;
_impl_.oneof_index_ = value;
}
@@ -13191,7 +13191,6 @@
}
inline ::google::protobuf::FieldOptions* FieldDescriptorProto::_internal_mutable_options() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000020u;
if (_impl_.options_ == nullptr) {
auto* p = ::google::protobuf::Message::DefaultConstruct<::google::protobuf::FieldOptions>(GetArena());
_impl_.options_ = reinterpret_cast<::google::protobuf::FieldOptions*>(p);
@@ -13199,6 +13198,7 @@
return _impl_.options_;
}
inline ::google::protobuf::FieldOptions* FieldDescriptorProto::mutable_options() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+ _impl_._has_bits_[0] |= 0x00000020u;
::google::protobuf::FieldOptions* _msg = _internal_mutable_options();
// @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.options)
return _msg;
@@ -13240,6 +13240,7 @@
}
inline void FieldDescriptorProto::set_proto3_optional(bool value) {
_internal_set_proto3_optional(value);
+ _impl_._has_bits_[0] |= 0x00000100u;
// @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.proto3_optional)
}
inline bool FieldDescriptorProto::_internal_proto3_optional() const {
@@ -13248,7 +13249,6 @@
}
inline void FieldDescriptorProto::_internal_set_proto3_optional(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000100u;
_impl_.proto3_optional_ = value;
}
@@ -13390,7 +13390,6 @@
}
inline ::google::protobuf::OneofOptions* OneofDescriptorProto::_internal_mutable_options() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000002u;
if (_impl_.options_ == nullptr) {
auto* p = ::google::protobuf::Message::DefaultConstruct<::google::protobuf::OneofOptions>(GetArena());
_impl_.options_ = reinterpret_cast<::google::protobuf::OneofOptions*>(p);
@@ -13398,6 +13397,7 @@
return _impl_.options_;
}
inline ::google::protobuf::OneofOptions* OneofDescriptorProto::mutable_options() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+ _impl_._has_bits_[0] |= 0x00000002u;
::google::protobuf::OneofOptions* _msg = _internal_mutable_options();
// @@protoc_insertion_point(field_mutable:google.protobuf.OneofDescriptorProto.options)
return _msg;
@@ -13443,6 +13443,7 @@
}
inline void EnumDescriptorProto_EnumReservedRange::set_start(::int32_t value) {
_internal_set_start(value);
+ _impl_._has_bits_[0] |= 0x00000001u;
// @@protoc_insertion_point(field_set:google.protobuf.EnumDescriptorProto.EnumReservedRange.start)
}
inline ::int32_t EnumDescriptorProto_EnumReservedRange::_internal_start() const {
@@ -13451,7 +13452,6 @@
}
inline void EnumDescriptorProto_EnumReservedRange::_internal_set_start(::int32_t value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000001u;
_impl_.start_ = value;
}
@@ -13471,6 +13471,7 @@
}
inline void EnumDescriptorProto_EnumReservedRange::set_end(::int32_t value) {
_internal_set_end(value);
+ _impl_._has_bits_[0] |= 0x00000002u;
// @@protoc_insertion_point(field_set:google.protobuf.EnumDescriptorProto.EnumReservedRange.end)
}
inline ::int32_t EnumDescriptorProto_EnumReservedRange::_internal_end() const {
@@ -13479,7 +13480,6 @@
}
inline void EnumDescriptorProto_EnumReservedRange::_internal_set_end(::int32_t value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000002u;
_impl_.end_ = value;
}
@@ -13670,7 +13670,6 @@
}
inline ::google::protobuf::EnumOptions* EnumDescriptorProto::_internal_mutable_options() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000002u;
if (_impl_.options_ == nullptr) {
auto* p = ::google::protobuf::Message::DefaultConstruct<::google::protobuf::EnumOptions>(GetArena());
_impl_.options_ = reinterpret_cast<::google::protobuf::EnumOptions*>(p);
@@ -13678,6 +13677,7 @@
return _impl_.options_;
}
inline ::google::protobuf::EnumOptions* EnumDescriptorProto::mutable_options() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+ _impl_._has_bits_[0] |= 0x00000002u;
::google::protobuf::EnumOptions* _msg = _internal_mutable_options();
// @@protoc_insertion_point(field_mutable:google.protobuf.EnumDescriptorProto.options)
return _msg;
@@ -13944,6 +13944,7 @@
}
inline void EnumValueDescriptorProto::set_number(::int32_t value) {
_internal_set_number(value);
+ _impl_._has_bits_[0] |= 0x00000004u;
// @@protoc_insertion_point(field_set:google.protobuf.EnumValueDescriptorProto.number)
}
inline ::int32_t EnumValueDescriptorProto::_internal_number() const {
@@ -13952,7 +13953,6 @@
}
inline void EnumValueDescriptorProto::_internal_set_number(::int32_t value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000004u;
_impl_.number_ = value;
}
@@ -14019,7 +14019,6 @@
}
inline ::google::protobuf::EnumValueOptions* EnumValueDescriptorProto::_internal_mutable_options() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000002u;
if (_impl_.options_ == nullptr) {
auto* p = ::google::protobuf::Message::DefaultConstruct<::google::protobuf::EnumValueOptions>(GetArena());
_impl_.options_ = reinterpret_cast<::google::protobuf::EnumValueOptions*>(p);
@@ -14027,6 +14026,7 @@
return _impl_.options_;
}
inline ::google::protobuf::EnumValueOptions* EnumValueDescriptorProto::mutable_options() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+ _impl_._has_bits_[0] |= 0x00000002u;
::google::protobuf::EnumValueOptions* _msg = _internal_mutable_options();
// @@protoc_insertion_point(field_mutable:google.protobuf.EnumValueDescriptorProto.options)
return _msg;
@@ -14239,7 +14239,6 @@
}
inline ::google::protobuf::ServiceOptions* ServiceDescriptorProto::_internal_mutable_options() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000002u;
if (_impl_.options_ == nullptr) {
auto* p = ::google::protobuf::Message::DefaultConstruct<::google::protobuf::ServiceOptions>(GetArena());
_impl_.options_ = reinterpret_cast<::google::protobuf::ServiceOptions*>(p);
@@ -14247,6 +14246,7 @@
return _impl_.options_;
}
inline ::google::protobuf::ServiceOptions* ServiceDescriptorProto::mutable_options() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+ _impl_._has_bits_[0] |= 0x00000002u;
::google::protobuf::ServiceOptions* _msg = _internal_mutable_options();
// @@protoc_insertion_point(field_mutable:google.protobuf.ServiceDescriptorProto.options)
return _msg;
@@ -14552,7 +14552,6 @@
}
inline ::google::protobuf::MethodOptions* MethodDescriptorProto::_internal_mutable_options() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000008u;
if (_impl_.options_ == nullptr) {
auto* p = ::google::protobuf::Message::DefaultConstruct<::google::protobuf::MethodOptions>(GetArena());
_impl_.options_ = reinterpret_cast<::google::protobuf::MethodOptions*>(p);
@@ -14560,6 +14559,7 @@
return _impl_.options_;
}
inline ::google::protobuf::MethodOptions* MethodDescriptorProto::mutable_options() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+ _impl_._has_bits_[0] |= 0x00000008u;
::google::protobuf::MethodOptions* _msg = _internal_mutable_options();
// @@protoc_insertion_point(field_mutable:google.protobuf.MethodDescriptorProto.options)
return _msg;
@@ -14601,6 +14601,7 @@
}
inline void MethodDescriptorProto::set_client_streaming(bool value) {
_internal_set_client_streaming(value);
+ _impl_._has_bits_[0] |= 0x00000010u;
// @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.client_streaming)
}
inline bool MethodDescriptorProto::_internal_client_streaming() const {
@@ -14609,7 +14610,6 @@
}
inline void MethodDescriptorProto::_internal_set_client_streaming(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000010u;
_impl_.client_streaming_ = value;
}
@@ -14629,6 +14629,7 @@
}
inline void MethodDescriptorProto::set_server_streaming(bool value) {
_internal_set_server_streaming(value);
+ _impl_._has_bits_[0] |= 0x00000020u;
// @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.server_streaming)
}
inline bool MethodDescriptorProto::_internal_server_streaming() const {
@@ -14637,7 +14638,6 @@
}
inline void MethodDescriptorProto::_internal_set_server_streaming(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000020u;
_impl_.server_streaming_ = value;
}
@@ -14803,6 +14803,7 @@
}
inline void FileOptions::set_java_multiple_files(bool value) {
_internal_set_java_multiple_files(value);
+ _impl_._has_bits_[0] |= 0x00000800u;
// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_multiple_files)
}
inline bool FileOptions::_internal_java_multiple_files() const {
@@ -14811,7 +14812,6 @@
}
inline void FileOptions::_internal_set_java_multiple_files(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000800u;
_impl_.java_multiple_files_ = value;
}
@@ -14831,6 +14831,7 @@
}
inline void FileOptions::set_java_generate_equals_and_hash(bool value) {
_internal_set_java_generate_equals_and_hash(value);
+ _impl_._has_bits_[0] |= 0x00001000u;
// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_generate_equals_and_hash)
}
inline bool FileOptions::_internal_java_generate_equals_and_hash() const {
@@ -14839,7 +14840,6 @@
}
inline void FileOptions::_internal_set_java_generate_equals_and_hash(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00001000u;
_impl_.java_generate_equals_and_hash_ = value;
}
@@ -14859,6 +14859,7 @@
}
inline void FileOptions::set_java_string_check_utf8(bool value) {
_internal_set_java_string_check_utf8(value);
+ _impl_._has_bits_[0] |= 0x00002000u;
// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_string_check_utf8)
}
inline bool FileOptions::_internal_java_string_check_utf8() const {
@@ -14867,7 +14868,6 @@
}
inline void FileOptions::_internal_set_java_string_check_utf8(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00002000u;
_impl_.java_string_check_utf8_ = value;
}
@@ -14887,6 +14887,7 @@
}
inline void FileOptions::set_optimize_for(::google::protobuf::FileOptions_OptimizeMode value) {
_internal_set_optimize_for(value);
+ _impl_._has_bits_[0] |= 0x00080000u;
// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.optimize_for)
}
inline ::google::protobuf::FileOptions_OptimizeMode FileOptions::_internal_optimize_for() const {
@@ -14896,7 +14897,6 @@
inline void FileOptions::_internal_set_optimize_for(::google::protobuf::FileOptions_OptimizeMode value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
assert(::google::protobuf::FileOptions_OptimizeMode_IsValid(value));
- _impl_._has_bits_[0] |= 0x00080000u;
_impl_.optimize_for_ = value;
}
@@ -14987,6 +14987,7 @@
}
inline void FileOptions::set_cc_generic_services(bool value) {
_internal_set_cc_generic_services(value);
+ _impl_._has_bits_[0] |= 0x00004000u;
// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.cc_generic_services)
}
inline bool FileOptions::_internal_cc_generic_services() const {
@@ -14995,7 +14996,6 @@
}
inline void FileOptions::_internal_set_cc_generic_services(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00004000u;
_impl_.cc_generic_services_ = value;
}
@@ -15015,6 +15015,7 @@
}
inline void FileOptions::set_java_generic_services(bool value) {
_internal_set_java_generic_services(value);
+ _impl_._has_bits_[0] |= 0x00008000u;
// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_generic_services)
}
inline bool FileOptions::_internal_java_generic_services() const {
@@ -15023,7 +15024,6 @@
}
inline void FileOptions::_internal_set_java_generic_services(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00008000u;
_impl_.java_generic_services_ = value;
}
@@ -15043,6 +15043,7 @@
}
inline void FileOptions::set_py_generic_services(bool value) {
_internal_set_py_generic_services(value);
+ _impl_._has_bits_[0] |= 0x00010000u;
// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.py_generic_services)
}
inline bool FileOptions::_internal_py_generic_services() const {
@@ -15051,7 +15052,6 @@
}
inline void FileOptions::_internal_set_py_generic_services(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00010000u;
_impl_.py_generic_services_ = value;
}
@@ -15071,6 +15071,7 @@
}
inline void FileOptions::set_php_generic_services(bool value) {
_internal_set_php_generic_services(value);
+ _impl_._has_bits_[0] |= 0x00020000u;
// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.php_generic_services)
}
inline bool FileOptions::_internal_php_generic_services() const {
@@ -15079,7 +15080,6 @@
}
inline void FileOptions::_internal_set_php_generic_services(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00020000u;
_impl_.php_generic_services_ = value;
}
@@ -15099,6 +15099,7 @@
}
inline void FileOptions::set_deprecated(bool value) {
_internal_set_deprecated(value);
+ _impl_._has_bits_[0] |= 0x00040000u;
// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.deprecated)
}
inline bool FileOptions::_internal_deprecated() const {
@@ -15107,7 +15108,6 @@
}
inline void FileOptions::_internal_set_deprecated(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00040000u;
_impl_.deprecated_ = value;
}
@@ -15127,6 +15127,7 @@
}
inline void FileOptions::set_cc_enable_arenas(bool value) {
_internal_set_cc_enable_arenas(value);
+ _impl_._has_bits_[0] |= 0x00100000u;
// @@protoc_insertion_point(field_set:google.protobuf.FileOptions.cc_enable_arenas)
}
inline bool FileOptions::_internal_cc_enable_arenas() const {
@@ -15135,7 +15136,6 @@
}
inline void FileOptions::_internal_set_cc_enable_arenas(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00100000u;
_impl_.cc_enable_arenas_ = value;
}
@@ -15699,7 +15699,6 @@
}
inline ::google::protobuf::FeatureSet* FileOptions::_internal_mutable_features() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000400u;
if (_impl_.features_ == nullptr) {
auto* p = ::google::protobuf::Message::DefaultConstruct<::google::protobuf::FeatureSet>(GetArena());
_impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(p);
@@ -15707,6 +15706,7 @@
return _impl_.features_;
}
inline ::google::protobuf::FeatureSet* FileOptions::mutable_features() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+ _impl_._has_bits_[0] |= 0x00000400u;
::google::protobuf::FeatureSet* _msg = _internal_mutable_features();
// @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.features)
return _msg;
@@ -15801,6 +15801,7 @@
}
inline void MessageOptions::set_message_set_wire_format(bool value) {
_internal_set_message_set_wire_format(value);
+ _impl_._has_bits_[0] |= 0x00000002u;
// @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.message_set_wire_format)
}
inline bool MessageOptions::_internal_message_set_wire_format() const {
@@ -15809,7 +15810,6 @@
}
inline void MessageOptions::_internal_set_message_set_wire_format(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000002u;
_impl_.message_set_wire_format_ = value;
}
@@ -15829,6 +15829,7 @@
}
inline void MessageOptions::set_no_standard_descriptor_accessor(bool value) {
_internal_set_no_standard_descriptor_accessor(value);
+ _impl_._has_bits_[0] |= 0x00000004u;
// @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.no_standard_descriptor_accessor)
}
inline bool MessageOptions::_internal_no_standard_descriptor_accessor() const {
@@ -15837,7 +15838,6 @@
}
inline void MessageOptions::_internal_set_no_standard_descriptor_accessor(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000004u;
_impl_.no_standard_descriptor_accessor_ = value;
}
@@ -15857,6 +15857,7 @@
}
inline void MessageOptions::set_deprecated(bool value) {
_internal_set_deprecated(value);
+ _impl_._has_bits_[0] |= 0x00000008u;
// @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.deprecated)
}
inline bool MessageOptions::_internal_deprecated() const {
@@ -15865,7 +15866,6 @@
}
inline void MessageOptions::_internal_set_deprecated(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000008u;
_impl_.deprecated_ = value;
}
@@ -15885,6 +15885,7 @@
}
inline void MessageOptions::set_map_entry(bool value) {
_internal_set_map_entry(value);
+ _impl_._has_bits_[0] |= 0x00000010u;
// @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.map_entry)
}
inline bool MessageOptions::_internal_map_entry() const {
@@ -15893,7 +15894,6 @@
}
inline void MessageOptions::_internal_set_map_entry(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000010u;
_impl_.map_entry_ = value;
}
@@ -15913,6 +15913,7 @@
}
inline void MessageOptions::set_deprecated_legacy_json_field_conflicts(bool value) {
_internal_set_deprecated_legacy_json_field_conflicts(value);
+ _impl_._has_bits_[0] |= 0x00000020u;
// @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.deprecated_legacy_json_field_conflicts)
}
inline bool MessageOptions::_internal_deprecated_legacy_json_field_conflicts() const {
@@ -15921,7 +15922,6 @@
}
inline void MessageOptions::_internal_set_deprecated_legacy_json_field_conflicts(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000020u;
_impl_.deprecated_legacy_json_field_conflicts_ = value;
}
@@ -15988,7 +15988,6 @@
}
inline ::google::protobuf::FeatureSet* MessageOptions::_internal_mutable_features() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000001u;
if (_impl_.features_ == nullptr) {
auto* p = ::google::protobuf::Message::DefaultConstruct<::google::protobuf::FeatureSet>(GetArena());
_impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(p);
@@ -15996,6 +15995,7 @@
return _impl_.features_;
}
inline ::google::protobuf::FeatureSet* MessageOptions::mutable_features() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+ _impl_._has_bits_[0] |= 0x00000001u;
::google::protobuf::FeatureSet* _msg = _internal_mutable_features();
// @@protoc_insertion_point(field_mutable:google.protobuf.MessageOptions.features)
return _msg;
@@ -16090,6 +16090,7 @@
}
inline void FieldOptions_EditionDefault::set_edition(::google::protobuf::Edition value) {
_internal_set_edition(value);
+ _impl_._has_bits_[0] |= 0x00000002u;
// @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.EditionDefault.edition)
}
inline ::google::protobuf::Edition FieldOptions_EditionDefault::_internal_edition() const {
@@ -16099,7 +16100,6 @@
inline void FieldOptions_EditionDefault::_internal_set_edition(::google::protobuf::Edition value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
assert(::google::protobuf::Edition_IsValid(value));
- _impl_._has_bits_[0] |= 0x00000002u;
_impl_.edition_ = value;
}
@@ -16194,6 +16194,7 @@
}
inline void FieldOptions::set_ctype(::google::protobuf::FieldOptions_CType value) {
_internal_set_ctype(value);
+ _impl_._has_bits_[0] |= 0x00000002u;
// @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.ctype)
}
inline ::google::protobuf::FieldOptions_CType FieldOptions::_internal_ctype() const {
@@ -16203,7 +16204,6 @@
inline void FieldOptions::_internal_set_ctype(::google::protobuf::FieldOptions_CType value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
assert(::google::protobuf::FieldOptions_CType_IsValid(value));
- _impl_._has_bits_[0] |= 0x00000002u;
_impl_.ctype_ = value;
}
@@ -16223,6 +16223,7 @@
}
inline void FieldOptions::set_packed(bool value) {
_internal_set_packed(value);
+ _impl_._has_bits_[0] |= 0x00000008u;
// @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.packed)
}
inline bool FieldOptions::_internal_packed() const {
@@ -16231,7 +16232,6 @@
}
inline void FieldOptions::_internal_set_packed(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000008u;
_impl_.packed_ = value;
}
@@ -16251,6 +16251,7 @@
}
inline void FieldOptions::set_jstype(::google::protobuf::FieldOptions_JSType value) {
_internal_set_jstype(value);
+ _impl_._has_bits_[0] |= 0x00000004u;
// @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.jstype)
}
inline ::google::protobuf::FieldOptions_JSType FieldOptions::_internal_jstype() const {
@@ -16260,7 +16261,6 @@
inline void FieldOptions::_internal_set_jstype(::google::protobuf::FieldOptions_JSType value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
assert(::google::protobuf::FieldOptions_JSType_IsValid(value));
- _impl_._has_bits_[0] |= 0x00000004u;
_impl_.jstype_ = value;
}
@@ -16280,6 +16280,7 @@
}
inline void FieldOptions::set_lazy(bool value) {
_internal_set_lazy(value);
+ _impl_._has_bits_[0] |= 0x00000010u;
// @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.lazy)
}
inline bool FieldOptions::_internal_lazy() const {
@@ -16288,7 +16289,6 @@
}
inline void FieldOptions::_internal_set_lazy(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000010u;
_impl_.lazy_ = value;
}
@@ -16308,6 +16308,7 @@
}
inline void FieldOptions::set_unverified_lazy(bool value) {
_internal_set_unverified_lazy(value);
+ _impl_._has_bits_[0] |= 0x00000020u;
// @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.unverified_lazy)
}
inline bool FieldOptions::_internal_unverified_lazy() const {
@@ -16316,7 +16317,6 @@
}
inline void FieldOptions::_internal_set_unverified_lazy(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000020u;
_impl_.unverified_lazy_ = value;
}
@@ -16336,6 +16336,7 @@
}
inline void FieldOptions::set_deprecated(bool value) {
_internal_set_deprecated(value);
+ _impl_._has_bits_[0] |= 0x00000040u;
// @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.deprecated)
}
inline bool FieldOptions::_internal_deprecated() const {
@@ -16344,7 +16345,6 @@
}
inline void FieldOptions::_internal_set_deprecated(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000040u;
_impl_.deprecated_ = value;
}
@@ -16364,6 +16364,7 @@
}
inline void FieldOptions::set_weak(bool value) {
_internal_set_weak(value);
+ _impl_._has_bits_[0] |= 0x00000080u;
// @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.weak)
}
inline bool FieldOptions::_internal_weak() const {
@@ -16372,7 +16373,6 @@
}
inline void FieldOptions::_internal_set_weak(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000080u;
_impl_.weak_ = value;
}
@@ -16392,6 +16392,7 @@
}
inline void FieldOptions::set_debug_redact(bool value) {
_internal_set_debug_redact(value);
+ _impl_._has_bits_[0] |= 0x00000100u;
// @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.debug_redact)
}
inline bool FieldOptions::_internal_debug_redact() const {
@@ -16400,7 +16401,6 @@
}
inline void FieldOptions::_internal_set_debug_redact(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000100u;
_impl_.debug_redact_ = value;
}
@@ -16420,6 +16420,7 @@
}
inline void FieldOptions::set_retention(::google::protobuf::FieldOptions_OptionRetention value) {
_internal_set_retention(value);
+ _impl_._has_bits_[0] |= 0x00000200u;
// @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.retention)
}
inline ::google::protobuf::FieldOptions_OptionRetention FieldOptions::_internal_retention() const {
@@ -16429,7 +16430,6 @@
inline void FieldOptions::_internal_set_retention(::google::protobuf::FieldOptions_OptionRetention value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
assert(::google::protobuf::FieldOptions_OptionRetention_IsValid(value));
- _impl_._has_bits_[0] |= 0x00000200u;
_impl_.retention_ = value;
}
@@ -16591,7 +16591,6 @@
}
inline ::google::protobuf::FeatureSet* FieldOptions::_internal_mutable_features() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000001u;
if (_impl_.features_ == nullptr) {
auto* p = ::google::protobuf::Message::DefaultConstruct<::google::protobuf::FeatureSet>(GetArena());
_impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(p);
@@ -16599,6 +16598,7 @@
return _impl_.features_;
}
inline ::google::protobuf::FeatureSet* FieldOptions::mutable_features() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+ _impl_._has_bits_[0] |= 0x00000001u;
::google::protobuf::FeatureSet* _msg = _internal_mutable_features();
// @@protoc_insertion_point(field_mutable:google.protobuf.FieldOptions.features)
return _msg;
@@ -16740,7 +16740,6 @@
}
inline ::google::protobuf::FeatureSet* OneofOptions::_internal_mutable_features() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000001u;
if (_impl_.features_ == nullptr) {
auto* p = ::google::protobuf::Message::DefaultConstruct<::google::protobuf::FeatureSet>(GetArena());
_impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(p);
@@ -16748,6 +16747,7 @@
return _impl_.features_;
}
inline ::google::protobuf::FeatureSet* OneofOptions::mutable_features() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+ _impl_._has_bits_[0] |= 0x00000001u;
::google::protobuf::FeatureSet* _msg = _internal_mutable_features();
// @@protoc_insertion_point(field_mutable:google.protobuf.OneofOptions.features)
return _msg;
@@ -16842,6 +16842,7 @@
}
inline void EnumOptions::set_allow_alias(bool value) {
_internal_set_allow_alias(value);
+ _impl_._has_bits_[0] |= 0x00000002u;
// @@protoc_insertion_point(field_set:google.protobuf.EnumOptions.allow_alias)
}
inline bool EnumOptions::_internal_allow_alias() const {
@@ -16850,7 +16851,6 @@
}
inline void EnumOptions::_internal_set_allow_alias(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000002u;
_impl_.allow_alias_ = value;
}
@@ -16870,6 +16870,7 @@
}
inline void EnumOptions::set_deprecated(bool value) {
_internal_set_deprecated(value);
+ _impl_._has_bits_[0] |= 0x00000004u;
// @@protoc_insertion_point(field_set:google.protobuf.EnumOptions.deprecated)
}
inline bool EnumOptions::_internal_deprecated() const {
@@ -16878,7 +16879,6 @@
}
inline void EnumOptions::_internal_set_deprecated(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000004u;
_impl_.deprecated_ = value;
}
@@ -16898,6 +16898,7 @@
}
inline void EnumOptions::set_deprecated_legacy_json_field_conflicts(bool value) {
_internal_set_deprecated_legacy_json_field_conflicts(value);
+ _impl_._has_bits_[0] |= 0x00000008u;
// @@protoc_insertion_point(field_set:google.protobuf.EnumOptions.deprecated_legacy_json_field_conflicts)
}
inline bool EnumOptions::_internal_deprecated_legacy_json_field_conflicts() const {
@@ -16906,7 +16907,6 @@
}
inline void EnumOptions::_internal_set_deprecated_legacy_json_field_conflicts(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000008u;
_impl_.deprecated_legacy_json_field_conflicts_ = value;
}
@@ -16973,7 +16973,6 @@
}
inline ::google::protobuf::FeatureSet* EnumOptions::_internal_mutable_features() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000001u;
if (_impl_.features_ == nullptr) {
auto* p = ::google::protobuf::Message::DefaultConstruct<::google::protobuf::FeatureSet>(GetArena());
_impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(p);
@@ -16981,6 +16980,7 @@
return _impl_.features_;
}
inline ::google::protobuf::FeatureSet* EnumOptions::mutable_features() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+ _impl_._has_bits_[0] |= 0x00000001u;
::google::protobuf::FeatureSet* _msg = _internal_mutable_features();
// @@protoc_insertion_point(field_mutable:google.protobuf.EnumOptions.features)
return _msg;
@@ -17075,6 +17075,7 @@
}
inline void EnumValueOptions::set_deprecated(bool value) {
_internal_set_deprecated(value);
+ _impl_._has_bits_[0] |= 0x00000002u;
// @@protoc_insertion_point(field_set:google.protobuf.EnumValueOptions.deprecated)
}
inline bool EnumValueOptions::_internal_deprecated() const {
@@ -17083,7 +17084,6 @@
}
inline void EnumValueOptions::_internal_set_deprecated(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000002u;
_impl_.deprecated_ = value;
}
@@ -17150,7 +17150,6 @@
}
inline ::google::protobuf::FeatureSet* EnumValueOptions::_internal_mutable_features() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000001u;
if (_impl_.features_ == nullptr) {
auto* p = ::google::protobuf::Message::DefaultConstruct<::google::protobuf::FeatureSet>(GetArena());
_impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(p);
@@ -17158,6 +17157,7 @@
return _impl_.features_;
}
inline ::google::protobuf::FeatureSet* EnumValueOptions::mutable_features() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+ _impl_._has_bits_[0] |= 0x00000001u;
::google::protobuf::FeatureSet* _msg = _internal_mutable_features();
// @@protoc_insertion_point(field_mutable:google.protobuf.EnumValueOptions.features)
return _msg;
@@ -17199,6 +17199,7 @@
}
inline void EnumValueOptions::set_debug_redact(bool value) {
_internal_set_debug_redact(value);
+ _impl_._has_bits_[0] |= 0x00000004u;
// @@protoc_insertion_point(field_set:google.protobuf.EnumValueOptions.debug_redact)
}
inline bool EnumValueOptions::_internal_debug_redact() const {
@@ -17207,7 +17208,6 @@
}
inline void EnumValueOptions::_internal_set_debug_redact(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000004u;
_impl_.debug_redact_ = value;
}
@@ -17327,7 +17327,6 @@
}
inline ::google::protobuf::FeatureSet* ServiceOptions::_internal_mutable_features() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000001u;
if (_impl_.features_ == nullptr) {
auto* p = ::google::protobuf::Message::DefaultConstruct<::google::protobuf::FeatureSet>(GetArena());
_impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(p);
@@ -17335,6 +17334,7 @@
return _impl_.features_;
}
inline ::google::protobuf::FeatureSet* ServiceOptions::mutable_features() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+ _impl_._has_bits_[0] |= 0x00000001u;
::google::protobuf::FeatureSet* _msg = _internal_mutable_features();
// @@protoc_insertion_point(field_mutable:google.protobuf.ServiceOptions.features)
return _msg;
@@ -17376,6 +17376,7 @@
}
inline void ServiceOptions::set_deprecated(bool value) {
_internal_set_deprecated(value);
+ _impl_._has_bits_[0] |= 0x00000002u;
// @@protoc_insertion_point(field_set:google.protobuf.ServiceOptions.deprecated)
}
inline bool ServiceOptions::_internal_deprecated() const {
@@ -17384,7 +17385,6 @@
}
inline void ServiceOptions::_internal_set_deprecated(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000002u;
_impl_.deprecated_ = value;
}
@@ -17457,6 +17457,7 @@
}
inline void MethodOptions::set_deprecated(bool value) {
_internal_set_deprecated(value);
+ _impl_._has_bits_[0] |= 0x00000002u;
// @@protoc_insertion_point(field_set:google.protobuf.MethodOptions.deprecated)
}
inline bool MethodOptions::_internal_deprecated() const {
@@ -17465,7 +17466,6 @@
}
inline void MethodOptions::_internal_set_deprecated(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000002u;
_impl_.deprecated_ = value;
}
@@ -17485,6 +17485,7 @@
}
inline void MethodOptions::set_idempotency_level(::google::protobuf::MethodOptions_IdempotencyLevel value) {
_internal_set_idempotency_level(value);
+ _impl_._has_bits_[0] |= 0x00000004u;
// @@protoc_insertion_point(field_set:google.protobuf.MethodOptions.idempotency_level)
}
inline ::google::protobuf::MethodOptions_IdempotencyLevel MethodOptions::_internal_idempotency_level() const {
@@ -17494,7 +17495,6 @@
inline void MethodOptions::_internal_set_idempotency_level(::google::protobuf::MethodOptions_IdempotencyLevel value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
assert(::google::protobuf::MethodOptions_IdempotencyLevel_IsValid(value));
- _impl_._has_bits_[0] |= 0x00000004u;
_impl_.idempotency_level_ = value;
}
@@ -17561,7 +17561,6 @@
}
inline ::google::protobuf::FeatureSet* MethodOptions::_internal_mutable_features() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000001u;
if (_impl_.features_ == nullptr) {
auto* p = ::google::protobuf::Message::DefaultConstruct<::google::protobuf::FeatureSet>(GetArena());
_impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(p);
@@ -17569,6 +17568,7 @@
return _impl_.features_;
}
inline ::google::protobuf::FeatureSet* MethodOptions::mutable_features() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+ _impl_._has_bits_[0] |= 0x00000001u;
::google::protobuf::FeatureSet* _msg = _internal_mutable_features();
// @@protoc_insertion_point(field_mutable:google.protobuf.MethodOptions.features)
return _msg;
@@ -17734,6 +17734,7 @@
}
inline void UninterpretedOption_NamePart::set_is_extension(bool value) {
_internal_set_is_extension(value);
+ _impl_._has_bits_[0] |= 0x00000002u;
// @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.NamePart.is_extension)
}
inline bool UninterpretedOption_NamePart::_internal_is_extension() const {
@@ -17742,7 +17743,6 @@
}
inline void UninterpretedOption_NamePart::_internal_set_is_extension(bool value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000002u;
_impl_.is_extension_ = value;
}
@@ -17886,6 +17886,7 @@
}
inline void UninterpretedOption::set_positive_int_value(::uint64_t value) {
_internal_set_positive_int_value(value);
+ _impl_._has_bits_[0] |= 0x00000008u;
// @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.positive_int_value)
}
inline ::uint64_t UninterpretedOption::_internal_positive_int_value() const {
@@ -17894,7 +17895,6 @@
}
inline void UninterpretedOption::_internal_set_positive_int_value(::uint64_t value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000008u;
_impl_.positive_int_value_ = value;
}
@@ -17914,6 +17914,7 @@
}
inline void UninterpretedOption::set_negative_int_value(::int64_t value) {
_internal_set_negative_int_value(value);
+ _impl_._has_bits_[0] |= 0x00000010u;
// @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.negative_int_value)
}
inline ::int64_t UninterpretedOption::_internal_negative_int_value() const {
@@ -17922,7 +17923,6 @@
}
inline void UninterpretedOption::_internal_set_negative_int_value(::int64_t value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000010u;
_impl_.negative_int_value_ = value;
}
@@ -17942,6 +17942,7 @@
}
inline void UninterpretedOption::set_double_value(double value) {
_internal_set_double_value(value);
+ _impl_._has_bits_[0] |= 0x00000020u;
// @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.double_value)
}
inline double UninterpretedOption::_internal_double_value() const {
@@ -17950,7 +17951,6 @@
}
inline void UninterpretedOption::_internal_set_double_value(double value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000020u;
_impl_.double_value_ = value;
}
@@ -18116,6 +18116,7 @@
}
inline void FeatureSet::set_field_presence(::google::protobuf::FeatureSet_FieldPresence value) {
_internal_set_field_presence(value);
+ _impl_._has_bits_[0] |= 0x00000001u;
// @@protoc_insertion_point(field_set:google.protobuf.FeatureSet.field_presence)
}
inline ::google::protobuf::FeatureSet_FieldPresence FeatureSet::_internal_field_presence() const {
@@ -18125,7 +18126,6 @@
inline void FeatureSet::_internal_set_field_presence(::google::protobuf::FeatureSet_FieldPresence value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
assert(::google::protobuf::FeatureSet_FieldPresence_IsValid(value));
- _impl_._has_bits_[0] |= 0x00000001u;
_impl_.field_presence_ = value;
}
@@ -18145,6 +18145,7 @@
}
inline void FeatureSet::set_enum_type(::google::protobuf::FeatureSet_EnumType value) {
_internal_set_enum_type(value);
+ _impl_._has_bits_[0] |= 0x00000002u;
// @@protoc_insertion_point(field_set:google.protobuf.FeatureSet.enum_type)
}
inline ::google::protobuf::FeatureSet_EnumType FeatureSet::_internal_enum_type() const {
@@ -18154,7 +18155,6 @@
inline void FeatureSet::_internal_set_enum_type(::google::protobuf::FeatureSet_EnumType value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
assert(::google::protobuf::FeatureSet_EnumType_IsValid(value));
- _impl_._has_bits_[0] |= 0x00000002u;
_impl_.enum_type_ = value;
}
@@ -18174,6 +18174,7 @@
}
inline void FeatureSet::set_repeated_field_encoding(::google::protobuf::FeatureSet_RepeatedFieldEncoding value) {
_internal_set_repeated_field_encoding(value);
+ _impl_._has_bits_[0] |= 0x00000004u;
// @@protoc_insertion_point(field_set:google.protobuf.FeatureSet.repeated_field_encoding)
}
inline ::google::protobuf::FeatureSet_RepeatedFieldEncoding FeatureSet::_internal_repeated_field_encoding() const {
@@ -18183,7 +18184,6 @@
inline void FeatureSet::_internal_set_repeated_field_encoding(::google::protobuf::FeatureSet_RepeatedFieldEncoding value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
assert(::google::protobuf::FeatureSet_RepeatedFieldEncoding_IsValid(value));
- _impl_._has_bits_[0] |= 0x00000004u;
_impl_.repeated_field_encoding_ = value;
}
@@ -18203,6 +18203,7 @@
}
inline void FeatureSet::set_utf8_validation(::google::protobuf::FeatureSet_Utf8Validation value) {
_internal_set_utf8_validation(value);
+ _impl_._has_bits_[0] |= 0x00000008u;
// @@protoc_insertion_point(field_set:google.protobuf.FeatureSet.utf8_validation)
}
inline ::google::protobuf::FeatureSet_Utf8Validation FeatureSet::_internal_utf8_validation() const {
@@ -18212,7 +18213,6 @@
inline void FeatureSet::_internal_set_utf8_validation(::google::protobuf::FeatureSet_Utf8Validation value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
assert(::google::protobuf::FeatureSet_Utf8Validation_IsValid(value));
- _impl_._has_bits_[0] |= 0x00000008u;
_impl_.utf8_validation_ = value;
}
@@ -18232,6 +18232,7 @@
}
inline void FeatureSet::set_message_encoding(::google::protobuf::FeatureSet_MessageEncoding value) {
_internal_set_message_encoding(value);
+ _impl_._has_bits_[0] |= 0x00000010u;
// @@protoc_insertion_point(field_set:google.protobuf.FeatureSet.message_encoding)
}
inline ::google::protobuf::FeatureSet_MessageEncoding FeatureSet::_internal_message_encoding() const {
@@ -18241,7 +18242,6 @@
inline void FeatureSet::_internal_set_message_encoding(::google::protobuf::FeatureSet_MessageEncoding value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
assert(::google::protobuf::FeatureSet_MessageEncoding_IsValid(value));
- _impl_._has_bits_[0] |= 0x00000010u;
_impl_.message_encoding_ = value;
}
@@ -18261,6 +18261,7 @@
}
inline void FeatureSet::set_json_format(::google::protobuf::FeatureSet_JsonFormat value) {
_internal_set_json_format(value);
+ _impl_._has_bits_[0] |= 0x00000020u;
// @@protoc_insertion_point(field_set:google.protobuf.FeatureSet.json_format)
}
inline ::google::protobuf::FeatureSet_JsonFormat FeatureSet::_internal_json_format() const {
@@ -18270,7 +18271,6 @@
inline void FeatureSet::_internal_set_json_format(::google::protobuf::FeatureSet_JsonFormat value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
assert(::google::protobuf::FeatureSet_JsonFormat_IsValid(value));
- _impl_._has_bits_[0] |= 0x00000020u;
_impl_.json_format_ = value;
}
@@ -18294,6 +18294,7 @@
}
inline void FeatureSetDefaults_FeatureSetEditionDefault::set_edition(::google::protobuf::Edition value) {
_internal_set_edition(value);
+ _impl_._has_bits_[0] |= 0x00000002u;
// @@protoc_insertion_point(field_set:google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.edition)
}
inline ::google::protobuf::Edition FeatureSetDefaults_FeatureSetEditionDefault::_internal_edition() const {
@@ -18303,7 +18304,6 @@
inline void FeatureSetDefaults_FeatureSetEditionDefault::_internal_set_edition(::google::protobuf::Edition value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
assert(::google::protobuf::Edition_IsValid(value));
- _impl_._has_bits_[0] |= 0x00000002u;
_impl_.edition_ = value;
}
@@ -18370,7 +18370,6 @@
}
inline ::google::protobuf::FeatureSet* FeatureSetDefaults_FeatureSetEditionDefault::_internal_mutable_features() {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000001u;
if (_impl_.features_ == nullptr) {
auto* p = ::google::protobuf::Message::DefaultConstruct<::google::protobuf::FeatureSet>(GetArena());
_impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(p);
@@ -18378,6 +18377,7 @@
return _impl_.features_;
}
inline ::google::protobuf::FeatureSet* FeatureSetDefaults_FeatureSetEditionDefault::mutable_features() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+ _impl_._has_bits_[0] |= 0x00000001u;
::google::protobuf::FeatureSet* _msg = _internal_mutable_features();
// @@protoc_insertion_point(field_mutable:google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.features)
return _msg;
@@ -18472,6 +18472,7 @@
}
inline void FeatureSetDefaults::set_minimum_edition(::google::protobuf::Edition value) {
_internal_set_minimum_edition(value);
+ _impl_._has_bits_[0] |= 0x00000001u;
// @@protoc_insertion_point(field_set:google.protobuf.FeatureSetDefaults.minimum_edition)
}
inline ::google::protobuf::Edition FeatureSetDefaults::_internal_minimum_edition() const {
@@ -18481,7 +18482,6 @@
inline void FeatureSetDefaults::_internal_set_minimum_edition(::google::protobuf::Edition value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
assert(::google::protobuf::Edition_IsValid(value));
- _impl_._has_bits_[0] |= 0x00000001u;
_impl_.minimum_edition_ = value;
}
@@ -18501,6 +18501,7 @@
}
inline void FeatureSetDefaults::set_maximum_edition(::google::protobuf::Edition value) {
_internal_set_maximum_edition(value);
+ _impl_._has_bits_[0] |= 0x00000002u;
// @@protoc_insertion_point(field_set:google.protobuf.FeatureSetDefaults.maximum_edition)
}
inline ::google::protobuf::Edition FeatureSetDefaults::_internal_maximum_edition() const {
@@ -18510,7 +18511,6 @@
inline void FeatureSetDefaults::_internal_set_maximum_edition(::google::protobuf::Edition value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
assert(::google::protobuf::Edition_IsValid(value));
- _impl_._has_bits_[0] |= 0x00000002u;
_impl_.maximum_edition_ = value;
}
@@ -19040,6 +19040,7 @@
}
inline void GeneratedCodeInfo_Annotation::set_begin(::int32_t value) {
_internal_set_begin(value);
+ _impl_._has_bits_[0] |= 0x00000002u;
// @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.begin)
}
inline ::int32_t GeneratedCodeInfo_Annotation::_internal_begin() const {
@@ -19048,7 +19049,6 @@
}
inline void GeneratedCodeInfo_Annotation::_internal_set_begin(::int32_t value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000002u;
_impl_.begin_ = value;
}
@@ -19068,6 +19068,7 @@
}
inline void GeneratedCodeInfo_Annotation::set_end(::int32_t value) {
_internal_set_end(value);
+ _impl_._has_bits_[0] |= 0x00000004u;
// @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.end)
}
inline ::int32_t GeneratedCodeInfo_Annotation::_internal_end() const {
@@ -19076,7 +19077,6 @@
}
inline void GeneratedCodeInfo_Annotation::_internal_set_end(::int32_t value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
- _impl_._has_bits_[0] |= 0x00000004u;
_impl_.end_ = value;
}
@@ -19096,6 +19096,7 @@
}
inline void GeneratedCodeInfo_Annotation::set_semantic(::google::protobuf::GeneratedCodeInfo_Annotation_Semantic value) {
_internal_set_semantic(value);
+ _impl_._has_bits_[0] |= 0x00000008u;
// @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.semantic)
}
inline ::google::protobuf::GeneratedCodeInfo_Annotation_Semantic GeneratedCodeInfo_Annotation::_internal_semantic() const {
@@ -19105,7 +19106,6 @@
inline void GeneratedCodeInfo_Annotation::_internal_set_semantic(::google::protobuf::GeneratedCodeInfo_Annotation_Semantic value) {
PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
assert(::google::protobuf::GeneratedCodeInfo_Annotation_Semantic_IsValid(value));
- _impl_._has_bits_[0] |= 0x00000008u;
_impl_.semantic_ = value;
}
diff --git a/src/google/protobuf/has_bits.h b/src/google/protobuf/has_bits.h
index 72af335..93cda15 100644
--- a/src/google/protobuf/has_bits.h
+++ b/src/google/protobuf/has_bits.h
@@ -8,6 +8,9 @@
#ifndef GOOGLE_PROTOBUF_HAS_BITS_H__
#define GOOGLE_PROTOBUF_HAS_BITS_H__
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
#include <initializer_list>
#include "google/protobuf/stubs/common.h"
@@ -54,7 +57,12 @@
}
void Or(const HasBits<doublewords>& rhs) {
- for (int i = 0; i < doublewords; i++) has_bits_[i] |= rhs.has_bits_[i];
+ for (int i = 0; (i + 1) < doublewords; i += 2) {
+ Write64B(Read64B(i) | rhs.Read64B(i), i);
+ }
+ if ((doublewords % 2) != 0) {
+ has_bits_[doublewords - 1] |= rhs.has_bits_[doublewords - 1];
+ }
}
bool empty() const;
@@ -75,6 +83,16 @@
}
}
+ uint64_t Read64B(int index) const {
+ uint64_t v;
+ memcpy(&v, has_bits_ + index, sizeof(v));
+ return v;
+ }
+
+ void Write64B(uint64_t v, int index) {
+ memcpy(has_bits_ + index, &v, sizeof(v));
+ }
+
uint32_t has_bits_[doublewords];
};
diff --git a/src/google/protobuf/message_unittest.inc b/src/google/protobuf/message_unittest.inc
index 0dae965..9ae5fae 100644
--- a/src/google/protobuf/message_unittest.inc
+++ b/src/google/protobuf/message_unittest.inc
@@ -101,6 +101,24 @@
}
+TEST(MESSAGE_TEST_NAME, RoundTrip) {
+ UNITTEST::TestAllTypes message;
+ TestUtil::SetAllFields(&message);
+ TestUtil::ExpectAllFieldsSet(message);
+
+ UNITTEST::TestAllTypes copied, merged, parsed;
+ copied = message;
+ TestUtil::ExpectAllFieldsSet(copied);
+
+ merged.MergeFrom(message);
+ TestUtil::ExpectAllFieldsSet(merged);
+
+ std::string data;
+ ASSERT_TRUE(message.SerializeToString(&data));
+ ASSERT_TRUE(parsed.ParseFromString(data));
+ TestUtil::ExpectAllFieldsSet(parsed);
+}
+
TEST(MESSAGE_TEST_NAME, SerializeToBrokenOstream) {
std::ofstream out;
UNITTEST::TestAllTypes message;
