diff --git a/src/google/protobuf/compiler/cpp/field.cc b/src/google/protobuf/compiler/cpp/field.cc
index 2326935551..ef8e28c89d 100644
--- a/src/google/protobuf/compiler/cpp/field.cc
+++ b/src/google/protobuf/compiler/cpp/field.cc
@@ -62,17 +62,6 @@ using Sub = ::google::protobuf::io::Printer::Sub;
 
 std::vector<Sub> FieldVars(const FieldDescriptor* field, const Options& opts) {
   bool split = ShouldSplit(field, opts);
-  // TODO(b/280674214): get rid of phase logic after TSan validation rolls out.
-  std::string tsan_validation_phase;
-  if (field->is_repeated()) {
-    tsan_validation_phase = "REPEATED";
-  } else if (field->cpp_type() < FieldDescriptor::CPPTYPE_STRING) {
-    tsan_validation_phase = "PRIMITIVE";
-  } else if (field->cpp_type() == FieldDescriptor::CPPTYPE_STRING) {
-    tsan_validation_phase = "STRING";
-  } else {  // message fields
-    tsan_validation_phase = "MESSAGE";
-  }
   std::vector<Sub> vars = {
       // This will eventually be renamed to "field", once the existing "field"
       // variable is replaced with "field_" everywhere.
@@ -99,11 +88,9 @@ std::vector<Sub> FieldVars(const FieldDescriptor* field, const Options& opts) {
 
       // For TSan validation.
       {"TsanDetectConcurrentMutation",
-       absl::StrCat("PROTOBUF_TSAN_WRITE_", tsan_validation_phase,
-                    "(&_impl_._tsan_detect_race)")},
+       "PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race)"},
       {"TsanDetectConcurrentRead",
-       absl::StrCat("PROTOBUF_TSAN_READ_", tsan_validation_phase,
-                    "(&_impl_._tsan_detect_race)")},
+       "PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race)"},
 
       // Old-style names.
       {"field", FieldMemberName(field, split)},
diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h
index cdf23d95f1..fd7a9a7100 100644
--- a/src/google/protobuf/compiler/plugin.pb.h
+++ b/src/google/protobuf/compiler/plugin.pb.h
@@ -1059,11 +1059,11 @@ inline void Version::set_major(::int32_t value) {
   // @@protoc_insertion_point(field_set:google.protobuf.compiler.Version.major)
 }
 inline ::int32_t Version::_internal_major() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.major_;
 }
 inline void Version::_internal_set_major(::int32_t value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.major_ = value;
 }
@@ -1086,11 +1086,11 @@ inline void Version::set_minor(::int32_t value) {
   // @@protoc_insertion_point(field_set:google.protobuf.compiler.Version.minor)
 }
 inline ::int32_t Version::_internal_minor() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.minor_;
 }
 inline void Version::_internal_set_minor(::int32_t value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.minor_ = value;
 }
@@ -1113,11 +1113,11 @@ inline void Version::set_patch(::int32_t value) {
   // @@protoc_insertion_point(field_set:google.protobuf.compiler.Version.patch)
 }
 inline ::int32_t Version::_internal_patch() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.patch_;
 }
 inline void Version::_internal_set_patch(::int32_t value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   _impl_.patch_ = value;
 }
@@ -1138,7 +1138,7 @@ inline const std::string& Version::suffix() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void Version::set_suffix(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.suffix_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.compiler.Version.suffix)
@@ -1149,21 +1149,21 @@ inline std::string* Version::mutable_suffix() {
   return _s;
 }
 inline const std::string& Version::_internal_suffix() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.suffix_.Get();
 }
 inline void Version::_internal_set_suffix(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.suffix_.Set(value, GetArenaForAllocation());
 }
 inline std::string* Version::_internal_mutable_suffix() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.suffix_.Mutable( GetArenaForAllocation());
 }
 inline std::string* Version::release_suffix() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.compiler.Version.suffix)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -1176,7 +1176,7 @@ inline std::string* Version::release_suffix() {
   return released;
 }
 inline void Version::set_allocated_suffix(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -1206,7 +1206,7 @@ inline void CodeGeneratorRequest::clear_file_to_generate() {
   _internal_mutable_file_to_generate()->Clear();
 }
 inline std::string* CodeGeneratorRequest::add_file_to_generate() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   std::string* _s = _internal_mutable_file_to_generate()->Add();
   // @@protoc_insertion_point(field_add_mutable:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate)
   return _s;
@@ -1244,29 +1244,29 @@ inline void CodeGeneratorRequest::set_file_to_generate(int index, absl::string_v
   // @@protoc_insertion_point(field_set_string_piece:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate)
 }
 inline void CodeGeneratorRequest::add_file_to_generate(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_file_to_generate()->Add()->assign(value);
   // @@protoc_insertion_point(field_add:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate)
 }
 inline void CodeGeneratorRequest::add_file_to_generate(std::string&& value) {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_file_to_generate()->Add(std::move(value));
   // @@protoc_insertion_point(field_add:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate)
 }
 inline void CodeGeneratorRequest::add_file_to_generate(const char* value) {
   ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_file_to_generate()->Add()->assign(value);
   // @@protoc_insertion_point(field_add_char:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate)
 }
 inline void CodeGeneratorRequest::add_file_to_generate(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_file_to_generate()->Add()->assign(
       reinterpret_cast<const char*>(value), size);
   // @@protoc_insertion_point(field_add_pointer:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate)
 }
 inline void CodeGeneratorRequest::add_file_to_generate(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_file_to_generate()->Add()->assign(value.data(), value.size());
   // @@protoc_insertion_point(field_add_string_piece:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate)
 }
@@ -1277,17 +1277,17 @@ CodeGeneratorRequest::file_to_generate() const {
 }
 inline ::google::protobuf::RepeatedPtrField<std::string>* CodeGeneratorRequest::mutable_file_to_generate() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_file_to_generate();
 }
 inline const ::google::protobuf::RepeatedPtrField<std::string>&
 CodeGeneratorRequest::_internal_file_to_generate() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.file_to_generate_;
 }
 inline ::google::protobuf::RepeatedPtrField<std::string>*
 CodeGeneratorRequest::_internal_mutable_file_to_generate() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.file_to_generate_;
 }
 
@@ -1307,7 +1307,7 @@ inline const std::string& CodeGeneratorRequest::parameter() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void CodeGeneratorRequest::set_parameter(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.parameter_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.compiler.CodeGeneratorRequest.parameter)
@@ -1318,21 +1318,21 @@ inline std::string* CodeGeneratorRequest::mutable_parameter() {
   return _s;
 }
 inline const std::string& CodeGeneratorRequest::_internal_parameter() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.parameter_.Get();
 }
 inline void CodeGeneratorRequest::_internal_set_parameter(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.parameter_.Set(value, GetArenaForAllocation());
 }
 inline std::string* CodeGeneratorRequest::_internal_mutable_parameter() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.parameter_.Mutable( GetArenaForAllocation());
 }
 inline std::string* CodeGeneratorRequest::release_parameter() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.compiler.CodeGeneratorRequest.parameter)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -1345,7 +1345,7 @@ inline std::string* CodeGeneratorRequest::release_parameter() {
   return released;
 }
 inline void CodeGeneratorRequest::set_allocated_parameter(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -1374,7 +1374,7 @@ inline ::google::protobuf::FileDescriptorProto* CodeGeneratorRequest::mutable_pr
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::FileDescriptorProto >*
 CodeGeneratorRequest::mutable_proto_file() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.compiler.CodeGeneratorRequest.proto_file)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_proto_file();
 }
 inline const ::google::protobuf::FileDescriptorProto& CodeGeneratorRequest::proto_file(int index) const {
@@ -1382,7 +1382,7 @@ inline const ::google::protobuf::FileDescriptorProto& CodeGeneratorRequest::prot
     return _internal_proto_file().Get(index);
 }
 inline ::google::protobuf::FileDescriptorProto* CodeGeneratorRequest::add_proto_file() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::FileDescriptorProto* _add = _internal_mutable_proto_file()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.compiler.CodeGeneratorRequest.proto_file)
   return _add;
@@ -1394,12 +1394,12 @@ CodeGeneratorRequest::proto_file() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::FileDescriptorProto>&
 CodeGeneratorRequest::_internal_proto_file() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.proto_file_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::FileDescriptorProto>*
 CodeGeneratorRequest::_internal_mutable_proto_file() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.proto_file_;
 }
 
@@ -1417,7 +1417,7 @@ inline ::google::protobuf::FileDescriptorProto* CodeGeneratorRequest::mutable_so
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::FileDescriptorProto >*
 CodeGeneratorRequest::mutable_source_file_descriptors() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.compiler.CodeGeneratorRequest.source_file_descriptors)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_source_file_descriptors();
 }
 inline const ::google::protobuf::FileDescriptorProto& CodeGeneratorRequest::source_file_descriptors(int index) const {
@@ -1425,7 +1425,7 @@ inline const ::google::protobuf::FileDescriptorProto& CodeGeneratorRequest::sour
     return _internal_source_file_descriptors().Get(index);
 }
 inline ::google::protobuf::FileDescriptorProto* CodeGeneratorRequest::add_source_file_descriptors() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::FileDescriptorProto* _add = _internal_mutable_source_file_descriptors()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.compiler.CodeGeneratorRequest.source_file_descriptors)
   return _add;
@@ -1437,12 +1437,12 @@ CodeGeneratorRequest::source_file_descriptors() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::FileDescriptorProto>&
 CodeGeneratorRequest::_internal_source_file_descriptors() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.source_file_descriptors_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::FileDescriptorProto>*
 CodeGeneratorRequest::_internal_mutable_source_file_descriptors() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.source_file_descriptors_;
 }
 
@@ -1457,7 +1457,7 @@ inline void CodeGeneratorRequest::clear_compiler_version() {
   _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::google::protobuf::compiler::Version& CodeGeneratorRequest::_internal_compiler_version() const {
-  PROTOBUF_TSAN_READ_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   const ::google::protobuf::compiler::Version* p = _impl_.compiler_version_;
   return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::compiler::Version&>(::google::protobuf::compiler::_Version_default_instance_);
 }
@@ -1466,7 +1466,7 @@ inline const ::google::protobuf::compiler::Version& CodeGeneratorRequest::compil
   return _internal_compiler_version();
 }
 inline void CodeGeneratorRequest::unsafe_arena_set_allocated_compiler_version(::google::protobuf::compiler::Version* value) {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.compiler_version_);
   }
@@ -1479,7 +1479,7 @@ inline void CodeGeneratorRequest::unsafe_arena_set_allocated_compiler_version(::
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.compiler.CodeGeneratorRequest.compiler_version)
 }
 inline ::google::protobuf::compiler::Version* CodeGeneratorRequest::release_compiler_version() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000002u;
   ::google::protobuf::compiler::Version* released = _impl_.compiler_version_;
@@ -1498,7 +1498,7 @@ inline ::google::protobuf::compiler::Version* CodeGeneratorRequest::release_comp
   return released;
 }
 inline ::google::protobuf::compiler::Version* CodeGeneratorRequest::unsafe_arena_release_compiler_version() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.compiler.CodeGeneratorRequest.compiler_version)
 
   _impl_._has_bits_[0] &= ~0x00000002u;
@@ -1507,7 +1507,7 @@ inline ::google::protobuf::compiler::Version* CodeGeneratorRequest::unsafe_arena
   return temp;
 }
 inline ::google::protobuf::compiler::Version* CodeGeneratorRequest::_internal_mutable_compiler_version() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   if (_impl_.compiler_version_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::compiler::Version>(GetArenaForAllocation());
@@ -1522,7 +1522,7 @@ inline ::google::protobuf::compiler::Version* CodeGeneratorRequest::mutable_comp
 }
 inline void CodeGeneratorRequest::set_allocated_compiler_version(::google::protobuf::compiler::Version* value) {
   ::google::protobuf::Arena* message_arena = GetArenaForAllocation();
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::compiler::Version*>(_impl_.compiler_version_);
   }
@@ -1562,7 +1562,7 @@ inline const std::string& CodeGeneratorResponse_File::name() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void CodeGeneratorResponse_File::set_name(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.compiler.CodeGeneratorResponse.File.name)
@@ -1573,21 +1573,21 @@ inline std::string* CodeGeneratorResponse_File::mutable_name() {
   return _s;
 }
 inline const std::string& CodeGeneratorResponse_File::_internal_name() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.name_.Get();
 }
 inline void CodeGeneratorResponse_File::_internal_set_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(value, GetArenaForAllocation());
 }
 inline std::string* CodeGeneratorResponse_File::_internal_mutable_name() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.name_.Mutable( GetArenaForAllocation());
 }
 inline std::string* CodeGeneratorResponse_File::release_name() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.compiler.CodeGeneratorResponse.File.name)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -1600,7 +1600,7 @@ inline std::string* CodeGeneratorResponse_File::release_name() {
   return released;
 }
 inline void CodeGeneratorResponse_File::set_allocated_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -1631,7 +1631,7 @@ inline const std::string& CodeGeneratorResponse_File::insertion_point() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void CodeGeneratorResponse_File::set_insertion_point(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.insertion_point_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.compiler.CodeGeneratorResponse.File.insertion_point)
@@ -1642,21 +1642,21 @@ inline std::string* CodeGeneratorResponse_File::mutable_insertion_point() {
   return _s;
 }
 inline const std::string& CodeGeneratorResponse_File::_internal_insertion_point() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.insertion_point_.Get();
 }
 inline void CodeGeneratorResponse_File::_internal_set_insertion_point(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.insertion_point_.Set(value, GetArenaForAllocation());
 }
 inline std::string* CodeGeneratorResponse_File::_internal_mutable_insertion_point() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   return _impl_.insertion_point_.Mutable( GetArenaForAllocation());
 }
 inline std::string* CodeGeneratorResponse_File::release_insertion_point() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.compiler.CodeGeneratorResponse.File.insertion_point)
   if ((_impl_._has_bits_[0] & 0x00000002u) == 0) {
     return nullptr;
@@ -1669,7 +1669,7 @@ inline std::string* CodeGeneratorResponse_File::release_insertion_point() {
   return released;
 }
 inline void CodeGeneratorResponse_File::set_allocated_insertion_point(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000002u;
   } else {
@@ -1700,7 +1700,7 @@ inline const std::string& CodeGeneratorResponse_File::content() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void CodeGeneratorResponse_File::set_content(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.content_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.compiler.CodeGeneratorResponse.File.content)
@@ -1711,21 +1711,21 @@ inline std::string* CodeGeneratorResponse_File::mutable_content() {
   return _s;
 }
 inline const std::string& CodeGeneratorResponse_File::_internal_content() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.content_.Get();
 }
 inline void CodeGeneratorResponse_File::_internal_set_content(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.content_.Set(value, GetArenaForAllocation());
 }
 inline std::string* CodeGeneratorResponse_File::_internal_mutable_content() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   return _impl_.content_.Mutable( GetArenaForAllocation());
 }
 inline std::string* CodeGeneratorResponse_File::release_content() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.compiler.CodeGeneratorResponse.File.content)
   if ((_impl_._has_bits_[0] & 0x00000004u) == 0) {
     return nullptr;
@@ -1738,7 +1738,7 @@ inline std::string* CodeGeneratorResponse_File::release_content() {
   return released;
 }
 inline void CodeGeneratorResponse_File::set_allocated_content(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000004u;
   } else {
@@ -1760,7 +1760,7 @@ inline bool CodeGeneratorResponse_File::has_generated_code_info() const {
   return value;
 }
 inline const ::google::protobuf::GeneratedCodeInfo& CodeGeneratorResponse_File::_internal_generated_code_info() const {
-  PROTOBUF_TSAN_READ_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   const ::google::protobuf::GeneratedCodeInfo* p = _impl_.generated_code_info_;
   return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::GeneratedCodeInfo&>(::google::protobuf::_GeneratedCodeInfo_default_instance_);
 }
@@ -1769,7 +1769,7 @@ inline const ::google::protobuf::GeneratedCodeInfo& CodeGeneratorResponse_File::
   return _internal_generated_code_info();
 }
 inline void CodeGeneratorResponse_File::unsafe_arena_set_allocated_generated_code_info(::google::protobuf::GeneratedCodeInfo* value) {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.generated_code_info_);
   }
@@ -1782,7 +1782,7 @@ inline void CodeGeneratorResponse_File::unsafe_arena_set_allocated_generated_cod
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.compiler.CodeGeneratorResponse.File.generated_code_info)
 }
 inline ::google::protobuf::GeneratedCodeInfo* CodeGeneratorResponse_File::release_generated_code_info() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000008u;
   ::google::protobuf::GeneratedCodeInfo* released = _impl_.generated_code_info_;
@@ -1801,7 +1801,7 @@ inline ::google::protobuf::GeneratedCodeInfo* CodeGeneratorResponse_File::releas
   return released;
 }
 inline ::google::protobuf::GeneratedCodeInfo* CodeGeneratorResponse_File::unsafe_arena_release_generated_code_info() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.compiler.CodeGeneratorResponse.File.generated_code_info)
 
   _impl_._has_bits_[0] &= ~0x00000008u;
@@ -1810,7 +1810,7 @@ inline ::google::protobuf::GeneratedCodeInfo* CodeGeneratorResponse_File::unsafe
   return temp;
 }
 inline ::google::protobuf::GeneratedCodeInfo* CodeGeneratorResponse_File::_internal_mutable_generated_code_info() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   if (_impl_.generated_code_info_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::GeneratedCodeInfo>(GetArenaForAllocation());
@@ -1825,7 +1825,7 @@ inline ::google::protobuf::GeneratedCodeInfo* CodeGeneratorResponse_File::mutabl
 }
 inline void CodeGeneratorResponse_File::set_allocated_generated_code_info(::google::protobuf::GeneratedCodeInfo* value) {
   ::google::protobuf::Arena* message_arena = GetArenaForAllocation();
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.generated_code_info_);
   }
@@ -1865,7 +1865,7 @@ inline const std::string& CodeGeneratorResponse::error() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void CodeGeneratorResponse::set_error(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.error_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.compiler.CodeGeneratorResponse.error)
@@ -1876,21 +1876,21 @@ inline std::string* CodeGeneratorResponse::mutable_error() {
   return _s;
 }
 inline const std::string& CodeGeneratorResponse::_internal_error() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.error_.Get();
 }
 inline void CodeGeneratorResponse::_internal_set_error(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.error_.Set(value, GetArenaForAllocation());
 }
 inline std::string* CodeGeneratorResponse::_internal_mutable_error() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.error_.Mutable( GetArenaForAllocation());
 }
 inline std::string* CodeGeneratorResponse::release_error() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.compiler.CodeGeneratorResponse.error)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -1903,7 +1903,7 @@ inline std::string* CodeGeneratorResponse::release_error() {
   return released;
 }
 inline void CodeGeneratorResponse::set_allocated_error(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -1936,11 +1936,11 @@ inline void CodeGeneratorResponse::set_supported_features(::uint64_t value) {
   // @@protoc_insertion_point(field_set:google.protobuf.compiler.CodeGeneratorResponse.supported_features)
 }
 inline ::uint64_t CodeGeneratorResponse::_internal_supported_features() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.supported_features_;
 }
 inline void CodeGeneratorResponse::_internal_set_supported_features(::uint64_t value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.supported_features_ = value;
 }
@@ -1962,7 +1962,7 @@ inline ::google::protobuf::compiler::CodeGeneratorResponse_File* CodeGeneratorRe
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::compiler::CodeGeneratorResponse_File >*
 CodeGeneratorResponse::mutable_file() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.compiler.CodeGeneratorResponse.file)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_file();
 }
 inline const ::google::protobuf::compiler::CodeGeneratorResponse_File& CodeGeneratorResponse::file(int index) const {
@@ -1970,7 +1970,7 @@ inline const ::google::protobuf::compiler::CodeGeneratorResponse_File& CodeGener
     return _internal_file().Get(index);
 }
 inline ::google::protobuf::compiler::CodeGeneratorResponse_File* CodeGeneratorResponse::add_file() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::compiler::CodeGeneratorResponse_File* _add = _internal_mutable_file()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.compiler.CodeGeneratorResponse.file)
   return _add;
@@ -1982,12 +1982,12 @@ CodeGeneratorResponse::file() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::compiler::CodeGeneratorResponse_File>&
 CodeGeneratorResponse::_internal_file() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.file_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::compiler::CodeGeneratorResponse_File>*
 CodeGeneratorResponse::_internal_mutable_file() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.file_;
 }
 
diff --git a/src/google/protobuf/cpp_features.pb.h b/src/google/protobuf/cpp_features.pb.h
index 37b61e6c14..d6f4947ee2 100644
--- a/src/google/protobuf/cpp_features.pb.h
+++ b/src/google/protobuf/cpp_features.pb.h
@@ -271,11 +271,11 @@ inline void CppFeatures::set_legacy_closed_enum(bool value) {
   // @@protoc_insertion_point(field_set:pb.CppFeatures.legacy_closed_enum)
 }
 inline bool CppFeatures::_internal_legacy_closed_enum() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.legacy_closed_enum_;
 }
 inline void CppFeatures::_internal_set_legacy_closed_enum(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.legacy_closed_enum_ = value;
 }
diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h
index 82627cc43d..b1d88ae945 100644
--- a/src/google/protobuf/descriptor.pb.h
+++ b/src/google/protobuf/descriptor.pb.h
@@ -9741,7 +9741,7 @@ inline ::google::protobuf::FileDescriptorProto* FileDescriptorSet::mutable_file(
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::FileDescriptorProto >*
 FileDescriptorSet::mutable_file() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorSet.file)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_file();
 }
 inline const ::google::protobuf::FileDescriptorProto& FileDescriptorSet::file(int index) const {
@@ -9749,7 +9749,7 @@ inline const ::google::protobuf::FileDescriptorProto& FileDescriptorSet::file(in
     return _internal_file().Get(index);
 }
 inline ::google::protobuf::FileDescriptorProto* FileDescriptorSet::add_file() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::FileDescriptorProto* _add = _internal_mutable_file()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorSet.file)
   return _add;
@@ -9761,12 +9761,12 @@ FileDescriptorSet::file() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::FileDescriptorProto>&
 FileDescriptorSet::_internal_file() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.file_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::FileDescriptorProto>*
 FileDescriptorSet::_internal_mutable_file() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.file_;
 }
 
@@ -9790,7 +9790,7 @@ inline const std::string& FileDescriptorProto::name() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void FileDescriptorProto::set_name(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.name)
@@ -9801,21 +9801,21 @@ inline std::string* FileDescriptorProto::mutable_name() {
   return _s;
 }
 inline const std::string& FileDescriptorProto::_internal_name() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.name_.Get();
 }
 inline void FileDescriptorProto::_internal_set_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FileDescriptorProto::_internal_mutable_name() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.name_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FileDescriptorProto::release_name() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileDescriptorProto.name)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -9828,7 +9828,7 @@ inline std::string* FileDescriptorProto::release_name() {
   return released;
 }
 inline void FileDescriptorProto::set_allocated_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -9859,7 +9859,7 @@ inline const std::string& FileDescriptorProto::package() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void FileDescriptorProto::set_package(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.package_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.package)
@@ -9870,21 +9870,21 @@ inline std::string* FileDescriptorProto::mutable_package() {
   return _s;
 }
 inline const std::string& FileDescriptorProto::_internal_package() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.package_.Get();
 }
 inline void FileDescriptorProto::_internal_set_package(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.package_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FileDescriptorProto::_internal_mutable_package() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   return _impl_.package_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FileDescriptorProto::release_package() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileDescriptorProto.package)
   if ((_impl_._has_bits_[0] & 0x00000002u) == 0) {
     return nullptr;
@@ -9897,7 +9897,7 @@ inline std::string* FileDescriptorProto::release_package() {
   return released;
 }
 inline void FileDescriptorProto::set_allocated_package(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000002u;
   } else {
@@ -9923,7 +9923,7 @@ inline void FileDescriptorProto::clear_dependency() {
   _internal_mutable_dependency()->Clear();
 }
 inline std::string* FileDescriptorProto::add_dependency() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   std::string* _s = _internal_mutable_dependency()->Add();
   // @@protoc_insertion_point(field_add_mutable:google.protobuf.FileDescriptorProto.dependency)
   return _s;
@@ -9961,29 +9961,29 @@ inline void FileDescriptorProto::set_dependency(int index, absl::string_view val
   // @@protoc_insertion_point(field_set_string_piece:google.protobuf.FileDescriptorProto.dependency)
 }
 inline void FileDescriptorProto::add_dependency(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_dependency()->Add()->assign(value);
   // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.dependency)
 }
 inline void FileDescriptorProto::add_dependency(std::string&& value) {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_dependency()->Add(std::move(value));
   // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.dependency)
 }
 inline void FileDescriptorProto::add_dependency(const char* value) {
   ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_dependency()->Add()->assign(value);
   // @@protoc_insertion_point(field_add_char:google.protobuf.FileDescriptorProto.dependency)
 }
 inline void FileDescriptorProto::add_dependency(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_dependency()->Add()->assign(
       reinterpret_cast<const char*>(value), size);
   // @@protoc_insertion_point(field_add_pointer:google.protobuf.FileDescriptorProto.dependency)
 }
 inline void FileDescriptorProto::add_dependency(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_dependency()->Add()->assign(value.data(), value.size());
   // @@protoc_insertion_point(field_add_string_piece:google.protobuf.FileDescriptorProto.dependency)
 }
@@ -9994,17 +9994,17 @@ FileDescriptorProto::dependency() const {
 }
 inline ::google::protobuf::RepeatedPtrField<std::string>* FileDescriptorProto::mutable_dependency() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.dependency)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_dependency();
 }
 inline const ::google::protobuf::RepeatedPtrField<std::string>&
 FileDescriptorProto::_internal_dependency() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.dependency_;
 }
 inline ::google::protobuf::RepeatedPtrField<std::string>*
 FileDescriptorProto::_internal_mutable_dependency() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.dependency_;
 }
 
@@ -10027,7 +10027,7 @@ inline void FileDescriptorProto::set_public_dependency(int index, ::int32_t valu
   // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.public_dependency)
 }
 inline void FileDescriptorProto::add_public_dependency(::int32_t value) {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_public_dependency()->Add(value);
   // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.public_dependency)
 }
@@ -10037,16 +10037,16 @@ inline const ::google::protobuf::RepeatedField<::int32_t>& FileDescriptorProto::
 }
 inline ::google::protobuf::RepeatedField<::int32_t>* FileDescriptorProto::mutable_public_dependency() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.public_dependency)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_public_dependency();
 }
 
 inline const ::google::protobuf::RepeatedField<::int32_t>& FileDescriptorProto::_internal_public_dependency() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.public_dependency_;
 }
 inline ::google::protobuf::RepeatedField<::int32_t>* FileDescriptorProto::_internal_mutable_public_dependency() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.public_dependency_;
 }
 
@@ -10069,7 +10069,7 @@ inline void FileDescriptorProto::set_weak_dependency(int index, ::int32_t value)
   // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.weak_dependency)
 }
 inline void FileDescriptorProto::add_weak_dependency(::int32_t value) {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_weak_dependency()->Add(value);
   // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.weak_dependency)
 }
@@ -10079,16 +10079,16 @@ inline const ::google::protobuf::RepeatedField<::int32_t>& FileDescriptorProto::
 }
 inline ::google::protobuf::RepeatedField<::int32_t>* FileDescriptorProto::mutable_weak_dependency() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.weak_dependency)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_weak_dependency();
 }
 
 inline const ::google::protobuf::RepeatedField<::int32_t>& FileDescriptorProto::_internal_weak_dependency() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.weak_dependency_;
 }
 inline ::google::protobuf::RepeatedField<::int32_t>* FileDescriptorProto::_internal_mutable_weak_dependency() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.weak_dependency_;
 }
 
@@ -10109,7 +10109,7 @@ inline ::google::protobuf::DescriptorProto* FileDescriptorProto::mutable_message
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto >*
 FileDescriptorProto::mutable_message_type() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.message_type)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_message_type();
 }
 inline const ::google::protobuf::DescriptorProto& FileDescriptorProto::message_type(int index) const {
@@ -10117,7 +10117,7 @@ inline const ::google::protobuf::DescriptorProto& FileDescriptorProto::message_t
     return _internal_message_type().Get(index);
 }
 inline ::google::protobuf::DescriptorProto* FileDescriptorProto::add_message_type() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::DescriptorProto* _add = _internal_mutable_message_type()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.message_type)
   return _add;
@@ -10129,12 +10129,12 @@ FileDescriptorProto::message_type() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::DescriptorProto>&
 FileDescriptorProto::_internal_message_type() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.message_type_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::DescriptorProto>*
 FileDescriptorProto::_internal_mutable_message_type() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.message_type_;
 }
 
@@ -10155,7 +10155,7 @@ inline ::google::protobuf::EnumDescriptorProto* FileDescriptorProto::mutable_enu
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto >*
 FileDescriptorProto::mutable_enum_type() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.enum_type)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_enum_type();
 }
 inline const ::google::protobuf::EnumDescriptorProto& FileDescriptorProto::enum_type(int index) const {
@@ -10163,7 +10163,7 @@ inline const ::google::protobuf::EnumDescriptorProto& FileDescriptorProto::enum_
     return _internal_enum_type().Get(index);
 }
 inline ::google::protobuf::EnumDescriptorProto* FileDescriptorProto::add_enum_type() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::EnumDescriptorProto* _add = _internal_mutable_enum_type()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.enum_type)
   return _add;
@@ -10175,12 +10175,12 @@ FileDescriptorProto::enum_type() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumDescriptorProto>&
 FileDescriptorProto::_internal_enum_type() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.enum_type_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumDescriptorProto>*
 FileDescriptorProto::_internal_mutable_enum_type() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.enum_type_;
 }
 
@@ -10201,7 +10201,7 @@ inline ::google::protobuf::ServiceDescriptorProto* FileDescriptorProto::mutable_
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::ServiceDescriptorProto >*
 FileDescriptorProto::mutable_service() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.service)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_service();
 }
 inline const ::google::protobuf::ServiceDescriptorProto& FileDescriptorProto::service(int index) const {
@@ -10209,7 +10209,7 @@ inline const ::google::protobuf::ServiceDescriptorProto& FileDescriptorProto::se
     return _internal_service().Get(index);
 }
 inline ::google::protobuf::ServiceDescriptorProto* FileDescriptorProto::add_service() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::ServiceDescriptorProto* _add = _internal_mutable_service()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.service)
   return _add;
@@ -10221,12 +10221,12 @@ FileDescriptorProto::service() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::ServiceDescriptorProto>&
 FileDescriptorProto::_internal_service() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.service_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::ServiceDescriptorProto>*
 FileDescriptorProto::_internal_mutable_service() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.service_;
 }
 
@@ -10247,7 +10247,7 @@ inline ::google::protobuf::FieldDescriptorProto* FileDescriptorProto::mutable_ex
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >*
 FileDescriptorProto::mutable_extension() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.extension)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_extension();
 }
 inline const ::google::protobuf::FieldDescriptorProto& FileDescriptorProto::extension(int index) const {
@@ -10255,7 +10255,7 @@ inline const ::google::protobuf::FieldDescriptorProto& FileDescriptorProto::exte
     return _internal_extension().Get(index);
 }
 inline ::google::protobuf::FieldDescriptorProto* FileDescriptorProto::add_extension() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::FieldDescriptorProto* _add = _internal_mutable_extension()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.extension)
   return _add;
@@ -10267,12 +10267,12 @@ FileDescriptorProto::extension() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::FieldDescriptorProto>&
 FileDescriptorProto::_internal_extension() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.extension_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::FieldDescriptorProto>*
 FileDescriptorProto::_internal_mutable_extension() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.extension_;
 }
 
@@ -10287,7 +10287,7 @@ inline void FileDescriptorProto::clear_options() {
   _impl_._has_bits_[0] &= ~0x00000010u;
 }
 inline const ::google::protobuf::FileOptions& FileDescriptorProto::_internal_options() const {
-  PROTOBUF_TSAN_READ_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   const ::google::protobuf::FileOptions* p = _impl_.options_;
   return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FileOptions&>(::google::protobuf::_FileOptions_default_instance_);
 }
@@ -10296,7 +10296,7 @@ inline const ::google::protobuf::FileOptions& FileDescriptorProto::options() con
   return _internal_options();
 }
 inline void FileDescriptorProto::unsafe_arena_set_allocated_options(::google::protobuf::FileOptions* value) {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_);
   }
@@ -10309,7 +10309,7 @@ inline void FileDescriptorProto::unsafe_arena_set_allocated_options(::google::pr
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.FileDescriptorProto.options)
 }
 inline ::google::protobuf::FileOptions* FileDescriptorProto::release_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000010u;
   ::google::protobuf::FileOptions* released = _impl_.options_;
@@ -10328,7 +10328,7 @@ inline ::google::protobuf::FileOptions* FileDescriptorProto::release_options() {
   return released;
 }
 inline ::google::protobuf::FileOptions* FileDescriptorProto::unsafe_arena_release_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileDescriptorProto.options)
 
   _impl_._has_bits_[0] &= ~0x00000010u;
@@ -10337,7 +10337,7 @@ inline ::google::protobuf::FileOptions* FileDescriptorProto::unsafe_arena_releas
   return temp;
 }
 inline ::google::protobuf::FileOptions* FileDescriptorProto::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000010u;
   if (_impl_.options_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::FileOptions>(GetArenaForAllocation());
@@ -10352,7 +10352,7 @@ inline ::google::protobuf::FileOptions* FileDescriptorProto::mutable_options() {
 }
 inline void FileDescriptorProto::set_allocated_options(::google::protobuf::FileOptions* value) {
   ::google::protobuf::Arena* message_arena = GetArenaForAllocation();
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::FileOptions*>(_impl_.options_);
   }
@@ -10383,7 +10383,7 @@ inline void FileDescriptorProto::clear_source_code_info() {
   _impl_._has_bits_[0] &= ~0x00000020u;
 }
 inline const ::google::protobuf::SourceCodeInfo& FileDescriptorProto::_internal_source_code_info() const {
-  PROTOBUF_TSAN_READ_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   const ::google::protobuf::SourceCodeInfo* p = _impl_.source_code_info_;
   return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::SourceCodeInfo&>(::google::protobuf::_SourceCodeInfo_default_instance_);
 }
@@ -10392,7 +10392,7 @@ inline const ::google::protobuf::SourceCodeInfo& FileDescriptorProto::source_cod
   return _internal_source_code_info();
 }
 inline void FileDescriptorProto::unsafe_arena_set_allocated_source_code_info(::google::protobuf::SourceCodeInfo* value) {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_code_info_);
   }
@@ -10405,7 +10405,7 @@ inline void FileDescriptorProto::unsafe_arena_set_allocated_source_code_info(::g
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.FileDescriptorProto.source_code_info)
 }
 inline ::google::protobuf::SourceCodeInfo* FileDescriptorProto::release_source_code_info() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000020u;
   ::google::protobuf::SourceCodeInfo* released = _impl_.source_code_info_;
@@ -10424,7 +10424,7 @@ inline ::google::protobuf::SourceCodeInfo* FileDescriptorProto::release_source_c
   return released;
 }
 inline ::google::protobuf::SourceCodeInfo* FileDescriptorProto::unsafe_arena_release_source_code_info() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileDescriptorProto.source_code_info)
 
   _impl_._has_bits_[0] &= ~0x00000020u;
@@ -10433,7 +10433,7 @@ inline ::google::protobuf::SourceCodeInfo* FileDescriptorProto::unsafe_arena_rel
   return temp;
 }
 inline ::google::protobuf::SourceCodeInfo* FileDescriptorProto::_internal_mutable_source_code_info() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000020u;
   if (_impl_.source_code_info_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::SourceCodeInfo>(GetArenaForAllocation());
@@ -10448,7 +10448,7 @@ inline ::google::protobuf::SourceCodeInfo* FileDescriptorProto::mutable_source_c
 }
 inline void FileDescriptorProto::set_allocated_source_code_info(::google::protobuf::SourceCodeInfo* value) {
   ::google::protobuf::Arena* message_arena = GetArenaForAllocation();
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::SourceCodeInfo*>(_impl_.source_code_info_);
   }
@@ -10484,7 +10484,7 @@ inline const std::string& FileDescriptorProto::syntax() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void FileDescriptorProto::set_syntax(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.syntax_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.syntax)
@@ -10495,21 +10495,21 @@ inline std::string* FileDescriptorProto::mutable_syntax() {
   return _s;
 }
 inline const std::string& FileDescriptorProto::_internal_syntax() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.syntax_.Get();
 }
 inline void FileDescriptorProto::_internal_set_syntax(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.syntax_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FileDescriptorProto::_internal_mutable_syntax() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   return _impl_.syntax_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FileDescriptorProto::release_syntax() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileDescriptorProto.syntax)
   if ((_impl_._has_bits_[0] & 0x00000004u) == 0) {
     return nullptr;
@@ -10522,7 +10522,7 @@ inline std::string* FileDescriptorProto::release_syntax() {
   return released;
 }
 inline void FileDescriptorProto::set_allocated_syntax(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000004u;
   } else {
@@ -10553,7 +10553,7 @@ inline const std::string& FileDescriptorProto::edition() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void FileDescriptorProto::set_edition(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   _impl_.edition_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.edition)
@@ -10564,21 +10564,21 @@ inline std::string* FileDescriptorProto::mutable_edition() {
   return _s;
 }
 inline const std::string& FileDescriptorProto::_internal_edition() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.edition_.Get();
 }
 inline void FileDescriptorProto::_internal_set_edition(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   _impl_.edition_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FileDescriptorProto::_internal_mutable_edition() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   return _impl_.edition_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FileDescriptorProto::release_edition() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileDescriptorProto.edition)
   if ((_impl_._has_bits_[0] & 0x00000008u) == 0) {
     return nullptr;
@@ -10591,7 +10591,7 @@ inline std::string* FileDescriptorProto::release_edition() {
   return released;
 }
 inline void FileDescriptorProto::set_allocated_edition(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000008u;
   } else {
@@ -10628,11 +10628,11 @@ inline void DescriptorProto_ExtensionRange::set_start(::int32_t value) {
   // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ExtensionRange.start)
 }
 inline ::int32_t DescriptorProto_ExtensionRange::_internal_start() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.start_;
 }
 inline void DescriptorProto_ExtensionRange::_internal_set_start(::int32_t value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.start_ = value;
 }
@@ -10655,11 +10655,11 @@ inline void DescriptorProto_ExtensionRange::set_end(::int32_t value) {
   // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ExtensionRange.end)
 }
 inline ::int32_t DescriptorProto_ExtensionRange::_internal_end() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.end_;
 }
 inline void DescriptorProto_ExtensionRange::_internal_set_end(::int32_t value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.end_ = value;
 }
@@ -10675,7 +10675,7 @@ inline void DescriptorProto_ExtensionRange::clear_options() {
   _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const ::google::protobuf::ExtensionRangeOptions& DescriptorProto_ExtensionRange::_internal_options() const {
-  PROTOBUF_TSAN_READ_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   const ::google::protobuf::ExtensionRangeOptions* p = _impl_.options_;
   return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::ExtensionRangeOptions&>(::google::protobuf::_ExtensionRangeOptions_default_instance_);
 }
@@ -10684,7 +10684,7 @@ inline const ::google::protobuf::ExtensionRangeOptions& DescriptorProto_Extensio
   return _internal_options();
 }
 inline void DescriptorProto_ExtensionRange::unsafe_arena_set_allocated_options(::google::protobuf::ExtensionRangeOptions* value) {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_);
   }
@@ -10697,7 +10697,7 @@ inline void DescriptorProto_ExtensionRange::unsafe_arena_set_allocated_options(:
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.DescriptorProto.ExtensionRange.options)
 }
 inline ::google::protobuf::ExtensionRangeOptions* DescriptorProto_ExtensionRange::release_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000001u;
   ::google::protobuf::ExtensionRangeOptions* released = _impl_.options_;
@@ -10716,7 +10716,7 @@ inline ::google::protobuf::ExtensionRangeOptions* DescriptorProto_ExtensionRange
   return released;
 }
 inline ::google::protobuf::ExtensionRangeOptions* DescriptorProto_ExtensionRange::unsafe_arena_release_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.DescriptorProto.ExtensionRange.options)
 
   _impl_._has_bits_[0] &= ~0x00000001u;
@@ -10725,7 +10725,7 @@ inline ::google::protobuf::ExtensionRangeOptions* DescriptorProto_ExtensionRange
   return temp;
 }
 inline ::google::protobuf::ExtensionRangeOptions* DescriptorProto_ExtensionRange::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   if (_impl_.options_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::ExtensionRangeOptions>(GetArenaForAllocation());
@@ -10740,7 +10740,7 @@ inline ::google::protobuf::ExtensionRangeOptions* DescriptorProto_ExtensionRange
 }
 inline void DescriptorProto_ExtensionRange::set_allocated_options(::google::protobuf::ExtensionRangeOptions* value) {
   ::google::protobuf::Arena* message_arena = GetArenaForAllocation();
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::ExtensionRangeOptions*>(_impl_.options_);
   }
@@ -10782,11 +10782,11 @@ inline void DescriptorProto_ReservedRange::set_start(::int32_t value) {
   // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ReservedRange.start)
 }
 inline ::int32_t DescriptorProto_ReservedRange::_internal_start() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.start_;
 }
 inline void DescriptorProto_ReservedRange::_internal_set_start(::int32_t value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.start_ = value;
 }
@@ -10809,11 +10809,11 @@ inline void DescriptorProto_ReservedRange::set_end(::int32_t value) {
   // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ReservedRange.end)
 }
 inline ::int32_t DescriptorProto_ReservedRange::_internal_end() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.end_;
 }
 inline void DescriptorProto_ReservedRange::_internal_set_end(::int32_t value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.end_ = value;
 }
@@ -10838,7 +10838,7 @@ inline const std::string& DescriptorProto::name() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void DescriptorProto::set_name(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.name)
@@ -10849,21 +10849,21 @@ inline std::string* DescriptorProto::mutable_name() {
   return _s;
 }
 inline const std::string& DescriptorProto::_internal_name() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.name_.Get();
 }
 inline void DescriptorProto::_internal_set_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(value, GetArenaForAllocation());
 }
 inline std::string* DescriptorProto::_internal_mutable_name() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.name_.Mutable( GetArenaForAllocation());
 }
 inline std::string* DescriptorProto::release_name() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.DescriptorProto.name)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -10876,7 +10876,7 @@ inline std::string* DescriptorProto::release_name() {
   return released;
 }
 inline void DescriptorProto::set_allocated_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -10908,7 +10908,7 @@ inline ::google::protobuf::FieldDescriptorProto* DescriptorProto::mutable_field(
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >*
 DescriptorProto::mutable_field() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.field)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_field();
 }
 inline const ::google::protobuf::FieldDescriptorProto& DescriptorProto::field(int index) const {
@@ -10916,7 +10916,7 @@ inline const ::google::protobuf::FieldDescriptorProto& DescriptorProto::field(in
     return _internal_field().Get(index);
 }
 inline ::google::protobuf::FieldDescriptorProto* DescriptorProto::add_field() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::FieldDescriptorProto* _add = _internal_mutable_field()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.field)
   return _add;
@@ -10928,12 +10928,12 @@ DescriptorProto::field() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::FieldDescriptorProto>&
 DescriptorProto::_internal_field() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.field_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::FieldDescriptorProto>*
 DescriptorProto::_internal_mutable_field() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.field_;
 }
 
@@ -10954,7 +10954,7 @@ inline ::google::protobuf::FieldDescriptorProto* DescriptorProto::mutable_extens
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldDescriptorProto >*
 DescriptorProto::mutable_extension() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.extension)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_extension();
 }
 inline const ::google::protobuf::FieldDescriptorProto& DescriptorProto::extension(int index) const {
@@ -10962,7 +10962,7 @@ inline const ::google::protobuf::FieldDescriptorProto& DescriptorProto::extensio
     return _internal_extension().Get(index);
 }
 inline ::google::protobuf::FieldDescriptorProto* DescriptorProto::add_extension() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::FieldDescriptorProto* _add = _internal_mutable_extension()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.extension)
   return _add;
@@ -10974,12 +10974,12 @@ DescriptorProto::extension() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::FieldDescriptorProto>&
 DescriptorProto::_internal_extension() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.extension_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::FieldDescriptorProto>*
 DescriptorProto::_internal_mutable_extension() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.extension_;
 }
 
@@ -11000,7 +11000,7 @@ inline ::google::protobuf::DescriptorProto* DescriptorProto::mutable_nested_type
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto >*
 DescriptorProto::mutable_nested_type() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.nested_type)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_nested_type();
 }
 inline const ::google::protobuf::DescriptorProto& DescriptorProto::nested_type(int index) const {
@@ -11008,7 +11008,7 @@ inline const ::google::protobuf::DescriptorProto& DescriptorProto::nested_type(i
     return _internal_nested_type().Get(index);
 }
 inline ::google::protobuf::DescriptorProto* DescriptorProto::add_nested_type() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::DescriptorProto* _add = _internal_mutable_nested_type()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.nested_type)
   return _add;
@@ -11020,12 +11020,12 @@ DescriptorProto::nested_type() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::DescriptorProto>&
 DescriptorProto::_internal_nested_type() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.nested_type_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::DescriptorProto>*
 DescriptorProto::_internal_mutable_nested_type() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.nested_type_;
 }
 
@@ -11046,7 +11046,7 @@ inline ::google::protobuf::EnumDescriptorProto* DescriptorProto::mutable_enum_ty
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto >*
 DescriptorProto::mutable_enum_type() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.enum_type)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_enum_type();
 }
 inline const ::google::protobuf::EnumDescriptorProto& DescriptorProto::enum_type(int index) const {
@@ -11054,7 +11054,7 @@ inline const ::google::protobuf::EnumDescriptorProto& DescriptorProto::enum_type
     return _internal_enum_type().Get(index);
 }
 inline ::google::protobuf::EnumDescriptorProto* DescriptorProto::add_enum_type() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::EnumDescriptorProto* _add = _internal_mutable_enum_type()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.enum_type)
   return _add;
@@ -11066,12 +11066,12 @@ DescriptorProto::enum_type() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumDescriptorProto>&
 DescriptorProto::_internal_enum_type() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.enum_type_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumDescriptorProto>*
 DescriptorProto::_internal_mutable_enum_type() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.enum_type_;
 }
 
@@ -11092,7 +11092,7 @@ inline ::google::protobuf::DescriptorProto_ExtensionRange* DescriptorProto::muta
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto_ExtensionRange >*
 DescriptorProto::mutable_extension_range() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.extension_range)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_extension_range();
 }
 inline const ::google::protobuf::DescriptorProto_ExtensionRange& DescriptorProto::extension_range(int index) const {
@@ -11100,7 +11100,7 @@ inline const ::google::protobuf::DescriptorProto_ExtensionRange& DescriptorProto
     return _internal_extension_range().Get(index);
 }
 inline ::google::protobuf::DescriptorProto_ExtensionRange* DescriptorProto::add_extension_range() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::DescriptorProto_ExtensionRange* _add = _internal_mutable_extension_range()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.extension_range)
   return _add;
@@ -11112,12 +11112,12 @@ DescriptorProto::extension_range() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::DescriptorProto_ExtensionRange>&
 DescriptorProto::_internal_extension_range() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.extension_range_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::DescriptorProto_ExtensionRange>*
 DescriptorProto::_internal_mutable_extension_range() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.extension_range_;
 }
 
@@ -11138,7 +11138,7 @@ inline ::google::protobuf::OneofDescriptorProto* DescriptorProto::mutable_oneof_
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::OneofDescriptorProto >*
 DescriptorProto::mutable_oneof_decl() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.oneof_decl)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_oneof_decl();
 }
 inline const ::google::protobuf::OneofDescriptorProto& DescriptorProto::oneof_decl(int index) const {
@@ -11146,7 +11146,7 @@ inline const ::google::protobuf::OneofDescriptorProto& DescriptorProto::oneof_de
     return _internal_oneof_decl().Get(index);
 }
 inline ::google::protobuf::OneofDescriptorProto* DescriptorProto::add_oneof_decl() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::OneofDescriptorProto* _add = _internal_mutable_oneof_decl()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.oneof_decl)
   return _add;
@@ -11158,12 +11158,12 @@ DescriptorProto::oneof_decl() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::OneofDescriptorProto>&
 DescriptorProto::_internal_oneof_decl() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.oneof_decl_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::OneofDescriptorProto>*
 DescriptorProto::_internal_mutable_oneof_decl() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.oneof_decl_;
 }
 
@@ -11178,7 +11178,7 @@ inline void DescriptorProto::clear_options() {
   _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::google::protobuf::MessageOptions& DescriptorProto::_internal_options() const {
-  PROTOBUF_TSAN_READ_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   const ::google::protobuf::MessageOptions* p = _impl_.options_;
   return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::MessageOptions&>(::google::protobuf::_MessageOptions_default_instance_);
 }
@@ -11187,7 +11187,7 @@ inline const ::google::protobuf::MessageOptions& DescriptorProto::options() cons
   return _internal_options();
 }
 inline void DescriptorProto::unsafe_arena_set_allocated_options(::google::protobuf::MessageOptions* value) {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_);
   }
@@ -11200,7 +11200,7 @@ inline void DescriptorProto::unsafe_arena_set_allocated_options(::google::protob
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.DescriptorProto.options)
 }
 inline ::google::protobuf::MessageOptions* DescriptorProto::release_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000002u;
   ::google::protobuf::MessageOptions* released = _impl_.options_;
@@ -11219,7 +11219,7 @@ inline ::google::protobuf::MessageOptions* DescriptorProto::release_options() {
   return released;
 }
 inline ::google::protobuf::MessageOptions* DescriptorProto::unsafe_arena_release_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.DescriptorProto.options)
 
   _impl_._has_bits_[0] &= ~0x00000002u;
@@ -11228,7 +11228,7 @@ inline ::google::protobuf::MessageOptions* DescriptorProto::unsafe_arena_release
   return temp;
 }
 inline ::google::protobuf::MessageOptions* DescriptorProto::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   if (_impl_.options_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::MessageOptions>(GetArenaForAllocation());
@@ -11243,7 +11243,7 @@ inline ::google::protobuf::MessageOptions* DescriptorProto::mutable_options() {
 }
 inline void DescriptorProto::set_allocated_options(::google::protobuf::MessageOptions* value) {
   ::google::protobuf::Arena* message_arena = GetArenaForAllocation();
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageOptions*>(_impl_.options_);
   }
@@ -11280,7 +11280,7 @@ inline ::google::protobuf::DescriptorProto_ReservedRange* DescriptorProto::mutab
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::DescriptorProto_ReservedRange >*
 DescriptorProto::mutable_reserved_range() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.reserved_range)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_reserved_range();
 }
 inline const ::google::protobuf::DescriptorProto_ReservedRange& DescriptorProto::reserved_range(int index) const {
@@ -11288,7 +11288,7 @@ inline const ::google::protobuf::DescriptorProto_ReservedRange& DescriptorProto:
     return _internal_reserved_range().Get(index);
 }
 inline ::google::protobuf::DescriptorProto_ReservedRange* DescriptorProto::add_reserved_range() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::DescriptorProto_ReservedRange* _add = _internal_mutable_reserved_range()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.reserved_range)
   return _add;
@@ -11300,12 +11300,12 @@ DescriptorProto::reserved_range() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::DescriptorProto_ReservedRange>&
 DescriptorProto::_internal_reserved_range() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.reserved_range_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::DescriptorProto_ReservedRange>*
 DescriptorProto::_internal_mutable_reserved_range() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.reserved_range_;
 }
 
@@ -11320,7 +11320,7 @@ inline void DescriptorProto::clear_reserved_name() {
   _internal_mutable_reserved_name()->Clear();
 }
 inline std::string* DescriptorProto::add_reserved_name() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   std::string* _s = _internal_mutable_reserved_name()->Add();
   // @@protoc_insertion_point(field_add_mutable:google.protobuf.DescriptorProto.reserved_name)
   return _s;
@@ -11358,29 +11358,29 @@ inline void DescriptorProto::set_reserved_name(int index, absl::string_view valu
   // @@protoc_insertion_point(field_set_string_piece:google.protobuf.DescriptorProto.reserved_name)
 }
 inline void DescriptorProto::add_reserved_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_reserved_name()->Add()->assign(value);
   // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.reserved_name)
 }
 inline void DescriptorProto::add_reserved_name(std::string&& value) {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_reserved_name()->Add(std::move(value));
   // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.reserved_name)
 }
 inline void DescriptorProto::add_reserved_name(const char* value) {
   ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_reserved_name()->Add()->assign(value);
   // @@protoc_insertion_point(field_add_char:google.protobuf.DescriptorProto.reserved_name)
 }
 inline void DescriptorProto::add_reserved_name(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_reserved_name()->Add()->assign(
       reinterpret_cast<const char*>(value), size);
   // @@protoc_insertion_point(field_add_pointer:google.protobuf.DescriptorProto.reserved_name)
 }
 inline void DescriptorProto::add_reserved_name(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_reserved_name()->Add()->assign(value.data(), value.size());
   // @@protoc_insertion_point(field_add_string_piece:google.protobuf.DescriptorProto.reserved_name)
 }
@@ -11391,17 +11391,17 @@ DescriptorProto::reserved_name() const {
 }
 inline ::google::protobuf::RepeatedPtrField<std::string>* DescriptorProto::mutable_reserved_name() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.reserved_name)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_reserved_name();
 }
 inline const ::google::protobuf::RepeatedPtrField<std::string>&
 DescriptorProto::_internal_reserved_name() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.reserved_name_;
 }
 inline ::google::protobuf::RepeatedPtrField<std::string>*
 DescriptorProto::_internal_mutable_reserved_name() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.reserved_name_;
 }
 
@@ -11427,11 +11427,11 @@ inline void ExtensionRangeOptions_Declaration::set_number(::int32_t value) {
   // @@protoc_insertion_point(field_set:google.protobuf.ExtensionRangeOptions.Declaration.number)
 }
 inline ::int32_t ExtensionRangeOptions_Declaration::_internal_number() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.number_;
 }
 inline void ExtensionRangeOptions_Declaration::_internal_set_number(::int32_t value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.number_ = value;
 }
@@ -11452,7 +11452,7 @@ inline const std::string& ExtensionRangeOptions_Declaration::full_name() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void ExtensionRangeOptions_Declaration::set_full_name(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.full_name_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.ExtensionRangeOptions.Declaration.full_name)
@@ -11463,21 +11463,21 @@ inline std::string* ExtensionRangeOptions_Declaration::mutable_full_name() {
   return _s;
 }
 inline const std::string& ExtensionRangeOptions_Declaration::_internal_full_name() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.full_name_.Get();
 }
 inline void ExtensionRangeOptions_Declaration::_internal_set_full_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.full_name_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ExtensionRangeOptions_Declaration::_internal_mutable_full_name() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.full_name_.Mutable( GetArenaForAllocation());
 }
 inline std::string* ExtensionRangeOptions_Declaration::release_full_name() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.ExtensionRangeOptions.Declaration.full_name)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -11490,7 +11490,7 @@ inline std::string* ExtensionRangeOptions_Declaration::release_full_name() {
   return released;
 }
 inline void ExtensionRangeOptions_Declaration::set_allocated_full_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -11521,7 +11521,7 @@ inline const std::string& ExtensionRangeOptions_Declaration::type() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void ExtensionRangeOptions_Declaration::set_type(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.type_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.ExtensionRangeOptions.Declaration.type)
@@ -11532,21 +11532,21 @@ inline std::string* ExtensionRangeOptions_Declaration::mutable_type() {
   return _s;
 }
 inline const std::string& ExtensionRangeOptions_Declaration::_internal_type() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.type_.Get();
 }
 inline void ExtensionRangeOptions_Declaration::_internal_set_type(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.type_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ExtensionRangeOptions_Declaration::_internal_mutable_type() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   return _impl_.type_.Mutable( GetArenaForAllocation());
 }
 inline std::string* ExtensionRangeOptions_Declaration::release_type() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.ExtensionRangeOptions.Declaration.type)
   if ((_impl_._has_bits_[0] & 0x00000002u) == 0) {
     return nullptr;
@@ -11559,7 +11559,7 @@ inline std::string* ExtensionRangeOptions_Declaration::release_type() {
   return released;
 }
 inline void ExtensionRangeOptions_Declaration::set_allocated_type(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000002u;
   } else {
@@ -11592,11 +11592,11 @@ inline void ExtensionRangeOptions_Declaration::set_reserved(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.ExtensionRangeOptions.Declaration.reserved)
 }
 inline bool ExtensionRangeOptions_Declaration::_internal_reserved() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.reserved_;
 }
 inline void ExtensionRangeOptions_Declaration::_internal_set_reserved(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   _impl_.reserved_ = value;
 }
@@ -11619,11 +11619,11 @@ inline void ExtensionRangeOptions_Declaration::set_repeated(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.ExtensionRangeOptions.Declaration.repeated)
 }
 inline bool ExtensionRangeOptions_Declaration::_internal_repeated() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.repeated_;
 }
 inline void ExtensionRangeOptions_Declaration::_internal_set_repeated(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000010u;
   _impl_.repeated_ = value;
 }
@@ -11649,7 +11649,7 @@ inline ::google::protobuf::UninterpretedOption* ExtensionRangeOptions::mutable_u
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
 ExtensionRangeOptions::mutable_uninterpreted_option() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.ExtensionRangeOptions.uninterpreted_option)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_uninterpreted_option();
 }
 inline const ::google::protobuf::UninterpretedOption& ExtensionRangeOptions::uninterpreted_option(int index) const {
@@ -11657,7 +11657,7 @@ inline const ::google::protobuf::UninterpretedOption& ExtensionRangeOptions::uni
     return _internal_uninterpreted_option().Get(index);
 }
 inline ::google::protobuf::UninterpretedOption* ExtensionRangeOptions::add_uninterpreted_option() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::UninterpretedOption* _add = _internal_mutable_uninterpreted_option()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.ExtensionRangeOptions.uninterpreted_option)
   return _add;
@@ -11669,12 +11669,12 @@ ExtensionRangeOptions::uninterpreted_option() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>&
 ExtensionRangeOptions::_internal_uninterpreted_option() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.uninterpreted_option_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>*
 ExtensionRangeOptions::_internal_mutable_uninterpreted_option() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.uninterpreted_option_;
 }
 
@@ -11695,7 +11695,7 @@ inline ::google::protobuf::ExtensionRangeOptions_Declaration* ExtensionRangeOpti
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::ExtensionRangeOptions_Declaration >*
 ExtensionRangeOptions::mutable_declaration() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.ExtensionRangeOptions.declaration)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_declaration();
 }
 inline const ::google::protobuf::ExtensionRangeOptions_Declaration& ExtensionRangeOptions::declaration(int index) const {
@@ -11703,7 +11703,7 @@ inline const ::google::protobuf::ExtensionRangeOptions_Declaration& ExtensionRan
     return _internal_declaration().Get(index);
 }
 inline ::google::protobuf::ExtensionRangeOptions_Declaration* ExtensionRangeOptions::add_declaration() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::ExtensionRangeOptions_Declaration* _add = _internal_mutable_declaration()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.ExtensionRangeOptions.declaration)
   return _add;
@@ -11715,12 +11715,12 @@ ExtensionRangeOptions::declaration() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::ExtensionRangeOptions_Declaration>&
 ExtensionRangeOptions::_internal_declaration() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.declaration_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::ExtensionRangeOptions_Declaration>*
 ExtensionRangeOptions::_internal_mutable_declaration() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.declaration_;
 }
 
@@ -11735,7 +11735,7 @@ inline void ExtensionRangeOptions::clear_features() {
   _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const ::google::protobuf::FeatureSet& ExtensionRangeOptions::_internal_features() const {
-  PROTOBUF_TSAN_READ_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   const ::google::protobuf::FeatureSet* p = _impl_.features_;
   return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_default_instance_);
 }
@@ -11744,7 +11744,7 @@ inline const ::google::protobuf::FeatureSet& ExtensionRangeOptions::features() c
   return _internal_features();
 }
 inline void ExtensionRangeOptions::unsafe_arena_set_allocated_features(::google::protobuf::FeatureSet* value) {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.features_);
   }
@@ -11757,7 +11757,7 @@ inline void ExtensionRangeOptions::unsafe_arena_set_allocated_features(::google:
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.ExtensionRangeOptions.features)
 }
 inline ::google::protobuf::FeatureSet* ExtensionRangeOptions::release_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000001u;
   ::google::protobuf::FeatureSet* released = _impl_.features_;
@@ -11776,7 +11776,7 @@ inline ::google::protobuf::FeatureSet* ExtensionRangeOptions::release_features()
   return released;
 }
 inline ::google::protobuf::FeatureSet* ExtensionRangeOptions::unsafe_arena_release_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.ExtensionRangeOptions.features)
 
   _impl_._has_bits_[0] &= ~0x00000001u;
@@ -11785,7 +11785,7 @@ inline ::google::protobuf::FeatureSet* ExtensionRangeOptions::unsafe_arena_relea
   return temp;
 }
 inline ::google::protobuf::FeatureSet* ExtensionRangeOptions::_internal_mutable_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   if (_impl_.features_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArenaForAllocation());
@@ -11800,7 +11800,7 @@ inline ::google::protobuf::FeatureSet* ExtensionRangeOptions::mutable_features()
 }
 inline void ExtensionRangeOptions::set_allocated_features(::google::protobuf::FeatureSet* value) {
   ::google::protobuf::Arena* message_arena = GetArenaForAllocation();
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::FeatureSet*>(_impl_.features_);
   }
@@ -11838,11 +11838,11 @@ inline void ExtensionRangeOptions::set_verification(::google::protobuf::Extensio
   // @@protoc_insertion_point(field_set:google.protobuf.ExtensionRangeOptions.verification)
 }
 inline ::google::protobuf::ExtensionRangeOptions_VerificationState ExtensionRangeOptions::_internal_verification() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return static_cast<::google::protobuf::ExtensionRangeOptions_VerificationState>(_impl_.verification_);
 }
 inline void ExtensionRangeOptions::_internal_set_verification(::google::protobuf::ExtensionRangeOptions_VerificationState value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   assert(::google::protobuf::ExtensionRangeOptions_VerificationState_IsValid(value));
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.verification_ = value;
@@ -11868,7 +11868,7 @@ inline const std::string& FieldDescriptorProto::name() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void FieldDescriptorProto::set_name(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.name)
@@ -11879,21 +11879,21 @@ inline std::string* FieldDescriptorProto::mutable_name() {
   return _s;
 }
 inline const std::string& FieldDescriptorProto::_internal_name() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.name_.Get();
 }
 inline void FieldDescriptorProto::_internal_set_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FieldDescriptorProto::_internal_mutable_name() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.name_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FieldDescriptorProto::release_name() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.name)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -11906,7 +11906,7 @@ inline std::string* FieldDescriptorProto::release_name() {
   return released;
 }
 inline void FieldDescriptorProto::set_allocated_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -11939,11 +11939,11 @@ inline void FieldDescriptorProto::set_number(::int32_t value) {
   // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.number)
 }
 inline ::int32_t FieldDescriptorProto::_internal_number() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.number_;
 }
 inline void FieldDescriptorProto::_internal_set_number(::int32_t value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000040u;
   _impl_.number_ = value;
 }
@@ -11966,11 +11966,11 @@ inline void FieldDescriptorProto::set_label(::google::protobuf::FieldDescriptorP
   // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.label)
 }
 inline ::google::protobuf::FieldDescriptorProto_Label FieldDescriptorProto::_internal_label() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return static_cast<::google::protobuf::FieldDescriptorProto_Label>(_impl_.label_);
 }
 inline void FieldDescriptorProto::_internal_set_label(::google::protobuf::FieldDescriptorProto_Label value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   assert(::google::protobuf::FieldDescriptorProto_Label_IsValid(value));
   _impl_._has_bits_[0] |= 0x00000200u;
   _impl_.label_ = value;
@@ -11994,11 +11994,11 @@ inline void FieldDescriptorProto::set_type(::google::protobuf::FieldDescriptorPr
   // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.type)
 }
 inline ::google::protobuf::FieldDescriptorProto_Type FieldDescriptorProto::_internal_type() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return static_cast<::google::protobuf::FieldDescriptorProto_Type>(_impl_.type_);
 }
 inline void FieldDescriptorProto::_internal_set_type(::google::protobuf::FieldDescriptorProto_Type value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   assert(::google::protobuf::FieldDescriptorProto_Type_IsValid(value));
   _impl_._has_bits_[0] |= 0x00000400u;
   _impl_.type_ = value;
@@ -12020,7 +12020,7 @@ inline const std::string& FieldDescriptorProto::type_name() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void FieldDescriptorProto::set_type_name(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.type_name_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.type_name)
@@ -12031,21 +12031,21 @@ inline std::string* FieldDescriptorProto::mutable_type_name() {
   return _s;
 }
 inline const std::string& FieldDescriptorProto::_internal_type_name() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.type_name_.Get();
 }
 inline void FieldDescriptorProto::_internal_set_type_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.type_name_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FieldDescriptorProto::_internal_mutable_type_name() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   return _impl_.type_name_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FieldDescriptorProto::release_type_name() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.type_name)
   if ((_impl_._has_bits_[0] & 0x00000004u) == 0) {
     return nullptr;
@@ -12058,7 +12058,7 @@ inline std::string* FieldDescriptorProto::release_type_name() {
   return released;
 }
 inline void FieldDescriptorProto::set_allocated_type_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000004u;
   } else {
@@ -12089,7 +12089,7 @@ inline const std::string& FieldDescriptorProto::extendee() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void FieldDescriptorProto::set_extendee(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.extendee_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.extendee)
@@ -12100,21 +12100,21 @@ inline std::string* FieldDescriptorProto::mutable_extendee() {
   return _s;
 }
 inline const std::string& FieldDescriptorProto::_internal_extendee() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.extendee_.Get();
 }
 inline void FieldDescriptorProto::_internal_set_extendee(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.extendee_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FieldDescriptorProto::_internal_mutable_extendee() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   return _impl_.extendee_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FieldDescriptorProto::release_extendee() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.extendee)
   if ((_impl_._has_bits_[0] & 0x00000002u) == 0) {
     return nullptr;
@@ -12127,7 +12127,7 @@ inline std::string* FieldDescriptorProto::release_extendee() {
   return released;
 }
 inline void FieldDescriptorProto::set_allocated_extendee(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000002u;
   } else {
@@ -12158,7 +12158,7 @@ inline const std::string& FieldDescriptorProto::default_value() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void FieldDescriptorProto::set_default_value(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   _impl_.default_value_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.default_value)
@@ -12169,21 +12169,21 @@ inline std::string* FieldDescriptorProto::mutable_default_value() {
   return _s;
 }
 inline const std::string& FieldDescriptorProto::_internal_default_value() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.default_value_.Get();
 }
 inline void FieldDescriptorProto::_internal_set_default_value(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   _impl_.default_value_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FieldDescriptorProto::_internal_mutable_default_value() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   return _impl_.default_value_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FieldDescriptorProto::release_default_value() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.default_value)
   if ((_impl_._has_bits_[0] & 0x00000008u) == 0) {
     return nullptr;
@@ -12196,7 +12196,7 @@ inline std::string* FieldDescriptorProto::release_default_value() {
   return released;
 }
 inline void FieldDescriptorProto::set_allocated_default_value(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000008u;
   } else {
@@ -12229,11 +12229,11 @@ inline void FieldDescriptorProto::set_oneof_index(::int32_t value) {
   // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.oneof_index)
 }
 inline ::int32_t FieldDescriptorProto::_internal_oneof_index() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.oneof_index_;
 }
 inline void FieldDescriptorProto::_internal_set_oneof_index(::int32_t value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000080u;
   _impl_.oneof_index_ = value;
 }
@@ -12254,7 +12254,7 @@ inline const std::string& FieldDescriptorProto::json_name() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void FieldDescriptorProto::set_json_name(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000010u;
   _impl_.json_name_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.json_name)
@@ -12265,21 +12265,21 @@ inline std::string* FieldDescriptorProto::mutable_json_name() {
   return _s;
 }
 inline const std::string& FieldDescriptorProto::_internal_json_name() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.json_name_.Get();
 }
 inline void FieldDescriptorProto::_internal_set_json_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000010u;
   _impl_.json_name_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FieldDescriptorProto::_internal_mutable_json_name() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000010u;
   return _impl_.json_name_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FieldDescriptorProto::release_json_name() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.json_name)
   if ((_impl_._has_bits_[0] & 0x00000010u) == 0) {
     return nullptr;
@@ -12292,7 +12292,7 @@ inline std::string* FieldDescriptorProto::release_json_name() {
   return released;
 }
 inline void FieldDescriptorProto::set_allocated_json_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000010u;
   } else {
@@ -12318,7 +12318,7 @@ inline void FieldDescriptorProto::clear_options() {
   _impl_._has_bits_[0] &= ~0x00000020u;
 }
 inline const ::google::protobuf::FieldOptions& FieldDescriptorProto::_internal_options() const {
-  PROTOBUF_TSAN_READ_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   const ::google::protobuf::FieldOptions* p = _impl_.options_;
   return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FieldOptions&>(::google::protobuf::_FieldOptions_default_instance_);
 }
@@ -12327,7 +12327,7 @@ inline const ::google::protobuf::FieldOptions& FieldDescriptorProto::options() c
   return _internal_options();
 }
 inline void FieldDescriptorProto::unsafe_arena_set_allocated_options(::google::protobuf::FieldOptions* value) {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_);
   }
@@ -12340,7 +12340,7 @@ inline void FieldDescriptorProto::unsafe_arena_set_allocated_options(::google::p
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.FieldDescriptorProto.options)
 }
 inline ::google::protobuf::FieldOptions* FieldDescriptorProto::release_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000020u;
   ::google::protobuf::FieldOptions* released = _impl_.options_;
@@ -12359,7 +12359,7 @@ inline ::google::protobuf::FieldOptions* FieldDescriptorProto::release_options()
   return released;
 }
 inline ::google::protobuf::FieldOptions* FieldDescriptorProto::unsafe_arena_release_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.options)
 
   _impl_._has_bits_[0] &= ~0x00000020u;
@@ -12368,7 +12368,7 @@ inline ::google::protobuf::FieldOptions* FieldDescriptorProto::unsafe_arena_rele
   return temp;
 }
 inline ::google::protobuf::FieldOptions* FieldDescriptorProto::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000020u;
   if (_impl_.options_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::FieldOptions>(GetArenaForAllocation());
@@ -12383,7 +12383,7 @@ inline ::google::protobuf::FieldOptions* FieldDescriptorProto::mutable_options()
 }
 inline void FieldDescriptorProto::set_allocated_options(::google::protobuf::FieldOptions* value) {
   ::google::protobuf::Arena* message_arena = GetArenaForAllocation();
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::FieldOptions*>(_impl_.options_);
   }
@@ -12421,11 +12421,11 @@ inline void FieldDescriptorProto::set_proto3_optional(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.proto3_optional)
 }
 inline bool FieldDescriptorProto::_internal_proto3_optional() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.proto3_optional_;
 }
 inline void FieldDescriptorProto::_internal_set_proto3_optional(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000100u;
   _impl_.proto3_optional_ = value;
 }
@@ -12450,7 +12450,7 @@ inline const std::string& OneofDescriptorProto::name() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void OneofDescriptorProto::set_name(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.OneofDescriptorProto.name)
@@ -12461,21 +12461,21 @@ inline std::string* OneofDescriptorProto::mutable_name() {
   return _s;
 }
 inline const std::string& OneofDescriptorProto::_internal_name() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.name_.Get();
 }
 inline void OneofDescriptorProto::_internal_set_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(value, GetArenaForAllocation());
 }
 inline std::string* OneofDescriptorProto::_internal_mutable_name() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.name_.Mutable( GetArenaForAllocation());
 }
 inline std::string* OneofDescriptorProto::release_name() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.OneofDescriptorProto.name)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -12488,7 +12488,7 @@ inline std::string* OneofDescriptorProto::release_name() {
   return released;
 }
 inline void OneofDescriptorProto::set_allocated_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -12514,7 +12514,7 @@ inline void OneofDescriptorProto::clear_options() {
   _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::google::protobuf::OneofOptions& OneofDescriptorProto::_internal_options() const {
-  PROTOBUF_TSAN_READ_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   const ::google::protobuf::OneofOptions* p = _impl_.options_;
   return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::OneofOptions&>(::google::protobuf::_OneofOptions_default_instance_);
 }
@@ -12523,7 +12523,7 @@ inline const ::google::protobuf::OneofOptions& OneofDescriptorProto::options() c
   return _internal_options();
 }
 inline void OneofDescriptorProto::unsafe_arena_set_allocated_options(::google::protobuf::OneofOptions* value) {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_);
   }
@@ -12536,7 +12536,7 @@ inline void OneofDescriptorProto::unsafe_arena_set_allocated_options(::google::p
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.OneofDescriptorProto.options)
 }
 inline ::google::protobuf::OneofOptions* OneofDescriptorProto::release_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000002u;
   ::google::protobuf::OneofOptions* released = _impl_.options_;
@@ -12555,7 +12555,7 @@ inline ::google::protobuf::OneofOptions* OneofDescriptorProto::release_options()
   return released;
 }
 inline ::google::protobuf::OneofOptions* OneofDescriptorProto::unsafe_arena_release_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.OneofDescriptorProto.options)
 
   _impl_._has_bits_[0] &= ~0x00000002u;
@@ -12564,7 +12564,7 @@ inline ::google::protobuf::OneofOptions* OneofDescriptorProto::unsafe_arena_rele
   return temp;
 }
 inline ::google::protobuf::OneofOptions* OneofDescriptorProto::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   if (_impl_.options_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::OneofOptions>(GetArenaForAllocation());
@@ -12579,7 +12579,7 @@ inline ::google::protobuf::OneofOptions* OneofDescriptorProto::mutable_options()
 }
 inline void OneofDescriptorProto::set_allocated_options(::google::protobuf::OneofOptions* value) {
   ::google::protobuf::Arena* message_arena = GetArenaForAllocation();
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::OneofOptions*>(_impl_.options_);
   }
@@ -12621,11 +12621,11 @@ inline void EnumDescriptorProto_EnumReservedRange::set_start(::int32_t value) {
   // @@protoc_insertion_point(field_set:google.protobuf.EnumDescriptorProto.EnumReservedRange.start)
 }
 inline ::int32_t EnumDescriptorProto_EnumReservedRange::_internal_start() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.start_;
 }
 inline void EnumDescriptorProto_EnumReservedRange::_internal_set_start(::int32_t value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.start_ = value;
 }
@@ -12648,11 +12648,11 @@ inline void EnumDescriptorProto_EnumReservedRange::set_end(::int32_t value) {
   // @@protoc_insertion_point(field_set:google.protobuf.EnumDescriptorProto.EnumReservedRange.end)
 }
 inline ::int32_t EnumDescriptorProto_EnumReservedRange::_internal_end() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.end_;
 }
 inline void EnumDescriptorProto_EnumReservedRange::_internal_set_end(::int32_t value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.end_ = value;
 }
@@ -12677,7 +12677,7 @@ inline const std::string& EnumDescriptorProto::name() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void EnumDescriptorProto::set_name(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.EnumDescriptorProto.name)
@@ -12688,21 +12688,21 @@ inline std::string* EnumDescriptorProto::mutable_name() {
   return _s;
 }
 inline const std::string& EnumDescriptorProto::_internal_name() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.name_.Get();
 }
 inline void EnumDescriptorProto::_internal_set_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(value, GetArenaForAllocation());
 }
 inline std::string* EnumDescriptorProto::_internal_mutable_name() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.name_.Mutable( GetArenaForAllocation());
 }
 inline std::string* EnumDescriptorProto::release_name() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.EnumDescriptorProto.name)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -12715,7 +12715,7 @@ inline std::string* EnumDescriptorProto::release_name() {
   return released;
 }
 inline void EnumDescriptorProto::set_allocated_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -12747,7 +12747,7 @@ inline ::google::protobuf::EnumValueDescriptorProto* EnumDescriptorProto::mutabl
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValueDescriptorProto >*
 EnumDescriptorProto::mutable_value() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumDescriptorProto.value)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_value();
 }
 inline const ::google::protobuf::EnumValueDescriptorProto& EnumDescriptorProto::value(int index) const {
@@ -12755,7 +12755,7 @@ inline const ::google::protobuf::EnumValueDescriptorProto& EnumDescriptorProto::
     return _internal_value().Get(index);
 }
 inline ::google::protobuf::EnumValueDescriptorProto* EnumDescriptorProto::add_value() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::EnumValueDescriptorProto* _add = _internal_mutable_value()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.EnumDescriptorProto.value)
   return _add;
@@ -12767,12 +12767,12 @@ EnumDescriptorProto::value() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumValueDescriptorProto>&
 EnumDescriptorProto::_internal_value() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.value_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumValueDescriptorProto>*
 EnumDescriptorProto::_internal_mutable_value() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.value_;
 }
 
@@ -12787,7 +12787,7 @@ inline void EnumDescriptorProto::clear_options() {
   _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::google::protobuf::EnumOptions& EnumDescriptorProto::_internal_options() const {
-  PROTOBUF_TSAN_READ_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   const ::google::protobuf::EnumOptions* p = _impl_.options_;
   return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::EnumOptions&>(::google::protobuf::_EnumOptions_default_instance_);
 }
@@ -12796,7 +12796,7 @@ inline const ::google::protobuf::EnumOptions& EnumDescriptorProto::options() con
   return _internal_options();
 }
 inline void EnumDescriptorProto::unsafe_arena_set_allocated_options(::google::protobuf::EnumOptions* value) {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_);
   }
@@ -12809,7 +12809,7 @@ inline void EnumDescriptorProto::unsafe_arena_set_allocated_options(::google::pr
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.EnumDescriptorProto.options)
 }
 inline ::google::protobuf::EnumOptions* EnumDescriptorProto::release_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000002u;
   ::google::protobuf::EnumOptions* released = _impl_.options_;
@@ -12828,7 +12828,7 @@ inline ::google::protobuf::EnumOptions* EnumDescriptorProto::release_options() {
   return released;
 }
 inline ::google::protobuf::EnumOptions* EnumDescriptorProto::unsafe_arena_release_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.EnumDescriptorProto.options)
 
   _impl_._has_bits_[0] &= ~0x00000002u;
@@ -12837,7 +12837,7 @@ inline ::google::protobuf::EnumOptions* EnumDescriptorProto::unsafe_arena_releas
   return temp;
 }
 inline ::google::protobuf::EnumOptions* EnumDescriptorProto::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   if (_impl_.options_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::EnumOptions>(GetArenaForAllocation());
@@ -12852,7 +12852,7 @@ inline ::google::protobuf::EnumOptions* EnumDescriptorProto::mutable_options() {
 }
 inline void EnumDescriptorProto::set_allocated_options(::google::protobuf::EnumOptions* value) {
   ::google::protobuf::Arena* message_arena = GetArenaForAllocation();
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::EnumOptions*>(_impl_.options_);
   }
@@ -12889,7 +12889,7 @@ inline ::google::protobuf::EnumDescriptorProto_EnumReservedRange* EnumDescriptor
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumDescriptorProto_EnumReservedRange >*
 EnumDescriptorProto::mutable_reserved_range() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumDescriptorProto.reserved_range)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_reserved_range();
 }
 inline const ::google::protobuf::EnumDescriptorProto_EnumReservedRange& EnumDescriptorProto::reserved_range(int index) const {
@@ -12897,7 +12897,7 @@ inline const ::google::protobuf::EnumDescriptorProto_EnumReservedRange& EnumDesc
     return _internal_reserved_range().Get(index);
 }
 inline ::google::protobuf::EnumDescriptorProto_EnumReservedRange* EnumDescriptorProto::add_reserved_range() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::EnumDescriptorProto_EnumReservedRange* _add = _internal_mutable_reserved_range()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.EnumDescriptorProto.reserved_range)
   return _add;
@@ -12909,12 +12909,12 @@ EnumDescriptorProto::reserved_range() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumDescriptorProto_EnumReservedRange>&
 EnumDescriptorProto::_internal_reserved_range() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.reserved_range_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumDescriptorProto_EnumReservedRange>*
 EnumDescriptorProto::_internal_mutable_reserved_range() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.reserved_range_;
 }
 
@@ -12929,7 +12929,7 @@ inline void EnumDescriptorProto::clear_reserved_name() {
   _internal_mutable_reserved_name()->Clear();
 }
 inline std::string* EnumDescriptorProto::add_reserved_name() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   std::string* _s = _internal_mutable_reserved_name()->Add();
   // @@protoc_insertion_point(field_add_mutable:google.protobuf.EnumDescriptorProto.reserved_name)
   return _s;
@@ -12967,29 +12967,29 @@ inline void EnumDescriptorProto::set_reserved_name(int index, absl::string_view
   // @@protoc_insertion_point(field_set_string_piece:google.protobuf.EnumDescriptorProto.reserved_name)
 }
 inline void EnumDescriptorProto::add_reserved_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_reserved_name()->Add()->assign(value);
   // @@protoc_insertion_point(field_add:google.protobuf.EnumDescriptorProto.reserved_name)
 }
 inline void EnumDescriptorProto::add_reserved_name(std::string&& value) {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_reserved_name()->Add(std::move(value));
   // @@protoc_insertion_point(field_add:google.protobuf.EnumDescriptorProto.reserved_name)
 }
 inline void EnumDescriptorProto::add_reserved_name(const char* value) {
   ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_reserved_name()->Add()->assign(value);
   // @@protoc_insertion_point(field_add_char:google.protobuf.EnumDescriptorProto.reserved_name)
 }
 inline void EnumDescriptorProto::add_reserved_name(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_reserved_name()->Add()->assign(
       reinterpret_cast<const char*>(value), size);
   // @@protoc_insertion_point(field_add_pointer:google.protobuf.EnumDescriptorProto.reserved_name)
 }
 inline void EnumDescriptorProto::add_reserved_name(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_reserved_name()->Add()->assign(value.data(), value.size());
   // @@protoc_insertion_point(field_add_string_piece:google.protobuf.EnumDescriptorProto.reserved_name)
 }
@@ -13000,17 +13000,17 @@ EnumDescriptorProto::reserved_name() const {
 }
 inline ::google::protobuf::RepeatedPtrField<std::string>* EnumDescriptorProto::mutable_reserved_name() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumDescriptorProto.reserved_name)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_reserved_name();
 }
 inline const ::google::protobuf::RepeatedPtrField<std::string>&
 EnumDescriptorProto::_internal_reserved_name() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.reserved_name_;
 }
 inline ::google::protobuf::RepeatedPtrField<std::string>*
 EnumDescriptorProto::_internal_mutable_reserved_name() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.reserved_name_;
 }
 
@@ -13034,7 +13034,7 @@ inline const std::string& EnumValueDescriptorProto::name() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void EnumValueDescriptorProto::set_name(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.EnumValueDescriptorProto.name)
@@ -13045,21 +13045,21 @@ inline std::string* EnumValueDescriptorProto::mutable_name() {
   return _s;
 }
 inline const std::string& EnumValueDescriptorProto::_internal_name() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.name_.Get();
 }
 inline void EnumValueDescriptorProto::_internal_set_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(value, GetArenaForAllocation());
 }
 inline std::string* EnumValueDescriptorProto::_internal_mutable_name() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.name_.Mutable( GetArenaForAllocation());
 }
 inline std::string* EnumValueDescriptorProto::release_name() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.EnumValueDescriptorProto.name)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -13072,7 +13072,7 @@ inline std::string* EnumValueDescriptorProto::release_name() {
   return released;
 }
 inline void EnumValueDescriptorProto::set_allocated_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -13105,11 +13105,11 @@ inline void EnumValueDescriptorProto::set_number(::int32_t value) {
   // @@protoc_insertion_point(field_set:google.protobuf.EnumValueDescriptorProto.number)
 }
 inline ::int32_t EnumValueDescriptorProto::_internal_number() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.number_;
 }
 inline void EnumValueDescriptorProto::_internal_set_number(::int32_t value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.number_ = value;
 }
@@ -13125,7 +13125,7 @@ inline void EnumValueDescriptorProto::clear_options() {
   _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::google::protobuf::EnumValueOptions& EnumValueDescriptorProto::_internal_options() const {
-  PROTOBUF_TSAN_READ_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   const ::google::protobuf::EnumValueOptions* p = _impl_.options_;
   return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::EnumValueOptions&>(::google::protobuf::_EnumValueOptions_default_instance_);
 }
@@ -13134,7 +13134,7 @@ inline const ::google::protobuf::EnumValueOptions& EnumValueDescriptorProto::opt
   return _internal_options();
 }
 inline void EnumValueDescriptorProto::unsafe_arena_set_allocated_options(::google::protobuf::EnumValueOptions* value) {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_);
   }
@@ -13147,7 +13147,7 @@ inline void EnumValueDescriptorProto::unsafe_arena_set_allocated_options(::googl
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.EnumValueDescriptorProto.options)
 }
 inline ::google::protobuf::EnumValueOptions* EnumValueDescriptorProto::release_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000002u;
   ::google::protobuf::EnumValueOptions* released = _impl_.options_;
@@ -13166,7 +13166,7 @@ inline ::google::protobuf::EnumValueOptions* EnumValueDescriptorProto::release_o
   return released;
 }
 inline ::google::protobuf::EnumValueOptions* EnumValueDescriptorProto::unsafe_arena_release_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.EnumValueDescriptorProto.options)
 
   _impl_._has_bits_[0] &= ~0x00000002u;
@@ -13175,7 +13175,7 @@ inline ::google::protobuf::EnumValueOptions* EnumValueDescriptorProto::unsafe_ar
   return temp;
 }
 inline ::google::protobuf::EnumValueOptions* EnumValueDescriptorProto::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   if (_impl_.options_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::EnumValueOptions>(GetArenaForAllocation());
@@ -13190,7 +13190,7 @@ inline ::google::protobuf::EnumValueOptions* EnumValueDescriptorProto::mutable_o
 }
 inline void EnumValueDescriptorProto::set_allocated_options(::google::protobuf::EnumValueOptions* value) {
   ::google::protobuf::Arena* message_arena = GetArenaForAllocation();
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::EnumValueOptions*>(_impl_.options_);
   }
@@ -13230,7 +13230,7 @@ inline const std::string& ServiceDescriptorProto::name() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void ServiceDescriptorProto::set_name(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.ServiceDescriptorProto.name)
@@ -13241,21 +13241,21 @@ inline std::string* ServiceDescriptorProto::mutable_name() {
   return _s;
 }
 inline const std::string& ServiceDescriptorProto::_internal_name() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.name_.Get();
 }
 inline void ServiceDescriptorProto::_internal_set_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ServiceDescriptorProto::_internal_mutable_name() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.name_.Mutable( GetArenaForAllocation());
 }
 inline std::string* ServiceDescriptorProto::release_name() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.ServiceDescriptorProto.name)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -13268,7 +13268,7 @@ inline std::string* ServiceDescriptorProto::release_name() {
   return released;
 }
 inline void ServiceDescriptorProto::set_allocated_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -13300,7 +13300,7 @@ inline ::google::protobuf::MethodDescriptorProto* ServiceDescriptorProto::mutabl
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::MethodDescriptorProto >*
 ServiceDescriptorProto::mutable_method() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.ServiceDescriptorProto.method)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_method();
 }
 inline const ::google::protobuf::MethodDescriptorProto& ServiceDescriptorProto::method(int index) const {
@@ -13308,7 +13308,7 @@ inline const ::google::protobuf::MethodDescriptorProto& ServiceDescriptorProto::
     return _internal_method().Get(index);
 }
 inline ::google::protobuf::MethodDescriptorProto* ServiceDescriptorProto::add_method() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::MethodDescriptorProto* _add = _internal_mutable_method()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.ServiceDescriptorProto.method)
   return _add;
@@ -13320,12 +13320,12 @@ ServiceDescriptorProto::method() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::MethodDescriptorProto>&
 ServiceDescriptorProto::_internal_method() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.method_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::MethodDescriptorProto>*
 ServiceDescriptorProto::_internal_mutable_method() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.method_;
 }
 
@@ -13340,7 +13340,7 @@ inline void ServiceDescriptorProto::clear_options() {
   _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::google::protobuf::ServiceOptions& ServiceDescriptorProto::_internal_options() const {
-  PROTOBUF_TSAN_READ_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   const ::google::protobuf::ServiceOptions* p = _impl_.options_;
   return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::ServiceOptions&>(::google::protobuf::_ServiceOptions_default_instance_);
 }
@@ -13349,7 +13349,7 @@ inline const ::google::protobuf::ServiceOptions& ServiceDescriptorProto::options
   return _internal_options();
 }
 inline void ServiceDescriptorProto::unsafe_arena_set_allocated_options(::google::protobuf::ServiceOptions* value) {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_);
   }
@@ -13362,7 +13362,7 @@ inline void ServiceDescriptorProto::unsafe_arena_set_allocated_options(::google:
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.ServiceDescriptorProto.options)
 }
 inline ::google::protobuf::ServiceOptions* ServiceDescriptorProto::release_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000002u;
   ::google::protobuf::ServiceOptions* released = _impl_.options_;
@@ -13381,7 +13381,7 @@ inline ::google::protobuf::ServiceOptions* ServiceDescriptorProto::release_optio
   return released;
 }
 inline ::google::protobuf::ServiceOptions* ServiceDescriptorProto::unsafe_arena_release_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.ServiceDescriptorProto.options)
 
   _impl_._has_bits_[0] &= ~0x00000002u;
@@ -13390,7 +13390,7 @@ inline ::google::protobuf::ServiceOptions* ServiceDescriptorProto::unsafe_arena_
   return temp;
 }
 inline ::google::protobuf::ServiceOptions* ServiceDescriptorProto::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   if (_impl_.options_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::ServiceOptions>(GetArenaForAllocation());
@@ -13405,7 +13405,7 @@ inline ::google::protobuf::ServiceOptions* ServiceDescriptorProto::mutable_optio
 }
 inline void ServiceDescriptorProto::set_allocated_options(::google::protobuf::ServiceOptions* value) {
   ::google::protobuf::Arena* message_arena = GetArenaForAllocation();
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::ServiceOptions*>(_impl_.options_);
   }
@@ -13445,7 +13445,7 @@ inline const std::string& MethodDescriptorProto::name() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void MethodDescriptorProto::set_name(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.name)
@@ -13456,21 +13456,21 @@ inline std::string* MethodDescriptorProto::mutable_name() {
   return _s;
 }
 inline const std::string& MethodDescriptorProto::_internal_name() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.name_.Get();
 }
 inline void MethodDescriptorProto::_internal_set_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(value, GetArenaForAllocation());
 }
 inline std::string* MethodDescriptorProto::_internal_mutable_name() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.name_.Mutable( GetArenaForAllocation());
 }
 inline std::string* MethodDescriptorProto::release_name() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.MethodDescriptorProto.name)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -13483,7 +13483,7 @@ inline std::string* MethodDescriptorProto::release_name() {
   return released;
 }
 inline void MethodDescriptorProto::set_allocated_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -13514,7 +13514,7 @@ inline const std::string& MethodDescriptorProto::input_type() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void MethodDescriptorProto::set_input_type(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.input_type_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.input_type)
@@ -13525,21 +13525,21 @@ inline std::string* MethodDescriptorProto::mutable_input_type() {
   return _s;
 }
 inline const std::string& MethodDescriptorProto::_internal_input_type() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.input_type_.Get();
 }
 inline void MethodDescriptorProto::_internal_set_input_type(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.input_type_.Set(value, GetArenaForAllocation());
 }
 inline std::string* MethodDescriptorProto::_internal_mutable_input_type() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   return _impl_.input_type_.Mutable( GetArenaForAllocation());
 }
 inline std::string* MethodDescriptorProto::release_input_type() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.MethodDescriptorProto.input_type)
   if ((_impl_._has_bits_[0] & 0x00000002u) == 0) {
     return nullptr;
@@ -13552,7 +13552,7 @@ inline std::string* MethodDescriptorProto::release_input_type() {
   return released;
 }
 inline void MethodDescriptorProto::set_allocated_input_type(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000002u;
   } else {
@@ -13583,7 +13583,7 @@ inline const std::string& MethodDescriptorProto::output_type() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void MethodDescriptorProto::set_output_type(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.output_type_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.output_type)
@@ -13594,21 +13594,21 @@ inline std::string* MethodDescriptorProto::mutable_output_type() {
   return _s;
 }
 inline const std::string& MethodDescriptorProto::_internal_output_type() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.output_type_.Get();
 }
 inline void MethodDescriptorProto::_internal_set_output_type(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.output_type_.Set(value, GetArenaForAllocation());
 }
 inline std::string* MethodDescriptorProto::_internal_mutable_output_type() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   return _impl_.output_type_.Mutable( GetArenaForAllocation());
 }
 inline std::string* MethodDescriptorProto::release_output_type() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.MethodDescriptorProto.output_type)
   if ((_impl_._has_bits_[0] & 0x00000004u) == 0) {
     return nullptr;
@@ -13621,7 +13621,7 @@ inline std::string* MethodDescriptorProto::release_output_type() {
   return released;
 }
 inline void MethodDescriptorProto::set_allocated_output_type(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000004u;
   } else {
@@ -13647,7 +13647,7 @@ inline void MethodDescriptorProto::clear_options() {
   _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline const ::google::protobuf::MethodOptions& MethodDescriptorProto::_internal_options() const {
-  PROTOBUF_TSAN_READ_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   const ::google::protobuf::MethodOptions* p = _impl_.options_;
   return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::MethodOptions&>(::google::protobuf::_MethodOptions_default_instance_);
 }
@@ -13656,7 +13656,7 @@ inline const ::google::protobuf::MethodOptions& MethodDescriptorProto::options()
   return _internal_options();
 }
 inline void MethodDescriptorProto::unsafe_arena_set_allocated_options(::google::protobuf::MethodOptions* value) {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_);
   }
@@ -13669,7 +13669,7 @@ inline void MethodDescriptorProto::unsafe_arena_set_allocated_options(::google::
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.MethodDescriptorProto.options)
 }
 inline ::google::protobuf::MethodOptions* MethodDescriptorProto::release_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000008u;
   ::google::protobuf::MethodOptions* released = _impl_.options_;
@@ -13688,7 +13688,7 @@ inline ::google::protobuf::MethodOptions* MethodDescriptorProto::release_options
   return released;
 }
 inline ::google::protobuf::MethodOptions* MethodDescriptorProto::unsafe_arena_release_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.MethodDescriptorProto.options)
 
   _impl_._has_bits_[0] &= ~0x00000008u;
@@ -13697,7 +13697,7 @@ inline ::google::protobuf::MethodOptions* MethodDescriptorProto::unsafe_arena_re
   return temp;
 }
 inline ::google::protobuf::MethodOptions* MethodDescriptorProto::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   if (_impl_.options_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::MethodOptions>(GetArenaForAllocation());
@@ -13712,7 +13712,7 @@ inline ::google::protobuf::MethodOptions* MethodDescriptorProto::mutable_options
 }
 inline void MethodDescriptorProto::set_allocated_options(::google::protobuf::MethodOptions* value) {
   ::google::protobuf::Arena* message_arena = GetArenaForAllocation();
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::MethodOptions*>(_impl_.options_);
   }
@@ -13750,11 +13750,11 @@ inline void MethodDescriptorProto::set_client_streaming(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.client_streaming)
 }
 inline bool MethodDescriptorProto::_internal_client_streaming() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.client_streaming_;
 }
 inline void MethodDescriptorProto::_internal_set_client_streaming(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000010u;
   _impl_.client_streaming_ = value;
 }
@@ -13777,11 +13777,11 @@ inline void MethodDescriptorProto::set_server_streaming(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.server_streaming)
 }
 inline bool MethodDescriptorProto::_internal_server_streaming() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.server_streaming_;
 }
 inline void MethodDescriptorProto::_internal_set_server_streaming(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000020u;
   _impl_.server_streaming_ = value;
 }
@@ -13806,7 +13806,7 @@ inline const std::string& FileOptions::java_package() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_java_package(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.java_package_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_package)
@@ -13817,21 +13817,21 @@ inline std::string* FileOptions::mutable_java_package() {
   return _s;
 }
 inline const std::string& FileOptions::_internal_java_package() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.java_package_.Get();
 }
 inline void FileOptions::_internal_set_java_package(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.java_package_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FileOptions::_internal_mutable_java_package() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.java_package_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FileOptions::release_java_package() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.java_package)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -13844,7 +13844,7 @@ inline std::string* FileOptions::release_java_package() {
   return released;
 }
 inline void FileOptions::set_allocated_java_package(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -13875,7 +13875,7 @@ inline const std::string& FileOptions::java_outer_classname() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_java_outer_classname(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.java_outer_classname_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_outer_classname)
@@ -13886,21 +13886,21 @@ inline std::string* FileOptions::mutable_java_outer_classname() {
   return _s;
 }
 inline const std::string& FileOptions::_internal_java_outer_classname() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.java_outer_classname_.Get();
 }
 inline void FileOptions::_internal_set_java_outer_classname(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.java_outer_classname_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FileOptions::_internal_mutable_java_outer_classname() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   return _impl_.java_outer_classname_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FileOptions::release_java_outer_classname() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.java_outer_classname)
   if ((_impl_._has_bits_[0] & 0x00000002u) == 0) {
     return nullptr;
@@ -13913,7 +13913,7 @@ inline std::string* FileOptions::release_java_outer_classname() {
   return released;
 }
 inline void FileOptions::set_allocated_java_outer_classname(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000002u;
   } else {
@@ -13946,11 +13946,11 @@ inline void FileOptions::set_java_multiple_files(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_multiple_files)
 }
 inline bool FileOptions::_internal_java_multiple_files() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.java_multiple_files_;
 }
 inline void FileOptions::_internal_set_java_multiple_files(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000800u;
   _impl_.java_multiple_files_ = value;
 }
@@ -13973,11 +13973,11 @@ inline void FileOptions::set_java_generate_equals_and_hash(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_generate_equals_and_hash)
 }
 inline bool FileOptions::_internal_java_generate_equals_and_hash() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.java_generate_equals_and_hash_;
 }
 inline void FileOptions::_internal_set_java_generate_equals_and_hash(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00001000u;
   _impl_.java_generate_equals_and_hash_ = value;
 }
@@ -14000,11 +14000,11 @@ inline void FileOptions::set_java_string_check_utf8(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_string_check_utf8)
 }
 inline bool FileOptions::_internal_java_string_check_utf8() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.java_string_check_utf8_;
 }
 inline void FileOptions::_internal_set_java_string_check_utf8(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00002000u;
   _impl_.java_string_check_utf8_ = value;
 }
@@ -14027,11 +14027,11 @@ inline void FileOptions::set_optimize_for(::google::protobuf::FileOptions_Optimi
   // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.optimize_for)
 }
 inline ::google::protobuf::FileOptions_OptimizeMode FileOptions::_internal_optimize_for() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return static_cast<::google::protobuf::FileOptions_OptimizeMode>(_impl_.optimize_for_);
 }
 inline void FileOptions::_internal_set_optimize_for(::google::protobuf::FileOptions_OptimizeMode value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   assert(::google::protobuf::FileOptions_OptimizeMode_IsValid(value));
   _impl_._has_bits_[0] |= 0x00080000u;
   _impl_.optimize_for_ = value;
@@ -14053,7 +14053,7 @@ inline const std::string& FileOptions::go_package() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_go_package(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.go_package_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.go_package)
@@ -14064,21 +14064,21 @@ inline std::string* FileOptions::mutable_go_package() {
   return _s;
 }
 inline const std::string& FileOptions::_internal_go_package() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.go_package_.Get();
 }
 inline void FileOptions::_internal_set_go_package(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.go_package_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FileOptions::_internal_mutable_go_package() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   return _impl_.go_package_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FileOptions::release_go_package() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.go_package)
   if ((_impl_._has_bits_[0] & 0x00000004u) == 0) {
     return nullptr;
@@ -14091,7 +14091,7 @@ inline std::string* FileOptions::release_go_package() {
   return released;
 }
 inline void FileOptions::set_allocated_go_package(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000004u;
   } else {
@@ -14124,11 +14124,11 @@ inline void FileOptions::set_cc_generic_services(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.cc_generic_services)
 }
 inline bool FileOptions::_internal_cc_generic_services() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.cc_generic_services_;
 }
 inline void FileOptions::_internal_set_cc_generic_services(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00004000u;
   _impl_.cc_generic_services_ = value;
 }
@@ -14151,11 +14151,11 @@ inline void FileOptions::set_java_generic_services(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_generic_services)
 }
 inline bool FileOptions::_internal_java_generic_services() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.java_generic_services_;
 }
 inline void FileOptions::_internal_set_java_generic_services(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00008000u;
   _impl_.java_generic_services_ = value;
 }
@@ -14178,11 +14178,11 @@ inline void FileOptions::set_py_generic_services(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.py_generic_services)
 }
 inline bool FileOptions::_internal_py_generic_services() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.py_generic_services_;
 }
 inline void FileOptions::_internal_set_py_generic_services(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00010000u;
   _impl_.py_generic_services_ = value;
 }
@@ -14205,11 +14205,11 @@ inline void FileOptions::set_php_generic_services(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.php_generic_services)
 }
 inline bool FileOptions::_internal_php_generic_services() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.php_generic_services_;
 }
 inline void FileOptions::_internal_set_php_generic_services(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00020000u;
   _impl_.php_generic_services_ = value;
 }
@@ -14232,11 +14232,11 @@ inline void FileOptions::set_deprecated(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.deprecated)
 }
 inline bool FileOptions::_internal_deprecated() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.deprecated_;
 }
 inline void FileOptions::_internal_set_deprecated(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00040000u;
   _impl_.deprecated_ = value;
 }
@@ -14259,11 +14259,11 @@ inline void FileOptions::set_cc_enable_arenas(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.cc_enable_arenas)
 }
 inline bool FileOptions::_internal_cc_enable_arenas() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.cc_enable_arenas_;
 }
 inline void FileOptions::_internal_set_cc_enable_arenas(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00100000u;
   _impl_.cc_enable_arenas_ = value;
 }
@@ -14284,7 +14284,7 @@ inline const std::string& FileOptions::objc_class_prefix() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_objc_class_prefix(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   _impl_.objc_class_prefix_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.objc_class_prefix)
@@ -14295,21 +14295,21 @@ inline std::string* FileOptions::mutable_objc_class_prefix() {
   return _s;
 }
 inline const std::string& FileOptions::_internal_objc_class_prefix() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.objc_class_prefix_.Get();
 }
 inline void FileOptions::_internal_set_objc_class_prefix(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   _impl_.objc_class_prefix_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FileOptions::_internal_mutable_objc_class_prefix() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   return _impl_.objc_class_prefix_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FileOptions::release_objc_class_prefix() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.objc_class_prefix)
   if ((_impl_._has_bits_[0] & 0x00000008u) == 0) {
     return nullptr;
@@ -14322,7 +14322,7 @@ inline std::string* FileOptions::release_objc_class_prefix() {
   return released;
 }
 inline void FileOptions::set_allocated_objc_class_prefix(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000008u;
   } else {
@@ -14353,7 +14353,7 @@ inline const std::string& FileOptions::csharp_namespace() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_csharp_namespace(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000010u;
   _impl_.csharp_namespace_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.csharp_namespace)
@@ -14364,21 +14364,21 @@ inline std::string* FileOptions::mutable_csharp_namespace() {
   return _s;
 }
 inline const std::string& FileOptions::_internal_csharp_namespace() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.csharp_namespace_.Get();
 }
 inline void FileOptions::_internal_set_csharp_namespace(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000010u;
   _impl_.csharp_namespace_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FileOptions::_internal_mutable_csharp_namespace() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000010u;
   return _impl_.csharp_namespace_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FileOptions::release_csharp_namespace() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.csharp_namespace)
   if ((_impl_._has_bits_[0] & 0x00000010u) == 0) {
     return nullptr;
@@ -14391,7 +14391,7 @@ inline std::string* FileOptions::release_csharp_namespace() {
   return released;
 }
 inline void FileOptions::set_allocated_csharp_namespace(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000010u;
   } else {
@@ -14422,7 +14422,7 @@ inline const std::string& FileOptions::swift_prefix() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_swift_prefix(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000020u;
   _impl_.swift_prefix_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.swift_prefix)
@@ -14433,21 +14433,21 @@ inline std::string* FileOptions::mutable_swift_prefix() {
   return _s;
 }
 inline const std::string& FileOptions::_internal_swift_prefix() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.swift_prefix_.Get();
 }
 inline void FileOptions::_internal_set_swift_prefix(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000020u;
   _impl_.swift_prefix_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FileOptions::_internal_mutable_swift_prefix() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000020u;
   return _impl_.swift_prefix_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FileOptions::release_swift_prefix() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.swift_prefix)
   if ((_impl_._has_bits_[0] & 0x00000020u) == 0) {
     return nullptr;
@@ -14460,7 +14460,7 @@ inline std::string* FileOptions::release_swift_prefix() {
   return released;
 }
 inline void FileOptions::set_allocated_swift_prefix(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000020u;
   } else {
@@ -14491,7 +14491,7 @@ inline const std::string& FileOptions::php_class_prefix() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_php_class_prefix(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000040u;
   _impl_.php_class_prefix_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.php_class_prefix)
@@ -14502,21 +14502,21 @@ inline std::string* FileOptions::mutable_php_class_prefix() {
   return _s;
 }
 inline const std::string& FileOptions::_internal_php_class_prefix() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.php_class_prefix_.Get();
 }
 inline void FileOptions::_internal_set_php_class_prefix(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000040u;
   _impl_.php_class_prefix_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FileOptions::_internal_mutable_php_class_prefix() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000040u;
   return _impl_.php_class_prefix_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FileOptions::release_php_class_prefix() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.php_class_prefix)
   if ((_impl_._has_bits_[0] & 0x00000040u) == 0) {
     return nullptr;
@@ -14529,7 +14529,7 @@ inline std::string* FileOptions::release_php_class_prefix() {
   return released;
 }
 inline void FileOptions::set_allocated_php_class_prefix(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000040u;
   } else {
@@ -14560,7 +14560,7 @@ inline const std::string& FileOptions::php_namespace() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_php_namespace(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000080u;
   _impl_.php_namespace_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.php_namespace)
@@ -14571,21 +14571,21 @@ inline std::string* FileOptions::mutable_php_namespace() {
   return _s;
 }
 inline const std::string& FileOptions::_internal_php_namespace() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.php_namespace_.Get();
 }
 inline void FileOptions::_internal_set_php_namespace(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000080u;
   _impl_.php_namespace_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FileOptions::_internal_mutable_php_namespace() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000080u;
   return _impl_.php_namespace_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FileOptions::release_php_namespace() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.php_namespace)
   if ((_impl_._has_bits_[0] & 0x00000080u) == 0) {
     return nullptr;
@@ -14598,7 +14598,7 @@ inline std::string* FileOptions::release_php_namespace() {
   return released;
 }
 inline void FileOptions::set_allocated_php_namespace(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000080u;
   } else {
@@ -14629,7 +14629,7 @@ inline const std::string& FileOptions::php_metadata_namespace() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_php_metadata_namespace(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000100u;
   _impl_.php_metadata_namespace_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.php_metadata_namespace)
@@ -14640,21 +14640,21 @@ inline std::string* FileOptions::mutable_php_metadata_namespace() {
   return _s;
 }
 inline const std::string& FileOptions::_internal_php_metadata_namespace() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.php_metadata_namespace_.Get();
 }
 inline void FileOptions::_internal_set_php_metadata_namespace(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000100u;
   _impl_.php_metadata_namespace_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FileOptions::_internal_mutable_php_metadata_namespace() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000100u;
   return _impl_.php_metadata_namespace_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FileOptions::release_php_metadata_namespace() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.php_metadata_namespace)
   if ((_impl_._has_bits_[0] & 0x00000100u) == 0) {
     return nullptr;
@@ -14667,7 +14667,7 @@ inline std::string* FileOptions::release_php_metadata_namespace() {
   return released;
 }
 inline void FileOptions::set_allocated_php_metadata_namespace(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000100u;
   } else {
@@ -14698,7 +14698,7 @@ inline const std::string& FileOptions::ruby_package() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_ruby_package(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000200u;
   _impl_.ruby_package_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.ruby_package)
@@ -14709,21 +14709,21 @@ inline std::string* FileOptions::mutable_ruby_package() {
   return _s;
 }
 inline const std::string& FileOptions::_internal_ruby_package() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.ruby_package_.Get();
 }
 inline void FileOptions::_internal_set_ruby_package(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000200u;
   _impl_.ruby_package_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FileOptions::_internal_mutable_ruby_package() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000200u;
   return _impl_.ruby_package_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FileOptions::release_ruby_package() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.ruby_package)
   if ((_impl_._has_bits_[0] & 0x00000200u) == 0) {
     return nullptr;
@@ -14736,7 +14736,7 @@ inline std::string* FileOptions::release_ruby_package() {
   return released;
 }
 inline void FileOptions::set_allocated_ruby_package(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000200u;
   } else {
@@ -14762,7 +14762,7 @@ inline void FileOptions::clear_features() {
   _impl_._has_bits_[0] &= ~0x00000400u;
 }
 inline const ::google::protobuf::FeatureSet& FileOptions::_internal_features() const {
-  PROTOBUF_TSAN_READ_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   const ::google::protobuf::FeatureSet* p = _impl_.features_;
   return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_default_instance_);
 }
@@ -14771,7 +14771,7 @@ inline const ::google::protobuf::FeatureSet& FileOptions::features() const {
   return _internal_features();
 }
 inline void FileOptions::unsafe_arena_set_allocated_features(::google::protobuf::FeatureSet* value) {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.features_);
   }
@@ -14784,7 +14784,7 @@ inline void FileOptions::unsafe_arena_set_allocated_features(::google::protobuf:
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.FileOptions.features)
 }
 inline ::google::protobuf::FeatureSet* FileOptions::release_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000400u;
   ::google::protobuf::FeatureSet* released = _impl_.features_;
@@ -14803,7 +14803,7 @@ inline ::google::protobuf::FeatureSet* FileOptions::release_features() {
   return released;
 }
 inline ::google::protobuf::FeatureSet* FileOptions::unsafe_arena_release_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.features)
 
   _impl_._has_bits_[0] &= ~0x00000400u;
@@ -14812,7 +14812,7 @@ inline ::google::protobuf::FeatureSet* FileOptions::unsafe_arena_release_feature
   return temp;
 }
 inline ::google::protobuf::FeatureSet* FileOptions::_internal_mutable_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000400u;
   if (_impl_.features_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArenaForAllocation());
@@ -14827,7 +14827,7 @@ inline ::google::protobuf::FeatureSet* FileOptions::mutable_features() {
 }
 inline void FileOptions::set_allocated_features(::google::protobuf::FeatureSet* value) {
   ::google::protobuf::Arena* message_arena = GetArenaForAllocation();
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::FeatureSet*>(_impl_.features_);
   }
@@ -14864,7 +14864,7 @@ inline ::google::protobuf::UninterpretedOption* FileOptions::mutable_uninterpret
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
 FileOptions::mutable_uninterpreted_option() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileOptions.uninterpreted_option)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_uninterpreted_option();
 }
 inline const ::google::protobuf::UninterpretedOption& FileOptions::uninterpreted_option(int index) const {
@@ -14872,7 +14872,7 @@ inline const ::google::protobuf::UninterpretedOption& FileOptions::uninterpreted
     return _internal_uninterpreted_option().Get(index);
 }
 inline ::google::protobuf::UninterpretedOption* FileOptions::add_uninterpreted_option() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::UninterpretedOption* _add = _internal_mutable_uninterpreted_option()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.FileOptions.uninterpreted_option)
   return _add;
@@ -14884,12 +14884,12 @@ FileOptions::uninterpreted_option() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>&
 FileOptions::_internal_uninterpreted_option() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.uninterpreted_option_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>*
 FileOptions::_internal_mutable_uninterpreted_option() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.uninterpreted_option_;
 }
 
@@ -14915,11 +14915,11 @@ inline void MessageOptions::set_message_set_wire_format(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.message_set_wire_format)
 }
 inline bool MessageOptions::_internal_message_set_wire_format() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.message_set_wire_format_;
 }
 inline void MessageOptions::_internal_set_message_set_wire_format(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.message_set_wire_format_ = value;
 }
@@ -14942,11 +14942,11 @@ inline void MessageOptions::set_no_standard_descriptor_accessor(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.no_standard_descriptor_accessor)
 }
 inline bool MessageOptions::_internal_no_standard_descriptor_accessor() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.no_standard_descriptor_accessor_;
 }
 inline void MessageOptions::_internal_set_no_standard_descriptor_accessor(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.no_standard_descriptor_accessor_ = value;
 }
@@ -14969,11 +14969,11 @@ inline void MessageOptions::set_deprecated(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.deprecated)
 }
 inline bool MessageOptions::_internal_deprecated() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.deprecated_;
 }
 inline void MessageOptions::_internal_set_deprecated(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   _impl_.deprecated_ = value;
 }
@@ -14996,11 +14996,11 @@ inline void MessageOptions::set_map_entry(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.map_entry)
 }
 inline bool MessageOptions::_internal_map_entry() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.map_entry_;
 }
 inline void MessageOptions::_internal_set_map_entry(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000010u;
   _impl_.map_entry_ = value;
 }
@@ -15023,11 +15023,11 @@ inline void MessageOptions::set_deprecated_legacy_json_field_conflicts(bool valu
   // @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.deprecated_legacy_json_field_conflicts)
 }
 inline bool MessageOptions::_internal_deprecated_legacy_json_field_conflicts() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.deprecated_legacy_json_field_conflicts_;
 }
 inline void MessageOptions::_internal_set_deprecated_legacy_json_field_conflicts(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000020u;
   _impl_.deprecated_legacy_json_field_conflicts_ = value;
 }
@@ -15043,7 +15043,7 @@ inline void MessageOptions::clear_features() {
   _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const ::google::protobuf::FeatureSet& MessageOptions::_internal_features() const {
-  PROTOBUF_TSAN_READ_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   const ::google::protobuf::FeatureSet* p = _impl_.features_;
   return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_default_instance_);
 }
@@ -15052,7 +15052,7 @@ inline const ::google::protobuf::FeatureSet& MessageOptions::features() const {
   return _internal_features();
 }
 inline void MessageOptions::unsafe_arena_set_allocated_features(::google::protobuf::FeatureSet* value) {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.features_);
   }
@@ -15065,7 +15065,7 @@ inline void MessageOptions::unsafe_arena_set_allocated_features(::google::protob
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.MessageOptions.features)
 }
 inline ::google::protobuf::FeatureSet* MessageOptions::release_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000001u;
   ::google::protobuf::FeatureSet* released = _impl_.features_;
@@ -15084,7 +15084,7 @@ inline ::google::protobuf::FeatureSet* MessageOptions::release_features() {
   return released;
 }
 inline ::google::protobuf::FeatureSet* MessageOptions::unsafe_arena_release_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.MessageOptions.features)
 
   _impl_._has_bits_[0] &= ~0x00000001u;
@@ -15093,7 +15093,7 @@ inline ::google::protobuf::FeatureSet* MessageOptions::unsafe_arena_release_feat
   return temp;
 }
 inline ::google::protobuf::FeatureSet* MessageOptions::_internal_mutable_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   if (_impl_.features_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArenaForAllocation());
@@ -15108,7 +15108,7 @@ inline ::google::protobuf::FeatureSet* MessageOptions::mutable_features() {
 }
 inline void MessageOptions::set_allocated_features(::google::protobuf::FeatureSet* value) {
   ::google::protobuf::Arena* message_arena = GetArenaForAllocation();
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::FeatureSet*>(_impl_.features_);
   }
@@ -15145,7 +15145,7 @@ inline ::google::protobuf::UninterpretedOption* MessageOptions::mutable_uninterp
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
 MessageOptions::mutable_uninterpreted_option() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.MessageOptions.uninterpreted_option)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_uninterpreted_option();
 }
 inline const ::google::protobuf::UninterpretedOption& MessageOptions::uninterpreted_option(int index) const {
@@ -15153,7 +15153,7 @@ inline const ::google::protobuf::UninterpretedOption& MessageOptions::uninterpre
     return _internal_uninterpreted_option().Get(index);
 }
 inline ::google::protobuf::UninterpretedOption* MessageOptions::add_uninterpreted_option() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::UninterpretedOption* _add = _internal_mutable_uninterpreted_option()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.MessageOptions.uninterpreted_option)
   return _add;
@@ -15165,12 +15165,12 @@ MessageOptions::uninterpreted_option() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>&
 MessageOptions::_internal_uninterpreted_option() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.uninterpreted_option_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>*
 MessageOptions::_internal_mutable_uninterpreted_option() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.uninterpreted_option_;
 }
 
@@ -15194,7 +15194,7 @@ inline const std::string& FieldOptions_EditionDefault::edition() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void FieldOptions_EditionDefault::set_edition(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.edition_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.EditionDefault.edition)
@@ -15205,21 +15205,21 @@ inline std::string* FieldOptions_EditionDefault::mutable_edition() {
   return _s;
 }
 inline const std::string& FieldOptions_EditionDefault::_internal_edition() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.edition_.Get();
 }
 inline void FieldOptions_EditionDefault::_internal_set_edition(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.edition_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FieldOptions_EditionDefault::_internal_mutable_edition() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.edition_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FieldOptions_EditionDefault::release_edition() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FieldOptions.EditionDefault.edition)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -15232,7 +15232,7 @@ inline std::string* FieldOptions_EditionDefault::release_edition() {
   return released;
 }
 inline void FieldOptions_EditionDefault::set_allocated_edition(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -15263,7 +15263,7 @@ inline const std::string& FieldOptions_EditionDefault::value() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void FieldOptions_EditionDefault::set_value(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.value_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.EditionDefault.value)
@@ -15274,21 +15274,21 @@ inline std::string* FieldOptions_EditionDefault::mutable_value() {
   return _s;
 }
 inline const std::string& FieldOptions_EditionDefault::_internal_value() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.value_.Get();
 }
 inline void FieldOptions_EditionDefault::_internal_set_value(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.value_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FieldOptions_EditionDefault::_internal_mutable_value() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   return _impl_.value_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FieldOptions_EditionDefault::release_value() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FieldOptions.EditionDefault.value)
   if ((_impl_._has_bits_[0] & 0x00000002u) == 0) {
     return nullptr;
@@ -15301,7 +15301,7 @@ inline std::string* FieldOptions_EditionDefault::release_value() {
   return released;
 }
 inline void FieldOptions_EditionDefault::set_allocated_value(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000002u;
   } else {
@@ -15338,11 +15338,11 @@ inline void FieldOptions::set_ctype(::google::protobuf::FieldOptions_CType value
   // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.ctype)
 }
 inline ::google::protobuf::FieldOptions_CType FieldOptions::_internal_ctype() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return static_cast<::google::protobuf::FieldOptions_CType>(_impl_.ctype_);
 }
 inline void FieldOptions::_internal_set_ctype(::google::protobuf::FieldOptions_CType value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   assert(::google::protobuf::FieldOptions_CType_IsValid(value));
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.ctype_ = value;
@@ -15366,11 +15366,11 @@ inline void FieldOptions::set_packed(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.packed)
 }
 inline bool FieldOptions::_internal_packed() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.packed_;
 }
 inline void FieldOptions::_internal_set_packed(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   _impl_.packed_ = value;
 }
@@ -15393,11 +15393,11 @@ inline void FieldOptions::set_jstype(::google::protobuf::FieldOptions_JSType val
   // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.jstype)
 }
 inline ::google::protobuf::FieldOptions_JSType FieldOptions::_internal_jstype() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return static_cast<::google::protobuf::FieldOptions_JSType>(_impl_.jstype_);
 }
 inline void FieldOptions::_internal_set_jstype(::google::protobuf::FieldOptions_JSType value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   assert(::google::protobuf::FieldOptions_JSType_IsValid(value));
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.jstype_ = value;
@@ -15421,11 +15421,11 @@ inline void FieldOptions::set_lazy(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.lazy)
 }
 inline bool FieldOptions::_internal_lazy() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.lazy_;
 }
 inline void FieldOptions::_internal_set_lazy(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000010u;
   _impl_.lazy_ = value;
 }
@@ -15448,11 +15448,11 @@ inline void FieldOptions::set_unverified_lazy(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.unverified_lazy)
 }
 inline bool FieldOptions::_internal_unverified_lazy() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.unverified_lazy_;
 }
 inline void FieldOptions::_internal_set_unverified_lazy(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000020u;
   _impl_.unverified_lazy_ = value;
 }
@@ -15475,11 +15475,11 @@ inline void FieldOptions::set_deprecated(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.deprecated)
 }
 inline bool FieldOptions::_internal_deprecated() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.deprecated_;
 }
 inline void FieldOptions::_internal_set_deprecated(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000040u;
   _impl_.deprecated_ = value;
 }
@@ -15502,11 +15502,11 @@ inline void FieldOptions::set_weak(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.weak)
 }
 inline bool FieldOptions::_internal_weak() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.weak_;
 }
 inline void FieldOptions::_internal_set_weak(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000080u;
   _impl_.weak_ = value;
 }
@@ -15529,11 +15529,11 @@ inline void FieldOptions::set_debug_redact(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.debug_redact)
 }
 inline bool FieldOptions::_internal_debug_redact() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.debug_redact_;
 }
 inline void FieldOptions::_internal_set_debug_redact(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000100u;
   _impl_.debug_redact_ = value;
 }
@@ -15556,11 +15556,11 @@ inline void FieldOptions::set_retention(::google::protobuf::FieldOptions_OptionR
   // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.retention)
 }
 inline ::google::protobuf::FieldOptions_OptionRetention FieldOptions::_internal_retention() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return static_cast<::google::protobuf::FieldOptions_OptionRetention>(_impl_.retention_);
 }
 inline void FieldOptions::_internal_set_retention(::google::protobuf::FieldOptions_OptionRetention value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   assert(::google::protobuf::FieldOptions_OptionRetention_IsValid(value));
   _impl_._has_bits_[0] |= 0x00000200u;
   _impl_.retention_ = value;
@@ -15587,7 +15587,7 @@ inline void FieldOptions::set_targets(int index, ::google::protobuf::FieldOption
 }
 inline void FieldOptions::add_targets(::google::protobuf::FieldOptions_OptionTargetType value) {
   assert(::google::protobuf::FieldOptions_OptionTargetType_IsValid(value));
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_targets()->Add(value);
   // @@protoc_insertion_point(field_add:google.protobuf.FieldOptions.targets)
 }
@@ -15597,15 +15597,15 @@ inline const ::google::protobuf::RepeatedField<int>& FieldOptions::targets() con
 }
 inline ::google::protobuf::RepeatedField<int>* FieldOptions::mutable_targets() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.FieldOptions.targets)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_targets();
 }
 inline const ::google::protobuf::RepeatedField<int>& FieldOptions::_internal_targets() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.targets_;
 }
 inline ::google::protobuf::RepeatedField<int>* FieldOptions::_internal_mutable_targets() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.targets_;
 }
 
@@ -15626,7 +15626,7 @@ inline ::google::protobuf::FieldOptions_EditionDefault* FieldOptions::mutable_ed
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::FieldOptions_EditionDefault >*
 FieldOptions::mutable_edition_defaults() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.FieldOptions.edition_defaults)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_edition_defaults();
 }
 inline const ::google::protobuf::FieldOptions_EditionDefault& FieldOptions::edition_defaults(int index) const {
@@ -15634,7 +15634,7 @@ inline const ::google::protobuf::FieldOptions_EditionDefault& FieldOptions::edit
     return _internal_edition_defaults().Get(index);
 }
 inline ::google::protobuf::FieldOptions_EditionDefault* FieldOptions::add_edition_defaults() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::FieldOptions_EditionDefault* _add = _internal_mutable_edition_defaults()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.FieldOptions.edition_defaults)
   return _add;
@@ -15646,12 +15646,12 @@ FieldOptions::edition_defaults() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::FieldOptions_EditionDefault>&
 FieldOptions::_internal_edition_defaults() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.edition_defaults_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::FieldOptions_EditionDefault>*
 FieldOptions::_internal_mutable_edition_defaults() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.edition_defaults_;
 }
 
@@ -15666,7 +15666,7 @@ inline void FieldOptions::clear_features() {
   _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const ::google::protobuf::FeatureSet& FieldOptions::_internal_features() const {
-  PROTOBUF_TSAN_READ_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   const ::google::protobuf::FeatureSet* p = _impl_.features_;
   return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_default_instance_);
 }
@@ -15675,7 +15675,7 @@ inline const ::google::protobuf::FeatureSet& FieldOptions::features() const {
   return _internal_features();
 }
 inline void FieldOptions::unsafe_arena_set_allocated_features(::google::protobuf::FeatureSet* value) {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.features_);
   }
@@ -15688,7 +15688,7 @@ inline void FieldOptions::unsafe_arena_set_allocated_features(::google::protobuf
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.FieldOptions.features)
 }
 inline ::google::protobuf::FeatureSet* FieldOptions::release_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000001u;
   ::google::protobuf::FeatureSet* released = _impl_.features_;
@@ -15707,7 +15707,7 @@ inline ::google::protobuf::FeatureSet* FieldOptions::release_features() {
   return released;
 }
 inline ::google::protobuf::FeatureSet* FieldOptions::unsafe_arena_release_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FieldOptions.features)
 
   _impl_._has_bits_[0] &= ~0x00000001u;
@@ -15716,7 +15716,7 @@ inline ::google::protobuf::FeatureSet* FieldOptions::unsafe_arena_release_featur
   return temp;
 }
 inline ::google::protobuf::FeatureSet* FieldOptions::_internal_mutable_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   if (_impl_.features_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArenaForAllocation());
@@ -15731,7 +15731,7 @@ inline ::google::protobuf::FeatureSet* FieldOptions::mutable_features() {
 }
 inline void FieldOptions::set_allocated_features(::google::protobuf::FeatureSet* value) {
   ::google::protobuf::Arena* message_arena = GetArenaForAllocation();
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::FeatureSet*>(_impl_.features_);
   }
@@ -15768,7 +15768,7 @@ inline ::google::protobuf::UninterpretedOption* FieldOptions::mutable_uninterpre
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
 FieldOptions::mutable_uninterpreted_option() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.FieldOptions.uninterpreted_option)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_uninterpreted_option();
 }
 inline const ::google::protobuf::UninterpretedOption& FieldOptions::uninterpreted_option(int index) const {
@@ -15776,7 +15776,7 @@ inline const ::google::protobuf::UninterpretedOption& FieldOptions::uninterprete
     return _internal_uninterpreted_option().Get(index);
 }
 inline ::google::protobuf::UninterpretedOption* FieldOptions::add_uninterpreted_option() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::UninterpretedOption* _add = _internal_mutable_uninterpreted_option()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.FieldOptions.uninterpreted_option)
   return _add;
@@ -15788,12 +15788,12 @@ FieldOptions::uninterpreted_option() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>&
 FieldOptions::_internal_uninterpreted_option() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.uninterpreted_option_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>*
 FieldOptions::_internal_mutable_uninterpreted_option() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.uninterpreted_option_;
 }
 
@@ -15812,7 +15812,7 @@ inline void OneofOptions::clear_features() {
   _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const ::google::protobuf::FeatureSet& OneofOptions::_internal_features() const {
-  PROTOBUF_TSAN_READ_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   const ::google::protobuf::FeatureSet* p = _impl_.features_;
   return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_default_instance_);
 }
@@ -15821,7 +15821,7 @@ inline const ::google::protobuf::FeatureSet& OneofOptions::features() const {
   return _internal_features();
 }
 inline void OneofOptions::unsafe_arena_set_allocated_features(::google::protobuf::FeatureSet* value) {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.features_);
   }
@@ -15834,7 +15834,7 @@ inline void OneofOptions::unsafe_arena_set_allocated_features(::google::protobuf
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.OneofOptions.features)
 }
 inline ::google::protobuf::FeatureSet* OneofOptions::release_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000001u;
   ::google::protobuf::FeatureSet* released = _impl_.features_;
@@ -15853,7 +15853,7 @@ inline ::google::protobuf::FeatureSet* OneofOptions::release_features() {
   return released;
 }
 inline ::google::protobuf::FeatureSet* OneofOptions::unsafe_arena_release_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.OneofOptions.features)
 
   _impl_._has_bits_[0] &= ~0x00000001u;
@@ -15862,7 +15862,7 @@ inline ::google::protobuf::FeatureSet* OneofOptions::unsafe_arena_release_featur
   return temp;
 }
 inline ::google::protobuf::FeatureSet* OneofOptions::_internal_mutable_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   if (_impl_.features_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArenaForAllocation());
@@ -15877,7 +15877,7 @@ inline ::google::protobuf::FeatureSet* OneofOptions::mutable_features() {
 }
 inline void OneofOptions::set_allocated_features(::google::protobuf::FeatureSet* value) {
   ::google::protobuf::Arena* message_arena = GetArenaForAllocation();
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::FeatureSet*>(_impl_.features_);
   }
@@ -15914,7 +15914,7 @@ inline ::google::protobuf::UninterpretedOption* OneofOptions::mutable_uninterpre
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
 OneofOptions::mutable_uninterpreted_option() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.OneofOptions.uninterpreted_option)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_uninterpreted_option();
 }
 inline const ::google::protobuf::UninterpretedOption& OneofOptions::uninterpreted_option(int index) const {
@@ -15922,7 +15922,7 @@ inline const ::google::protobuf::UninterpretedOption& OneofOptions::uninterprete
     return _internal_uninterpreted_option().Get(index);
 }
 inline ::google::protobuf::UninterpretedOption* OneofOptions::add_uninterpreted_option() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::UninterpretedOption* _add = _internal_mutable_uninterpreted_option()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.OneofOptions.uninterpreted_option)
   return _add;
@@ -15934,12 +15934,12 @@ OneofOptions::uninterpreted_option() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>&
 OneofOptions::_internal_uninterpreted_option() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.uninterpreted_option_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>*
 OneofOptions::_internal_mutable_uninterpreted_option() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.uninterpreted_option_;
 }
 
@@ -15965,11 +15965,11 @@ inline void EnumOptions::set_allow_alias(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.EnumOptions.allow_alias)
 }
 inline bool EnumOptions::_internal_allow_alias() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.allow_alias_;
 }
 inline void EnumOptions::_internal_set_allow_alias(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.allow_alias_ = value;
 }
@@ -15992,11 +15992,11 @@ inline void EnumOptions::set_deprecated(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.EnumOptions.deprecated)
 }
 inline bool EnumOptions::_internal_deprecated() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.deprecated_;
 }
 inline void EnumOptions::_internal_set_deprecated(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.deprecated_ = value;
 }
@@ -16019,11 +16019,11 @@ inline void EnumOptions::set_deprecated_legacy_json_field_conflicts(bool value)
   // @@protoc_insertion_point(field_set:google.protobuf.EnumOptions.deprecated_legacy_json_field_conflicts)
 }
 inline bool EnumOptions::_internal_deprecated_legacy_json_field_conflicts() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.deprecated_legacy_json_field_conflicts_;
 }
 inline void EnumOptions::_internal_set_deprecated_legacy_json_field_conflicts(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   _impl_.deprecated_legacy_json_field_conflicts_ = value;
 }
@@ -16039,7 +16039,7 @@ inline void EnumOptions::clear_features() {
   _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const ::google::protobuf::FeatureSet& EnumOptions::_internal_features() const {
-  PROTOBUF_TSAN_READ_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   const ::google::protobuf::FeatureSet* p = _impl_.features_;
   return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_default_instance_);
 }
@@ -16048,7 +16048,7 @@ inline const ::google::protobuf::FeatureSet& EnumOptions::features() const {
   return _internal_features();
 }
 inline void EnumOptions::unsafe_arena_set_allocated_features(::google::protobuf::FeatureSet* value) {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.features_);
   }
@@ -16061,7 +16061,7 @@ inline void EnumOptions::unsafe_arena_set_allocated_features(::google::protobuf:
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.EnumOptions.features)
 }
 inline ::google::protobuf::FeatureSet* EnumOptions::release_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000001u;
   ::google::protobuf::FeatureSet* released = _impl_.features_;
@@ -16080,7 +16080,7 @@ inline ::google::protobuf::FeatureSet* EnumOptions::release_features() {
   return released;
 }
 inline ::google::protobuf::FeatureSet* EnumOptions::unsafe_arena_release_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.EnumOptions.features)
 
   _impl_._has_bits_[0] &= ~0x00000001u;
@@ -16089,7 +16089,7 @@ inline ::google::protobuf::FeatureSet* EnumOptions::unsafe_arena_release_feature
   return temp;
 }
 inline ::google::protobuf::FeatureSet* EnumOptions::_internal_mutable_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   if (_impl_.features_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArenaForAllocation());
@@ -16104,7 +16104,7 @@ inline ::google::protobuf::FeatureSet* EnumOptions::mutable_features() {
 }
 inline void EnumOptions::set_allocated_features(::google::protobuf::FeatureSet* value) {
   ::google::protobuf::Arena* message_arena = GetArenaForAllocation();
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::FeatureSet*>(_impl_.features_);
   }
@@ -16141,7 +16141,7 @@ inline ::google::protobuf::UninterpretedOption* EnumOptions::mutable_uninterpret
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
 EnumOptions::mutable_uninterpreted_option() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumOptions.uninterpreted_option)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_uninterpreted_option();
 }
 inline const ::google::protobuf::UninterpretedOption& EnumOptions::uninterpreted_option(int index) const {
@@ -16149,7 +16149,7 @@ inline const ::google::protobuf::UninterpretedOption& EnumOptions::uninterpreted
     return _internal_uninterpreted_option().Get(index);
 }
 inline ::google::protobuf::UninterpretedOption* EnumOptions::add_uninterpreted_option() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::UninterpretedOption* _add = _internal_mutable_uninterpreted_option()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.EnumOptions.uninterpreted_option)
   return _add;
@@ -16161,12 +16161,12 @@ EnumOptions::uninterpreted_option() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>&
 EnumOptions::_internal_uninterpreted_option() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.uninterpreted_option_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>*
 EnumOptions::_internal_mutable_uninterpreted_option() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.uninterpreted_option_;
 }
 
@@ -16192,11 +16192,11 @@ inline void EnumValueOptions::set_deprecated(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.EnumValueOptions.deprecated)
 }
 inline bool EnumValueOptions::_internal_deprecated() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.deprecated_;
 }
 inline void EnumValueOptions::_internal_set_deprecated(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.deprecated_ = value;
 }
@@ -16212,7 +16212,7 @@ inline void EnumValueOptions::clear_features() {
   _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const ::google::protobuf::FeatureSet& EnumValueOptions::_internal_features() const {
-  PROTOBUF_TSAN_READ_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   const ::google::protobuf::FeatureSet* p = _impl_.features_;
   return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_default_instance_);
 }
@@ -16221,7 +16221,7 @@ inline const ::google::protobuf::FeatureSet& EnumValueOptions::features() const
   return _internal_features();
 }
 inline void EnumValueOptions::unsafe_arena_set_allocated_features(::google::protobuf::FeatureSet* value) {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.features_);
   }
@@ -16234,7 +16234,7 @@ inline void EnumValueOptions::unsafe_arena_set_allocated_features(::google::prot
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.EnumValueOptions.features)
 }
 inline ::google::protobuf::FeatureSet* EnumValueOptions::release_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000001u;
   ::google::protobuf::FeatureSet* released = _impl_.features_;
@@ -16253,7 +16253,7 @@ inline ::google::protobuf::FeatureSet* EnumValueOptions::release_features() {
   return released;
 }
 inline ::google::protobuf::FeatureSet* EnumValueOptions::unsafe_arena_release_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.EnumValueOptions.features)
 
   _impl_._has_bits_[0] &= ~0x00000001u;
@@ -16262,7 +16262,7 @@ inline ::google::protobuf::FeatureSet* EnumValueOptions::unsafe_arena_release_fe
   return temp;
 }
 inline ::google::protobuf::FeatureSet* EnumValueOptions::_internal_mutable_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   if (_impl_.features_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArenaForAllocation());
@@ -16277,7 +16277,7 @@ inline ::google::protobuf::FeatureSet* EnumValueOptions::mutable_features() {
 }
 inline void EnumValueOptions::set_allocated_features(::google::protobuf::FeatureSet* value) {
   ::google::protobuf::Arena* message_arena = GetArenaForAllocation();
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::FeatureSet*>(_impl_.features_);
   }
@@ -16315,11 +16315,11 @@ inline void EnumValueOptions::set_debug_redact(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.EnumValueOptions.debug_redact)
 }
 inline bool EnumValueOptions::_internal_debug_redact() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.debug_redact_;
 }
 inline void EnumValueOptions::_internal_set_debug_redact(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.debug_redact_ = value;
 }
@@ -16341,7 +16341,7 @@ inline ::google::protobuf::UninterpretedOption* EnumValueOptions::mutable_uninte
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
 EnumValueOptions::mutable_uninterpreted_option() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumValueOptions.uninterpreted_option)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_uninterpreted_option();
 }
 inline const ::google::protobuf::UninterpretedOption& EnumValueOptions::uninterpreted_option(int index) const {
@@ -16349,7 +16349,7 @@ inline const ::google::protobuf::UninterpretedOption& EnumValueOptions::uninterp
     return _internal_uninterpreted_option().Get(index);
 }
 inline ::google::protobuf::UninterpretedOption* EnumValueOptions::add_uninterpreted_option() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::UninterpretedOption* _add = _internal_mutable_uninterpreted_option()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.EnumValueOptions.uninterpreted_option)
   return _add;
@@ -16361,12 +16361,12 @@ EnumValueOptions::uninterpreted_option() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>&
 EnumValueOptions::_internal_uninterpreted_option() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.uninterpreted_option_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>*
 EnumValueOptions::_internal_mutable_uninterpreted_option() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.uninterpreted_option_;
 }
 
@@ -16385,7 +16385,7 @@ inline void ServiceOptions::clear_features() {
   _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const ::google::protobuf::FeatureSet& ServiceOptions::_internal_features() const {
-  PROTOBUF_TSAN_READ_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   const ::google::protobuf::FeatureSet* p = _impl_.features_;
   return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_default_instance_);
 }
@@ -16394,7 +16394,7 @@ inline const ::google::protobuf::FeatureSet& ServiceOptions::features() const {
   return _internal_features();
 }
 inline void ServiceOptions::unsafe_arena_set_allocated_features(::google::protobuf::FeatureSet* value) {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.features_);
   }
@@ -16407,7 +16407,7 @@ inline void ServiceOptions::unsafe_arena_set_allocated_features(::google::protob
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.ServiceOptions.features)
 }
 inline ::google::protobuf::FeatureSet* ServiceOptions::release_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000001u;
   ::google::protobuf::FeatureSet* released = _impl_.features_;
@@ -16426,7 +16426,7 @@ inline ::google::protobuf::FeatureSet* ServiceOptions::release_features() {
   return released;
 }
 inline ::google::protobuf::FeatureSet* ServiceOptions::unsafe_arena_release_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.ServiceOptions.features)
 
   _impl_._has_bits_[0] &= ~0x00000001u;
@@ -16435,7 +16435,7 @@ inline ::google::protobuf::FeatureSet* ServiceOptions::unsafe_arena_release_feat
   return temp;
 }
 inline ::google::protobuf::FeatureSet* ServiceOptions::_internal_mutable_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   if (_impl_.features_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArenaForAllocation());
@@ -16450,7 +16450,7 @@ inline ::google::protobuf::FeatureSet* ServiceOptions::mutable_features() {
 }
 inline void ServiceOptions::set_allocated_features(::google::protobuf::FeatureSet* value) {
   ::google::protobuf::Arena* message_arena = GetArenaForAllocation();
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::FeatureSet*>(_impl_.features_);
   }
@@ -16488,11 +16488,11 @@ inline void ServiceOptions::set_deprecated(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.ServiceOptions.deprecated)
 }
 inline bool ServiceOptions::_internal_deprecated() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.deprecated_;
 }
 inline void ServiceOptions::_internal_set_deprecated(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.deprecated_ = value;
 }
@@ -16514,7 +16514,7 @@ inline ::google::protobuf::UninterpretedOption* ServiceOptions::mutable_uninterp
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
 ServiceOptions::mutable_uninterpreted_option() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.ServiceOptions.uninterpreted_option)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_uninterpreted_option();
 }
 inline const ::google::protobuf::UninterpretedOption& ServiceOptions::uninterpreted_option(int index) const {
@@ -16522,7 +16522,7 @@ inline const ::google::protobuf::UninterpretedOption& ServiceOptions::uninterpre
     return _internal_uninterpreted_option().Get(index);
 }
 inline ::google::protobuf::UninterpretedOption* ServiceOptions::add_uninterpreted_option() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::UninterpretedOption* _add = _internal_mutable_uninterpreted_option()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.ServiceOptions.uninterpreted_option)
   return _add;
@@ -16534,12 +16534,12 @@ ServiceOptions::uninterpreted_option() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>&
 ServiceOptions::_internal_uninterpreted_option() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.uninterpreted_option_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>*
 ServiceOptions::_internal_mutable_uninterpreted_option() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.uninterpreted_option_;
 }
 
@@ -16565,11 +16565,11 @@ inline void MethodOptions::set_deprecated(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.MethodOptions.deprecated)
 }
 inline bool MethodOptions::_internal_deprecated() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.deprecated_;
 }
 inline void MethodOptions::_internal_set_deprecated(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.deprecated_ = value;
 }
@@ -16592,11 +16592,11 @@ inline void MethodOptions::set_idempotency_level(::google::protobuf::MethodOptio
   // @@protoc_insertion_point(field_set:google.protobuf.MethodOptions.idempotency_level)
 }
 inline ::google::protobuf::MethodOptions_IdempotencyLevel MethodOptions::_internal_idempotency_level() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return static_cast<::google::protobuf::MethodOptions_IdempotencyLevel>(_impl_.idempotency_level_);
 }
 inline void MethodOptions::_internal_set_idempotency_level(::google::protobuf::MethodOptions_IdempotencyLevel value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   assert(::google::protobuf::MethodOptions_IdempotencyLevel_IsValid(value));
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.idempotency_level_ = value;
@@ -16613,7 +16613,7 @@ inline void MethodOptions::clear_features() {
   _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const ::google::protobuf::FeatureSet& MethodOptions::_internal_features() const {
-  PROTOBUF_TSAN_READ_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   const ::google::protobuf::FeatureSet* p = _impl_.features_;
   return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_default_instance_);
 }
@@ -16622,7 +16622,7 @@ inline const ::google::protobuf::FeatureSet& MethodOptions::features() const {
   return _internal_features();
 }
 inline void MethodOptions::unsafe_arena_set_allocated_features(::google::protobuf::FeatureSet* value) {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.features_);
   }
@@ -16635,7 +16635,7 @@ inline void MethodOptions::unsafe_arena_set_allocated_features(::google::protobu
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.MethodOptions.features)
 }
 inline ::google::protobuf::FeatureSet* MethodOptions::release_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000001u;
   ::google::protobuf::FeatureSet* released = _impl_.features_;
@@ -16654,7 +16654,7 @@ inline ::google::protobuf::FeatureSet* MethodOptions::release_features() {
   return released;
 }
 inline ::google::protobuf::FeatureSet* MethodOptions::unsafe_arena_release_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.MethodOptions.features)
 
   _impl_._has_bits_[0] &= ~0x00000001u;
@@ -16663,7 +16663,7 @@ inline ::google::protobuf::FeatureSet* MethodOptions::unsafe_arena_release_featu
   return temp;
 }
 inline ::google::protobuf::FeatureSet* MethodOptions::_internal_mutable_features() {
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   if (_impl_.features_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArenaForAllocation());
@@ -16678,7 +16678,7 @@ inline ::google::protobuf::FeatureSet* MethodOptions::mutable_features() {
 }
 inline void MethodOptions::set_allocated_features(::google::protobuf::FeatureSet* value) {
   ::google::protobuf::Arena* message_arena = GetArenaForAllocation();
-  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::FeatureSet*>(_impl_.features_);
   }
@@ -16715,7 +16715,7 @@ inline ::google::protobuf::UninterpretedOption* MethodOptions::mutable_uninterpr
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >*
 MethodOptions::mutable_uninterpreted_option() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.MethodOptions.uninterpreted_option)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_uninterpreted_option();
 }
 inline const ::google::protobuf::UninterpretedOption& MethodOptions::uninterpreted_option(int index) const {
@@ -16723,7 +16723,7 @@ inline const ::google::protobuf::UninterpretedOption& MethodOptions::uninterpret
     return _internal_uninterpreted_option().Get(index);
 }
 inline ::google::protobuf::UninterpretedOption* MethodOptions::add_uninterpreted_option() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::UninterpretedOption* _add = _internal_mutable_uninterpreted_option()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.MethodOptions.uninterpreted_option)
   return _add;
@@ -16735,12 +16735,12 @@ MethodOptions::uninterpreted_option() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>&
 MethodOptions::_internal_uninterpreted_option() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.uninterpreted_option_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>*
 MethodOptions::_internal_mutable_uninterpreted_option() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.uninterpreted_option_;
 }
 
@@ -16764,7 +16764,7 @@ inline const std::string& UninterpretedOption_NamePart::name_part() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void UninterpretedOption_NamePart::set_name_part(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_part_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.NamePart.name_part)
@@ -16775,21 +16775,21 @@ inline std::string* UninterpretedOption_NamePart::mutable_name_part() {
   return _s;
 }
 inline const std::string& UninterpretedOption_NamePart::_internal_name_part() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.name_part_.Get();
 }
 inline void UninterpretedOption_NamePart::_internal_set_name_part(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_part_.Set(value, GetArenaForAllocation());
 }
 inline std::string* UninterpretedOption_NamePart::_internal_mutable_name_part() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.name_part_.Mutable( GetArenaForAllocation());
 }
 inline std::string* UninterpretedOption_NamePart::release_name_part() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.NamePart.name_part)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -16802,7 +16802,7 @@ inline std::string* UninterpretedOption_NamePart::release_name_part() {
   return released;
 }
 inline void UninterpretedOption_NamePart::set_allocated_name_part(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -16835,11 +16835,11 @@ inline void UninterpretedOption_NamePart::set_is_extension(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.NamePart.is_extension)
 }
 inline bool UninterpretedOption_NamePart::_internal_is_extension() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.is_extension_;
 }
 inline void UninterpretedOption_NamePart::_internal_set_is_extension(bool value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.is_extension_ = value;
 }
@@ -16865,7 +16865,7 @@ inline ::google::protobuf::UninterpretedOption_NamePart* UninterpretedOption::mu
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption_NamePart >*
 UninterpretedOption::mutable_name() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.UninterpretedOption.name)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_name();
 }
 inline const ::google::protobuf::UninterpretedOption_NamePart& UninterpretedOption::name(int index) const {
@@ -16873,7 +16873,7 @@ inline const ::google::protobuf::UninterpretedOption_NamePart& UninterpretedOpti
     return _internal_name().Get(index);
 }
 inline ::google::protobuf::UninterpretedOption_NamePart* UninterpretedOption::add_name() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::UninterpretedOption_NamePart* _add = _internal_mutable_name()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.UninterpretedOption.name)
   return _add;
@@ -16885,12 +16885,12 @@ UninterpretedOption::name() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption_NamePart>&
 UninterpretedOption::_internal_name() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.name_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption_NamePart>*
 UninterpretedOption::_internal_mutable_name() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.name_;
 }
 
@@ -16910,7 +16910,7 @@ inline const std::string& UninterpretedOption::identifier_value() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void UninterpretedOption::set_identifier_value(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.identifier_value_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.identifier_value)
@@ -16921,21 +16921,21 @@ inline std::string* UninterpretedOption::mutable_identifier_value() {
   return _s;
 }
 inline const std::string& UninterpretedOption::_internal_identifier_value() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.identifier_value_.Get();
 }
 inline void UninterpretedOption::_internal_set_identifier_value(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.identifier_value_.Set(value, GetArenaForAllocation());
 }
 inline std::string* UninterpretedOption::_internal_mutable_identifier_value() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.identifier_value_.Mutable( GetArenaForAllocation());
 }
 inline std::string* UninterpretedOption::release_identifier_value() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.identifier_value)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -16948,7 +16948,7 @@ inline std::string* UninterpretedOption::release_identifier_value() {
   return released;
 }
 inline void UninterpretedOption::set_allocated_identifier_value(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -16981,11 +16981,11 @@ inline void UninterpretedOption::set_positive_int_value(::uint64_t value) {
   // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.positive_int_value)
 }
 inline ::uint64_t UninterpretedOption::_internal_positive_int_value() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.positive_int_value_;
 }
 inline void UninterpretedOption::_internal_set_positive_int_value(::uint64_t value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   _impl_.positive_int_value_ = value;
 }
@@ -17008,11 +17008,11 @@ inline void UninterpretedOption::set_negative_int_value(::int64_t value) {
   // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.negative_int_value)
 }
 inline ::int64_t UninterpretedOption::_internal_negative_int_value() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.negative_int_value_;
 }
 inline void UninterpretedOption::_internal_set_negative_int_value(::int64_t value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000010u;
   _impl_.negative_int_value_ = value;
 }
@@ -17035,11 +17035,11 @@ inline void UninterpretedOption::set_double_value(double value) {
   // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.double_value)
 }
 inline double UninterpretedOption::_internal_double_value() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.double_value_;
 }
 inline void UninterpretedOption::_internal_set_double_value(double value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000020u;
   _impl_.double_value_ = value;
 }
@@ -17060,7 +17060,7 @@ inline const std::string& UninterpretedOption::string_value() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void UninterpretedOption::set_string_value(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.string_value_.SetBytes(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.string_value)
@@ -17071,21 +17071,21 @@ inline std::string* UninterpretedOption::mutable_string_value() {
   return _s;
 }
 inline const std::string& UninterpretedOption::_internal_string_value() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.string_value_.Get();
 }
 inline void UninterpretedOption::_internal_set_string_value(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.string_value_.Set(value, GetArenaForAllocation());
 }
 inline std::string* UninterpretedOption::_internal_mutable_string_value() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   return _impl_.string_value_.Mutable( GetArenaForAllocation());
 }
 inline std::string* UninterpretedOption::release_string_value() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.string_value)
   if ((_impl_._has_bits_[0] & 0x00000002u) == 0) {
     return nullptr;
@@ -17098,7 +17098,7 @@ inline std::string* UninterpretedOption::release_string_value() {
   return released;
 }
 inline void UninterpretedOption::set_allocated_string_value(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000002u;
   } else {
@@ -17129,7 +17129,7 @@ inline const std::string& UninterpretedOption::aggregate_value() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void UninterpretedOption::set_aggregate_value(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.aggregate_value_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.aggregate_value)
@@ -17140,21 +17140,21 @@ inline std::string* UninterpretedOption::mutable_aggregate_value() {
   return _s;
 }
 inline const std::string& UninterpretedOption::_internal_aggregate_value() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.aggregate_value_.Get();
 }
 inline void UninterpretedOption::_internal_set_aggregate_value(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.aggregate_value_.Set(value, GetArenaForAllocation());
 }
 inline std::string* UninterpretedOption::_internal_mutable_aggregate_value() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   return _impl_.aggregate_value_.Mutable( GetArenaForAllocation());
 }
 inline std::string* UninterpretedOption::release_aggregate_value() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.aggregate_value)
   if ((_impl_._has_bits_[0] & 0x00000004u) == 0) {
     return nullptr;
@@ -17167,7 +17167,7 @@ inline std::string* UninterpretedOption::release_aggregate_value() {
   return released;
 }
 inline void UninterpretedOption::set_allocated_aggregate_value(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000004u;
   } else {
@@ -17204,11 +17204,11 @@ inline void FeatureSet::set_field_presence(::google::protobuf::FeatureSet_FieldP
   // @@protoc_insertion_point(field_set:google.protobuf.FeatureSet.field_presence)
 }
 inline ::google::protobuf::FeatureSet_FieldPresence FeatureSet::_internal_field_presence() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return static_cast<::google::protobuf::FeatureSet_FieldPresence>(_impl_.field_presence_);
 }
 inline void FeatureSet::_internal_set_field_presence(::google::protobuf::FeatureSet_FieldPresence value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   assert(::google::protobuf::FeatureSet_FieldPresence_IsValid(value));
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.field_presence_ = value;
@@ -17232,11 +17232,11 @@ inline void FeatureSet::set_enum_type(::google::protobuf::FeatureSet_EnumType va
   // @@protoc_insertion_point(field_set:google.protobuf.FeatureSet.enum_type)
 }
 inline ::google::protobuf::FeatureSet_EnumType FeatureSet::_internal_enum_type() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return static_cast<::google::protobuf::FeatureSet_EnumType>(_impl_.enum_type_);
 }
 inline void FeatureSet::_internal_set_enum_type(::google::protobuf::FeatureSet_EnumType value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   assert(::google::protobuf::FeatureSet_EnumType_IsValid(value));
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.enum_type_ = value;
@@ -17260,11 +17260,11 @@ inline void FeatureSet::set_repeated_field_encoding(::google::protobuf::FeatureS
   // @@protoc_insertion_point(field_set:google.protobuf.FeatureSet.repeated_field_encoding)
 }
 inline ::google::protobuf::FeatureSet_RepeatedFieldEncoding FeatureSet::_internal_repeated_field_encoding() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return static_cast<::google::protobuf::FeatureSet_RepeatedFieldEncoding>(_impl_.repeated_field_encoding_);
 }
 inline void FeatureSet::_internal_set_repeated_field_encoding(::google::protobuf::FeatureSet_RepeatedFieldEncoding value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   assert(::google::protobuf::FeatureSet_RepeatedFieldEncoding_IsValid(value));
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.repeated_field_encoding_ = value;
@@ -17288,11 +17288,11 @@ inline void FeatureSet::set_string_field_validation(::google::protobuf::FeatureS
   // @@protoc_insertion_point(field_set:google.protobuf.FeatureSet.string_field_validation)
 }
 inline ::google::protobuf::FeatureSet_StringFieldValidation FeatureSet::_internal_string_field_validation() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return static_cast<::google::protobuf::FeatureSet_StringFieldValidation>(_impl_.string_field_validation_);
 }
 inline void FeatureSet::_internal_set_string_field_validation(::google::protobuf::FeatureSet_StringFieldValidation value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   assert(::google::protobuf::FeatureSet_StringFieldValidation_IsValid(value));
   _impl_._has_bits_[0] |= 0x00000008u;
   _impl_.string_field_validation_ = value;
@@ -17316,11 +17316,11 @@ inline void FeatureSet::set_message_encoding(::google::protobuf::FeatureSet_Mess
   // @@protoc_insertion_point(field_set:google.protobuf.FeatureSet.message_encoding)
 }
 inline ::google::protobuf::FeatureSet_MessageEncoding FeatureSet::_internal_message_encoding() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return static_cast<::google::protobuf::FeatureSet_MessageEncoding>(_impl_.message_encoding_);
 }
 inline void FeatureSet::_internal_set_message_encoding(::google::protobuf::FeatureSet_MessageEncoding value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   assert(::google::protobuf::FeatureSet_MessageEncoding_IsValid(value));
   _impl_._has_bits_[0] |= 0x00000010u;
   _impl_.message_encoding_ = value;
@@ -17344,11 +17344,11 @@ inline void FeatureSet::set_json_format(::google::protobuf::FeatureSet_JsonForma
   // @@protoc_insertion_point(field_set:google.protobuf.FeatureSet.json_format)
 }
 inline ::google::protobuf::FeatureSet_JsonFormat FeatureSet::_internal_json_format() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return static_cast<::google::protobuf::FeatureSet_JsonFormat>(_impl_.json_format_);
 }
 inline void FeatureSet::_internal_set_json_format(::google::protobuf::FeatureSet_JsonFormat value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   assert(::google::protobuf::FeatureSet_JsonFormat_IsValid(value));
   _impl_._has_bits_[0] |= 0x00000020u;
   _impl_.json_format_ = value;
@@ -17377,7 +17377,7 @@ inline void SourceCodeInfo_Location::set_path(int index, ::int32_t value) {
   // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.path)
 }
 inline void SourceCodeInfo_Location::add_path(::int32_t value) {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_path()->Add(value);
   // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.path)
 }
@@ -17387,16 +17387,16 @@ inline const ::google::protobuf::RepeatedField<::int32_t>& SourceCodeInfo_Locati
 }
 inline ::google::protobuf::RepeatedField<::int32_t>* SourceCodeInfo_Location::mutable_path() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.Location.path)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_path();
 }
 
 inline const ::google::protobuf::RepeatedField<::int32_t>& SourceCodeInfo_Location::_internal_path() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.path_;
 }
 inline ::google::protobuf::RepeatedField<::int32_t>* SourceCodeInfo_Location::_internal_mutable_path() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.path_;
 }
 
@@ -17419,7 +17419,7 @@ inline void SourceCodeInfo_Location::set_span(int index, ::int32_t value) {
   // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.span)
 }
 inline void SourceCodeInfo_Location::add_span(::int32_t value) {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_span()->Add(value);
   // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.span)
 }
@@ -17429,16 +17429,16 @@ inline const ::google::protobuf::RepeatedField<::int32_t>& SourceCodeInfo_Locati
 }
 inline ::google::protobuf::RepeatedField<::int32_t>* SourceCodeInfo_Location::mutable_span() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.Location.span)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_span();
 }
 
 inline const ::google::protobuf::RepeatedField<::int32_t>& SourceCodeInfo_Location::_internal_span() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.span_;
 }
 inline ::google::protobuf::RepeatedField<::int32_t>* SourceCodeInfo_Location::_internal_mutable_span() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.span_;
 }
 
@@ -17458,7 +17458,7 @@ inline const std::string& SourceCodeInfo_Location::leading_comments() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void SourceCodeInfo_Location::set_leading_comments(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.leading_comments_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.leading_comments)
@@ -17469,21 +17469,21 @@ inline std::string* SourceCodeInfo_Location::mutable_leading_comments() {
   return _s;
 }
 inline const std::string& SourceCodeInfo_Location::_internal_leading_comments() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.leading_comments_.Get();
 }
 inline void SourceCodeInfo_Location::_internal_set_leading_comments(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.leading_comments_.Set(value, GetArenaForAllocation());
 }
 inline std::string* SourceCodeInfo_Location::_internal_mutable_leading_comments() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.leading_comments_.Mutable( GetArenaForAllocation());
 }
 inline std::string* SourceCodeInfo_Location::release_leading_comments() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.SourceCodeInfo.Location.leading_comments)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -17496,7 +17496,7 @@ inline std::string* SourceCodeInfo_Location::release_leading_comments() {
   return released;
 }
 inline void SourceCodeInfo_Location::set_allocated_leading_comments(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -17527,7 +17527,7 @@ inline const std::string& SourceCodeInfo_Location::trailing_comments() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void SourceCodeInfo_Location::set_trailing_comments(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.trailing_comments_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.trailing_comments)
@@ -17538,21 +17538,21 @@ inline std::string* SourceCodeInfo_Location::mutable_trailing_comments() {
   return _s;
 }
 inline const std::string& SourceCodeInfo_Location::_internal_trailing_comments() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.trailing_comments_.Get();
 }
 inline void SourceCodeInfo_Location::_internal_set_trailing_comments(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.trailing_comments_.Set(value, GetArenaForAllocation());
 }
 inline std::string* SourceCodeInfo_Location::_internal_mutable_trailing_comments() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   return _impl_.trailing_comments_.Mutable( GetArenaForAllocation());
 }
 inline std::string* SourceCodeInfo_Location::release_trailing_comments() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.SourceCodeInfo.Location.trailing_comments)
   if ((_impl_._has_bits_[0] & 0x00000002u) == 0) {
     return nullptr;
@@ -17565,7 +17565,7 @@ inline std::string* SourceCodeInfo_Location::release_trailing_comments() {
   return released;
 }
 inline void SourceCodeInfo_Location::set_allocated_trailing_comments(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000002u;
   } else {
@@ -17591,7 +17591,7 @@ inline void SourceCodeInfo_Location::clear_leading_detached_comments() {
   _internal_mutable_leading_detached_comments()->Clear();
 }
 inline std::string* SourceCodeInfo_Location::add_leading_detached_comments() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   std::string* _s = _internal_mutable_leading_detached_comments()->Add();
   // @@protoc_insertion_point(field_add_mutable:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
   return _s;
@@ -17629,29 +17629,29 @@ inline void SourceCodeInfo_Location::set_leading_detached_comments(int index, ab
   // @@protoc_insertion_point(field_set_string_piece:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
 }
 inline void SourceCodeInfo_Location::add_leading_detached_comments(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_leading_detached_comments()->Add()->assign(value);
   // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
 }
 inline void SourceCodeInfo_Location::add_leading_detached_comments(std::string&& value) {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_leading_detached_comments()->Add(std::move(value));
   // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
 }
 inline void SourceCodeInfo_Location::add_leading_detached_comments(const char* value) {
   ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_leading_detached_comments()->Add()->assign(value);
   // @@protoc_insertion_point(field_add_char:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
 }
 inline void SourceCodeInfo_Location::add_leading_detached_comments(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_leading_detached_comments()->Add()->assign(
       reinterpret_cast<const char*>(value), size);
   // @@protoc_insertion_point(field_add_pointer:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
 }
 inline void SourceCodeInfo_Location::add_leading_detached_comments(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_leading_detached_comments()->Add()->assign(value.data(), value.size());
   // @@protoc_insertion_point(field_add_string_piece:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
 }
@@ -17662,17 +17662,17 @@ SourceCodeInfo_Location::leading_detached_comments() const {
 }
 inline ::google::protobuf::RepeatedPtrField<std::string>* SourceCodeInfo_Location::mutable_leading_detached_comments() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_leading_detached_comments();
 }
 inline const ::google::protobuf::RepeatedPtrField<std::string>&
 SourceCodeInfo_Location::_internal_leading_detached_comments() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.leading_detached_comments_;
 }
 inline ::google::protobuf::RepeatedPtrField<std::string>*
 SourceCodeInfo_Location::_internal_mutable_leading_detached_comments() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.leading_detached_comments_;
 }
 
@@ -17697,7 +17697,7 @@ inline ::google::protobuf::SourceCodeInfo_Location* SourceCodeInfo::mutable_loca
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::SourceCodeInfo_Location >*
 SourceCodeInfo::mutable_location() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.location)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_location();
 }
 inline const ::google::protobuf::SourceCodeInfo_Location& SourceCodeInfo::location(int index) const {
@@ -17705,7 +17705,7 @@ inline const ::google::protobuf::SourceCodeInfo_Location& SourceCodeInfo::locati
     return _internal_location().Get(index);
 }
 inline ::google::protobuf::SourceCodeInfo_Location* SourceCodeInfo::add_location() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::SourceCodeInfo_Location* _add = _internal_mutable_location()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.location)
   return _add;
@@ -17717,12 +17717,12 @@ SourceCodeInfo::location() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::SourceCodeInfo_Location>&
 SourceCodeInfo::_internal_location() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.location_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::SourceCodeInfo_Location>*
 SourceCodeInfo::_internal_mutable_location() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.location_;
 }
 
@@ -17749,7 +17749,7 @@ inline void GeneratedCodeInfo_Annotation::set_path(int index, ::int32_t value) {
   // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.path)
 }
 inline void GeneratedCodeInfo_Annotation::add_path(::int32_t value) {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _internal_mutable_path()->Add(value);
   // @@protoc_insertion_point(field_add:google.protobuf.GeneratedCodeInfo.Annotation.path)
 }
@@ -17759,16 +17759,16 @@ inline const ::google::protobuf::RepeatedField<::int32_t>& GeneratedCodeInfo_Ann
 }
 inline ::google::protobuf::RepeatedField<::int32_t>* GeneratedCodeInfo_Annotation::mutable_path() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.GeneratedCodeInfo.Annotation.path)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_path();
 }
 
 inline const ::google::protobuf::RepeatedField<::int32_t>& GeneratedCodeInfo_Annotation::_internal_path() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.path_;
 }
 inline ::google::protobuf::RepeatedField<::int32_t>* GeneratedCodeInfo_Annotation::_internal_mutable_path() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.path_;
 }
 
@@ -17788,7 +17788,7 @@ inline const std::string& GeneratedCodeInfo_Annotation::source_file() const {
 template <typename Arg_, typename... Args_>
 inline PROTOBUF_ALWAYS_INLINE void GeneratedCodeInfo_Annotation::set_source_file(Arg_&& arg,
                                                      Args_... args) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.source_file_.Set(static_cast<Arg_&&>(arg), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.source_file)
@@ -17799,21 +17799,21 @@ inline std::string* GeneratedCodeInfo_Annotation::mutable_source_file() {
   return _s;
 }
 inline const std::string& GeneratedCodeInfo_Annotation::_internal_source_file() const {
-  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.source_file_.Get();
 }
 inline void GeneratedCodeInfo_Annotation::_internal_set_source_file(const std::string& value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.source_file_.Set(value, GetArenaForAllocation());
 }
 inline std::string* GeneratedCodeInfo_Annotation::_internal_mutable_source_file() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.source_file_.Mutable( GetArenaForAllocation());
 }
 inline std::string* GeneratedCodeInfo_Annotation::release_source_file() {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.GeneratedCodeInfo.Annotation.source_file)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -17826,7 +17826,7 @@ inline std::string* GeneratedCodeInfo_Annotation::release_source_file() {
   return released;
 }
 inline void GeneratedCodeInfo_Annotation::set_allocated_source_file(std::string* value) {
-  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -17859,11 +17859,11 @@ inline void GeneratedCodeInfo_Annotation::set_begin(::int32_t value) {
   // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.begin)
 }
 inline ::int32_t GeneratedCodeInfo_Annotation::_internal_begin() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.begin_;
 }
 inline void GeneratedCodeInfo_Annotation::_internal_set_begin(::int32_t value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.begin_ = value;
 }
@@ -17886,11 +17886,11 @@ inline void GeneratedCodeInfo_Annotation::set_end(::int32_t value) {
   // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.end)
 }
 inline ::int32_t GeneratedCodeInfo_Annotation::_internal_end() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.end_;
 }
 inline void GeneratedCodeInfo_Annotation::_internal_set_end(::int32_t value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.end_ = value;
 }
@@ -17913,11 +17913,11 @@ inline void GeneratedCodeInfo_Annotation::set_semantic(::google::protobuf::Gener
   // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.semantic)
 }
 inline ::google::protobuf::GeneratedCodeInfo_Annotation_Semantic GeneratedCodeInfo_Annotation::_internal_semantic() const {
-  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return static_cast<::google::protobuf::GeneratedCodeInfo_Annotation_Semantic>(_impl_.semantic_);
 }
 inline void GeneratedCodeInfo_Annotation::_internal_set_semantic(::google::protobuf::GeneratedCodeInfo_Annotation_Semantic value) {
-  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   assert(::google::protobuf::GeneratedCodeInfo_Annotation_Semantic_IsValid(value));
   _impl_._has_bits_[0] |= 0x00000008u;
   _impl_.semantic_ = value;
@@ -17944,7 +17944,7 @@ inline ::google::protobuf::GeneratedCodeInfo_Annotation* GeneratedCodeInfo::muta
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::GeneratedCodeInfo_Annotation >*
 GeneratedCodeInfo::mutable_annotation() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.GeneratedCodeInfo.annotation)
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   return _internal_mutable_annotation();
 }
 inline const ::google::protobuf::GeneratedCodeInfo_Annotation& GeneratedCodeInfo::annotation(int index) const {
@@ -17952,7 +17952,7 @@ inline const ::google::protobuf::GeneratedCodeInfo_Annotation& GeneratedCodeInfo
     return _internal_annotation().Get(index);
 }
 inline ::google::protobuf::GeneratedCodeInfo_Annotation* GeneratedCodeInfo::add_annotation() {
-  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   ::google::protobuf::GeneratedCodeInfo_Annotation* _add = _internal_mutable_annotation()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.GeneratedCodeInfo.annotation)
   return _add;
@@ -17964,12 +17964,12 @@ GeneratedCodeInfo::annotation() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::GeneratedCodeInfo_Annotation>&
 GeneratedCodeInfo::_internal_annotation() const {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.annotation_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::GeneratedCodeInfo_Annotation>*
 GeneratedCodeInfo::_internal_mutable_annotation() {
-  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return &_impl_.annotation_;
 }
 
diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
index c1696ef958..ea74d184a0 100644
--- a/src/google/protobuf/port_def.inc
+++ b/src/google/protobuf/port_def.inc
@@ -860,16 +860,6 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
 #define PROTOBUF_TSAN_DECLARE_MEMBER
 #endif
 
-// TODO(b/280674214): cleanup these macros.
-#define PROTOBUF_TSAN_READ_REPEATED(addr) PROTOBUF_TSAN_READ(addr)
-#define PROTOBUF_TSAN_READ_PRIMITIVE(addr) PROTOBUF_TSAN_READ(addr)
-#define PROTOBUF_TSAN_READ_STRING(addr) PROTOBUF_TSAN_READ(addr)
-#define PROTOBUF_TSAN_READ_MESSAGE(addr) PROTOBUF_TSAN_READ(addr)
-#define PROTOBUF_TSAN_WRITE_REPEATED(addr) PROTOBUF_TSAN_WRITE(addr)
-#define PROTOBUF_TSAN_WRITE_PRIMITIVE(addr) PROTOBUF_TSAN_WRITE(addr)
-#define PROTOBUF_TSAN_WRITE_STRING(addr) PROTOBUF_TSAN_WRITE(addr)
-#define PROTOBUF_TSAN_WRITE_MESSAGE(addr) PROTOBUF_TSAN_WRITE(addr)
-
 #ifdef PROTOBUF_USE_TABLE_PARSER_ON_REFLECTION
 #error PROTOBUF_USE_TABLE_PARSER_ON_REFLECTION was previously defined
 #endif
diff --git a/src/google/protobuf/port_undef.inc b/src/google/protobuf/port_undef.inc
index f32d74ffdb..c52992ca13 100644
--- a/src/google/protobuf/port_undef.inc
+++ b/src/google/protobuf/port_undef.inc
@@ -106,14 +106,6 @@
 #undef PROTOBUF_TSAN_DECLARE_MEMBER
 #undef PROTOBUF_TSAN_READ
 #undef PROTOBUF_TSAN_WRITE
-#undef PROTOBUF_TSAN_READ_REPEATED
-#undef PROTOBUF_TSAN_READ_PRIMITIVE
-#undef PROTOBUF_TSAN_READ_STRING
-#undef PROTOBUF_TSAN_READ_MESSAGE
-#undef PROTOBUF_TSAN_WRITE_REPEATED
-#undef PROTOBUF_TSAN_WRITE_PRIMITIVE
-#undef PROTOBUF_TSAN_WRITE_STRING
-#undef PROTOBUF_TSAN_WRITE_MESSAGE
 #undef PROTOBUF_USE_TABLE_PARSER_ON_REFLECTION
 #undef PROTOBUF_TC_PARAM_DECL
 #undef PROTOBUF_EXCLUSIVE_LOCKS_REQUIRED