diff --git a/src/google/protobuf/compiler/cpp/field.cc b/src/google/protobuf/compiler/cpp/field.cc
index ef8e28c89d..2326935551 100644
--- a/src/google/protobuf/compiler/cpp/field.cc
+++ b/src/google/protobuf/compiler/cpp/field.cc
@@ -62,6 +62,17 @@ 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.
@@ -88,9 +99,11 @@ std::vector<Sub> FieldVars(const FieldDescriptor* field, const Options& opts) {
 
       // For TSan validation.
       {"TsanDetectConcurrentMutation",
-       "PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race)"},
+       absl::StrCat("PROTOBUF_TSAN_WRITE_", tsan_validation_phase,
+                    "(&_impl_._tsan_detect_race)")},
       {"TsanDetectConcurrentRead",
-       "PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race)"},
+       absl::StrCat("PROTOBUF_TSAN_READ_", tsan_validation_phase,
+                    "(&_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 ba3f788f65..c396c2f347 100644
--- a/src/google/protobuf/compiler/plugin.pb.h
+++ b/src/google/protobuf/compiler/plugin.pb.h
@@ -1039,11 +1039,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.major_;
 }
 inline void Version::_internal_set_major(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.major_ = value;
 }
@@ -1066,11 +1066,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.minor_;
 }
 inline void Version::_internal_set_minor(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.minor_ = value;
 }
@@ -1093,11 +1093,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.patch_;
 }
 inline void Version::_internal_set_patch(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   _impl_.patch_ = value;
 }
@@ -1118,7 +1118,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -1129,21 +1129,21 @@ inline std::string* Version::mutable_suffix() {
   return _s;
 }
 inline const std::string& Version::_internal_suffix() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.suffix_.Get();
 }
 inline void Version::_internal_set_suffix(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.suffix_.Set(value, GetArenaForAllocation());
 }
 inline std::string* Version::_internal_mutable_suffix() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.suffix_.Mutable( GetArenaForAllocation());
 }
 inline std::string* Version::release_suffix() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.compiler.Version.suffix)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -1156,7 +1156,7 @@ inline std::string* Version::release_suffix() {
   return released;
 }
 inline void Version::set_allocated_suffix(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -1186,7 +1186,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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;
@@ -1224,29 +1224,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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)
 }
@@ -1257,17 +1257,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.file_to_generate_;
 }
 inline ::google::protobuf::RepeatedPtrField<std::string>*
 CodeGeneratorRequest::_internal_mutable_file_to_generate() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.file_to_generate_;
 }
 
@@ -1287,7 +1287,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -1298,21 +1298,21 @@ inline std::string* CodeGeneratorRequest::mutable_parameter() {
   return _s;
 }
 inline const std::string& CodeGeneratorRequest::_internal_parameter() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.parameter_.Get();
 }
 inline void CodeGeneratorRequest::_internal_set_parameter(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.parameter_.Set(value, GetArenaForAllocation());
 }
 inline std::string* CodeGeneratorRequest::_internal_mutable_parameter() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.parameter_.Mutable( GetArenaForAllocation());
 }
 inline std::string* CodeGeneratorRequest::release_parameter() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.compiler.CodeGeneratorRequest.parameter)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -1325,7 +1325,7 @@ inline std::string* CodeGeneratorRequest::release_parameter() {
   return released;
 }
 inline void CodeGeneratorRequest::set_allocated_parameter(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -1354,7 +1354,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_proto_file();
 }
 inline const ::google::protobuf::FileDescriptorProto& CodeGeneratorRequest::proto_file(int index) const {
@@ -1362,7 +1362,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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;
@@ -1374,12 +1374,12 @@ CodeGeneratorRequest::proto_file() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::FileDescriptorProto>&
 CodeGeneratorRequest::_internal_proto_file() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.proto_file_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::FileDescriptorProto>*
 CodeGeneratorRequest::_internal_mutable_proto_file() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.proto_file_;
 }
 
@@ -1394,7 +1394,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_MESSAGE(&_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_);
 }
@@ -1403,7 +1403,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.compiler_version_);
   }
@@ -1416,7 +1416,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000002u;
   ::google::protobuf::compiler::Version* released = _impl_.compiler_version_;
@@ -1435,7 +1435,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.compiler.CodeGeneratorRequest.compiler_version)
 
   _impl_._has_bits_[0] &= ~0x00000002u;
@@ -1444,7 +1444,7 @@ inline ::google::protobuf::compiler::Version* CodeGeneratorRequest::unsafe_arena
   return temp;
 }
 inline ::google::protobuf::compiler::Version* CodeGeneratorRequest::_internal_mutable_compiler_version() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   if (_impl_.compiler_version_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::compiler::Version>(GetArenaForAllocation());
@@ -1459,7 +1459,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::compiler::Version*>(_impl_.compiler_version_);
   }
@@ -1499,7 +1499,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -1510,21 +1510,21 @@ inline std::string* CodeGeneratorResponse_File::mutable_name() {
   return _s;
 }
 inline const std::string& CodeGeneratorResponse_File::_internal_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.name_.Get();
 }
 inline void CodeGeneratorResponse_File::_internal_set_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.name_.Mutable( GetArenaForAllocation());
 }
 inline std::string* CodeGeneratorResponse_File::release_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.compiler.CodeGeneratorResponse.File.name)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -1537,7 +1537,7 @@ inline std::string* CodeGeneratorResponse_File::release_name() {
   return released;
 }
 inline void CodeGeneratorResponse_File::set_allocated_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -1568,7 +1568,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -1579,21 +1579,21 @@ inline std::string* CodeGeneratorResponse_File::mutable_insertion_point() {
   return _s;
 }
 inline const std::string& CodeGeneratorResponse_File::_internal_insertion_point() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.insertion_point_.Get();
 }
 inline void CodeGeneratorResponse_File::_internal_set_insertion_point(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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;
@@ -1606,7 +1606,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000002u;
   } else {
@@ -1637,7 +1637,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -1648,21 +1648,21 @@ inline std::string* CodeGeneratorResponse_File::mutable_content() {
   return _s;
 }
 inline const std::string& CodeGeneratorResponse_File::_internal_content() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.content_.Get();
 }
 inline void CodeGeneratorResponse_File::_internal_set_content(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   return _impl_.content_.Mutable( GetArenaForAllocation());
 }
 inline std::string* CodeGeneratorResponse_File::release_content() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.compiler.CodeGeneratorResponse.File.content)
   if ((_impl_._has_bits_[0] & 0x00000004u) == 0) {
     return nullptr;
@@ -1675,7 +1675,7 @@ inline std::string* CodeGeneratorResponse_File::release_content() {
   return released;
 }
 inline void CodeGeneratorResponse_File::set_allocated_content(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000004u;
   } else {
@@ -1697,7 +1697,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_MESSAGE(&_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_);
 }
@@ -1706,7 +1706,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.generated_code_info_);
   }
@@ -1719,7 +1719,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000008u;
   ::google::protobuf::GeneratedCodeInfo* released = _impl_.generated_code_info_;
@@ -1738,7 +1738,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.compiler.CodeGeneratorResponse.File.generated_code_info)
 
   _impl_._has_bits_[0] &= ~0x00000008u;
@@ -1747,7 +1747,7 @@ inline ::google::protobuf::GeneratedCodeInfo* CodeGeneratorResponse_File::unsafe
   return temp;
 }
 inline ::google::protobuf::GeneratedCodeInfo* CodeGeneratorResponse_File::_internal_mutable_generated_code_info() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   if (_impl_.generated_code_info_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::GeneratedCodeInfo>(GetArenaForAllocation());
@@ -1762,7 +1762,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.generated_code_info_);
   }
@@ -1802,7 +1802,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -1813,21 +1813,21 @@ inline std::string* CodeGeneratorResponse::mutable_error() {
   return _s;
 }
 inline const std::string& CodeGeneratorResponse::_internal_error() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.error_.Get();
 }
 inline void CodeGeneratorResponse::_internal_set_error(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.error_.Set(value, GetArenaForAllocation());
 }
 inline std::string* CodeGeneratorResponse::_internal_mutable_error() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.error_.Mutable( GetArenaForAllocation());
 }
 inline std::string* CodeGeneratorResponse::release_error() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.compiler.CodeGeneratorResponse.error)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -1840,7 +1840,7 @@ inline std::string* CodeGeneratorResponse::release_error() {
   return released;
 }
 inline void CodeGeneratorResponse::set_allocated_error(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -1873,11 +1873,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.supported_features_;
 }
 inline void CodeGeneratorResponse::_internal_set_supported_features(::uint64_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.supported_features_ = value;
 }
@@ -1899,7 +1899,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_file();
 }
 inline const ::google::protobuf::compiler::CodeGeneratorResponse_File& CodeGeneratorResponse::file(int index) const {
@@ -1907,7 +1907,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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;
@@ -1919,12 +1919,12 @@ CodeGeneratorResponse::file() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::compiler::CodeGeneratorResponse_File>&
 CodeGeneratorResponse::_internal_file() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.file_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::compiler::CodeGeneratorResponse_File>*
 CodeGeneratorResponse::_internal_mutable_file() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.file_;
 }
 
diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h
index f6a46327ff..175f01b060 100644
--- a/src/google/protobuf/descriptor.pb.h
+++ b/src/google/protobuf/descriptor.pb.h
@@ -8714,7 +8714,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_file();
 }
 inline const ::google::protobuf::FileDescriptorProto& FileDescriptorSet::file(int index) const {
@@ -8722,7 +8722,7 @@ inline const ::google::protobuf::FileDescriptorProto& FileDescriptorSet::file(in
     return _internal_file().Get(index);
 }
 inline ::google::protobuf::FileDescriptorProto* FileDescriptorSet::add_file() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   ::google::protobuf::FileDescriptorProto* _add = _internal_mutable_file()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorSet.file)
   return _add;
@@ -8734,12 +8734,12 @@ FileDescriptorSet::file() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::FileDescriptorProto>&
 FileDescriptorSet::_internal_file() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.file_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::FileDescriptorProto>*
 FileDescriptorSet::_internal_mutable_file() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.file_;
 }
 
@@ -8763,7 +8763,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -8774,21 +8774,21 @@ inline std::string* FileDescriptorProto::mutable_name() {
   return _s;
 }
 inline const std::string& FileDescriptorProto::_internal_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.name_.Get();
 }
 inline void FileDescriptorProto::_internal_set_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FileDescriptorProto::_internal_mutable_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.name_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FileDescriptorProto::release_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileDescriptorProto.name)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -8801,7 +8801,7 @@ inline std::string* FileDescriptorProto::release_name() {
   return released;
 }
 inline void FileDescriptorProto::set_allocated_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -8832,7 +8832,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -8843,21 +8843,21 @@ inline std::string* FileDescriptorProto::mutable_package() {
   return _s;
 }
 inline const std::string& FileDescriptorProto::_internal_package() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.package_.Get();
 }
 inline void FileDescriptorProto::_internal_set_package(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.package_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FileDescriptorProto::_internal_mutable_package() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   return _impl_.package_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FileDescriptorProto::release_package() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileDescriptorProto.package)
   if ((_impl_._has_bits_[0] & 0x00000002u) == 0) {
     return nullptr;
@@ -8870,7 +8870,7 @@ inline std::string* FileDescriptorProto::release_package() {
   return released;
 }
 inline void FileDescriptorProto::set_allocated_package(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000002u;
   } else {
@@ -8896,7 +8896,7 @@ inline void FileDescriptorProto::clear_dependency() {
   _internal_mutable_dependency()->Clear();
 }
 inline std::string* FileDescriptorProto::add_dependency() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   std::string* _s = _internal_mutable_dependency()->Add();
   // @@protoc_insertion_point(field_add_mutable:google.protobuf.FileDescriptorProto.dependency)
   return _s;
@@ -8934,29 +8934,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   _internal_mutable_dependency()->Add()->assign(value.data(), value.size());
   // @@protoc_insertion_point(field_add_string_piece:google.protobuf.FileDescriptorProto.dependency)
 }
@@ -8967,17 +8967,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_dependency();
 }
 inline const ::google::protobuf::RepeatedPtrField<std::string>&
 FileDescriptorProto::_internal_dependency() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.dependency_;
 }
 inline ::google::protobuf::RepeatedPtrField<std::string>*
 FileDescriptorProto::_internal_mutable_dependency() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.dependency_;
 }
 
@@ -9000,7 +9000,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   _internal_mutable_public_dependency()->Add(value);
   // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.public_dependency)
 }
@@ -9010,16 +9010,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_public_dependency();
 }
 
 inline const ::google::protobuf::RepeatedField<::int32_t>& FileDescriptorProto::_internal_public_dependency() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.public_dependency_;
 }
 inline ::google::protobuf::RepeatedField<::int32_t>* FileDescriptorProto::_internal_mutable_public_dependency() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.public_dependency_;
 }
 
@@ -9042,7 +9042,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   _internal_mutable_weak_dependency()->Add(value);
   // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.weak_dependency)
 }
@@ -9052,16 +9052,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_weak_dependency();
 }
 
 inline const ::google::protobuf::RepeatedField<::int32_t>& FileDescriptorProto::_internal_weak_dependency() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.weak_dependency_;
 }
 inline ::google::protobuf::RepeatedField<::int32_t>* FileDescriptorProto::_internal_mutable_weak_dependency() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.weak_dependency_;
 }
 
@@ -9082,7 +9082,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_message_type();
 }
 inline const ::google::protobuf::DescriptorProto& FileDescriptorProto::message_type(int index) const {
@@ -9090,7 +9090,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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;
@@ -9102,12 +9102,12 @@ FileDescriptorProto::message_type() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::DescriptorProto>&
 FileDescriptorProto::_internal_message_type() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.message_type_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::DescriptorProto>*
 FileDescriptorProto::_internal_mutable_message_type() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.message_type_;
 }
 
@@ -9128,7 +9128,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_enum_type();
 }
 inline const ::google::protobuf::EnumDescriptorProto& FileDescriptorProto::enum_type(int index) const {
@@ -9136,7 +9136,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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;
@@ -9148,12 +9148,12 @@ FileDescriptorProto::enum_type() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumDescriptorProto>&
 FileDescriptorProto::_internal_enum_type() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.enum_type_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumDescriptorProto>*
 FileDescriptorProto::_internal_mutable_enum_type() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.enum_type_;
 }
 
@@ -9174,7 +9174,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_service();
 }
 inline const ::google::protobuf::ServiceDescriptorProto& FileDescriptorProto::service(int index) const {
@@ -9182,7 +9182,7 @@ inline const ::google::protobuf::ServiceDescriptorProto& FileDescriptorProto::se
     return _internal_service().Get(index);
 }
 inline ::google::protobuf::ServiceDescriptorProto* FileDescriptorProto::add_service() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   ::google::protobuf::ServiceDescriptorProto* _add = _internal_mutable_service()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.service)
   return _add;
@@ -9194,12 +9194,12 @@ FileDescriptorProto::service() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::ServiceDescriptorProto>&
 FileDescriptorProto::_internal_service() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.service_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::ServiceDescriptorProto>*
 FileDescriptorProto::_internal_mutable_service() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.service_;
 }
 
@@ -9220,7 +9220,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_extension();
 }
 inline const ::google::protobuf::FieldDescriptorProto& FileDescriptorProto::extension(int index) const {
@@ -9228,7 +9228,7 @@ inline const ::google::protobuf::FieldDescriptorProto& FileDescriptorProto::exte
     return _internal_extension().Get(index);
 }
 inline ::google::protobuf::FieldDescriptorProto* FileDescriptorProto::add_extension() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   ::google::protobuf::FieldDescriptorProto* _add = _internal_mutable_extension()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.extension)
   return _add;
@@ -9240,12 +9240,12 @@ FileDescriptorProto::extension() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::FieldDescriptorProto>&
 FileDescriptorProto::_internal_extension() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.extension_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::FieldDescriptorProto>*
 FileDescriptorProto::_internal_mutable_extension() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.extension_;
 }
 
@@ -9260,7 +9260,7 @@ inline void FileDescriptorProto::clear_options() {
   _impl_._has_bits_[0] &= ~0x00000010u;
 }
 inline const ::google::protobuf::FileOptions& FileDescriptorProto::_internal_options() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_MESSAGE(&_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_);
 }
@@ -9269,7 +9269,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_);
   }
@@ -9282,7 +9282,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000010u;
   ::google::protobuf::FileOptions* released = _impl_.options_;
@@ -9301,7 +9301,7 @@ inline ::google::protobuf::FileOptions* FileDescriptorProto::release_options() {
   return released;
 }
 inline ::google::protobuf::FileOptions* FileDescriptorProto::unsafe_arena_release_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileDescriptorProto.options)
 
   _impl_._has_bits_[0] &= ~0x00000010u;
@@ -9310,7 +9310,7 @@ inline ::google::protobuf::FileOptions* FileDescriptorProto::unsafe_arena_releas
   return temp;
 }
 inline ::google::protobuf::FileOptions* FileDescriptorProto::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000010u;
   if (_impl_.options_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::FileOptions>(GetArenaForAllocation());
@@ -9325,7 +9325,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::FileOptions*>(_impl_.options_);
   }
@@ -9356,7 +9356,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_MESSAGE(&_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_);
 }
@@ -9365,7 +9365,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_code_info_);
   }
@@ -9378,7 +9378,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000020u;
   ::google::protobuf::SourceCodeInfo* released = _impl_.source_code_info_;
@@ -9397,7 +9397,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileDescriptorProto.source_code_info)
 
   _impl_._has_bits_[0] &= ~0x00000020u;
@@ -9406,7 +9406,7 @@ inline ::google::protobuf::SourceCodeInfo* FileDescriptorProto::unsafe_arena_rel
   return temp;
 }
 inline ::google::protobuf::SourceCodeInfo* FileDescriptorProto::_internal_mutable_source_code_info() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000020u;
   if (_impl_.source_code_info_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::SourceCodeInfo>(GetArenaForAllocation());
@@ -9421,7 +9421,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::SourceCodeInfo*>(_impl_.source_code_info_);
   }
@@ -9457,7 +9457,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -9468,21 +9468,21 @@ inline std::string* FileDescriptorProto::mutable_syntax() {
   return _s;
 }
 inline const std::string& FileDescriptorProto::_internal_syntax() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.syntax_.Get();
 }
 inline void FileDescriptorProto::_internal_set_syntax(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.syntax_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FileDescriptorProto::_internal_mutable_syntax() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   return _impl_.syntax_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FileDescriptorProto::release_syntax() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileDescriptorProto.syntax)
   if ((_impl_._has_bits_[0] & 0x00000004u) == 0) {
     return nullptr;
@@ -9495,7 +9495,7 @@ inline std::string* FileDescriptorProto::release_syntax() {
   return released;
 }
 inline void FileDescriptorProto::set_allocated_syntax(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000004u;
   } else {
@@ -9526,7 +9526,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -9537,21 +9537,21 @@ inline std::string* FileDescriptorProto::mutable_edition() {
   return _s;
 }
 inline const std::string& FileDescriptorProto::_internal_edition() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.edition_.Get();
 }
 inline void FileDescriptorProto::_internal_set_edition(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   _impl_.edition_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FileDescriptorProto::_internal_mutable_edition() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   return _impl_.edition_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FileDescriptorProto::release_edition() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileDescriptorProto.edition)
   if ((_impl_._has_bits_[0] & 0x00000008u) == 0) {
     return nullptr;
@@ -9564,7 +9564,7 @@ inline std::string* FileDescriptorProto::release_edition() {
   return released;
 }
 inline void FileDescriptorProto::set_allocated_edition(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000008u;
   } else {
@@ -9601,11 +9601,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.start_;
 }
 inline void DescriptorProto_ExtensionRange::_internal_set_start(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.start_ = value;
 }
@@ -9628,11 +9628,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.end_;
 }
 inline void DescriptorProto_ExtensionRange::_internal_set_end(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.end_ = value;
 }
@@ -9648,7 +9648,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_MESSAGE(&_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_);
 }
@@ -9657,7 +9657,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_);
   }
@@ -9670,7 +9670,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000001u;
   ::google::protobuf::ExtensionRangeOptions* released = _impl_.options_;
@@ -9689,7 +9689,7 @@ inline ::google::protobuf::ExtensionRangeOptions* DescriptorProto_ExtensionRange
   return released;
 }
 inline ::google::protobuf::ExtensionRangeOptions* DescriptorProto_ExtensionRange::unsafe_arena_release_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.DescriptorProto.ExtensionRange.options)
 
   _impl_._has_bits_[0] &= ~0x00000001u;
@@ -9698,7 +9698,7 @@ inline ::google::protobuf::ExtensionRangeOptions* DescriptorProto_ExtensionRange
   return temp;
 }
 inline ::google::protobuf::ExtensionRangeOptions* DescriptorProto_ExtensionRange::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   if (_impl_.options_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::ExtensionRangeOptions>(GetArenaForAllocation());
@@ -9713,7 +9713,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::ExtensionRangeOptions*>(_impl_.options_);
   }
@@ -9755,11 +9755,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.start_;
 }
 inline void DescriptorProto_ReservedRange::_internal_set_start(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.start_ = value;
 }
@@ -9782,11 +9782,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.end_;
 }
 inline void DescriptorProto_ReservedRange::_internal_set_end(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.end_ = value;
 }
@@ -9811,7 +9811,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -9822,21 +9822,21 @@ inline std::string* DescriptorProto::mutable_name() {
   return _s;
 }
 inline const std::string& DescriptorProto::_internal_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.name_.Get();
 }
 inline void DescriptorProto::_internal_set_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(value, GetArenaForAllocation());
 }
 inline std::string* DescriptorProto::_internal_mutable_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.name_.Mutable( GetArenaForAllocation());
 }
 inline std::string* DescriptorProto::release_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.DescriptorProto.name)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -9849,7 +9849,7 @@ inline std::string* DescriptorProto::release_name() {
   return released;
 }
 inline void DescriptorProto::set_allocated_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -9881,7 +9881,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_field();
 }
 inline const ::google::protobuf::FieldDescriptorProto& DescriptorProto::field(int index) const {
@@ -9889,7 +9889,7 @@ inline const ::google::protobuf::FieldDescriptorProto& DescriptorProto::field(in
     return _internal_field().Get(index);
 }
 inline ::google::protobuf::FieldDescriptorProto* DescriptorProto::add_field() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   ::google::protobuf::FieldDescriptorProto* _add = _internal_mutable_field()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.field)
   return _add;
@@ -9901,12 +9901,12 @@ DescriptorProto::field() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::FieldDescriptorProto>&
 DescriptorProto::_internal_field() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.field_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::FieldDescriptorProto>*
 DescriptorProto::_internal_mutable_field() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.field_;
 }
 
@@ -9927,7 +9927,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_extension();
 }
 inline const ::google::protobuf::FieldDescriptorProto& DescriptorProto::extension(int index) const {
@@ -9935,7 +9935,7 @@ inline const ::google::protobuf::FieldDescriptorProto& DescriptorProto::extensio
     return _internal_extension().Get(index);
 }
 inline ::google::protobuf::FieldDescriptorProto* DescriptorProto::add_extension() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   ::google::protobuf::FieldDescriptorProto* _add = _internal_mutable_extension()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.extension)
   return _add;
@@ -9947,12 +9947,12 @@ DescriptorProto::extension() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::FieldDescriptorProto>&
 DescriptorProto::_internal_extension() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.extension_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::FieldDescriptorProto>*
 DescriptorProto::_internal_mutable_extension() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.extension_;
 }
 
@@ -9973,7 +9973,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_nested_type();
 }
 inline const ::google::protobuf::DescriptorProto& DescriptorProto::nested_type(int index) const {
@@ -9981,7 +9981,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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;
@@ -9993,12 +9993,12 @@ DescriptorProto::nested_type() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::DescriptorProto>&
 DescriptorProto::_internal_nested_type() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.nested_type_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::DescriptorProto>*
 DescriptorProto::_internal_mutable_nested_type() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.nested_type_;
 }
 
@@ -10019,7 +10019,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_enum_type();
 }
 inline const ::google::protobuf::EnumDescriptorProto& DescriptorProto::enum_type(int index) const {
@@ -10027,7 +10027,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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;
@@ -10039,12 +10039,12 @@ DescriptorProto::enum_type() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumDescriptorProto>&
 DescriptorProto::_internal_enum_type() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.enum_type_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumDescriptorProto>*
 DescriptorProto::_internal_mutable_enum_type() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.enum_type_;
 }
 
@@ -10065,7 +10065,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_extension_range();
 }
 inline const ::google::protobuf::DescriptorProto_ExtensionRange& DescriptorProto::extension_range(int index) const {
@@ -10073,7 +10073,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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;
@@ -10085,12 +10085,12 @@ DescriptorProto::extension_range() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::DescriptorProto_ExtensionRange>&
 DescriptorProto::_internal_extension_range() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.extension_range_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::DescriptorProto_ExtensionRange>*
 DescriptorProto::_internal_mutable_extension_range() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.extension_range_;
 }
 
@@ -10111,7 +10111,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_oneof_decl();
 }
 inline const ::google::protobuf::OneofDescriptorProto& DescriptorProto::oneof_decl(int index) const {
@@ -10119,7 +10119,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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;
@@ -10131,12 +10131,12 @@ DescriptorProto::oneof_decl() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::OneofDescriptorProto>&
 DescriptorProto::_internal_oneof_decl() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.oneof_decl_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::OneofDescriptorProto>*
 DescriptorProto::_internal_mutable_oneof_decl() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.oneof_decl_;
 }
 
@@ -10151,7 +10151,7 @@ inline void DescriptorProto::clear_options() {
   _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::google::protobuf::MessageOptions& DescriptorProto::_internal_options() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_MESSAGE(&_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_);
 }
@@ -10160,7 +10160,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_);
   }
@@ -10173,7 +10173,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000002u;
   ::google::protobuf::MessageOptions* released = _impl_.options_;
@@ -10192,7 +10192,7 @@ inline ::google::protobuf::MessageOptions* DescriptorProto::release_options() {
   return released;
 }
 inline ::google::protobuf::MessageOptions* DescriptorProto::unsafe_arena_release_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.DescriptorProto.options)
 
   _impl_._has_bits_[0] &= ~0x00000002u;
@@ -10201,7 +10201,7 @@ inline ::google::protobuf::MessageOptions* DescriptorProto::unsafe_arena_release
   return temp;
 }
 inline ::google::protobuf::MessageOptions* DescriptorProto::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   if (_impl_.options_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::MessageOptions>(GetArenaForAllocation());
@@ -10216,7 +10216,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageOptions*>(_impl_.options_);
   }
@@ -10253,7 +10253,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_reserved_range();
 }
 inline const ::google::protobuf::DescriptorProto_ReservedRange& DescriptorProto::reserved_range(int index) const {
@@ -10261,7 +10261,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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;
@@ -10273,12 +10273,12 @@ DescriptorProto::reserved_range() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::DescriptorProto_ReservedRange>&
 DescriptorProto::_internal_reserved_range() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.reserved_range_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::DescriptorProto_ReservedRange>*
 DescriptorProto::_internal_mutable_reserved_range() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.reserved_range_;
 }
 
@@ -10293,7 +10293,7 @@ inline void DescriptorProto::clear_reserved_name() {
   _internal_mutable_reserved_name()->Clear();
 }
 inline std::string* DescriptorProto::add_reserved_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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;
@@ -10331,29 +10331,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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)
 }
@@ -10364,17 +10364,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_reserved_name();
 }
 inline const ::google::protobuf::RepeatedPtrField<std::string>&
 DescriptorProto::_internal_reserved_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.reserved_name_;
 }
 inline ::google::protobuf::RepeatedPtrField<std::string>*
 DescriptorProto::_internal_mutable_reserved_name() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.reserved_name_;
 }
 
@@ -10400,11 +10400,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.number_;
 }
 inline void ExtensionRangeOptions_Declaration::_internal_set_number(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.number_ = value;
 }
@@ -10425,7 +10425,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -10436,21 +10436,21 @@ inline std::string* ExtensionRangeOptions_Declaration::mutable_full_name() {
   return _s;
 }
 inline const std::string& ExtensionRangeOptions_Declaration::_internal_full_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.full_name_.Get();
 }
 inline void ExtensionRangeOptions_Declaration::_internal_set_full_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.ExtensionRangeOptions.Declaration.full_name)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -10463,7 +10463,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -10494,7 +10494,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -10505,21 +10505,21 @@ inline std::string* ExtensionRangeOptions_Declaration::mutable_type() {
   return _s;
 }
 inline const std::string& ExtensionRangeOptions_Declaration::_internal_type() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.type_.Get();
 }
 inline void ExtensionRangeOptions_Declaration::_internal_set_type(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   return _impl_.type_.Mutable( GetArenaForAllocation());
 }
 inline std::string* ExtensionRangeOptions_Declaration::release_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.ExtensionRangeOptions.Declaration.type)
   if ((_impl_._has_bits_[0] & 0x00000002u) == 0) {
     return nullptr;
@@ -10532,7 +10532,7 @@ inline std::string* ExtensionRangeOptions_Declaration::release_type() {
   return released;
 }
 inline void ExtensionRangeOptions_Declaration::set_allocated_type(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000002u;
   } else {
@@ -10565,11 +10565,11 @@ inline void ExtensionRangeOptions_Declaration::set_is_repeated(bool value) {
   // @@protoc_insertion_point(field_set:google.protobuf.ExtensionRangeOptions.Declaration.is_repeated)
 }
 inline bool ExtensionRangeOptions_Declaration::_internal_is_repeated() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.is_repeated_;
 }
 inline void ExtensionRangeOptions_Declaration::_internal_set_is_repeated(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   _impl_.is_repeated_ = value;
 }
@@ -10592,11 +10592,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.reserved_;
 }
 inline void ExtensionRangeOptions_Declaration::_internal_set_reserved(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000010u;
   _impl_.reserved_ = value;
 }
@@ -10619,11 +10619,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.repeated_;
 }
 inline void ExtensionRangeOptions_Declaration::_internal_set_repeated(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000020u;
   _impl_.repeated_ = value;
 }
@@ -10649,7 +10649,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_uninterpreted_option();
 }
 inline const ::google::protobuf::UninterpretedOption& ExtensionRangeOptions::uninterpreted_option(int index) const {
@@ -10657,7 +10657,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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;
@@ -10669,12 +10669,12 @@ ExtensionRangeOptions::uninterpreted_option() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>&
 ExtensionRangeOptions::_internal_uninterpreted_option() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.uninterpreted_option_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>*
 ExtensionRangeOptions::_internal_mutable_uninterpreted_option() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.uninterpreted_option_;
 }
 
@@ -10695,7 +10695,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_declaration();
 }
 inline const ::google::protobuf::ExtensionRangeOptions_Declaration& ExtensionRangeOptions::declaration(int index) const {
@@ -10703,7 +10703,7 @@ inline const ::google::protobuf::ExtensionRangeOptions_Declaration& ExtensionRan
     return _internal_declaration().Get(index);
 }
 inline ::google::protobuf::ExtensionRangeOptions_Declaration* ExtensionRangeOptions::add_declaration() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   ::google::protobuf::ExtensionRangeOptions_Declaration* _add = _internal_mutable_declaration()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.ExtensionRangeOptions.declaration)
   return _add;
@@ -10715,12 +10715,12 @@ ExtensionRangeOptions::declaration() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::ExtensionRangeOptions_Declaration>&
 ExtensionRangeOptions::_internal_declaration() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.declaration_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::ExtensionRangeOptions_Declaration>*
 ExtensionRangeOptions::_internal_mutable_declaration() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.declaration_;
 }
 
@@ -10742,11 +10742,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   assert(::google::protobuf::ExtensionRangeOptions_VerificationState_IsValid(value));
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.verification_ = value;
@@ -10772,7 +10772,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -10783,21 +10783,21 @@ inline std::string* FieldDescriptorProto::mutable_name() {
   return _s;
 }
 inline const std::string& FieldDescriptorProto::_internal_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.name_.Get();
 }
 inline void FieldDescriptorProto::_internal_set_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FieldDescriptorProto::_internal_mutable_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.name_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FieldDescriptorProto::release_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.name)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -10810,7 +10810,7 @@ inline std::string* FieldDescriptorProto::release_name() {
   return released;
 }
 inline void FieldDescriptorProto::set_allocated_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -10843,11 +10843,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.number_;
 }
 inline void FieldDescriptorProto::_internal_set_number(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000040u;
   _impl_.number_ = value;
 }
@@ -10870,11 +10870,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   assert(::google::protobuf::FieldDescriptorProto_Label_IsValid(value));
   _impl_._has_bits_[0] |= 0x00000200u;
   _impl_.label_ = value;
@@ -10898,11 +10898,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   assert(::google::protobuf::FieldDescriptorProto_Type_IsValid(value));
   _impl_._has_bits_[0] |= 0x00000400u;
   _impl_.type_ = value;
@@ -10924,7 +10924,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -10935,21 +10935,21 @@ inline std::string* FieldDescriptorProto::mutable_type_name() {
   return _s;
 }
 inline const std::string& FieldDescriptorProto::_internal_type_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.type_name_.Get();
 }
 inline void FieldDescriptorProto::_internal_set_type_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.type_name)
   if ((_impl_._has_bits_[0] & 0x00000004u) == 0) {
     return nullptr;
@@ -10962,7 +10962,7 @@ inline std::string* FieldDescriptorProto::release_type_name() {
   return released;
 }
 inline void FieldDescriptorProto::set_allocated_type_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000004u;
   } else {
@@ -10993,7 +10993,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -11004,21 +11004,21 @@ inline std::string* FieldDescriptorProto::mutable_extendee() {
   return _s;
 }
 inline const std::string& FieldDescriptorProto::_internal_extendee() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.extendee_.Get();
 }
 inline void FieldDescriptorProto::_internal_set_extendee(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.extendee_.Set(value, GetArenaForAllocation());
 }
 inline std::string* FieldDescriptorProto::_internal_mutable_extendee() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   return _impl_.extendee_.Mutable( GetArenaForAllocation());
 }
 inline std::string* FieldDescriptorProto::release_extendee() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.extendee)
   if ((_impl_._has_bits_[0] & 0x00000002u) == 0) {
     return nullptr;
@@ -11031,7 +11031,7 @@ inline std::string* FieldDescriptorProto::release_extendee() {
   return released;
 }
 inline void FieldDescriptorProto::set_allocated_extendee(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000002u;
   } else {
@@ -11062,7 +11062,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -11073,21 +11073,21 @@ inline std::string* FieldDescriptorProto::mutable_default_value() {
   return _s;
 }
 inline const std::string& FieldDescriptorProto::_internal_default_value() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.default_value_.Get();
 }
 inline void FieldDescriptorProto::_internal_set_default_value(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.default_value)
   if ((_impl_._has_bits_[0] & 0x00000008u) == 0) {
     return nullptr;
@@ -11100,7 +11100,7 @@ inline std::string* FieldDescriptorProto::release_default_value() {
   return released;
 }
 inline void FieldDescriptorProto::set_allocated_default_value(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000008u;
   } else {
@@ -11133,11 +11133,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.oneof_index_;
 }
 inline void FieldDescriptorProto::_internal_set_oneof_index(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000080u;
   _impl_.oneof_index_ = value;
 }
@@ -11158,7 +11158,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -11169,21 +11169,21 @@ inline std::string* FieldDescriptorProto::mutable_json_name() {
   return _s;
 }
 inline const std::string& FieldDescriptorProto::_internal_json_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.json_name_.Get();
 }
 inline void FieldDescriptorProto::_internal_set_json_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.json_name)
   if ((_impl_._has_bits_[0] & 0x00000010u) == 0) {
     return nullptr;
@@ -11196,7 +11196,7 @@ inline std::string* FieldDescriptorProto::release_json_name() {
   return released;
 }
 inline void FieldDescriptorProto::set_allocated_json_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000010u;
   } else {
@@ -11222,7 +11222,7 @@ inline void FieldDescriptorProto::clear_options() {
   _impl_._has_bits_[0] &= ~0x00000020u;
 }
 inline const ::google::protobuf::FieldOptions& FieldDescriptorProto::_internal_options() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_MESSAGE(&_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_);
 }
@@ -11231,7 +11231,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_);
   }
@@ -11244,7 +11244,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000020u;
   ::google::protobuf::FieldOptions* released = _impl_.options_;
@@ -11263,7 +11263,7 @@ inline ::google::protobuf::FieldOptions* FieldDescriptorProto::release_options()
   return released;
 }
 inline ::google::protobuf::FieldOptions* FieldDescriptorProto::unsafe_arena_release_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.options)
 
   _impl_._has_bits_[0] &= ~0x00000020u;
@@ -11272,7 +11272,7 @@ inline ::google::protobuf::FieldOptions* FieldDescriptorProto::unsafe_arena_rele
   return temp;
 }
 inline ::google::protobuf::FieldOptions* FieldDescriptorProto::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000020u;
   if (_impl_.options_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::FieldOptions>(GetArenaForAllocation());
@@ -11287,7 +11287,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::FieldOptions*>(_impl_.options_);
   }
@@ -11325,11 +11325,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.proto3_optional_;
 }
 inline void FieldDescriptorProto::_internal_set_proto3_optional(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000100u;
   _impl_.proto3_optional_ = value;
 }
@@ -11354,7 +11354,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -11365,21 +11365,21 @@ inline std::string* OneofDescriptorProto::mutable_name() {
   return _s;
 }
 inline const std::string& OneofDescriptorProto::_internal_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.name_.Get();
 }
 inline void OneofDescriptorProto::_internal_set_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(value, GetArenaForAllocation());
 }
 inline std::string* OneofDescriptorProto::_internal_mutable_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.name_.Mutable( GetArenaForAllocation());
 }
 inline std::string* OneofDescriptorProto::release_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.OneofDescriptorProto.name)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -11392,7 +11392,7 @@ inline std::string* OneofDescriptorProto::release_name() {
   return released;
 }
 inline void OneofDescriptorProto::set_allocated_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -11418,7 +11418,7 @@ inline void OneofDescriptorProto::clear_options() {
   _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::google::protobuf::OneofOptions& OneofDescriptorProto::_internal_options() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_MESSAGE(&_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_);
 }
@@ -11427,7 +11427,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_);
   }
@@ -11440,7 +11440,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000002u;
   ::google::protobuf::OneofOptions* released = _impl_.options_;
@@ -11459,7 +11459,7 @@ inline ::google::protobuf::OneofOptions* OneofDescriptorProto::release_options()
   return released;
 }
 inline ::google::protobuf::OneofOptions* OneofDescriptorProto::unsafe_arena_release_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.OneofDescriptorProto.options)
 
   _impl_._has_bits_[0] &= ~0x00000002u;
@@ -11468,7 +11468,7 @@ inline ::google::protobuf::OneofOptions* OneofDescriptorProto::unsafe_arena_rele
   return temp;
 }
 inline ::google::protobuf::OneofOptions* OneofDescriptorProto::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   if (_impl_.options_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::OneofOptions>(GetArenaForAllocation());
@@ -11483,7 +11483,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::OneofOptions*>(_impl_.options_);
   }
@@ -11525,11 +11525,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.start_;
 }
 inline void EnumDescriptorProto_EnumReservedRange::_internal_set_start(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.start_ = value;
 }
@@ -11552,11 +11552,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.end_;
 }
 inline void EnumDescriptorProto_EnumReservedRange::_internal_set_end(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.end_ = value;
 }
@@ -11581,7 +11581,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -11592,21 +11592,21 @@ inline std::string* EnumDescriptorProto::mutable_name() {
   return _s;
 }
 inline const std::string& EnumDescriptorProto::_internal_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.name_.Get();
 }
 inline void EnumDescriptorProto::_internal_set_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(value, GetArenaForAllocation());
 }
 inline std::string* EnumDescriptorProto::_internal_mutable_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.name_.Mutable( GetArenaForAllocation());
 }
 inline std::string* EnumDescriptorProto::release_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.EnumDescriptorProto.name)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -11619,7 +11619,7 @@ inline std::string* EnumDescriptorProto::release_name() {
   return released;
 }
 inline void EnumDescriptorProto::set_allocated_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -11651,7 +11651,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_value();
 }
 inline const ::google::protobuf::EnumValueDescriptorProto& EnumDescriptorProto::value(int index) const {
@@ -11659,7 +11659,7 @@ inline const ::google::protobuf::EnumValueDescriptorProto& EnumDescriptorProto::
     return _internal_value().Get(index);
 }
 inline ::google::protobuf::EnumValueDescriptorProto* EnumDescriptorProto::add_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   ::google::protobuf::EnumValueDescriptorProto* _add = _internal_mutable_value()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.EnumDescriptorProto.value)
   return _add;
@@ -11671,12 +11671,12 @@ EnumDescriptorProto::value() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumValueDescriptorProto>&
 EnumDescriptorProto::_internal_value() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.value_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumValueDescriptorProto>*
 EnumDescriptorProto::_internal_mutable_value() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.value_;
 }
 
@@ -11691,7 +11691,7 @@ inline void EnumDescriptorProto::clear_options() {
   _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::google::protobuf::EnumOptions& EnumDescriptorProto::_internal_options() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_MESSAGE(&_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_);
 }
@@ -11700,7 +11700,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_);
   }
@@ -11713,7 +11713,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000002u;
   ::google::protobuf::EnumOptions* released = _impl_.options_;
@@ -11732,7 +11732,7 @@ inline ::google::protobuf::EnumOptions* EnumDescriptorProto::release_options() {
   return released;
 }
 inline ::google::protobuf::EnumOptions* EnumDescriptorProto::unsafe_arena_release_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.EnumDescriptorProto.options)
 
   _impl_._has_bits_[0] &= ~0x00000002u;
@@ -11741,7 +11741,7 @@ inline ::google::protobuf::EnumOptions* EnumDescriptorProto::unsafe_arena_releas
   return temp;
 }
 inline ::google::protobuf::EnumOptions* EnumDescriptorProto::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   if (_impl_.options_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::EnumOptions>(GetArenaForAllocation());
@@ -11756,7 +11756,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::EnumOptions*>(_impl_.options_);
   }
@@ -11793,7 +11793,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_reserved_range();
 }
 inline const ::google::protobuf::EnumDescriptorProto_EnumReservedRange& EnumDescriptorProto::reserved_range(int index) const {
@@ -11801,7 +11801,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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;
@@ -11813,12 +11813,12 @@ EnumDescriptorProto::reserved_range() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumDescriptorProto_EnumReservedRange>&
 EnumDescriptorProto::_internal_reserved_range() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.reserved_range_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumDescriptorProto_EnumReservedRange>*
 EnumDescriptorProto::_internal_mutable_reserved_range() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.reserved_range_;
 }
 
@@ -11833,7 +11833,7 @@ inline void EnumDescriptorProto::clear_reserved_name() {
   _internal_mutable_reserved_name()->Clear();
 }
 inline std::string* EnumDescriptorProto::add_reserved_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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;
@@ -11871,29 +11871,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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)
 }
@@ -11904,17 +11904,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_reserved_name();
 }
 inline const ::google::protobuf::RepeatedPtrField<std::string>&
 EnumDescriptorProto::_internal_reserved_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.reserved_name_;
 }
 inline ::google::protobuf::RepeatedPtrField<std::string>*
 EnumDescriptorProto::_internal_mutable_reserved_name() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.reserved_name_;
 }
 
@@ -11938,7 +11938,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -11949,21 +11949,21 @@ inline std::string* EnumValueDescriptorProto::mutable_name() {
   return _s;
 }
 inline const std::string& EnumValueDescriptorProto::_internal_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.name_.Get();
 }
 inline void EnumValueDescriptorProto::_internal_set_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(value, GetArenaForAllocation());
 }
 inline std::string* EnumValueDescriptorProto::_internal_mutable_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.name_.Mutable( GetArenaForAllocation());
 }
 inline std::string* EnumValueDescriptorProto::release_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.EnumValueDescriptorProto.name)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -11976,7 +11976,7 @@ inline std::string* EnumValueDescriptorProto::release_name() {
   return released;
 }
 inline void EnumValueDescriptorProto::set_allocated_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -12009,11 +12009,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.number_;
 }
 inline void EnumValueDescriptorProto::_internal_set_number(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.number_ = value;
 }
@@ -12029,7 +12029,7 @@ inline void EnumValueDescriptorProto::clear_options() {
   _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::google::protobuf::EnumValueOptions& EnumValueDescriptorProto::_internal_options() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_MESSAGE(&_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_);
 }
@@ -12038,7 +12038,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_);
   }
@@ -12051,7 +12051,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000002u;
   ::google::protobuf::EnumValueOptions* released = _impl_.options_;
@@ -12070,7 +12070,7 @@ inline ::google::protobuf::EnumValueOptions* EnumValueDescriptorProto::release_o
   return released;
 }
 inline ::google::protobuf::EnumValueOptions* EnumValueDescriptorProto::unsafe_arena_release_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.EnumValueDescriptorProto.options)
 
   _impl_._has_bits_[0] &= ~0x00000002u;
@@ -12079,7 +12079,7 @@ inline ::google::protobuf::EnumValueOptions* EnumValueDescriptorProto::unsafe_ar
   return temp;
 }
 inline ::google::protobuf::EnumValueOptions* EnumValueDescriptorProto::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   if (_impl_.options_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::EnumValueOptions>(GetArenaForAllocation());
@@ -12094,7 +12094,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::EnumValueOptions*>(_impl_.options_);
   }
@@ -12134,7 +12134,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -12145,21 +12145,21 @@ inline std::string* ServiceDescriptorProto::mutable_name() {
   return _s;
 }
 inline const std::string& ServiceDescriptorProto::_internal_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.name_.Get();
 }
 inline void ServiceDescriptorProto::_internal_set_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ServiceDescriptorProto::_internal_mutable_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.name_.Mutable( GetArenaForAllocation());
 }
 inline std::string* ServiceDescriptorProto::release_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.ServiceDescriptorProto.name)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -12172,7 +12172,7 @@ inline std::string* ServiceDescriptorProto::release_name() {
   return released;
 }
 inline void ServiceDescriptorProto::set_allocated_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -12204,7 +12204,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_method();
 }
 inline const ::google::protobuf::MethodDescriptorProto& ServiceDescriptorProto::method(int index) const {
@@ -12212,7 +12212,7 @@ inline const ::google::protobuf::MethodDescriptorProto& ServiceDescriptorProto::
     return _internal_method().Get(index);
 }
 inline ::google::protobuf::MethodDescriptorProto* ServiceDescriptorProto::add_method() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   ::google::protobuf::MethodDescriptorProto* _add = _internal_mutable_method()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.ServiceDescriptorProto.method)
   return _add;
@@ -12224,12 +12224,12 @@ ServiceDescriptorProto::method() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::MethodDescriptorProto>&
 ServiceDescriptorProto::_internal_method() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.method_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::MethodDescriptorProto>*
 ServiceDescriptorProto::_internal_mutable_method() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.method_;
 }
 
@@ -12244,7 +12244,7 @@ inline void ServiceDescriptorProto::clear_options() {
   _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::google::protobuf::ServiceOptions& ServiceDescriptorProto::_internal_options() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_MESSAGE(&_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_);
 }
@@ -12253,7 +12253,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_);
   }
@@ -12266,7 +12266,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000002u;
   ::google::protobuf::ServiceOptions* released = _impl_.options_;
@@ -12285,7 +12285,7 @@ inline ::google::protobuf::ServiceOptions* ServiceDescriptorProto::release_optio
   return released;
 }
 inline ::google::protobuf::ServiceOptions* ServiceDescriptorProto::unsafe_arena_release_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.ServiceDescriptorProto.options)
 
   _impl_._has_bits_[0] &= ~0x00000002u;
@@ -12294,7 +12294,7 @@ inline ::google::protobuf::ServiceOptions* ServiceDescriptorProto::unsafe_arena_
   return temp;
 }
 inline ::google::protobuf::ServiceOptions* ServiceDescriptorProto::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   if (_impl_.options_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::ServiceOptions>(GetArenaForAllocation());
@@ -12309,7 +12309,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::ServiceOptions*>(_impl_.options_);
   }
@@ -12349,7 +12349,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -12360,21 +12360,21 @@ inline std::string* MethodDescriptorProto::mutable_name() {
   return _s;
 }
 inline const std::string& MethodDescriptorProto::_internal_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.name_.Get();
 }
 inline void MethodDescriptorProto::_internal_set_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.name_.Set(value, GetArenaForAllocation());
 }
 inline std::string* MethodDescriptorProto::_internal_mutable_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   return _impl_.name_.Mutable( GetArenaForAllocation());
 }
 inline std::string* MethodDescriptorProto::release_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.MethodDescriptorProto.name)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -12387,7 +12387,7 @@ inline std::string* MethodDescriptorProto::release_name() {
   return released;
 }
 inline void MethodDescriptorProto::set_allocated_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -12418,7 +12418,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -12429,21 +12429,21 @@ inline std::string* MethodDescriptorProto::mutable_input_type() {
   return _s;
 }
 inline const std::string& MethodDescriptorProto::_internal_input_type() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.input_type_.Get();
 }
 inline void MethodDescriptorProto::_internal_set_input_type(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.MethodDescriptorProto.input_type)
   if ((_impl_._has_bits_[0] & 0x00000002u) == 0) {
     return nullptr;
@@ -12456,7 +12456,7 @@ inline std::string* MethodDescriptorProto::release_input_type() {
   return released;
 }
 inline void MethodDescriptorProto::set_allocated_input_type(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000002u;
   } else {
@@ -12487,7 +12487,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -12498,21 +12498,21 @@ inline std::string* MethodDescriptorProto::mutable_output_type() {
   return _s;
 }
 inline const std::string& MethodDescriptorProto::_internal_output_type() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.output_type_.Get();
 }
 inline void MethodDescriptorProto::_internal_set_output_type(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.MethodDescriptorProto.output_type)
   if ((_impl_._has_bits_[0] & 0x00000004u) == 0) {
     return nullptr;
@@ -12525,7 +12525,7 @@ inline std::string* MethodDescriptorProto::release_output_type() {
   return released;
 }
 inline void MethodDescriptorProto::set_allocated_output_type(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000004u;
   } else {
@@ -12551,7 +12551,7 @@ inline void MethodDescriptorProto::clear_options() {
   _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline const ::google::protobuf::MethodOptions& MethodDescriptorProto::_internal_options() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_MESSAGE(&_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_);
 }
@@ -12560,7 +12560,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   if (GetArenaForAllocation() == nullptr) {
     delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_);
   }
@@ -12573,7 +12573,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
 
   _impl_._has_bits_[0] &= ~0x00000008u;
   ::google::protobuf::MethodOptions* released = _impl_.options_;
@@ -12592,7 +12592,7 @@ inline ::google::protobuf::MethodOptions* MethodDescriptorProto::release_options
   return released;
 }
 inline ::google::protobuf::MethodOptions* MethodDescriptorProto::unsafe_arena_release_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.MethodDescriptorProto.options)
 
   _impl_._has_bits_[0] &= ~0x00000008u;
@@ -12601,7 +12601,7 @@ inline ::google::protobuf::MethodOptions* MethodDescriptorProto::unsafe_arena_re
   return temp;
 }
 inline ::google::protobuf::MethodOptions* MethodDescriptorProto::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   if (_impl_.options_ == nullptr) {
     auto* p = CreateMaybeMessage<::google::protobuf::MethodOptions>(GetArenaForAllocation());
@@ -12616,7 +12616,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_MESSAGE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
     delete reinterpret_cast<::google::protobuf::MethodOptions*>(_impl_.options_);
   }
@@ -12654,11 +12654,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.client_streaming_;
 }
 inline void MethodDescriptorProto::_internal_set_client_streaming(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000010u;
   _impl_.client_streaming_ = value;
 }
@@ -12681,11 +12681,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.server_streaming_;
 }
 inline void MethodDescriptorProto::_internal_set_server_streaming(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000020u;
   _impl_.server_streaming_ = value;
 }
@@ -12710,7 +12710,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -12721,21 +12721,21 @@ inline std::string* FileOptions::mutable_java_package() {
   return _s;
 }
 inline const std::string& FileOptions::_internal_java_package() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.java_package_.Get();
 }
 inline void FileOptions::_internal_set_java_package(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.java_package)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -12748,7 +12748,7 @@ inline std::string* FileOptions::release_java_package() {
   return released;
 }
 inline void FileOptions::set_allocated_java_package(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -12779,7 +12779,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -12790,21 +12790,21 @@ inline std::string* FileOptions::mutable_java_outer_classname() {
   return _s;
 }
 inline const std::string& FileOptions::_internal_java_outer_classname() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.java_outer_classname)
   if ((_impl_._has_bits_[0] & 0x00000002u) == 0) {
     return nullptr;
@@ -12817,7 +12817,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000002u;
   } else {
@@ -12850,11 +12850,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.java_multiple_files_;
 }
 inline void FileOptions::_internal_set_java_multiple_files(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000400u;
   _impl_.java_multiple_files_ = value;
 }
@@ -12877,11 +12877,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000800u;
   _impl_.java_generate_equals_and_hash_ = value;
 }
@@ -12904,11 +12904,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.java_string_check_utf8_;
 }
 inline void FileOptions::_internal_set_java_string_check_utf8(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00001000u;
   _impl_.java_string_check_utf8_ = value;
 }
@@ -12931,11 +12931,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   assert(::google::protobuf::FileOptions_OptimizeMode_IsValid(value));
   _impl_._has_bits_[0] |= 0x00040000u;
   _impl_.optimize_for_ = value;
@@ -12957,7 +12957,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -12968,21 +12968,21 @@ inline std::string* FileOptions::mutable_go_package() {
   return _s;
 }
 inline const std::string& FileOptions::_internal_go_package() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.go_package_.Get();
 }
 inline void FileOptions::_internal_set_go_package(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.go_package)
   if ((_impl_._has_bits_[0] & 0x00000004u) == 0) {
     return nullptr;
@@ -12995,7 +12995,7 @@ inline std::string* FileOptions::release_go_package() {
   return released;
 }
 inline void FileOptions::set_allocated_go_package(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000004u;
   } else {
@@ -13028,11 +13028,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.cc_generic_services_;
 }
 inline void FileOptions::_internal_set_cc_generic_services(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00002000u;
   _impl_.cc_generic_services_ = value;
 }
@@ -13055,11 +13055,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.java_generic_services_;
 }
 inline void FileOptions::_internal_set_java_generic_services(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00004000u;
   _impl_.java_generic_services_ = value;
 }
@@ -13082,11 +13082,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.py_generic_services_;
 }
 inline void FileOptions::_internal_set_py_generic_services(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00008000u;
   _impl_.py_generic_services_ = value;
 }
@@ -13109,11 +13109,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.php_generic_services_;
 }
 inline void FileOptions::_internal_set_php_generic_services(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00010000u;
   _impl_.php_generic_services_ = value;
 }
@@ -13136,11 +13136,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.deprecated_;
 }
 inline void FileOptions::_internal_set_deprecated(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00020000u;
   _impl_.deprecated_ = value;
 }
@@ -13163,11 +13163,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.cc_enable_arenas_;
 }
 inline void FileOptions::_internal_set_cc_enable_arenas(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00080000u;
   _impl_.cc_enable_arenas_ = value;
 }
@@ -13188,7 +13188,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -13199,21 +13199,21 @@ inline std::string* FileOptions::mutable_objc_class_prefix() {
   return _s;
 }
 inline const std::string& FileOptions::_internal_objc_class_prefix() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.objc_class_prefix)
   if ((_impl_._has_bits_[0] & 0x00000008u) == 0) {
     return nullptr;
@@ -13226,7 +13226,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000008u;
   } else {
@@ -13257,7 +13257,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -13268,21 +13268,21 @@ inline std::string* FileOptions::mutable_csharp_namespace() {
   return _s;
 }
 inline const std::string& FileOptions::_internal_csharp_namespace() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.csharp_namespace_.Get();
 }
 inline void FileOptions::_internal_set_csharp_namespace(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.csharp_namespace)
   if ((_impl_._has_bits_[0] & 0x00000010u) == 0) {
     return nullptr;
@@ -13295,7 +13295,7 @@ inline std::string* FileOptions::release_csharp_namespace() {
   return released;
 }
 inline void FileOptions::set_allocated_csharp_namespace(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000010u;
   } else {
@@ -13326,7 +13326,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -13337,21 +13337,21 @@ inline std::string* FileOptions::mutable_swift_prefix() {
   return _s;
 }
 inline const std::string& FileOptions::_internal_swift_prefix() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.swift_prefix_.Get();
 }
 inline void FileOptions::_internal_set_swift_prefix(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.swift_prefix)
   if ((_impl_._has_bits_[0] & 0x00000020u) == 0) {
     return nullptr;
@@ -13364,7 +13364,7 @@ inline std::string* FileOptions::release_swift_prefix() {
   return released;
 }
 inline void FileOptions::set_allocated_swift_prefix(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000020u;
   } else {
@@ -13395,7 +13395,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -13406,21 +13406,21 @@ inline std::string* FileOptions::mutable_php_class_prefix() {
   return _s;
 }
 inline const std::string& FileOptions::_internal_php_class_prefix() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.php_class_prefix)
   if ((_impl_._has_bits_[0] & 0x00000040u) == 0) {
     return nullptr;
@@ -13433,7 +13433,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000040u;
   } else {
@@ -13464,7 +13464,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -13475,21 +13475,21 @@ inline std::string* FileOptions::mutable_php_namespace() {
   return _s;
 }
 inline const std::string& FileOptions::_internal_php_namespace() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.php_namespace_.Get();
 }
 inline void FileOptions::_internal_set_php_namespace(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.php_namespace)
   if ((_impl_._has_bits_[0] & 0x00000080u) == 0) {
     return nullptr;
@@ -13502,7 +13502,7 @@ inline std::string* FileOptions::release_php_namespace() {
   return released;
 }
 inline void FileOptions::set_allocated_php_namespace(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000080u;
   } else {
@@ -13533,7 +13533,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -13544,21 +13544,21 @@ inline std::string* FileOptions::mutable_php_metadata_namespace() {
   return _s;
 }
 inline const std::string& FileOptions::_internal_php_metadata_namespace() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.php_metadata_namespace)
   if ((_impl_._has_bits_[0] & 0x00000100u) == 0) {
     return nullptr;
@@ -13571,7 +13571,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000100u;
   } else {
@@ -13602,7 +13602,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -13613,21 +13613,21 @@ inline std::string* FileOptions::mutable_ruby_package() {
   return _s;
 }
 inline const std::string& FileOptions::_internal_ruby_package() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.ruby_package_.Get();
 }
 inline void FileOptions::_internal_set_ruby_package(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.ruby_package)
   if ((_impl_._has_bits_[0] & 0x00000200u) == 0) {
     return nullptr;
@@ -13640,7 +13640,7 @@ inline std::string* FileOptions::release_ruby_package() {
   return released;
 }
 inline void FileOptions::set_allocated_ruby_package(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000200u;
   } else {
@@ -13672,7 +13672,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_uninterpreted_option();
 }
 inline const ::google::protobuf::UninterpretedOption& FileOptions::uninterpreted_option(int index) const {
@@ -13680,7 +13680,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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;
@@ -13692,12 +13692,12 @@ FileOptions::uninterpreted_option() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>&
 FileOptions::_internal_uninterpreted_option() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.uninterpreted_option_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>*
 FileOptions::_internal_mutable_uninterpreted_option() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.uninterpreted_option_;
 }
 
@@ -13723,11 +13723,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.message_set_wire_format_;
 }
 inline void MessageOptions::_internal_set_message_set_wire_format(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.message_set_wire_format_ = value;
 }
@@ -13750,11 +13750,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.no_standard_descriptor_accessor_;
 }
 inline void MessageOptions::_internal_set_no_standard_descriptor_accessor(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.no_standard_descriptor_accessor_ = value;
 }
@@ -13777,11 +13777,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.deprecated_;
 }
 inline void MessageOptions::_internal_set_deprecated(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.deprecated_ = value;
 }
@@ -13804,11 +13804,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.map_entry_;
 }
 inline void MessageOptions::_internal_set_map_entry(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   _impl_.map_entry_ = value;
 }
@@ -13831,11 +13831,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000010u;
   _impl_.deprecated_legacy_json_field_conflicts_ = value;
 }
@@ -13857,7 +13857,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_uninterpreted_option();
 }
 inline const ::google::protobuf::UninterpretedOption& MessageOptions::uninterpreted_option(int index) const {
@@ -13865,7 +13865,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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;
@@ -13877,12 +13877,12 @@ MessageOptions::uninterpreted_option() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>&
 MessageOptions::_internal_uninterpreted_option() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.uninterpreted_option_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>*
 MessageOptions::_internal_mutable_uninterpreted_option() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.uninterpreted_option_;
 }
 
@@ -13908,11 +13908,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   assert(::google::protobuf::FieldOptions_CType_IsValid(value));
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.ctype_ = value;
@@ -13936,11 +13936,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.packed_;
 }
 inline void FieldOptions::_internal_set_packed(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.packed_ = value;
 }
@@ -13963,11 +13963,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   assert(::google::protobuf::FieldOptions_JSType_IsValid(value));
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.jstype_ = value;
@@ -13991,11 +13991,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.lazy_;
 }
 inline void FieldOptions::_internal_set_lazy(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   _impl_.lazy_ = value;
 }
@@ -14018,11 +14018,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.unverified_lazy_;
 }
 inline void FieldOptions::_internal_set_unverified_lazy(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000010u;
   _impl_.unverified_lazy_ = value;
 }
@@ -14045,11 +14045,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.deprecated_;
 }
 inline void FieldOptions::_internal_set_deprecated(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000020u;
   _impl_.deprecated_ = value;
 }
@@ -14072,11 +14072,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.weak_;
 }
 inline void FieldOptions::_internal_set_weak(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000040u;
   _impl_.weak_ = value;
 }
@@ -14099,11 +14099,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.debug_redact_;
 }
 inline void FieldOptions::_internal_set_debug_redact(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000080u;
   _impl_.debug_redact_ = value;
 }
@@ -14126,11 +14126,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   assert(::google::protobuf::FieldOptions_OptionRetention_IsValid(value));
   _impl_._has_bits_[0] |= 0x00000100u;
   _impl_.retention_ = value;
@@ -14157,7 +14157,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   _internal_mutable_targets()->Add(value);
   // @@protoc_insertion_point(field_add:google.protobuf.FieldOptions.targets)
 }
@@ -14167,15 +14167,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_targets();
 }
 inline const ::google::protobuf::RepeatedField<int>& FieldOptions::_internal_targets() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.targets_;
 }
 inline ::google::protobuf::RepeatedField<int>* FieldOptions::_internal_mutable_targets() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.targets_;
 }
 
@@ -14196,7 +14196,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_uninterpreted_option();
 }
 inline const ::google::protobuf::UninterpretedOption& FieldOptions::uninterpreted_option(int index) const {
@@ -14204,7 +14204,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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;
@@ -14216,12 +14216,12 @@ FieldOptions::uninterpreted_option() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>&
 FieldOptions::_internal_uninterpreted_option() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.uninterpreted_option_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>*
 FieldOptions::_internal_mutable_uninterpreted_option() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.uninterpreted_option_;
 }
 
@@ -14243,11 +14243,11 @@ inline void FieldOptions::set_target_obsolete_do_not_use(::google::protobuf::Fie
   // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.target_obsolete_do_not_use)
 }
 inline ::google::protobuf::FieldOptions_OptionTargetType FieldOptions::_internal_target_obsolete_do_not_use() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return static_cast<::google::protobuf::FieldOptions_OptionTargetType>(_impl_.target_obsolete_do_not_use_);
 }
 inline void FieldOptions::_internal_set_target_obsolete_do_not_use(::google::protobuf::FieldOptions_OptionTargetType value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   assert(::google::protobuf::FieldOptions_OptionTargetType_IsValid(value));
   _impl_._has_bits_[0] |= 0x00000200u;
   _impl_.target_obsolete_do_not_use_ = value;
@@ -14274,7 +14274,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_uninterpreted_option();
 }
 inline const ::google::protobuf::UninterpretedOption& OneofOptions::uninterpreted_option(int index) const {
@@ -14282,7 +14282,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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;
@@ -14294,12 +14294,12 @@ OneofOptions::uninterpreted_option() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>&
 OneofOptions::_internal_uninterpreted_option() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.uninterpreted_option_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>*
 OneofOptions::_internal_mutable_uninterpreted_option() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.uninterpreted_option_;
 }
 
@@ -14325,11 +14325,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.allow_alias_;
 }
 inline void EnumOptions::_internal_set_allow_alias(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.allow_alias_ = value;
 }
@@ -14352,11 +14352,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.deprecated_;
 }
 inline void EnumOptions::_internal_set_deprecated(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.deprecated_ = value;
 }
@@ -14379,11 +14379,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.deprecated_legacy_json_field_conflicts_ = value;
 }
@@ -14405,7 +14405,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_uninterpreted_option();
 }
 inline const ::google::protobuf::UninterpretedOption& EnumOptions::uninterpreted_option(int index) const {
@@ -14413,7 +14413,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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;
@@ -14425,12 +14425,12 @@ EnumOptions::uninterpreted_option() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>&
 EnumOptions::_internal_uninterpreted_option() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.uninterpreted_option_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>*
 EnumOptions::_internal_mutable_uninterpreted_option() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.uninterpreted_option_;
 }
 
@@ -14456,11 +14456,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.deprecated_;
 }
 inline void EnumValueOptions::_internal_set_deprecated(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.deprecated_ = value;
 }
@@ -14483,11 +14483,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.debug_redact_;
 }
 inline void EnumValueOptions::_internal_set_debug_redact(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.debug_redact_ = value;
 }
@@ -14509,7 +14509,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_uninterpreted_option();
 }
 inline const ::google::protobuf::UninterpretedOption& EnumValueOptions::uninterpreted_option(int index) const {
@@ -14517,7 +14517,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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;
@@ -14529,12 +14529,12 @@ EnumValueOptions::uninterpreted_option() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>&
 EnumValueOptions::_internal_uninterpreted_option() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.uninterpreted_option_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>*
 EnumValueOptions::_internal_mutable_uninterpreted_option() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.uninterpreted_option_;
 }
 
@@ -14560,11 +14560,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.deprecated_;
 }
 inline void ServiceOptions::_internal_set_deprecated(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.deprecated_ = value;
 }
@@ -14586,7 +14586,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_uninterpreted_option();
 }
 inline const ::google::protobuf::UninterpretedOption& ServiceOptions::uninterpreted_option(int index) const {
@@ -14594,7 +14594,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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;
@@ -14606,12 +14606,12 @@ ServiceOptions::uninterpreted_option() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>&
 ServiceOptions::_internal_uninterpreted_option() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.uninterpreted_option_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>*
 ServiceOptions::_internal_mutable_uninterpreted_option() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.uninterpreted_option_;
 }
 
@@ -14637,11 +14637,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.deprecated_;
 }
 inline void MethodOptions::_internal_set_deprecated(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000001u;
   _impl_.deprecated_ = value;
 }
@@ -14664,11 +14664,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   assert(::google::protobuf::MethodOptions_IdempotencyLevel_IsValid(value));
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.idempotency_level_ = value;
@@ -14691,7 +14691,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_uninterpreted_option();
 }
 inline const ::google::protobuf::UninterpretedOption& MethodOptions::uninterpreted_option(int index) const {
@@ -14699,7 +14699,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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;
@@ -14711,12 +14711,12 @@ MethodOptions::uninterpreted_option() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>&
 MethodOptions::_internal_uninterpreted_option() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.uninterpreted_option_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption>*
 MethodOptions::_internal_mutable_uninterpreted_option() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.uninterpreted_option_;
 }
 
@@ -14740,7 +14740,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -14751,21 +14751,21 @@ inline std::string* UninterpretedOption_NamePart::mutable_name_part() {
   return _s;
 }
 inline const std::string& UninterpretedOption_NamePart::_internal_name_part() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.name_part_.Get();
 }
 inline void UninterpretedOption_NamePart::_internal_set_name_part(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.NamePart.name_part)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -14778,7 +14778,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -14811,11 +14811,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.is_extension_;
 }
 inline void UninterpretedOption_NamePart::_internal_set_is_extension(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.is_extension_ = value;
 }
@@ -14841,7 +14841,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_name();
 }
 inline const ::google::protobuf::UninterpretedOption_NamePart& UninterpretedOption::name(int index) const {
@@ -14849,7 +14849,7 @@ inline const ::google::protobuf::UninterpretedOption_NamePart& UninterpretedOpti
     return _internal_name().Get(index);
 }
 inline ::google::protobuf::UninterpretedOption_NamePart* UninterpretedOption::add_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   ::google::protobuf::UninterpretedOption_NamePart* _add = _internal_mutable_name()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.UninterpretedOption.name)
   return _add;
@@ -14861,12 +14861,12 @@ UninterpretedOption::name() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption_NamePart>&
 UninterpretedOption::_internal_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.name_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::UninterpretedOption_NamePart>*
 UninterpretedOption::_internal_mutable_name() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.name_;
 }
 
@@ -14886,7 +14886,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -14897,21 +14897,21 @@ inline std::string* UninterpretedOption::mutable_identifier_value() {
   return _s;
 }
 inline const std::string& UninterpretedOption::_internal_identifier_value() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.identifier_value_.Get();
 }
 inline void UninterpretedOption::_internal_set_identifier_value(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.identifier_value)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -14924,7 +14924,7 @@ inline std::string* UninterpretedOption::release_identifier_value() {
   return released;
 }
 inline void UninterpretedOption::set_allocated_identifier_value(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -14957,11 +14957,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.positive_int_value_;
 }
 inline void UninterpretedOption::_internal_set_positive_int_value(::uint64_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000008u;
   _impl_.positive_int_value_ = value;
 }
@@ -14984,11 +14984,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.negative_int_value_;
 }
 inline void UninterpretedOption::_internal_set_negative_int_value(::int64_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000010u;
   _impl_.negative_int_value_ = value;
 }
@@ -15011,11 +15011,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.double_value_;
 }
 inline void UninterpretedOption::_internal_set_double_value(double value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000020u;
   _impl_.double_value_ = value;
 }
@@ -15036,7 +15036,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -15047,21 +15047,21 @@ inline std::string* UninterpretedOption::mutable_string_value() {
   return _s;
 }
 inline const std::string& UninterpretedOption::_internal_string_value() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.string_value_.Get();
 }
 inline void UninterpretedOption::_internal_set_string_value(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.string_value)
   if ((_impl_._has_bits_[0] & 0x00000002u) == 0) {
     return nullptr;
@@ -15074,7 +15074,7 @@ inline std::string* UninterpretedOption::release_string_value() {
   return released;
 }
 inline void UninterpretedOption::set_allocated_string_value(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000002u;
   } else {
@@ -15105,7 +15105,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -15116,21 +15116,21 @@ inline std::string* UninterpretedOption::mutable_aggregate_value() {
   return _s;
 }
 inline const std::string& UninterpretedOption::_internal_aggregate_value() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.aggregate_value_.Get();
 }
 inline void UninterpretedOption::_internal_set_aggregate_value(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.aggregate_value)
   if ((_impl_._has_bits_[0] & 0x00000004u) == 0) {
     return nullptr;
@@ -15143,7 +15143,7 @@ inline std::string* UninterpretedOption::release_aggregate_value() {
   return released;
 }
 inline void UninterpretedOption::set_allocated_aggregate_value(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000004u;
   } else {
@@ -15181,7 +15181,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   _internal_mutable_path()->Add(value);
   // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.path)
 }
@@ -15191,16 +15191,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_path();
 }
 
 inline const ::google::protobuf::RepeatedField<::int32_t>& SourceCodeInfo_Location::_internal_path() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.path_;
 }
 inline ::google::protobuf::RepeatedField<::int32_t>* SourceCodeInfo_Location::_internal_mutable_path() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.path_;
 }
 
@@ -15223,7 +15223,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   _internal_mutable_span()->Add(value);
   // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.span)
 }
@@ -15233,16 +15233,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_span();
 }
 
 inline const ::google::protobuf::RepeatedField<::int32_t>& SourceCodeInfo_Location::_internal_span() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.span_;
 }
 inline ::google::protobuf::RepeatedField<::int32_t>* SourceCodeInfo_Location::_internal_mutable_span() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.span_;
 }
 
@@ -15262,7 +15262,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -15273,21 +15273,21 @@ inline std::string* SourceCodeInfo_Location::mutable_leading_comments() {
   return _s;
 }
 inline const std::string& SourceCodeInfo_Location::_internal_leading_comments() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.leading_comments_.Get();
 }
 inline void SourceCodeInfo_Location::_internal_set_leading_comments(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.SourceCodeInfo.Location.leading_comments)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -15300,7 +15300,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -15331,7 +15331,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -15342,21 +15342,21 @@ inline std::string* SourceCodeInfo_Location::mutable_trailing_comments() {
   return _s;
 }
 inline const std::string& SourceCodeInfo_Location::_internal_trailing_comments() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.trailing_comments_.Get();
 }
 inline void SourceCodeInfo_Location::_internal_set_trailing_comments(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.SourceCodeInfo.Location.trailing_comments)
   if ((_impl_._has_bits_[0] & 0x00000002u) == 0) {
     return nullptr;
@@ -15369,7 +15369,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000002u;
   } else {
@@ -15395,7 +15395,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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;
@@ -15433,29 +15433,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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)
 }
@@ -15466,17 +15466,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.leading_detached_comments_;
 }
 
@@ -15501,7 +15501,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_location();
 }
 inline const ::google::protobuf::SourceCodeInfo_Location& SourceCodeInfo::location(int index) const {
@@ -15509,7 +15509,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   ::google::protobuf::SourceCodeInfo_Location* _add = _internal_mutable_location()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.location)
   return _add;
@@ -15521,12 +15521,12 @@ SourceCodeInfo::location() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::SourceCodeInfo_Location>&
 SourceCodeInfo::_internal_location() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.location_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::SourceCodeInfo_Location>*
 SourceCodeInfo::_internal_mutable_location() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.location_;
 }
 
@@ -15553,7 +15553,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   _internal_mutable_path()->Add(value);
   // @@protoc_insertion_point(field_add:google.protobuf.GeneratedCodeInfo.Annotation.path)
 }
@@ -15563,16 +15563,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_path();
 }
 
 inline const ::google::protobuf::RepeatedField<::int32_t>& GeneratedCodeInfo_Annotation::_internal_path() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.path_;
 }
 inline ::google::protobuf::RepeatedField<::int32_t>* GeneratedCodeInfo_Annotation::_internal_mutable_path() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.path_;
 }
 
@@ -15592,7 +15592,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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)
@@ -15603,21 +15603,21 @@ inline std::string* GeneratedCodeInfo_Annotation::mutable_source_file() {
   return _s;
 }
 inline const std::string& GeneratedCodeInfo_Annotation::_internal_source_file() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_STRING(&_impl_._tsan_detect_race);
   return _impl_.source_file_.Get();
 }
 inline void GeneratedCodeInfo_Annotation::_internal_set_source_file(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:google.protobuf.GeneratedCodeInfo.Annotation.source_file)
   if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
     return nullptr;
@@ -15630,7 +15630,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_STRING(&_impl_._tsan_detect_race);
   if (value != nullptr) {
     _impl_._has_bits_[0] |= 0x00000001u;
   } else {
@@ -15663,11 +15663,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.begin_;
 }
 inline void GeneratedCodeInfo_Annotation::_internal_set_begin(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000002u;
   _impl_.begin_ = value;
 }
@@ -15690,11 +15690,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_impl_._tsan_detect_race);
   return _impl_.end_;
 }
 inline void GeneratedCodeInfo_Annotation::_internal_set_end(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   _impl_._has_bits_[0] |= 0x00000004u;
   _impl_.end_ = value;
 }
@@ -15717,11 +15717,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_PRIMITIVE(&_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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_PRIMITIVE(&_impl_._tsan_detect_race);
   assert(::google::protobuf::GeneratedCodeInfo_Annotation_Semantic_IsValid(value));
   _impl_._has_bits_[0] |= 0x00000008u;
   _impl_.semantic_ = value;
@@ -15748,7 +15748,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(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   return _internal_mutable_annotation();
 }
 inline const ::google::protobuf::GeneratedCodeInfo_Annotation& GeneratedCodeInfo::annotation(int index) const {
@@ -15756,7 +15756,7 @@ inline const ::google::protobuf::GeneratedCodeInfo_Annotation& GeneratedCodeInfo
     return _internal_annotation().Get(index);
 }
 inline ::google::protobuf::GeneratedCodeInfo_Annotation* GeneratedCodeInfo::add_annotation() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_WRITE_REPEATED(&_impl_._tsan_detect_race);
   ::google::protobuf::GeneratedCodeInfo_Annotation* _add = _internal_mutable_annotation()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.GeneratedCodeInfo.annotation)
   return _add;
@@ -15768,12 +15768,12 @@ GeneratedCodeInfo::annotation() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::GeneratedCodeInfo_Annotation>&
 GeneratedCodeInfo::_internal_annotation() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return _impl_.annotation_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::GeneratedCodeInfo_Annotation>*
 GeneratedCodeInfo::_internal_mutable_annotation() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  PROTOBUF_TSAN_READ_REPEATED(&_impl_._tsan_detect_race);
   return &_impl_.annotation_;
 }
 
diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
index 8b980685d3..88fb579143 100644
--- a/src/google/protobuf/port_def.inc
+++ b/src/google/protobuf/port_def.inc
@@ -835,8 +835,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
 #ifdef PROTOBUF_TSAN_WRITE
 #error PROTOBUF_TSAN_WRITE was previously defined
 #endif
-// TODO(b/280674214): re-enable these macros once failing tests are fixed.
-#if defined(PROTOBUF_TSAN) && false
+#ifdef PROTOBUF_TSAN
 // TODO(b/285620714): it would be preferable to use __tsan_external_read/
 // __tsan_external_write, but they can cause dlopen issues.
 #define PROTOBUF_TSAN_READ(addr)                                               \
@@ -861,6 +860,17 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
 #define PROTOBUF_TSAN_DECLARE_MEMBER
 #endif
 
+// TODO(b/280674214): enable these macros in phases. The phases are: repeated
+// fields/maps, enum/primitive fields, string fields, message fields.
+#define PROTOBUF_TSAN_READ_REPEATED(addr)
+#define PROTOBUF_TSAN_READ_PRIMITIVE(addr)
+#define PROTOBUF_TSAN_READ_STRING(addr)
+#define PROTOBUF_TSAN_READ_MESSAGE(addr)
+#define PROTOBUF_TSAN_WRITE_REPEATED(addr)
+#define PROTOBUF_TSAN_WRITE_PRIMITIVE(addr)
+#define PROTOBUF_TSAN_WRITE_STRING(addr)
+#define PROTOBUF_TSAN_WRITE_MESSAGE(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 c52992ca13..f32d74ffdb 100644
--- a/src/google/protobuf/port_undef.inc
+++ b/src/google/protobuf/port_undef.inc
@@ -106,6 +106,14 @@
 #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