From 160697003a10db5e3b56e0fec5846d274e82e317 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Mon, 6 Nov 2023 17:01:54 +0000 Subject: [PATCH] Auto-generate files after cl/579856691 --- src/google/protobuf/any.pb.cc | 8 +-- src/google/protobuf/any.pb.h | 1 - src/google/protobuf/api.pb.cc | 24 +++----- src/google/protobuf/api.pb.h | 3 - src/google/protobuf/duration.pb.cc | 8 +-- src/google/protobuf/duration.pb.h | 1 - src/google/protobuf/field_mask.pb.cc | 8 +-- src/google/protobuf/field_mask.pb.h | 1 - src/google/protobuf/source_context.pb.cc | 8 +-- src/google/protobuf/source_context.pb.h | 1 - src/google/protobuf/struct.pb.cc | 24 +++----- src/google/protobuf/struct.pb.h | 3 - src/google/protobuf/timestamp.pb.cc | 8 +-- src/google/protobuf/timestamp.pb.h | 1 - src/google/protobuf/type.pb.cc | 40 +++++-------- src/google/protobuf/type.pb.h | 5 -- src/google/protobuf/wrappers.pb.cc | 72 +++++++++--------------- src/google/protobuf/wrappers.pb.h | 9 --- 18 files changed, 75 insertions(+), 150 deletions(-) diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc index 429b41c6f8..889e5d2ed9 100644 --- a/src/google/protobuf/any.pb.cc +++ b/src/google/protobuf/any.pb.cc @@ -198,12 +198,13 @@ inline void Any::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* Any::GetClassData() const { PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - data = { + _data_ = { Any::MergeImpl, nullptr, // OnDemandRegisterArenaDtor &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_FIELD_OFFSET(Any, _impl_._cached_size_), }; - return &data; + return &_data_; } PROTOBUF_NOINLINE void Any::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.Any) @@ -345,9 +346,6 @@ PROTOBUF_NOINLINE bool Any::IsInitialized() const { return true; } -::_pbi::CachedSize* Any::AccessCachedSize() const { - return &_impl_._cached_size_; -} void Any::InternalSwap(Any* PROTOBUF_RESTRICT other) { using std::swap; auto* arena = GetArena(); diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index 10a84ba8af..9ce9e6f2a9 100644 --- a/src/google/protobuf/any.pb.h +++ b/src/google/protobuf/any.pb.h @@ -213,7 +213,6 @@ class PROTOBUF_EXPORT Any final : int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: - ::google::protobuf::internal::CachedSize* AccessCachedSize() const final; void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(Any* other); diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc index 773786a15b..afcad3de14 100644 --- a/src/google/protobuf/api.pb.cc +++ b/src/google/protobuf/api.pb.cc @@ -335,12 +335,13 @@ inline void Api::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* Api::GetClassData() const { PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - data = { + _data_ = { Api::MergeImpl, nullptr, // OnDemandRegisterArenaDtor &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_FIELD_OFFSET(Api, _impl_._cached_size_), }; - return &data; + return &_data_; } PROTOBUF_NOINLINE void Api::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.Api) @@ -612,9 +613,6 @@ PROTOBUF_NOINLINE bool Api::IsInitialized() const { return true; } -::_pbi::CachedSize* Api::AccessCachedSize() const { - return &_impl_._cached_size_; -} void Api::InternalSwap(Api* PROTOBUF_RESTRICT other) { using std::swap; auto* arena = GetArena(); @@ -716,12 +714,13 @@ inline void Method::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* Method::GetClassData() const { PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - data = { + _data_ = { Method::MergeImpl, nullptr, // OnDemandRegisterArenaDtor &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_FIELD_OFFSET(Method, _impl_._cached_size_), }; - return &data; + return &_data_; } PROTOBUF_NOINLINE void Method::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.Method) @@ -982,9 +981,6 @@ PROTOBUF_NOINLINE bool Method::IsInitialized() const { return true; } -::_pbi::CachedSize* Method::AccessCachedSize() const { - return &_impl_._cached_size_; -} void Method::InternalSwap(Method* PROTOBUF_RESTRICT other) { using std::swap; auto* arena = GetArena(); @@ -1062,12 +1058,13 @@ inline void Mixin::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* Mixin::GetClassData() const { PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - data = { + _data_ = { Mixin::MergeImpl, nullptr, // OnDemandRegisterArenaDtor &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_FIELD_OFFSET(Mixin, _impl_._cached_size_), }; - return &data; + return &_data_; } PROTOBUF_NOINLINE void Mixin::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.Mixin) @@ -1212,9 +1209,6 @@ PROTOBUF_NOINLINE bool Mixin::IsInitialized() const { return true; } -::_pbi::CachedSize* Mixin::AccessCachedSize() const { - return &_impl_._cached_size_; -} void Mixin::InternalSwap(Mixin* PROTOBUF_RESTRICT other) { using std::swap; auto* arena = GetArena(); diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index 88d9ccc34f..2252373551 100644 --- a/src/google/protobuf/api.pb.h +++ b/src/google/protobuf/api.pb.h @@ -186,7 +186,6 @@ class PROTOBUF_EXPORT Mixin final : int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: - ::google::protobuf::internal::CachedSize* AccessCachedSize() const final; void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(Mixin* other); @@ -383,7 +382,6 @@ class PROTOBUF_EXPORT Method final : int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: - ::google::protobuf::internal::CachedSize* AccessCachedSize() const final; void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(Method* other); @@ -654,7 +652,6 @@ class PROTOBUF_EXPORT Api final : int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: - ::google::protobuf::internal::CachedSize* AccessCachedSize() const final; void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(Api* other); diff --git a/src/google/protobuf/duration.pb.cc b/src/google/protobuf/duration.pb.cc index a3838bdfa3..4024586011 100644 --- a/src/google/protobuf/duration.pb.cc +++ b/src/google/protobuf/duration.pb.cc @@ -162,12 +162,13 @@ inline void Duration::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* Duration::GetClassData() const { PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - data = { + _data_ = { Duration::MergeImpl, nullptr, // OnDemandRegisterArenaDtor &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_FIELD_OFFSET(Duration, _impl_._cached_size_), }; - return &data; + return &_data_; } PROTOBUF_NOINLINE void Duration::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.Duration) @@ -307,9 +308,6 @@ PROTOBUF_NOINLINE bool Duration::IsInitialized() const { return true; } -::_pbi::CachedSize* Duration::AccessCachedSize() const { - return &_impl_._cached_size_; -} void Duration::InternalSwap(Duration* PROTOBUF_RESTRICT other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h index 346b58d9f1..c165b574b7 100644 --- a/src/google/protobuf/duration.pb.h +++ b/src/google/protobuf/duration.pb.h @@ -178,7 +178,6 @@ class PROTOBUF_EXPORT Duration final : int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: - ::google::protobuf::internal::CachedSize* AccessCachedSize() const final; void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(Duration* other); diff --git a/src/google/protobuf/field_mask.pb.cc b/src/google/protobuf/field_mask.pb.cc index 2c6c5badc2..6c6ddd0a6c 100644 --- a/src/google/protobuf/field_mask.pb.cc +++ b/src/google/protobuf/field_mask.pb.cc @@ -168,12 +168,13 @@ inline void FieldMask::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* FieldMask::GetClassData() const { PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - data = { + _data_ = { FieldMask::MergeImpl, nullptr, // OnDemandRegisterArenaDtor &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_FIELD_OFFSET(FieldMask, _impl_._cached_size_), }; - return &data; + return &_data_; } PROTOBUF_NOINLINE void FieldMask::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.FieldMask) @@ -291,9 +292,6 @@ PROTOBUF_NOINLINE bool FieldMask::IsInitialized() const { return true; } -::_pbi::CachedSize* FieldMask::AccessCachedSize() const { - return &_impl_._cached_size_; -} void FieldMask::InternalSwap(FieldMask* PROTOBUF_RESTRICT other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h index 4e8f3946ca..123d28d102 100644 --- a/src/google/protobuf/field_mask.pb.h +++ b/src/google/protobuf/field_mask.pb.h @@ -178,7 +178,6 @@ class PROTOBUF_EXPORT FieldMask final : int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: - ::google::protobuf::internal::CachedSize* AccessCachedSize() const final; void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(FieldMask* other); diff --git a/src/google/protobuf/source_context.pb.cc b/src/google/protobuf/source_context.pb.cc index b93bf206fa..f1b6d8ad1c 100644 --- a/src/google/protobuf/source_context.pb.cc +++ b/src/google/protobuf/source_context.pb.cc @@ -171,12 +171,13 @@ inline void SourceContext::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* SourceContext::GetClassData() const { PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - data = { + _data_ = { SourceContext::MergeImpl, nullptr, // OnDemandRegisterArenaDtor &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_FIELD_OFFSET(SourceContext, _impl_._cached_size_), }; - return &data; + return &_data_; } PROTOBUF_NOINLINE void SourceContext::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.SourceContext) @@ -296,9 +297,6 @@ PROTOBUF_NOINLINE bool SourceContext::IsInitialized() const { return true; } -::_pbi::CachedSize* SourceContext::AccessCachedSize() const { - return &_impl_._cached_size_; -} void SourceContext::InternalSwap(SourceContext* PROTOBUF_RESTRICT other) { using std::swap; auto* arena = GetArena(); diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h index 0e3e2c96fd..1504fe9015 100644 --- a/src/google/protobuf/source_context.pb.h +++ b/src/google/protobuf/source_context.pb.h @@ -178,7 +178,6 @@ class PROTOBUF_EXPORT SourceContext final : int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: - ::google::protobuf::internal::CachedSize* AccessCachedSize() const final; void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(SourceContext* other); diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc index cb8e5c9736..4d1b6255ae 100644 --- a/src/google/protobuf/struct.pb.cc +++ b/src/google/protobuf/struct.pb.cc @@ -289,12 +289,13 @@ inline void Struct::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* Struct::GetClassData() const { PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - data = { + _data_ = { Struct::MergeImpl, nullptr, // OnDemandRegisterArenaDtor &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_FIELD_OFFSET(Struct, _impl_._cached_size_), }; - return &data; + return &_data_; } PROTOBUF_NOINLINE void Struct::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.Struct) @@ -434,9 +435,6 @@ PROTOBUF_NOINLINE bool Struct::IsInitialized() const { return true; } -::_pbi::CachedSize* Struct::AccessCachedSize() const { - return &_impl_._cached_size_; -} void Struct::InternalSwap(Struct* PROTOBUF_RESTRICT other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); @@ -602,12 +600,13 @@ void Value::clear_kind() { const ::google::protobuf::MessageLite::ClassData* Value::GetClassData() const { PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - data = { + _data_ = { Value::MergeImpl, nullptr, // OnDemandRegisterArenaDtor &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_FIELD_OFFSET(Value, _impl_._cached_size_), }; - return &data; + return &_data_; } PROTOBUF_NOINLINE void Value::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.Value) @@ -835,9 +834,6 @@ PROTOBUF_NOINLINE bool Value::IsInitialized() const { return true; } -::_pbi::CachedSize* Value::AccessCachedSize() const { - return &_impl_._cached_size_; -} void Value::InternalSwap(Value* PROTOBUF_RESTRICT other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); @@ -901,12 +897,13 @@ inline void ListValue::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* ListValue::GetClassData() const { PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - data = { + _data_ = { ListValue::MergeImpl, nullptr, // OnDemandRegisterArenaDtor &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_FIELD_OFFSET(ListValue, _impl_._cached_size_), }; - return &data; + return &_data_; } PROTOBUF_NOINLINE void ListValue::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.ListValue) @@ -1022,9 +1019,6 @@ PROTOBUF_NOINLINE bool ListValue::IsInitialized() const { return true; } -::_pbi::CachedSize* ListValue::AccessCachedSize() const { - return &_impl_._cached_size_; -} void ListValue::InternalSwap(ListValue* PROTOBUF_RESTRICT other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index 61a923efc0..6f5d3e968b 100644 --- a/src/google/protobuf/struct.pb.h +++ b/src/google/protobuf/struct.pb.h @@ -223,7 +223,6 @@ class PROTOBUF_EXPORT ListValue final : int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: - ::google::protobuf::internal::CachedSize* AccessCachedSize() const final; void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(ListValue* other); @@ -404,7 +403,6 @@ class PROTOBUF_EXPORT Struct final : int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: - ::google::protobuf::internal::CachedSize* AccessCachedSize() const final; void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(Struct* other); @@ -624,7 +622,6 @@ class PROTOBUF_EXPORT Value final : int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: - ::google::protobuf::internal::CachedSize* AccessCachedSize() const final; void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(Value* other); diff --git a/src/google/protobuf/timestamp.pb.cc b/src/google/protobuf/timestamp.pb.cc index e048cb8c30..42a487730a 100644 --- a/src/google/protobuf/timestamp.pb.cc +++ b/src/google/protobuf/timestamp.pb.cc @@ -162,12 +162,13 @@ inline void Timestamp::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* Timestamp::GetClassData() const { PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - data = { + _data_ = { Timestamp::MergeImpl, nullptr, // OnDemandRegisterArenaDtor &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_FIELD_OFFSET(Timestamp, _impl_._cached_size_), }; - return &data; + return &_data_; } PROTOBUF_NOINLINE void Timestamp::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.Timestamp) @@ -307,9 +308,6 @@ PROTOBUF_NOINLINE bool Timestamp::IsInitialized() const { return true; } -::_pbi::CachedSize* Timestamp::AccessCachedSize() const { - return &_impl_._cached_size_; -} void Timestamp::InternalSwap(Timestamp* PROTOBUF_RESTRICT other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h index 0d58d1e036..6a6b310aac 100644 --- a/src/google/protobuf/timestamp.pb.h +++ b/src/google/protobuf/timestamp.pb.h @@ -178,7 +178,6 @@ class PROTOBUF_EXPORT Timestamp final : int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: - ::google::protobuf::internal::CachedSize* AccessCachedSize() const final; void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(Timestamp* other); diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc index 29884227e7..18a1f3946e 100644 --- a/src/google/protobuf/type.pb.cc +++ b/src/google/protobuf/type.pb.cc @@ -515,12 +515,13 @@ inline void Type::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* Type::GetClassData() const { PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - data = { + _data_ = { Type::MergeImpl, nullptr, // OnDemandRegisterArenaDtor &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_FIELD_OFFSET(Type, _impl_._cached_size_), }; - return &data; + return &_data_; } PROTOBUF_NOINLINE void Type::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.Type) @@ -791,9 +792,6 @@ PROTOBUF_NOINLINE bool Type::IsInitialized() const { return true; } -::_pbi::CachedSize* Type::AccessCachedSize() const { - return &_impl_._cached_size_; -} void Type::InternalSwap(Type* PROTOBUF_RESTRICT other) { using std::swap; auto* arena = GetArena(); @@ -894,12 +892,13 @@ inline void Field::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* Field::GetClassData() const { PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - data = { + _data_ = { Field::MergeImpl, nullptr, // OnDemandRegisterArenaDtor &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_FIELD_OFFSET(Field, _impl_._cached_size_), }; - return &data; + return &_data_; } PROTOBUF_NOINLINE void Field::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.Field) @@ -1235,9 +1234,6 @@ PROTOBUF_NOINLINE bool Field::IsInitialized() const { return true; } -::_pbi::CachedSize* Field::AccessCachedSize() const { - return &_impl_._cached_size_; -} void Field::InternalSwap(Field* PROTOBUF_RESTRICT other) { using std::swap; auto* arena = GetArena(); @@ -1348,12 +1344,13 @@ inline void Enum::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* Enum::GetClassData() const { PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - data = { + _data_ = { Enum::MergeImpl, nullptr, // OnDemandRegisterArenaDtor &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_FIELD_OFFSET(Enum, _impl_._cached_size_), }; - return &data; + return &_data_; } PROTOBUF_NOINLINE void Enum::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.Enum) @@ -1602,9 +1599,6 @@ PROTOBUF_NOINLINE bool Enum::IsInitialized() const { return true; } -::_pbi::CachedSize* Enum::AccessCachedSize() const { - return &_impl_._cached_size_; -} void Enum::InternalSwap(Enum* PROTOBUF_RESTRICT other) { using std::swap; auto* arena = GetArena(); @@ -1684,12 +1678,13 @@ inline void EnumValue::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* EnumValue::GetClassData() const { PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - data = { + _data_ = { EnumValue::MergeImpl, nullptr, // OnDemandRegisterArenaDtor &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_FIELD_OFFSET(EnumValue, _impl_._cached_size_), }; - return &data; + return &_data_; } PROTOBUF_NOINLINE void EnumValue::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.EnumValue) @@ -1856,9 +1851,6 @@ PROTOBUF_NOINLINE bool EnumValue::IsInitialized() const { return true; } -::_pbi::CachedSize* EnumValue::AccessCachedSize() const { - return &_impl_._cached_size_; -} void EnumValue::InternalSwap(EnumValue* PROTOBUF_RESTRICT other) { using std::swap; auto* arena = GetArena(); @@ -1948,12 +1940,13 @@ inline void Option::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* Option::GetClassData() const { PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - data = { + _data_ = { Option::MergeImpl, nullptr, // OnDemandRegisterArenaDtor &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_FIELD_OFFSET(Option, _impl_._cached_size_), }; - return &data; + return &_data_; } PROTOBUF_NOINLINE void Option::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.Option) @@ -2104,9 +2097,6 @@ PROTOBUF_NOINLINE bool Option::IsInitialized() const { return true; } -::_pbi::CachedSize* Option::AccessCachedSize() const { - return &_impl_._cached_size_; -} void Option::InternalSwap(Option* PROTOBUF_RESTRICT other) { using std::swap; auto* arena = GetArena(); diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h index b9bb7f6336..f15c09249d 100644 --- a/src/google/protobuf/type.pb.h +++ b/src/google/protobuf/type.pb.h @@ -312,7 +312,6 @@ class PROTOBUF_EXPORT Option final : int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: - ::google::protobuf::internal::CachedSize* AccessCachedSize() const final; void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(Option* other); @@ -509,7 +508,6 @@ class PROTOBUF_EXPORT Field final : int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: - ::google::protobuf::internal::CachedSize* AccessCachedSize() const final; void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(Field* other); @@ -881,7 +879,6 @@ class PROTOBUF_EXPORT EnumValue final : int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: - ::google::protobuf::internal::CachedSize* AccessCachedSize() const final; void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(EnumValue* other); @@ -1092,7 +1089,6 @@ class PROTOBUF_EXPORT Type final : int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: - ::google::protobuf::internal::CachedSize* AccessCachedSize() const final; void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(Type* other); @@ -1389,7 +1385,6 @@ class PROTOBUF_EXPORT Enum final : int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: - ::google::protobuf::internal::CachedSize* AccessCachedSize() const final; void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(Enum* other); diff --git a/src/google/protobuf/wrappers.pb.cc b/src/google/protobuf/wrappers.pb.cc index cf7efbb562..895975fdd6 100644 --- a/src/google/protobuf/wrappers.pb.cc +++ b/src/google/protobuf/wrappers.pb.cc @@ -405,12 +405,13 @@ inline void DoubleValue::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* DoubleValue::GetClassData() const { PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - data = { + _data_ = { DoubleValue::MergeImpl, nullptr, // OnDemandRegisterArenaDtor &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_FIELD_OFFSET(DoubleValue, _impl_._cached_size_), }; - return &data; + return &_data_; } PROTOBUF_NOINLINE void DoubleValue::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.DoubleValue) @@ -540,9 +541,6 @@ PROTOBUF_NOINLINE bool DoubleValue::IsInitialized() const { return true; } -::_pbi::CachedSize* DoubleValue::AccessCachedSize() const { - return &_impl_._cached_size_; -} void DoubleValue::InternalSwap(DoubleValue* PROTOBUF_RESTRICT other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); @@ -592,12 +590,13 @@ inline void FloatValue::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* FloatValue::GetClassData() const { PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - data = { + _data_ = { FloatValue::MergeImpl, nullptr, // OnDemandRegisterArenaDtor &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_FIELD_OFFSET(FloatValue, _impl_._cached_size_), }; - return &data; + return &_data_; } PROTOBUF_NOINLINE void FloatValue::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.FloatValue) @@ -727,9 +726,6 @@ PROTOBUF_NOINLINE bool FloatValue::IsInitialized() const { return true; } -::_pbi::CachedSize* FloatValue::AccessCachedSize() const { - return &_impl_._cached_size_; -} void FloatValue::InternalSwap(FloatValue* PROTOBUF_RESTRICT other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); @@ -779,12 +775,13 @@ inline void Int64Value::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* Int64Value::GetClassData() const { PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - data = { + _data_ = { Int64Value::MergeImpl, nullptr, // OnDemandRegisterArenaDtor &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_FIELD_OFFSET(Int64Value, _impl_._cached_size_), }; - return &data; + return &_data_; } PROTOBUF_NOINLINE void Int64Value::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.Int64Value) @@ -900,9 +897,6 @@ PROTOBUF_NOINLINE bool Int64Value::IsInitialized() const { return true; } -::_pbi::CachedSize* Int64Value::AccessCachedSize() const { - return &_impl_._cached_size_; -} void Int64Value::InternalSwap(Int64Value* PROTOBUF_RESTRICT other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); @@ -952,12 +946,13 @@ inline void UInt64Value::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* UInt64Value::GetClassData() const { PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - data = { + _data_ = { UInt64Value::MergeImpl, nullptr, // OnDemandRegisterArenaDtor &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_FIELD_OFFSET(UInt64Value, _impl_._cached_size_), }; - return &data; + return &_data_; } PROTOBUF_NOINLINE void UInt64Value::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.UInt64Value) @@ -1073,9 +1068,6 @@ PROTOBUF_NOINLINE bool UInt64Value::IsInitialized() const { return true; } -::_pbi::CachedSize* UInt64Value::AccessCachedSize() const { - return &_impl_._cached_size_; -} void UInt64Value::InternalSwap(UInt64Value* PROTOBUF_RESTRICT other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); @@ -1125,12 +1117,13 @@ inline void Int32Value::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* Int32Value::GetClassData() const { PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - data = { + _data_ = { Int32Value::MergeImpl, nullptr, // OnDemandRegisterArenaDtor &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_FIELD_OFFSET(Int32Value, _impl_._cached_size_), }; - return &data; + return &_data_; } PROTOBUF_NOINLINE void Int32Value::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.Int32Value) @@ -1246,9 +1239,6 @@ PROTOBUF_NOINLINE bool Int32Value::IsInitialized() const { return true; } -::_pbi::CachedSize* Int32Value::AccessCachedSize() const { - return &_impl_._cached_size_; -} void Int32Value::InternalSwap(Int32Value* PROTOBUF_RESTRICT other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); @@ -1298,12 +1288,13 @@ inline void UInt32Value::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* UInt32Value::GetClassData() const { PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - data = { + _data_ = { UInt32Value::MergeImpl, nullptr, // OnDemandRegisterArenaDtor &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_FIELD_OFFSET(UInt32Value, _impl_._cached_size_), }; - return &data; + return &_data_; } PROTOBUF_NOINLINE void UInt32Value::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.UInt32Value) @@ -1419,9 +1410,6 @@ PROTOBUF_NOINLINE bool UInt32Value::IsInitialized() const { return true; } -::_pbi::CachedSize* UInt32Value::AccessCachedSize() const { - return &_impl_._cached_size_; -} void UInt32Value::InternalSwap(UInt32Value* PROTOBUF_RESTRICT other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); @@ -1471,12 +1459,13 @@ inline void BoolValue::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* BoolValue::GetClassData() const { PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - data = { + _data_ = { BoolValue::MergeImpl, nullptr, // OnDemandRegisterArenaDtor &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_FIELD_OFFSET(BoolValue, _impl_._cached_size_), }; - return &data; + return &_data_; } PROTOBUF_NOINLINE void BoolValue::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.BoolValue) @@ -1591,9 +1580,6 @@ PROTOBUF_NOINLINE bool BoolValue::IsInitialized() const { return true; } -::_pbi::CachedSize* BoolValue::AccessCachedSize() const { - return &_impl_._cached_size_; -} void BoolValue::InternalSwap(BoolValue* PROTOBUF_RESTRICT other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); @@ -1657,12 +1643,13 @@ inline void StringValue::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* StringValue::GetClassData() const { PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - data = { + _data_ = { StringValue::MergeImpl, nullptr, // OnDemandRegisterArenaDtor &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_FIELD_OFFSET(StringValue, _impl_._cached_size_), }; - return &data; + return &_data_; } PROTOBUF_NOINLINE void StringValue::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.StringValue) @@ -1782,9 +1769,6 @@ PROTOBUF_NOINLINE bool StringValue::IsInitialized() const { return true; } -::_pbi::CachedSize* StringValue::AccessCachedSize() const { - return &_impl_._cached_size_; -} void StringValue::InternalSwap(StringValue* PROTOBUF_RESTRICT other) { using std::swap; auto* arena = GetArena(); @@ -1850,12 +1834,13 @@ inline void BytesValue::SharedDtor() { const ::google::protobuf::MessageLite::ClassData* BytesValue::GetClassData() const { PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData - data = { + _data_ = { BytesValue::MergeImpl, nullptr, // OnDemandRegisterArenaDtor &::google::protobuf::Message::kDescriptorMethods, + PROTOBUF_FIELD_OFFSET(BytesValue, _impl_._cached_size_), }; - return &data; + return &_data_; } PROTOBUF_NOINLINE void BytesValue::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.BytesValue) @@ -1970,9 +1955,6 @@ PROTOBUF_NOINLINE bool BytesValue::IsInitialized() const { return true; } -::_pbi::CachedSize* BytesValue::AccessCachedSize() const { - return &_impl_._cached_size_; -} void BytesValue::InternalSwap(BytesValue* PROTOBUF_RESTRICT other) { using std::swap; auto* arena = GetArena(); diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h index 564ba0c2c2..3aeffa20c9 100644 --- a/src/google/protobuf/wrappers.pb.h +++ b/src/google/protobuf/wrappers.pb.h @@ -202,7 +202,6 @@ class PROTOBUF_EXPORT UInt64Value final : int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: - ::google::protobuf::internal::CachedSize* AccessCachedSize() const final; void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(UInt64Value* other); @@ -375,7 +374,6 @@ class PROTOBUF_EXPORT UInt32Value final : int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: - ::google::protobuf::internal::CachedSize* AccessCachedSize() const final; void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(UInt32Value* other); @@ -548,7 +546,6 @@ class PROTOBUF_EXPORT StringValue final : int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: - ::google::protobuf::internal::CachedSize* AccessCachedSize() const final; void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(StringValue* other); @@ -727,7 +724,6 @@ class PROTOBUF_EXPORT Int64Value final : int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: - ::google::protobuf::internal::CachedSize* AccessCachedSize() const final; void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(Int64Value* other); @@ -900,7 +896,6 @@ class PROTOBUF_EXPORT Int32Value final : int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: - ::google::protobuf::internal::CachedSize* AccessCachedSize() const final; void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(Int32Value* other); @@ -1073,7 +1068,6 @@ class PROTOBUF_EXPORT FloatValue final : int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: - ::google::protobuf::internal::CachedSize* AccessCachedSize() const final; void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(FloatValue* other); @@ -1246,7 +1240,6 @@ class PROTOBUF_EXPORT DoubleValue final : int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: - ::google::protobuf::internal::CachedSize* AccessCachedSize() const final; void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(DoubleValue* other); @@ -1419,7 +1412,6 @@ class PROTOBUF_EXPORT BytesValue final : int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: - ::google::protobuf::internal::CachedSize* AccessCachedSize() const final; void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(BytesValue* other); @@ -1598,7 +1590,6 @@ class PROTOBUF_EXPORT BoolValue final : int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: - ::google::protobuf::internal::CachedSize* AccessCachedSize() const final; void SharedCtor(::google::protobuf::Arena* arena); void SharedDtor(); void InternalSwap(BoolValue* other);