From 0e95c9d958389720dc7e5c924fc18f3751ec6fa9 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Wed, 28 Aug 2024 20:48:17 +0000 Subject: [PATCH] Auto-generate files after cl/668584753 --- src/google/protobuf/any.pb.cc | 20 +- src/google/protobuf/any.pb.h | 40 +-- src/google/protobuf/api.pb.cc | 93 +++--- src/google/protobuf/api.pb.h | 139 +++++---- src/google/protobuf/duration.pb.cc | 22 +- src/google/protobuf/duration.pb.h | 44 +-- src/google/protobuf/empty.pb.cc | 2 +- src/google/protobuf/field_mask.pb.cc | 18 +- src/google/protobuf/field_mask.pb.h | 41 +-- src/google/protobuf/source_context.pb.cc | 18 +- src/google/protobuf/source_context.pb.h | 39 +-- src/google/protobuf/struct.pb.cc | 54 ++-- src/google/protobuf/struct.pb.h | 132 ++++---- src/google/protobuf/timestamp.pb.cc | 22 +- src/google/protobuf/timestamp.pb.h | 44 +-- src/google/protobuf/type.pb.cc | 153 ++++++---- src/google/protobuf/type.pb.h | 245 ++++++++------- src/google/protobuf/wrappers.pb.cc | 162 ++++++---- src/google/protobuf/wrappers.pb.h | 365 ++++++++++++----------- 19 files changed, 961 insertions(+), 692 deletions(-) diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc index f27d031ab5..a8bde002a0 100644 --- a/src/google/protobuf/any.pb.cc +++ b/src/google/protobuf/any.pb.cc @@ -209,7 +209,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - ::google::protobuf::Message::GetClearImpl(), &Any::ByteSizeLong, + &Any::Clear, &Any::ByteSizeLong, &Any::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(Any, _impl_._cached_size_), @@ -267,16 +267,22 @@ const ::_pbi::TcParseTable<1, 2, 0, 36, 2> Any::_table_ = { }}, }; -PROTOBUF_NOINLINE void Any::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.Any) - ::google::protobuf::internal::TSanWrite(&_impl_); +#if defined(PROTOBUF_CUSTOM_VTABLE) + void Any::Clear(MessageLite& base) { + Any& this_ = static_cast(base); +#else // PROTOBUF_CUSTOM_VTABLE + void Any::Clear() { + Any& this_ = *this; +#endif // PROTOBUF_CUSTOM_VTABLE + // @@protoc_insertion_point(message_clear_start:google.protobuf.Any) + ::google::protobuf::internal::TSanWrite(&this_._impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - _impl_.type_url_.ClearToEmpty(); - _impl_.value_.ClearToEmpty(); - _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + this_._impl_.type_url_.ClearToEmpty(); + this_._impl_.value_.ClearToEmpty(); + this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index c073a1981c..f8f9646b15 100644 --- a/src/google/protobuf/any.pb.h +++ b/src/google/protobuf/any.pb.h @@ -207,26 +207,28 @@ class PROTOBUF_EXPORT Any final : public ::google::protobuf::Message bool IsInitialized() const { return true; } - ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - 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); - } + 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); + } #else // PROTOBUF_CUSTOM_VTABLE - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ABSL_ATTRIBUTE_REINITIALIZES void Clear() 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(); } @@ -344,6 +346,7 @@ class PROTOBUF_EXPORT Any final : public ::google::protobuf::Message // string type_url = 1; inline void Any::clear_type_url() { + Any& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.type_url_.ClearToEmpty(); } @@ -394,6 +397,7 @@ inline void Any::set_allocated_type_url(std::string* value) { // bytes value = 2; inline void Any::clear_value() { + Any& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.value_.ClearToEmpty(); } diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc index ddec0837ce..27a19c75d6 100644 --- a/src/google/protobuf/api.pb.cc +++ b/src/google/protobuf/api.pb.cc @@ -254,10 +254,12 @@ class Api::_Internal { }; void Api::clear_options() { + Api& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - _impl_.options_.Clear(); + this_._impl_.options_.Clear(); } void Api::clear_source_context() { + Api& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.source_context_ != nullptr) _impl_.source_context_->Clear(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -374,7 +376,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - ::google::protobuf::Message::GetClearImpl(), &Api::ByteSizeLong, + &Api::Clear, &Api::ByteSizeLong, &Api::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(Api, _impl_._cached_size_), @@ -467,26 +469,32 @@ const ::_pbi::TcParseTable<3, 7, 4, 39, 2> Api::_table_ = { }}, }; -PROTOBUF_NOINLINE void Api::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.Api) - ::google::protobuf::internal::TSanWrite(&_impl_); +#if defined(PROTOBUF_CUSTOM_VTABLE) + void Api::Clear(MessageLite& base) { + Api& this_ = static_cast(base); +#else // PROTOBUF_CUSTOM_VTABLE + void Api::Clear() { + Api& this_ = *this; +#endif // PROTOBUF_CUSTOM_VTABLE + // @@protoc_insertion_point(message_clear_start:google.protobuf.Api) + ::google::protobuf::internal::TSanWrite(&this_._impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - _impl_.methods_.Clear(); - _impl_.options_.Clear(); - _impl_.mixins_.Clear(); - _impl_.name_.ClearToEmpty(); - _impl_.version_.ClearToEmpty(); - cached_has_bits = _impl_._has_bits_[0]; + this_._impl_.methods_.Clear(); + this_._impl_.options_.Clear(); + this_._impl_.mixins_.Clear(); + this_._impl_.name_.ClearToEmpty(); + this_._impl_.version_.ClearToEmpty(); + cached_has_bits = this_._impl_._has_bits_[0]; if (cached_has_bits & 0x00000001u) { - ABSL_DCHECK(_impl_.source_context_ != nullptr); - _impl_.source_context_->Clear(); + ABSL_DCHECK(this_._impl_.source_context_ != nullptr); + this_._impl_.source_context_->Clear(); } - _impl_.syntax_ = 0; - _impl_._has_bits_.Clear(); - _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + this_._impl_.syntax_ = 0; + this_._impl_._has_bits_.Clear(); + this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -721,8 +729,9 @@ class Method::_Internal { }; void Method::clear_options() { + Method& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - _impl_.options_.Clear(); + this_._impl_.options_.Clear(); } Method::Method(::google::protobuf::Arena* arena) #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -827,7 +836,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - ::google::protobuf::Message::GetClearImpl(), &Method::ByteSizeLong, + &Method::Clear, &Method::ByteSizeLong, &Method::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(Method, _impl_._cached_size_), @@ -918,21 +927,27 @@ const ::_pbi::TcParseTable<3, 7, 1, 68, 2> Method::_table_ = { }}, }; -PROTOBUF_NOINLINE void Method::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.Method) - ::google::protobuf::internal::TSanWrite(&_impl_); +#if defined(PROTOBUF_CUSTOM_VTABLE) + void Method::Clear(MessageLite& base) { + Method& this_ = static_cast(base); +#else // PROTOBUF_CUSTOM_VTABLE + void Method::Clear() { + Method& this_ = *this; +#endif // PROTOBUF_CUSTOM_VTABLE + // @@protoc_insertion_point(message_clear_start:google.protobuf.Method) + ::google::protobuf::internal::TSanWrite(&this_._impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - _impl_.options_.Clear(); - _impl_.name_.ClearToEmpty(); - _impl_.request_type_url_.ClearToEmpty(); - _impl_.response_type_url_.ClearToEmpty(); - ::memset(&_impl_.request_streaming_, 0, static_cast<::size_t>( - reinterpret_cast(&_impl_.syntax_) - - reinterpret_cast(&_impl_.request_streaming_)) + sizeof(_impl_.syntax_)); - _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + this_._impl_.options_.Clear(); + this_._impl_.name_.ClearToEmpty(); + this_._impl_.request_type_url_.ClearToEmpty(); + this_._impl_.response_type_url_.ClearToEmpty(); + ::memset(&this_._impl_.request_streaming_, 0, static_cast<::size_t>( + reinterpret_cast(&this_._impl_.syntax_) - + reinterpret_cast(&this_._impl_.request_streaming_)) + sizeof(_impl_.syntax_)); + this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -1212,7 +1227,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - ::google::protobuf::Message::GetClearImpl(), &Mixin::ByteSizeLong, + &Mixin::Clear, &Mixin::ByteSizeLong, &Mixin::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(Mixin, _impl_._cached_size_), @@ -1271,16 +1286,22 @@ const ::_pbi::TcParseTable<1, 2, 0, 38, 2> Mixin::_table_ = { }}, }; -PROTOBUF_NOINLINE void Mixin::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.Mixin) - ::google::protobuf::internal::TSanWrite(&_impl_); +#if defined(PROTOBUF_CUSTOM_VTABLE) + void Mixin::Clear(MessageLite& base) { + Mixin& this_ = static_cast(base); +#else // PROTOBUF_CUSTOM_VTABLE + void Mixin::Clear() { + Mixin& this_ = *this; +#endif // PROTOBUF_CUSTOM_VTABLE + // @@protoc_insertion_point(message_clear_start:google.protobuf.Mixin) + ::google::protobuf::internal::TSanWrite(&this_._impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - _impl_.name_.ClearToEmpty(); - _impl_.root_.ClearToEmpty(); - _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + this_._impl_.name_.ClearToEmpty(); + this_._impl_.root_.ClearToEmpty(); + this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index 234e7c4345..7ee303f7f7 100644 --- a/src/google/protobuf/api.pb.h +++ b/src/google/protobuf/api.pb.h @@ -167,26 +167,28 @@ class PROTOBUF_EXPORT Mixin final : public ::google::protobuf::Message bool IsInitialized() const { return true; } - ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - 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); - } + 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); + } #else // PROTOBUF_CUSTOM_VTABLE - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ABSL_ATTRIBUTE_REINITIALIZES void Clear() 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(); } @@ -380,26 +382,28 @@ class PROTOBUF_EXPORT Method final : public ::google::protobuf::Message bool IsInitialized() const { return true; } - ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - 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); - } + 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); + } #else // PROTOBUF_CUSTOM_VTABLE - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ABSL_ATTRIBUTE_REINITIALIZES void Clear() 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(); } @@ -666,26 +670,28 @@ class PROTOBUF_EXPORT Api final : public ::google::protobuf::Message bool IsInitialized() const { return true; } - ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - 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); - } + 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); + } #else // PROTOBUF_CUSTOM_VTABLE - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ABSL_ATTRIBUTE_REINITIALIZES void Clear() 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(); } @@ -889,6 +895,7 @@ class PROTOBUF_EXPORT Api final : public ::google::protobuf::Message // string name = 1; inline void Api::clear_name() { + Api& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.name_.ClearToEmpty(); } @@ -945,8 +952,9 @@ inline int Api::methods_size() const { return _internal_methods_size(); } inline void Api::clear_methods() { + Api& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - _impl_.methods_.Clear(); + this_._impl_.methods_.Clear(); } inline ::google::protobuf::Method* Api::mutable_methods(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -1033,6 +1041,7 @@ Api::_internal_mutable_options() { // string version = 4; inline void Api::clear_version() { + Api& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.version_.ClearToEmpty(); } @@ -1180,8 +1189,9 @@ inline int Api::mixins_size() const { return _internal_mixins_size(); } inline void Api::clear_mixins() { + Api& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - _impl_.mixins_.Clear(); + this_._impl_.mixins_.Clear(); } inline ::google::protobuf::Mixin* Api::mutable_mixins(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -1223,8 +1233,9 @@ Api::_internal_mutable_mixins() { // .google.protobuf.Syntax syntax = 7; inline void Api::clear_syntax() { + Api& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - _impl_.syntax_ = 0; + this_._impl_.syntax_ = 0; } inline ::google::protobuf::Syntax Api::syntax() const { // @@protoc_insertion_point(field_get:google.protobuf.Api.syntax) @@ -1249,6 +1260,7 @@ inline void Api::_internal_set_syntax(::google::protobuf::Syntax value) { // string name = 1; inline void Method::clear_name() { + Method& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.name_.ClearToEmpty(); } @@ -1299,6 +1311,7 @@ inline void Method::set_allocated_name(std::string* value) { // string request_type_url = 2; inline void Method::clear_request_type_url() { + Method& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.request_type_url_.ClearToEmpty(); } @@ -1349,8 +1362,9 @@ inline void Method::set_allocated_request_type_url(std::string* value) { // bool request_streaming = 3; inline void Method::clear_request_streaming() { + Method& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - _impl_.request_streaming_ = false; + this_._impl_.request_streaming_ = false; } inline bool Method::request_streaming() const { // @@protoc_insertion_point(field_get:google.protobuf.Method.request_streaming) @@ -1371,6 +1385,7 @@ inline void Method::_internal_set_request_streaming(bool value) { // string response_type_url = 4; inline void Method::clear_response_type_url() { + Method& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.response_type_url_.ClearToEmpty(); } @@ -1421,8 +1436,9 @@ inline void Method::set_allocated_response_type_url(std::string* value) { // bool response_streaming = 5; inline void Method::clear_response_streaming() { + Method& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - _impl_.response_streaming_ = false; + this_._impl_.response_streaming_ = false; } inline bool Method::response_streaming() const { // @@protoc_insertion_point(field_get:google.protobuf.Method.response_streaming) @@ -1488,8 +1504,9 @@ Method::_internal_mutable_options() { // .google.protobuf.Syntax syntax = 7; inline void Method::clear_syntax() { + Method& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - _impl_.syntax_ = 0; + this_._impl_.syntax_ = 0; } inline ::google::protobuf::Syntax Method::syntax() const { // @@protoc_insertion_point(field_get:google.protobuf.Method.syntax) @@ -1514,6 +1531,7 @@ inline void Method::_internal_set_syntax(::google::protobuf::Syntax value) { // string name = 1; inline void Mixin::clear_name() { + Mixin& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.name_.ClearToEmpty(); } @@ -1564,6 +1582,7 @@ inline void Mixin::set_allocated_name(std::string* value) { // string root = 2; inline void Mixin::clear_root() { + Mixin& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.root_.ClearToEmpty(); } diff --git a/src/google/protobuf/duration.pb.cc b/src/google/protobuf/duration.pb.cc index 526fb9bd0a..4a0bef56be 100644 --- a/src/google/protobuf/duration.pb.cc +++ b/src/google/protobuf/duration.pb.cc @@ -172,7 +172,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - ::google::protobuf::Message::GetClearImpl(), &Duration::ByteSizeLong, + &Duration::Clear, &Duration::ByteSizeLong, &Duration::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(Duration, _impl_._cached_size_), @@ -227,17 +227,23 @@ const ::_pbi::TcParseTable<1, 2, 0, 0, 2> Duration::_table_ = { }}, }; -PROTOBUF_NOINLINE void Duration::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.Duration) - ::google::protobuf::internal::TSanWrite(&_impl_); +#if defined(PROTOBUF_CUSTOM_VTABLE) + void Duration::Clear(MessageLite& base) { + Duration& this_ = static_cast(base); +#else // PROTOBUF_CUSTOM_VTABLE + void Duration::Clear() { + Duration& this_ = *this; +#endif // PROTOBUF_CUSTOM_VTABLE + // @@protoc_insertion_point(message_clear_start:google.protobuf.Duration) + ::google::protobuf::internal::TSanWrite(&this_._impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - ::memset(&_impl_.seconds_, 0, static_cast<::size_t>( - reinterpret_cast(&_impl_.nanos_) - - reinterpret_cast(&_impl_.seconds_)) + sizeof(_impl_.nanos_)); - _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + ::memset(&this_._impl_.seconds_, 0, static_cast<::size_t>( + reinterpret_cast(&this_._impl_.nanos_) - + reinterpret_cast(&this_._impl_.seconds_)) + sizeof(_impl_.nanos_)); + this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h index d3c3b4d363..7d4c99d941 100644 --- a/src/google/protobuf/duration.pb.h +++ b/src/google/protobuf/duration.pb.h @@ -159,26 +159,28 @@ class PROTOBUF_EXPORT Duration final : public ::google::protobuf::Message bool IsInitialized() const { return true; } - ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - 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); - } + 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); + } #else // PROTOBUF_CUSTOM_VTABLE - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ABSL_ATTRIBUTE_REINITIALIZES void Clear() 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(); } @@ -283,8 +285,9 @@ class PROTOBUF_EXPORT Duration final : public ::google::protobuf::Message // int64 seconds = 1; inline void Duration::clear_seconds() { + Duration& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - _impl_.seconds_ = ::int64_t{0}; + this_._impl_.seconds_ = ::int64_t{0}; } inline ::int64_t Duration::seconds() const { // @@protoc_insertion_point(field_get:google.protobuf.Duration.seconds) @@ -305,8 +308,9 @@ inline void Duration::_internal_set_seconds(::int64_t value) { // int32 nanos = 2; inline void Duration::clear_nanos() { + Duration& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - _impl_.nanos_ = 0; + this_._impl_.nanos_ = 0; } inline ::int32_t Duration::nanos() const { // @@protoc_insertion_point(field_get:google.protobuf.Duration.nanos) diff --git a/src/google/protobuf/empty.pb.cc b/src/google/protobuf/empty.pb.cc index 31811d5168..6614628bcd 100644 --- a/src/google/protobuf/empty.pb.cc +++ b/src/google/protobuf/empty.pb.cc @@ -147,7 +147,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::internal::ZeroFieldsBase::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::internal::ZeroFieldsBase::GetDeleteImpl(), - ::google::protobuf::internal::ZeroFieldsBase::GetClearImpl(), &Empty::ByteSizeLong, + &Empty::Clear, &Empty::ByteSizeLong, &Empty::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(Empty, _impl_._cached_size_), diff --git a/src/google/protobuf/field_mask.pb.cc b/src/google/protobuf/field_mask.pb.cc index 8b0cebc802..5a9e1922a6 100644 --- a/src/google/protobuf/field_mask.pb.cc +++ b/src/google/protobuf/field_mask.pb.cc @@ -193,7 +193,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - ::google::protobuf::Message::GetClearImpl(), &FieldMask::ByteSizeLong, + &FieldMask::Clear, &FieldMask::ByteSizeLong, &FieldMask::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(FieldMask, _impl_._cached_size_), @@ -245,15 +245,21 @@ const ::_pbi::TcParseTable<0, 1, 0, 39, 2> FieldMask::_table_ = { }}, }; -PROTOBUF_NOINLINE void FieldMask::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.FieldMask) - ::google::protobuf::internal::TSanWrite(&_impl_); +#if defined(PROTOBUF_CUSTOM_VTABLE) + void FieldMask::Clear(MessageLite& base) { + FieldMask& this_ = static_cast(base); +#else // PROTOBUF_CUSTOM_VTABLE + void FieldMask::Clear() { + FieldMask& this_ = *this; +#endif // PROTOBUF_CUSTOM_VTABLE + // @@protoc_insertion_point(message_clear_start:google.protobuf.FieldMask) + ::google::protobuf::internal::TSanWrite(&this_._impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - _impl_.paths_.Clear(); - _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + this_._impl_.paths_.Clear(); + this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h index 552a6e969e..12680ba5a8 100644 --- a/src/google/protobuf/field_mask.pb.h +++ b/src/google/protobuf/field_mask.pb.h @@ -159,26 +159,28 @@ class PROTOBUF_EXPORT FieldMask final : public ::google::protobuf::Message bool IsInitialized() const { return true; } - ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - 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); - } + 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); + } #else // PROTOBUF_CUSTOM_VTABLE - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ABSL_ATTRIBUTE_REINITIALIZES void Clear() 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(); } @@ -289,8 +291,9 @@ inline int FieldMask::paths_size() const { return _internal_paths_size(); } inline void FieldMask::clear_paths() { + FieldMask& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - _impl_.paths_.Clear(); + this_._impl_.paths_.Clear(); } inline std::string* FieldMask::add_paths() ABSL_ATTRIBUTE_LIFETIME_BOUND { ::google::protobuf::internal::TSanWrite(&_impl_); diff --git a/src/google/protobuf/source_context.pb.cc b/src/google/protobuf/source_context.pb.cc index 86b0aefd44..bc11967ced 100644 --- a/src/google/protobuf/source_context.pb.cc +++ b/src/google/protobuf/source_context.pb.cc @@ -185,7 +185,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - ::google::protobuf::Message::GetClearImpl(), &SourceContext::ByteSizeLong, + &SourceContext::Clear, &SourceContext::ByteSizeLong, &SourceContext::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(SourceContext, _impl_._cached_size_), @@ -237,15 +237,21 @@ const ::_pbi::TcParseTable<0, 1, 0, 47, 2> SourceContext::_table_ = { }}, }; -PROTOBUF_NOINLINE void SourceContext::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.SourceContext) - ::google::protobuf::internal::TSanWrite(&_impl_); +#if defined(PROTOBUF_CUSTOM_VTABLE) + void SourceContext::Clear(MessageLite& base) { + SourceContext& this_ = static_cast(base); +#else // PROTOBUF_CUSTOM_VTABLE + void SourceContext::Clear() { + SourceContext& this_ = *this; +#endif // PROTOBUF_CUSTOM_VTABLE + // @@protoc_insertion_point(message_clear_start:google.protobuf.SourceContext) + ::google::protobuf::internal::TSanWrite(&this_._impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - _impl_.file_name_.ClearToEmpty(); - _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + this_._impl_.file_name_.ClearToEmpty(); + this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h index 099fb8371c..b9b6334921 100644 --- a/src/google/protobuf/source_context.pb.h +++ b/src/google/protobuf/source_context.pb.h @@ -159,26 +159,28 @@ class PROTOBUF_EXPORT SourceContext final : public ::google::protobuf::Message bool IsInitialized() const { return true; } - ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - 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); - } + 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); + } #else // PROTOBUF_CUSTOM_VTABLE - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ABSL_ATTRIBUTE_REINITIALIZES void Clear() 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(); } @@ -277,6 +279,7 @@ class PROTOBUF_EXPORT SourceContext final : public ::google::protobuf::Message // string file_name = 1; inline void SourceContext::clear_file_name() { + SourceContext& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.file_name_.ClearToEmpty(); } diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc index c4e5e7c8fe..9718d03582 100644 --- a/src/google/protobuf/struct.pb.cc +++ b/src/google/protobuf/struct.pb.cc @@ -414,7 +414,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - ::google::protobuf::Message::GetClearImpl(), &Struct::ByteSizeLong, + &Struct::Clear, &Struct::ByteSizeLong, &Struct::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(Struct, _impl_._cached_size_), @@ -468,15 +468,21 @@ const ::_pbi::TcParseTable<0, 1, 2, 37, 2> Struct::_table_ = { }}, }; -PROTOBUF_NOINLINE void Struct::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.Struct) - ::google::protobuf::internal::TSanWrite(&_impl_); +#if defined(PROTOBUF_CUSTOM_VTABLE) + void Struct::Clear(MessageLite& base) { + Struct& this_ = static_cast(base); +#else // PROTOBUF_CUSTOM_VTABLE + void Struct::Clear() { + Struct& this_ = *this; +#endif // PROTOBUF_CUSTOM_VTABLE + // @@protoc_insertion_point(message_clear_start:google.protobuf.Struct) + ::google::protobuf::internal::TSanWrite(&this_._impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - _impl_.fields_.Clear(); - _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + this_._impl_.fields_.Clear(); + this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -765,7 +771,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - ::google::protobuf::Message::GetClearImpl(), &Value::ByteSizeLong, + &Value::Clear, &Value::ByteSizeLong, &Value::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(Value, _impl_._cached_size_), @@ -831,15 +837,21 @@ const ::_pbi::TcParseTable<0, 6, 2, 42, 2> Value::_table_ = { }}, }; -PROTOBUF_NOINLINE void Value::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.Value) - ::google::protobuf::internal::TSanWrite(&_impl_); +#if defined(PROTOBUF_CUSTOM_VTABLE) + void Value::Clear(MessageLite& base) { + Value& this_ = static_cast(base); +#else // PROTOBUF_CUSTOM_VTABLE + void Value::Clear() { + Value& this_ = *this; +#endif // PROTOBUF_CUSTOM_VTABLE + // @@protoc_insertion_point(message_clear_start:google.protobuf.Value) + ::google::protobuf::internal::TSanWrite(&this_._impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - clear_kind(); - _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + this_.clear_kind(); + this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -1133,7 +1145,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - ::google::protobuf::Message::GetClearImpl(), &ListValue::ByteSizeLong, + &ListValue::Clear, &ListValue::ByteSizeLong, &ListValue::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(ListValue, _impl_._cached_size_), @@ -1182,15 +1194,21 @@ const ::_pbi::TcParseTable<0, 1, 1, 0, 2> ListValue::_table_ = { }}, }; -PROTOBUF_NOINLINE void ListValue::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.ListValue) - ::google::protobuf::internal::TSanWrite(&_impl_); +#if defined(PROTOBUF_CUSTOM_VTABLE) + void ListValue::Clear(MessageLite& base) { + ListValue& this_ = static_cast(base); +#else // PROTOBUF_CUSTOM_VTABLE + void ListValue::Clear() { + ListValue& this_ = *this; +#endif // PROTOBUF_CUSTOM_VTABLE + // @@protoc_insertion_point(message_clear_start:google.protobuf.ListValue) + ::google::protobuf::internal::TSanWrite(&this_._impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - _impl_.values_.Clear(); - _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + this_._impl_.values_.Clear(); + this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index c4e3ec5660..14ac6e065e 100644 --- a/src/google/protobuf/struct.pb.h +++ b/src/google/protobuf/struct.pb.h @@ -204,26 +204,28 @@ class PROTOBUF_EXPORT ListValue final : public ::google::protobuf::Message bool IsInitialized() const { return true; } - ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - 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); - } + 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); + } #else // PROTOBUF_CUSTOM_VTABLE - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ABSL_ATTRIBUTE_REINITIALIZES void Clear() 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(); } @@ -400,26 +402,28 @@ class PROTOBUF_EXPORT Struct final : public ::google::protobuf::Message bool IsInitialized() const { return true; } - ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - 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); - } + 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); + } #else // PROTOBUF_CUSTOM_VTABLE - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ABSL_ATTRIBUTE_REINITIALIZES void Clear() 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(); } @@ -645,26 +649,28 @@ class PROTOBUF_EXPORT Value final : public ::google::protobuf::Message bool IsInitialized() const { return true; } - ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - 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); - } + 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); + } #else // PROTOBUF_CUSTOM_VTABLE - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ABSL_ATTRIBUTE_REINITIALIZES void Clear() 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(); } @@ -868,8 +874,9 @@ inline int Struct::fields_size() const { return _internal_fields_size(); } inline void Struct::clear_fields() { + Struct& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - _impl_.fields_.Clear(); + this_._impl_.fields_.Clear(); } inline const ::google::protobuf::Map& Struct::_internal_fields() const { ::google::protobuf::internal::TSanRead(&_impl_); @@ -900,9 +907,10 @@ inline void Value::set_has_null_value() { _impl_._oneof_case_[0] = kNullValue; } inline void Value::clear_null_value() { + Value& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (kind_case() == kNullValue) { - _impl_.kind_.null_value_ = 0; + this_._impl_.kind_.null_value_ = 0; clear_has_kind(); } } @@ -933,9 +941,10 @@ inline void Value::set_has_number_value() { _impl_._oneof_case_[0] = kNumberValue; } inline void Value::clear_number_value() { + Value& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (kind_case() == kNumberValue) { - _impl_.kind_.number_value_ = 0; + this_._impl_.kind_.number_value_ = 0; clear_has_kind(); } } @@ -966,6 +975,7 @@ inline void Value::set_has_string_value() { _impl_._oneof_case_[0] = kStringValue; } inline void Value::clear_string_value() { + Value& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (kind_case() == kStringValue) { _impl_.kind_.string_value_.Destroy(); @@ -1051,9 +1061,10 @@ inline void Value::set_has_bool_value() { _impl_._oneof_case_[0] = kBoolValue; } inline void Value::clear_bool_value() { + Value& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (kind_case() == kBoolValue) { - _impl_.kind_.bool_value_ = false; + this_._impl_.kind_.bool_value_ = false; clear_has_kind(); } } @@ -1087,6 +1098,7 @@ inline void Value::set_has_struct_value() { _impl_._oneof_case_[0] = kStructValue; } inline void Value::clear_struct_value() { + Value& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (kind_case() == kStructValue) { if (GetArena() == nullptr) { @@ -1166,6 +1178,7 @@ inline void Value::set_has_list_value() { _impl_._oneof_case_[0] = kListValue; } inline void Value::clear_list_value() { + Value& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (kind_case() == kListValue) { if (GetArena() == nullptr) { @@ -1255,8 +1268,9 @@ inline int ListValue::values_size() const { return _internal_values_size(); } inline void ListValue::clear_values() { + ListValue& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - _impl_.values_.Clear(); + this_._impl_.values_.Clear(); } inline ::google::protobuf::Value* ListValue::mutable_values(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { diff --git a/src/google/protobuf/timestamp.pb.cc b/src/google/protobuf/timestamp.pb.cc index 8f7597e322..81e9a905fb 100644 --- a/src/google/protobuf/timestamp.pb.cc +++ b/src/google/protobuf/timestamp.pb.cc @@ -172,7 +172,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - ::google::protobuf::Message::GetClearImpl(), &Timestamp::ByteSizeLong, + &Timestamp::Clear, &Timestamp::ByteSizeLong, &Timestamp::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(Timestamp, _impl_._cached_size_), @@ -227,17 +227,23 @@ const ::_pbi::TcParseTable<1, 2, 0, 0, 2> Timestamp::_table_ = { }}, }; -PROTOBUF_NOINLINE void Timestamp::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.Timestamp) - ::google::protobuf::internal::TSanWrite(&_impl_); +#if defined(PROTOBUF_CUSTOM_VTABLE) + void Timestamp::Clear(MessageLite& base) { + Timestamp& this_ = static_cast(base); +#else // PROTOBUF_CUSTOM_VTABLE + void Timestamp::Clear() { + Timestamp& this_ = *this; +#endif // PROTOBUF_CUSTOM_VTABLE + // @@protoc_insertion_point(message_clear_start:google.protobuf.Timestamp) + ::google::protobuf::internal::TSanWrite(&this_._impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - ::memset(&_impl_.seconds_, 0, static_cast<::size_t>( - reinterpret_cast(&_impl_.nanos_) - - reinterpret_cast(&_impl_.seconds_)) + sizeof(_impl_.nanos_)); - _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + ::memset(&this_._impl_.seconds_, 0, static_cast<::size_t>( + reinterpret_cast(&this_._impl_.nanos_) - + reinterpret_cast(&this_._impl_.seconds_)) + sizeof(_impl_.nanos_)); + this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h index 3f68d6000c..b44e347715 100644 --- a/src/google/protobuf/timestamp.pb.h +++ b/src/google/protobuf/timestamp.pb.h @@ -159,26 +159,28 @@ class PROTOBUF_EXPORT Timestamp final : public ::google::protobuf::Message bool IsInitialized() const { return true; } - ABSL_ATTRIBUTE_REINITIALIZES void Clear() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - 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); - } + 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); + } #else // PROTOBUF_CUSTOM_VTABLE - ::size_t ByteSizeLong() const final; - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const final; + ABSL_ATTRIBUTE_REINITIALIZES void Clear() 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(); } @@ -283,8 +285,9 @@ class PROTOBUF_EXPORT Timestamp final : public ::google::protobuf::Message // int64 seconds = 1; inline void Timestamp::clear_seconds() { + Timestamp& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - _impl_.seconds_ = ::int64_t{0}; + this_._impl_.seconds_ = ::int64_t{0}; } inline ::int64_t Timestamp::seconds() const { // @@protoc_insertion_point(field_get:google.protobuf.Timestamp.seconds) @@ -305,8 +308,9 @@ inline void Timestamp::_internal_set_seconds(::int64_t value) { // int32 nanos = 2; inline void Timestamp::clear_nanos() { + Timestamp& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); - _impl_.nanos_ = 0; + this_._impl_.nanos_ = 0; } inline ::int32_t Timestamp::nanos() const { // @@protoc_insertion_point(field_get:google.protobuf.Timestamp.nanos) diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc index 654f3207e1..0e4b1be0fd 100644 --- a/src/google/protobuf/type.pb.cc +++ b/src/google/protobuf/type.pb.cc @@ -450,6 +450,7 @@ class Type::_Internal { }; void Type::clear_source_context() { + Type& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.source_context_ != nullptr) _impl_.source_context_->Clear(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -566,7 +567,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - ::google::protobuf::Message::GetClearImpl(), &Type::ByteSizeLong, + &Type::Clear, &Type::ByteSizeLong, &Type::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(Type, _impl_._cached_size_), @@ -659,26 +660,32 @@ const ::_pbi::TcParseTable<3, 7, 3, 46, 2> Type::_table_ = { }}, }; -PROTOBUF_NOINLINE void Type::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.Type) - ::google::protobuf::internal::TSanWrite(&_impl_); +#if defined(PROTOBUF_CUSTOM_VTABLE) + void Type::Clear(MessageLite& base) { + Type& this_ = static_cast(base); +#else // PROTOBUF_CUSTOM_VTABLE + void Type::Clear() { + Type& this_ = *this; +#endif // PROTOBUF_CUSTOM_VTABLE + // @@protoc_insertion_point(message_clear_start:google.protobuf.Type) + ::google::protobuf::internal::TSanWrite(&this_._impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - _impl_.fields_.Clear(); - _impl_.oneofs_.Clear(); - _impl_.options_.Clear(); - _impl_.name_.ClearToEmpty(); - _impl_.edition_.ClearToEmpty(); - cached_has_bits = _impl_._has_bits_[0]; + this_._impl_.fields_.Clear(); + this_._impl_.oneofs_.Clear(); + this_._impl_.options_.Clear(); + this_._impl_.name_.ClearToEmpty(); + this_._impl_.edition_.ClearToEmpty(); + cached_has_bits = this_._impl_._has_bits_[0]; if (cached_has_bits & 0x00000001u) { - ABSL_DCHECK(_impl_.source_context_ != nullptr); - _impl_.source_context_->Clear(); + ABSL_DCHECK(this_._impl_.source_context_ != nullptr); + this_._impl_.source_context_->Clear(); } - _impl_.syntax_ = 0; - _impl_._has_bits_.Clear(); - _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + this_._impl_.syntax_ = 0; + this_._impl_._has_bits_.Clear(); + this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -1016,7 +1023,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - ::google::protobuf::Message::GetClearImpl(), &Field::ByteSizeLong, + &Field::Clear, &Field::ByteSizeLong, &Field::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(Field, _impl_._cached_size_), @@ -1131,22 +1138,28 @@ const ::_pbi::TcParseTable<4, 10, 1, 72, 2> Field::_table_ = { }}, }; -PROTOBUF_NOINLINE void Field::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.Field) - ::google::protobuf::internal::TSanWrite(&_impl_); +#if defined(PROTOBUF_CUSTOM_VTABLE) + void Field::Clear(MessageLite& base) { + Field& this_ = static_cast(base); +#else // PROTOBUF_CUSTOM_VTABLE + void Field::Clear() { + Field& this_ = *this; +#endif // PROTOBUF_CUSTOM_VTABLE + // @@protoc_insertion_point(message_clear_start:google.protobuf.Field) + ::google::protobuf::internal::TSanWrite(&this_._impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - _impl_.options_.Clear(); - _impl_.name_.ClearToEmpty(); - _impl_.type_url_.ClearToEmpty(); - _impl_.json_name_.ClearToEmpty(); - _impl_.default_value_.ClearToEmpty(); - ::memset(&_impl_.kind_, 0, static_cast<::size_t>( - reinterpret_cast(&_impl_.packed_) - - reinterpret_cast(&_impl_.kind_)) + sizeof(_impl_.packed_)); - _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + this_._impl_.options_.Clear(); + this_._impl_.name_.ClearToEmpty(); + this_._impl_.type_url_.ClearToEmpty(); + this_._impl_.json_name_.ClearToEmpty(); + this_._impl_.default_value_.ClearToEmpty(); + ::memset(&this_._impl_.kind_, 0, static_cast<::size_t>( + reinterpret_cast(&this_._impl_.packed_) - + reinterpret_cast(&this_._impl_.kind_)) + sizeof(_impl_.packed_)); + this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -1405,6 +1418,7 @@ class Enum::_Internal { }; void Enum::clear_source_context() { + Enum& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.source_context_ != nullptr) _impl_.source_context_->Clear(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -1515,7 +1529,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - ::google::protobuf::Message::GetClearImpl(), &Enum::ByteSizeLong, + &Enum::Clear, &Enum::ByteSizeLong, &Enum::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(Enum, _impl_._cached_size_), @@ -1602,25 +1616,31 @@ const ::_pbi::TcParseTable<3, 6, 3, 40, 2> Enum::_table_ = { }}, }; -PROTOBUF_NOINLINE void Enum::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.Enum) - ::google::protobuf::internal::TSanWrite(&_impl_); +#if defined(PROTOBUF_CUSTOM_VTABLE) + void Enum::Clear(MessageLite& base) { + Enum& this_ = static_cast(base); +#else // PROTOBUF_CUSTOM_VTABLE + void Enum::Clear() { + Enum& this_ = *this; +#endif // PROTOBUF_CUSTOM_VTABLE + // @@protoc_insertion_point(message_clear_start:google.protobuf.Enum) + ::google::protobuf::internal::TSanWrite(&this_._impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - _impl_.enumvalue_.Clear(); - _impl_.options_.Clear(); - _impl_.name_.ClearToEmpty(); - _impl_.edition_.ClearToEmpty(); - cached_has_bits = _impl_._has_bits_[0]; + this_._impl_.enumvalue_.Clear(); + this_._impl_.options_.Clear(); + this_._impl_.name_.ClearToEmpty(); + this_._impl_.edition_.ClearToEmpty(); + cached_has_bits = this_._impl_._has_bits_[0]; if (cached_has_bits & 0x00000001u) { - ABSL_DCHECK(_impl_.source_context_ != nullptr); - _impl_.source_context_->Clear(); + ABSL_DCHECK(this_._impl_.source_context_ != nullptr); + this_._impl_.source_context_->Clear(); } - _impl_.syntax_ = 0; - _impl_._has_bits_.Clear(); - _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + this_._impl_.syntax_ = 0; + this_._impl_._has_bits_.Clear(); + this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -1919,7 +1939,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl(), #if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), - ::google::protobuf::Message::GetClearImpl(), &EnumValue::ByteSizeLong, + &EnumValue::Clear, &EnumValue::ByteSizeLong, &EnumValue::_InternalSerialize, #endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(EnumValue, _impl_._cached_size_), @@ -1984,17 +2004,23 @@ const ::_pbi::TcParseTable<2, 3, 1, 38, 2> EnumValue::_table_ = { }}, }; -PROTOBUF_NOINLINE void EnumValue::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumValue) - ::google::protobuf::internal::TSanWrite(&_impl_); +#if defined(PROTOBUF_CUSTOM_VTABLE) + void EnumValue::Clear(MessageLite& base) { + EnumValue& this_ = static_cast(base); +#else // PROTOBUF_CUSTOM_VTABLE + void EnumValue::Clear() { + EnumValue& this_ = *this; +#endif // PROTOBUF_CUSTOM_VTABLE + // @@protoc_insertion_point(message_clear_start:google.protobuf.EnumValue) + ::google::protobuf::internal::TSanWrite(&this_._impl_); ::uint32_t cached_has_bits = 0; // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - _impl_.options_.Clear(); - _impl_.name_.ClearToEmpty(); - _impl_.number_ = 0; - _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); + this_._impl_.options_.Clear(); + this_._impl_.name_.ClearToEmpty(); + this_._impl_.number_ = 0; + this_._internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>(); } #if defined(PROTOBUF_CUSTOM_VTABLE) @@ -2138,6 +2164,7 @@ class Option::_Internal { }; void Option::clear_value() { + Option& this_ PROTOBUF_UNUSED = *this; ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.value_ != nullptr) _impl_.value_->Clear(); _impl_._has_bits_[0] &= ~0x00000001u; @@ -2220,7 +2247,7 @@ const ::google::protobuf::MessageLite::ClassDataFull ::google::protobuf::Message::GetNewImpl