From c3a7be812377a30904f9129d314b1f2d3be85f47 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Wed, 21 Jun 2023 21:22:55 +0000 Subject: [PATCH] Auto-generate files after cl/542354883 --- src/google/protobuf/any.pb.h | 24 +-- src/google/protobuf/api.pb.h | 144 +++++++------- src/google/protobuf/duration.pb.h | 8 +- src/google/protobuf/field_mask.pb.h | 18 +- src/google/protobuf/source_context.pb.h | 12 +- src/google/protobuf/struct.pb.h | 24 +-- src/google/protobuf/timestamp.pb.h | 8 +- src/google/protobuf/type.pb.h | 254 ++++++++++++------------ src/google/protobuf/wrappers.pb.h | 52 ++--- 9 files changed, 272 insertions(+), 272 deletions(-) diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index 7906e5e0fc..a8c9c80964 100644 --- a/src/google/protobuf/any.pb.h +++ b/src/google/protobuf/any.pb.h @@ -316,7 +316,7 @@ inline const std::string& Any::type_url() const { template inline PROTOBUF_ALWAYS_INLINE void Any::set_type_url(Arg_&& arg, Args_... args) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.type_url_.Set(static_cast(arg), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:google.protobuf.Any.type_url) @@ -327,26 +327,26 @@ inline std::string* Any::mutable_type_url() { return _s; } inline const std::string& Any::_internal_type_url() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race); return _impl_.type_url_.Get(); } inline void Any::_internal_set_type_url(const std::string& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.type_url_.Set(value, GetArenaForAllocation()); } inline std::string* Any::_internal_mutable_type_url() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; return _impl_.type_url_.Mutable( GetArenaForAllocation()); } inline std::string* Any::release_type_url() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.Any.type_url) return _impl_.type_url_.Release(); } inline void Any::set_allocated_type_url(std::string* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); _impl_.type_url_.SetAllocated(value, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.type_url_.IsDefault()) { @@ -367,7 +367,7 @@ inline const std::string& Any::value() const { template inline PROTOBUF_ALWAYS_INLINE void Any::set_value(Arg_&& arg, Args_... args) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.value_.SetBytes(static_cast(arg), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:google.protobuf.Any.value) @@ -378,26 +378,26 @@ inline std::string* Any::mutable_value() { return _s; } inline const std::string& Any::_internal_value() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race); return _impl_.value_.Get(); } inline void Any::_internal_set_value(const std::string& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.value_.Set(value, GetArenaForAllocation()); } inline std::string* Any::_internal_mutable_value() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; return _impl_.value_.Mutable( GetArenaForAllocation()); } inline std::string* Any::release_value() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.Any.value) return _impl_.value_.Release(); } inline void Any::set_allocated_value(std::string* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); _impl_.value_.SetAllocated(value, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.value_.IsDefault()) { diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index 9f11187dc1..fc05d27647 100644 --- a/src/google/protobuf/api.pb.h +++ b/src/google/protobuf/api.pb.h @@ -820,7 +820,7 @@ inline const std::string& Api::name() const { template inline PROTOBUF_ALWAYS_INLINE void Api::set_name(Arg_&& arg, Args_... args) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.name_.Set(static_cast(arg), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:google.protobuf.Api.name) @@ -831,26 +831,26 @@ inline std::string* Api::mutable_name() { return _s; } inline const std::string& Api::_internal_name() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race); return _impl_.name_.Get(); } inline void Api::_internal_set_name(const std::string& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.name_.Set(value, GetArenaForAllocation()); } inline std::string* Api::_internal_mutable_name() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; return _impl_.name_.Mutable( GetArenaForAllocation()); } inline std::string* Api::release_name() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.Api.name) return _impl_.name_.Release(); } inline void Api::set_allocated_name(std::string* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); _impl_.name_.SetAllocated(value, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.name_.IsDefault()) { @@ -877,7 +877,7 @@ inline ::google::protobuf::Method* Api::mutable_methods(int index) { inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Method >* Api::mutable_methods() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Api.methods) - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); return _internal_mutable_methods(); } inline const ::google::protobuf::Method& Api::methods(int index) const { @@ -885,7 +885,7 @@ inline const ::google::protobuf::Method& Api::methods(int index) const { return _internal_methods().Get(index); } inline ::google::protobuf::Method* Api::add_methods() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); ::google::protobuf::Method* _add = _internal_mutable_methods()->Add(); // @@protoc_insertion_point(field_add:google.protobuf.Api.methods) return _add; @@ -897,12 +897,12 @@ Api::methods() const { } inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Method>& Api::_internal_methods() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return _impl_.methods_; } inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Method>* Api::_internal_mutable_methods() { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return &_impl_.methods_; } @@ -920,7 +920,7 @@ inline ::google::protobuf::Option* Api::mutable_options(int index) { inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* Api::mutable_options() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Api.options) - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); return _internal_mutable_options(); } inline const ::google::protobuf::Option& Api::options(int index) const { @@ -928,7 +928,7 @@ inline const ::google::protobuf::Option& Api::options(int index) const { return _internal_options().Get(index); } inline ::google::protobuf::Option* Api::add_options() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); ::google::protobuf::Option* _add = _internal_mutable_options()->Add(); // @@protoc_insertion_point(field_add:google.protobuf.Api.options) return _add; @@ -940,12 +940,12 @@ Api::options() const { } inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>& Api::_internal_options() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return _impl_.options_; } inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* Api::_internal_mutable_options() { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return &_impl_.options_; } @@ -960,7 +960,7 @@ inline const std::string& Api::version() const { template inline PROTOBUF_ALWAYS_INLINE void Api::set_version(Arg_&& arg, Args_... args) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.version_.Set(static_cast(arg), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:google.protobuf.Api.version) @@ -971,26 +971,26 @@ inline std::string* Api::mutable_version() { return _s; } inline const std::string& Api::_internal_version() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race); return _impl_.version_.Get(); } inline void Api::_internal_set_version(const std::string& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.version_.Set(value, GetArenaForAllocation()); } inline std::string* Api::_internal_mutable_version() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; return _impl_.version_.Mutable( GetArenaForAllocation()); } inline std::string* Api::release_version() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.Api.version) return _impl_.version_.Release(); } inline void Api::set_allocated_version(std::string* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); _impl_.version_.SetAllocated(value, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.version_.IsDefault()) { @@ -1007,7 +1007,7 @@ inline bool Api::has_source_context() const { return value; } inline const ::google::protobuf::SourceContext& Api::_internal_source_context() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_MESSAGE(&_impl_._tsan_detect_race); const ::google::protobuf::SourceContext* p = _impl_.source_context_; return p != nullptr ? *p : reinterpret_cast(::google::protobuf::_SourceContext_default_instance_); } @@ -1016,7 +1016,7 @@ inline const ::google::protobuf::SourceContext& Api::source_context() const { return _internal_source_context(); } inline void Api::unsafe_arena_set_allocated_source_context(::google::protobuf::SourceContext* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race); if (GetArenaForAllocation() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_context_); } @@ -1029,7 +1029,7 @@ inline void Api::unsafe_arena_set_allocated_source_context(::google::protobuf::S // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Api.source_context) } inline ::google::protobuf::SourceContext* Api::release_source_context() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] &= ~0x00000001u; ::google::protobuf::SourceContext* released = _impl_.source_context_; @@ -1048,7 +1048,7 @@ inline ::google::protobuf::SourceContext* Api::release_source_context() { return released; } inline ::google::protobuf::SourceContext* Api::unsafe_arena_release_source_context() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.Api.source_context) _impl_._has_bits_[0] &= ~0x00000001u; @@ -1057,7 +1057,7 @@ inline ::google::protobuf::SourceContext* Api::unsafe_arena_release_source_conte return temp; } inline ::google::protobuf::SourceContext* Api::_internal_mutable_source_context() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; if (_impl_.source_context_ == nullptr) { auto* p = CreateMaybeMessage<::google::protobuf::SourceContext>(GetArenaForAllocation()); @@ -1072,7 +1072,7 @@ inline ::google::protobuf::SourceContext* Api::mutable_source_context() { } inline void Api::set_allocated_source_context(::google::protobuf::SourceContext* value) { ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_context_); } @@ -1109,7 +1109,7 @@ inline ::google::protobuf::Mixin* Api::mutable_mixins(int index) { inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin >* Api::mutable_mixins() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Api.mixins) - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); return _internal_mutable_mixins(); } inline const ::google::protobuf::Mixin& Api::mixins(int index) const { @@ -1117,7 +1117,7 @@ inline const ::google::protobuf::Mixin& Api::mixins(int index) const { return _internal_mixins().Get(index); } inline ::google::protobuf::Mixin* Api::add_mixins() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); ::google::protobuf::Mixin* _add = _internal_mutable_mixins()->Add(); // @@protoc_insertion_point(field_add:google.protobuf.Api.mixins) return _add; @@ -1129,12 +1129,12 @@ Api::mixins() const { } inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Mixin>& Api::_internal_mixins() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return _impl_.mixins_; } inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Mixin>* Api::_internal_mutable_mixins() { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return &_impl_.mixins_; } @@ -1151,11 +1151,11 @@ inline void Api::set_syntax(::google::protobuf::Syntax value) { // @@protoc_insertion_point(field_set:google.protobuf.Api.syntax) } inline ::google::protobuf::Syntax Api::_internal_syntax() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race); return static_cast<::google::protobuf::Syntax>(_impl_.syntax_); } inline void Api::_internal_set_syntax(::google::protobuf::Syntax value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race); ; _impl_.syntax_ = value; } @@ -1175,7 +1175,7 @@ inline const std::string& Method::name() const { template inline PROTOBUF_ALWAYS_INLINE void Method::set_name(Arg_&& arg, Args_... args) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.name_.Set(static_cast(arg), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:google.protobuf.Method.name) @@ -1186,26 +1186,26 @@ inline std::string* Method::mutable_name() { return _s; } inline const std::string& Method::_internal_name() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race); return _impl_.name_.Get(); } inline void Method::_internal_set_name(const std::string& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.name_.Set(value, GetArenaForAllocation()); } inline std::string* Method::_internal_mutable_name() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; return _impl_.name_.Mutable( GetArenaForAllocation()); } inline std::string* Method::release_name() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.Method.name) return _impl_.name_.Release(); } inline void Method::set_allocated_name(std::string* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); _impl_.name_.SetAllocated(value, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.name_.IsDefault()) { @@ -1226,7 +1226,7 @@ inline const std::string& Method::request_type_url() const { template inline PROTOBUF_ALWAYS_INLINE void Method::set_request_type_url(Arg_&& arg, Args_... args) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.request_type_url_.Set(static_cast(arg), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:google.protobuf.Method.request_type_url) @@ -1237,26 +1237,26 @@ inline std::string* Method::mutable_request_type_url() { return _s; } inline const std::string& Method::_internal_request_type_url() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race); return _impl_.request_type_url_.Get(); } inline void Method::_internal_set_request_type_url(const std::string& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.request_type_url_.Set(value, GetArenaForAllocation()); } inline std::string* Method::_internal_mutable_request_type_url() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; return _impl_.request_type_url_.Mutable( GetArenaForAllocation()); } inline std::string* Method::release_request_type_url() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.Method.request_type_url) return _impl_.request_type_url_.Release(); } inline void Method::set_allocated_request_type_url(std::string* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); _impl_.request_type_url_.SetAllocated(value, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.request_type_url_.IsDefault()) { @@ -1279,11 +1279,11 @@ inline void Method::set_request_streaming(bool value) { // @@protoc_insertion_point(field_set:google.protobuf.Method.request_streaming) } inline bool Method::_internal_request_streaming() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race); return _impl_.request_streaming_; } inline void Method::_internal_set_request_streaming(bool value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race); ; _impl_.request_streaming_ = value; } @@ -1299,7 +1299,7 @@ inline const std::string& Method::response_type_url() const { template inline PROTOBUF_ALWAYS_INLINE void Method::set_response_type_url(Arg_&& arg, Args_... args) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.response_type_url_.Set(static_cast(arg), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:google.protobuf.Method.response_type_url) @@ -1310,26 +1310,26 @@ inline std::string* Method::mutable_response_type_url() { return _s; } inline const std::string& Method::_internal_response_type_url() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race); return _impl_.response_type_url_.Get(); } inline void Method::_internal_set_response_type_url(const std::string& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.response_type_url_.Set(value, GetArenaForAllocation()); } inline std::string* Method::_internal_mutable_response_type_url() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; return _impl_.response_type_url_.Mutable( GetArenaForAllocation()); } inline std::string* Method::release_response_type_url() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.Method.response_type_url) return _impl_.response_type_url_.Release(); } inline void Method::set_allocated_response_type_url(std::string* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); _impl_.response_type_url_.SetAllocated(value, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.response_type_url_.IsDefault()) { @@ -1352,11 +1352,11 @@ inline void Method::set_response_streaming(bool value) { // @@protoc_insertion_point(field_set:google.protobuf.Method.response_streaming) } inline bool Method::_internal_response_streaming() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race); return _impl_.response_streaming_; } inline void Method::_internal_set_response_streaming(bool value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race); ; _impl_.response_streaming_ = value; } @@ -1375,7 +1375,7 @@ inline ::google::protobuf::Option* Method::mutable_options(int index) { inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* Method::mutable_options() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Method.options) - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); return _internal_mutable_options(); } inline const ::google::protobuf::Option& Method::options(int index) const { @@ -1383,7 +1383,7 @@ inline const ::google::protobuf::Option& Method::options(int index) const { return _internal_options().Get(index); } inline ::google::protobuf::Option* Method::add_options() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); ::google::protobuf::Option* _add = _internal_mutable_options()->Add(); // @@protoc_insertion_point(field_add:google.protobuf.Method.options) return _add; @@ -1395,12 +1395,12 @@ Method::options() const { } inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>& Method::_internal_options() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return _impl_.options_; } inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* Method::_internal_mutable_options() { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return &_impl_.options_; } @@ -1417,11 +1417,11 @@ inline void Method::set_syntax(::google::protobuf::Syntax value) { // @@protoc_insertion_point(field_set:google.protobuf.Method.syntax) } inline ::google::protobuf::Syntax Method::_internal_syntax() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race); return static_cast<::google::protobuf::Syntax>(_impl_.syntax_); } inline void Method::_internal_set_syntax(::google::protobuf::Syntax value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race); ; _impl_.syntax_ = value; } @@ -1441,7 +1441,7 @@ inline const std::string& Mixin::name() const { template inline PROTOBUF_ALWAYS_INLINE void Mixin::set_name(Arg_&& arg, Args_... args) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.name_.Set(static_cast(arg), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:google.protobuf.Mixin.name) @@ -1452,26 +1452,26 @@ inline std::string* Mixin::mutable_name() { return _s; } inline const std::string& Mixin::_internal_name() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race); return _impl_.name_.Get(); } inline void Mixin::_internal_set_name(const std::string& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.name_.Set(value, GetArenaForAllocation()); } inline std::string* Mixin::_internal_mutable_name() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; return _impl_.name_.Mutable( GetArenaForAllocation()); } inline std::string* Mixin::release_name() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.Mixin.name) return _impl_.name_.Release(); } inline void Mixin::set_allocated_name(std::string* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); _impl_.name_.SetAllocated(value, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.name_.IsDefault()) { @@ -1492,7 +1492,7 @@ inline const std::string& Mixin::root() const { template inline PROTOBUF_ALWAYS_INLINE void Mixin::set_root(Arg_&& arg, Args_... args) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.root_.Set(static_cast(arg), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:google.protobuf.Mixin.root) @@ -1503,26 +1503,26 @@ inline std::string* Mixin::mutable_root() { return _s; } inline const std::string& Mixin::_internal_root() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race); return _impl_.root_.Get(); } inline void Mixin::_internal_set_root(const std::string& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.root_.Set(value, GetArenaForAllocation()); } inline std::string* Mixin::_internal_mutable_root() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; return _impl_.root_.Mutable( GetArenaForAllocation()); } inline std::string* Mixin::release_root() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.Mixin.root) return _impl_.root_.Release(); } inline void Mixin::set_allocated_root(std::string* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); _impl_.root_.SetAllocated(value, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.root_.IsDefault()) { diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h index 13bd2f1807..48795aeacf 100644 --- a/src/google/protobuf/duration.pb.h +++ b/src/google/protobuf/duration.pb.h @@ -270,11 +270,11 @@ inline void Duration::set_seconds(::int64_t value) { // @@protoc_insertion_point(field_set:google.protobuf.Duration.seconds) } inline ::int64_t Duration::_internal_seconds() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race); return _impl_.seconds_; } inline void Duration::_internal_set_seconds(::int64_t value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race); ; _impl_.seconds_ = value; } @@ -292,11 +292,11 @@ inline void Duration::set_nanos(::int32_t value) { // @@protoc_insertion_point(field_set:google.protobuf.Duration.nanos) } inline ::int32_t Duration::_internal_nanos() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race); return _impl_.nanos_; } inline void Duration::_internal_set_nanos(::int32_t value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race); ; _impl_.nanos_ = value; } diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h index e614510356..c199d19ee7 100644 --- a/src/google/protobuf/field_mask.pb.h +++ b/src/google/protobuf/field_mask.pb.h @@ -274,7 +274,7 @@ inline void FieldMask::clear_paths() { _internal_mutable_paths()->Clear(); } inline std::string* FieldMask::add_paths() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); std::string* _s = _internal_mutable_paths()->Add(); // @@protoc_insertion_point(field_add_mutable:google.protobuf.FieldMask.paths) return _s; @@ -312,29 +312,29 @@ inline void FieldMask::set_paths(int index, absl::string_view value) { // @@protoc_insertion_point(field_set_string_piece:google.protobuf.FieldMask.paths) } inline void FieldMask::add_paths(const std::string& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); _internal_mutable_paths()->Add()->assign(value); // @@protoc_insertion_point(field_add:google.protobuf.FieldMask.paths) } inline void FieldMask::add_paths(std::string&& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); _internal_mutable_paths()->Add(std::move(value)); // @@protoc_insertion_point(field_add:google.protobuf.FieldMask.paths) } inline void FieldMask::add_paths(const char* value) { ABSL_DCHECK(value != nullptr); - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); _internal_mutable_paths()->Add()->assign(value); // @@protoc_insertion_point(field_add_char:google.protobuf.FieldMask.paths) } inline void FieldMask::add_paths(const char* value, std::size_t size) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); _internal_mutable_paths()->Add()->assign( reinterpret_cast(value), size); // @@protoc_insertion_point(field_add_pointer:google.protobuf.FieldMask.paths) } inline void FieldMask::add_paths(absl::string_view value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); _internal_mutable_paths()->Add()->assign(value.data(), value.size()); // @@protoc_insertion_point(field_add_string_piece:google.protobuf.FieldMask.paths) } @@ -345,17 +345,17 @@ FieldMask::paths() const { } inline ::google::protobuf::RepeatedPtrField* FieldMask::mutable_paths() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.FieldMask.paths) - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); return _internal_mutable_paths(); } inline const ::google::protobuf::RepeatedPtrField& FieldMask::_internal_paths() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return _impl_.paths_; } inline ::google::protobuf::RepeatedPtrField* FieldMask::_internal_mutable_paths() { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return &_impl_.paths_; } diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h index 4e15bf2103..5ffb554d98 100644 --- a/src/google/protobuf/source_context.pb.h +++ b/src/google/protobuf/source_context.pb.h @@ -262,7 +262,7 @@ inline const std::string& SourceContext::file_name() const { template inline PROTOBUF_ALWAYS_INLINE void SourceContext::set_file_name(Arg_&& arg, Args_... args) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.file_name_.Set(static_cast(arg), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:google.protobuf.SourceContext.file_name) @@ -273,26 +273,26 @@ inline std::string* SourceContext::mutable_file_name() { return _s; } inline const std::string& SourceContext::_internal_file_name() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race); return _impl_.file_name_.Get(); } inline void SourceContext::_internal_set_file_name(const std::string& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.file_name_.Set(value, GetArenaForAllocation()); } inline std::string* SourceContext::_internal_mutable_file_name() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; return _impl_.file_name_.Mutable( GetArenaForAllocation()); } inline std::string* SourceContext::release_file_name() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.SourceContext.file_name) return _impl_.file_name_.Release(); } inline void SourceContext::set_allocated_file_name(std::string* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); _impl_.file_name_.SetAllocated(value, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.file_name_.IsDefault()) { diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index 841ccf309b..8b705f56c8 100644 --- a/src/google/protobuf/struct.pb.h +++ b/src/google/protobuf/struct.pb.h @@ -782,7 +782,7 @@ inline void Struct::clear_fields() { _impl_.fields_.Clear(); } inline const ::google::protobuf::Map& Struct::_internal_fields() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return _impl_.fields_.GetMap(); } inline const ::google::protobuf::Map& Struct::fields() const { @@ -790,7 +790,7 @@ inline const ::google::protobuf::Map& St return _internal_fields(); } inline ::google::protobuf::Map* Struct::_internal_mutable_fields() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); return _impl_.fields_.MutableMap(); } inline ::google::protobuf::Map* Struct::mutable_fields() { @@ -892,7 +892,7 @@ inline const std::string& Value::string_value() const { template inline PROTOBUF_ALWAYS_INLINE void Value::set_string_value(Arg_&& arg, Args_... args) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); if (kind_case() != kStringValue) { clear_kind(); @@ -908,14 +908,14 @@ inline std::string* Value::mutable_string_value() { return _s; } inline const std::string& Value::_internal_string_value() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race); if (kind_case() != kStringValue) { return ::google::protobuf::internal::GetEmptyStringAlreadyInited(); } return _impl_.kind_.string_value_.Get(); } inline void Value::_internal_set_string_value(const std::string& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); if (kind_case() != kStringValue) { clear_kind(); @@ -925,7 +925,7 @@ inline void Value::_internal_set_string_value(const std::string& value) { _impl_.kind_.string_value_.Set(value, GetArenaForAllocation()); } inline std::string* Value::_internal_mutable_string_value() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); if (kind_case() != kStringValue) { clear_kind(); @@ -935,7 +935,7 @@ inline std::string* Value::_internal_mutable_string_value() { return _impl_.kind_.string_value_.Mutable( GetArenaForAllocation()); } inline std::string* Value::release_string_value() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.Value.string_value) if (kind_case() != kStringValue) { return nullptr; @@ -944,7 +944,7 @@ inline std::string* Value::release_string_value() { return _impl_.kind_.string_value_.Release(); } inline void Value::set_allocated_string_value(std::string* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); if (has_kind()) { clear_kind(); } @@ -1168,7 +1168,7 @@ inline ::google::protobuf::Value* ListValue::mutable_values(int index) { inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Value >* ListValue::mutable_values() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.ListValue.values) - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); return _internal_mutable_values(); } inline const ::google::protobuf::Value& ListValue::values(int index) const { @@ -1176,7 +1176,7 @@ inline const ::google::protobuf::Value& ListValue::values(int index) const { return _internal_values().Get(index); } inline ::google::protobuf::Value* ListValue::add_values() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); ::google::protobuf::Value* _add = _internal_mutable_values()->Add(); // @@protoc_insertion_point(field_add:google.protobuf.ListValue.values) return _add; @@ -1188,12 +1188,12 @@ ListValue::values() const { } inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Value>& ListValue::_internal_values() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return _impl_.values_; } inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Value>* ListValue::_internal_mutable_values() { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return &_impl_.values_; } diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h index dc39fcc6c6..4cc2a40c82 100644 --- a/src/google/protobuf/timestamp.pb.h +++ b/src/google/protobuf/timestamp.pb.h @@ -270,11 +270,11 @@ inline void Timestamp::set_seconds(::int64_t value) { // @@protoc_insertion_point(field_set:google.protobuf.Timestamp.seconds) } inline ::int64_t Timestamp::_internal_seconds() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race); return _impl_.seconds_; } inline void Timestamp::_internal_set_seconds(::int64_t value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race); ; _impl_.seconds_ = value; } @@ -292,11 +292,11 @@ inline void Timestamp::set_nanos(::int32_t value) { // @@protoc_insertion_point(field_set:google.protobuf.Timestamp.nanos) } inline ::int32_t Timestamp::_internal_nanos() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race); return _impl_.nanos_; } inline void Timestamp::_internal_set_nanos(::int32_t value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race); ; _impl_.nanos_ = value; } diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h index 91d6f5bdb0..3f98bd12f0 100644 --- a/src/google/protobuf/type.pb.h +++ b/src/google/protobuf/type.pb.h @@ -1506,7 +1506,7 @@ inline const std::string& Type::name() const { template inline PROTOBUF_ALWAYS_INLINE void Type::set_name(Arg_&& arg, Args_... args) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.name_.Set(static_cast(arg), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:google.protobuf.Type.name) @@ -1517,26 +1517,26 @@ inline std::string* Type::mutable_name() { return _s; } inline const std::string& Type::_internal_name() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race); return _impl_.name_.Get(); } inline void Type::_internal_set_name(const std::string& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.name_.Set(value, GetArenaForAllocation()); } inline std::string* Type::_internal_mutable_name() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; return _impl_.name_.Mutable( GetArenaForAllocation()); } inline std::string* Type::release_name() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.Type.name) return _impl_.name_.Release(); } inline void Type::set_allocated_name(std::string* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); _impl_.name_.SetAllocated(value, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.name_.IsDefault()) { @@ -1563,7 +1563,7 @@ inline ::google::protobuf::Field* Type::mutable_fields(int index) { inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Field >* Type::mutable_fields() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Type.fields) - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); return _internal_mutable_fields(); } inline const ::google::protobuf::Field& Type::fields(int index) const { @@ -1571,7 +1571,7 @@ inline const ::google::protobuf::Field& Type::fields(int index) const { return _internal_fields().Get(index); } inline ::google::protobuf::Field* Type::add_fields() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); ::google::protobuf::Field* _add = _internal_mutable_fields()->Add(); // @@protoc_insertion_point(field_add:google.protobuf.Type.fields) return _add; @@ -1583,12 +1583,12 @@ Type::fields() const { } inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Field>& Type::_internal_fields() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return _impl_.fields_; } inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Field>* Type::_internal_mutable_fields() { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return &_impl_.fields_; } @@ -1603,7 +1603,7 @@ inline void Type::clear_oneofs() { _internal_mutable_oneofs()->Clear(); } inline std::string* Type::add_oneofs() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); std::string* _s = _internal_mutable_oneofs()->Add(); // @@protoc_insertion_point(field_add_mutable:google.protobuf.Type.oneofs) return _s; @@ -1641,29 +1641,29 @@ inline void Type::set_oneofs(int index, absl::string_view value) { // @@protoc_insertion_point(field_set_string_piece:google.protobuf.Type.oneofs) } inline void Type::add_oneofs(const std::string& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); _internal_mutable_oneofs()->Add()->assign(value); // @@protoc_insertion_point(field_add:google.protobuf.Type.oneofs) } inline void Type::add_oneofs(std::string&& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); _internal_mutable_oneofs()->Add(std::move(value)); // @@protoc_insertion_point(field_add:google.protobuf.Type.oneofs) } inline void Type::add_oneofs(const char* value) { ABSL_DCHECK(value != nullptr); - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); _internal_mutable_oneofs()->Add()->assign(value); // @@protoc_insertion_point(field_add_char:google.protobuf.Type.oneofs) } inline void Type::add_oneofs(const char* value, std::size_t size) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); _internal_mutable_oneofs()->Add()->assign( reinterpret_cast(value), size); // @@protoc_insertion_point(field_add_pointer:google.protobuf.Type.oneofs) } inline void Type::add_oneofs(absl::string_view value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); _internal_mutable_oneofs()->Add()->assign(value.data(), value.size()); // @@protoc_insertion_point(field_add_string_piece:google.protobuf.Type.oneofs) } @@ -1674,17 +1674,17 @@ Type::oneofs() const { } inline ::google::protobuf::RepeatedPtrField* Type::mutable_oneofs() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Type.oneofs) - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); return _internal_mutable_oneofs(); } inline const ::google::protobuf::RepeatedPtrField& Type::_internal_oneofs() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return _impl_.oneofs_; } inline ::google::protobuf::RepeatedPtrField* Type::_internal_mutable_oneofs() { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return &_impl_.oneofs_; } @@ -1705,7 +1705,7 @@ inline ::google::protobuf::Option* Type::mutable_options(int index) { inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* Type::mutable_options() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Type.options) - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); return _internal_mutable_options(); } inline const ::google::protobuf::Option& Type::options(int index) const { @@ -1713,7 +1713,7 @@ inline const ::google::protobuf::Option& Type::options(int index) const { return _internal_options().Get(index); } inline ::google::protobuf::Option* Type::add_options() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); ::google::protobuf::Option* _add = _internal_mutable_options()->Add(); // @@protoc_insertion_point(field_add:google.protobuf.Type.options) return _add; @@ -1725,12 +1725,12 @@ Type::options() const { } inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>& Type::_internal_options() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return _impl_.options_; } inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* Type::_internal_mutable_options() { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return &_impl_.options_; } @@ -1741,7 +1741,7 @@ inline bool Type::has_source_context() const { return value; } inline const ::google::protobuf::SourceContext& Type::_internal_source_context() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_MESSAGE(&_impl_._tsan_detect_race); const ::google::protobuf::SourceContext* p = _impl_.source_context_; return p != nullptr ? *p : reinterpret_cast(::google::protobuf::_SourceContext_default_instance_); } @@ -1750,7 +1750,7 @@ inline const ::google::protobuf::SourceContext& Type::source_context() const { return _internal_source_context(); } inline void Type::unsafe_arena_set_allocated_source_context(::google::protobuf::SourceContext* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race); if (GetArenaForAllocation() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_context_); } @@ -1763,7 +1763,7 @@ inline void Type::unsafe_arena_set_allocated_source_context(::google::protobuf:: // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Type.source_context) } inline ::google::protobuf::SourceContext* Type::release_source_context() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] &= ~0x00000001u; ::google::protobuf::SourceContext* released = _impl_.source_context_; @@ -1782,7 +1782,7 @@ inline ::google::protobuf::SourceContext* Type::release_source_context() { return released; } inline ::google::protobuf::SourceContext* Type::unsafe_arena_release_source_context() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.Type.source_context) _impl_._has_bits_[0] &= ~0x00000001u; @@ -1791,7 +1791,7 @@ inline ::google::protobuf::SourceContext* Type::unsafe_arena_release_source_cont return temp; } inline ::google::protobuf::SourceContext* Type::_internal_mutable_source_context() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; if (_impl_.source_context_ == nullptr) { auto* p = CreateMaybeMessage<::google::protobuf::SourceContext>(GetArenaForAllocation()); @@ -1806,7 +1806,7 @@ inline ::google::protobuf::SourceContext* Type::mutable_source_context() { } inline void Type::set_allocated_source_context(::google::protobuf::SourceContext* value) { ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_context_); } @@ -1839,11 +1839,11 @@ inline void Type::set_syntax(::google::protobuf::Syntax value) { // @@protoc_insertion_point(field_set:google.protobuf.Type.syntax) } inline ::google::protobuf::Syntax Type::_internal_syntax() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race); return static_cast<::google::protobuf::Syntax>(_impl_.syntax_); } inline void Type::_internal_set_syntax(::google::protobuf::Syntax value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race); ; _impl_.syntax_ = value; } @@ -1859,7 +1859,7 @@ inline const std::string& Type::edition() const { template inline PROTOBUF_ALWAYS_INLINE void Type::set_edition(Arg_&& arg, Args_... args) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.edition_.Set(static_cast(arg), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:google.protobuf.Type.edition) @@ -1870,26 +1870,26 @@ inline std::string* Type::mutable_edition() { return _s; } inline const std::string& Type::_internal_edition() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race); return _impl_.edition_.Get(); } inline void Type::_internal_set_edition(const std::string& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.edition_.Set(value, GetArenaForAllocation()); } inline std::string* Type::_internal_mutable_edition() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; return _impl_.edition_.Mutable( GetArenaForAllocation()); } inline std::string* Type::release_edition() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.Type.edition) return _impl_.edition_.Release(); } inline void Type::set_allocated_edition(std::string* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); _impl_.edition_.SetAllocated(value, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.edition_.IsDefault()) { @@ -1916,11 +1916,11 @@ inline void Field::set_kind(::google::protobuf::Field_Kind value) { // @@protoc_insertion_point(field_set:google.protobuf.Field.kind) } inline ::google::protobuf::Field_Kind Field::_internal_kind() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race); return static_cast<::google::protobuf::Field_Kind>(_impl_.kind_); } inline void Field::_internal_set_kind(::google::protobuf::Field_Kind value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race); ; _impl_.kind_ = value; } @@ -1938,11 +1938,11 @@ inline void Field::set_cardinality(::google::protobuf::Field_Cardinality value) // @@protoc_insertion_point(field_set:google.protobuf.Field.cardinality) } inline ::google::protobuf::Field_Cardinality Field::_internal_cardinality() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race); return static_cast<::google::protobuf::Field_Cardinality>(_impl_.cardinality_); } inline void Field::_internal_set_cardinality(::google::protobuf::Field_Cardinality value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race); ; _impl_.cardinality_ = value; } @@ -1960,11 +1960,11 @@ inline void Field::set_number(::int32_t value) { // @@protoc_insertion_point(field_set:google.protobuf.Field.number) } inline ::int32_t Field::_internal_number() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race); return _impl_.number_; } inline void Field::_internal_set_number(::int32_t value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race); ; _impl_.number_ = value; } @@ -1980,7 +1980,7 @@ inline const std::string& Field::name() const { template inline PROTOBUF_ALWAYS_INLINE void Field::set_name(Arg_&& arg, Args_... args) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.name_.Set(static_cast(arg), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:google.protobuf.Field.name) @@ -1991,26 +1991,26 @@ inline std::string* Field::mutable_name() { return _s; } inline const std::string& Field::_internal_name() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race); return _impl_.name_.Get(); } inline void Field::_internal_set_name(const std::string& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.name_.Set(value, GetArenaForAllocation()); } inline std::string* Field::_internal_mutable_name() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; return _impl_.name_.Mutable( GetArenaForAllocation()); } inline std::string* Field::release_name() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.Field.name) return _impl_.name_.Release(); } inline void Field::set_allocated_name(std::string* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); _impl_.name_.SetAllocated(value, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.name_.IsDefault()) { @@ -2031,7 +2031,7 @@ inline const std::string& Field::type_url() const { template inline PROTOBUF_ALWAYS_INLINE void Field::set_type_url(Arg_&& arg, Args_... args) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.type_url_.Set(static_cast(arg), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:google.protobuf.Field.type_url) @@ -2042,26 +2042,26 @@ inline std::string* Field::mutable_type_url() { return _s; } inline const std::string& Field::_internal_type_url() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race); return _impl_.type_url_.Get(); } inline void Field::_internal_set_type_url(const std::string& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.type_url_.Set(value, GetArenaForAllocation()); } inline std::string* Field::_internal_mutable_type_url() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; return _impl_.type_url_.Mutable( GetArenaForAllocation()); } inline std::string* Field::release_type_url() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.Field.type_url) return _impl_.type_url_.Release(); } inline void Field::set_allocated_type_url(std::string* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); _impl_.type_url_.SetAllocated(value, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.type_url_.IsDefault()) { @@ -2084,11 +2084,11 @@ inline void Field::set_oneof_index(::int32_t value) { // @@protoc_insertion_point(field_set:google.protobuf.Field.oneof_index) } inline ::int32_t Field::_internal_oneof_index() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race); return _impl_.oneof_index_; } inline void Field::_internal_set_oneof_index(::int32_t value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race); ; _impl_.oneof_index_ = value; } @@ -2106,11 +2106,11 @@ inline void Field::set_packed(bool value) { // @@protoc_insertion_point(field_set:google.protobuf.Field.packed) } inline bool Field::_internal_packed() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race); return _impl_.packed_; } inline void Field::_internal_set_packed(bool value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race); ; _impl_.packed_ = value; } @@ -2132,7 +2132,7 @@ inline ::google::protobuf::Option* Field::mutable_options(int index) { inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* Field::mutable_options() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Field.options) - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); return _internal_mutable_options(); } inline const ::google::protobuf::Option& Field::options(int index) const { @@ -2140,7 +2140,7 @@ inline const ::google::protobuf::Option& Field::options(int index) const { return _internal_options().Get(index); } inline ::google::protobuf::Option* Field::add_options() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); ::google::protobuf::Option* _add = _internal_mutable_options()->Add(); // @@protoc_insertion_point(field_add:google.protobuf.Field.options) return _add; @@ -2152,12 +2152,12 @@ Field::options() const { } inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>& Field::_internal_options() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return _impl_.options_; } inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* Field::_internal_mutable_options() { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return &_impl_.options_; } @@ -2172,7 +2172,7 @@ inline const std::string& Field::json_name() const { template inline PROTOBUF_ALWAYS_INLINE void Field::set_json_name(Arg_&& arg, Args_... args) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.json_name_.Set(static_cast(arg), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:google.protobuf.Field.json_name) @@ -2183,26 +2183,26 @@ inline std::string* Field::mutable_json_name() { return _s; } inline const std::string& Field::_internal_json_name() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race); return _impl_.json_name_.Get(); } inline void Field::_internal_set_json_name(const std::string& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.json_name_.Set(value, GetArenaForAllocation()); } inline std::string* Field::_internal_mutable_json_name() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; return _impl_.json_name_.Mutable( GetArenaForAllocation()); } inline std::string* Field::release_json_name() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.Field.json_name) return _impl_.json_name_.Release(); } inline void Field::set_allocated_json_name(std::string* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); _impl_.json_name_.SetAllocated(value, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.json_name_.IsDefault()) { @@ -2223,7 +2223,7 @@ inline const std::string& Field::default_value() const { template inline PROTOBUF_ALWAYS_INLINE void Field::set_default_value(Arg_&& arg, Args_... args) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.default_value_.Set(static_cast(arg), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:google.protobuf.Field.default_value) @@ -2234,26 +2234,26 @@ inline std::string* Field::mutable_default_value() { return _s; } inline const std::string& Field::_internal_default_value() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race); return _impl_.default_value_.Get(); } inline void Field::_internal_set_default_value(const std::string& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.default_value_.Set(value, GetArenaForAllocation()); } inline std::string* Field::_internal_mutable_default_value() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; return _impl_.default_value_.Mutable( GetArenaForAllocation()); } inline std::string* Field::release_default_value() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.Field.default_value) return _impl_.default_value_.Release(); } inline void Field::set_allocated_default_value(std::string* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); _impl_.default_value_.SetAllocated(value, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.default_value_.IsDefault()) { @@ -2278,7 +2278,7 @@ inline const std::string& Enum::name() const { template inline PROTOBUF_ALWAYS_INLINE void Enum::set_name(Arg_&& arg, Args_... args) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.name_.Set(static_cast(arg), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:google.protobuf.Enum.name) @@ -2289,26 +2289,26 @@ inline std::string* Enum::mutable_name() { return _s; } inline const std::string& Enum::_internal_name() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race); return _impl_.name_.Get(); } inline void Enum::_internal_set_name(const std::string& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.name_.Set(value, GetArenaForAllocation()); } inline std::string* Enum::_internal_mutable_name() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; return _impl_.name_.Mutable( GetArenaForAllocation()); } inline std::string* Enum::release_name() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.Enum.name) return _impl_.name_.Release(); } inline void Enum::set_allocated_name(std::string* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); _impl_.name_.SetAllocated(value, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.name_.IsDefault()) { @@ -2335,7 +2335,7 @@ inline ::google::protobuf::EnumValue* Enum::mutable_enumvalue(int index) { inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValue >* Enum::mutable_enumvalue() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Enum.enumvalue) - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); return _internal_mutable_enumvalue(); } inline const ::google::protobuf::EnumValue& Enum::enumvalue(int index) const { @@ -2343,7 +2343,7 @@ inline const ::google::protobuf::EnumValue& Enum::enumvalue(int index) const { return _internal_enumvalue().Get(index); } inline ::google::protobuf::EnumValue* Enum::add_enumvalue() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); ::google::protobuf::EnumValue* _add = _internal_mutable_enumvalue()->Add(); // @@protoc_insertion_point(field_add:google.protobuf.Enum.enumvalue) return _add; @@ -2355,12 +2355,12 @@ Enum::enumvalue() const { } inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumValue>& Enum::_internal_enumvalue() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return _impl_.enumvalue_; } inline ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumValue>* Enum::_internal_mutable_enumvalue() { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return &_impl_.enumvalue_; } @@ -2381,7 +2381,7 @@ inline ::google::protobuf::Option* Enum::mutable_options(int index) { inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* Enum::mutable_options() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Enum.options) - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); return _internal_mutable_options(); } inline const ::google::protobuf::Option& Enum::options(int index) const { @@ -2389,7 +2389,7 @@ inline const ::google::protobuf::Option& Enum::options(int index) const { return _internal_options().Get(index); } inline ::google::protobuf::Option* Enum::add_options() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); ::google::protobuf::Option* _add = _internal_mutable_options()->Add(); // @@protoc_insertion_point(field_add:google.protobuf.Enum.options) return _add; @@ -2401,12 +2401,12 @@ Enum::options() const { } inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>& Enum::_internal_options() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return _impl_.options_; } inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* Enum::_internal_mutable_options() { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return &_impl_.options_; } @@ -2417,7 +2417,7 @@ inline bool Enum::has_source_context() const { return value; } inline const ::google::protobuf::SourceContext& Enum::_internal_source_context() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_MESSAGE(&_impl_._tsan_detect_race); const ::google::protobuf::SourceContext* p = _impl_.source_context_; return p != nullptr ? *p : reinterpret_cast(::google::protobuf::_SourceContext_default_instance_); } @@ -2426,7 +2426,7 @@ inline const ::google::protobuf::SourceContext& Enum::source_context() const { return _internal_source_context(); } inline void Enum::unsafe_arena_set_allocated_source_context(::google::protobuf::SourceContext* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race); if (GetArenaForAllocation() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_context_); } @@ -2439,7 +2439,7 @@ inline void Enum::unsafe_arena_set_allocated_source_context(::google::protobuf:: // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Enum.source_context) } inline ::google::protobuf::SourceContext* Enum::release_source_context() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] &= ~0x00000001u; ::google::protobuf::SourceContext* released = _impl_.source_context_; @@ -2458,7 +2458,7 @@ inline ::google::protobuf::SourceContext* Enum::release_source_context() { return released; } inline ::google::protobuf::SourceContext* Enum::unsafe_arena_release_source_context() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.Enum.source_context) _impl_._has_bits_[0] &= ~0x00000001u; @@ -2467,7 +2467,7 @@ inline ::google::protobuf::SourceContext* Enum::unsafe_arena_release_source_cont return temp; } inline ::google::protobuf::SourceContext* Enum::_internal_mutable_source_context() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; if (_impl_.source_context_ == nullptr) { auto* p = CreateMaybeMessage<::google::protobuf::SourceContext>(GetArenaForAllocation()); @@ -2482,7 +2482,7 @@ inline ::google::protobuf::SourceContext* Enum::mutable_source_context() { } inline void Enum::set_allocated_source_context(::google::protobuf::SourceContext* value) { ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_context_); } @@ -2515,11 +2515,11 @@ inline void Enum::set_syntax(::google::protobuf::Syntax value) { // @@protoc_insertion_point(field_set:google.protobuf.Enum.syntax) } inline ::google::protobuf::Syntax Enum::_internal_syntax() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race); return static_cast<::google::protobuf::Syntax>(_impl_.syntax_); } inline void Enum::_internal_set_syntax(::google::protobuf::Syntax value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race); ; _impl_.syntax_ = value; } @@ -2535,7 +2535,7 @@ inline const std::string& Enum::edition() const { template inline PROTOBUF_ALWAYS_INLINE void Enum::set_edition(Arg_&& arg, Args_... args) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.edition_.Set(static_cast(arg), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:google.protobuf.Enum.edition) @@ -2546,26 +2546,26 @@ inline std::string* Enum::mutable_edition() { return _s; } inline const std::string& Enum::_internal_edition() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race); return _impl_.edition_.Get(); } inline void Enum::_internal_set_edition(const std::string& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.edition_.Set(value, GetArenaForAllocation()); } inline std::string* Enum::_internal_mutable_edition() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; return _impl_.edition_.Mutable( GetArenaForAllocation()); } inline std::string* Enum::release_edition() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.Enum.edition) return _impl_.edition_.Release(); } inline void Enum::set_allocated_edition(std::string* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); _impl_.edition_.SetAllocated(value, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.edition_.IsDefault()) { @@ -2590,7 +2590,7 @@ inline const std::string& EnumValue::name() const { template inline PROTOBUF_ALWAYS_INLINE void EnumValue::set_name(Arg_&& arg, Args_... args) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.name_.Set(static_cast(arg), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:google.protobuf.EnumValue.name) @@ -2601,26 +2601,26 @@ inline std::string* EnumValue::mutable_name() { return _s; } inline const std::string& EnumValue::_internal_name() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race); return _impl_.name_.Get(); } inline void EnumValue::_internal_set_name(const std::string& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.name_.Set(value, GetArenaForAllocation()); } inline std::string* EnumValue::_internal_mutable_name() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; return _impl_.name_.Mutable( GetArenaForAllocation()); } inline std::string* EnumValue::release_name() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.EnumValue.name) return _impl_.name_.Release(); } inline void EnumValue::set_allocated_name(std::string* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); _impl_.name_.SetAllocated(value, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.name_.IsDefault()) { @@ -2643,11 +2643,11 @@ inline void EnumValue::set_number(::int32_t value) { // @@protoc_insertion_point(field_set:google.protobuf.EnumValue.number) } inline ::int32_t EnumValue::_internal_number() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race); return _impl_.number_; } inline void EnumValue::_internal_set_number(::int32_t value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race); ; _impl_.number_ = value; } @@ -2669,7 +2669,7 @@ inline ::google::protobuf::Option* EnumValue::mutable_options(int index) { inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* EnumValue::mutable_options() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumValue.options) - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); return _internal_mutable_options(); } inline const ::google::protobuf::Option& EnumValue::options(int index) const { @@ -2677,7 +2677,7 @@ inline const ::google::protobuf::Option& EnumValue::options(int index) const { return _internal_options().Get(index); } inline ::google::protobuf::Option* EnumValue::add_options() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race); ::google::protobuf::Option* _add = _internal_mutable_options()->Add(); // @@protoc_insertion_point(field_add:google.protobuf.EnumValue.options) return _add; @@ -2689,12 +2689,12 @@ EnumValue::options() const { } inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>& EnumValue::_internal_options() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return _impl_.options_; } inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>* EnumValue::_internal_mutable_options() { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race); return &_impl_.options_; } @@ -2713,7 +2713,7 @@ inline const std::string& Option::name() const { template inline PROTOBUF_ALWAYS_INLINE void Option::set_name(Arg_&& arg, Args_... args) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.name_.Set(static_cast(arg), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:google.protobuf.Option.name) @@ -2724,26 +2724,26 @@ inline std::string* Option::mutable_name() { return _s; } inline const std::string& Option::_internal_name() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race); return _impl_.name_.Get(); } inline void Option::_internal_set_name(const std::string& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.name_.Set(value, GetArenaForAllocation()); } inline std::string* Option::_internal_mutable_name() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; return _impl_.name_.Mutable( GetArenaForAllocation()); } inline std::string* Option::release_name() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.Option.name) return _impl_.name_.Release(); } inline void Option::set_allocated_name(std::string* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); _impl_.name_.SetAllocated(value, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.name_.IsDefault()) { @@ -2760,7 +2760,7 @@ inline bool Option::has_value() const { return value; } inline const ::google::protobuf::Any& Option::_internal_value() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_MESSAGE(&_impl_._tsan_detect_race); const ::google::protobuf::Any* p = _impl_.value_; return p != nullptr ? *p : reinterpret_cast(::google::protobuf::_Any_default_instance_); } @@ -2769,7 +2769,7 @@ inline const ::google::protobuf::Any& Option::value() const { return _internal_value(); } inline void Option::unsafe_arena_set_allocated_value(::google::protobuf::Any* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race); if (GetArenaForAllocation() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.value_); } @@ -2782,7 +2782,7 @@ inline void Option::unsafe_arena_set_allocated_value(::google::protobuf::Any* va // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Option.value) } inline ::google::protobuf::Any* Option::release_value() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] &= ~0x00000001u; ::google::protobuf::Any* released = _impl_.value_; @@ -2801,7 +2801,7 @@ inline ::google::protobuf::Any* Option::release_value() { return released; } inline ::google::protobuf::Any* Option::unsafe_arena_release_value() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.Option.value) _impl_._has_bits_[0] &= ~0x00000001u; @@ -2810,7 +2810,7 @@ inline ::google::protobuf::Any* Option::unsafe_arena_release_value() { return temp; } inline ::google::protobuf::Any* Option::_internal_mutable_value() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; if (_impl_.value_ == nullptr) { auto* p = CreateMaybeMessage<::google::protobuf::Any>(GetArenaForAllocation()); @@ -2825,7 +2825,7 @@ inline ::google::protobuf::Any* Option::mutable_value() { } inline void Option::set_allocated_value(::google::protobuf::Any* value) { ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.value_); } diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h index d9aa8d3669..7a83f8b286 100644 --- a/src/google/protobuf/wrappers.pb.h +++ b/src/google/protobuf/wrappers.pb.h @@ -1574,11 +1574,11 @@ inline void DoubleValue::set_value(double value) { // @@protoc_insertion_point(field_set:google.protobuf.DoubleValue.value) } inline double DoubleValue::_internal_value() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race); return _impl_.value_; } inline void DoubleValue::_internal_set_value(double value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race); ; _impl_.value_ = value; } @@ -1600,11 +1600,11 @@ inline void FloatValue::set_value(float value) { // @@protoc_insertion_point(field_set:google.protobuf.FloatValue.value) } inline float FloatValue::_internal_value() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race); return _impl_.value_; } inline void FloatValue::_internal_set_value(float value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race); ; _impl_.value_ = value; } @@ -1626,11 +1626,11 @@ inline void Int64Value::set_value(::int64_t value) { // @@protoc_insertion_point(field_set:google.protobuf.Int64Value.value) } inline ::int64_t Int64Value::_internal_value() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race); return _impl_.value_; } inline void Int64Value::_internal_set_value(::int64_t value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race); ; _impl_.value_ = value; } @@ -1652,11 +1652,11 @@ inline void UInt64Value::set_value(::uint64_t value) { // @@protoc_insertion_point(field_set:google.protobuf.UInt64Value.value) } inline ::uint64_t UInt64Value::_internal_value() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race); return _impl_.value_; } inline void UInt64Value::_internal_set_value(::uint64_t value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race); ; _impl_.value_ = value; } @@ -1678,11 +1678,11 @@ inline void Int32Value::set_value(::int32_t value) { // @@protoc_insertion_point(field_set:google.protobuf.Int32Value.value) } inline ::int32_t Int32Value::_internal_value() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race); return _impl_.value_; } inline void Int32Value::_internal_set_value(::int32_t value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race); ; _impl_.value_ = value; } @@ -1704,11 +1704,11 @@ inline void UInt32Value::set_value(::uint32_t value) { // @@protoc_insertion_point(field_set:google.protobuf.UInt32Value.value) } inline ::uint32_t UInt32Value::_internal_value() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race); return _impl_.value_; } inline void UInt32Value::_internal_set_value(::uint32_t value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race); ; _impl_.value_ = value; } @@ -1730,11 +1730,11 @@ inline void BoolValue::set_value(bool value) { // @@protoc_insertion_point(field_set:google.protobuf.BoolValue.value) } inline bool BoolValue::_internal_value() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race); return _impl_.value_; } inline void BoolValue::_internal_set_value(bool value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race); ; _impl_.value_ = value; } @@ -1754,7 +1754,7 @@ inline const std::string& StringValue::value() const { template inline PROTOBUF_ALWAYS_INLINE void StringValue::set_value(Arg_&& arg, Args_... args) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.value_.Set(static_cast(arg), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:google.protobuf.StringValue.value) @@ -1765,26 +1765,26 @@ inline std::string* StringValue::mutable_value() { return _s; } inline const std::string& StringValue::_internal_value() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race); return _impl_.value_.Get(); } inline void StringValue::_internal_set_value(const std::string& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.value_.Set(value, GetArenaForAllocation()); } inline std::string* StringValue::_internal_mutable_value() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; return _impl_.value_.Mutable( GetArenaForAllocation()); } inline std::string* StringValue::release_value() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.StringValue.value) return _impl_.value_.Release(); } inline void StringValue::set_allocated_value(std::string* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); _impl_.value_.SetAllocated(value, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.value_.IsDefault()) { @@ -1809,7 +1809,7 @@ inline const std::string& BytesValue::value() const { template inline PROTOBUF_ALWAYS_INLINE void BytesValue::set_value(Arg_&& arg, Args_... args) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.value_.SetBytes(static_cast(arg), args..., GetArenaForAllocation()); // @@protoc_insertion_point(field_set:google.protobuf.BytesValue.value) @@ -1820,26 +1820,26 @@ inline std::string* BytesValue::mutable_value() { return _s; } inline const std::string& BytesValue::_internal_value() const { - PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race); return _impl_.value_.Get(); } inline void BytesValue::_internal_set_value(const std::string& value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; _impl_.value_.Set(value, GetArenaForAllocation()); } inline std::string* BytesValue::_internal_mutable_value() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); ; return _impl_.value_.Mutable( GetArenaForAllocation()); } inline std::string* BytesValue::release_value() { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); // @@protoc_insertion_point(field_release:google.protobuf.BytesValue.value) return _impl_.value_.Release(); } inline void BytesValue::set_allocated_value(std::string* value) { - PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); + PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race); _impl_.value_.SetAllocated(value, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.value_.IsDefault()) {