From 363c0e16df99a5d0a720bc6370bf019abc556816 Mon Sep 17 00:00:00 2001 From: Mike Kruskal Date: Thu, 29 Aug 2024 22:41:13 -0700 Subject: [PATCH] Automated rollback of commit 589cf718b43b8a26004d5973d8351ebd5db5fa8b. PiperOrigin-RevId: 669198477 --- .../cpp/field_generators/cord_field.cc | 5 +- .../cpp/field_generators/enum_field.cc | 6 +- .../cpp/field_generators/map_field.cc | 2 +- .../cpp/field_generators/message_field.cc | 8 +- .../cpp/field_generators/primitive_field.cc | 6 +- .../cpp/field_generators/string_field.cc | 12 +- .../cpp/field_generators/string_view_field.cc | 12 +- src/google/protobuf/compiler/cpp/message.cc | 56 +- .../compiler/java/java_features.pb.cc | 26 +- .../protobuf/compiler/java/java_features.pb.h | 44 +- src/google/protobuf/compiler/plugin.pb.cc | 127 +- src/google/protobuf/compiler/plugin.pb.h | 183 +- src/google/protobuf/cpp_features.pb.cc | 26 +- src/google/protobuf/cpp_features.pb.h | 47 +- src/google/protobuf/descriptor.pb.cc | 1052 +++++------ src/google/protobuf/descriptor.pb.h | 1644 +++++++---------- src/google/protobuf/message_lite.h | 11 + 17 files changed, 1380 insertions(+), 1887 deletions(-) diff --git a/src/google/protobuf/compiler/cpp/field_generators/cord_field.cc b/src/google/protobuf/compiler/cpp/field_generators/cord_field.cc index 8f5a3357318b..e1c2116a20ed 100644 --- a/src/google/protobuf/compiler/cpp/field_generators/cord_field.cc +++ b/src/google/protobuf/compiler/cpp/field_generators/cord_field.cc @@ -224,10 +224,9 @@ void CordFieldGenerator::GenerateInlineAccessorDefinitions( void CordFieldGenerator::GenerateClearingCode(io::Printer* printer) const { Formatter format(printer, variables_); if (field_->default_value_string().empty()) { - format("this_.$field$.Clear();\n"); + format("$field$.Clear();\n"); } else { - format( - "this_.$field$ = ::absl::string_view($default$, $default_length$);\n"); + format("$field$ = ::absl::string_view($default$, $default_length$);\n"); } } 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 ec557a152870..b974f7846398 100644 --- a/src/google/protobuf/compiler/cpp/field_generators/enum_field.cc +++ b/src/google/protobuf/compiler/cpp/field_generators/enum_field.cc @@ -68,7 +68,7 @@ class SingularEnum : public FieldGeneratorBase { void GenerateClearingCode(io::Printer* p) const override { p->Emit(R"cc( - this_.$field_$ = $kDefault$; + $field_$ = $kDefault$; )cc"); } @@ -248,9 +248,9 @@ class RepeatedEnum : public FieldGeneratorBase { void GenerateClearingCode(io::Printer* p) const override { if (should_split()) { - p->Emit("this_.$field_$.ClearIfNotDefault();\n"); + p->Emit("$field_$.ClearIfNotDefault();\n"); } else { - p->Emit("this_.$field_$.Clear();\n"); + p->Emit("$field_$.Clear();\n"); } } diff --git a/src/google/protobuf/compiler/cpp/field_generators/map_field.cc b/src/google/protobuf/compiler/cpp/field_generators/map_field.cc index ad37f78d6308..bd6221732b96 100644 --- a/src/google/protobuf/compiler/cpp/field_generators/map_field.cc +++ b/src/google/protobuf/compiler/cpp/field_generators/map_field.cc @@ -89,7 +89,7 @@ class Map : public FieldGeneratorBase { void GenerateClearingCode(io::Printer* p) const override { p->Emit(R"cc( - this_.$field_$.Clear(); + $field_$.Clear(); )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 361a60de3ff8..f304011111af 100644 --- a/src/google/protobuf/compiler/cpp/field_generators/message_field.cc +++ b/src/google/protobuf/compiler/cpp/field_generators/message_field.cc @@ -322,8 +322,8 @@ void SingularMessage::GenerateMessageClearingCode(io::Printer* p) const { ABSL_CHECK(has_hasbit_); p->Emit( R"cc( - $DCHK$(this_.$field_$ != nullptr); - this_.$field_$->Clear(); + $DCHK$($field_$ != nullptr); + $field_$->Clear(); )cc"); } @@ -872,9 +872,9 @@ void RepeatedMessage::GenerateInlineAccessorDefinitions(io::Printer* p) const { void RepeatedMessage::GenerateClearingCode(io::Printer* p) const { if (should_split()) { - p->Emit("this_.$field_$.ClearIfNotDefault();\n"); + p->Emit("$field_$.ClearIfNotDefault();\n"); } else { - p->Emit("this_.$field_$.Clear();\n"); + p->Emit("$field_$.Clear();\n"); } } 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 c352cf94665d..7590512e5acf 100644 --- a/src/google/protobuf/compiler/cpp/field_generators/primitive_field.cc +++ b/src/google/protobuf/compiler/cpp/field_generators/primitive_field.cc @@ -102,7 +102,7 @@ class SingularPrimitive final : public FieldGeneratorBase { void GenerateClearingCode(io::Printer* p) const override { p->Emit(R"cc( - this_.$field_$ = $kDefault$; + $field_$ = $kDefault$; )cc"); } @@ -297,9 +297,9 @@ class RepeatedPrimitive final : public FieldGeneratorBase { void GenerateClearingCode(io::Printer* p) const override { if (should_split()) { - p->Emit("this_.$field_$.ClearIfNotDefault();\n"); + p->Emit("$field_$.ClearIfNotDefault();\n"); } else { - p->Emit("this_.$field_$.Clear();\n"); + p->Emit("$field_$.Clear();\n"); } } diff --git a/src/google/protobuf/compiler/cpp/field_generators/string_field.cc b/src/google/protobuf/compiler/cpp/field_generators/string_field.cc index c3a593672927..fcca9dfc332b 100644 --- a/src/google/protobuf/compiler/cpp/field_generators/string_field.cc +++ b/src/google/protobuf/compiler/cpp/field_generators/string_field.cc @@ -539,7 +539,7 @@ void SingularString::GenerateClearingCode(io::Printer* p) const { void SingularString::GenerateMessageClearingCode(io::Printer* p) const { if (is_oneof()) { p->Emit(R"cc( - this_.$field_$.Destroy(); + $field_$.Destroy(); )cc"); return; } @@ -563,7 +563,7 @@ void SingularString::GenerateMessageClearingCode(io::Printer* p) const { // For non-inlined strings, we distinguish from non-default by comparing // instances, rather than contents. p->Emit(R"cc( - $DCHK$(!this_.$field_$.IsDefault()); + $DCHK$(!$field_$.IsDefault()); )cc"); } @@ -571,7 +571,7 @@ void SingularString::GenerateMessageClearingCode(io::Printer* p) const { // Clear to a non-empty default is more involved, as we try to use the // Arena if one is present and may need to reallocate the string. p->Emit(R"cc( - this_.$field_$.ClearToDefault($lazy_var$, this_.GetArena()); + $field_$.ClearToDefault($lazy_var$, GetArena()); )cc"); return; } @@ -579,7 +579,7 @@ void SingularString::GenerateMessageClearingCode(io::Printer* p) const { p->Emit({{"Clear", HasHasbit(field_) ? "ClearNonDefaultToEmpty" : "ClearToEmpty"}}, R"cc( - this_.$field_$.$Clear$(); + $field_$.$Clear$(); )cc"); } @@ -750,9 +750,9 @@ class RepeatedString : public FieldGeneratorBase { void GenerateClearingCode(io::Printer* p) const override { if (should_split()) { - p->Emit("this_.$field_$.ClearIfNotDefault();\n"); + p->Emit("$field_$.ClearIfNotDefault();\n"); } else { - p->Emit("this_.$field_$.Clear();\n"); + p->Emit("$field_$.Clear();\n"); } } diff --git a/src/google/protobuf/compiler/cpp/field_generators/string_view_field.cc b/src/google/protobuf/compiler/cpp/field_generators/string_view_field.cc index 802fc718f6cb..204cabc6a9d3 100644 --- a/src/google/protobuf/compiler/cpp/field_generators/string_view_field.cc +++ b/src/google/protobuf/compiler/cpp/field_generators/string_view_field.cc @@ -374,7 +374,7 @@ void SingularStringView::GenerateClearingCode(io::Printer* p) const { void SingularStringView::GenerateMessageClearingCode(io::Printer* p) const { if (is_oneof()) { p->Emit(R"cc( - this_.$field_$.Destroy(); + $field_$.Destroy(); )cc"); return; } @@ -390,7 +390,7 @@ void SingularStringView::GenerateMessageClearingCode(io::Printer* p) const { if (is_inlined() && HasHasbit(field_)) { p->Emit(R"cc( - $DCHK$(!this_.$field_$.IsDefault()); + $DCHK$(!$field_$.IsDefault()); )cc"); } @@ -398,7 +398,7 @@ void SingularStringView::GenerateMessageClearingCode(io::Printer* p) const { // Clear to a non-empty default is more involved, as we try to use the // Arena if one is present and may need to reallocate the string. p->Emit(R"cc( - this_.$field_$.ClearToDefault($lazy_var$, this_.GetArena()); + $field_$.ClearToDefault($lazy_var$, GetArena()); )cc"); return; } @@ -406,7 +406,7 @@ void SingularStringView::GenerateMessageClearingCode(io::Printer* p) const { p->Emit({{"Clear", HasHasbit(field_) ? "ClearNonDefaultToEmpty" : "ClearToEmpty"}}, R"cc( - this_.$field_$.$Clear$(); + $field_$.$Clear$(); )cc"); } @@ -577,9 +577,9 @@ class RepeatedStringView : public FieldGeneratorBase { void GenerateClearingCode(io::Printer* p) const override { if (should_split()) { - p->Emit("this_.$field_$.ClearIfNotDefault();\n"); + p->Emit("$field_$.ClearIfNotDefault();\n"); } else { - p->Emit("this_.$field_$.Clear();\n"); + p->Emit("$field_$.Clear();\n"); } } diff --git a/src/google/protobuf/compiler/cpp/message.cc b/src/google/protobuf/compiler/cpp/message.cc index f0c141fe8ea8..daf0ed3615c2 100644 --- a/src/google/protobuf/compiler/cpp/message.cc +++ b/src/google/protobuf/compiler/cpp/message.cc @@ -92,16 +92,16 @@ std::string ConditionalToCheckBitmasks( return result + (return_success ? " == 0" : " != 0"); } -void PrintPresenceCheck(const FieldDescriptor* field, absl::string_view prefix, +void PrintPresenceCheck(const FieldDescriptor* field, const std::vector& has_bit_indices, io::Printer* p, int* cached_has_word_index) { if (!field->options().weak()) { int has_bit_index = has_bit_indices[field->index()]; if (*cached_has_word_index != (has_bit_index / 32)) { *cached_has_word_index = (has_bit_index / 32); - p->Emit({{"prefix", prefix}, {"index", *cached_has_word_index}}, + p->Emit({{"index", *cached_has_word_index}}, R"cc( - cached_has_bits = $prefix$$has_bits$[$index$]; + cached_has_bits = $has_bits$[$index$]; )cc"); } p->Emit({{"mask", absl::StrFormat("0x%08xu", 1u << (has_bit_index % 32))}}, @@ -1171,7 +1171,6 @@ void MessageGenerator::GenerateFieldClear(const FieldDescriptor* field, }}}, R"cc( $inline $void $classname$::clear_$name$() { - $classname$& this_ PROTOBUF_UNUSED = *this; $pbi$::TSanWrite(&_impl_); $WeakDescriptorSelfPin$; $body$; @@ -1860,16 +1859,15 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) { // virtual overrides. This reduces the number of functions in the // binary in both modes. p->Emit(R"cc( + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) private: - static void Clear(MessageLite& msg); static ::size_t ByteSizeLong(const ::$proto_ns$::MessageLite& msg); static $uint8$* _InternalSerialize( const MessageLite& msg, $uint8$* target, ::$proto_ns$::io::EpsCopyOutputStream* stream); public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } $uint8$* _InternalSerialize( $uint8$* target, @@ -1877,7 +1875,6 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) { return _InternalSerialize(*this, target, stream); } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; ::size_t ByteSizeLong() const final; $uint8$* _InternalSerialize( $uint8$* target, @@ -3448,19 +3445,12 @@ void MessageGenerator::GenerateClear(io::Printer* p) { // hasbit to see if a zero-init is necessary. const int kMaxUnconditionalPrimitiveBytesClear = 4; - p->Emit(R"cc( -#if defined(PROTOBUF_CUSTOM_VTABLE) - void $classname$::Clear(MessageLite& base) { - $classname$& this_ = static_cast<$classname$&>(base); -#else // PROTOBUF_CUSTOM_VTABLE - void $classname$::Clear() { - $classname$& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:$full_name$) - )cc"); + format( + "PROTOBUF_NOINLINE void $classname$::Clear() {\n" + "// @@protoc_insertion_point(message_clear_start:$full_name$)\n"); format.Indent(); - format("$pbi$::TSanWrite(&this_._impl_);\n"); + format("$pbi$::TSanWrite(&_impl_);\n"); format( // TODO: It would be better to avoid emitting this if it is not used, @@ -3470,7 +3460,7 @@ void MessageGenerator::GenerateClear(io::Printer* p) { "(void) cached_has_bits;\n\n"); if (descriptor_->extension_range_count() > 0) { - format("this_.$extensions$.Clear();\n"); + format("$extensions$.Clear();\n"); } // Collect fields into chunks. Each chunk may have an if() condition that @@ -3506,14 +3496,13 @@ void MessageGenerator::GenerateClear(io::Printer* p) { int cached_has_word_index = -1; while (it != end) { auto next = FindNextUnequalChunk(it, end, MayGroupChunksForHaswordsCheck); - bool has_haswords_check = - MaybeEmitHaswordsCheck(it, next, options_, has_bit_indices_, - cached_has_word_index, "this_.", p); + bool has_haswords_check = MaybeEmitHaswordsCheck( + it, next, options_, has_bit_indices_, cached_has_word_index, "", p); bool has_default_split_check = !it->fields.empty() && it->should_split; if (has_default_split_check) { // Some fields are cleared without checking has_bit. So we add the // condition here to avoid writing to the default split instance. - format("if (!this_.IsSplitMessageDefault()) {\n"); + format("if (!IsSplitMessageDefault()) {\n"); format.Indent(); } while (it != next) { @@ -3559,8 +3548,7 @@ void MessageGenerator::GenerateClear(io::Printer* p) { if (cached_has_word_index != HasWordIndex(fields.front())) { cached_has_word_index = HasWordIndex(fields.front()); - format("cached_has_bits = this_.$has_bits$[$1$];\n", - cached_has_word_index); + format("cached_has_bits = $has_bits$[$1$];\n", cached_has_word_index); } format("if (cached_has_bits & 0x$1$u) {\n", chunk_mask_str); format.Indent(); @@ -3574,9 +3562,9 @@ void MessageGenerator::GenerateClear(io::Printer* p) { ABSL_CHECK_EQ(chunk_is_split, ShouldSplit(memset_start, options_)); ABSL_CHECK_EQ(chunk_is_split, ShouldSplit(memset_end, options_)); format( - "::memset(&this_.$1$, 0, static_cast<::size_t>(\n" - " reinterpret_cast(&this_.$2$) -\n" - " reinterpret_cast(&this_.$1$)) + sizeof($2$));\n", + "::memset(&$1$, 0, static_cast<::size_t>(\n" + " reinterpret_cast(&$2$) -\n" + " reinterpret_cast(&$1$)) + sizeof($2$));\n", FieldMemberName(memset_start, chunk_is_split), FieldMemberName(memset_end, chunk_is_split)); } @@ -3595,7 +3583,7 @@ void MessageGenerator::GenerateClear(io::Printer* p) { field->cpp_type() == FieldDescriptor::CPPTYPE_STRING); if (have_enclosing_if) { - PrintPresenceCheck(field, "this_.", has_bit_indices_, p, + PrintPresenceCheck(field, has_bit_indices_, p, &cached_has_word_index); format.Indent(); } @@ -3633,21 +3621,21 @@ void MessageGenerator::GenerateClear(io::Printer* p) { } // Step 4: Unions. for (auto oneof : OneOfRange(descriptor_)) { - format("this_.clear_$1$();\n", oneof->name()); + format("clear_$1$();\n", oneof->name()); } if (num_weak_fields_) { - format("this_.$weak_field_map$.ClearAll();\n"); + format("$weak_field_map$.ClearAll();\n"); } // We don't clear donated status. if (!has_bit_indices_.empty()) { // Step 5: Everything else. - format("this_.$has_bits$.Clear();\n"); + format("$has_bits$.Clear();\n"); } - format("this_._internal_metadata_.Clear<$unknown_fields_type$>();\n"); + format("_internal_metadata_.Clear<$unknown_fields_type$>();\n"); format.Outdent(); format("}\n"); @@ -4004,7 +3992,7 @@ void MessageGenerator::GenerateClassData(io::Printer* p) { if (HasGeneratedMethods(descriptor_->file(), options_) && !IsMapEntryMessage(descriptor_)) { p->Emit(R"cc( - &$classname$::Clear, &$classname$::ByteSizeLong, + $superclass$::GetClearImpl<$classname$>(), &$classname$::ByteSizeLong, &$classname$::_InternalSerialize, )cc"); } else { diff --git a/src/google/protobuf/compiler/java/java_features.pb.cc b/src/google/protobuf/compiler/java/java_features.pb.cc index 276776343609..4c92088b6c19 100644 --- a/src/google/protobuf/compiler/java/java_features.pb.cc +++ b/src/google/protobuf/compiler/java/java_features.pb.cc @@ -214,7 +214,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &JavaFeatures::Clear, &JavaFeatures::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &JavaFeatures::ByteSizeLong, &JavaFeatures::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(JavaFeatures, _impl_._cached_size_), @@ -269,27 +269,21 @@ const ::_pbi::TcParseTable<1, 2, 1, 0, 2> JavaFeatures::_table_ = { }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void JavaFeatures::Clear(MessageLite& base) { - JavaFeatures& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void JavaFeatures::Clear() { - JavaFeatures& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:pb.JavaFeatures) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void JavaFeatures::Clear() { +// @@protoc_insertion_point(message_clear_start:pb.JavaFeatures) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - cached_has_bits = this_._impl_._has_bits_[0]; + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000003u) { - ::memset(&this_._impl_.legacy_closed_enum_, 0, static_cast<::size_t>( - reinterpret_cast(&this_._impl_.utf8_validation_) - - reinterpret_cast(&this_._impl_.legacy_closed_enum_)) + sizeof(_impl_.utf8_validation_)); + ::memset(&_impl_.legacy_closed_enum_, 0, static_cast<::size_t>( + reinterpret_cast(&_impl_.utf8_validation_) - + reinterpret_cast(&_impl_.legacy_closed_enum_)) + sizeof(_impl_.utf8_validation_)); } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) diff --git a/src/google/protobuf/compiler/java/java_features.pb.h b/src/google/protobuf/compiler/java/java_features.pb.h index 7163d696a8e2..add37c10b348 100644 --- a/src/google/protobuf/compiler/java/java_features.pb.h +++ b/src/google/protobuf/compiler/java/java_features.pb.h @@ -192,28 +192,26 @@ class PROTOC_EXPORT JavaFeatures final : public ::google::protobuf::Message bool IsInitialized() const { return true; } + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -350,9 +348,8 @@ inline bool JavaFeatures::has_legacy_closed_enum() const { return value; } inline void JavaFeatures::clear_legacy_closed_enum() { - JavaFeatures& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.legacy_closed_enum_ = false; + _impl_.legacy_closed_enum_ = false; _impl_._has_bits_[0] &= ~0x00000001u; } inline bool JavaFeatures::legacy_closed_enum() const { @@ -379,9 +376,8 @@ inline bool JavaFeatures::has_utf8_validation() const { return value; } inline void JavaFeatures::clear_utf8_validation() { - JavaFeatures& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.utf8_validation_ = 0; + _impl_.utf8_validation_ = 0; _impl_._has_bits_[0] &= ~0x00000002u; } inline ::pb::JavaFeatures_Utf8Validation JavaFeatures::utf8_validation() const { diff --git a/src/google/protobuf/compiler/plugin.pb.cc b/src/google/protobuf/compiler/plugin.pb.cc index d15bcc12278c..3f22130ece12 100644 --- a/src/google/protobuf/compiler/plugin.pb.cc +++ b/src/google/protobuf/compiler/plugin.pb.cc @@ -412,7 +412,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &Version::Clear, &Version::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &Version::ByteSizeLong, &Version::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(Version, _impl_._cached_size_), @@ -482,30 +482,24 @@ const ::_pbi::TcParseTable<2, 4, 0, 47, 2> Version::_table_ = { }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void Version::Clear(MessageLite& base) { - Version& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void Version::Clear() { - Version& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.compiler.Version) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void Version::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.compiler.Version) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - cached_has_bits = this_._impl_._has_bits_[0]; + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000001u) { - this_._impl_.suffix_.ClearNonDefaultToEmpty(); + _impl_.suffix_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x0000000eu) { - ::memset(&this_._impl_.major_, 0, static_cast<::size_t>( - reinterpret_cast(&this_._impl_.patch_) - - reinterpret_cast(&this_._impl_.major_)) + sizeof(_impl_.patch_)); + ::memset(&_impl_.major_, 0, static_cast<::size_t>( + reinterpret_cast(&_impl_.patch_) - + reinterpret_cast(&_impl_.major_)) + sizeof(_impl_.patch_)); } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -668,14 +662,12 @@ class CodeGeneratorRequest::_Internal { }; void CodeGeneratorRequest::clear_proto_file() { - CodeGeneratorRequest& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.proto_file_.Clear(); + _impl_.proto_file_.Clear(); } void CodeGeneratorRequest::clear_source_file_descriptors() { - CodeGeneratorRequest& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.source_file_descriptors_.Clear(); + _impl_.source_file_descriptors_.Clear(); } CodeGeneratorRequest::CodeGeneratorRequest(::google::protobuf::Arena* arena) #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -780,7 +772,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &CodeGeneratorRequest::Clear, &CodeGeneratorRequest::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &CodeGeneratorRequest::ByteSizeLong, &CodeGeneratorRequest::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(CodeGeneratorRequest, _impl_._cached_size_), @@ -860,34 +852,28 @@ const ::_pbi::TcParseTable<3, 5, 3, 79, 2> CodeGeneratorRequest::_table_ = { }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void CodeGeneratorRequest::Clear(MessageLite& base) { - CodeGeneratorRequest& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void CodeGeneratorRequest::Clear() { - CodeGeneratorRequest& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.compiler.CodeGeneratorRequest) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void CodeGeneratorRequest::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.compiler.CodeGeneratorRequest) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - this_._impl_.file_to_generate_.Clear(); - this_._impl_.proto_file_.Clear(); - this_._impl_.source_file_descriptors_.Clear(); - cached_has_bits = this_._impl_._has_bits_[0]; + _impl_.file_to_generate_.Clear(); + _impl_.proto_file_.Clear(); + _impl_.source_file_descriptors_.Clear(); + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000003u) { if (cached_has_bits & 0x00000001u) { - this_._impl_.parameter_.ClearNonDefaultToEmpty(); + _impl_.parameter_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000002u) { - ABSL_DCHECK(this_._impl_.compiler_version_ != nullptr); - this_._impl_.compiler_version_->Clear(); + ABSL_DCHECK(_impl_.compiler_version_ != nullptr); + _impl_.compiler_version_->Clear(); } } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -1094,7 +1080,6 @@ class CodeGeneratorResponse_File::_Internal { }; void CodeGeneratorResponse_File::clear_generated_code_info() { - CodeGeneratorResponse_File& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.generated_code_info_ != nullptr) _impl_.generated_code_info_->Clear(); _impl_._has_bits_[0] &= ~0x00000008u; @@ -1183,7 +1168,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &CodeGeneratorResponse_File::Clear, &CodeGeneratorResponse_File::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &CodeGeneratorResponse_File::ByteSizeLong, &CodeGeneratorResponse_File::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(CodeGeneratorResponse_File, _impl_._cached_size_), @@ -1255,37 +1240,31 @@ const ::_pbi::TcParseTable<2, 4, 1, 86, 2> CodeGeneratorResponse_File::_table_ = }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void CodeGeneratorResponse_File::Clear(MessageLite& base) { - CodeGeneratorResponse_File& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void CodeGeneratorResponse_File::Clear() { - CodeGeneratorResponse_File& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.compiler.CodeGeneratorResponse.File) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void CodeGeneratorResponse_File::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.compiler.CodeGeneratorResponse.File) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - cached_has_bits = this_._impl_._has_bits_[0]; + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x0000000fu) { if (cached_has_bits & 0x00000001u) { - this_._impl_.name_.ClearNonDefaultToEmpty(); + _impl_.name_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000002u) { - this_._impl_.insertion_point_.ClearNonDefaultToEmpty(); + _impl_.insertion_point_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000004u) { - this_._impl_.content_.ClearNonDefaultToEmpty(); + _impl_.content_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000008u) { - ABSL_DCHECK(this_._impl_.generated_code_info_ != nullptr); - this_._impl_.generated_code_info_->Clear(); + ABSL_DCHECK(_impl_.generated_code_info_ != nullptr); + _impl_.generated_code_info_->Clear(); } } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -1551,7 +1530,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &CodeGeneratorResponse::Clear, &CodeGeneratorResponse::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &CodeGeneratorResponse::ByteSizeLong, &CodeGeneratorResponse::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(CodeGeneratorResponse, _impl_._cached_size_), @@ -1630,31 +1609,25 @@ const ::_pbi::TcParseTable<3, 5, 1, 60, 2> CodeGeneratorResponse::_table_ = { }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void CodeGeneratorResponse::Clear(MessageLite& base) { - CodeGeneratorResponse& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void CodeGeneratorResponse::Clear() { - CodeGeneratorResponse& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.compiler.CodeGeneratorResponse) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void CodeGeneratorResponse::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.compiler.CodeGeneratorResponse) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - this_._impl_.file_.Clear(); - cached_has_bits = this_._impl_._has_bits_[0]; + _impl_.file_.Clear(); + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000001u) { - this_._impl_.error_.ClearNonDefaultToEmpty(); + _impl_.error_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x0000000eu) { - ::memset(&this_._impl_.supported_features_, 0, static_cast<::size_t>( - reinterpret_cast(&this_._impl_.maximum_edition_) - - reinterpret_cast(&this_._impl_.supported_features_)) + sizeof(_impl_.maximum_edition_)); + ::memset(&_impl_.supported_features_, 0, static_cast<::size_t>( + reinterpret_cast(&_impl_.maximum_edition_) - + reinterpret_cast(&_impl_.supported_features_)) + sizeof(_impl_.maximum_edition_)); } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h index 83c86ae61257..e34fd5976b33 100644 --- a/src/google/protobuf/compiler/plugin.pb.h +++ b/src/google/protobuf/compiler/plugin.pb.h @@ -209,28 +209,26 @@ class PROTOC_EXPORT Version final : public ::google::protobuf::Message bool IsInitialized() const { return true; } + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -447,28 +445,26 @@ class PROTOC_EXPORT CodeGeneratorResponse_File final : public ::google::protobuf bool IsInitialized() const { return true; } + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -701,28 +697,26 @@ class PROTOC_EXPORT CodeGeneratorResponse final : public ::google::protobuf::Mes bool IsInitialized() const { return true; } + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -984,28 +978,26 @@ class PROTOC_EXPORT CodeGeneratorRequest final : public ::google::protobuf::Mess static bool IsInitializedImpl(const MessageLite& msg); public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -1189,9 +1181,8 @@ inline bool Version::has_major() const { return value; } inline void Version::clear_major() { - Version& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.major_ = 0; + _impl_.major_ = 0; _impl_._has_bits_[0] &= ~0x00000002u; } inline ::int32_t Version::major() const { @@ -1218,9 +1209,8 @@ inline bool Version::has_minor() const { return value; } inline void Version::clear_minor() { - Version& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.minor_ = 0; + _impl_.minor_ = 0; _impl_._has_bits_[0] &= ~0x00000004u; } inline ::int32_t Version::minor() const { @@ -1247,9 +1237,8 @@ inline bool Version::has_patch() const { return value; } inline void Version::clear_patch() { - Version& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.patch_ = 0; + _impl_.patch_ = 0; _impl_._has_bits_[0] &= ~0x00000008u; } inline ::int32_t Version::patch() const { @@ -1276,7 +1265,6 @@ inline bool Version::has_suffix() const { return value; } inline void Version::clear_suffix() { - Version& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.suffix_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -1354,9 +1342,8 @@ inline int CodeGeneratorRequest::file_to_generate_size() const { return _internal_file_to_generate_size(); } inline void CodeGeneratorRequest::clear_file_to_generate() { - CodeGeneratorRequest& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.file_to_generate_.Clear(); + _impl_.file_to_generate_.Clear(); } inline std::string* CodeGeneratorRequest::add_file_to_generate() ABSL_ATTRIBUTE_LIFETIME_BOUND { ::google::protobuf::internal::TSanWrite(&_impl_); @@ -1417,7 +1404,6 @@ inline bool CodeGeneratorRequest::has_parameter() const { return value; } inline void CodeGeneratorRequest::clear_parameter() { - CodeGeneratorRequest& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.parameter_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -1580,7 +1566,6 @@ inline bool CodeGeneratorRequest::has_compiler_version() const { return value; } inline void CodeGeneratorRequest::clear_compiler_version() { - CodeGeneratorRequest& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.compiler_version_ != nullptr) _impl_.compiler_version_->Clear(); _impl_._has_bits_[0] &= ~0x00000002u; @@ -1680,7 +1665,6 @@ inline bool CodeGeneratorResponse_File::has_name() const { return value; } inline void CodeGeneratorResponse_File::clear_name() { - CodeGeneratorResponse_File& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.name_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -1752,7 +1736,6 @@ inline bool CodeGeneratorResponse_File::has_insertion_point() const { return value; } inline void CodeGeneratorResponse_File::clear_insertion_point() { - CodeGeneratorResponse_File& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.insertion_point_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000002u; @@ -1824,7 +1807,6 @@ inline bool CodeGeneratorResponse_File::has_content() const { return value; } inline void CodeGeneratorResponse_File::clear_content() { - CodeGeneratorResponse_File& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.content_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000004u; @@ -1991,7 +1973,6 @@ inline bool CodeGeneratorResponse::has_error() const { return value; } inline void CodeGeneratorResponse::clear_error() { - CodeGeneratorResponse& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.error_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -2063,9 +2044,8 @@ inline bool CodeGeneratorResponse::has_supported_features() const { return value; } inline void CodeGeneratorResponse::clear_supported_features() { - CodeGeneratorResponse& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.supported_features_ = ::uint64_t{0u}; + _impl_.supported_features_ = ::uint64_t{0u}; _impl_._has_bits_[0] &= ~0x00000002u; } inline ::uint64_t CodeGeneratorResponse::supported_features() const { @@ -2092,9 +2072,8 @@ inline bool CodeGeneratorResponse::has_minimum_edition() const { return value; } inline void CodeGeneratorResponse::clear_minimum_edition() { - CodeGeneratorResponse& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.minimum_edition_ = 0; + _impl_.minimum_edition_ = 0; _impl_._has_bits_[0] &= ~0x00000004u; } inline ::int32_t CodeGeneratorResponse::minimum_edition() const { @@ -2121,9 +2100,8 @@ inline bool CodeGeneratorResponse::has_maximum_edition() const { return value; } inline void CodeGeneratorResponse::clear_maximum_edition() { - CodeGeneratorResponse& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.maximum_edition_ = 0; + _impl_.maximum_edition_ = 0; _impl_._has_bits_[0] &= ~0x00000008u; } inline ::int32_t CodeGeneratorResponse::maximum_edition() const { @@ -2152,9 +2130,8 @@ inline int CodeGeneratorResponse::file_size() const { return _internal_file_size(); } inline void CodeGeneratorResponse::clear_file() { - CodeGeneratorResponse& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.file_.Clear(); + _impl_.file_.Clear(); } inline ::google::protobuf::compiler::CodeGeneratorResponse_File* CodeGeneratorResponse::mutable_file(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { diff --git a/src/google/protobuf/cpp_features.pb.cc b/src/google/protobuf/cpp_features.pb.cc index d160b0ccc485..50f1979657f5 100644 --- a/src/google/protobuf/cpp_features.pb.cc +++ b/src/google/protobuf/cpp_features.pb.cc @@ -214,7 +214,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &CppFeatures::Clear, &CppFeatures::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &CppFeatures::ByteSizeLong, &CppFeatures::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(CppFeatures, _impl_._cached_size_), @@ -276,27 +276,21 @@ const ::_pbi::TcParseTable<2, 3, 1, 0, 2> CppFeatures::_table_ = { }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void CppFeatures::Clear(MessageLite& base) { - CppFeatures& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void CppFeatures::Clear() { - CppFeatures& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:pb.CppFeatures) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void CppFeatures::Clear() { +// @@protoc_insertion_point(message_clear_start:pb.CppFeatures) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - cached_has_bits = this_._impl_._has_bits_[0]; + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000007u) { - ::memset(&this_._impl_.string_type_, 0, static_cast<::size_t>( - reinterpret_cast(&this_._impl_.enum_name_uses_string_view_) - - reinterpret_cast(&this_._impl_.string_type_)) + sizeof(_impl_.enum_name_uses_string_view_)); + ::memset(&_impl_.string_type_, 0, static_cast<::size_t>( + reinterpret_cast(&_impl_.enum_name_uses_string_view_) - + reinterpret_cast(&_impl_.string_type_)) + sizeof(_impl_.enum_name_uses_string_view_)); } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) diff --git a/src/google/protobuf/cpp_features.pb.h b/src/google/protobuf/cpp_features.pb.h index b3b104a87862..22d009042b1c 100644 --- a/src/google/protobuf/cpp_features.pb.h +++ b/src/google/protobuf/cpp_features.pb.h @@ -193,28 +193,26 @@ class PROTOBUF_EXPORT CppFeatures final : public ::google::protobuf::Message bool IsInitialized() const { return true; } + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -365,9 +363,8 @@ inline bool CppFeatures::has_legacy_closed_enum() const { return value; } inline void CppFeatures::clear_legacy_closed_enum() { - CppFeatures& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.legacy_closed_enum_ = false; + _impl_.legacy_closed_enum_ = false; _impl_._has_bits_[0] &= ~0x00000002u; } inline bool CppFeatures::legacy_closed_enum() const { @@ -394,9 +391,8 @@ inline bool CppFeatures::has_string_type() const { return value; } inline void CppFeatures::clear_string_type() { - CppFeatures& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.string_type_ = 0; + _impl_.string_type_ = 0; _impl_._has_bits_[0] &= ~0x00000001u; } inline ::pb::CppFeatures_StringType CppFeatures::string_type() const { @@ -424,9 +420,8 @@ inline bool CppFeatures::has_enum_name_uses_string_view() const { return value; } inline void CppFeatures::clear_enum_name_uses_string_view() { - CppFeatures& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.enum_name_uses_string_view_ = false; + _impl_.enum_name_uses_string_view_ = false; _impl_._has_bits_[0] &= ~0x00000004u; } inline bool CppFeatures::enum_name_uses_string_view() const { diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc index 831cc8943a1e..2e07e9bd7b1e 100644 --- a/src/google/protobuf/descriptor.pb.cc +++ b/src/google/protobuf/descriptor.pb.cc @@ -2687,7 +2687,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &FileDescriptorSet::Clear, &FileDescriptorSet::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &FileDescriptorSet::ByteSizeLong, &FileDescriptorSet::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(FileDescriptorSet, _impl_._cached_size_), @@ -2735,21 +2735,15 @@ constexpr ::_pbi::TcParseTable<0, 1, 1, 0, 2> FileDescriptorSet::_table_ = { }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void FileDescriptorSet::Clear(MessageLite& base) { - FileDescriptorSet& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void FileDescriptorSet::Clear() { - FileDescriptorSet& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.FileDescriptorSet) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void FileDescriptorSet::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.FileDescriptorSet) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - this_._impl_.file_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_.file_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -3005,7 +2999,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &FileDescriptorProto::Clear, &FileDescriptorProto::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &FileDescriptorProto::ByteSizeLong, &FileDescriptorProto::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(FileDescriptorProto, _impl_._cached_size_), @@ -3140,49 +3134,43 @@ constexpr ::_pbi::TcParseTable<4, 13, 7, 79, 2> FileDescriptorProto::_table_ = { }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void FileDescriptorProto::Clear(MessageLite& base) { - FileDescriptorProto& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void FileDescriptorProto::Clear() { - FileDescriptorProto& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.FileDescriptorProto) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void FileDescriptorProto::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.FileDescriptorProto) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - this_._impl_.dependency_.Clear(); - this_._impl_.message_type_.Clear(); - this_._impl_.enum_type_.Clear(); - this_._impl_.service_.Clear(); - this_._impl_.extension_.Clear(); - this_._impl_.public_dependency_.Clear(); - this_._impl_.weak_dependency_.Clear(); - cached_has_bits = this_._impl_._has_bits_[0]; + _impl_.dependency_.Clear(); + _impl_.message_type_.Clear(); + _impl_.enum_type_.Clear(); + _impl_.service_.Clear(); + _impl_.extension_.Clear(); + _impl_.public_dependency_.Clear(); + _impl_.weak_dependency_.Clear(); + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x0000001fu) { if (cached_has_bits & 0x00000001u) { - this_._impl_.name_.ClearNonDefaultToEmpty(); + _impl_.name_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000002u) { - this_._impl_.package_.ClearNonDefaultToEmpty(); + _impl_.package_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000004u) { - this_._impl_.syntax_.ClearNonDefaultToEmpty(); + _impl_.syntax_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000008u) { - ABSL_DCHECK(this_._impl_.options_ != nullptr); - this_._impl_.options_->Clear(); + ABSL_DCHECK(_impl_.options_ != nullptr); + _impl_.options_->Clear(); } if (cached_has_bits & 0x00000010u) { - ABSL_DCHECK(this_._impl_.source_code_info_ != nullptr); - this_._impl_.source_code_info_->Clear(); + ABSL_DCHECK(_impl_.source_code_info_ != nullptr); + _impl_.source_code_info_->Clear(); } } - this_._impl_.edition_ = 0; - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_.edition_ = 0; + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -3633,7 +3621,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &DescriptorProto_ExtensionRange::Clear, &DescriptorProto_ExtensionRange::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &DescriptorProto_ExtensionRange::ByteSizeLong, &DescriptorProto_ExtensionRange::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(DescriptorProto_ExtensionRange, _impl_._cached_size_), @@ -3694,31 +3682,25 @@ constexpr ::_pbi::TcParseTable<2, 3, 1, 0, 2> DescriptorProto_ExtensionRange::_t }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void DescriptorProto_ExtensionRange::Clear(MessageLite& base) { - DescriptorProto_ExtensionRange& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void DescriptorProto_ExtensionRange::Clear() { - DescriptorProto_ExtensionRange& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.DescriptorProto.ExtensionRange) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void DescriptorProto_ExtensionRange::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.DescriptorProto.ExtensionRange) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - cached_has_bits = this_._impl_._has_bits_[0]; + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000001u) { - ABSL_DCHECK(this_._impl_.options_ != nullptr); - this_._impl_.options_->Clear(); + ABSL_DCHECK(_impl_.options_ != nullptr); + _impl_.options_->Clear(); } if (cached_has_bits & 0x00000006u) { - ::memset(&this_._impl_.start_, 0, static_cast<::size_t>( - reinterpret_cast(&this_._impl_.end_) - - reinterpret_cast(&this_._impl_.start_)) + sizeof(_impl_.end_)); + ::memset(&_impl_.start_, 0, static_cast<::size_t>( + reinterpret_cast(&_impl_.end_) - + reinterpret_cast(&_impl_.start_)) + sizeof(_impl_.end_)); } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -3934,7 +3916,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &DescriptorProto_ReservedRange::Clear, &DescriptorProto_ReservedRange::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &DescriptorProto_ReservedRange::ByteSizeLong, &DescriptorProto_ReservedRange::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(DescriptorProto_ReservedRange, _impl_._cached_size_), @@ -3988,27 +3970,21 @@ constexpr ::_pbi::TcParseTable<1, 2, 0, 0, 2> DescriptorProto_ReservedRange::_ta }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void DescriptorProto_ReservedRange::Clear(MessageLite& base) { - DescriptorProto_ReservedRange& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void DescriptorProto_ReservedRange::Clear() { - DescriptorProto_ReservedRange& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.DescriptorProto.ReservedRange) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void DescriptorProto_ReservedRange::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.DescriptorProto.ReservedRange) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - cached_has_bits = this_._impl_._has_bits_[0]; + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000003u) { - ::memset(&this_._impl_.start_, 0, static_cast<::size_t>( - reinterpret_cast(&this_._impl_.end_) - - reinterpret_cast(&this_._impl_.start_)) + sizeof(_impl_.end_)); + ::memset(&_impl_.start_, 0, static_cast<::size_t>( + reinterpret_cast(&_impl_.end_) - + reinterpret_cast(&_impl_.start_)) + sizeof(_impl_.end_)); } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -4269,7 +4245,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &DescriptorProto::Clear, &DescriptorProto::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &DescriptorProto::ByteSizeLong, &DescriptorProto::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(DescriptorProto, _impl_._cached_size_), @@ -4388,39 +4364,33 @@ constexpr ::_pbi::TcParseTable<4, 10, 8, 65, 2> DescriptorProto::_table_ = { }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void DescriptorProto::Clear(MessageLite& base) { - DescriptorProto& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void DescriptorProto::Clear() { - DescriptorProto& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.DescriptorProto) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void DescriptorProto::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.DescriptorProto) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - this_._impl_.field_.Clear(); - this_._impl_.nested_type_.Clear(); - this_._impl_.enum_type_.Clear(); - this_._impl_.extension_range_.Clear(); - this_._impl_.extension_.Clear(); - this_._impl_.oneof_decl_.Clear(); - this_._impl_.reserved_range_.Clear(); - this_._impl_.reserved_name_.Clear(); - cached_has_bits = this_._impl_._has_bits_[0]; + _impl_.field_.Clear(); + _impl_.nested_type_.Clear(); + _impl_.enum_type_.Clear(); + _impl_.extension_range_.Clear(); + _impl_.extension_.Clear(); + _impl_.oneof_decl_.Clear(); + _impl_.reserved_range_.Clear(); + _impl_.reserved_name_.Clear(); + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000003u) { if (cached_has_bits & 0x00000001u) { - this_._impl_.name_.ClearNonDefaultToEmpty(); + _impl_.name_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000002u) { - ABSL_DCHECK(this_._impl_.options_ != nullptr); - this_._impl_.options_->Clear(); + ABSL_DCHECK(_impl_.options_ != nullptr); + _impl_.options_->Clear(); } } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -4830,7 +4800,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &ExtensionRangeOptions_Declaration::Clear, &ExtensionRangeOptions_Declaration::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &ExtensionRangeOptions_Declaration::ByteSizeLong, &ExtensionRangeOptions_Declaration::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(ExtensionRangeOptions_Declaration, _impl_._cached_size_), @@ -4909,35 +4879,29 @@ constexpr ::_pbi::TcParseTable<3, 5, 0, 71, 2> ExtensionRangeOptions_Declaration }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void ExtensionRangeOptions_Declaration::Clear(MessageLite& base) { - ExtensionRangeOptions_Declaration& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void ExtensionRangeOptions_Declaration::Clear() { - ExtensionRangeOptions_Declaration& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.ExtensionRangeOptions.Declaration) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void ExtensionRangeOptions_Declaration::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.ExtensionRangeOptions.Declaration) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - cached_has_bits = this_._impl_._has_bits_[0]; + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000003u) { if (cached_has_bits & 0x00000001u) { - this_._impl_.full_name_.ClearNonDefaultToEmpty(); + _impl_.full_name_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000002u) { - this_._impl_.type_.ClearNonDefaultToEmpty(); + _impl_.type_.ClearNonDefaultToEmpty(); } } if (cached_has_bits & 0x0000001cu) { - ::memset(&this_._impl_.number_, 0, static_cast<::size_t>( - reinterpret_cast(&this_._impl_.repeated_) - - reinterpret_cast(&this_._impl_.number_)) + sizeof(_impl_.repeated_)); + ::memset(&_impl_.number_, 0, static_cast<::size_t>( + reinterpret_cast(&_impl_.repeated_) - + reinterpret_cast(&_impl_.number_)) + sizeof(_impl_.repeated_)); } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -5216,7 +5180,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &ExtensionRangeOptions::Clear, &ExtensionRangeOptions::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &ExtensionRangeOptions::ByteSizeLong, &ExtensionRangeOptions::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(ExtensionRangeOptions, _impl_._cached_size_), @@ -5290,32 +5254,26 @@ constexpr ::_pbi::TcParseTable<3, 4, 4, 0, 12> ExtensionRangeOptions::_table_ = }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void ExtensionRangeOptions::Clear(MessageLite& base) { - ExtensionRangeOptions& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void ExtensionRangeOptions::Clear() { - ExtensionRangeOptions& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.ExtensionRangeOptions) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void ExtensionRangeOptions::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.ExtensionRangeOptions) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - this_._impl_._extensions_.Clear(); - this_._impl_.declaration_.Clear(); - this_._impl_.uninterpreted_option_.Clear(); - cached_has_bits = this_._impl_._has_bits_[0]; + _impl_._extensions_.Clear(); + _impl_.declaration_.Clear(); + _impl_.uninterpreted_option_.Clear(); + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000003u) { if (cached_has_bits & 0x00000001u) { - ABSL_DCHECK(this_._impl_.features_ != nullptr); - this_._impl_.features_->Clear(); + ABSL_DCHECK(_impl_.features_ != nullptr); + _impl_.features_->Clear(); } - this_._impl_.verification_ = 1; + _impl_.verification_ = 1; } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -5618,7 +5576,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &FieldDescriptorProto::Clear, &FieldDescriptorProto::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &FieldDescriptorProto::ByteSizeLong, &FieldDescriptorProto::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_._cached_size_), @@ -5738,53 +5696,47 @@ constexpr ::_pbi::TcParseTable<4, 11, 3, 96, 2> FieldDescriptorProto::_table_ = }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void FieldDescriptorProto::Clear(MessageLite& base) { - FieldDescriptorProto& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void FieldDescriptorProto::Clear() { - FieldDescriptorProto& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.FieldDescriptorProto) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void FieldDescriptorProto::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.FieldDescriptorProto) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - cached_has_bits = this_._impl_._has_bits_[0]; + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x0000003fu) { if (cached_has_bits & 0x00000001u) { - this_._impl_.name_.ClearNonDefaultToEmpty(); + _impl_.name_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000002u) { - this_._impl_.extendee_.ClearNonDefaultToEmpty(); + _impl_.extendee_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000004u) { - this_._impl_.type_name_.ClearNonDefaultToEmpty(); + _impl_.type_name_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000008u) { - this_._impl_.default_value_.ClearNonDefaultToEmpty(); + _impl_.default_value_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000010u) { - this_._impl_.json_name_.ClearNonDefaultToEmpty(); + _impl_.json_name_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000020u) { - ABSL_DCHECK(this_._impl_.options_ != nullptr); - this_._impl_.options_->Clear(); + ABSL_DCHECK(_impl_.options_ != nullptr); + _impl_.options_->Clear(); } } if (cached_has_bits & 0x000000c0u) { - ::memset(&this_._impl_.number_, 0, static_cast<::size_t>( - reinterpret_cast(&this_._impl_.oneof_index_) - - reinterpret_cast(&this_._impl_.number_)) + sizeof(_impl_.oneof_index_)); + ::memset(&_impl_.number_, 0, static_cast<::size_t>( + reinterpret_cast(&_impl_.oneof_index_) - + reinterpret_cast(&_impl_.number_)) + sizeof(_impl_.oneof_index_)); } if (cached_has_bits & 0x00000700u) { - this_._impl_.proto3_optional_ = false; - this_._impl_.label_ = 1; - this_._impl_.type_ = 1; + _impl_.proto3_optional_ = false; + _impl_.label_ = 1; + _impl_.type_ = 1; } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -6155,7 +6107,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &OneofDescriptorProto::Clear, &OneofDescriptorProto::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &OneofDescriptorProto::ByteSizeLong, &OneofDescriptorProto::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(OneofDescriptorProto, _impl_._cached_size_), @@ -6212,31 +6164,25 @@ constexpr ::_pbi::TcParseTable<1, 2, 1, 49, 2> OneofDescriptorProto::_table_ = { }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void OneofDescriptorProto::Clear(MessageLite& base) { - OneofDescriptorProto& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void OneofDescriptorProto::Clear() { - OneofDescriptorProto& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.OneofDescriptorProto) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void OneofDescriptorProto::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.OneofDescriptorProto) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - cached_has_bits = this_._impl_._has_bits_[0]; + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000003u) { if (cached_has_bits & 0x00000001u) { - this_._impl_.name_.ClearNonDefaultToEmpty(); + _impl_.name_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000002u) { - ABSL_DCHECK(this_._impl_.options_ != nullptr); - this_._impl_.options_->Clear(); + ABSL_DCHECK(_impl_.options_ != nullptr); + _impl_.options_->Clear(); } } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -6436,7 +6382,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &EnumDescriptorProto_EnumReservedRange::Clear, &EnumDescriptorProto_EnumReservedRange::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &EnumDescriptorProto_EnumReservedRange::ByteSizeLong, &EnumDescriptorProto_EnumReservedRange::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(EnumDescriptorProto_EnumReservedRange, _impl_._cached_size_), @@ -6490,27 +6436,21 @@ constexpr ::_pbi::TcParseTable<1, 2, 0, 0, 2> EnumDescriptorProto_EnumReservedRa }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void EnumDescriptorProto_EnumReservedRange::Clear(MessageLite& base) { - EnumDescriptorProto_EnumReservedRange& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void EnumDescriptorProto_EnumReservedRange::Clear() { - EnumDescriptorProto_EnumReservedRange& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.EnumDescriptorProto.EnumReservedRange) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void EnumDescriptorProto_EnumReservedRange::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumDescriptorProto.EnumReservedRange) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - cached_has_bits = this_._impl_._has_bits_[0]; + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000003u) { - ::memset(&this_._impl_.start_, 0, static_cast<::size_t>( - reinterpret_cast(&this_._impl_.end_) - - reinterpret_cast(&this_._impl_.start_)) + sizeof(_impl_.end_)); + ::memset(&_impl_.start_, 0, static_cast<::size_t>( + reinterpret_cast(&_impl_.end_) - + reinterpret_cast(&_impl_.start_)) + sizeof(_impl_.end_)); } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -6741,7 +6681,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &EnumDescriptorProto::Clear, &EnumDescriptorProto::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &EnumDescriptorProto::ByteSizeLong, &EnumDescriptorProto::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(EnumDescriptorProto, _impl_._cached_size_), @@ -6822,34 +6762,28 @@ constexpr ::_pbi::TcParseTable<3, 5, 3, 61, 2> EnumDescriptorProto::_table_ = { }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void EnumDescriptorProto::Clear(MessageLite& base) { - EnumDescriptorProto& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void EnumDescriptorProto::Clear() { - EnumDescriptorProto& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.EnumDescriptorProto) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void EnumDescriptorProto::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumDescriptorProto) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - this_._impl_.value_.Clear(); - this_._impl_.reserved_range_.Clear(); - this_._impl_.reserved_name_.Clear(); - cached_has_bits = this_._impl_._has_bits_[0]; + _impl_.value_.Clear(); + _impl_.reserved_range_.Clear(); + _impl_.reserved_name_.Clear(); + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000003u) { if (cached_has_bits & 0x00000001u) { - this_._impl_.name_.ClearNonDefaultToEmpty(); + _impl_.name_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000002u) { - ABSL_DCHECK(this_._impl_.options_ != nullptr); - this_._impl_.options_->Clear(); + ABSL_DCHECK(_impl_.options_ != nullptr); + _impl_.options_->Clear(); } } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -7140,7 +7074,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &EnumValueDescriptorProto::Clear, &EnumValueDescriptorProto::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &EnumValueDescriptorProto::ByteSizeLong, &EnumValueDescriptorProto::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(EnumValueDescriptorProto, _impl_._cached_size_), @@ -7204,32 +7138,26 @@ constexpr ::_pbi::TcParseTable<2, 3, 1, 53, 2> EnumValueDescriptorProto::_table_ }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void EnumValueDescriptorProto::Clear(MessageLite& base) { - EnumValueDescriptorProto& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void EnumValueDescriptorProto::Clear() { - EnumValueDescriptorProto& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.EnumValueDescriptorProto) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void EnumValueDescriptorProto::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumValueDescriptorProto) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - cached_has_bits = this_._impl_._has_bits_[0]; + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000003u) { if (cached_has_bits & 0x00000001u) { - this_._impl_.name_.ClearNonDefaultToEmpty(); + _impl_.name_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000002u) { - ABSL_DCHECK(this_._impl_.options_ != nullptr); - this_._impl_.options_->Clear(); + ABSL_DCHECK(_impl_.options_ != nullptr); + _impl_.options_->Clear(); } } - this_._impl_.number_ = 0; - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_.number_ = 0; + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -7482,7 +7410,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &ServiceDescriptorProto::Clear, &ServiceDescriptorProto::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &ServiceDescriptorProto::ByteSizeLong, &ServiceDescriptorProto::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(ServiceDescriptorProto, _impl_._cached_size_), @@ -7547,32 +7475,26 @@ constexpr ::_pbi::TcParseTable<2, 3, 2, 51, 2> ServiceDescriptorProto::_table_ = }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void ServiceDescriptorProto::Clear(MessageLite& base) { - ServiceDescriptorProto& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void ServiceDescriptorProto::Clear() { - ServiceDescriptorProto& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.ServiceDescriptorProto) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void ServiceDescriptorProto::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.ServiceDescriptorProto) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - this_._impl_.method_.Clear(); - cached_has_bits = this_._impl_._has_bits_[0]; + _impl_.method_.Clear(); + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000003u) { if (cached_has_bits & 0x00000001u) { - this_._impl_.name_.ClearNonDefaultToEmpty(); + _impl_.name_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000002u) { - ABSL_DCHECK(this_._impl_.options_ != nullptr); - this_._impl_.options_->Clear(); + ABSL_DCHECK(_impl_.options_ != nullptr); + _impl_.options_->Clear(); } } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -7835,7 +7757,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &MethodDescriptorProto::Clear, &MethodDescriptorProto::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &MethodDescriptorProto::ByteSizeLong, &MethodDescriptorProto::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(MethodDescriptorProto, _impl_._cached_size_), @@ -7920,40 +7842,34 @@ constexpr ::_pbi::TcParseTable<3, 6, 1, 71, 2> MethodDescriptorProto::_table_ = }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void MethodDescriptorProto::Clear(MessageLite& base) { - MethodDescriptorProto& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void MethodDescriptorProto::Clear() { - MethodDescriptorProto& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.MethodDescriptorProto) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void MethodDescriptorProto::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.MethodDescriptorProto) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - cached_has_bits = this_._impl_._has_bits_[0]; + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x0000000fu) { if (cached_has_bits & 0x00000001u) { - this_._impl_.name_.ClearNonDefaultToEmpty(); + _impl_.name_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000002u) { - this_._impl_.input_type_.ClearNonDefaultToEmpty(); + _impl_.input_type_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000004u) { - this_._impl_.output_type_.ClearNonDefaultToEmpty(); + _impl_.output_type_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000008u) { - ABSL_DCHECK(this_._impl_.options_ != nullptr); - this_._impl_.options_->Clear(); + ABSL_DCHECK(_impl_.options_ != nullptr); + _impl_.options_->Clear(); } } - ::memset(&this_._impl_.client_streaming_, 0, static_cast<::size_t>( - reinterpret_cast(&this_._impl_.server_streaming_) - - reinterpret_cast(&this_._impl_.client_streaming_)) + sizeof(_impl_.server_streaming_)); - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + ::memset(&_impl_.client_streaming_, 0, static_cast<::size_t>( + reinterpret_cast(&_impl_.server_streaming_) - + reinterpret_cast(&_impl_.client_streaming_)) + sizeof(_impl_.server_streaming_)); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -8300,7 +8216,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &FileOptions::Clear, &FileOptions::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &FileOptions::ByteSizeLong, &FileOptions::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(FileOptions, _impl_._cached_size_), @@ -8488,74 +8404,68 @@ constexpr ::_pbi::TcParseTable<5, 21, 3, 202, 12> FileOptions::_table_ = { }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void FileOptions::Clear(MessageLite& base) { - FileOptions& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void FileOptions::Clear() { - FileOptions& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.FileOptions) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void FileOptions::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.FileOptions) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - this_._impl_._extensions_.Clear(); - this_._impl_.uninterpreted_option_.Clear(); - cached_has_bits = this_._impl_._has_bits_[0]; + _impl_._extensions_.Clear(); + _impl_.uninterpreted_option_.Clear(); + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x000000ffu) { if (cached_has_bits & 0x00000001u) { - this_._impl_.java_package_.ClearNonDefaultToEmpty(); + _impl_.java_package_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000002u) { - this_._impl_.java_outer_classname_.ClearNonDefaultToEmpty(); + _impl_.java_outer_classname_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000004u) { - this_._impl_.go_package_.ClearNonDefaultToEmpty(); + _impl_.go_package_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000008u) { - this_._impl_.objc_class_prefix_.ClearNonDefaultToEmpty(); + _impl_.objc_class_prefix_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000010u) { - this_._impl_.csharp_namespace_.ClearNonDefaultToEmpty(); + _impl_.csharp_namespace_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000020u) { - this_._impl_.swift_prefix_.ClearNonDefaultToEmpty(); + _impl_.swift_prefix_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000040u) { - this_._impl_.php_class_prefix_.ClearNonDefaultToEmpty(); + _impl_.php_class_prefix_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000080u) { - this_._impl_.php_namespace_.ClearNonDefaultToEmpty(); + _impl_.php_namespace_.ClearNonDefaultToEmpty(); } } if (cached_has_bits & 0x00000700u) { if (cached_has_bits & 0x00000100u) { - this_._impl_.php_metadata_namespace_.ClearNonDefaultToEmpty(); + _impl_.php_metadata_namespace_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000200u) { - this_._impl_.ruby_package_.ClearNonDefaultToEmpty(); + _impl_.ruby_package_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000400u) { - ABSL_DCHECK(this_._impl_.features_ != nullptr); - this_._impl_.features_->Clear(); + ABSL_DCHECK(_impl_.features_ != nullptr); + _impl_.features_->Clear(); } } if (cached_has_bits & 0x0000f800u) { - ::memset(&this_._impl_.java_multiple_files_, 0, static_cast<::size_t>( - reinterpret_cast(&this_._impl_.java_generic_services_) - - reinterpret_cast(&this_._impl_.java_multiple_files_)) + sizeof(_impl_.java_generic_services_)); + ::memset(&_impl_.java_multiple_files_, 0, static_cast<::size_t>( + reinterpret_cast(&_impl_.java_generic_services_) - + reinterpret_cast(&_impl_.java_multiple_files_)) + sizeof(_impl_.java_generic_services_)); } if (cached_has_bits & 0x000f0000u) { - ::memset(&this_._impl_.py_generic_services_, 0, static_cast<::size_t>( - reinterpret_cast(&this_._impl_.deprecated_) - - reinterpret_cast(&this_._impl_.py_generic_services_)) + sizeof(_impl_.deprecated_)); - this_._impl_.optimize_for_ = 1; - this_._impl_.cc_enable_arenas_ = true; + ::memset(&_impl_.py_generic_services_, 0, static_cast<::size_t>( + reinterpret_cast(&_impl_.deprecated_) - + reinterpret_cast(&_impl_.py_generic_services_)) + sizeof(_impl_.deprecated_)); + _impl_.optimize_for_ = 1; + _impl_.cc_enable_arenas_ = true; } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -9131,7 +9041,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &MessageOptions::Clear, &MessageOptions::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &MessageOptions::ByteSizeLong, &MessageOptions::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(MessageOptions, _impl_._cached_size_), @@ -9215,33 +9125,27 @@ constexpr ::_pbi::TcParseTable<3, 7, 2, 0, 7> MessageOptions::_table_ = { }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void MessageOptions::Clear(MessageLite& base) { - MessageOptions& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void MessageOptions::Clear() { - MessageOptions& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.MessageOptions) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void MessageOptions::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.MessageOptions) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - this_._impl_._extensions_.Clear(); - this_._impl_.uninterpreted_option_.Clear(); - cached_has_bits = this_._impl_._has_bits_[0]; + _impl_._extensions_.Clear(); + _impl_.uninterpreted_option_.Clear(); + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000001u) { - ABSL_DCHECK(this_._impl_.features_ != nullptr); - this_._impl_.features_->Clear(); + ABSL_DCHECK(_impl_.features_ != nullptr); + _impl_.features_->Clear(); } if (cached_has_bits & 0x0000003eu) { - ::memset(&this_._impl_.message_set_wire_format_, 0, static_cast<::size_t>( - reinterpret_cast(&this_._impl_.deprecated_legacy_json_field_conflicts_) - - reinterpret_cast(&this_._impl_.message_set_wire_format_)) + sizeof(_impl_.deprecated_legacy_json_field_conflicts_)); + ::memset(&_impl_.message_set_wire_format_, 0, static_cast<::size_t>( + reinterpret_cast(&_impl_.deprecated_legacy_json_field_conflicts_) - + reinterpret_cast(&_impl_.message_set_wire_format_)) + sizeof(_impl_.deprecated_legacy_json_field_conflicts_)); } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -9548,7 +9452,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &FieldOptions_EditionDefault::Clear, &FieldOptions_EditionDefault::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &FieldOptions_EditionDefault::ByteSizeLong, &FieldOptions_EditionDefault::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(FieldOptions_EditionDefault, _impl_._cached_size_), @@ -9605,26 +9509,20 @@ constexpr ::_pbi::TcParseTable<1, 2, 1, 57, 2> FieldOptions_EditionDefault::_tab }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void FieldOptions_EditionDefault::Clear(MessageLite& base) { - FieldOptions_EditionDefault& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void FieldOptions_EditionDefault::Clear() { - FieldOptions_EditionDefault& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.FieldOptions.EditionDefault) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void FieldOptions_EditionDefault::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.FieldOptions.EditionDefault) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - cached_has_bits = this_._impl_._has_bits_[0]; + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000001u) { - this_._impl_.value_.ClearNonDefaultToEmpty(); + _impl_.value_.ClearNonDefaultToEmpty(); } - this_._impl_.edition_ = 0; - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_.edition_ = 0; + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -9836,7 +9734,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &FieldOptions_FeatureSupport::Clear, &FieldOptions_FeatureSupport::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &FieldOptions_FeatureSupport::ByteSizeLong, &FieldOptions_FeatureSupport::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(FieldOptions_FeatureSupport, _impl_._cached_size_), @@ -9907,30 +9805,24 @@ constexpr ::_pbi::TcParseTable<2, 4, 3, 71, 2> FieldOptions_FeatureSupport::_tab }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void FieldOptions_FeatureSupport::Clear(MessageLite& base) { - FieldOptions_FeatureSupport& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void FieldOptions_FeatureSupport::Clear() { - FieldOptions_FeatureSupport& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.FieldOptions.FeatureSupport) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void FieldOptions_FeatureSupport::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.FieldOptions.FeatureSupport) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - cached_has_bits = this_._impl_._has_bits_[0]; + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000001u) { - this_._impl_.deprecation_warning_.ClearNonDefaultToEmpty(); + _impl_.deprecation_warning_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x0000000eu) { - ::memset(&this_._impl_.edition_introduced_, 0, static_cast<::size_t>( - reinterpret_cast(&this_._impl_.edition_removed_) - - reinterpret_cast(&this_._impl_.edition_introduced_)) + sizeof(_impl_.edition_removed_)); + ::memset(&_impl_.edition_introduced_, 0, static_cast<::size_t>( + reinterpret_cast(&_impl_.edition_removed_) - + reinterpret_cast(&_impl_.edition_introduced_)) + sizeof(_impl_.edition_removed_)); } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -10214,7 +10106,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &FieldOptions::Clear, &FieldOptions::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &FieldOptions::ByteSizeLong, &FieldOptions::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_._cached_size_), @@ -10343,46 +10235,40 @@ constexpr ::_pbi::TcParseTable<4, 14, 8, 0, 7> FieldOptions::_table_ = { }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void FieldOptions::Clear(MessageLite& base) { - FieldOptions& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void FieldOptions::Clear() { - FieldOptions& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.FieldOptions) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void FieldOptions::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.FieldOptions) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - this_._impl_._extensions_.Clear(); - this_._impl_.targets_.Clear(); - this_._impl_.edition_defaults_.Clear(); - this_._impl_.uninterpreted_option_.Clear(); - cached_has_bits = this_._impl_._has_bits_[0]; + _impl_._extensions_.Clear(); + _impl_.targets_.Clear(); + _impl_.edition_defaults_.Clear(); + _impl_.uninterpreted_option_.Clear(); + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000003u) { if (cached_has_bits & 0x00000001u) { - ABSL_DCHECK(this_._impl_.features_ != nullptr); - this_._impl_.features_->Clear(); + ABSL_DCHECK(_impl_.features_ != nullptr); + _impl_.features_->Clear(); } if (cached_has_bits & 0x00000002u) { - ABSL_DCHECK(this_._impl_.feature_support_ != nullptr); - this_._impl_.feature_support_->Clear(); + ABSL_DCHECK(_impl_.feature_support_ != nullptr); + _impl_.feature_support_->Clear(); } } if (cached_has_bits & 0x000000fcu) { - ::memset(&this_._impl_.ctype_, 0, static_cast<::size_t>( - reinterpret_cast(&this_._impl_.deprecated_) - - reinterpret_cast(&this_._impl_.ctype_)) + sizeof(_impl_.deprecated_)); + ::memset(&_impl_.ctype_, 0, static_cast<::size_t>( + reinterpret_cast(&_impl_.deprecated_) - + reinterpret_cast(&_impl_.ctype_)) + sizeof(_impl_.deprecated_)); } if (cached_has_bits & 0x00000700u) { - ::memset(&this_._impl_.weak_, 0, static_cast<::size_t>( - reinterpret_cast(&this_._impl_.retention_) - - reinterpret_cast(&this_._impl_.weak_)) + sizeof(_impl_.retention_)); + ::memset(&_impl_.weak_, 0, static_cast<::size_t>( + reinterpret_cast(&_impl_.retention_) - + reinterpret_cast(&_impl_.weak_)) + sizeof(_impl_.retention_)); } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -10832,7 +10718,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &OneofOptions::Clear, &OneofOptions::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &OneofOptions::ByteSizeLong, &OneofOptions::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(OneofOptions, _impl_._cached_size_), @@ -10891,28 +10777,22 @@ constexpr ::_pbi::TcParseTable<2, 2, 2, 0, 7> OneofOptions::_table_ = { }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void OneofOptions::Clear(MessageLite& base) { - OneofOptions& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void OneofOptions::Clear() { - OneofOptions& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.OneofOptions) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void OneofOptions::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.OneofOptions) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - this_._impl_._extensions_.Clear(); - this_._impl_.uninterpreted_option_.Clear(); - cached_has_bits = this_._impl_._has_bits_[0]; + _impl_._extensions_.Clear(); + _impl_.uninterpreted_option_.Clear(); + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000001u) { - ABSL_DCHECK(this_._impl_.features_ != nullptr); - this_._impl_.features_->Clear(); + ABSL_DCHECK(_impl_.features_ != nullptr); + _impl_.features_->Clear(); } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -11174,7 +11054,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &EnumOptions::Clear, &EnumOptions::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &EnumOptions::ByteSizeLong, &EnumOptions::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(EnumOptions, _impl_._cached_size_), @@ -11250,31 +11130,25 @@ constexpr ::_pbi::TcParseTable<3, 5, 2, 0, 7> EnumOptions::_table_ = { }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void EnumOptions::Clear(MessageLite& base) { - EnumOptions& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void EnumOptions::Clear() { - EnumOptions& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.EnumOptions) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void EnumOptions::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumOptions) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - this_._impl_._extensions_.Clear(); - this_._impl_.uninterpreted_option_.Clear(); - cached_has_bits = this_._impl_._has_bits_[0]; + _impl_._extensions_.Clear(); + _impl_.uninterpreted_option_.Clear(); + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000001u) { - ABSL_DCHECK(this_._impl_.features_ != nullptr); - this_._impl_.features_->Clear(); + ABSL_DCHECK(_impl_.features_ != nullptr); + _impl_.features_->Clear(); } - ::memset(&this_._impl_.allow_alias_, 0, static_cast<::size_t>( - reinterpret_cast(&this_._impl_.deprecated_legacy_json_field_conflicts_) - - reinterpret_cast(&this_._impl_.allow_alias_)) + sizeof(_impl_.deprecated_legacy_json_field_conflicts_)); - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + ::memset(&_impl_.allow_alias_, 0, static_cast<::size_t>( + reinterpret_cast(&_impl_.deprecated_legacy_json_field_conflicts_) - + reinterpret_cast(&_impl_.allow_alias_)) + sizeof(_impl_.deprecated_legacy_json_field_conflicts_)); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -11589,7 +11463,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &EnumValueOptions::Clear, &EnumValueOptions::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &EnumValueOptions::ByteSizeLong, &EnumValueOptions::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(EnumValueOptions, _impl_._cached_size_), @@ -11668,37 +11542,31 @@ constexpr ::_pbi::TcParseTable<3, 5, 3, 0, 7> EnumValueOptions::_table_ = { }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void EnumValueOptions::Clear(MessageLite& base) { - EnumValueOptions& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void EnumValueOptions::Clear() { - EnumValueOptions& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.EnumValueOptions) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void EnumValueOptions::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumValueOptions) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - this_._impl_._extensions_.Clear(); - this_._impl_.uninterpreted_option_.Clear(); - cached_has_bits = this_._impl_._has_bits_[0]; + _impl_._extensions_.Clear(); + _impl_.uninterpreted_option_.Clear(); + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000003u) { if (cached_has_bits & 0x00000001u) { - ABSL_DCHECK(this_._impl_.features_ != nullptr); - this_._impl_.features_->Clear(); + ABSL_DCHECK(_impl_.features_ != nullptr); + _impl_.features_->Clear(); } if (cached_has_bits & 0x00000002u) { - ABSL_DCHECK(this_._impl_.feature_support_ != nullptr); - this_._impl_.feature_support_->Clear(); + ABSL_DCHECK(_impl_.feature_support_ != nullptr); + _impl_.feature_support_->Clear(); } } - ::memset(&this_._impl_.deprecated_, 0, static_cast<::size_t>( - reinterpret_cast(&this_._impl_.debug_redact_) - - reinterpret_cast(&this_._impl_.deprecated_)) + sizeof(_impl_.debug_redact_)); - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + ::memset(&_impl_.deprecated_, 0, static_cast<::size_t>( + reinterpret_cast(&_impl_.debug_redact_) - + reinterpret_cast(&_impl_.deprecated_)) + sizeof(_impl_.debug_redact_)); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -12010,7 +11878,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &ServiceOptions::Clear, &ServiceOptions::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &ServiceOptions::ByteSizeLong, &ServiceOptions::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(ServiceOptions, _impl_._cached_size_), @@ -12075,29 +11943,23 @@ constexpr ::_pbi::TcParseTable<2, 3, 2, 0, 12> ServiceOptions::_table_ = { }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void ServiceOptions::Clear(MessageLite& base) { - ServiceOptions& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void ServiceOptions::Clear() { - ServiceOptions& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.ServiceOptions) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void ServiceOptions::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.ServiceOptions) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - this_._impl_._extensions_.Clear(); - this_._impl_.uninterpreted_option_.Clear(); - cached_has_bits = this_._impl_._has_bits_[0]; + _impl_._extensions_.Clear(); + _impl_.uninterpreted_option_.Clear(); + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000001u) { - ABSL_DCHECK(this_._impl_.features_ != nullptr); - this_._impl_.features_->Clear(); + ABSL_DCHECK(_impl_.features_ != nullptr); + _impl_.features_->Clear(); } - this_._impl_.deprecated_ = false; - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_.deprecated_ = false; + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -12380,7 +12242,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &MethodOptions::Clear, &MethodOptions::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &MethodOptions::ByteSizeLong, &MethodOptions::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(MethodOptions, _impl_._cached_size_), @@ -12455,33 +12317,27 @@ constexpr ::_pbi::TcParseTable<3, 4, 3, 0, 12> MethodOptions::_table_ = { }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void MethodOptions::Clear(MessageLite& base) { - MethodOptions& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void MethodOptions::Clear() { - MethodOptions& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.MethodOptions) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void MethodOptions::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.MethodOptions) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - this_._impl_._extensions_.Clear(); - this_._impl_.uninterpreted_option_.Clear(); - cached_has_bits = this_._impl_._has_bits_[0]; + _impl_._extensions_.Clear(); + _impl_.uninterpreted_option_.Clear(); + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000001u) { - ABSL_DCHECK(this_._impl_.features_ != nullptr); - this_._impl_.features_->Clear(); + ABSL_DCHECK(_impl_.features_ != nullptr); + _impl_.features_->Clear(); } if (cached_has_bits & 0x00000006u) { - ::memset(&this_._impl_.deprecated_, 0, static_cast<::size_t>( - reinterpret_cast(&this_._impl_.idempotency_level_) - - reinterpret_cast(&this_._impl_.deprecated_)) + sizeof(_impl_.idempotency_level_)); + ::memset(&_impl_.deprecated_, 0, static_cast<::size_t>( + reinterpret_cast(&_impl_.idempotency_level_) - + reinterpret_cast(&_impl_.deprecated_)) + sizeof(_impl_.idempotency_level_)); } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -12750,7 +12606,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &UninterpretedOption_NamePart::Clear, &UninterpretedOption_NamePart::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &UninterpretedOption_NamePart::ByteSizeLong, &UninterpretedOption_NamePart::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(UninterpretedOption_NamePart, _impl_._cached_size_), @@ -12807,26 +12663,20 @@ constexpr ::_pbi::TcParseTable<1, 2, 0, 62, 2> UninterpretedOption_NamePart::_ta }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void UninterpretedOption_NamePart::Clear(MessageLite& base) { - UninterpretedOption_NamePart& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void UninterpretedOption_NamePart::Clear() { - UninterpretedOption_NamePart& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.UninterpretedOption.NamePart) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void UninterpretedOption_NamePart::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.UninterpretedOption.NamePart) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - cached_has_bits = this_._impl_._has_bits_[0]; + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000001u) { - this_._impl_.name_part_.ClearNonDefaultToEmpty(); + _impl_.name_part_.ClearNonDefaultToEmpty(); } - this_._impl_.is_extension_ = false; - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_.is_extension_ = false; + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -13064,7 +12914,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &UninterpretedOption::Clear, &UninterpretedOption::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &UninterpretedOption::ByteSizeLong, &UninterpretedOption::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(UninterpretedOption, _impl_._cached_size_), @@ -13153,39 +13003,33 @@ constexpr ::_pbi::TcParseTable<3, 7, 1, 75, 2> UninterpretedOption::_table_ = { }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void UninterpretedOption::Clear(MessageLite& base) { - UninterpretedOption& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void UninterpretedOption::Clear() { - UninterpretedOption& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.UninterpretedOption) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void UninterpretedOption::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.UninterpretedOption) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - this_._impl_.name_.Clear(); - cached_has_bits = this_._impl_._has_bits_[0]; + _impl_.name_.Clear(); + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000007u) { if (cached_has_bits & 0x00000001u) { - this_._impl_.identifier_value_.ClearNonDefaultToEmpty(); + _impl_.identifier_value_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000002u) { - this_._impl_.string_value_.ClearNonDefaultToEmpty(); + _impl_.string_value_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000004u) { - this_._impl_.aggregate_value_.ClearNonDefaultToEmpty(); + _impl_.aggregate_value_.ClearNonDefaultToEmpty(); } } if (cached_has_bits & 0x00000038u) { - ::memset(&this_._impl_.positive_int_value_, 0, static_cast<::size_t>( - reinterpret_cast(&this_._impl_.double_value_) - - reinterpret_cast(&this_._impl_.positive_int_value_)) + sizeof(_impl_.double_value_)); + ::memset(&_impl_.positive_int_value_, 0, static_cast<::size_t>( + reinterpret_cast(&_impl_.double_value_) - + reinterpret_cast(&_impl_.positive_int_value_)) + sizeof(_impl_.double_value_)); } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -13503,7 +13347,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &FeatureSet::Clear, &FeatureSet::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &FeatureSet::ByteSizeLong, &FeatureSet::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(FeatureSet, _impl_._cached_size_), @@ -13588,28 +13432,22 @@ constexpr ::_pbi::TcParseTable<3, 6, 6, 0, 2> FeatureSet::_table_ = { }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void FeatureSet::Clear(MessageLite& base) { - FeatureSet& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void FeatureSet::Clear() { - FeatureSet& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.FeatureSet) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void FeatureSet::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.FeatureSet) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - this_._impl_._extensions_.Clear(); - cached_has_bits = this_._impl_._has_bits_[0]; + _impl_._extensions_.Clear(); + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x0000003fu) { - ::memset(&this_._impl_.field_presence_, 0, static_cast<::size_t>( - reinterpret_cast(&this_._impl_.json_format_) - - reinterpret_cast(&this_._impl_.field_presence_)) + sizeof(_impl_.json_format_)); + ::memset(&_impl_.field_presence_, 0, static_cast<::size_t>( + reinterpret_cast(&_impl_.json_format_) - + reinterpret_cast(&_impl_.field_presence_)) + sizeof(_impl_.json_format_)); } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -13897,7 +13735,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &FeatureSetDefaults_FeatureSetEditionDefault::Clear, &FeatureSetDefaults_FeatureSetEditionDefault::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &FeatureSetDefaults_FeatureSetEditionDefault::ByteSizeLong, &FeatureSetDefaults_FeatureSetEditionDefault::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(FeatureSetDefaults_FeatureSetEditionDefault, _impl_._cached_size_), @@ -13960,33 +13798,27 @@ constexpr ::_pbi::TcParseTable<2, 3, 3, 0, 2> FeatureSetDefaults_FeatureSetEditi }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void FeatureSetDefaults_FeatureSetEditionDefault::Clear(MessageLite& base) { - FeatureSetDefaults_FeatureSetEditionDefault& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void FeatureSetDefaults_FeatureSetEditionDefault::Clear() { - FeatureSetDefaults_FeatureSetEditionDefault& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void FeatureSetDefaults_FeatureSetEditionDefault::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - cached_has_bits = this_._impl_._has_bits_[0]; + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000003u) { if (cached_has_bits & 0x00000001u) { - ABSL_DCHECK(this_._impl_.overridable_features_ != nullptr); - this_._impl_.overridable_features_->Clear(); + ABSL_DCHECK(_impl_.overridable_features_ != nullptr); + _impl_.overridable_features_->Clear(); } if (cached_has_bits & 0x00000002u) { - ABSL_DCHECK(this_._impl_.fixed_features_ != nullptr); - this_._impl_.fixed_features_->Clear(); + ABSL_DCHECK(_impl_.fixed_features_ != nullptr); + _impl_.fixed_features_->Clear(); } } - this_._impl_.edition_ = 0; - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_.edition_ = 0; + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -14248,7 +14080,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &FeatureSetDefaults::Clear, &FeatureSetDefaults::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &FeatureSetDefaults::ByteSizeLong, &FeatureSetDefaults::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(FeatureSetDefaults, _impl_._cached_size_), @@ -14307,28 +14139,22 @@ constexpr ::_pbi::TcParseTable<1, 3, 3, 0, 2> FeatureSetDefaults::_table_ = { }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void FeatureSetDefaults::Clear(MessageLite& base) { - FeatureSetDefaults& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void FeatureSetDefaults::Clear() { - FeatureSetDefaults& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.FeatureSetDefaults) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void FeatureSetDefaults::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.FeatureSetDefaults) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - this_._impl_.defaults_.Clear(); - cached_has_bits = this_._impl_._has_bits_[0]; + _impl_.defaults_.Clear(); + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000003u) { - ::memset(&this_._impl_.minimum_edition_, 0, static_cast<::size_t>( - reinterpret_cast(&this_._impl_.maximum_edition_) - - reinterpret_cast(&this_._impl_.minimum_edition_)) + sizeof(_impl_.maximum_edition_)); + ::memset(&_impl_.minimum_edition_, 0, static_cast<::size_t>( + reinterpret_cast(&_impl_.maximum_edition_) - + reinterpret_cast(&_impl_.minimum_edition_)) + sizeof(_impl_.maximum_edition_)); } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -14590,7 +14416,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &SourceCodeInfo_Location::Clear, &SourceCodeInfo_Location::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &SourceCodeInfo_Location::ByteSizeLong, &SourceCodeInfo_Location::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(SourceCodeInfo_Location, _impl_._cached_size_), @@ -14670,33 +14496,27 @@ constexpr ::_pbi::TcParseTable<3, 5, 0, 106, 2> SourceCodeInfo_Location::_table_ }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void SourceCodeInfo_Location::Clear(MessageLite& base) { - SourceCodeInfo_Location& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void SourceCodeInfo_Location::Clear() { - SourceCodeInfo_Location& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.SourceCodeInfo.Location) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void SourceCodeInfo_Location::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.SourceCodeInfo.Location) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - this_._impl_.path_.Clear(); - this_._impl_.span_.Clear(); - this_._impl_.leading_detached_comments_.Clear(); - cached_has_bits = this_._impl_._has_bits_[0]; + _impl_.path_.Clear(); + _impl_.span_.Clear(); + _impl_.leading_detached_comments_.Clear(); + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000003u) { if (cached_has_bits & 0x00000001u) { - this_._impl_.leading_comments_.ClearNonDefaultToEmpty(); + _impl_.leading_comments_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x00000002u) { - this_._impl_.trailing_comments_.ClearNonDefaultToEmpty(); + _impl_.trailing_comments_.ClearNonDefaultToEmpty(); } } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -14958,7 +14778,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &SourceCodeInfo::Clear, &SourceCodeInfo::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &SourceCodeInfo::ByteSizeLong, &SourceCodeInfo::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(SourceCodeInfo, _impl_._cached_size_), @@ -15006,21 +14826,15 @@ constexpr ::_pbi::TcParseTable<0, 1, 1, 0, 2> SourceCodeInfo::_table_ = { }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void SourceCodeInfo::Clear(MessageLite& base) { - SourceCodeInfo& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void SourceCodeInfo::Clear() { - SourceCodeInfo& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.SourceCodeInfo) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void SourceCodeInfo::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.SourceCodeInfo) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - this_._impl_.location_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_.location_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -15226,7 +15040,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &GeneratedCodeInfo_Annotation::Clear, &GeneratedCodeInfo_Annotation::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &GeneratedCodeInfo_Annotation::ByteSizeLong, &GeneratedCodeInfo_Annotation::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(GeneratedCodeInfo_Annotation, _impl_._cached_size_), @@ -15304,31 +15118,25 @@ constexpr ::_pbi::TcParseTable<3, 5, 1, 64, 2> GeneratedCodeInfo_Annotation::_ta }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void GeneratedCodeInfo_Annotation::Clear(MessageLite& base) { - GeneratedCodeInfo_Annotation& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void GeneratedCodeInfo_Annotation::Clear() { - GeneratedCodeInfo_Annotation& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.GeneratedCodeInfo.Annotation) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void GeneratedCodeInfo_Annotation::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.GeneratedCodeInfo.Annotation) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - this_._impl_.path_.Clear(); - cached_has_bits = this_._impl_._has_bits_[0]; + _impl_.path_.Clear(); + cached_has_bits = _impl_._has_bits_[0]; if (cached_has_bits & 0x00000001u) { - this_._impl_.source_file_.ClearNonDefaultToEmpty(); + _impl_.source_file_.ClearNonDefaultToEmpty(); } if (cached_has_bits & 0x0000000eu) { - ::memset(&this_._impl_.begin_, 0, static_cast<::size_t>( - reinterpret_cast(&this_._impl_.semantic_) - - reinterpret_cast(&this_._impl_.begin_)) + sizeof(_impl_.semantic_)); + ::memset(&_impl_.begin_, 0, static_cast<::size_t>( + reinterpret_cast(&_impl_.semantic_) - + reinterpret_cast(&_impl_.begin_)) + sizeof(_impl_.semantic_)); } - this_._impl_._has_bits_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_._has_bits_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -15587,7 +15395,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - &GeneratedCodeInfo::Clear, &GeneratedCodeInfo::ByteSizeLong, + ::google::protobuf::Message::GetClearImpl(), &GeneratedCodeInfo::ByteSizeLong, &GeneratedCodeInfo::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(GeneratedCodeInfo, _impl_._cached_size_), @@ -15635,21 +15443,15 @@ constexpr ::_pbi::TcParseTable<0, 1, 1, 0, 2> GeneratedCodeInfo::_table_ = { }}, }; -#if defined(PROTOBUF_CUSTOM_VTABLE) - void GeneratedCodeInfo::Clear(MessageLite& base) { - GeneratedCodeInfo& this_ = static_cast(base); -#else // PROTOBUF_CUSTOM_VTABLE - void GeneratedCodeInfo::Clear() { - GeneratedCodeInfo& this_ = *this; -#endif // PROTOBUF_CUSTOM_VTABLE - // @@protoc_insertion_point(message_clear_start:google.protobuf.GeneratedCodeInfo) - ::google::protobuf::internal::TSanWrite(&this_._impl_); +PROTOBUF_NOINLINE void GeneratedCodeInfo::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.GeneratedCodeInfo) + ::google::protobuf::internal::TSanWrite(&_impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - this_._impl_.annotation_.Clear(); - this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + _impl_.annotation_.Clear(); + _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index a3ebd0a9707b..de114bfda9f8 100644 --- a/src/google/protobuf/descriptor.pb.h +++ b/src/google/protobuf/descriptor.pb.h @@ -800,28 +800,26 @@ class PROTOBUF_EXPORT UninterpretedOption_NamePart final : public ::google::prot static bool IsInitializedImpl(const MessageLite& msg); public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -1012,28 +1010,26 @@ class PROTOBUF_EXPORT SourceCodeInfo_Location final : public ::google::protobuf: bool IsInitialized() const { return true; } + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -1296,28 +1292,26 @@ class PROTOBUF_EXPORT GeneratedCodeInfo_Annotation final : public ::google::prot bool IsInitialized() const { return true; } + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -1575,28 +1569,26 @@ class PROTOBUF_EXPORT FieldOptions_FeatureSupport final : public ::google::proto bool IsInitialized() const { return true; } + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -1813,28 +1805,26 @@ class PROTOBUF_EXPORT FieldOptions_EditionDefault final : public ::google::proto bool IsInitialized() const { return true; } + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -2030,28 +2020,26 @@ class PROTOBUF_EXPORT FeatureSet final : public ::google::protobuf::Message static bool IsInitializedImpl(const MessageLite& msg); public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -2589,28 +2577,26 @@ class PROTOBUF_EXPORT ExtensionRangeOptions_Declaration final : public ::google: bool IsInitialized() const { return true; } + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -2846,28 +2832,26 @@ class PROTOBUF_EXPORT EnumDescriptorProto_EnumReservedRange final : public ::goo bool IsInitialized() const { return true; } + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -3052,28 +3036,26 @@ class PROTOBUF_EXPORT DescriptorProto_ReservedRange final : public ::google::pro bool IsInitialized() const { return true; } + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -3263,28 +3245,26 @@ class PROTOBUF_EXPORT UninterpretedOption final : public ::google::protobuf::Mes static bool IsInitializedImpl(const MessageLite& msg); public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -3559,28 +3539,26 @@ class PROTOBUF_EXPORT SourceCodeInfo final : public ::google::protobuf::Message bool IsInitialized() const { return true; } + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -3758,28 +3736,26 @@ class PROTOBUF_EXPORT GeneratedCodeInfo final : public ::google::protobuf::Messa bool IsInitialized() const { return true; } + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -3962,28 +3938,26 @@ class PROTOBUF_EXPORT FeatureSetDefaults_FeatureSetEditionDefault final : public static bool IsInitializedImpl(const MessageLite& msg); public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -4194,28 +4168,26 @@ class PROTOBUF_EXPORT ServiceOptions final : public ::google::protobuf::Message static bool IsInitializedImpl(const MessageLite& msg); public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -4608,28 +4580,26 @@ class PROTOBUF_EXPORT OneofOptions final : public ::google::protobuf::Message static bool IsInitializedImpl(const MessageLite& msg); public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -5009,28 +4979,26 @@ class PROTOBUF_EXPORT MethodOptions final : public ::google::protobuf::Message static bool IsInitializedImpl(const MessageLite& msg); public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -5456,28 +5424,26 @@ class PROTOBUF_EXPORT MessageOptions final : public ::google::protobuf::Message static bool IsInitializedImpl(const MessageLite& msg); public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -5922,28 +5888,26 @@ class PROTOBUF_EXPORT FileOptions final : public ::google::protobuf::Message static bool IsInitializedImpl(const MessageLite& msg); public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -6650,28 +6614,26 @@ class PROTOBUF_EXPORT FieldOptions final : public ::google::protobuf::Message static bool IsInitializedImpl(const MessageLite& msg); public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -7314,28 +7276,26 @@ class PROTOBUF_EXPORT FeatureSetDefaults final : public ::google::protobuf::Mess static bool IsInitializedImpl(const MessageLite& msg); public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -7545,28 +7505,26 @@ class PROTOBUF_EXPORT ExtensionRangeOptions final : public ::google::protobuf::M static bool IsInitializedImpl(const MessageLite& msg); public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -7998,28 +7956,26 @@ class PROTOBUF_EXPORT EnumValueOptions final : public ::google::protobuf::Messag static bool IsInitializedImpl(const MessageLite& msg); public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -8442,28 +8398,26 @@ class PROTOBUF_EXPORT EnumOptions final : public ::google::protobuf::Message static bool IsInitializedImpl(const MessageLite& msg); public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -8882,28 +8836,26 @@ class PROTOBUF_EXPORT OneofDescriptorProto final : public ::google::protobuf::Me static bool IsInitializedImpl(const MessageLite& msg); public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -9103,28 +9055,26 @@ class PROTOBUF_EXPORT MethodDescriptorProto final : public ::google::protobuf::M static bool IsInitializedImpl(const MessageLite& msg); public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -9388,28 +9338,26 @@ class PROTOBUF_EXPORT FieldDescriptorProto final : public ::google::protobuf::Me static bool IsInitializedImpl(const MessageLite& msg); public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -9805,28 +9753,26 @@ class PROTOBUF_EXPORT EnumValueDescriptorProto final : public ::google::protobuf static bool IsInitializedImpl(const MessageLite& msg); public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -10039,28 +9985,26 @@ class PROTOBUF_EXPORT DescriptorProto_ExtensionRange final : public ::google::pr static bool IsInitializedImpl(const MessageLite& msg); public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -10267,28 +10211,26 @@ class PROTOBUF_EXPORT ServiceDescriptorProto final : public ::google::protobuf:: static bool IsInitializedImpl(const MessageLite& msg); public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -10507,28 +10449,26 @@ class PROTOBUF_EXPORT EnumDescriptorProto final : public ::google::protobuf::Mes static bool IsInitializedImpl(const MessageLite& msg); public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -10791,28 +10731,26 @@ class PROTOBUF_EXPORT DescriptorProto final : public ::google::protobuf::Message static bool IsInitializedImpl(const MessageLite& msg); public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -11171,28 +11109,26 @@ class PROTOBUF_EXPORT FileDescriptorProto final : public ::google::protobuf::Mes static bool IsInitializedImpl(const MessageLite& msg); public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -11600,28 +11536,26 @@ class PROTOBUF_EXPORT FileDescriptorSet final : public ::google::protobuf::Messa static bool IsInitializedImpl(const MessageLite& msg); public: + ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - private: - static void Clear(MessageLite& msg); - static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); - static ::uint8_t* _InternalSerialize( - const MessageLite& msg, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream); - - public: - ABSL_ATTRIBUTE_REINITIALIZES void Clear() { Clear(*this); }; - ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { - return _InternalSerialize(*this, target, stream); - } + private: + static ::size_t ByteSizeLong(const ::google::protobuf::MessageLite& msg); + static ::uint8_t* _InternalSerialize( + const MessageLite& msg, ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream); + + public: + ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const { + return _InternalSerialize(*this, target, stream); + } #else // PROTOBUF_CUSTOM_VTABLE - ABSL_ATTRIBUTE_REINITIALIZES void Clear() final; - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ::size_t ByteSizeLong() const final; + ::uint8_t* _InternalSerialize( + ::uint8_t* target, + ::google::protobuf::io::EpsCopyOutputStream* stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } @@ -11727,9 +11661,8 @@ inline int FileDescriptorSet::file_size() const { return _internal_file_size(); } inline void FileDescriptorSet::clear_file() { - FileDescriptorSet& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.file_.Clear(); + _impl_.file_.Clear(); } inline ::google::protobuf::FileDescriptorProto* FileDescriptorSet::mutable_file(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -11779,7 +11712,6 @@ inline bool FileDescriptorProto::has_name() const { return value; } inline void FileDescriptorProto::clear_name() { - FileDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.name_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -11851,7 +11783,6 @@ inline bool FileDescriptorProto::has_package() const { return value; } inline void FileDescriptorProto::clear_package() { - FileDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.package_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000002u; @@ -11925,9 +11856,8 @@ inline int FileDescriptorProto::dependency_size() const { return _internal_dependency_size(); } inline void FileDescriptorProto::clear_dependency() { - FileDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.dependency_.Clear(); + _impl_.dependency_.Clear(); } inline std::string* FileDescriptorProto::add_dependency() ABSL_ATTRIBUTE_LIFETIME_BOUND { ::google::protobuf::internal::TSanWrite(&_impl_); @@ -11990,9 +11920,8 @@ inline int FileDescriptorProto::public_dependency_size() const { return _internal_public_dependency_size(); } inline void FileDescriptorProto::clear_public_dependency() { - FileDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.public_dependency_.Clear(); + _impl_.public_dependency_.Clear(); } inline ::int32_t FileDescriptorProto::public_dependency(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.public_dependency) @@ -12036,9 +11965,8 @@ inline int FileDescriptorProto::weak_dependency_size() const { return _internal_weak_dependency_size(); } inline void FileDescriptorProto::clear_weak_dependency() { - FileDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.weak_dependency_.Clear(); + _impl_.weak_dependency_.Clear(); } inline ::int32_t FileDescriptorProto::weak_dependency(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.weak_dependency) @@ -12082,9 +12010,8 @@ inline int FileDescriptorProto::message_type_size() const { return _internal_message_type_size(); } inline void FileDescriptorProto::clear_message_type() { - FileDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.message_type_.Clear(); + _impl_.message_type_.Clear(); } inline ::google::protobuf::DescriptorProto* FileDescriptorProto::mutable_message_type(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -12132,9 +12059,8 @@ inline int FileDescriptorProto::enum_type_size() const { return _internal_enum_type_size(); } inline void FileDescriptorProto::clear_enum_type() { - FileDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.enum_type_.Clear(); + _impl_.enum_type_.Clear(); } inline ::google::protobuf::EnumDescriptorProto* FileDescriptorProto::mutable_enum_type(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -12182,9 +12108,8 @@ inline int FileDescriptorProto::service_size() const { return _internal_service_size(); } inline void FileDescriptorProto::clear_service() { - FileDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.service_.Clear(); + _impl_.service_.Clear(); } inline ::google::protobuf::ServiceDescriptorProto* FileDescriptorProto::mutable_service(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -12232,9 +12157,8 @@ inline int FileDescriptorProto::extension_size() const { return _internal_extension_size(); } inline void FileDescriptorProto::clear_extension() { - FileDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.extension_.Clear(); + _impl_.extension_.Clear(); } inline ::google::protobuf::FieldDescriptorProto* FileDescriptorProto::mutable_extension(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -12281,7 +12205,6 @@ inline bool FileDescriptorProto::has_options() const { return value; } inline void FileDescriptorProto::clear_options() { - FileDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.options_ != nullptr) _impl_.options_->Clear(); _impl_._has_bits_[0] &= ~0x00000008u; @@ -12378,7 +12301,6 @@ inline bool FileDescriptorProto::has_source_code_info() const { return value; } inline void FileDescriptorProto::clear_source_code_info() { - FileDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.source_code_info_ != nullptr) _impl_.source_code_info_->Clear(); _impl_._has_bits_[0] &= ~0x00000010u; @@ -12474,7 +12396,6 @@ inline bool FileDescriptorProto::has_syntax() const { return value; } inline void FileDescriptorProto::clear_syntax() { - FileDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.syntax_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000004u; @@ -12546,9 +12467,8 @@ inline bool FileDescriptorProto::has_edition() const { return value; } inline void FileDescriptorProto::clear_edition() { - FileDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.edition_ = 0; + _impl_.edition_ = 0; _impl_._has_bits_[0] &= ~0x00000020u; } inline ::google::protobuf::Edition FileDescriptorProto::edition() const { @@ -12580,9 +12500,8 @@ inline bool DescriptorProto_ExtensionRange::has_start() const { return value; } inline void DescriptorProto_ExtensionRange::clear_start() { - DescriptorProto_ExtensionRange& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.start_ = 0; + _impl_.start_ = 0; _impl_._has_bits_[0] &= ~0x00000002u; } inline ::int32_t DescriptorProto_ExtensionRange::start() const { @@ -12609,9 +12528,8 @@ inline bool DescriptorProto_ExtensionRange::has_end() const { return value; } inline void DescriptorProto_ExtensionRange::clear_end() { - DescriptorProto_ExtensionRange& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.end_ = 0; + _impl_.end_ = 0; _impl_._has_bits_[0] &= ~0x00000004u; } inline ::int32_t DescriptorProto_ExtensionRange::end() const { @@ -12639,7 +12557,6 @@ inline bool DescriptorProto_ExtensionRange::has_options() const { return value; } inline void DescriptorProto_ExtensionRange::clear_options() { - DescriptorProto_ExtensionRange& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.options_ != nullptr) _impl_.options_->Clear(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -12739,9 +12656,8 @@ inline bool DescriptorProto_ReservedRange::has_start() const { return value; } inline void DescriptorProto_ReservedRange::clear_start() { - DescriptorProto_ReservedRange& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.start_ = 0; + _impl_.start_ = 0; _impl_._has_bits_[0] &= ~0x00000001u; } inline ::int32_t DescriptorProto_ReservedRange::start() const { @@ -12768,9 +12684,8 @@ inline bool DescriptorProto_ReservedRange::has_end() const { return value; } inline void DescriptorProto_ReservedRange::clear_end() { - DescriptorProto_ReservedRange& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.end_ = 0; + _impl_.end_ = 0; _impl_._has_bits_[0] &= ~0x00000002u; } inline ::int32_t DescriptorProto_ReservedRange::end() const { @@ -12801,7 +12716,6 @@ inline bool DescriptorProto::has_name() const { return value; } inline void DescriptorProto::clear_name() { - DescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.name_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -12875,9 +12789,8 @@ inline int DescriptorProto::field_size() const { return _internal_field_size(); } inline void DescriptorProto::clear_field() { - DescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.field_.Clear(); + _impl_.field_.Clear(); } inline ::google::protobuf::FieldDescriptorProto* DescriptorProto::mutable_field(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -12925,9 +12838,8 @@ inline int DescriptorProto::extension_size() const { return _internal_extension_size(); } inline void DescriptorProto::clear_extension() { - DescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.extension_.Clear(); + _impl_.extension_.Clear(); } inline ::google::protobuf::FieldDescriptorProto* DescriptorProto::mutable_extension(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -12975,9 +12887,8 @@ inline int DescriptorProto::nested_type_size() const { return _internal_nested_type_size(); } inline void DescriptorProto::clear_nested_type() { - DescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.nested_type_.Clear(); + _impl_.nested_type_.Clear(); } inline ::google::protobuf::DescriptorProto* DescriptorProto::mutable_nested_type(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -13025,9 +12936,8 @@ inline int DescriptorProto::enum_type_size() const { return _internal_enum_type_size(); } inline void DescriptorProto::clear_enum_type() { - DescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.enum_type_.Clear(); + _impl_.enum_type_.Clear(); } inline ::google::protobuf::EnumDescriptorProto* DescriptorProto::mutable_enum_type(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -13075,9 +12985,8 @@ inline int DescriptorProto::extension_range_size() const { return _internal_extension_range_size(); } inline void DescriptorProto::clear_extension_range() { - DescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.extension_range_.Clear(); + _impl_.extension_range_.Clear(); } inline ::google::protobuf::DescriptorProto_ExtensionRange* DescriptorProto::mutable_extension_range(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -13125,9 +13034,8 @@ inline int DescriptorProto::oneof_decl_size() const { return _internal_oneof_decl_size(); } inline void DescriptorProto::clear_oneof_decl() { - DescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.oneof_decl_.Clear(); + _impl_.oneof_decl_.Clear(); } inline ::google::protobuf::OneofDescriptorProto* DescriptorProto::mutable_oneof_decl(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -13174,7 +13082,6 @@ inline bool DescriptorProto::has_options() const { return value; } inline void DescriptorProto::clear_options() { - DescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.options_ != nullptr) _impl_.options_->Clear(); _impl_._has_bits_[0] &= ~0x00000002u; @@ -13272,9 +13179,8 @@ inline int DescriptorProto::reserved_range_size() const { return _internal_reserved_range_size(); } inline void DescriptorProto::clear_reserved_range() { - DescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.reserved_range_.Clear(); + _impl_.reserved_range_.Clear(); } inline ::google::protobuf::DescriptorProto_ReservedRange* DescriptorProto::mutable_reserved_range(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -13322,9 +13228,8 @@ inline int DescriptorProto::reserved_name_size() const { return _internal_reserved_name_size(); } inline void DescriptorProto::clear_reserved_name() { - DescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.reserved_name_.Clear(); + _impl_.reserved_name_.Clear(); } inline std::string* DescriptorProto::add_reserved_name() ABSL_ATTRIBUTE_LIFETIME_BOUND { ::google::protobuf::internal::TSanWrite(&_impl_); @@ -13389,9 +13294,8 @@ inline bool ExtensionRangeOptions_Declaration::has_number() const { return value; } inline void ExtensionRangeOptions_Declaration::clear_number() { - ExtensionRangeOptions_Declaration& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.number_ = 0; + _impl_.number_ = 0; _impl_._has_bits_[0] &= ~0x00000004u; } inline ::int32_t ExtensionRangeOptions_Declaration::number() const { @@ -13418,7 +13322,6 @@ inline bool ExtensionRangeOptions_Declaration::has_full_name() const { return value; } inline void ExtensionRangeOptions_Declaration::clear_full_name() { - ExtensionRangeOptions_Declaration& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.full_name_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -13490,7 +13393,6 @@ inline bool ExtensionRangeOptions_Declaration::has_type() const { return value; } inline void ExtensionRangeOptions_Declaration::clear_type() { - ExtensionRangeOptions_Declaration& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.type_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000002u; @@ -13562,9 +13464,8 @@ inline bool ExtensionRangeOptions_Declaration::has_reserved() const { return value; } inline void ExtensionRangeOptions_Declaration::clear_reserved() { - ExtensionRangeOptions_Declaration& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.reserved_ = false; + _impl_.reserved_ = false; _impl_._has_bits_[0] &= ~0x00000008u; } inline bool ExtensionRangeOptions_Declaration::reserved() const { @@ -13591,9 +13492,8 @@ inline bool ExtensionRangeOptions_Declaration::has_repeated() const { return value; } inline void ExtensionRangeOptions_Declaration::clear_repeated() { - ExtensionRangeOptions_Declaration& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.repeated_ = false; + _impl_.repeated_ = false; _impl_._has_bits_[0] &= ~0x00000010u; } inline bool ExtensionRangeOptions_Declaration::repeated() const { @@ -13626,9 +13526,8 @@ inline int ExtensionRangeOptions::uninterpreted_option_size() const { return _internal_uninterpreted_option_size(); } inline void ExtensionRangeOptions::clear_uninterpreted_option() { - ExtensionRangeOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.uninterpreted_option_.Clear(); + _impl_.uninterpreted_option_.Clear(); } inline ::google::protobuf::UninterpretedOption* ExtensionRangeOptions::mutable_uninterpreted_option(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -13676,9 +13575,8 @@ inline int ExtensionRangeOptions::declaration_size() const { return _internal_declaration_size(); } inline void ExtensionRangeOptions::clear_declaration() { - ExtensionRangeOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.declaration_.Clear(); + _impl_.declaration_.Clear(); } inline ::google::protobuf::ExtensionRangeOptions_Declaration* ExtensionRangeOptions::mutable_declaration(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -13725,7 +13623,6 @@ inline bool ExtensionRangeOptions::has_features() const { return value; } inline void ExtensionRangeOptions::clear_features() { - ExtensionRangeOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.features_ != nullptr) _impl_.features_->Clear(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -13821,9 +13718,8 @@ inline bool ExtensionRangeOptions::has_verification() const { return value; } inline void ExtensionRangeOptions::clear_verification() { - ExtensionRangeOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.verification_ = 1; + _impl_.verification_ = 1; _impl_._has_bits_[0] &= ~0x00000002u; } inline ::google::protobuf::ExtensionRangeOptions_VerificationState ExtensionRangeOptions::verification() const { @@ -13855,7 +13751,6 @@ inline bool FieldDescriptorProto::has_name() const { return value; } inline void FieldDescriptorProto::clear_name() { - FieldDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.name_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -13927,9 +13822,8 @@ inline bool FieldDescriptorProto::has_number() const { return value; } inline void FieldDescriptorProto::clear_number() { - FieldDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.number_ = 0; + _impl_.number_ = 0; _impl_._has_bits_[0] &= ~0x00000040u; } inline ::int32_t FieldDescriptorProto::number() const { @@ -13956,9 +13850,8 @@ inline bool FieldDescriptorProto::has_label() const { return value; } inline void FieldDescriptorProto::clear_label() { - FieldDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.label_ = 1; + _impl_.label_ = 1; _impl_._has_bits_[0] &= ~0x00000200u; } inline ::google::protobuf::FieldDescriptorProto_Label FieldDescriptorProto::label() const { @@ -13986,9 +13879,8 @@ inline bool FieldDescriptorProto::has_type() const { return value; } inline void FieldDescriptorProto::clear_type() { - FieldDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.type_ = 1; + _impl_.type_ = 1; _impl_._has_bits_[0] &= ~0x00000400u; } inline ::google::protobuf::FieldDescriptorProto_Type FieldDescriptorProto::type() const { @@ -14016,7 +13908,6 @@ inline bool FieldDescriptorProto::has_type_name() const { return value; } inline void FieldDescriptorProto::clear_type_name() { - FieldDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.type_name_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000004u; @@ -14088,7 +13979,6 @@ inline bool FieldDescriptorProto::has_extendee() const { return value; } inline void FieldDescriptorProto::clear_extendee() { - FieldDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.extendee_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000002u; @@ -14160,7 +14050,6 @@ inline bool FieldDescriptorProto::has_default_value() const { return value; } inline void FieldDescriptorProto::clear_default_value() { - FieldDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.default_value_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000008u; @@ -14232,9 +14121,8 @@ inline bool FieldDescriptorProto::has_oneof_index() const { return value; } inline void FieldDescriptorProto::clear_oneof_index() { - FieldDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.oneof_index_ = 0; + _impl_.oneof_index_ = 0; _impl_._has_bits_[0] &= ~0x00000080u; } inline ::int32_t FieldDescriptorProto::oneof_index() const { @@ -14261,7 +14149,6 @@ inline bool FieldDescriptorProto::has_json_name() const { return value; } inline void FieldDescriptorProto::clear_json_name() { - FieldDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.json_name_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000010u; @@ -14334,7 +14221,6 @@ inline bool FieldDescriptorProto::has_options() const { return value; } inline void FieldDescriptorProto::clear_options() { - FieldDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.options_ != nullptr) _impl_.options_->Clear(); _impl_._has_bits_[0] &= ~0x00000020u; @@ -14430,9 +14316,8 @@ inline bool FieldDescriptorProto::has_proto3_optional() const { return value; } inline void FieldDescriptorProto::clear_proto3_optional() { - FieldDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.proto3_optional_ = false; + _impl_.proto3_optional_ = false; _impl_._has_bits_[0] &= ~0x00000100u; } inline bool FieldDescriptorProto::proto3_optional() const { @@ -14463,7 +14348,6 @@ inline bool OneofDescriptorProto::has_name() const { return value; } inline void OneofDescriptorProto::clear_name() { - OneofDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.name_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -14536,7 +14420,6 @@ inline bool OneofDescriptorProto::has_options() const { return value; } inline void OneofDescriptorProto::clear_options() { - OneofDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.options_ != nullptr) _impl_.options_->Clear(); _impl_._has_bits_[0] &= ~0x00000002u; @@ -14636,9 +14519,8 @@ inline bool EnumDescriptorProto_EnumReservedRange::has_start() const { return value; } inline void EnumDescriptorProto_EnumReservedRange::clear_start() { - EnumDescriptorProto_EnumReservedRange& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.start_ = 0; + _impl_.start_ = 0; _impl_._has_bits_[0] &= ~0x00000001u; } inline ::int32_t EnumDescriptorProto_EnumReservedRange::start() const { @@ -14665,9 +14547,8 @@ inline bool EnumDescriptorProto_EnumReservedRange::has_end() const { return value; } inline void EnumDescriptorProto_EnumReservedRange::clear_end() { - EnumDescriptorProto_EnumReservedRange& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.end_ = 0; + _impl_.end_ = 0; _impl_._has_bits_[0] &= ~0x00000002u; } inline ::int32_t EnumDescriptorProto_EnumReservedRange::end() const { @@ -14698,7 +14579,6 @@ inline bool EnumDescriptorProto::has_name() const { return value; } inline void EnumDescriptorProto::clear_name() { - EnumDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.name_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -14772,9 +14652,8 @@ inline int EnumDescriptorProto::value_size() const { return _internal_value_size(); } inline void EnumDescriptorProto::clear_value() { - EnumDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.value_.Clear(); + _impl_.value_.Clear(); } inline ::google::protobuf::EnumValueDescriptorProto* EnumDescriptorProto::mutable_value(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -14821,7 +14700,6 @@ inline bool EnumDescriptorProto::has_options() const { return value; } inline void EnumDescriptorProto::clear_options() { - EnumDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.options_ != nullptr) _impl_.options_->Clear(); _impl_._has_bits_[0] &= ~0x00000002u; @@ -14919,9 +14797,8 @@ inline int EnumDescriptorProto::reserved_range_size() const { return _internal_reserved_range_size(); } inline void EnumDescriptorProto::clear_reserved_range() { - EnumDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.reserved_range_.Clear(); + _impl_.reserved_range_.Clear(); } inline ::google::protobuf::EnumDescriptorProto_EnumReservedRange* EnumDescriptorProto::mutable_reserved_range(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -14969,9 +14846,8 @@ inline int EnumDescriptorProto::reserved_name_size() const { return _internal_reserved_name_size(); } inline void EnumDescriptorProto::clear_reserved_name() { - EnumDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.reserved_name_.Clear(); + _impl_.reserved_name_.Clear(); } inline std::string* EnumDescriptorProto::add_reserved_name() ABSL_ATTRIBUTE_LIFETIME_BOUND { ::google::protobuf::internal::TSanWrite(&_impl_); @@ -15036,7 +14912,6 @@ inline bool EnumValueDescriptorProto::has_name() const { return value; } inline void EnumValueDescriptorProto::clear_name() { - EnumValueDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.name_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -15108,9 +14983,8 @@ inline bool EnumValueDescriptorProto::has_number() const { return value; } inline void EnumValueDescriptorProto::clear_number() { - EnumValueDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.number_ = 0; + _impl_.number_ = 0; _impl_._has_bits_[0] &= ~0x00000004u; } inline ::int32_t EnumValueDescriptorProto::number() const { @@ -15138,7 +15012,6 @@ inline bool EnumValueDescriptorProto::has_options() const { return value; } inline void EnumValueDescriptorProto::clear_options() { - EnumValueDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.options_ != nullptr) _impl_.options_->Clear(); _impl_._has_bits_[0] &= ~0x00000002u; @@ -15238,7 +15111,6 @@ inline bool ServiceDescriptorProto::has_name() const { return value; } inline void ServiceDescriptorProto::clear_name() { - ServiceDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.name_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -15312,9 +15184,8 @@ inline int ServiceDescriptorProto::method_size() const { return _internal_method_size(); } inline void ServiceDescriptorProto::clear_method() { - ServiceDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.method_.Clear(); + _impl_.method_.Clear(); } inline ::google::protobuf::MethodDescriptorProto* ServiceDescriptorProto::mutable_method(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -15361,7 +15232,6 @@ inline bool ServiceDescriptorProto::has_options() const { return value; } inline void ServiceDescriptorProto::clear_options() { - ServiceDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.options_ != nullptr) _impl_.options_->Clear(); _impl_._has_bits_[0] &= ~0x00000002u; @@ -15461,7 +15331,6 @@ inline bool MethodDescriptorProto::has_name() const { return value; } inline void MethodDescriptorProto::clear_name() { - MethodDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.name_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -15533,7 +15402,6 @@ inline bool MethodDescriptorProto::has_input_type() const { return value; } inline void MethodDescriptorProto::clear_input_type() { - MethodDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.input_type_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000002u; @@ -15605,7 +15473,6 @@ inline bool MethodDescriptorProto::has_output_type() const { return value; } inline void MethodDescriptorProto::clear_output_type() { - MethodDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.output_type_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000004u; @@ -15678,7 +15545,6 @@ inline bool MethodDescriptorProto::has_options() const { return value; } inline void MethodDescriptorProto::clear_options() { - MethodDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.options_ != nullptr) _impl_.options_->Clear(); _impl_._has_bits_[0] &= ~0x00000008u; @@ -15774,9 +15640,8 @@ inline bool MethodDescriptorProto::has_client_streaming() const { return value; } inline void MethodDescriptorProto::clear_client_streaming() { - MethodDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.client_streaming_ = false; + _impl_.client_streaming_ = false; _impl_._has_bits_[0] &= ~0x00000010u; } inline bool MethodDescriptorProto::client_streaming() const { @@ -15803,9 +15668,8 @@ inline bool MethodDescriptorProto::has_server_streaming() const { return value; } inline void MethodDescriptorProto::clear_server_streaming() { - MethodDescriptorProto& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.server_streaming_ = false; + _impl_.server_streaming_ = false; _impl_._has_bits_[0] &= ~0x00000020u; } inline bool MethodDescriptorProto::server_streaming() const { @@ -15836,7 +15700,6 @@ inline bool FileOptions::has_java_package() const { return value; } inline void FileOptions::clear_java_package() { - FileOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.java_package_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -15908,7 +15771,6 @@ inline bool FileOptions::has_java_outer_classname() const { return value; } inline void FileOptions::clear_java_outer_classname() { - FileOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.java_outer_classname_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000002u; @@ -15980,9 +15842,8 @@ inline bool FileOptions::has_java_multiple_files() const { return value; } inline void FileOptions::clear_java_multiple_files() { - FileOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.java_multiple_files_ = false; + _impl_.java_multiple_files_ = false; _impl_._has_bits_[0] &= ~0x00000800u; } inline bool FileOptions::java_multiple_files() const { @@ -16009,9 +15870,8 @@ inline bool FileOptions::has_java_generate_equals_and_hash() const { return value; } inline void FileOptions::clear_java_generate_equals_and_hash() { - FileOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.java_generate_equals_and_hash_ = false; + _impl_.java_generate_equals_and_hash_ = false; _impl_._has_bits_[0] &= ~0x00001000u; } inline bool FileOptions::java_generate_equals_and_hash() const { @@ -16038,9 +15898,8 @@ inline bool FileOptions::has_java_string_check_utf8() const { return value; } inline void FileOptions::clear_java_string_check_utf8() { - FileOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.java_string_check_utf8_ = false; + _impl_.java_string_check_utf8_ = false; _impl_._has_bits_[0] &= ~0x00002000u; } inline bool FileOptions::java_string_check_utf8() const { @@ -16067,9 +15926,8 @@ inline bool FileOptions::has_optimize_for() const { return value; } inline void FileOptions::clear_optimize_for() { - FileOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.optimize_for_ = 1; + _impl_.optimize_for_ = 1; _impl_._has_bits_[0] &= ~0x00040000u; } inline ::google::protobuf::FileOptions_OptimizeMode FileOptions::optimize_for() const { @@ -16097,7 +15955,6 @@ inline bool FileOptions::has_go_package() const { return value; } inline void FileOptions::clear_go_package() { - FileOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.go_package_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000004u; @@ -16169,9 +16026,8 @@ inline bool FileOptions::has_cc_generic_services() const { return value; } inline void FileOptions::clear_cc_generic_services() { - FileOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.cc_generic_services_ = false; + _impl_.cc_generic_services_ = false; _impl_._has_bits_[0] &= ~0x00004000u; } inline bool FileOptions::cc_generic_services() const { @@ -16198,9 +16054,8 @@ inline bool FileOptions::has_java_generic_services() const { return value; } inline void FileOptions::clear_java_generic_services() { - FileOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.java_generic_services_ = false; + _impl_.java_generic_services_ = false; _impl_._has_bits_[0] &= ~0x00008000u; } inline bool FileOptions::java_generic_services() const { @@ -16227,9 +16082,8 @@ inline bool FileOptions::has_py_generic_services() const { return value; } inline void FileOptions::clear_py_generic_services() { - FileOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.py_generic_services_ = false; + _impl_.py_generic_services_ = false; _impl_._has_bits_[0] &= ~0x00010000u; } inline bool FileOptions::py_generic_services() const { @@ -16256,9 +16110,8 @@ inline bool FileOptions::has_deprecated() const { return value; } inline void FileOptions::clear_deprecated() { - FileOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.deprecated_ = false; + _impl_.deprecated_ = false; _impl_._has_bits_[0] &= ~0x00020000u; } inline bool FileOptions::deprecated() const { @@ -16285,9 +16138,8 @@ inline bool FileOptions::has_cc_enable_arenas() const { return value; } inline void FileOptions::clear_cc_enable_arenas() { - FileOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.cc_enable_arenas_ = true; + _impl_.cc_enable_arenas_ = true; _impl_._has_bits_[0] &= ~0x00080000u; } inline bool FileOptions::cc_enable_arenas() const { @@ -16314,7 +16166,6 @@ inline bool FileOptions::has_objc_class_prefix() const { return value; } inline void FileOptions::clear_objc_class_prefix() { - FileOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.objc_class_prefix_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000008u; @@ -16386,7 +16237,6 @@ inline bool FileOptions::has_csharp_namespace() const { return value; } inline void FileOptions::clear_csharp_namespace() { - FileOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.csharp_namespace_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000010u; @@ -16458,7 +16308,6 @@ inline bool FileOptions::has_swift_prefix() const { return value; } inline void FileOptions::clear_swift_prefix() { - FileOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.swift_prefix_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000020u; @@ -16530,7 +16379,6 @@ inline bool FileOptions::has_php_class_prefix() const { return value; } inline void FileOptions::clear_php_class_prefix() { - FileOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.php_class_prefix_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000040u; @@ -16602,7 +16450,6 @@ inline bool FileOptions::has_php_namespace() const { return value; } inline void FileOptions::clear_php_namespace() { - FileOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.php_namespace_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000080u; @@ -16674,7 +16521,6 @@ inline bool FileOptions::has_php_metadata_namespace() const { return value; } inline void FileOptions::clear_php_metadata_namespace() { - FileOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.php_metadata_namespace_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000100u; @@ -16746,7 +16592,6 @@ inline bool FileOptions::has_ruby_package() const { return value; } inline void FileOptions::clear_ruby_package() { - FileOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.ruby_package_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000200u; @@ -16819,7 +16664,6 @@ inline bool FileOptions::has_features() const { return value; } inline void FileOptions::clear_features() { - FileOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.features_ != nullptr) _impl_.features_->Clear(); _impl_._has_bits_[0] &= ~0x00000400u; @@ -16917,9 +16761,8 @@ inline int FileOptions::uninterpreted_option_size() const { return _internal_uninterpreted_option_size(); } inline void FileOptions::clear_uninterpreted_option() { - FileOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.uninterpreted_option_.Clear(); + _impl_.uninterpreted_option_.Clear(); } inline ::google::protobuf::UninterpretedOption* FileOptions::mutable_uninterpreted_option(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -16969,9 +16812,8 @@ inline bool MessageOptions::has_message_set_wire_format() const { return value; } inline void MessageOptions::clear_message_set_wire_format() { - MessageOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.message_set_wire_format_ = false; + _impl_.message_set_wire_format_ = false; _impl_._has_bits_[0] &= ~0x00000002u; } inline bool MessageOptions::message_set_wire_format() const { @@ -16998,9 +16840,8 @@ inline bool MessageOptions::has_no_standard_descriptor_accessor() const { return value; } inline void MessageOptions::clear_no_standard_descriptor_accessor() { - MessageOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.no_standard_descriptor_accessor_ = false; + _impl_.no_standard_descriptor_accessor_ = false; _impl_._has_bits_[0] &= ~0x00000004u; } inline bool MessageOptions::no_standard_descriptor_accessor() const { @@ -17027,9 +16868,8 @@ inline bool MessageOptions::has_deprecated() const { return value; } inline void MessageOptions::clear_deprecated() { - MessageOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.deprecated_ = false; + _impl_.deprecated_ = false; _impl_._has_bits_[0] &= ~0x00000008u; } inline bool MessageOptions::deprecated() const { @@ -17056,9 +16896,8 @@ inline bool MessageOptions::has_map_entry() const { return value; } inline void MessageOptions::clear_map_entry() { - MessageOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.map_entry_ = false; + _impl_.map_entry_ = false; _impl_._has_bits_[0] &= ~0x00000010u; } inline bool MessageOptions::map_entry() const { @@ -17085,9 +16924,8 @@ inline bool MessageOptions::has_deprecated_legacy_json_field_conflicts() const { return value; } inline void MessageOptions::clear_deprecated_legacy_json_field_conflicts() { - MessageOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.deprecated_legacy_json_field_conflicts_ = false; + _impl_.deprecated_legacy_json_field_conflicts_ = false; _impl_._has_bits_[0] &= ~0x00000020u; } inline bool MessageOptions::deprecated_legacy_json_field_conflicts() const { @@ -17115,7 +16953,6 @@ inline bool MessageOptions::has_features() const { return value; } inline void MessageOptions::clear_features() { - MessageOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.features_ != nullptr) _impl_.features_->Clear(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -17213,9 +17050,8 @@ inline int MessageOptions::uninterpreted_option_size() const { return _internal_uninterpreted_option_size(); } inline void MessageOptions::clear_uninterpreted_option() { - MessageOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.uninterpreted_option_.Clear(); + _impl_.uninterpreted_option_.Clear(); } inline ::google::protobuf::UninterpretedOption* MessageOptions::mutable_uninterpreted_option(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -17265,9 +17101,8 @@ inline bool FieldOptions_EditionDefault::has_edition() const { return value; } inline void FieldOptions_EditionDefault::clear_edition() { - FieldOptions_EditionDefault& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.edition_ = 0; + _impl_.edition_ = 0; _impl_._has_bits_[0] &= ~0x00000002u; } inline ::google::protobuf::Edition FieldOptions_EditionDefault::edition() const { @@ -17295,7 +17130,6 @@ inline bool FieldOptions_EditionDefault::has_value() const { return value; } inline void FieldOptions_EditionDefault::clear_value() { - FieldOptions_EditionDefault& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.value_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -17371,9 +17205,8 @@ inline bool FieldOptions_FeatureSupport::has_edition_introduced() const { return value; } inline void FieldOptions_FeatureSupport::clear_edition_introduced() { - FieldOptions_FeatureSupport& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.edition_introduced_ = 0; + _impl_.edition_introduced_ = 0; _impl_._has_bits_[0] &= ~0x00000002u; } inline ::google::protobuf::Edition FieldOptions_FeatureSupport::edition_introduced() const { @@ -17401,9 +17234,8 @@ inline bool FieldOptions_FeatureSupport::has_edition_deprecated() const { return value; } inline void FieldOptions_FeatureSupport::clear_edition_deprecated() { - FieldOptions_FeatureSupport& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.edition_deprecated_ = 0; + _impl_.edition_deprecated_ = 0; _impl_._has_bits_[0] &= ~0x00000004u; } inline ::google::protobuf::Edition FieldOptions_FeatureSupport::edition_deprecated() const { @@ -17431,7 +17263,6 @@ inline bool FieldOptions_FeatureSupport::has_deprecation_warning() const { return value; } inline void FieldOptions_FeatureSupport::clear_deprecation_warning() { - FieldOptions_FeatureSupport& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.deprecation_warning_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -17503,9 +17334,8 @@ inline bool FieldOptions_FeatureSupport::has_edition_removed() const { return value; } inline void FieldOptions_FeatureSupport::clear_edition_removed() { - FieldOptions_FeatureSupport& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.edition_removed_ = 0; + _impl_.edition_removed_ = 0; _impl_._has_bits_[0] &= ~0x00000008u; } inline ::google::protobuf::Edition FieldOptions_FeatureSupport::edition_removed() const { @@ -17537,9 +17367,8 @@ inline bool FieldOptions::has_ctype() const { return value; } inline void FieldOptions::clear_ctype() { - FieldOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.ctype_ = 0; + _impl_.ctype_ = 0; _impl_._has_bits_[0] &= ~0x00000004u; } inline ::google::protobuf::FieldOptions_CType FieldOptions::ctype() const { @@ -17567,9 +17396,8 @@ inline bool FieldOptions::has_packed() const { return value; } inline void FieldOptions::clear_packed() { - FieldOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.packed_ = false; + _impl_.packed_ = false; _impl_._has_bits_[0] &= ~0x00000010u; } inline bool FieldOptions::packed() const { @@ -17596,9 +17424,8 @@ inline bool FieldOptions::has_jstype() const { return value; } inline void FieldOptions::clear_jstype() { - FieldOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.jstype_ = 0; + _impl_.jstype_ = 0; _impl_._has_bits_[0] &= ~0x00000008u; } inline ::google::protobuf::FieldOptions_JSType FieldOptions::jstype() const { @@ -17626,9 +17453,8 @@ inline bool FieldOptions::has_lazy() const { return value; } inline void FieldOptions::clear_lazy() { - FieldOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.lazy_ = false; + _impl_.lazy_ = false; _impl_._has_bits_[0] &= ~0x00000020u; } inline bool FieldOptions::lazy() const { @@ -17655,9 +17481,8 @@ inline bool FieldOptions::has_unverified_lazy() const { return value; } inline void FieldOptions::clear_unverified_lazy() { - FieldOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.unverified_lazy_ = false; + _impl_.unverified_lazy_ = false; _impl_._has_bits_[0] &= ~0x00000040u; } inline bool FieldOptions::unverified_lazy() const { @@ -17684,9 +17509,8 @@ inline bool FieldOptions::has_deprecated() const { return value; } inline void FieldOptions::clear_deprecated() { - FieldOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.deprecated_ = false; + _impl_.deprecated_ = false; _impl_._has_bits_[0] &= ~0x00000080u; } inline bool FieldOptions::deprecated() const { @@ -17713,9 +17537,8 @@ inline bool FieldOptions::has_weak() const { return value; } inline void FieldOptions::clear_weak() { - FieldOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.weak_ = false; + _impl_.weak_ = false; _impl_._has_bits_[0] &= ~0x00000100u; } inline bool FieldOptions::weak() const { @@ -17742,9 +17565,8 @@ inline bool FieldOptions::has_debug_redact() const { return value; } inline void FieldOptions::clear_debug_redact() { - FieldOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.debug_redact_ = false; + _impl_.debug_redact_ = false; _impl_._has_bits_[0] &= ~0x00000200u; } inline bool FieldOptions::debug_redact() const { @@ -17771,9 +17593,8 @@ inline bool FieldOptions::has_retention() const { return value; } inline void FieldOptions::clear_retention() { - FieldOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.retention_ = 0; + _impl_.retention_ = 0; _impl_._has_bits_[0] &= ~0x00000400u; } inline ::google::protobuf::FieldOptions_OptionRetention FieldOptions::retention() const { @@ -17803,9 +17624,8 @@ inline int FieldOptions::targets_size() const { return _internal_targets_size(); } inline void FieldOptions::clear_targets() { - FieldOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.targets_.Clear(); + _impl_.targets_.Clear(); } inline ::google::protobuf::FieldOptions_OptionTargetType FieldOptions::targets(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.targets) @@ -17851,9 +17671,8 @@ inline int FieldOptions::edition_defaults_size() const { return _internal_edition_defaults_size(); } inline void FieldOptions::clear_edition_defaults() { - FieldOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.edition_defaults_.Clear(); + _impl_.edition_defaults_.Clear(); } inline ::google::protobuf::FieldOptions_EditionDefault* FieldOptions::mutable_edition_defaults(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -17900,7 +17719,6 @@ inline bool FieldOptions::has_features() const { return value; } inline void FieldOptions::clear_features() { - FieldOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.features_ != nullptr) _impl_.features_->Clear(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -17997,7 +17815,6 @@ inline bool FieldOptions::has_feature_support() const { return value; } inline void FieldOptions::clear_feature_support() { - FieldOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.feature_support_ != nullptr) _impl_.feature_support_->Clear(); _impl_._has_bits_[0] &= ~0x00000002u; @@ -18095,9 +17912,8 @@ inline int FieldOptions::uninterpreted_option_size() const { return _internal_uninterpreted_option_size(); } inline void FieldOptions::clear_uninterpreted_option() { - FieldOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.uninterpreted_option_.Clear(); + _impl_.uninterpreted_option_.Clear(); } inline ::google::protobuf::UninterpretedOption* FieldOptions::mutable_uninterpreted_option(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -18148,7 +17964,6 @@ inline bool OneofOptions::has_features() const { return value; } inline void OneofOptions::clear_features() { - OneofOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.features_ != nullptr) _impl_.features_->Clear(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -18246,9 +18061,8 @@ inline int OneofOptions::uninterpreted_option_size() const { return _internal_uninterpreted_option_size(); } inline void OneofOptions::clear_uninterpreted_option() { - OneofOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.uninterpreted_option_.Clear(); + _impl_.uninterpreted_option_.Clear(); } inline ::google::protobuf::UninterpretedOption* OneofOptions::mutable_uninterpreted_option(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -18298,9 +18112,8 @@ inline bool EnumOptions::has_allow_alias() const { return value; } inline void EnumOptions::clear_allow_alias() { - EnumOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.allow_alias_ = false; + _impl_.allow_alias_ = false; _impl_._has_bits_[0] &= ~0x00000002u; } inline bool EnumOptions::allow_alias() const { @@ -18327,9 +18140,8 @@ inline bool EnumOptions::has_deprecated() const { return value; } inline void EnumOptions::clear_deprecated() { - EnumOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.deprecated_ = false; + _impl_.deprecated_ = false; _impl_._has_bits_[0] &= ~0x00000004u; } inline bool EnumOptions::deprecated() const { @@ -18356,9 +18168,8 @@ inline bool EnumOptions::has_deprecated_legacy_json_field_conflicts() const { return value; } inline void EnumOptions::clear_deprecated_legacy_json_field_conflicts() { - EnumOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.deprecated_legacy_json_field_conflicts_ = false; + _impl_.deprecated_legacy_json_field_conflicts_ = false; _impl_._has_bits_[0] &= ~0x00000008u; } inline bool EnumOptions::deprecated_legacy_json_field_conflicts() const { @@ -18386,7 +18197,6 @@ inline bool EnumOptions::has_features() const { return value; } inline void EnumOptions::clear_features() { - EnumOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.features_ != nullptr) _impl_.features_->Clear(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -18484,9 +18294,8 @@ inline int EnumOptions::uninterpreted_option_size() const { return _internal_uninterpreted_option_size(); } inline void EnumOptions::clear_uninterpreted_option() { - EnumOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.uninterpreted_option_.Clear(); + _impl_.uninterpreted_option_.Clear(); } inline ::google::protobuf::UninterpretedOption* EnumOptions::mutable_uninterpreted_option(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -18536,9 +18345,8 @@ inline bool EnumValueOptions::has_deprecated() const { return value; } inline void EnumValueOptions::clear_deprecated() { - EnumValueOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.deprecated_ = false; + _impl_.deprecated_ = false; _impl_._has_bits_[0] &= ~0x00000004u; } inline bool EnumValueOptions::deprecated() const { @@ -18566,7 +18374,6 @@ inline bool EnumValueOptions::has_features() const { return value; } inline void EnumValueOptions::clear_features() { - EnumValueOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.features_ != nullptr) _impl_.features_->Clear(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -18662,9 +18469,8 @@ inline bool EnumValueOptions::has_debug_redact() const { return value; } inline void EnumValueOptions::clear_debug_redact() { - EnumValueOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.debug_redact_ = false; + _impl_.debug_redact_ = false; _impl_._has_bits_[0] &= ~0x00000008u; } inline bool EnumValueOptions::debug_redact() const { @@ -18692,7 +18498,6 @@ inline bool EnumValueOptions::has_feature_support() const { return value; } inline void EnumValueOptions::clear_feature_support() { - EnumValueOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.feature_support_ != nullptr) _impl_.feature_support_->Clear(); _impl_._has_bits_[0] &= ~0x00000002u; @@ -18790,9 +18595,8 @@ inline int EnumValueOptions::uninterpreted_option_size() const { return _internal_uninterpreted_option_size(); } inline void EnumValueOptions::clear_uninterpreted_option() { - EnumValueOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.uninterpreted_option_.Clear(); + _impl_.uninterpreted_option_.Clear(); } inline ::google::protobuf::UninterpretedOption* EnumValueOptions::mutable_uninterpreted_option(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -18843,7 +18647,6 @@ inline bool ServiceOptions::has_features() const { return value; } inline void ServiceOptions::clear_features() { - ServiceOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.features_ != nullptr) _impl_.features_->Clear(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -18939,9 +18742,8 @@ inline bool ServiceOptions::has_deprecated() const { return value; } inline void ServiceOptions::clear_deprecated() { - ServiceOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.deprecated_ = false; + _impl_.deprecated_ = false; _impl_._has_bits_[0] &= ~0x00000002u; } inline bool ServiceOptions::deprecated() const { @@ -18970,9 +18772,8 @@ inline int ServiceOptions::uninterpreted_option_size() const { return _internal_uninterpreted_option_size(); } inline void ServiceOptions::clear_uninterpreted_option() { - ServiceOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.uninterpreted_option_.Clear(); + _impl_.uninterpreted_option_.Clear(); } inline ::google::protobuf::UninterpretedOption* ServiceOptions::mutable_uninterpreted_option(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -19022,9 +18823,8 @@ inline bool MethodOptions::has_deprecated() const { return value; } inline void MethodOptions::clear_deprecated() { - MethodOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.deprecated_ = false; + _impl_.deprecated_ = false; _impl_._has_bits_[0] &= ~0x00000002u; } inline bool MethodOptions::deprecated() const { @@ -19051,9 +18851,8 @@ inline bool MethodOptions::has_idempotency_level() const { return value; } inline void MethodOptions::clear_idempotency_level() { - MethodOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.idempotency_level_ = 0; + _impl_.idempotency_level_ = 0; _impl_._has_bits_[0] &= ~0x00000004u; } inline ::google::protobuf::MethodOptions_IdempotencyLevel MethodOptions::idempotency_level() const { @@ -19082,7 +18881,6 @@ inline bool MethodOptions::has_features() const { return value; } inline void MethodOptions::clear_features() { - MethodOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.features_ != nullptr) _impl_.features_->Clear(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -19180,9 +18978,8 @@ inline int MethodOptions::uninterpreted_option_size() const { return _internal_uninterpreted_option_size(); } inline void MethodOptions::clear_uninterpreted_option() { - MethodOptions& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.uninterpreted_option_.Clear(); + _impl_.uninterpreted_option_.Clear(); } inline ::google::protobuf::UninterpretedOption* MethodOptions::mutable_uninterpreted_option(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -19232,7 +19029,6 @@ inline bool UninterpretedOption_NamePart::has_name_part() const { return value; } inline void UninterpretedOption_NamePart::clear_name_part() { - UninterpretedOption_NamePart& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.name_part_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -19304,9 +19100,8 @@ inline bool UninterpretedOption_NamePart::has_is_extension() const { return value; } inline void UninterpretedOption_NamePart::clear_is_extension() { - UninterpretedOption_NamePart& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.is_extension_ = false; + _impl_.is_extension_ = false; _impl_._has_bits_[0] &= ~0x00000002u; } inline bool UninterpretedOption_NamePart::is_extension() const { @@ -19339,9 +19134,8 @@ inline int UninterpretedOption::name_size() const { return _internal_name_size(); } inline void UninterpretedOption::clear_name() { - UninterpretedOption& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.name_.Clear(); + _impl_.name_.Clear(); } inline ::google::protobuf::UninterpretedOption_NamePart* UninterpretedOption::mutable_name(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -19387,7 +19181,6 @@ inline bool UninterpretedOption::has_identifier_value() const { return value; } inline void UninterpretedOption::clear_identifier_value() { - UninterpretedOption& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.identifier_value_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -19459,9 +19252,8 @@ inline bool UninterpretedOption::has_positive_int_value() const { return value; } inline void UninterpretedOption::clear_positive_int_value() { - UninterpretedOption& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.positive_int_value_ = ::uint64_t{0u}; + _impl_.positive_int_value_ = ::uint64_t{0u}; _impl_._has_bits_[0] &= ~0x00000008u; } inline ::uint64_t UninterpretedOption::positive_int_value() const { @@ -19488,9 +19280,8 @@ inline bool UninterpretedOption::has_negative_int_value() const { return value; } inline void UninterpretedOption::clear_negative_int_value() { - UninterpretedOption& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.negative_int_value_ = ::int64_t{0}; + _impl_.negative_int_value_ = ::int64_t{0}; _impl_._has_bits_[0] &= ~0x00000010u; } inline ::int64_t UninterpretedOption::negative_int_value() const { @@ -19517,9 +19308,8 @@ inline bool UninterpretedOption::has_double_value() const { return value; } inline void UninterpretedOption::clear_double_value() { - UninterpretedOption& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.double_value_ = 0; + _impl_.double_value_ = 0; _impl_._has_bits_[0] &= ~0x00000020u; } inline double UninterpretedOption::double_value() const { @@ -19546,7 +19336,6 @@ inline bool UninterpretedOption::has_string_value() const { return value; } inline void UninterpretedOption::clear_string_value() { - UninterpretedOption& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.string_value_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000002u; @@ -19618,7 +19407,6 @@ inline bool UninterpretedOption::has_aggregate_value() const { return value; } inline void UninterpretedOption::clear_aggregate_value() { - UninterpretedOption& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.aggregate_value_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000004u; @@ -19694,9 +19482,8 @@ inline bool FeatureSet::has_field_presence() const { return value; } inline void FeatureSet::clear_field_presence() { - FeatureSet& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.field_presence_ = 0; + _impl_.field_presence_ = 0; _impl_._has_bits_[0] &= ~0x00000001u; } inline ::google::protobuf::FeatureSet_FieldPresence FeatureSet::field_presence() const { @@ -19724,9 +19511,8 @@ inline bool FeatureSet::has_enum_type() const { return value; } inline void FeatureSet::clear_enum_type() { - FeatureSet& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.enum_type_ = 0; + _impl_.enum_type_ = 0; _impl_._has_bits_[0] &= ~0x00000002u; } inline ::google::protobuf::FeatureSet_EnumType FeatureSet::enum_type() const { @@ -19754,9 +19540,8 @@ inline bool FeatureSet::has_repeated_field_encoding() const { return value; } inline void FeatureSet::clear_repeated_field_encoding() { - FeatureSet& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.repeated_field_encoding_ = 0; + _impl_.repeated_field_encoding_ = 0; _impl_._has_bits_[0] &= ~0x00000004u; } inline ::google::protobuf::FeatureSet_RepeatedFieldEncoding FeatureSet::repeated_field_encoding() const { @@ -19784,9 +19569,8 @@ inline bool FeatureSet::has_utf8_validation() const { return value; } inline void FeatureSet::clear_utf8_validation() { - FeatureSet& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.utf8_validation_ = 0; + _impl_.utf8_validation_ = 0; _impl_._has_bits_[0] &= ~0x00000008u; } inline ::google::protobuf::FeatureSet_Utf8Validation FeatureSet::utf8_validation() const { @@ -19814,9 +19598,8 @@ inline bool FeatureSet::has_message_encoding() const { return value; } inline void FeatureSet::clear_message_encoding() { - FeatureSet& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.message_encoding_ = 0; + _impl_.message_encoding_ = 0; _impl_._has_bits_[0] &= ~0x00000010u; } inline ::google::protobuf::FeatureSet_MessageEncoding FeatureSet::message_encoding() const { @@ -19844,9 +19627,8 @@ inline bool FeatureSet::has_json_format() const { return value; } inline void FeatureSet::clear_json_format() { - FeatureSet& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.json_format_ = 0; + _impl_.json_format_ = 0; _impl_._has_bits_[0] &= ~0x00000020u; } inline ::google::protobuf::FeatureSet_JsonFormat FeatureSet::json_format() const { @@ -19878,9 +19660,8 @@ inline bool FeatureSetDefaults_FeatureSetEditionDefault::has_edition() const { return value; } inline void FeatureSetDefaults_FeatureSetEditionDefault::clear_edition() { - FeatureSetDefaults_FeatureSetEditionDefault& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.edition_ = 0; + _impl_.edition_ = 0; _impl_._has_bits_[0] &= ~0x00000004u; } inline ::google::protobuf::Edition FeatureSetDefaults_FeatureSetEditionDefault::edition() const { @@ -19909,7 +19690,6 @@ inline bool FeatureSetDefaults_FeatureSetEditionDefault::has_overridable_feature return value; } inline void FeatureSetDefaults_FeatureSetEditionDefault::clear_overridable_features() { - FeatureSetDefaults_FeatureSetEditionDefault& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.overridable_features_ != nullptr) _impl_.overridable_features_->Clear(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -20006,7 +19786,6 @@ inline bool FeatureSetDefaults_FeatureSetEditionDefault::has_fixed_features() co return value; } inline void FeatureSetDefaults_FeatureSetEditionDefault::clear_fixed_features() { - FeatureSetDefaults_FeatureSetEditionDefault& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.fixed_features_ != nullptr) _impl_.fixed_features_->Clear(); _impl_._has_bits_[0] &= ~0x00000002u; @@ -20108,9 +19887,8 @@ inline int FeatureSetDefaults::defaults_size() const { return _internal_defaults_size(); } inline void FeatureSetDefaults::clear_defaults() { - FeatureSetDefaults& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.defaults_.Clear(); + _impl_.defaults_.Clear(); } inline ::google::protobuf::FeatureSetDefaults_FeatureSetEditionDefault* FeatureSetDefaults::mutable_defaults(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -20156,9 +19934,8 @@ inline bool FeatureSetDefaults::has_minimum_edition() const { return value; } inline void FeatureSetDefaults::clear_minimum_edition() { - FeatureSetDefaults& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.minimum_edition_ = 0; + _impl_.minimum_edition_ = 0; _impl_._has_bits_[0] &= ~0x00000001u; } inline ::google::protobuf::Edition FeatureSetDefaults::minimum_edition() const { @@ -20186,9 +19963,8 @@ inline bool FeatureSetDefaults::has_maximum_edition() const { return value; } inline void FeatureSetDefaults::clear_maximum_edition() { - FeatureSetDefaults& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.maximum_edition_ = 0; + _impl_.maximum_edition_ = 0; _impl_._has_bits_[0] &= ~0x00000002u; } inline ::google::protobuf::Edition FeatureSetDefaults::maximum_edition() const { @@ -20222,9 +19998,8 @@ inline int SourceCodeInfo_Location::path_size() const { return _internal_path_size(); } inline void SourceCodeInfo_Location::clear_path() { - SourceCodeInfo_Location& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.path_.Clear(); + _impl_.path_.Clear(); } inline ::int32_t SourceCodeInfo_Location::path(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.path) @@ -20268,9 +20043,8 @@ inline int SourceCodeInfo_Location::span_size() const { return _internal_span_size(); } inline void SourceCodeInfo_Location::clear_span() { - SourceCodeInfo_Location& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.span_.Clear(); + _impl_.span_.Clear(); } inline ::int32_t SourceCodeInfo_Location::span(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.span) @@ -20312,7 +20086,6 @@ inline bool SourceCodeInfo_Location::has_leading_comments() const { return value; } inline void SourceCodeInfo_Location::clear_leading_comments() { - SourceCodeInfo_Location& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.leading_comments_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -20384,7 +20157,6 @@ inline bool SourceCodeInfo_Location::has_trailing_comments() const { return value; } inline void SourceCodeInfo_Location::clear_trailing_comments() { - SourceCodeInfo_Location& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.trailing_comments_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000002u; @@ -20458,9 +20230,8 @@ inline int SourceCodeInfo_Location::leading_detached_comments_size() const { return _internal_leading_detached_comments_size(); } inline void SourceCodeInfo_Location::clear_leading_detached_comments() { - SourceCodeInfo_Location& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.leading_detached_comments_.Clear(); + _impl_.leading_detached_comments_.Clear(); } inline std::string* SourceCodeInfo_Location::add_leading_detached_comments() ABSL_ATTRIBUTE_LIFETIME_BOUND { ::google::protobuf::internal::TSanWrite(&_impl_); @@ -20527,9 +20298,8 @@ inline int SourceCodeInfo::location_size() const { return _internal_location_size(); } inline void SourceCodeInfo::clear_location() { - SourceCodeInfo& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.location_.Clear(); + _impl_.location_.Clear(); } inline ::google::protobuf::SourceCodeInfo_Location* SourceCodeInfo::mutable_location(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -20581,9 +20351,8 @@ inline int GeneratedCodeInfo_Annotation::path_size() const { return _internal_path_size(); } inline void GeneratedCodeInfo_Annotation::clear_path() { - GeneratedCodeInfo_Annotation& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.path_.Clear(); + _impl_.path_.Clear(); } inline ::int32_t GeneratedCodeInfo_Annotation::path(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.path) @@ -20625,7 +20394,6 @@ inline bool GeneratedCodeInfo_Annotation::has_source_file() const { return value; } inline void GeneratedCodeInfo_Annotation::clear_source_file() { - GeneratedCodeInfo_Annotation& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.source_file_.ClearToEmpty(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -20697,9 +20465,8 @@ inline bool GeneratedCodeInfo_Annotation::has_begin() const { return value; } inline void GeneratedCodeInfo_Annotation::clear_begin() { - GeneratedCodeInfo_Annotation& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.begin_ = 0; + _impl_.begin_ = 0; _impl_._has_bits_[0] &= ~0x00000002u; } inline ::int32_t GeneratedCodeInfo_Annotation::begin() const { @@ -20726,9 +20493,8 @@ inline bool GeneratedCodeInfo_Annotation::has_end() const { return value; } inline void GeneratedCodeInfo_Annotation::clear_end() { - GeneratedCodeInfo_Annotation& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.end_ = 0; + _impl_.end_ = 0; _impl_._has_bits_[0] &= ~0x00000004u; } inline ::int32_t GeneratedCodeInfo_Annotation::end() const { @@ -20755,9 +20521,8 @@ inline bool GeneratedCodeInfo_Annotation::has_semantic() const { return value; } inline void GeneratedCodeInfo_Annotation::clear_semantic() { - GeneratedCodeInfo_Annotation& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.semantic_ = 0; + _impl_.semantic_ = 0; _impl_._has_bits_[0] &= ~0x00000008u; } inline ::google::protobuf::GeneratedCodeInfo_Annotation_Semantic GeneratedCodeInfo_Annotation::semantic() const { @@ -20791,9 +20556,8 @@ inline int GeneratedCodeInfo::annotation_size() const { return _internal_annotation_size(); } inline void GeneratedCodeInfo::clear_annotation() { - GeneratedCodeInfo& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - this_._impl_.annotation_.Clear(); + _impl_.annotation_.Clear(); } inline ::google::protobuf::GeneratedCodeInfo_Annotation* GeneratedCodeInfo::mutable_annotation(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { diff --git a/src/google/protobuf/message_lite.h b/src/google/protobuf/message_lite.h index 486dc79023d2..c3ae2039b3d6 100644 --- a/src/google/protobuf/message_lite.h +++ b/src/google/protobuf/message_lite.h @@ -648,11 +648,22 @@ class PROTOBUF_EXPORT MessageLite { static constexpr auto GetDeleteImpl() { return DeleteImpl; } + + template + static void ClearImpl(MessageLite& msg) { + return static_cast(msg).Clear(); + } + template + static constexpr auto GetClearImpl() { + return ClearImpl; + } #else // PROTOBUF_CUSTOM_VTABLE // When custom vtables are off we avoid instantiating the functions because we // will not use them anyway. Less work for the compiler. template using GetDeleteImpl = std::nullptr_t; + template + using GetClearImpl = std::nullptr_t; #endif // PROTOBUF_CUSTOM_VTABLE template