From fd2ce71c233a48e4c98badec9bc2154fd6b9f94a Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Thu, 9 Jan 2025 16:33:34 +0000 Subject: [PATCH] Auto-generate files after cl/713678926 --- src/google/protobuf/any.pb.cc | 32 +- src/google/protobuf/any.pb.h | 73 ++-- src/google/protobuf/api.pb.cc | 73 ++-- src/google/protobuf/api.pb.h | 278 +++++++------ src/google/protobuf/duration.pb.cc | 27 +- src/google/protobuf/duration.pb.h | 46 ++- src/google/protobuf/empty.pb.cc | 13 +- src/google/protobuf/empty.pb.h | 24 +- src/google/protobuf/field_mask.pb.cc | 27 +- src/google/protobuf/field_mask.pb.h | 63 +-- src/google/protobuf/source_context.pb.cc | 27 +- src/google/protobuf/source_context.pb.h | 55 +-- src/google/protobuf/struct.pb.cc | 79 ++-- src/google/protobuf/struct.pb.h | 208 +++++----- src/google/protobuf/timestamp.pb.cc | 27 +- src/google/protobuf/timestamp.pb.h | 46 ++- src/google/protobuf/type.pb.cc | 122 +++--- src/google/protobuf/type.pb.h | 500 ++++++++++++----------- src/google/protobuf/wrappers.pb.cc | 195 ++++----- src/google/protobuf/wrappers.pb.h | 432 +++++++++++--------- 20 files changed, 1263 insertions(+), 1084 deletions(-) diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc index 7a4bbcfe5d..9caffdc082 100644 --- a/src/google/protobuf/any.pb.cc +++ b/src/google/protobuf/any.pb.cc @@ -62,9 +62,9 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AnyDefaultTypeInternal _Any_default_instance_; } // namespace protobuf } // namespace google -static constexpr const ::_pb::EnumDescriptor** PROTOBUF_NULLABLE +static constexpr const ::_pb::EnumDescriptor *PROTOBUF_NONNULL *PROTOBUF_NULLABLE file_level_enum_descriptors_google_2fprotobuf_2fany_2eproto = nullptr; -static constexpr const ::_pb::ServiceDescriptor** PROTOBUF_NULLABLE +static constexpr const ::_pb::ServiceDescriptor *PROTOBUF_NONNULL *PROTOBUF_NULLABLE file_level_service_descriptors_google_2fprotobuf_2fany_2eproto = nullptr; const ::uint32_t TableStruct_google_2fprotobuf_2fany_2eproto::offsets[] ABSL_ATTRIBUTE_SECTION_VARIABLE( @@ -87,7 +87,7 @@ static const ::_pbi::MigrationSchema schemas[] ABSL_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = { {0, 10, -1, sizeof(::google::protobuf::Any)}, }; -static const ::_pb::Message* const file_default_instances[] = { +static const ::_pb::Message* PROTOBUF_NONNULL const file_default_instances[] = { &::google::protobuf::_Any_default_instance_._instance, }; const char descriptor_table_protodef_google_2fprotobuf_2fany_2eproto[] ABSL_ATTRIBUTE_SECTION_VARIABLE( @@ -126,8 +126,9 @@ bool Any::GetAnyFieldDescriptors( const ::google::protobuf::FieldDescriptor** value_field) { return ::_pbi::GetAnyFieldDescriptors(message, type_url_field, value_field); } -bool Any::ParseAnyTypeUrl(::absl::string_view type_url, - std::string* full_type_name) { +bool Any::ParseAnyTypeUrl( + ::absl::string_view type_url, + std::string* PROTOBUF_NONNULL full_type_name) { return ::_pbi::ParseAnyTypeUrl(type_url, full_type_name); } class Any::_Internal { @@ -195,8 +196,9 @@ inline void Any::SharedDtor(MessageLite& self) { this_._impl_.~Impl_(); } -inline void* Any::PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { +inline void* PROTOBUF_NONNULL Any::PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { return ::new (mem) Any(arena); } constexpr auto Any::InternalNewImpl_() { @@ -231,7 +233,7 @@ PROTOBUF_CONSTINIT PROTOBUF_EXPORT Any_class_data_ = Any::InternalGenerateClassData_(); -const ::google::protobuf::internal::ClassData* Any::GetClassData() const { +const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL Any::GetClassData() const { ::google::protobuf::internal::PrefetchToLocalCache(&Any_class_data_); ::google::protobuf::internal::PrefetchToLocalCache(Any_class_data_.tc_table); return Any_class_data_.base(); @@ -300,14 +302,14 @@ PROTOBUF_NOINLINE void Any::Clear() { } #if defined(PROTOBUF_CUSTOM_VTABLE) -::uint8_t* Any::_InternalSerialize( - const MessageLite& base, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) { +::uint8_t* PROTOBUF_NONNULL Any::_InternalSerialize( + const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const Any& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE -::uint8_t* Any::_InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { +::uint8_t* PROTOBUF_NONNULL Any::_InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { const Any& this_ = *this; #endif // PROTOBUF_CUSTOM_VTABLE // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Any) @@ -418,7 +420,7 @@ void Any::CopyFrom(const Any& from) { } -void Any::InternalSwap(Any* PROTOBUF_RESTRICT other) { +void Any::InternalSwap(Any* PROTOBUF_RESTRICT PROTOBUF_NONNULL other) { using std::swap; auto* arena = GetArena(); ABSL_DCHECK_EQ(arena, other->GetArena()); diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index 74c9adb2ea..b05af5672d 100644 --- a/src/google/protobuf/any.pb.h +++ b/src/google/protobuf/any.pb.h @@ -77,7 +77,7 @@ class PROTOBUF_EXPORT Any final : public ::google::protobuf::Message ~Any() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - void operator delete(Any* msg, std::destroying_delete_t) { + void operator delete(Any* PROTOBUF_NONNULL msg, std::destroying_delete_t) { SharedDtor(*msg); ::google::protobuf::internal::SizedDelete(msg, sizeof(Any)); } @@ -108,18 +108,18 @@ class PROTOBUF_EXPORT Any final : public ::google::protobuf::Message ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); } - inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() + inline ::google::protobuf::UnknownFieldSet* PROTOBUF_NONNULL mutable_unknown_fields() ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); } - static const ::google::protobuf::Descriptor* descriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL descriptor() { return GetDescriptor(); } - static const ::google::protobuf::Descriptor* GetDescriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::google::protobuf::Reflection* GetReflection() { + static const ::google::protobuf::Reflection* PROTOBUF_NONNULL GetReflection() { return default_instance().GetMetadata().reflection; } static const Any& default_instance() { @@ -142,7 +142,7 @@ class PROTOBUF_EXPORT Any final : public ::google::protobuf::Message message, type_url_prefix, mutable_type_url(), _internal_mutable_value()); } - bool UnpackTo(::google::protobuf::Message* message) const { + bool UnpackTo(::google::protobuf::Message* PROTOBUF_NONNULL message) const { return ::google::protobuf::internal::InternalUnpackTo( _internal_type_url(), _internal_value(), message); } @@ -174,7 +174,7 @@ class PROTOBUF_EXPORT Any final : public ::google::protobuf::Message typename T, class = typename std::enable_if::value>::type> - bool UnpackTo(T* message) const { + bool UnpackTo(T* PROTOBUF_NONNULL message) const { return ::google::protobuf::internal::InternalUnpackTo( _internal_type_url(), _internal_value(), message); } @@ -183,10 +183,11 @@ class PROTOBUF_EXPORT Any final : public ::google::protobuf::Message bool Is() const { return ::google::protobuf::internal::InternalIs(_internal_type_url()); } - static bool ParseAnyTypeUrl(::absl::string_view type_url, - std::string* full_type_name); + static bool ParseAnyTypeUrl( + ::absl::string_view type_url, + std::string* PROTOBUF_NONNULL full_type_name); friend void swap(Any& a, Any& b) { a.Swap(&b); } - inline void Swap(Any* other) { + inline void Swap(Any* PROTOBUF_NONNULL other) { if (other == this) return; if (::google::protobuf::internal::CanUseInternalSwap(GetArena(), other->GetArena())) { InternalSwap(other); @@ -194,7 +195,7 @@ class PROTOBUF_EXPORT Any final : public ::google::protobuf::Message ::google::protobuf::internal::GenericSwap(this, other); } } - void UnsafeArenaSwap(Any* other) { + void UnsafeArenaSwap(Any* PROTOBUF_NONNULL other) { if (other == this) return; ABSL_DCHECK(GetArena() == other->GetArena()); InternalSwap(other); @@ -202,7 +203,8 @@ class PROTOBUF_EXPORT Any final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - Any* New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + Any* PROTOBUF_NONNULL + New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -223,29 +225,31 @@ class PROTOBUF_EXPORT Any final : public ::google::protobuf::Message #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); + static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { + ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL + 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; + ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL + stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: void SharedCtor(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); static void SharedDtor(MessageLite& self); - void InternalSwap(Any* other); + void InternalSwap(Any* PROTOBUF_NONNULL other); private: template friend ::absl::string_view( @@ -261,9 +265,10 @@ class PROTOBUF_EXPORT Any final : public ::google::protobuf::Message : Any(arena) { *this = ::std::move(from); } - const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL; - static void* PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); + const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL GetClassData() const PROTOBUF_FINAL; + static void* PROTOBUF_NONNULL PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); static constexpr auto InternalNewImpl_(); public: @@ -282,14 +287,14 @@ class PROTOBUF_EXPORT Any final : public ::google::protobuf::Message const std::string& type_url() const; template void set_type_url(Arg_&& arg, Args_... args); - std::string* mutable_type_url(); + std::string* PROTOBUF_NONNULL mutable_type_url(); [[nodiscard]] std::string* PROTOBUF_NULLABLE release_type_url(); void set_allocated_type_url(std::string* PROTOBUF_NULLABLE value); private: const std::string& _internal_type_url() const; PROTOBUF_ALWAYS_INLINE void _internal_set_type_url(const std::string& value); - std::string* _internal_mutable_type_url(); + std::string* PROTOBUF_NONNULL _internal_mutable_type_url(); public: // bytes value = 2; @@ -297,14 +302,14 @@ class PROTOBUF_EXPORT Any final : public ::google::protobuf::Message const std::string& value() const; template void set_value(Arg_&& arg, Args_... args); - std::string* mutable_value(); + std::string* PROTOBUF_NONNULL mutable_value(); [[nodiscard]] std::string* PROTOBUF_NULLABLE release_value(); void set_allocated_value(std::string* PROTOBUF_NULLABLE value); private: const std::string& _internal_value() const; PROTOBUF_ALWAYS_INLINE void _internal_set_value(const std::string& value); - std::string* _internal_mutable_value(); + std::string* PROTOBUF_NONNULL _internal_mutable_value(); public: // @@protoc_insertion_point(class_scope:google.protobuf.Any) @@ -378,7 +383,8 @@ PROTOBUF_ALWAYS_INLINE void Any::set_type_url(Arg_&& arg, Args_... args) { _impl_.type_url_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.Any.type_url) } -inline std::string* Any::mutable_type_url() ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline std::string* PROTOBUF_NONNULL Any::mutable_type_url() + ABSL_ATTRIBUTE_LIFETIME_BOUND { std::string* _s = _internal_mutable_type_url(); // @@protoc_insertion_point(field_mutable:google.protobuf.Any.type_url) return _s; @@ -392,7 +398,7 @@ inline void Any::_internal_set_type_url(const std::string& value) { _impl_._has_bits_[0] |= 0x00000001u; _impl_.type_url_.Set(value, GetArena()); } -inline std::string* Any::_internal_mutable_type_url() { +inline std::string* PROTOBUF_NONNULL Any::_internal_mutable_type_url() { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_._has_bits_[0] |= 0x00000001u; return _impl_.type_url_.Mutable( GetArena()); @@ -442,7 +448,8 @@ PROTOBUF_ALWAYS_INLINE void Any::set_value(Arg_&& arg, Args_... args) { _impl_.value_.SetBytes(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.Any.value) } -inline std::string* Any::mutable_value() ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline std::string* PROTOBUF_NONNULL Any::mutable_value() + ABSL_ATTRIBUTE_LIFETIME_BOUND { std::string* _s = _internal_mutable_value(); // @@protoc_insertion_point(field_mutable:google.protobuf.Any.value) return _s; @@ -456,7 +463,7 @@ inline void Any::_internal_set_value(const std::string& value) { _impl_._has_bits_[0] |= 0x00000002u; _impl_.value_.Set(value, GetArena()); } -inline std::string* Any::_internal_mutable_value() { +inline std::string* PROTOBUF_NONNULL Any::_internal_mutable_value() { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_._has_bits_[0] |= 0x00000002u; return _impl_.value_.Mutable( GetArena()); diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc index f5e7627180..44d9ae7aed 100644 --- a/src/google/protobuf/api.pb.cc +++ b/src/google/protobuf/api.pb.cc @@ -130,9 +130,9 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ApiDefaultTypeInternal _Api_default_instance_; } // namespace protobuf } // namespace google -static constexpr const ::_pb::EnumDescriptor** PROTOBUF_NULLABLE +static constexpr const ::_pb::EnumDescriptor *PROTOBUF_NONNULL *PROTOBUF_NULLABLE file_level_enum_descriptors_google_2fprotobuf_2fapi_2eproto = nullptr; -static constexpr const ::_pb::ServiceDescriptor** PROTOBUF_NULLABLE +static constexpr const ::_pb::ServiceDescriptor *PROTOBUF_NONNULL *PROTOBUF_NULLABLE file_level_service_descriptors_google_2fprotobuf_2fapi_2eproto = nullptr; const ::uint32_t TableStruct_google_2fprotobuf_2fapi_2eproto::offsets[] ABSL_ATTRIBUTE_SECTION_VARIABLE( @@ -201,7 +201,7 @@ static const ::_pbi::MigrationSchema {22, 37, -1, sizeof(::google::protobuf::Method)}, {44, 54, -1, sizeof(::google::protobuf::Mixin)}, }; -static const ::_pb::Message* const file_default_instances[] = { +static const ::_pb::Message* PROTOBUF_NONNULL const file_default_instances[] = { &::google::protobuf::_Api_default_instance_._instance, &::google::protobuf::_Method_default_instance_._instance, &::google::protobuf::_Mixin_default_instance_._instance, @@ -228,8 +228,8 @@ const char descriptor_table_protodef_google_2fprotobuf_2fapi_2eproto[] ABSL_ATTR "otobuf/types/known/apipb\242\002\003GPB\252\002\036Google." "Protobuf.WellKnownTypesb\006proto3" }; -static const ::_pbi::DescriptorTable* const descriptor_table_google_2fprotobuf_2fapi_2eproto_deps[2] = - { +static const ::_pbi::DescriptorTable* PROTOBUF_NONNULL const + descriptor_table_google_2fprotobuf_2fapi_2eproto_deps[2] = { &::descriptor_table_google_2fprotobuf_2fsource_5fcontext_2eproto, &::descriptor_table_google_2fprotobuf_2ftype_2eproto, }; @@ -346,8 +346,9 @@ inline void Api::SharedDtor(MessageLite& self) { this_._impl_.~Impl_(); } -inline void* Api::PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { +inline void* PROTOBUF_NONNULL Api::PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { return ::new (mem) Api(arena); } constexpr auto Api::InternalNewImpl_() { @@ -402,7 +403,7 @@ PROTOBUF_CONSTINIT PROTOBUF_EXPORT Api_class_data_ = Api::InternalGenerateClassData_(); -const ::google::protobuf::internal::ClassData* Api::GetClassData() const { +const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL Api::GetClassData() const { ::google::protobuf::internal::PrefetchToLocalCache(&Api_class_data_); ::google::protobuf::internal::PrefetchToLocalCache(Api_class_data_.tc_table); return Api_class_data_.base(); @@ -516,14 +517,14 @@ PROTOBUF_NOINLINE void Api::Clear() { } #if defined(PROTOBUF_CUSTOM_VTABLE) -::uint8_t* Api::_InternalSerialize( - const MessageLite& base, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) { +::uint8_t* PROTOBUF_NONNULL Api::_InternalSerialize( + const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const Api& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE -::uint8_t* Api::_InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { +::uint8_t* PROTOBUF_NONNULL Api::_InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { const Api& this_ = *this; #endif // PROTOBUF_CUSTOM_VTABLE // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Api) @@ -741,7 +742,7 @@ void Api::CopyFrom(const Api& from) { } -void Api::InternalSwap(Api* PROTOBUF_RESTRICT other) { +void Api::InternalSwap(Api* PROTOBUF_RESTRICT PROTOBUF_NONNULL other) { using std::swap; auto* arena = GetArena(); ABSL_DCHECK_EQ(arena, other->GetArena()); @@ -852,8 +853,9 @@ inline void Method::SharedDtor(MessageLite& self) { this_._impl_.~Impl_(); } -inline void* Method::PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { +inline void* PROTOBUF_NONNULL Method::PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { return ::new (mem) Method(arena); } constexpr auto Method::InternalNewImpl_() { @@ -900,7 +902,7 @@ PROTOBUF_CONSTINIT PROTOBUF_EXPORT Method_class_data_ = Method::InternalGenerateClassData_(); -const ::google::protobuf::internal::ClassData* Method::GetClassData() const { +const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL Method::GetClassData() const { ::google::protobuf::internal::PrefetchToLocalCache(&Method_class_data_); ::google::protobuf::internal::PrefetchToLocalCache(Method_class_data_.tc_table); return Method_class_data_.base(); @@ -1013,14 +1015,14 @@ PROTOBUF_NOINLINE void Method::Clear() { } #if defined(PROTOBUF_CUSTOM_VTABLE) -::uint8_t* Method::_InternalSerialize( - const MessageLite& base, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) { +::uint8_t* PROTOBUF_NONNULL Method::_InternalSerialize( + const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const Method& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE -::uint8_t* Method::_InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { +::uint8_t* PROTOBUF_NONNULL Method::_InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { const Method& this_ = *this; #endif // PROTOBUF_CUSTOM_VTABLE // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Method) @@ -1242,7 +1244,7 @@ void Method::CopyFrom(const Method& from) { } -void Method::InternalSwap(Method* PROTOBUF_RESTRICT other) { +void Method::InternalSwap(Method* PROTOBUF_RESTRICT PROTOBUF_NONNULL other) { using std::swap; auto* arena = GetArena(); ABSL_DCHECK_EQ(arena, other->GetArena()); @@ -1330,8 +1332,9 @@ inline void Mixin::SharedDtor(MessageLite& self) { this_._impl_.~Impl_(); } -inline void* Mixin::PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { +inline void* PROTOBUF_NONNULL Mixin::PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { return ::new (mem) Mixin(arena); } constexpr auto Mixin::InternalNewImpl_() { @@ -1366,7 +1369,7 @@ PROTOBUF_CONSTINIT PROTOBUF_EXPORT Mixin_class_data_ = Mixin::InternalGenerateClassData_(); -const ::google::protobuf::internal::ClassData* Mixin::GetClassData() const { +const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL Mixin::GetClassData() const { ::google::protobuf::internal::PrefetchToLocalCache(&Mixin_class_data_); ::google::protobuf::internal::PrefetchToLocalCache(Mixin_class_data_.tc_table); return Mixin_class_data_.base(); @@ -1436,14 +1439,14 @@ PROTOBUF_NOINLINE void Mixin::Clear() { } #if defined(PROTOBUF_CUSTOM_VTABLE) -::uint8_t* Mixin::_InternalSerialize( - const MessageLite& base, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) { +::uint8_t* PROTOBUF_NONNULL Mixin::_InternalSerialize( + const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const Mixin& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE -::uint8_t* Mixin::_InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { +::uint8_t* PROTOBUF_NONNULL Mixin::_InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { const Mixin& this_ = *this; #endif // PROTOBUF_CUSTOM_VTABLE // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Mixin) @@ -1556,7 +1559,7 @@ void Mixin::CopyFrom(const Mixin& from) { } -void Mixin::InternalSwap(Mixin* PROTOBUF_RESTRICT other) { +void Mixin::InternalSwap(Mixin* PROTOBUF_RESTRICT PROTOBUF_NONNULL other) { using std::swap; auto* arena = GetArena(); ABSL_DCHECK_EQ(arena, other->GetArena()); diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index e2fa040914..01026273b7 100644 --- a/src/google/protobuf/api.pb.h +++ b/src/google/protobuf/api.pb.h @@ -87,7 +87,7 @@ class PROTOBUF_EXPORT Mixin final : public ::google::protobuf::Message ~Mixin() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - void operator delete(Mixin* msg, std::destroying_delete_t) { + void operator delete(Mixin* PROTOBUF_NONNULL msg, std::destroying_delete_t) { SharedDtor(*msg); ::google::protobuf::internal::SizedDelete(msg, sizeof(Mixin)); } @@ -118,18 +118,18 @@ class PROTOBUF_EXPORT Mixin final : public ::google::protobuf::Message ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); } - inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() + inline ::google::protobuf::UnknownFieldSet* PROTOBUF_NONNULL mutable_unknown_fields() ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); } - static const ::google::protobuf::Descriptor* descriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL descriptor() { return GetDescriptor(); } - static const ::google::protobuf::Descriptor* GetDescriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::google::protobuf::Reflection* GetReflection() { + static const ::google::protobuf::Reflection* PROTOBUF_NONNULL GetReflection() { return default_instance().GetMetadata().reflection; } static const Mixin& default_instance() { @@ -138,7 +138,7 @@ class PROTOBUF_EXPORT Mixin final : public ::google::protobuf::Message } static constexpr int kIndexInFileMessages = 2; friend void swap(Mixin& a, Mixin& b) { a.Swap(&b); } - inline void Swap(Mixin* other) { + inline void Swap(Mixin* PROTOBUF_NONNULL other) { if (other == this) return; if (::google::protobuf::internal::CanUseInternalSwap(GetArena(), other->GetArena())) { InternalSwap(other); @@ -146,7 +146,7 @@ class PROTOBUF_EXPORT Mixin final : public ::google::protobuf::Message ::google::protobuf::internal::GenericSwap(this, other); } } - void UnsafeArenaSwap(Mixin* other) { + void UnsafeArenaSwap(Mixin* PROTOBUF_NONNULL other) { if (other == this) return; ABSL_DCHECK(GetArena() == other->GetArena()); InternalSwap(other); @@ -154,7 +154,8 @@ class PROTOBUF_EXPORT Mixin final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - Mixin* New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + Mixin* PROTOBUF_NONNULL + New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -175,29 +176,31 @@ class PROTOBUF_EXPORT Mixin final : public ::google::protobuf::Message #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); + static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { + ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL + 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; + ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL + stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: void SharedCtor(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); static void SharedDtor(MessageLite& self); - void InternalSwap(Mixin* other); + void InternalSwap(Mixin* PROTOBUF_NONNULL other); private: template friend ::absl::string_view( @@ -213,9 +216,10 @@ class PROTOBUF_EXPORT Mixin final : public ::google::protobuf::Message : Mixin(arena) { *this = ::std::move(from); } - const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL; - static void* PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); + const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL GetClassData() const PROTOBUF_FINAL; + static void* PROTOBUF_NONNULL PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); static constexpr auto InternalNewImpl_(); public: @@ -234,14 +238,14 @@ class PROTOBUF_EXPORT Mixin final : public ::google::protobuf::Message const std::string& name() const; template void set_name(Arg_&& arg, Args_... args); - std::string* mutable_name(); + std::string* PROTOBUF_NONNULL mutable_name(); [[nodiscard]] std::string* PROTOBUF_NULLABLE release_name(); void set_allocated_name(std::string* PROTOBUF_NULLABLE value); private: const std::string& _internal_name() const; PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value); - std::string* _internal_mutable_name(); + std::string* PROTOBUF_NONNULL _internal_mutable_name(); public: // string root = 2; @@ -249,14 +253,14 @@ class PROTOBUF_EXPORT Mixin final : public ::google::protobuf::Message const std::string& root() const; template void set_root(Arg_&& arg, Args_... args); - std::string* mutable_root(); + std::string* PROTOBUF_NONNULL mutable_root(); [[nodiscard]] std::string* PROTOBUF_NULLABLE release_root(); void set_allocated_root(std::string* PROTOBUF_NULLABLE value); private: const std::string& _internal_root() const; PROTOBUF_ALWAYS_INLINE void _internal_set_root(const std::string& value); - std::string* _internal_mutable_root(); + std::string* PROTOBUF_NONNULL _internal_mutable_root(); public: // @@protoc_insertion_point(class_scope:google.protobuf.Mixin) @@ -304,7 +308,7 @@ class PROTOBUF_EXPORT Method final : public ::google::protobuf::Message ~Method() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - void operator delete(Method* msg, std::destroying_delete_t) { + void operator delete(Method* PROTOBUF_NONNULL msg, std::destroying_delete_t) { SharedDtor(*msg); ::google::protobuf::internal::SizedDelete(msg, sizeof(Method)); } @@ -335,18 +339,18 @@ class PROTOBUF_EXPORT Method final : public ::google::protobuf::Message ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); } - inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() + inline ::google::protobuf::UnknownFieldSet* PROTOBUF_NONNULL mutable_unknown_fields() ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); } - static const ::google::protobuf::Descriptor* descriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL descriptor() { return GetDescriptor(); } - static const ::google::protobuf::Descriptor* GetDescriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::google::protobuf::Reflection* GetReflection() { + static const ::google::protobuf::Reflection* PROTOBUF_NONNULL GetReflection() { return default_instance().GetMetadata().reflection; } static const Method& default_instance() { @@ -355,7 +359,7 @@ class PROTOBUF_EXPORT Method final : public ::google::protobuf::Message } static constexpr int kIndexInFileMessages = 1; friend void swap(Method& a, Method& b) { a.Swap(&b); } - inline void Swap(Method* other) { + inline void Swap(Method* PROTOBUF_NONNULL other) { if (other == this) return; if (::google::protobuf::internal::CanUseInternalSwap(GetArena(), other->GetArena())) { InternalSwap(other); @@ -363,7 +367,7 @@ class PROTOBUF_EXPORT Method final : public ::google::protobuf::Message ::google::protobuf::internal::GenericSwap(this, other); } } - void UnsafeArenaSwap(Method* other) { + void UnsafeArenaSwap(Method* PROTOBUF_NONNULL other) { if (other == this) return; ABSL_DCHECK(GetArena() == other->GetArena()); InternalSwap(other); @@ -371,7 +375,8 @@ class PROTOBUF_EXPORT Method final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - Method* New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + Method* PROTOBUF_NONNULL + New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -392,29 +397,31 @@ class PROTOBUF_EXPORT Method final : public ::google::protobuf::Message #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); + static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { + ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL + 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; + ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL + stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: void SharedCtor(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); static void SharedDtor(MessageLite& self); - void InternalSwap(Method* other); + void InternalSwap(Method* PROTOBUF_NONNULL other); private: template friend ::absl::string_view( @@ -430,9 +437,10 @@ class PROTOBUF_EXPORT Method final : public ::google::protobuf::Message : Method(arena) { *this = ::std::move(from); } - const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL; - static void* PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); + const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL GetClassData() const PROTOBUF_FINAL; + static void* PROTOBUF_NONNULL PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); static constexpr auto InternalNewImpl_(); public: @@ -458,29 +466,29 @@ class PROTOBUF_EXPORT Method final : public ::google::protobuf::Message public: void clear_options() ; - ::google::protobuf::Option* mutable_options(int index); - ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* mutable_options(); + ::google::protobuf::Option* PROTOBUF_NONNULL mutable_options(int index); + ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* PROTOBUF_NONNULL mutable_options(); private: const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>& _internal_options() const; - ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* _internal_mutable_options(); + ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* PROTOBUF_NONNULL _internal_mutable_options(); public: const ::google::protobuf::Option& options(int index) const; - ::google::protobuf::Option* add_options(); + ::google::protobuf::Option* PROTOBUF_NONNULL add_options(); const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>& options() const; // string name = 1; void clear_name() ; const std::string& name() const; template void set_name(Arg_&& arg, Args_... args); - std::string* mutable_name(); + std::string* PROTOBUF_NONNULL mutable_name(); [[nodiscard]] std::string* PROTOBUF_NULLABLE release_name(); void set_allocated_name(std::string* PROTOBUF_NULLABLE value); private: const std::string& _internal_name() const; PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value); - std::string* _internal_mutable_name(); + std::string* PROTOBUF_NONNULL _internal_mutable_name(); public: // string request_type_url = 2; @@ -488,14 +496,14 @@ class PROTOBUF_EXPORT Method final : public ::google::protobuf::Message const std::string& request_type_url() const; template void set_request_type_url(Arg_&& arg, Args_... args); - std::string* mutable_request_type_url(); + std::string* PROTOBUF_NONNULL mutable_request_type_url(); [[nodiscard]] std::string* PROTOBUF_NULLABLE release_request_type_url(); void set_allocated_request_type_url(std::string* PROTOBUF_NULLABLE value); private: const std::string& _internal_request_type_url() const; PROTOBUF_ALWAYS_INLINE void _internal_set_request_type_url(const std::string& value); - std::string* _internal_mutable_request_type_url(); + std::string* PROTOBUF_NONNULL _internal_mutable_request_type_url(); public: // string response_type_url = 4; @@ -503,14 +511,14 @@ class PROTOBUF_EXPORT Method final : public ::google::protobuf::Message const std::string& response_type_url() const; template void set_response_type_url(Arg_&& arg, Args_... args); - std::string* mutable_response_type_url(); + std::string* PROTOBUF_NONNULL mutable_response_type_url(); [[nodiscard]] std::string* PROTOBUF_NULLABLE release_response_type_url(); void set_allocated_response_type_url(std::string* PROTOBUF_NULLABLE value); private: const std::string& _internal_response_type_url() const; PROTOBUF_ALWAYS_INLINE void _internal_set_response_type_url(const std::string& value); - std::string* _internal_mutable_response_type_url(); + std::string* PROTOBUF_NONNULL _internal_mutable_response_type_url(); public: // bool request_streaming = 3; @@ -593,7 +601,7 @@ class PROTOBUF_EXPORT Api final : public ::google::protobuf::Message ~Api() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - void operator delete(Api* msg, std::destroying_delete_t) { + void operator delete(Api* PROTOBUF_NONNULL msg, std::destroying_delete_t) { SharedDtor(*msg); ::google::protobuf::internal::SizedDelete(msg, sizeof(Api)); } @@ -624,18 +632,18 @@ class PROTOBUF_EXPORT Api final : public ::google::protobuf::Message ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); } - inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() + inline ::google::protobuf::UnknownFieldSet* PROTOBUF_NONNULL mutable_unknown_fields() ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); } - static const ::google::protobuf::Descriptor* descriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL descriptor() { return GetDescriptor(); } - static const ::google::protobuf::Descriptor* GetDescriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::google::protobuf::Reflection* GetReflection() { + static const ::google::protobuf::Reflection* PROTOBUF_NONNULL GetReflection() { return default_instance().GetMetadata().reflection; } static const Api& default_instance() { @@ -644,7 +652,7 @@ class PROTOBUF_EXPORT Api final : public ::google::protobuf::Message } static constexpr int kIndexInFileMessages = 0; friend void swap(Api& a, Api& b) { a.Swap(&b); } - inline void Swap(Api* other) { + inline void Swap(Api* PROTOBUF_NONNULL other) { if (other == this) return; if (::google::protobuf::internal::CanUseInternalSwap(GetArena(), other->GetArena())) { InternalSwap(other); @@ -652,7 +660,7 @@ class PROTOBUF_EXPORT Api final : public ::google::protobuf::Message ::google::protobuf::internal::GenericSwap(this, other); } } - void UnsafeArenaSwap(Api* other) { + void UnsafeArenaSwap(Api* PROTOBUF_NONNULL other) { if (other == this) return; ABSL_DCHECK(GetArena() == other->GetArena()); InternalSwap(other); @@ -660,7 +668,8 @@ class PROTOBUF_EXPORT Api final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - Api* New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + Api* PROTOBUF_NONNULL + New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -681,29 +690,31 @@ class PROTOBUF_EXPORT Api final : public ::google::protobuf::Message #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); + static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { + ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL + 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; + ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL + stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: void SharedCtor(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); static void SharedDtor(MessageLite& self); - void InternalSwap(Api* other); + void InternalSwap(Api* PROTOBUF_NONNULL other); private: template friend ::absl::string_view( @@ -719,9 +730,10 @@ class PROTOBUF_EXPORT Api final : public ::google::protobuf::Message : Api(arena) { *this = ::std::move(from); } - const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL; - static void* PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); + const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL GetClassData() const PROTOBUF_FINAL; + static void* PROTOBUF_NONNULL PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); static constexpr auto InternalNewImpl_(); public: @@ -747,15 +759,15 @@ class PROTOBUF_EXPORT Api final : public ::google::protobuf::Message public: void clear_methods() ; - ::google::protobuf::Method* mutable_methods(int index); - ::google::protobuf::RepeatedPtrField<::google::protobuf::Method>* mutable_methods(); + ::google::protobuf::Method* PROTOBUF_NONNULL mutable_methods(int index); + ::google::protobuf::RepeatedPtrField<::google::protobuf::Method>* PROTOBUF_NONNULL mutable_methods(); private: const ::google::protobuf::RepeatedPtrField<::google::protobuf::Method>& _internal_methods() const; - ::google::protobuf::RepeatedPtrField<::google::protobuf::Method>* _internal_mutable_methods(); + ::google::protobuf::RepeatedPtrField<::google::protobuf::Method>* PROTOBUF_NONNULL _internal_mutable_methods(); public: const ::google::protobuf::Method& methods(int index) const; - ::google::protobuf::Method* add_methods(); + ::google::protobuf::Method* PROTOBUF_NONNULL add_methods(); const ::google::protobuf::RepeatedPtrField<::google::protobuf::Method>& methods() const; // repeated .google.protobuf.Option options = 3; int options_size() const; @@ -764,15 +776,15 @@ class PROTOBUF_EXPORT Api final : public ::google::protobuf::Message public: void clear_options() ; - ::google::protobuf::Option* mutable_options(int index); - ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* mutable_options(); + ::google::protobuf::Option* PROTOBUF_NONNULL mutable_options(int index); + ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* PROTOBUF_NONNULL mutable_options(); private: const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>& _internal_options() const; - ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* _internal_mutable_options(); + ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* PROTOBUF_NONNULL _internal_mutable_options(); public: const ::google::protobuf::Option& options(int index) const; - ::google::protobuf::Option* add_options(); + ::google::protobuf::Option* PROTOBUF_NONNULL add_options(); const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>& options() const; // repeated .google.protobuf.Mixin mixins = 6; int mixins_size() const; @@ -781,29 +793,29 @@ class PROTOBUF_EXPORT Api final : public ::google::protobuf::Message public: void clear_mixins() ; - ::google::protobuf::Mixin* mutable_mixins(int index); - ::google::protobuf::RepeatedPtrField<::google::protobuf::Mixin>* mutable_mixins(); + ::google::protobuf::Mixin* PROTOBUF_NONNULL mutable_mixins(int index); + ::google::protobuf::RepeatedPtrField<::google::protobuf::Mixin>* PROTOBUF_NONNULL mutable_mixins(); private: const ::google::protobuf::RepeatedPtrField<::google::protobuf::Mixin>& _internal_mixins() const; - ::google::protobuf::RepeatedPtrField<::google::protobuf::Mixin>* _internal_mutable_mixins(); + ::google::protobuf::RepeatedPtrField<::google::protobuf::Mixin>* PROTOBUF_NONNULL _internal_mutable_mixins(); public: const ::google::protobuf::Mixin& mixins(int index) const; - ::google::protobuf::Mixin* add_mixins(); + ::google::protobuf::Mixin* PROTOBUF_NONNULL add_mixins(); const ::google::protobuf::RepeatedPtrField<::google::protobuf::Mixin>& mixins() const; // string name = 1; void clear_name() ; const std::string& name() const; template void set_name(Arg_&& arg, Args_... args); - std::string* mutable_name(); + std::string* PROTOBUF_NONNULL mutable_name(); [[nodiscard]] std::string* PROTOBUF_NULLABLE release_name(); void set_allocated_name(std::string* PROTOBUF_NULLABLE value); private: const std::string& _internal_name() const; PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value); - std::string* _internal_mutable_name(); + std::string* PROTOBUF_NONNULL _internal_mutable_name(); public: // string version = 4; @@ -811,14 +823,14 @@ class PROTOBUF_EXPORT Api final : public ::google::protobuf::Message const std::string& version() const; template void set_version(Arg_&& arg, Args_... args); - std::string* mutable_version(); + std::string* PROTOBUF_NONNULL mutable_version(); [[nodiscard]] std::string* PROTOBUF_NULLABLE release_version(); void set_allocated_version(std::string* PROTOBUF_NULLABLE value); private: const std::string& _internal_version() const; PROTOBUF_ALWAYS_INLINE void _internal_set_version(const std::string& value); - std::string* _internal_mutable_version(); + std::string* PROTOBUF_NONNULL _internal_mutable_version(); public: // .google.protobuf.SourceContext source_context = 5; @@ -826,14 +838,14 @@ class PROTOBUF_EXPORT Api final : public ::google::protobuf::Message void clear_source_context() ; const ::google::protobuf::SourceContext& source_context() const; [[nodiscard]] ::google::protobuf::SourceContext* PROTOBUF_NULLABLE release_source_context(); - ::google::protobuf::SourceContext* mutable_source_context(); + ::google::protobuf::SourceContext* PROTOBUF_NONNULL mutable_source_context(); void set_allocated_source_context(::google::protobuf::SourceContext* PROTOBUF_NULLABLE value); void unsafe_arena_set_allocated_source_context(::google::protobuf::SourceContext* PROTOBUF_NULLABLE value); ::google::protobuf::SourceContext* PROTOBUF_NULLABLE unsafe_arena_release_source_context(); private: const ::google::protobuf::SourceContext& _internal_source_context() const; - ::google::protobuf::SourceContext* _internal_mutable_source_context(); + ::google::protobuf::SourceContext* PROTOBUF_NONNULL _internal_mutable_source_context(); public: // .google.protobuf.Syntax syntax = 7; @@ -922,7 +934,8 @@ PROTOBUF_ALWAYS_INLINE void Api::set_name(Arg_&& arg, Args_... args) { _impl_.name_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.Api.name) } -inline std::string* Api::mutable_name() ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline std::string* PROTOBUF_NONNULL Api::mutable_name() + ABSL_ATTRIBUTE_LIFETIME_BOUND { std::string* _s = _internal_mutable_name(); // @@protoc_insertion_point(field_mutable:google.protobuf.Api.name) return _s; @@ -936,7 +949,7 @@ inline void Api::_internal_set_name(const std::string& value) { _impl_._has_bits_[0] |= 0x00000001u; _impl_.name_.Set(value, GetArena()); } -inline std::string* Api::_internal_mutable_name() { +inline std::string* PROTOBUF_NONNULL Api::_internal_mutable_name() { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_._has_bits_[0] |= 0x00000001u; return _impl_.name_.Mutable( GetArena()); @@ -979,12 +992,12 @@ inline void Api::clear_methods() { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.methods_.Clear(); } -inline ::google::protobuf::Method* Api::mutable_methods(int index) +inline ::google::protobuf::Method* PROTOBUF_NONNULL Api::mutable_methods(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { // @@protoc_insertion_point(field_mutable:google.protobuf.Api.methods) return _internal_mutable_methods()->Mutable(index); } -inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Method>* Api::mutable_methods() +inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Method>* PROTOBUF_NONNULL Api::mutable_methods() ABSL_ATTRIBUTE_LIFETIME_BOUND { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Api.methods) ::google::protobuf::internal::TSanWrite(&_impl_); @@ -995,7 +1008,8 @@ inline const ::google::protobuf::Method& Api::methods(int index) const // @@protoc_insertion_point(field_get:google.protobuf.Api.methods) return _internal_methods().Get(index); } -inline ::google::protobuf::Method* Api::add_methods() ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline ::google::protobuf::Method* PROTOBUF_NONNULL Api::add_methods() + ABSL_ATTRIBUTE_LIFETIME_BOUND { ::google::protobuf::internal::TSanWrite(&_impl_); ::google::protobuf::Method* _add = _internal_mutable_methods()->Add(); // @@protoc_insertion_point(field_add:google.protobuf.Api.methods) @@ -1011,7 +1025,7 @@ Api::_internal_methods() const { ::google::protobuf::internal::TSanRead(&_impl_); return _impl_.methods_; } -inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Method>* +inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Method>* PROTOBUF_NONNULL Api::_internal_mutable_methods() { ::google::protobuf::internal::TSanRead(&_impl_); return &_impl_.methods_; @@ -1024,12 +1038,12 @@ inline int Api::_internal_options_size() const { inline int Api::options_size() const { return _internal_options_size(); } -inline ::google::protobuf::Option* Api::mutable_options(int index) +inline ::google::protobuf::Option* PROTOBUF_NONNULL Api::mutable_options(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { // @@protoc_insertion_point(field_mutable:google.protobuf.Api.options) return _internal_mutable_options()->Mutable(index); } -inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* Api::mutable_options() +inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* PROTOBUF_NONNULL Api::mutable_options() ABSL_ATTRIBUTE_LIFETIME_BOUND { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Api.options) ::google::protobuf::internal::TSanWrite(&_impl_); @@ -1040,7 +1054,8 @@ inline const ::google::protobuf::Option& Api::options(int index) const // @@protoc_insertion_point(field_get:google.protobuf.Api.options) return _internal_options().Get(index); } -inline ::google::protobuf::Option* Api::add_options() ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline ::google::protobuf::Option* PROTOBUF_NONNULL Api::add_options() + ABSL_ATTRIBUTE_LIFETIME_BOUND { ::google::protobuf::internal::TSanWrite(&_impl_); ::google::protobuf::Option* _add = _internal_mutable_options()->Add(); // @@protoc_insertion_point(field_add:google.protobuf.Api.options) @@ -1056,7 +1071,7 @@ Api::_internal_options() const { ::google::protobuf::internal::TSanRead(&_impl_); return _impl_.options_; } -inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* +inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* PROTOBUF_NONNULL Api::_internal_mutable_options() { ::google::protobuf::internal::TSanRead(&_impl_); return &_impl_.options_; @@ -1080,7 +1095,8 @@ PROTOBUF_ALWAYS_INLINE void Api::set_version(Arg_&& arg, Args_... args) { _impl_.version_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.Api.version) } -inline std::string* Api::mutable_version() ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline std::string* PROTOBUF_NONNULL Api::mutable_version() + ABSL_ATTRIBUTE_LIFETIME_BOUND { std::string* _s = _internal_mutable_version(); // @@protoc_insertion_point(field_mutable:google.protobuf.Api.version) return _s; @@ -1094,7 +1110,7 @@ inline void Api::_internal_set_version(const std::string& value) { _impl_._has_bits_[0] |= 0x00000002u; _impl_.version_.Set(value, GetArena()); } -inline std::string* Api::_internal_mutable_version() { +inline std::string* PROTOBUF_NONNULL Api::_internal_mutable_version() { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_._has_bits_[0] |= 0x00000002u; return _impl_.version_.Mutable( GetArena()); @@ -1183,7 +1199,7 @@ inline ::google::protobuf::SourceContext* PROTOBUF_NULLABLE Api::unsafe_arena_re _impl_.source_context_ = nullptr; return temp; } -inline ::google::protobuf::SourceContext* Api::_internal_mutable_source_context() { +inline ::google::protobuf::SourceContext* PROTOBUF_NONNULL Api::_internal_mutable_source_context() { ::google::protobuf::internal::TSanWrite(&_impl_); if (_impl_.source_context_ == nullptr) { auto* p = ::google::protobuf::Message::DefaultConstruct<::google::protobuf::SourceContext>(GetArena()); @@ -1191,7 +1207,8 @@ inline ::google::protobuf::SourceContext* Api::_internal_mutable_source_context( } return _impl_.source_context_; } -inline ::google::protobuf::SourceContext* Api::mutable_source_context() ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline ::google::protobuf::SourceContext* PROTOBUF_NONNULL Api::mutable_source_context() + ABSL_ATTRIBUTE_LIFETIME_BOUND { _impl_._has_bits_[0] |= 0x00000004u; ::google::protobuf::SourceContext* _msg = _internal_mutable_source_context(); // @@protoc_insertion_point(field_mutable:google.protobuf.Api.source_context) @@ -1229,12 +1246,12 @@ inline void Api::clear_mixins() { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.mixins_.Clear(); } -inline ::google::protobuf::Mixin* Api::mutable_mixins(int index) +inline ::google::protobuf::Mixin* PROTOBUF_NONNULL Api::mutable_mixins(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { // @@protoc_insertion_point(field_mutable:google.protobuf.Api.mixins) return _internal_mutable_mixins()->Mutable(index); } -inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Mixin>* Api::mutable_mixins() +inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Mixin>* PROTOBUF_NONNULL Api::mutable_mixins() ABSL_ATTRIBUTE_LIFETIME_BOUND { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Api.mixins) ::google::protobuf::internal::TSanWrite(&_impl_); @@ -1245,7 +1262,8 @@ inline const ::google::protobuf::Mixin& Api::mixins(int index) const // @@protoc_insertion_point(field_get:google.protobuf.Api.mixins) return _internal_mixins().Get(index); } -inline ::google::protobuf::Mixin* Api::add_mixins() ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline ::google::protobuf::Mixin* PROTOBUF_NONNULL Api::add_mixins() + ABSL_ATTRIBUTE_LIFETIME_BOUND { ::google::protobuf::internal::TSanWrite(&_impl_); ::google::protobuf::Mixin* _add = _internal_mutable_mixins()->Add(); // @@protoc_insertion_point(field_add:google.protobuf.Api.mixins) @@ -1261,7 +1279,7 @@ Api::_internal_mixins() const { ::google::protobuf::internal::TSanRead(&_impl_); return _impl_.mixins_; } -inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Mixin>* +inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Mixin>* PROTOBUF_NONNULL Api::_internal_mutable_mixins() { ::google::protobuf::internal::TSanRead(&_impl_); return &_impl_.mixins_; @@ -1313,7 +1331,8 @@ PROTOBUF_ALWAYS_INLINE void Method::set_name(Arg_&& arg, Args_... args) { _impl_.name_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.Method.name) } -inline std::string* Method::mutable_name() ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline std::string* PROTOBUF_NONNULL Method::mutable_name() + ABSL_ATTRIBUTE_LIFETIME_BOUND { std::string* _s = _internal_mutable_name(); // @@protoc_insertion_point(field_mutable:google.protobuf.Method.name) return _s; @@ -1327,7 +1346,7 @@ inline void Method::_internal_set_name(const std::string& value) { _impl_._has_bits_[0] |= 0x00000001u; _impl_.name_.Set(value, GetArena()); } -inline std::string* Method::_internal_mutable_name() { +inline std::string* PROTOBUF_NONNULL Method::_internal_mutable_name() { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_._has_bits_[0] |= 0x00000001u; return _impl_.name_.Mutable( GetArena()); @@ -1377,7 +1396,8 @@ PROTOBUF_ALWAYS_INLINE void Method::set_request_type_url(Arg_&& arg, Args_... ar _impl_.request_type_url_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.Method.request_type_url) } -inline std::string* Method::mutable_request_type_url() ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline std::string* PROTOBUF_NONNULL Method::mutable_request_type_url() + ABSL_ATTRIBUTE_LIFETIME_BOUND { std::string* _s = _internal_mutable_request_type_url(); // @@protoc_insertion_point(field_mutable:google.protobuf.Method.request_type_url) return _s; @@ -1391,7 +1411,7 @@ inline void Method::_internal_set_request_type_url(const std::string& value) { _impl_._has_bits_[0] |= 0x00000002u; _impl_.request_type_url_.Set(value, GetArena()); } -inline std::string* Method::_internal_mutable_request_type_url() { +inline std::string* PROTOBUF_NONNULL Method::_internal_mutable_request_type_url() { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_._has_bits_[0] |= 0x00000002u; return _impl_.request_type_url_.Mutable( GetArena()); @@ -1465,7 +1485,8 @@ PROTOBUF_ALWAYS_INLINE void Method::set_response_type_url(Arg_&& arg, Args_... a _impl_.response_type_url_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.Method.response_type_url) } -inline std::string* Method::mutable_response_type_url() ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline std::string* PROTOBUF_NONNULL Method::mutable_response_type_url() + ABSL_ATTRIBUTE_LIFETIME_BOUND { std::string* _s = _internal_mutable_response_type_url(); // @@protoc_insertion_point(field_mutable:google.protobuf.Method.response_type_url) return _s; @@ -1479,7 +1500,7 @@ inline void Method::_internal_set_response_type_url(const std::string& value) { _impl_._has_bits_[0] |= 0x00000004u; _impl_.response_type_url_.Set(value, GetArena()); } -inline std::string* Method::_internal_mutable_response_type_url() { +inline std::string* PROTOBUF_NONNULL Method::_internal_mutable_response_type_url() { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_._has_bits_[0] |= 0x00000004u; return _impl_.response_type_url_.Mutable( GetArena()); @@ -1542,12 +1563,12 @@ inline int Method::_internal_options_size() const { inline int Method::options_size() const { return _internal_options_size(); } -inline ::google::protobuf::Option* Method::mutable_options(int index) +inline ::google::protobuf::Option* PROTOBUF_NONNULL Method::mutable_options(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { // @@protoc_insertion_point(field_mutable:google.protobuf.Method.options) return _internal_mutable_options()->Mutable(index); } -inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* Method::mutable_options() +inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* PROTOBUF_NONNULL Method::mutable_options() ABSL_ATTRIBUTE_LIFETIME_BOUND { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Method.options) ::google::protobuf::internal::TSanWrite(&_impl_); @@ -1558,7 +1579,8 @@ inline const ::google::protobuf::Option& Method::options(int index) const // @@protoc_insertion_point(field_get:google.protobuf.Method.options) return _internal_options().Get(index); } -inline ::google::protobuf::Option* Method::add_options() ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline ::google::protobuf::Option* PROTOBUF_NONNULL Method::add_options() + ABSL_ATTRIBUTE_LIFETIME_BOUND { ::google::protobuf::internal::TSanWrite(&_impl_); ::google::protobuf::Option* _add = _internal_mutable_options()->Add(); // @@protoc_insertion_point(field_add:google.protobuf.Method.options) @@ -1574,7 +1596,7 @@ Method::_internal_options() const { ::google::protobuf::internal::TSanRead(&_impl_); return _impl_.options_; } -inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* +inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* PROTOBUF_NONNULL Method::_internal_mutable_options() { ::google::protobuf::internal::TSanRead(&_impl_); return &_impl_.options_; @@ -1626,7 +1648,8 @@ PROTOBUF_ALWAYS_INLINE void Mixin::set_name(Arg_&& arg, Args_... args) { _impl_.name_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.Mixin.name) } -inline std::string* Mixin::mutable_name() ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline std::string* PROTOBUF_NONNULL Mixin::mutable_name() + ABSL_ATTRIBUTE_LIFETIME_BOUND { std::string* _s = _internal_mutable_name(); // @@protoc_insertion_point(field_mutable:google.protobuf.Mixin.name) return _s; @@ -1640,7 +1663,7 @@ inline void Mixin::_internal_set_name(const std::string& value) { _impl_._has_bits_[0] |= 0x00000001u; _impl_.name_.Set(value, GetArena()); } -inline std::string* Mixin::_internal_mutable_name() { +inline std::string* PROTOBUF_NONNULL Mixin::_internal_mutable_name() { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_._has_bits_[0] |= 0x00000001u; return _impl_.name_.Mutable( GetArena()); @@ -1690,7 +1713,8 @@ PROTOBUF_ALWAYS_INLINE void Mixin::set_root(Arg_&& arg, Args_... args) { _impl_.root_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.Mixin.root) } -inline std::string* Mixin::mutable_root() ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline std::string* PROTOBUF_NONNULL Mixin::mutable_root() + ABSL_ATTRIBUTE_LIFETIME_BOUND { std::string* _s = _internal_mutable_root(); // @@protoc_insertion_point(field_mutable:google.protobuf.Mixin.root) return _s; @@ -1704,7 +1728,7 @@ inline void Mixin::_internal_set_root(const std::string& value) { _impl_._has_bits_[0] |= 0x00000002u; _impl_.root_.Set(value, GetArena()); } -inline std::string* Mixin::_internal_mutable_root() { +inline std::string* PROTOBUF_NONNULL Mixin::_internal_mutable_root() { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_._has_bits_[0] |= 0x00000002u; return _impl_.root_.Mutable( GetArena()); diff --git a/src/google/protobuf/duration.pb.cc b/src/google/protobuf/duration.pb.cc index 7447aa8ce2..8b7503f0a3 100644 --- a/src/google/protobuf/duration.pb.cc +++ b/src/google/protobuf/duration.pb.cc @@ -54,9 +54,9 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 DurationDefaultTypeInternal _Duration_default_instance_; } // namespace protobuf } // namespace google -static constexpr const ::_pb::EnumDescriptor** PROTOBUF_NULLABLE +static constexpr const ::_pb::EnumDescriptor *PROTOBUF_NONNULL *PROTOBUF_NULLABLE file_level_enum_descriptors_google_2fprotobuf_2fduration_2eproto = nullptr; -static constexpr const ::_pb::ServiceDescriptor** PROTOBUF_NULLABLE +static constexpr const ::_pb::ServiceDescriptor *PROTOBUF_NONNULL *PROTOBUF_NULLABLE file_level_service_descriptors_google_2fprotobuf_2fduration_2eproto = nullptr; const ::uint32_t TableStruct_google_2fprotobuf_2fduration_2eproto::offsets[] ABSL_ATTRIBUTE_SECTION_VARIABLE( @@ -79,7 +79,7 @@ static const ::_pbi::MigrationSchema schemas[] ABSL_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = { {0, 10, -1, sizeof(::google::protobuf::Duration)}, }; -static const ::_pb::Message* const file_default_instances[] = { +static const ::_pb::Message* PROTOBUF_NONNULL const file_default_instances[] = { &::google::protobuf::_Duration_default_instance_._instance, }; const char descriptor_table_protodef_google_2fprotobuf_2fduration_2eproto[] ABSL_ATTRIBUTE_SECTION_VARIABLE( @@ -165,8 +165,9 @@ inline void Duration::SharedDtor(MessageLite& self) { this_._impl_.~Impl_(); } -inline void* Duration::PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { +inline void* PROTOBUF_NONNULL Duration::PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { return ::new (mem) Duration(arena); } constexpr auto Duration::InternalNewImpl_() { @@ -201,7 +202,7 @@ PROTOBUF_CONSTINIT PROTOBUF_EXPORT Duration_class_data_ = Duration::InternalGenerateClassData_(); -const ::google::protobuf::internal::ClassData* Duration::GetClassData() const { +const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL Duration::GetClassData() const { ::google::protobuf::internal::PrefetchToLocalCache(&Duration_class_data_); ::google::protobuf::internal::PrefetchToLocalCache(Duration_class_data_.tc_table); return Duration_class_data_.base(); @@ -264,14 +265,14 @@ PROTOBUF_NOINLINE void Duration::Clear() { } #if defined(PROTOBUF_CUSTOM_VTABLE) -::uint8_t* Duration::_InternalSerialize( - const MessageLite& base, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) { +::uint8_t* PROTOBUF_NONNULL Duration::_InternalSerialize( + const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const Duration& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE -::uint8_t* Duration::_InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { +::uint8_t* PROTOBUF_NONNULL Duration::_InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { const Duration& this_ = *this; #endif // PROTOBUF_CUSTOM_VTABLE // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Duration) @@ -374,7 +375,7 @@ void Duration::CopyFrom(const Duration& from) { } -void Duration::InternalSwap(Duration* PROTOBUF_RESTRICT other) { +void Duration::InternalSwap(Duration* PROTOBUF_RESTRICT PROTOBUF_NONNULL other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h index 7eab0286e8..a7ec4ee214 100644 --- a/src/google/protobuf/duration.pb.h +++ b/src/google/protobuf/duration.pb.h @@ -77,7 +77,7 @@ class PROTOBUF_EXPORT Duration final : public ::google::protobuf::Message ~Duration() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - void operator delete(Duration* msg, std::destroying_delete_t) { + void operator delete(Duration* PROTOBUF_NONNULL msg, std::destroying_delete_t) { SharedDtor(*msg); ::google::protobuf::internal::SizedDelete(msg, sizeof(Duration)); } @@ -108,18 +108,18 @@ class PROTOBUF_EXPORT Duration final : public ::google::protobuf::Message ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); } - inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() + inline ::google::protobuf::UnknownFieldSet* PROTOBUF_NONNULL mutable_unknown_fields() ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); } - static const ::google::protobuf::Descriptor* descriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL descriptor() { return GetDescriptor(); } - static const ::google::protobuf::Descriptor* GetDescriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::google::protobuf::Reflection* GetReflection() { + static const ::google::protobuf::Reflection* PROTOBUF_NONNULL GetReflection() { return default_instance().GetMetadata().reflection; } static const Duration& default_instance() { @@ -128,7 +128,7 @@ class PROTOBUF_EXPORT Duration final : public ::google::protobuf::Message } static constexpr int kIndexInFileMessages = 0; friend void swap(Duration& a, Duration& b) { a.Swap(&b); } - inline void Swap(Duration* other) { + inline void Swap(Duration* PROTOBUF_NONNULL other) { if (other == this) return; if (::google::protobuf::internal::CanUseInternalSwap(GetArena(), other->GetArena())) { InternalSwap(other); @@ -136,7 +136,7 @@ class PROTOBUF_EXPORT Duration final : public ::google::protobuf::Message ::google::protobuf::internal::GenericSwap(this, other); } } - void UnsafeArenaSwap(Duration* other) { + void UnsafeArenaSwap(Duration* PROTOBUF_NONNULL other) { if (other == this) return; ABSL_DCHECK(GetArena() == other->GetArena()); InternalSwap(other); @@ -144,7 +144,8 @@ class PROTOBUF_EXPORT Duration final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - Duration* New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + Duration* PROTOBUF_NONNULL + New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -165,29 +166,31 @@ class PROTOBUF_EXPORT Duration final : public ::google::protobuf::Message #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); + static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { + ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL + 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; + ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL + stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: void SharedCtor(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); static void SharedDtor(MessageLite& self); - void InternalSwap(Duration* other); + void InternalSwap(Duration* PROTOBUF_NONNULL other); private: template friend ::absl::string_view( @@ -203,9 +206,10 @@ class PROTOBUF_EXPORT Duration final : public ::google::protobuf::Message : Duration(arena) { *this = ::std::move(from); } - const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL; - static void* PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); + const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL GetClassData() const PROTOBUF_FINAL; + static void* PROTOBUF_NONNULL PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); static constexpr auto InternalNewImpl_(); public: diff --git a/src/google/protobuf/empty.pb.cc b/src/google/protobuf/empty.pb.cc index 7b86911127..a588075485 100644 --- a/src/google/protobuf/empty.pb.cc +++ b/src/google/protobuf/empty.pb.cc @@ -46,9 +46,9 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EmptyDefaultTypeInternal _Empty_default_instance_; } // namespace protobuf } // namespace google -static constexpr const ::_pb::EnumDescriptor** PROTOBUF_NULLABLE +static constexpr const ::_pb::EnumDescriptor *PROTOBUF_NONNULL *PROTOBUF_NULLABLE file_level_enum_descriptors_google_2fprotobuf_2fempty_2eproto = nullptr; -static constexpr const ::_pb::ServiceDescriptor** PROTOBUF_NULLABLE +static constexpr const ::_pb::ServiceDescriptor *PROTOBUF_NONNULL *PROTOBUF_NULLABLE file_level_service_descriptors_google_2fprotobuf_2fempty_2eproto = nullptr; const ::uint32_t TableStruct_google_2fprotobuf_2fempty_2eproto::offsets[] ABSL_ATTRIBUTE_SECTION_VARIABLE( @@ -67,7 +67,7 @@ static const ::_pbi::MigrationSchema schemas[] ABSL_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = { {0, -1, -1, sizeof(::google::protobuf::Empty)}, }; -static const ::_pb::Message* const file_default_instances[] = { +static const ::_pb::Message* PROTOBUF_NONNULL const file_default_instances[] = { &::google::protobuf::_Empty_default_instance_._instance, }; const char descriptor_table_protodef_google_2fprotobuf_2fempty_2eproto[] ABSL_ATTRIBUTE_SECTION_VARIABLE( @@ -127,8 +127,9 @@ Empty::Empty( // @@protoc_insertion_point(copy_constructor:google.protobuf.Empty) } -inline void* Empty::PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { +inline void* PROTOBUF_NONNULL Empty::PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { return ::new (mem) Empty(arena); } constexpr auto Empty::InternalNewImpl_() { @@ -163,7 +164,7 @@ PROTOBUF_CONSTINIT PROTOBUF_EXPORT Empty_class_data_ = Empty::InternalGenerateClassData_(); -const ::google::protobuf::internal::ClassData* Empty::GetClassData() const { +const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL Empty::GetClassData() const { ::google::protobuf::internal::PrefetchToLocalCache(&Empty_class_data_); ::google::protobuf::internal::PrefetchToLocalCache(Empty_class_data_.tc_table); return Empty_class_data_.base(); diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h index 81c4808f19..39aaa0b70f 100644 --- a/src/google/protobuf/empty.pb.h +++ b/src/google/protobuf/empty.pb.h @@ -77,7 +77,7 @@ class PROTOBUF_EXPORT Empty final : public ::google::protobuf::internal::ZeroFie inline Empty() : Empty(nullptr) {} #if defined(PROTOBUF_CUSTOM_VTABLE) - void operator delete(Empty* msg, std::destroying_delete_t) { + void operator delete(Empty* PROTOBUF_NONNULL msg, std::destroying_delete_t) { SharedDtor(*msg); ::google::protobuf::internal::SizedDelete(msg, sizeof(Empty)); } @@ -108,18 +108,18 @@ class PROTOBUF_EXPORT Empty final : public ::google::protobuf::internal::ZeroFie ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); } - inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() + inline ::google::protobuf::UnknownFieldSet* PROTOBUF_NONNULL mutable_unknown_fields() ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); } - static const ::google::protobuf::Descriptor* descriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL descriptor() { return GetDescriptor(); } - static const ::google::protobuf::Descriptor* GetDescriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::google::protobuf::Reflection* GetReflection() { + static const ::google::protobuf::Reflection* PROTOBUF_NONNULL GetReflection() { return default_instance().GetMetadata().reflection; } static const Empty& default_instance() { @@ -128,7 +128,7 @@ class PROTOBUF_EXPORT Empty final : public ::google::protobuf::internal::ZeroFie } static constexpr int kIndexInFileMessages = 0; friend void swap(Empty& a, Empty& b) { a.Swap(&b); } - inline void Swap(Empty* other) { + inline void Swap(Empty* PROTOBUF_NONNULL other) { if (other == this) return; if (::google::protobuf::internal::CanUseInternalSwap(GetArena(), other->GetArena())) { InternalSwap(other); @@ -136,7 +136,7 @@ class PROTOBUF_EXPORT Empty final : public ::google::protobuf::internal::ZeroFie ::google::protobuf::internal::GenericSwap(this, other); } } - void UnsafeArenaSwap(Empty* other) { + void UnsafeArenaSwap(Empty* PROTOBUF_NONNULL other) { if (other == this) return; ABSL_DCHECK(GetArena() == other->GetArena()); InternalSwap(other); @@ -144,7 +144,8 @@ class PROTOBUF_EXPORT Empty final : public ::google::protobuf::internal::ZeroFie // implements Message ---------------------------------------------- - Empty* New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + Empty* PROTOBUF_NONNULL + New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::internal::ZeroFieldsBase::DefaultConstruct(arena); } using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom; @@ -175,9 +176,10 @@ class PROTOBUF_EXPORT Empty final : public ::google::protobuf::internal::ZeroFie : Empty(arena) { *this = ::std::move(from); } - const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL; - static void* PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); + const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL GetClassData() const PROTOBUF_FINAL; + static void* PROTOBUF_NONNULL PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); static constexpr auto InternalNewImpl_(); public: diff --git a/src/google/protobuf/field_mask.pb.cc b/src/google/protobuf/field_mask.pb.cc index 20208982be..7b9732a612 100644 --- a/src/google/protobuf/field_mask.pb.cc +++ b/src/google/protobuf/field_mask.pb.cc @@ -53,9 +53,9 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FieldMaskDefaultTypeInternal _FieldMask_default_instance_; } // namespace protobuf } // namespace google -static constexpr const ::_pb::EnumDescriptor** PROTOBUF_NULLABLE +static constexpr const ::_pb::EnumDescriptor *PROTOBUF_NONNULL *PROTOBUF_NULLABLE file_level_enum_descriptors_google_2fprotobuf_2ffield_5fmask_2eproto = nullptr; -static constexpr const ::_pb::ServiceDescriptor** PROTOBUF_NULLABLE +static constexpr const ::_pb::ServiceDescriptor *PROTOBUF_NONNULL *PROTOBUF_NULLABLE file_level_service_descriptors_google_2fprotobuf_2ffield_5fmask_2eproto = nullptr; const ::uint32_t TableStruct_google_2fprotobuf_2ffield_5fmask_2eproto::offsets[] ABSL_ATTRIBUTE_SECTION_VARIABLE( @@ -75,7 +75,7 @@ static const ::_pbi::MigrationSchema schemas[] ABSL_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = { {0, -1, -1, sizeof(::google::protobuf::FieldMask)}, }; -static const ::_pb::Message* const file_default_instances[] = { +static const ::_pb::Message* PROTOBUF_NONNULL const file_default_instances[] = { &::google::protobuf::_FieldMask_default_instance_._instance, }; const char descriptor_table_protodef_google_2fprotobuf_2ffield_5fmask_2eproto[] ABSL_ATTRIBUTE_SECTION_VARIABLE( @@ -164,8 +164,9 @@ inline void FieldMask::SharedDtor(MessageLite& self) { this_._impl_.~Impl_(); } -inline void* FieldMask::PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { +inline void* PROTOBUF_NONNULL FieldMask::PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { return ::new (mem) FieldMask(arena); } constexpr auto FieldMask::InternalNewImpl_() { @@ -212,7 +213,7 @@ PROTOBUF_CONSTINIT PROTOBUF_EXPORT FieldMask_class_data_ = FieldMask::InternalGenerateClassData_(); -const ::google::protobuf::internal::ClassData* FieldMask::GetClassData() const { +const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL FieldMask::GetClassData() const { ::google::protobuf::internal::PrefetchToLocalCache(&FieldMask_class_data_); ::google::protobuf::internal::PrefetchToLocalCache(FieldMask_class_data_.tc_table); return FieldMask_class_data_.base(); @@ -266,14 +267,14 @@ PROTOBUF_NOINLINE void FieldMask::Clear() { } #if defined(PROTOBUF_CUSTOM_VTABLE) -::uint8_t* FieldMask::_InternalSerialize( - const MessageLite& base, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) { +::uint8_t* PROTOBUF_NONNULL FieldMask::_InternalSerialize( + const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const FieldMask& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE -::uint8_t* FieldMask::_InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { +::uint8_t* PROTOBUF_NONNULL FieldMask::_InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { const FieldMask& this_ = *this; #endif // PROTOBUF_CUSTOM_VTABLE // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FieldMask) @@ -347,7 +348,7 @@ void FieldMask::CopyFrom(const FieldMask& from) { } -void FieldMask::InternalSwap(FieldMask* PROTOBUF_RESTRICT other) { +void FieldMask::InternalSwap(FieldMask* PROTOBUF_RESTRICT PROTOBUF_NONNULL other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); _impl_.paths_.InternalSwap(&other->_impl_.paths_); diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h index 63ac9d1f04..1433698a66 100644 --- a/src/google/protobuf/field_mask.pb.h +++ b/src/google/protobuf/field_mask.pb.h @@ -77,7 +77,7 @@ class PROTOBUF_EXPORT FieldMask final : public ::google::protobuf::Message ~FieldMask() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - void operator delete(FieldMask* msg, std::destroying_delete_t) { + void operator delete(FieldMask* PROTOBUF_NONNULL msg, std::destroying_delete_t) { SharedDtor(*msg); ::google::protobuf::internal::SizedDelete(msg, sizeof(FieldMask)); } @@ -108,18 +108,18 @@ class PROTOBUF_EXPORT FieldMask final : public ::google::protobuf::Message ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); } - inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() + inline ::google::protobuf::UnknownFieldSet* PROTOBUF_NONNULL mutable_unknown_fields() ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); } - static const ::google::protobuf::Descriptor* descriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL descriptor() { return GetDescriptor(); } - static const ::google::protobuf::Descriptor* GetDescriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::google::protobuf::Reflection* GetReflection() { + static const ::google::protobuf::Reflection* PROTOBUF_NONNULL GetReflection() { return default_instance().GetMetadata().reflection; } static const FieldMask& default_instance() { @@ -128,7 +128,7 @@ class PROTOBUF_EXPORT FieldMask final : public ::google::protobuf::Message } static constexpr int kIndexInFileMessages = 0; friend void swap(FieldMask& a, FieldMask& b) { a.Swap(&b); } - inline void Swap(FieldMask* other) { + inline void Swap(FieldMask* PROTOBUF_NONNULL other) { if (other == this) return; if (::google::protobuf::internal::CanUseInternalSwap(GetArena(), other->GetArena())) { InternalSwap(other); @@ -136,7 +136,7 @@ class PROTOBUF_EXPORT FieldMask final : public ::google::protobuf::Message ::google::protobuf::internal::GenericSwap(this, other); } } - void UnsafeArenaSwap(FieldMask* other) { + void UnsafeArenaSwap(FieldMask* PROTOBUF_NONNULL other) { if (other == this) return; ABSL_DCHECK(GetArena() == other->GetArena()); InternalSwap(other); @@ -144,7 +144,8 @@ class PROTOBUF_EXPORT FieldMask final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - FieldMask* New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + FieldMask* PROTOBUF_NONNULL + New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -165,29 +166,31 @@ class PROTOBUF_EXPORT FieldMask final : public ::google::protobuf::Message #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); + static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { + ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL + 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; + ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL + stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: void SharedCtor(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); static void SharedDtor(MessageLite& self); - void InternalSwap(FieldMask* other); + void InternalSwap(FieldMask* PROTOBUF_NONNULL other); private: template friend ::absl::string_view( @@ -203,9 +206,10 @@ class PROTOBUF_EXPORT FieldMask final : public ::google::protobuf::Message : FieldMask(arena) { *this = ::std::move(from); } - const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL; - static void* PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); + const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL GetClassData() const PROTOBUF_FINAL; + static void* PROTOBUF_NONNULL PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); static constexpr auto InternalNewImpl_(); public: @@ -226,18 +230,18 @@ class PROTOBUF_EXPORT FieldMask final : public ::google::protobuf::Message public: void clear_paths() ; const std::string& paths(int index) const; - std::string* mutable_paths(int index); + std::string* PROTOBUF_NONNULL mutable_paths(int index); template void set_paths(int index, Arg_&& value, Args_... args); - std::string* add_paths(); + std::string* PROTOBUF_NONNULL add_paths(); template void add_paths(Arg_&& value, Args_... args); const ::google::protobuf::RepeatedPtrField& paths() const; - ::google::protobuf::RepeatedPtrField* mutable_paths(); + ::google::protobuf::RepeatedPtrField* PROTOBUF_NONNULL mutable_paths(); private: const ::google::protobuf::RepeatedPtrField& _internal_paths() const; - ::google::protobuf::RepeatedPtrField* _internal_mutable_paths(); + ::google::protobuf::RepeatedPtrField* PROTOBUF_NONNULL _internal_mutable_paths(); public: // @@protoc_insertion_point(class_scope:google.protobuf.FieldMask) @@ -302,7 +306,8 @@ inline void FieldMask::clear_paths() { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.paths_.Clear(); } -inline std::string* FieldMask::add_paths() ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline std::string* PROTOBUF_NONNULL FieldMask::add_paths() + ABSL_ATTRIBUTE_LIFETIME_BOUND { ::google::protobuf::internal::TSanWrite(&_impl_); std::string* _s = _internal_mutable_paths()->Add(); // @@protoc_insertion_point(field_add_mutable:google.protobuf.FieldMask.paths) @@ -313,7 +318,7 @@ inline const std::string& FieldMask::paths(int index) const // @@protoc_insertion_point(field_get:google.protobuf.FieldMask.paths) return _internal_paths().Get(index); } -inline std::string* FieldMask::mutable_paths(int index) +inline std::string* PROTOBUF_NONNULL FieldMask::mutable_paths(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { // @@protoc_insertion_point(field_mutable:google.protobuf.FieldMask.paths) return _internal_mutable_paths()->Mutable(index); @@ -337,7 +342,7 @@ FieldMask::paths() const ABSL_ATTRIBUTE_LIFETIME_BOUND { // @@protoc_insertion_point(field_list:google.protobuf.FieldMask.paths) return _internal_paths(); } -inline ::google::protobuf::RepeatedPtrField* +inline ::google::protobuf::RepeatedPtrField* PROTOBUF_NONNULL FieldMask::mutable_paths() ABSL_ATTRIBUTE_LIFETIME_BOUND { // @@protoc_insertion_point(field_mutable_list:google.protobuf.FieldMask.paths) ::google::protobuf::internal::TSanWrite(&_impl_); @@ -348,7 +353,7 @@ FieldMask::_internal_paths() const { ::google::protobuf::internal::TSanRead(&_impl_); return _impl_.paths_; } -inline ::google::protobuf::RepeatedPtrField* +inline ::google::protobuf::RepeatedPtrField* PROTOBUF_NONNULL FieldMask::_internal_mutable_paths() { ::google::protobuf::internal::TSanRead(&_impl_); return &_impl_.paths_; diff --git a/src/google/protobuf/source_context.pb.cc b/src/google/protobuf/source_context.pb.cc index a627eebcd3..d47fa7743d 100644 --- a/src/google/protobuf/source_context.pb.cc +++ b/src/google/protobuf/source_context.pb.cc @@ -55,9 +55,9 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 SourceContextDefaultTypeInternal _SourceContext_default_instance_; } // namespace protobuf } // namespace google -static constexpr const ::_pb::EnumDescriptor** PROTOBUF_NULLABLE +static constexpr const ::_pb::EnumDescriptor *PROTOBUF_NONNULL *PROTOBUF_NULLABLE file_level_enum_descriptors_google_2fprotobuf_2fsource_5fcontext_2eproto = nullptr; -static constexpr const ::_pb::ServiceDescriptor** PROTOBUF_NULLABLE +static constexpr const ::_pb::ServiceDescriptor *PROTOBUF_NONNULL *PROTOBUF_NULLABLE file_level_service_descriptors_google_2fprotobuf_2fsource_5fcontext_2eproto = nullptr; const ::uint32_t TableStruct_google_2fprotobuf_2fsource_5fcontext_2eproto::offsets[] ABSL_ATTRIBUTE_SECTION_VARIABLE( @@ -78,7 +78,7 @@ static const ::_pbi::MigrationSchema schemas[] ABSL_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = { {0, 9, -1, sizeof(::google::protobuf::SourceContext)}, }; -static const ::_pb::Message* const file_default_instances[] = { +static const ::_pb::Message* PROTOBUF_NONNULL const file_default_instances[] = { &::google::protobuf::_SourceContext_default_instance_._instance, }; const char descriptor_table_protodef_google_2fprotobuf_2fsource_5fcontext_2eproto[] ABSL_ATTRIBUTE_SECTION_VARIABLE( @@ -173,8 +173,9 @@ inline void SourceContext::SharedDtor(MessageLite& self) { this_._impl_.~Impl_(); } -inline void* SourceContext::PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { +inline void* PROTOBUF_NONNULL SourceContext::PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { return ::new (mem) SourceContext(arena); } constexpr auto SourceContext::InternalNewImpl_() { @@ -209,7 +210,7 @@ PROTOBUF_CONSTINIT PROTOBUF_EXPORT SourceContext_class_data_ = SourceContext::InternalGenerateClassData_(); -const ::google::protobuf::internal::ClassData* SourceContext::GetClassData() const { +const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL SourceContext::GetClassData() const { ::google::protobuf::internal::PrefetchToLocalCache(&SourceContext_class_data_); ::google::protobuf::internal::PrefetchToLocalCache(SourceContext_class_data_.tc_table); return SourceContext_class_data_.base(); @@ -267,14 +268,14 @@ PROTOBUF_NOINLINE void SourceContext::Clear() { } #if defined(PROTOBUF_CUSTOM_VTABLE) -::uint8_t* SourceContext::_InternalSerialize( - const MessageLite& base, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) { +::uint8_t* PROTOBUF_NONNULL SourceContext::_InternalSerialize( + const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const SourceContext& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE -::uint8_t* SourceContext::_InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { +::uint8_t* PROTOBUF_NONNULL SourceContext::_InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { const SourceContext& this_ = *this; #endif // PROTOBUF_CUSTOM_VTABLE // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.SourceContext) @@ -358,7 +359,7 @@ void SourceContext::CopyFrom(const SourceContext& from) { } -void SourceContext::InternalSwap(SourceContext* PROTOBUF_RESTRICT other) { +void SourceContext::InternalSwap(SourceContext* PROTOBUF_RESTRICT PROTOBUF_NONNULL other) { using std::swap; auto* arena = GetArena(); ABSL_DCHECK_EQ(arena, other->GetArena()); diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h index beab702640..c32939b2d2 100644 --- a/src/google/protobuf/source_context.pb.h +++ b/src/google/protobuf/source_context.pb.h @@ -77,7 +77,7 @@ class PROTOBUF_EXPORT SourceContext final : public ::google::protobuf::Message ~SourceContext() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - void operator delete(SourceContext* msg, std::destroying_delete_t) { + void operator delete(SourceContext* PROTOBUF_NONNULL msg, std::destroying_delete_t) { SharedDtor(*msg); ::google::protobuf::internal::SizedDelete(msg, sizeof(SourceContext)); } @@ -108,18 +108,18 @@ class PROTOBUF_EXPORT SourceContext final : public ::google::protobuf::Message ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); } - inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() + inline ::google::protobuf::UnknownFieldSet* PROTOBUF_NONNULL mutable_unknown_fields() ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); } - static const ::google::protobuf::Descriptor* descriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL descriptor() { return GetDescriptor(); } - static const ::google::protobuf::Descriptor* GetDescriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::google::protobuf::Reflection* GetReflection() { + static const ::google::protobuf::Reflection* PROTOBUF_NONNULL GetReflection() { return default_instance().GetMetadata().reflection; } static const SourceContext& default_instance() { @@ -128,7 +128,7 @@ class PROTOBUF_EXPORT SourceContext final : public ::google::protobuf::Message } static constexpr int kIndexInFileMessages = 0; friend void swap(SourceContext& a, SourceContext& b) { a.Swap(&b); } - inline void Swap(SourceContext* other) { + inline void Swap(SourceContext* PROTOBUF_NONNULL other) { if (other == this) return; if (::google::protobuf::internal::CanUseInternalSwap(GetArena(), other->GetArena())) { InternalSwap(other); @@ -136,7 +136,7 @@ class PROTOBUF_EXPORT SourceContext final : public ::google::protobuf::Message ::google::protobuf::internal::GenericSwap(this, other); } } - void UnsafeArenaSwap(SourceContext* other) { + void UnsafeArenaSwap(SourceContext* PROTOBUF_NONNULL other) { if (other == this) return; ABSL_DCHECK(GetArena() == other->GetArena()); InternalSwap(other); @@ -144,7 +144,8 @@ class PROTOBUF_EXPORT SourceContext final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - SourceContext* New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + SourceContext* PROTOBUF_NONNULL + New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -165,29 +166,31 @@ class PROTOBUF_EXPORT SourceContext final : public ::google::protobuf::Message #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); + static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { + ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL + 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; + ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL + stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: void SharedCtor(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); static void SharedDtor(MessageLite& self); - void InternalSwap(SourceContext* other); + void InternalSwap(SourceContext* PROTOBUF_NONNULL other); private: template friend ::absl::string_view( @@ -203,9 +206,10 @@ class PROTOBUF_EXPORT SourceContext final : public ::google::protobuf::Message : SourceContext(arena) { *this = ::std::move(from); } - const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL; - static void* PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); + const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL GetClassData() const PROTOBUF_FINAL; + static void* PROTOBUF_NONNULL PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); static constexpr auto InternalNewImpl_(); public: @@ -223,14 +227,14 @@ class PROTOBUF_EXPORT SourceContext final : public ::google::protobuf::Message const std::string& file_name() const; template void set_file_name(Arg_&& arg, Args_... args); - std::string* mutable_file_name(); + std::string* PROTOBUF_NONNULL mutable_file_name(); [[nodiscard]] std::string* PROTOBUF_NULLABLE release_file_name(); void set_allocated_file_name(std::string* PROTOBUF_NULLABLE value); private: const std::string& _internal_file_name() const; PROTOBUF_ALWAYS_INLINE void _internal_set_file_name(const std::string& value); - std::string* _internal_mutable_file_name(); + std::string* PROTOBUF_NONNULL _internal_mutable_file_name(); public: // @@protoc_insertion_point(class_scope:google.protobuf.SourceContext) @@ -303,7 +307,8 @@ PROTOBUF_ALWAYS_INLINE void SourceContext::set_file_name(Arg_&& arg, Args_... ar _impl_.file_name_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.SourceContext.file_name) } -inline std::string* SourceContext::mutable_file_name() ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline std::string* PROTOBUF_NONNULL SourceContext::mutable_file_name() + ABSL_ATTRIBUTE_LIFETIME_BOUND { std::string* _s = _internal_mutable_file_name(); // @@protoc_insertion_point(field_mutable:google.protobuf.SourceContext.file_name) return _s; @@ -317,7 +322,7 @@ inline void SourceContext::_internal_set_file_name(const std::string& value) { _impl_._has_bits_[0] |= 0x00000001u; _impl_.file_name_.Set(value, GetArena()); } -inline std::string* SourceContext::_internal_mutable_file_name() { +inline std::string* PROTOBUF_NONNULL SourceContext::_internal_mutable_file_name() { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_._has_bits_[0] |= 0x00000001u; return _impl_.file_name_.Mutable( GetArena()); diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc index 1b4e9c63fd..5bb2d310e2 100644 --- a/src/google/protobuf/struct.pb.cc +++ b/src/google/protobuf/struct.pb.cc @@ -122,8 +122,9 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ValueDefaultTypeInternal _Value_default_instance_; } // namespace protobuf } // namespace google -static const ::_pb::EnumDescriptor* file_level_enum_descriptors_google_2fprotobuf_2fstruct_2eproto[1]; -static constexpr const ::_pb::ServiceDescriptor** PROTOBUF_NULLABLE +static const ::_pb::EnumDescriptor* PROTOBUF_NONNULL + file_level_enum_descriptors_google_2fprotobuf_2fstruct_2eproto[1]; +static constexpr const ::_pb::ServiceDescriptor *PROTOBUF_NONNULL *PROTOBUF_NULLABLE file_level_service_descriptors_google_2fprotobuf_2fstruct_2eproto = nullptr; const ::uint32_t TableStruct_google_2fprotobuf_2fstruct_2eproto::offsets[] ABSL_ATTRIBUTE_SECTION_VARIABLE( @@ -182,7 +183,7 @@ static const ::_pbi::MigrationSchema {21, -1, -1, sizeof(::google::protobuf::Value)}, {36, -1, -1, sizeof(::google::protobuf::ListValue)}, }; -static const ::_pb::Message* const file_default_instances[] = { +static const ::_pb::Message* PROTOBUF_NONNULL const file_default_instances[] = { &::google::protobuf::_Struct_FieldsEntry_DoNotUse_default_instance_._instance, &::google::protobuf::_Struct_default_instance_._instance, &::google::protobuf::_Value_default_instance_._instance, @@ -226,7 +227,7 @@ PROTOBUF_CONSTINIT const ::_pbi::DescriptorTable descriptor_table_google_2fproto }; namespace google { namespace protobuf { -const ::google::protobuf::EnumDescriptor* NullValue_descriptor() { +const ::google::protobuf::EnumDescriptor* PROTOBUF_NONNULL NullValue_descriptor() { ::google::protobuf::internal::AssignDescriptors(&descriptor_table_google_2fprotobuf_2fstruct_2eproto); return file_level_enum_descriptors_google_2fprotobuf_2fstruct_2eproto[0]; } @@ -247,8 +248,9 @@ Struct_FieldsEntry_DoNotUse::Struct_FieldsEntry_DoNotUse() : SuperType() {} Struct_FieldsEntry_DoNotUse::Struct_FieldsEntry_DoNotUse(::google::protobuf::Arena* PROTOBUF_NULLABLE arena) : SuperType(arena) {} #endif // PROTOBUF_CUSTOM_VTABLE -inline void* Struct_FieldsEntry_DoNotUse::PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { +inline void* PROTOBUF_NONNULL Struct_FieldsEntry_DoNotUse::PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { return ::new (mem) Struct_FieldsEntry_DoNotUse(arena); } constexpr auto Struct_FieldsEntry_DoNotUse::InternalNewImpl_() { @@ -285,7 +287,7 @@ PROTOBUF_CONSTINIT PROTOBUF_EXPORT Struct_FieldsEntry_DoNotUse_class_data_ = Struct_FieldsEntry_DoNotUse::InternalGenerateClassData_(); -const ::google::protobuf::internal::ClassData* Struct_FieldsEntry_DoNotUse::GetClassData() const { +const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL Struct_FieldsEntry_DoNotUse::GetClassData() const { ::google::protobuf::internal::PrefetchToLocalCache(&Struct_FieldsEntry_DoNotUse_class_data_); ::google::protobuf::internal::PrefetchToLocalCache(Struct_FieldsEntry_DoNotUse_class_data_.tc_table); return Struct_FieldsEntry_DoNotUse_class_data_.base(); @@ -393,8 +395,9 @@ inline void Struct::SharedDtor(MessageLite& self) { this_._impl_.~Impl_(); } -inline void* Struct::PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { +inline void* PROTOBUF_NONNULL Struct::PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { return ::new (mem) Struct(arena); } constexpr auto Struct::InternalNewImpl_() { @@ -445,7 +448,7 @@ PROTOBUF_CONSTINIT PROTOBUF_EXPORT Struct_class_data_ = Struct::InternalGenerateClassData_(); -const ::google::protobuf::internal::ClassData* Struct::GetClassData() const { +const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL Struct::GetClassData() const { ::google::protobuf::internal::PrefetchToLocalCache(&Struct_class_data_); ::google::protobuf::internal::PrefetchToLocalCache(Struct_class_data_.tc_table); return Struct_class_data_.base(); @@ -502,14 +505,14 @@ PROTOBUF_NOINLINE void Struct::Clear() { } #if defined(PROTOBUF_CUSTOM_VTABLE) -::uint8_t* Struct::_InternalSerialize( - const MessageLite& base, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) { +::uint8_t* PROTOBUF_NONNULL Struct::_InternalSerialize( + const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const Struct& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE -::uint8_t* Struct::_InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { +::uint8_t* PROTOBUF_NONNULL Struct::_InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { const Struct& this_ = *this; #endif // PROTOBUF_CUSTOM_VTABLE // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Struct) @@ -603,7 +606,7 @@ void Struct::CopyFrom(const Struct& from) { } -void Struct::InternalSwap(Struct* PROTOBUF_RESTRICT other) { +void Struct::InternalSwap(Struct* PROTOBUF_RESTRICT PROTOBUF_NONNULL other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); _impl_.fields_.InternalSwap(&other->_impl_.fields_); @@ -769,8 +772,9 @@ void Value::clear_kind() { } -inline void* Value::PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { +inline void* PROTOBUF_NONNULL Value::PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { return ::new (mem) Value(arena); } constexpr auto Value::InternalNewImpl_() { @@ -805,7 +809,7 @@ PROTOBUF_CONSTINIT PROTOBUF_EXPORT Value_class_data_ = Value::InternalGenerateClassData_(); -const ::google::protobuf::internal::ClassData* Value::GetClassData() const { +const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL Value::GetClassData() const { ::google::protobuf::internal::PrefetchToLocalCache(&Value_class_data_); ::google::protobuf::internal::PrefetchToLocalCache(Value_class_data_.tc_table); return Value_class_data_.base(); @@ -875,14 +879,14 @@ PROTOBUF_NOINLINE void Value::Clear() { } #if defined(PROTOBUF_CUSTOM_VTABLE) -::uint8_t* Value::_InternalSerialize( - const MessageLite& base, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) { +::uint8_t* PROTOBUF_NONNULL Value::_InternalSerialize( + const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const Value& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE -::uint8_t* Value::_InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { +::uint8_t* PROTOBUF_NONNULL Value::_InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { const Value& this_ = *this; #endif // PROTOBUF_CUSTOM_VTABLE // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Value) @@ -1066,7 +1070,7 @@ void Value::CopyFrom(const Value& from) { } -void Value::InternalSwap(Value* PROTOBUF_RESTRICT other) { +void Value::InternalSwap(Value* PROTOBUF_RESTRICT PROTOBUF_NONNULL other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); swap(_impl_.kind_, other->_impl_.kind_); @@ -1134,8 +1138,9 @@ inline void ListValue::SharedDtor(MessageLite& self) { this_._impl_.~Impl_(); } -inline void* ListValue::PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { +inline void* PROTOBUF_NONNULL ListValue::PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { return ::new (mem) ListValue(arena); } constexpr auto ListValue::InternalNewImpl_() { @@ -1182,7 +1187,7 @@ PROTOBUF_CONSTINIT PROTOBUF_EXPORT ListValue_class_data_ = ListValue::InternalGenerateClassData_(); -const ::google::protobuf::internal::ClassData* ListValue::GetClassData() const { +const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL ListValue::GetClassData() const { ::google::protobuf::internal::PrefetchToLocalCache(&ListValue_class_data_); ::google::protobuf::internal::PrefetchToLocalCache(ListValue_class_data_.tc_table); return ListValue_class_data_.base(); @@ -1235,14 +1240,14 @@ PROTOBUF_NOINLINE void ListValue::Clear() { } #if defined(PROTOBUF_CUSTOM_VTABLE) -::uint8_t* ListValue::_InternalSerialize( - const MessageLite& base, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) { +::uint8_t* PROTOBUF_NONNULL ListValue::_InternalSerialize( + const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const ListValue& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE -::uint8_t* ListValue::_InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { +::uint8_t* PROTOBUF_NONNULL ListValue::_InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { const ListValue& this_ = *this; #endif // PROTOBUF_CUSTOM_VTABLE // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.ListValue) @@ -1318,7 +1323,7 @@ void ListValue::CopyFrom(const ListValue& from) { } -void ListValue::InternalSwap(ListValue* PROTOBUF_RESTRICT other) { +void ListValue::InternalSwap(ListValue* PROTOBUF_RESTRICT PROTOBUF_NONNULL other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); _impl_.values_.InternalSwap(&other->_impl_.values_); diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index 7c513921e8..4ec4390fa9 100644 --- a/src/google/protobuf/struct.pb.h +++ b/src/google/protobuf/struct.pb.h @@ -102,8 +102,7 @@ inline constexpr NullValue NullValue_MIN = inline constexpr NullValue NullValue_MAX = static_cast(0); inline constexpr int NullValue_ARRAYSIZE = 0 + 1; -PROTOBUF_EXPORT const ::google::protobuf::EnumDescriptor* -NullValue_descriptor(); +PROTOBUF_EXPORT const ::google::protobuf::EnumDescriptor* PROTOBUF_NONNULL NullValue_descriptor(); template const std::string& NullValue_Name(T value) { static_assert(std::is_same::value || @@ -117,7 +116,8 @@ inline const std::string& NullValue_Name(NullValue value) { 0, 0>( static_cast(value)); } -inline bool NullValue_Parse(absl::string_view name, NullValue* value) { +inline bool NullValue_Parse( + absl::string_view name, NullValue* PROTOBUF_NONNULL value) { return ::google::protobuf::internal::ParseNamedEnum( NullValue_descriptor(), name, value); } @@ -134,7 +134,7 @@ class PROTOBUF_EXPORT ListValue final : public ::google::protobuf::Message ~ListValue() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - void operator delete(ListValue* msg, std::destroying_delete_t) { + void operator delete(ListValue* PROTOBUF_NONNULL msg, std::destroying_delete_t) { SharedDtor(*msg); ::google::protobuf::internal::SizedDelete(msg, sizeof(ListValue)); } @@ -165,18 +165,18 @@ class PROTOBUF_EXPORT ListValue final : public ::google::protobuf::Message ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); } - inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() + inline ::google::protobuf::UnknownFieldSet* PROTOBUF_NONNULL mutable_unknown_fields() ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); } - static const ::google::protobuf::Descriptor* descriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL descriptor() { return GetDescriptor(); } - static const ::google::protobuf::Descriptor* GetDescriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::google::protobuf::Reflection* GetReflection() { + static const ::google::protobuf::Reflection* PROTOBUF_NONNULL GetReflection() { return default_instance().GetMetadata().reflection; } static const ListValue& default_instance() { @@ -185,7 +185,7 @@ class PROTOBUF_EXPORT ListValue final : public ::google::protobuf::Message } static constexpr int kIndexInFileMessages = 3; friend void swap(ListValue& a, ListValue& b) { a.Swap(&b); } - inline void Swap(ListValue* other) { + inline void Swap(ListValue* PROTOBUF_NONNULL other) { if (other == this) return; if (::google::protobuf::internal::CanUseInternalSwap(GetArena(), other->GetArena())) { InternalSwap(other); @@ -193,7 +193,7 @@ class PROTOBUF_EXPORT ListValue final : public ::google::protobuf::Message ::google::protobuf::internal::GenericSwap(this, other); } } - void UnsafeArenaSwap(ListValue* other) { + void UnsafeArenaSwap(ListValue* PROTOBUF_NONNULL other) { if (other == this) return; ABSL_DCHECK(GetArena() == other->GetArena()); InternalSwap(other); @@ -201,7 +201,8 @@ class PROTOBUF_EXPORT ListValue final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - ListValue* New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + ListValue* PROTOBUF_NONNULL + New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -222,29 +223,31 @@ class PROTOBUF_EXPORT ListValue final : public ::google::protobuf::Message #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); + static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { + ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL + 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; + ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL + stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: void SharedCtor(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); static void SharedDtor(MessageLite& self); - void InternalSwap(ListValue* other); + void InternalSwap(ListValue* PROTOBUF_NONNULL other); private: template friend ::absl::string_view( @@ -260,9 +263,10 @@ class PROTOBUF_EXPORT ListValue final : public ::google::protobuf::Message : ListValue(arena) { *this = ::std::move(from); } - const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL; - static void* PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); + const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL GetClassData() const PROTOBUF_FINAL; + static void* PROTOBUF_NONNULL PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); static constexpr auto InternalNewImpl_(); public: @@ -282,15 +286,15 @@ class PROTOBUF_EXPORT ListValue final : public ::google::protobuf::Message public: void clear_values() ; - ::google::protobuf::Value* mutable_values(int index); - ::google::protobuf::RepeatedPtrField<::google::protobuf::Value>* mutable_values(); + ::google::protobuf::Value* PROTOBUF_NONNULL mutable_values(int index); + ::google::protobuf::RepeatedPtrField<::google::protobuf::Value>* PROTOBUF_NONNULL mutable_values(); private: const ::google::protobuf::RepeatedPtrField<::google::protobuf::Value>& _internal_values() const; - ::google::protobuf::RepeatedPtrField<::google::protobuf::Value>* _internal_mutable_values(); + ::google::protobuf::RepeatedPtrField<::google::protobuf::Value>* PROTOBUF_NONNULL _internal_mutable_values(); public: const ::google::protobuf::Value& values(int index) const; - ::google::protobuf::Value* add_values(); + ::google::protobuf::Value* PROTOBUF_NONNULL add_values(); const ::google::protobuf::RepeatedPtrField<::google::protobuf::Value>& values() const; // @@protoc_insertion_point(class_scope:google.protobuf.ListValue) private: @@ -335,7 +339,7 @@ class PROTOBUF_EXPORT Struct final : public ::google::protobuf::Message ~Struct() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - void operator delete(Struct* msg, std::destroying_delete_t) { + void operator delete(Struct* PROTOBUF_NONNULL msg, std::destroying_delete_t) { SharedDtor(*msg); ::google::protobuf::internal::SizedDelete(msg, sizeof(Struct)); } @@ -366,18 +370,18 @@ class PROTOBUF_EXPORT Struct final : public ::google::protobuf::Message ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); } - inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() + inline ::google::protobuf::UnknownFieldSet* PROTOBUF_NONNULL mutable_unknown_fields() ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); } - static const ::google::protobuf::Descriptor* descriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL descriptor() { return GetDescriptor(); } - static const ::google::protobuf::Descriptor* GetDescriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::google::protobuf::Reflection* GetReflection() { + static const ::google::protobuf::Reflection* PROTOBUF_NONNULL GetReflection() { return default_instance().GetMetadata().reflection; } static const Struct& default_instance() { @@ -386,7 +390,7 @@ class PROTOBUF_EXPORT Struct final : public ::google::protobuf::Message } static constexpr int kIndexInFileMessages = 1; friend void swap(Struct& a, Struct& b) { a.Swap(&b); } - inline void Swap(Struct* other) { + inline void Swap(Struct* PROTOBUF_NONNULL other) { if (other == this) return; if (::google::protobuf::internal::CanUseInternalSwap(GetArena(), other->GetArena())) { InternalSwap(other); @@ -394,7 +398,7 @@ class PROTOBUF_EXPORT Struct final : public ::google::protobuf::Message ::google::protobuf::internal::GenericSwap(this, other); } } - void UnsafeArenaSwap(Struct* other) { + void UnsafeArenaSwap(Struct* PROTOBUF_NONNULL other) { if (other == this) return; ABSL_DCHECK(GetArena() == other->GetArena()); InternalSwap(other); @@ -402,7 +406,8 @@ class PROTOBUF_EXPORT Struct final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - Struct* New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + Struct* PROTOBUF_NONNULL + New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -423,29 +428,31 @@ class PROTOBUF_EXPORT Struct final : public ::google::protobuf::Message #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); + static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { + ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL + 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; + ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL + stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: void SharedCtor(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); static void SharedDtor(MessageLite& self); - void InternalSwap(Struct* other); + void InternalSwap(Struct* PROTOBUF_NONNULL other); private: template friend ::absl::string_view( @@ -461,9 +468,10 @@ class PROTOBUF_EXPORT Struct final : public ::google::protobuf::Message : Struct(arena) { *this = ::std::move(from); } - const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL; - static void* PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); + const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL GetClassData() const PROTOBUF_FINAL; + static void* PROTOBUF_NONNULL PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); static constexpr auto InternalNewImpl_(); public: @@ -484,11 +492,11 @@ class PROTOBUF_EXPORT Struct final : public ::google::protobuf::Message public: void clear_fields() ; const ::google::protobuf::Map& fields() const; - ::google::protobuf::Map* mutable_fields(); + ::google::protobuf::Map* PROTOBUF_NONNULL mutable_fields(); private: const ::google::protobuf::Map& _internal_fields() const; - ::google::protobuf::Map* _internal_mutable_fields(); + ::google::protobuf::Map* PROTOBUF_NONNULL _internal_mutable_fields(); public: // @@protoc_insertion_point(class_scope:google.protobuf.Struct) @@ -545,7 +553,7 @@ class Struct_FieldsEntry_DoNotUse final explicit PROTOBUF_CONSTEXPR Struct_FieldsEntry_DoNotUse( ::google::protobuf::internal::ConstantInitialized); explicit Struct_FieldsEntry_DoNotUse(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); - static const Struct_FieldsEntry_DoNotUse* internal_default_instance() { + static const Struct_FieldsEntry_DoNotUse* PROTOBUF_NONNULL internal_default_instance() { return reinterpret_cast( &_Struct_FieldsEntry_DoNotUse_default_instance_); } @@ -563,9 +571,10 @@ class Struct_FieldsEntry_DoNotUse final 46, 2> _table_; - const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL; - static void* PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); + const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL GetClassData() const PROTOBUF_FINAL; + static void* PROTOBUF_NONNULL PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); static constexpr auto InternalNewImpl_(); }; PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull Struct_FieldsEntry_DoNotUse_class_data_; @@ -578,7 +587,7 @@ class PROTOBUF_EXPORT Value final : public ::google::protobuf::Message ~Value() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - void operator delete(Value* msg, std::destroying_delete_t) { + void operator delete(Value* PROTOBUF_NONNULL msg, std::destroying_delete_t) { SharedDtor(*msg); ::google::protobuf::internal::SizedDelete(msg, sizeof(Value)); } @@ -609,18 +618,18 @@ class PROTOBUF_EXPORT Value final : public ::google::protobuf::Message ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); } - inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() + inline ::google::protobuf::UnknownFieldSet* PROTOBUF_NONNULL mutable_unknown_fields() ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); } - static const ::google::protobuf::Descriptor* descriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL descriptor() { return GetDescriptor(); } - static const ::google::protobuf::Descriptor* GetDescriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::google::protobuf::Reflection* GetReflection() { + static const ::google::protobuf::Reflection* PROTOBUF_NONNULL GetReflection() { return default_instance().GetMetadata().reflection; } static const Value& default_instance() { @@ -638,7 +647,7 @@ class PROTOBUF_EXPORT Value final : public ::google::protobuf::Message }; static constexpr int kIndexInFileMessages = 2; friend void swap(Value& a, Value& b) { a.Swap(&b); } - inline void Swap(Value* other) { + inline void Swap(Value* PROTOBUF_NONNULL other) { if (other == this) return; if (::google::protobuf::internal::CanUseInternalSwap(GetArena(), other->GetArena())) { InternalSwap(other); @@ -646,7 +655,7 @@ class PROTOBUF_EXPORT Value final : public ::google::protobuf::Message ::google::protobuf::internal::GenericSwap(this, other); } } - void UnsafeArenaSwap(Value* other) { + void UnsafeArenaSwap(Value* PROTOBUF_NONNULL other) { if (other == this) return; ABSL_DCHECK(GetArena() == other->GetArena()); InternalSwap(other); @@ -654,7 +663,8 @@ class PROTOBUF_EXPORT Value final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - Value* New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + Value* PROTOBUF_NONNULL + New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -675,29 +685,31 @@ class PROTOBUF_EXPORT Value final : public ::google::protobuf::Message #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); + static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { + ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL + 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; + ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL + stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: void SharedCtor(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); static void SharedDtor(MessageLite& self); - void InternalSwap(Value* other); + void InternalSwap(Value* PROTOBUF_NONNULL other); private: template friend ::absl::string_view( @@ -713,9 +725,10 @@ class PROTOBUF_EXPORT Value final : public ::google::protobuf::Message : Value(arena) { *this = ::std::move(from); } - const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL; - static void* PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); + const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL GetClassData() const PROTOBUF_FINAL; + static void* PROTOBUF_NONNULL PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); static constexpr auto InternalNewImpl_(); public: @@ -761,14 +774,14 @@ class PROTOBUF_EXPORT Value final : public ::google::protobuf::Message const std::string& string_value() const; template void set_string_value(Arg_&& arg, Args_... args); - std::string* mutable_string_value(); + std::string* PROTOBUF_NONNULL mutable_string_value(); [[nodiscard]] std::string* PROTOBUF_NULLABLE release_string_value(); void set_allocated_string_value(std::string* PROTOBUF_NULLABLE value); private: const std::string& _internal_string_value() const; PROTOBUF_ALWAYS_INLINE void _internal_set_string_value(const std::string& value); - std::string* _internal_mutable_string_value(); + std::string* PROTOBUF_NONNULL _internal_mutable_string_value(); public: // bool bool_value = 4; @@ -791,14 +804,14 @@ class PROTOBUF_EXPORT Value final : public ::google::protobuf::Message void clear_struct_value() ; const ::google::protobuf::Struct& struct_value() const; [[nodiscard]] ::google::protobuf::Struct* PROTOBUF_NULLABLE release_struct_value(); - ::google::protobuf::Struct* mutable_struct_value(); + ::google::protobuf::Struct* PROTOBUF_NONNULL mutable_struct_value(); void set_allocated_struct_value(::google::protobuf::Struct* PROTOBUF_NULLABLE value); void unsafe_arena_set_allocated_struct_value(::google::protobuf::Struct* PROTOBUF_NULLABLE value); ::google::protobuf::Struct* PROTOBUF_NULLABLE unsafe_arena_release_struct_value(); private: const ::google::protobuf::Struct& _internal_struct_value() const; - ::google::protobuf::Struct* _internal_mutable_struct_value(); + ::google::protobuf::Struct* PROTOBUF_NONNULL _internal_mutable_struct_value(); public: // .google.protobuf.ListValue list_value = 6; @@ -810,14 +823,14 @@ class PROTOBUF_EXPORT Value final : public ::google::protobuf::Message void clear_list_value() ; const ::google::protobuf::ListValue& list_value() const; [[nodiscard]] ::google::protobuf::ListValue* PROTOBUF_NULLABLE release_list_value(); - ::google::protobuf::ListValue* mutable_list_value(); + ::google::protobuf::ListValue* PROTOBUF_NONNULL mutable_list_value(); void set_allocated_list_value(::google::protobuf::ListValue* PROTOBUF_NULLABLE value); void unsafe_arena_set_allocated_list_value(::google::protobuf::ListValue* PROTOBUF_NULLABLE value); ::google::protobuf::ListValue* PROTOBUF_NULLABLE unsafe_arena_release_list_value(); private: const ::google::protobuf::ListValue& _internal_list_value() const; - ::google::protobuf::ListValue* _internal_mutable_list_value(); + ::google::protobuf::ListValue* PROTOBUF_NONNULL _internal_mutable_list_value(); public: void clear_kind(); @@ -912,11 +925,12 @@ inline const ::google::protobuf::Map& St // @@protoc_insertion_point(field_map:google.protobuf.Struct.fields) return _internal_fields(); } -inline ::google::protobuf::Map* Struct::_internal_mutable_fields() { +inline ::google::protobuf::Map* PROTOBUF_NONNULL Struct::_internal_mutable_fields() { ::google::protobuf::internal::TSanWrite(&_impl_); return _impl_.fields_.MutableMap(); } -inline ::google::protobuf::Map* Struct::mutable_fields() ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline ::google::protobuf::Map* PROTOBUF_NONNULL Struct::mutable_fields() + ABSL_ATTRIBUTE_LIFETIME_BOUND { // @@protoc_insertion_point(field_mutable_map:google.protobuf.Struct.fields) return _internal_mutable_fields(); } @@ -1022,7 +1036,8 @@ PROTOBUF_ALWAYS_INLINE void Value::set_string_value(Arg_&& arg, Args_... args) { _impl_.kind_.string_value_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.Value.string_value) } -inline std::string* Value::mutable_string_value() ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline std::string* PROTOBUF_NONNULL Value::mutable_string_value() + ABSL_ATTRIBUTE_LIFETIME_BOUND { std::string* _s = _internal_mutable_string_value(); // @@protoc_insertion_point(field_mutable:google.protobuf.Value.string_value) return _s; @@ -1044,7 +1059,7 @@ inline void Value::_internal_set_string_value(const std::string& value) { } _impl_.kind_.string_value_.Set(value, GetArena()); } -inline std::string* Value::_internal_mutable_string_value() { +inline std::string* PROTOBUF_NONNULL Value::_internal_mutable_string_value() { ::google::protobuf::internal::TSanWrite(&_impl_); if (kind_case() != kStringValue) { clear_kind(); @@ -1173,7 +1188,7 @@ inline void Value::unsafe_arena_set_allocated_struct_value( } // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Value.struct_value) } -inline ::google::protobuf::Struct* Value::_internal_mutable_struct_value() { +inline ::google::protobuf::Struct* PROTOBUF_NONNULL Value::_internal_mutable_struct_value() { if (kind_case() != kStructValue) { clear_kind(); set_has_struct_value(); @@ -1182,7 +1197,8 @@ inline ::google::protobuf::Struct* Value::_internal_mutable_struct_value() { } return _impl_.kind_.struct_value_; } -inline ::google::protobuf::Struct* Value::mutable_struct_value() ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline ::google::protobuf::Struct* PROTOBUF_NONNULL Value::mutable_struct_value() + ABSL_ATTRIBUTE_LIFETIME_BOUND { ::google::protobuf::Struct* _msg = _internal_mutable_struct_value(); // @@protoc_insertion_point(field_mutable:google.protobuf.Value.struct_value) return _msg; @@ -1253,7 +1269,7 @@ inline void Value::unsafe_arena_set_allocated_list_value( } // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Value.list_value) } -inline ::google::protobuf::ListValue* Value::_internal_mutable_list_value() { +inline ::google::protobuf::ListValue* PROTOBUF_NONNULL Value::_internal_mutable_list_value() { if (kind_case() != kListValue) { clear_kind(); set_has_list_value(); @@ -1262,7 +1278,8 @@ inline ::google::protobuf::ListValue* Value::_internal_mutable_list_value() { } return _impl_.kind_.list_value_; } -inline ::google::protobuf::ListValue* Value::mutable_list_value() ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline ::google::protobuf::ListValue* PROTOBUF_NONNULL Value::mutable_list_value() + ABSL_ATTRIBUTE_LIFETIME_BOUND { ::google::protobuf::ListValue* _msg = _internal_mutable_list_value(); // @@protoc_insertion_point(field_mutable:google.protobuf.Value.list_value) return _msg; @@ -1292,12 +1309,12 @@ inline void ListValue::clear_values() { ::google::protobuf::internal::TSanWrite(&_impl_); _impl_.values_.Clear(); } -inline ::google::protobuf::Value* ListValue::mutable_values(int index) +inline ::google::protobuf::Value* PROTOBUF_NONNULL ListValue::mutable_values(int index) ABSL_ATTRIBUTE_LIFETIME_BOUND { // @@protoc_insertion_point(field_mutable:google.protobuf.ListValue.values) return _internal_mutable_values()->Mutable(index); } -inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Value>* ListValue::mutable_values() +inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Value>* PROTOBUF_NONNULL ListValue::mutable_values() ABSL_ATTRIBUTE_LIFETIME_BOUND { // @@protoc_insertion_point(field_mutable_list:google.protobuf.ListValue.values) ::google::protobuf::internal::TSanWrite(&_impl_); @@ -1308,7 +1325,8 @@ inline const ::google::protobuf::Value& ListValue::values(int index) const // @@protoc_insertion_point(field_get:google.protobuf.ListValue.values) return _internal_values().Get(index); } -inline ::google::protobuf::Value* ListValue::add_values() ABSL_ATTRIBUTE_LIFETIME_BOUND { +inline ::google::protobuf::Value* PROTOBUF_NONNULL ListValue::add_values() + ABSL_ATTRIBUTE_LIFETIME_BOUND { ::google::protobuf::internal::TSanWrite(&_impl_); ::google::protobuf::Value* _add = _internal_mutable_values()->Add(); // @@protoc_insertion_point(field_add:google.protobuf.ListValue.values) @@ -1324,7 +1342,7 @@ ListValue::_internal_values() const { ::google::protobuf::internal::TSanRead(&_impl_); return _impl_.values_; } -inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Value>* +inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Value>* PROTOBUF_NONNULL ListValue::_internal_mutable_values() { ::google::protobuf::internal::TSanRead(&_impl_); return &_impl_.values_; @@ -1345,7 +1363,7 @@ namespace protobuf { template <> struct is_proto_enum<::google::protobuf::NullValue> : std::true_type {}; template <> -inline const EnumDescriptor* GetEnumDescriptor<::google::protobuf::NullValue>() { +inline const EnumDescriptor* PROTOBUF_NONNULL GetEnumDescriptor<::google::protobuf::NullValue>() { return ::google::protobuf::NullValue_descriptor(); } diff --git a/src/google/protobuf/timestamp.pb.cc b/src/google/protobuf/timestamp.pb.cc index 3af4431373..c683f3acfa 100644 --- a/src/google/protobuf/timestamp.pb.cc +++ b/src/google/protobuf/timestamp.pb.cc @@ -54,9 +54,9 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 TimestampDefaultTypeInternal _Timestamp_default_instance_; } // namespace protobuf } // namespace google -static constexpr const ::_pb::EnumDescriptor** PROTOBUF_NULLABLE +static constexpr const ::_pb::EnumDescriptor *PROTOBUF_NONNULL *PROTOBUF_NULLABLE file_level_enum_descriptors_google_2fprotobuf_2ftimestamp_2eproto = nullptr; -static constexpr const ::_pb::ServiceDescriptor** PROTOBUF_NULLABLE +static constexpr const ::_pb::ServiceDescriptor *PROTOBUF_NONNULL *PROTOBUF_NULLABLE file_level_service_descriptors_google_2fprotobuf_2ftimestamp_2eproto = nullptr; const ::uint32_t TableStruct_google_2fprotobuf_2ftimestamp_2eproto::offsets[] ABSL_ATTRIBUTE_SECTION_VARIABLE( @@ -79,7 +79,7 @@ static const ::_pbi::MigrationSchema schemas[] ABSL_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = { {0, 10, -1, sizeof(::google::protobuf::Timestamp)}, }; -static const ::_pb::Message* const file_default_instances[] = { +static const ::_pb::Message* PROTOBUF_NONNULL const file_default_instances[] = { &::google::protobuf::_Timestamp_default_instance_._instance, }; const char descriptor_table_protodef_google_2fprotobuf_2ftimestamp_2eproto[] ABSL_ATTRIBUTE_SECTION_VARIABLE( @@ -165,8 +165,9 @@ inline void Timestamp::SharedDtor(MessageLite& self) { this_._impl_.~Impl_(); } -inline void* Timestamp::PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { +inline void* PROTOBUF_NONNULL Timestamp::PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { return ::new (mem) Timestamp(arena); } constexpr auto Timestamp::InternalNewImpl_() { @@ -201,7 +202,7 @@ PROTOBUF_CONSTINIT PROTOBUF_EXPORT Timestamp_class_data_ = Timestamp::InternalGenerateClassData_(); -const ::google::protobuf::internal::ClassData* Timestamp::GetClassData() const { +const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL Timestamp::GetClassData() const { ::google::protobuf::internal::PrefetchToLocalCache(&Timestamp_class_data_); ::google::protobuf::internal::PrefetchToLocalCache(Timestamp_class_data_.tc_table); return Timestamp_class_data_.base(); @@ -264,14 +265,14 @@ PROTOBUF_NOINLINE void Timestamp::Clear() { } #if defined(PROTOBUF_CUSTOM_VTABLE) -::uint8_t* Timestamp::_InternalSerialize( - const MessageLite& base, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) { +::uint8_t* PROTOBUF_NONNULL Timestamp::_InternalSerialize( + const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const Timestamp& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE -::uint8_t* Timestamp::_InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { +::uint8_t* PROTOBUF_NONNULL Timestamp::_InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { const Timestamp& this_ = *this; #endif // PROTOBUF_CUSTOM_VTABLE // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Timestamp) @@ -374,7 +375,7 @@ void Timestamp::CopyFrom(const Timestamp& from) { } -void Timestamp::InternalSwap(Timestamp* PROTOBUF_RESTRICT other) { +void Timestamp::InternalSwap(Timestamp* PROTOBUF_RESTRICT PROTOBUF_NONNULL other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h index a92e8c9a97..15788c006e 100644 --- a/src/google/protobuf/timestamp.pb.h +++ b/src/google/protobuf/timestamp.pb.h @@ -77,7 +77,7 @@ class PROTOBUF_EXPORT Timestamp final : public ::google::protobuf::Message ~Timestamp() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - void operator delete(Timestamp* msg, std::destroying_delete_t) { + void operator delete(Timestamp* PROTOBUF_NONNULL msg, std::destroying_delete_t) { SharedDtor(*msg); ::google::protobuf::internal::SizedDelete(msg, sizeof(Timestamp)); } @@ -108,18 +108,18 @@ class PROTOBUF_EXPORT Timestamp final : public ::google::protobuf::Message ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); } - inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() + inline ::google::protobuf::UnknownFieldSet* PROTOBUF_NONNULL mutable_unknown_fields() ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); } - static const ::google::protobuf::Descriptor* descriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL descriptor() { return GetDescriptor(); } - static const ::google::protobuf::Descriptor* GetDescriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::google::protobuf::Reflection* GetReflection() { + static const ::google::protobuf::Reflection* PROTOBUF_NONNULL GetReflection() { return default_instance().GetMetadata().reflection; } static const Timestamp& default_instance() { @@ -128,7 +128,7 @@ class PROTOBUF_EXPORT Timestamp final : public ::google::protobuf::Message } static constexpr int kIndexInFileMessages = 0; friend void swap(Timestamp& a, Timestamp& b) { a.Swap(&b); } - inline void Swap(Timestamp* other) { + inline void Swap(Timestamp* PROTOBUF_NONNULL other) { if (other == this) return; if (::google::protobuf::internal::CanUseInternalSwap(GetArena(), other->GetArena())) { InternalSwap(other); @@ -136,7 +136,7 @@ class PROTOBUF_EXPORT Timestamp final : public ::google::protobuf::Message ::google::protobuf::internal::GenericSwap(this, other); } } - void UnsafeArenaSwap(Timestamp* other) { + void UnsafeArenaSwap(Timestamp* PROTOBUF_NONNULL other) { if (other == this) return; ABSL_DCHECK(GetArena() == other->GetArena()); InternalSwap(other); @@ -144,7 +144,8 @@ class PROTOBUF_EXPORT Timestamp final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - Timestamp* New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + Timestamp* PROTOBUF_NONNULL + New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct(arena); } using ::google::protobuf::Message::CopyFrom; @@ -165,29 +166,31 @@ class PROTOBUF_EXPORT Timestamp final : public ::google::protobuf::Message #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); + static ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + const MessageLite& msg, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream); public: ::size_t ByteSizeLong() const { return ByteSizeLong(*this); } - ::uint8_t* _InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { + ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL + 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; + ::uint8_t* PROTOBUF_NONNULL _InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL + stream) const final; #endif // PROTOBUF_CUSTOM_VTABLE int GetCachedSize() const { return _impl_._cached_size_.Get(); } private: void SharedCtor(::google::protobuf::Arena* PROTOBUF_NULLABLE arena); static void SharedDtor(MessageLite& self); - void InternalSwap(Timestamp* other); + void InternalSwap(Timestamp* PROTOBUF_NONNULL other); private: template friend ::absl::string_view( @@ -203,9 +206,10 @@ class PROTOBUF_EXPORT Timestamp final : public ::google::protobuf::Message : Timestamp(arena) { *this = ::std::move(from); } - const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL; - static void* PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); + const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL GetClassData() const PROTOBUF_FINAL; + static void* PROTOBUF_NONNULL PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena); static constexpr auto InternalNewImpl_(); public: diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc index 033bf854cc..dced5a2c01 100644 --- a/src/google/protobuf/type.pb.cc +++ b/src/google/protobuf/type.pb.cc @@ -196,8 +196,9 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EnumDefaultTypeInternal _Enum_default_instance_; } // namespace protobuf } // namespace google -static const ::_pb::EnumDescriptor* file_level_enum_descriptors_google_2fprotobuf_2ftype_2eproto[3]; -static constexpr const ::_pb::ServiceDescriptor** PROTOBUF_NULLABLE +static const ::_pb::EnumDescriptor* PROTOBUF_NONNULL + file_level_enum_descriptors_google_2fprotobuf_2ftype_2eproto[3]; +static constexpr const ::_pb::ServiceDescriptor *PROTOBUF_NONNULL *PROTOBUF_NULLABLE file_level_service_descriptors_google_2fprotobuf_2ftype_2eproto = nullptr; const ::uint32_t TableStruct_google_2fprotobuf_2ftype_2eproto::offsets[] ABSL_ATTRIBUTE_SECTION_VARIABLE( @@ -308,7 +309,7 @@ static const ::_pbi::MigrationSchema {70, 81, -1, sizeof(::google::protobuf::EnumValue)}, {84, 94, -1, sizeof(::google::protobuf::Option)}, }; -static const ::_pb::Message* const file_default_instances[] = { +static const ::_pb::Message* PROTOBUF_NONNULL const file_default_instances[] = { &::google::protobuf::_Type_default_instance_._instance, &::google::protobuf::_Field_default_instance_._instance, &::google::protobuf::_Enum_default_instance_._instance, @@ -360,8 +361,8 @@ const char descriptor_table_protodef_google_2fprotobuf_2ftype_2eproto[] ABSL_ATT "\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypesb" "\006proto3" }; -static const ::_pbi::DescriptorTable* const descriptor_table_google_2fprotobuf_2ftype_2eproto_deps[2] = - { +static const ::_pbi::DescriptorTable* PROTOBUF_NONNULL const + descriptor_table_google_2fprotobuf_2ftype_2eproto_deps[2] = { &::descriptor_table_google_2fprotobuf_2fany_2eproto, &::descriptor_table_google_2fprotobuf_2fsource_5fcontext_2eproto, }; @@ -384,7 +385,7 @@ PROTOBUF_CONSTINIT const ::_pbi::DescriptorTable descriptor_table_google_2fproto }; namespace google { namespace protobuf { -const ::google::protobuf::EnumDescriptor* Field_Kind_descriptor() { +const ::google::protobuf::EnumDescriptor* PROTOBUF_NONNULL Field_Kind_descriptor() { ::google::protobuf::internal::AssignDescriptors(&descriptor_table_google_2fprotobuf_2ftype_2eproto); return file_level_enum_descriptors_google_2fprotobuf_2ftype_2eproto[0]; } @@ -393,7 +394,7 @@ PROTOBUF_CONSTINIT const uint32_t Field_Kind_internal_data_[] = { bool Field_Kind_IsValid(int value) { return 0 <= value && value <= 18; } -const ::google::protobuf::EnumDescriptor* Field_Cardinality_descriptor() { +const ::google::protobuf::EnumDescriptor* PROTOBUF_NONNULL Field_Cardinality_descriptor() { ::google::protobuf::internal::AssignDescriptors(&descriptor_table_google_2fprotobuf_2ftype_2eproto); return file_level_enum_descriptors_google_2fprotobuf_2ftype_2eproto[1]; } @@ -402,7 +403,7 @@ PROTOBUF_CONSTINIT const uint32_t Field_Cardinality_internal_data_[] = { bool Field_Cardinality_IsValid(int value) { return 0 <= value && value <= 3; } -const ::google::protobuf::EnumDescriptor* Syntax_descriptor() { +const ::google::protobuf::EnumDescriptor* PROTOBUF_NONNULL Syntax_descriptor() { ::google::protobuf::internal::AssignDescriptors(&descriptor_table_google_2fprotobuf_2ftype_2eproto); return file_level_enum_descriptors_google_2fprotobuf_2ftype_2eproto[2]; } @@ -501,8 +502,9 @@ inline void Type::SharedDtor(MessageLite& self) { this_._impl_.~Impl_(); } -inline void* Type::PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { +inline void* PROTOBUF_NONNULL Type::PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { return ::new (mem) Type(arena); } constexpr auto Type::InternalNewImpl_() { @@ -557,7 +559,7 @@ PROTOBUF_CONSTINIT PROTOBUF_EXPORT Type_class_data_ = Type::InternalGenerateClassData_(); -const ::google::protobuf::internal::ClassData* Type::GetClassData() const { +const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL Type::GetClassData() const { ::google::protobuf::internal::PrefetchToLocalCache(&Type_class_data_); ::google::protobuf::internal::PrefetchToLocalCache(Type_class_data_.tc_table); return Type_class_data_.base(); @@ -671,14 +673,14 @@ PROTOBUF_NOINLINE void Type::Clear() { } #if defined(PROTOBUF_CUSTOM_VTABLE) -::uint8_t* Type::_InternalSerialize( - const MessageLite& base, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) { +::uint8_t* PROTOBUF_NONNULL Type::_InternalSerialize( + const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const Type& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE -::uint8_t* Type::_InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { +::uint8_t* PROTOBUF_NONNULL Type::_InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { const Type& this_ = *this; #endif // PROTOBUF_CUSTOM_VTABLE // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Type) @@ -894,7 +896,7 @@ void Type::CopyFrom(const Type& from) { } -void Type::InternalSwap(Type* PROTOBUF_RESTRICT other) { +void Type::InternalSwap(Type* PROTOBUF_RESTRICT PROTOBUF_NONNULL other) { using std::swap; auto* arena = GetArena(); ABSL_DCHECK_EQ(arena, other->GetArena()); @@ -1004,8 +1006,9 @@ inline void Field::SharedDtor(MessageLite& self) { this_._impl_.~Impl_(); } -inline void* Field::PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { +inline void* PROTOBUF_NONNULL Field::PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { return ::new (mem) Field(arena); } constexpr auto Field::InternalNewImpl_() { @@ -1052,7 +1055,7 @@ PROTOBUF_CONSTINIT PROTOBUF_EXPORT Field_class_data_ = Field::InternalGenerateClassData_(); -const ::google::protobuf::internal::ClassData* Field::GetClassData() const { +const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL Field::GetClassData() const { ::google::protobuf::internal::PrefetchToLocalCache(&Field_class_data_); ::google::protobuf::internal::PrefetchToLocalCache(Field_class_data_.tc_table); return Field_class_data_.base(); @@ -1193,14 +1196,14 @@ PROTOBUF_NOINLINE void Field::Clear() { } #if defined(PROTOBUF_CUSTOM_VTABLE) -::uint8_t* Field::_InternalSerialize( - const MessageLite& base, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) { +::uint8_t* PROTOBUF_NONNULL Field::_InternalSerialize( + const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const Field& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE -::uint8_t* Field::_InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { +::uint8_t* PROTOBUF_NONNULL Field::_InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { const Field& this_ = *this; #endif // PROTOBUF_CUSTOM_VTABLE // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Field) @@ -1493,7 +1496,7 @@ void Field::CopyFrom(const Field& from) { } -void Field::InternalSwap(Field* PROTOBUF_RESTRICT other) { +void Field::InternalSwap(Field* PROTOBUF_RESTRICT PROTOBUF_NONNULL other) { using std::swap; auto* arena = GetArena(); ABSL_DCHECK_EQ(arena, other->GetArena()); @@ -1603,8 +1606,9 @@ inline void Enum::SharedDtor(MessageLite& self) { this_._impl_.~Impl_(); } -inline void* Enum::PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { +inline void* PROTOBUF_NONNULL Enum::PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { return ::new (mem) Enum(arena); } constexpr auto Enum::InternalNewImpl_() { @@ -1655,7 +1659,7 @@ PROTOBUF_CONSTINIT PROTOBUF_EXPORT Enum_class_data_ = Enum::InternalGenerateClassData_(); -const ::google::protobuf::internal::ClassData* Enum::GetClassData() const { +const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL Enum::GetClassData() const { ::google::protobuf::internal::PrefetchToLocalCache(&Enum_class_data_); ::google::protobuf::internal::PrefetchToLocalCache(Enum_class_data_.tc_table); return Enum_class_data_.base(); @@ -1762,14 +1766,14 @@ PROTOBUF_NOINLINE void Enum::Clear() { } #if defined(PROTOBUF_CUSTOM_VTABLE) -::uint8_t* Enum::_InternalSerialize( - const MessageLite& base, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) { +::uint8_t* PROTOBUF_NONNULL Enum::_InternalSerialize( + const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const Enum& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE -::uint8_t* Enum::_InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { +::uint8_t* PROTOBUF_NONNULL Enum::_InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { const Enum& this_ = *this; #endif // PROTOBUF_CUSTOM_VTABLE // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Enum) @@ -1967,7 +1971,7 @@ void Enum::CopyFrom(const Enum& from) { } -void Enum::InternalSwap(Enum* PROTOBUF_RESTRICT other) { +void Enum::InternalSwap(Enum* PROTOBUF_RESTRICT PROTOBUF_NONNULL other) { using std::swap; auto* arena = GetArena(); ABSL_DCHECK_EQ(arena, other->GetArena()); @@ -2056,8 +2060,9 @@ inline void EnumValue::SharedDtor(MessageLite& self) { this_._impl_.~Impl_(); } -inline void* EnumValue::PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { +inline void* PROTOBUF_NONNULL EnumValue::PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { return ::new (mem) EnumValue(arena); } constexpr auto EnumValue::InternalNewImpl_() { @@ -2104,7 +2109,7 @@ PROTOBUF_CONSTINIT PROTOBUF_EXPORT EnumValue_class_data_ = EnumValue::InternalGenerateClassData_(); -const ::google::protobuf::internal::ClassData* EnumValue::GetClassData() const { +const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL EnumValue::GetClassData() const { ::google::protobuf::internal::PrefetchToLocalCache(&EnumValue_class_data_); ::google::protobuf::internal::PrefetchToLocalCache(EnumValue_class_data_.tc_table); return EnumValue_class_data_.base(); @@ -2179,14 +2184,14 @@ PROTOBUF_NOINLINE void EnumValue::Clear() { } #if defined(PROTOBUF_CUSTOM_VTABLE) -::uint8_t* EnumValue::_InternalSerialize( - const MessageLite& base, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) { +::uint8_t* PROTOBUF_NONNULL EnumValue::_InternalSerialize( + const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const EnumValue& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE -::uint8_t* EnumValue::_InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { +::uint8_t* PROTOBUF_NONNULL EnumValue::_InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { const EnumValue& this_ = *this; #endif // PROTOBUF_CUSTOM_VTABLE // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumValue) @@ -2316,7 +2321,7 @@ void EnumValue::CopyFrom(const EnumValue& from) { } -void EnumValue::InternalSwap(EnumValue* PROTOBUF_RESTRICT other) { +void EnumValue::InternalSwap(EnumValue* PROTOBUF_RESTRICT PROTOBUF_NONNULL other) { using std::swap; auto* arena = GetArena(); ABSL_DCHECK_EQ(arena, other->GetArena()); @@ -2405,8 +2410,9 @@ inline void Option::SharedDtor(MessageLite& self) { this_._impl_.~Impl_(); } -inline void* Option::PlacementNew_( - const void*, void* mem, ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { +inline void* PROTOBUF_NONNULL Option::PlacementNew_( + const void* PROTOBUF_NONNULL, void* PROTOBUF_NONNULL mem, + ::google::protobuf::Arena* PROTOBUF_NULLABLE arena) { return ::new (mem) Option(arena); } constexpr auto Option::InternalNewImpl_() { @@ -2441,7 +2447,7 @@ PROTOBUF_CONSTINIT PROTOBUF_EXPORT Option_class_data_ = Option::InternalGenerateClassData_(); -const ::google::protobuf::internal::ClassData* Option::GetClassData() const { +const ::google::protobuf::internal::ClassData* PROTOBUF_NONNULL Option::GetClassData() const { ::google::protobuf::internal::PrefetchToLocalCache(&Option_class_data_); ::google::protobuf::internal::PrefetchToLocalCache(Option_class_data_.tc_table); return Option_class_data_.base(); @@ -2513,14 +2519,14 @@ PROTOBUF_NOINLINE void Option::Clear() { } #if defined(PROTOBUF_CUSTOM_VTABLE) -::uint8_t* Option::_InternalSerialize( - const MessageLite& base, ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) { +::uint8_t* PROTOBUF_NONNULL Option::_InternalSerialize( + const MessageLite& base, ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) { const Option& this_ = static_cast(base); #else // PROTOBUF_CUSTOM_VTABLE -::uint8_t* Option::_InternalSerialize( - ::uint8_t* target, - ::google::protobuf::io::EpsCopyOutputStream* stream) const { +::uint8_t* PROTOBUF_NONNULL Option::_InternalSerialize( + ::uint8_t* PROTOBUF_NONNULL target, + ::google::protobuf::io::EpsCopyOutputStream* PROTOBUF_NONNULL stream) const { const Option& this_ = *this; #endif // PROTOBUF_CUSTOM_VTABLE // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Option) @@ -2629,7 +2635,7 @@ void Option::CopyFrom(const Option& from) { } -void Option::InternalSwap(Option* PROTOBUF_RESTRICT other) { +void Option::InternalSwap(Option* PROTOBUF_RESTRICT PROTOBUF_NONNULL other) { using std::swap; auto* arena = GetArena(); ABSL_DCHECK_EQ(arena, other->GetArena()); diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h index 2af91ac768..0e949d6030 100644 --- a/src/google/protobuf/type.pb.h +++ b/src/google/protobuf/type.pb.h @@ -134,8 +134,7 @@ inline constexpr Field_Kind Field_Kind_Kind_MIN = inline constexpr Field_Kind Field_Kind_Kind_MAX = static_cast(18); inline constexpr int Field_Kind_Kind_ARRAYSIZE = 18 + 1; -PROTOBUF_EXPORT const ::google::protobuf::EnumDescriptor* -Field_Kind_descriptor(); +PROTOBUF_EXPORT const ::google::protobuf::EnumDescriptor* PROTOBUF_NONNULL Field_Kind_descriptor(); template const std::string& Field_Kind_Name(T value) { static_assert(std::is_same::value || @@ -149,7 +148,8 @@ inline const std::string& Field_Kind_Name(Field_Kind value) { 0, 18>( static_cast(value)); } -inline bool Field_Kind_Parse(absl::string_view name, Field_Kind* value) { +inline bool Field_Kind_Parse( + absl::string_view name, Field_Kind* PROTOBUF_NONNULL value) { return ::google::protobuf::internal::ParseNamedEnum( Field_Kind_descriptor(), name, value); } @@ -171,8 +171,7 @@ inline constexpr Field_Cardinality Field_Cardinality_Cardinality_MIN = inline constexpr Field_Cardinality Field_Cardinality_Cardinality_MAX = static_cast(3); inline constexpr int Field_Cardinality_Cardinality_ARRAYSIZE = 3 + 1; -PROTOBUF_EXPORT const ::google::protobuf::EnumDescriptor* -Field_Cardinality_descriptor(); +PROTOBUF_EXPORT const ::google::protobuf::EnumDescriptor* PROTOBUF_NONNULL Field_Cardinality_descriptor(); template const std::string& Field_Cardinality_Name(T value) { static_assert(std::is_same::value || @@ -186,7 +185,8 @@ inline const std::string& Field_Cardinality_Name(Field_Cardinality value) { 0, 3>( static_cast(value)); } -inline bool Field_Cardinality_Parse(absl::string_view name, Field_Cardinality* value) { +inline bool Field_Cardinality_Parse( + absl::string_view name, Field_Cardinality* PROTOBUF_NONNULL value) { return ::google::protobuf::internal::ParseNamedEnum( Field_Cardinality_descriptor(), name, value); } @@ -207,8 +207,7 @@ inline constexpr Syntax Syntax_MIN = inline constexpr Syntax Syntax_MAX = static_cast(2); inline constexpr int Syntax_ARRAYSIZE = 2 + 1; -PROTOBUF_EXPORT const ::google::protobuf::EnumDescriptor* -Syntax_descriptor(); +PROTOBUF_EXPORT const ::google::protobuf::EnumDescriptor* PROTOBUF_NONNULL Syntax_descriptor(); template const std::string& Syntax_Name(T value) { static_assert(std::is_same::value || @@ -222,7 +221,8 @@ inline const std::string& Syntax_Name(Syntax value) { 0, 2>( static_cast(value)); } -inline bool Syntax_Parse(absl::string_view name, Syntax* value) { +inline bool Syntax_Parse( + absl::string_view name, Syntax* PROTOBUF_NONNULL value) { return ::google::protobuf::internal::ParseNamedEnum( Syntax_descriptor(), name, value); } @@ -239,7 +239,7 @@ class PROTOBUF_EXPORT Option final : public ::google::protobuf::Message ~Option() PROTOBUF_FINAL; #if defined(PROTOBUF_CUSTOM_VTABLE) - void operator delete(Option* msg, std::destroying_delete_t) { + void operator delete(Option* PROTOBUF_NONNULL msg, std::destroying_delete_t) { SharedDtor(*msg); ::google::protobuf::internal::SizedDelete(msg, sizeof(Option)); } @@ -270,18 +270,18 @@ class PROTOBUF_EXPORT Option final : public ::google::protobuf::Message ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance); } - inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() + inline ::google::protobuf::UnknownFieldSet* PROTOBUF_NONNULL mutable_unknown_fields() ABSL_ATTRIBUTE_LIFETIME_BOUND { return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>(); } - static const ::google::protobuf::Descriptor* descriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL descriptor() { return GetDescriptor(); } - static const ::google::protobuf::Descriptor* GetDescriptor() { + static const ::google::protobuf::Descriptor* PROTOBUF_NONNULL GetDescriptor() { return default_instance().GetMetadata().descriptor; } - static const ::google::protobuf::Reflection* GetReflection() { + static const ::google::protobuf::Reflection* PROTOBUF_NONNULL GetReflection() { return default_instance().GetMetadata().reflection; } static const Option& default_instance() { @@ -290,7 +290,7 @@ class PROTOBUF_EXPORT Option final : public ::google::protobuf::Message } static constexpr int kIndexInFileMessages = 4; friend void swap(Option& a, Option& b) { a.Swap(&b); } - inline void Swap(Option* other) { + inline void Swap(Option* PROTOBUF_NONNULL other) { if (other == this) return; if (::google::protobuf::internal::CanUseInternalSwap(GetArena(), other->GetArena())) { InternalSwap(other); @@ -298,7 +298,7 @@ class PROTOBUF_EXPORT Option final : public ::google::protobuf::Message ::google::protobuf::internal::GenericSwap(this, other); } } - void UnsafeArenaSwap(Option* other) { + void UnsafeArenaSwap(Option* PROTOBUF_NONNULL other) { if (other == this) return; ABSL_DCHECK(GetArena() == other->GetArena()); InternalSwap(other); @@ -306,7 +306,8 @@ class PROTOBUF_EXPORT Option final : public ::google::protobuf::Message // implements Message ---------------------------------------------- - Option* New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { + Option* PROTOBUF_NONNULL + New(::google::protobuf::Arena* PROTOBUF_NULLABLE arena = nullptr) const { return ::google::protobuf::Message::DefaultConstruct