From 6fe5c6fd8e270e3771e31f94f08895475ee5b216 Mon Sep 17 00:00:00 2001
From: Protobuf Team Bot <protobuf-team-bot@google.com>
Date: Fri, 9 Jun 2023 21:17:58 +0000
Subject: [PATCH] Auto-generate files after cl/539172395

---
 src/google/protobuf/api.pb.h        | 24 ++++++++++-----
 src/google/protobuf/field_mask.pb.h | 11 +++++--
 src/google/protobuf/struct.pb.h     | 10 +++---
 src/google/protobuf/type.pb.h       | 47 ++++++++++++++++++++---------
 4 files changed, 64 insertions(+), 28 deletions(-)

diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h
index 977e1671aa..baadec00bf 100644
--- a/src/google/protobuf/api.pb.h
+++ b/src/google/protobuf/api.pb.h
@@ -868,6 +868,7 @@ inline ::google::protobuf::Method* Api::mutable_methods(int index) {
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Method >*
 Api::mutable_methods() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.Api.methods)
+  PROTOBUF_TSAN_WRITE(&_impl_);
   return _internal_mutable_methods();
 }
 inline const ::google::protobuf::Method& Api::methods(int index) const {
@@ -875,6 +876,7 @@ inline const ::google::protobuf::Method& Api::methods(int index) const {
     return _internal_methods().Get(index);
 }
 inline ::google::protobuf::Method* Api::add_methods() {
+  PROTOBUF_TSAN_WRITE(&_impl_);
   ::google::protobuf::Method* _add = _internal_mutable_methods()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.Api.methods)
   return _add;
@@ -886,12 +888,12 @@ Api::methods() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Method>&
 Api::_internal_methods() const {
-  PROTOBUF_TSAN_READ(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return _impl_.methods_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Method>*
 Api::_internal_mutable_methods() {
-  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return &_impl_.methods_;
 }
 
@@ -909,6 +911,7 @@ inline ::google::protobuf::Option* Api::mutable_options(int index) {
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >*
 Api::mutable_options() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.Api.options)
+  PROTOBUF_TSAN_WRITE(&_impl_);
   return _internal_mutable_options();
 }
 inline const ::google::protobuf::Option& Api::options(int index) const {
@@ -916,6 +919,7 @@ inline const ::google::protobuf::Option& Api::options(int index) const {
     return _internal_options().Get(index);
 }
 inline ::google::protobuf::Option* Api::add_options() {
+  PROTOBUF_TSAN_WRITE(&_impl_);
   ::google::protobuf::Option* _add = _internal_mutable_options()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.Api.options)
   return _add;
@@ -927,12 +931,12 @@ Api::options() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>&
 Api::_internal_options() const {
-  PROTOBUF_TSAN_READ(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return _impl_.options_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>*
 Api::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return &_impl_.options_;
 }
 
@@ -1084,6 +1088,7 @@ inline ::google::protobuf::Mixin* Api::mutable_mixins(int index) {
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin >*
 Api::mutable_mixins() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.Api.mixins)
+  PROTOBUF_TSAN_WRITE(&_impl_);
   return _internal_mutable_mixins();
 }
 inline const ::google::protobuf::Mixin& Api::mixins(int index) const {
@@ -1091,6 +1096,7 @@ inline const ::google::protobuf::Mixin& Api::mixins(int index) const {
     return _internal_mixins().Get(index);
 }
 inline ::google::protobuf::Mixin* Api::add_mixins() {
+  PROTOBUF_TSAN_WRITE(&_impl_);
   ::google::protobuf::Mixin* _add = _internal_mutable_mixins()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.Api.mixins)
   return _add;
@@ -1102,12 +1108,12 @@ Api::mixins() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Mixin>&
 Api::_internal_mixins() const {
-  PROTOBUF_TSAN_READ(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return _impl_.mixins_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Mixin>*
 Api::_internal_mutable_mixins() {
-  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return &_impl_.mixins_;
 }
 
@@ -1324,6 +1330,7 @@ inline ::google::protobuf::Option* Method::mutable_options(int index) {
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >*
 Method::mutable_options() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.Method.options)
+  PROTOBUF_TSAN_WRITE(&_impl_);
   return _internal_mutable_options();
 }
 inline const ::google::protobuf::Option& Method::options(int index) const {
@@ -1331,6 +1338,7 @@ inline const ::google::protobuf::Option& Method::options(int index) const {
     return _internal_options().Get(index);
 }
 inline ::google::protobuf::Option* Method::add_options() {
+  PROTOBUF_TSAN_WRITE(&_impl_);
   ::google::protobuf::Option* _add = _internal_mutable_options()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.Method.options)
   return _add;
@@ -1342,12 +1350,12 @@ Method::options() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>&
 Method::_internal_options() const {
-  PROTOBUF_TSAN_READ(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return _impl_.options_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>*
 Method::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return &_impl_.options_;
 }
 
diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h
index 6b40e7dce9..16c216b487 100644
--- a/src/google/protobuf/field_mask.pb.h
+++ b/src/google/protobuf/field_mask.pb.h
@@ -273,6 +273,7 @@ inline void FieldMask::clear_paths() {
   _internal_mutable_paths()->Clear();
 }
 inline std::string* FieldMask::add_paths() {
+  PROTOBUF_TSAN_WRITE(&_impl_);
   std::string* _s = _internal_mutable_paths()->Add();
   // @@protoc_insertion_point(field_add_mutable:google.protobuf.FieldMask.paths)
   return _s;
@@ -310,24 +311,29 @@ inline void FieldMask::set_paths(int index, absl::string_view value) {
   // @@protoc_insertion_point(field_set_string_piece:google.protobuf.FieldMask.paths)
 }
 inline void FieldMask::add_paths(const std::string& value) {
+  PROTOBUF_TSAN_WRITE(&_impl_);
   _internal_mutable_paths()->Add()->assign(value);
   // @@protoc_insertion_point(field_add:google.protobuf.FieldMask.paths)
 }
 inline void FieldMask::add_paths(std::string&& value) {
+  PROTOBUF_TSAN_WRITE(&_impl_);
   _internal_mutable_paths()->Add(std::move(value));
   // @@protoc_insertion_point(field_add:google.protobuf.FieldMask.paths)
 }
 inline void FieldMask::add_paths(const char* value) {
   ABSL_DCHECK(value != nullptr);
+  PROTOBUF_TSAN_WRITE(&_impl_);
   _internal_mutable_paths()->Add()->assign(value);
   // @@protoc_insertion_point(field_add_char:google.protobuf.FieldMask.paths)
 }
 inline void FieldMask::add_paths(const char* value, std::size_t size) {
+  PROTOBUF_TSAN_WRITE(&_impl_);
   _internal_mutable_paths()->Add()->assign(
       reinterpret_cast<const char*>(value), size);
   // @@protoc_insertion_point(field_add_pointer:google.protobuf.FieldMask.paths)
 }
 inline void FieldMask::add_paths(absl::string_view value) {
+  PROTOBUF_TSAN_WRITE(&_impl_);
   _internal_mutable_paths()->Add()->assign(value.data(), value.size());
   // @@protoc_insertion_point(field_add_string_piece:google.protobuf.FieldMask.paths)
 }
@@ -338,16 +344,17 @@ FieldMask::paths() const {
 }
 inline ::google::protobuf::RepeatedPtrField<std::string>* FieldMask::mutable_paths() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.FieldMask.paths)
+  PROTOBUF_TSAN_WRITE(&_impl_);
   return _internal_mutable_paths();
 }
 inline const ::google::protobuf::RepeatedPtrField<std::string>&
 FieldMask::_internal_paths() const {
-  PROTOBUF_TSAN_READ(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return _impl_.paths_;
 }
 inline ::google::protobuf::RepeatedPtrField<std::string>*
 FieldMask::_internal_mutable_paths() {
-  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return &_impl_.paths_;
 }
 
diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h
index 59f4392328..ddcacf6043 100644
--- a/src/google/protobuf/struct.pb.h
+++ b/src/google/protobuf/struct.pb.h
@@ -779,7 +779,7 @@ inline void Struct::clear_fields() {
   _impl_.fields_.Clear();
 }
 inline const ::google::protobuf::Map<std::string, ::google::protobuf::Value>& Struct::_internal_fields() const {
-  PROTOBUF_TSAN_READ(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return _impl_.fields_.GetMap();
 }
 inline const ::google::protobuf::Map<std::string, ::google::protobuf::Value>& Struct::fields() const {
@@ -787,7 +787,7 @@ inline const ::google::protobuf::Map<std::string, ::google::protobuf::Value>& St
   return _internal_fields();
 }
 inline ::google::protobuf::Map<std::string, ::google::protobuf::Value>* Struct::_internal_mutable_fields() {
-  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
+  PROTOBUF_TSAN_WRITE(&_impl_);
   return _impl_.fields_.MutableMap();
 }
 inline ::google::protobuf::Map<std::string, ::google::protobuf::Value>* Struct::mutable_fields() {
@@ -1159,6 +1159,7 @@ inline ::google::protobuf::Value* ListValue::mutable_values(int index) {
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Value >*
 ListValue::mutable_values() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.ListValue.values)
+  PROTOBUF_TSAN_WRITE(&_impl_);
   return _internal_mutable_values();
 }
 inline const ::google::protobuf::Value& ListValue::values(int index) const {
@@ -1166,6 +1167,7 @@ inline const ::google::protobuf::Value& ListValue::values(int index) const {
     return _internal_values().Get(index);
 }
 inline ::google::protobuf::Value* ListValue::add_values() {
+  PROTOBUF_TSAN_WRITE(&_impl_);
   ::google::protobuf::Value* _add = _internal_mutable_values()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.ListValue.values)
   return _add;
@@ -1177,12 +1179,12 @@ ListValue::values() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Value>&
 ListValue::_internal_values() const {
-  PROTOBUF_TSAN_READ(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return _impl_.values_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Value>*
 ListValue::_internal_mutable_values() {
-  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return &_impl_.values_;
 }
 
diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h
index 96620ea3a9..ffef86e79b 100644
--- a/src/google/protobuf/type.pb.h
+++ b/src/google/protobuf/type.pb.h
@@ -1552,6 +1552,7 @@ inline ::google::protobuf::Field* Type::mutable_fields(int index) {
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Field >*
 Type::mutable_fields() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.Type.fields)
+  PROTOBUF_TSAN_WRITE(&_impl_);
   return _internal_mutable_fields();
 }
 inline const ::google::protobuf::Field& Type::fields(int index) const {
@@ -1559,6 +1560,7 @@ inline const ::google::protobuf::Field& Type::fields(int index) const {
     return _internal_fields().Get(index);
 }
 inline ::google::protobuf::Field* Type::add_fields() {
+  PROTOBUF_TSAN_WRITE(&_impl_);
   ::google::protobuf::Field* _add = _internal_mutable_fields()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.Type.fields)
   return _add;
@@ -1570,12 +1572,12 @@ Type::fields() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Field>&
 Type::_internal_fields() const {
-  PROTOBUF_TSAN_READ(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return _impl_.fields_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Field>*
 Type::_internal_mutable_fields() {
-  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return &_impl_.fields_;
 }
 
@@ -1590,6 +1592,7 @@ inline void Type::clear_oneofs() {
   _internal_mutable_oneofs()->Clear();
 }
 inline std::string* Type::add_oneofs() {
+  PROTOBUF_TSAN_WRITE(&_impl_);
   std::string* _s = _internal_mutable_oneofs()->Add();
   // @@protoc_insertion_point(field_add_mutable:google.protobuf.Type.oneofs)
   return _s;
@@ -1627,24 +1630,29 @@ inline void Type::set_oneofs(int index, absl::string_view value) {
   // @@protoc_insertion_point(field_set_string_piece:google.protobuf.Type.oneofs)
 }
 inline void Type::add_oneofs(const std::string& value) {
+  PROTOBUF_TSAN_WRITE(&_impl_);
   _internal_mutable_oneofs()->Add()->assign(value);
   // @@protoc_insertion_point(field_add:google.protobuf.Type.oneofs)
 }
 inline void Type::add_oneofs(std::string&& value) {
+  PROTOBUF_TSAN_WRITE(&_impl_);
   _internal_mutable_oneofs()->Add(std::move(value));
   // @@protoc_insertion_point(field_add:google.protobuf.Type.oneofs)
 }
 inline void Type::add_oneofs(const char* value) {
   ABSL_DCHECK(value != nullptr);
+  PROTOBUF_TSAN_WRITE(&_impl_);
   _internal_mutable_oneofs()->Add()->assign(value);
   // @@protoc_insertion_point(field_add_char:google.protobuf.Type.oneofs)
 }
 inline void Type::add_oneofs(const char* value, std::size_t size) {
+  PROTOBUF_TSAN_WRITE(&_impl_);
   _internal_mutable_oneofs()->Add()->assign(
       reinterpret_cast<const char*>(value), size);
   // @@protoc_insertion_point(field_add_pointer:google.protobuf.Type.oneofs)
 }
 inline void Type::add_oneofs(absl::string_view value) {
+  PROTOBUF_TSAN_WRITE(&_impl_);
   _internal_mutable_oneofs()->Add()->assign(value.data(), value.size());
   // @@protoc_insertion_point(field_add_string_piece:google.protobuf.Type.oneofs)
 }
@@ -1655,16 +1663,17 @@ Type::oneofs() const {
 }
 inline ::google::protobuf::RepeatedPtrField<std::string>* Type::mutable_oneofs() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.Type.oneofs)
+  PROTOBUF_TSAN_WRITE(&_impl_);
   return _internal_mutable_oneofs();
 }
 inline const ::google::protobuf::RepeatedPtrField<std::string>&
 Type::_internal_oneofs() const {
-  PROTOBUF_TSAN_READ(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return _impl_.oneofs_;
 }
 inline ::google::protobuf::RepeatedPtrField<std::string>*
 Type::_internal_mutable_oneofs() {
-  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return &_impl_.oneofs_;
 }
 
@@ -1685,6 +1694,7 @@ inline ::google::protobuf::Option* Type::mutable_options(int index) {
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >*
 Type::mutable_options() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.Type.options)
+  PROTOBUF_TSAN_WRITE(&_impl_);
   return _internal_mutable_options();
 }
 inline const ::google::protobuf::Option& Type::options(int index) const {
@@ -1692,6 +1702,7 @@ inline const ::google::protobuf::Option& Type::options(int index) const {
     return _internal_options().Get(index);
 }
 inline ::google::protobuf::Option* Type::add_options() {
+  PROTOBUF_TSAN_WRITE(&_impl_);
   ::google::protobuf::Option* _add = _internal_mutable_options()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.Type.options)
   return _add;
@@ -1703,12 +1714,12 @@ Type::options() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>&
 Type::_internal_options() const {
-  PROTOBUF_TSAN_READ(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return _impl_.options_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>*
 Type::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return &_impl_.options_;
 }
 
@@ -2074,6 +2085,7 @@ inline ::google::protobuf::Option* Field::mutable_options(int index) {
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >*
 Field::mutable_options() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.Field.options)
+  PROTOBUF_TSAN_WRITE(&_impl_);
   return _internal_mutable_options();
 }
 inline const ::google::protobuf::Option& Field::options(int index) const {
@@ -2081,6 +2093,7 @@ inline const ::google::protobuf::Option& Field::options(int index) const {
     return _internal_options().Get(index);
 }
 inline ::google::protobuf::Option* Field::add_options() {
+  PROTOBUF_TSAN_WRITE(&_impl_);
   ::google::protobuf::Option* _add = _internal_mutable_options()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.Field.options)
   return _add;
@@ -2092,12 +2105,12 @@ Field::options() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>&
 Field::_internal_options() const {
-  PROTOBUF_TSAN_READ(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return _impl_.options_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>*
 Field::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return &_impl_.options_;
 }
 
@@ -2257,6 +2270,7 @@ inline ::google::protobuf::EnumValue* Enum::mutable_enumvalue(int index) {
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValue >*
 Enum::mutable_enumvalue() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.Enum.enumvalue)
+  PROTOBUF_TSAN_WRITE(&_impl_);
   return _internal_mutable_enumvalue();
 }
 inline const ::google::protobuf::EnumValue& Enum::enumvalue(int index) const {
@@ -2264,6 +2278,7 @@ inline const ::google::protobuf::EnumValue& Enum::enumvalue(int index) const {
     return _internal_enumvalue().Get(index);
 }
 inline ::google::protobuf::EnumValue* Enum::add_enumvalue() {
+  PROTOBUF_TSAN_WRITE(&_impl_);
   ::google::protobuf::EnumValue* _add = _internal_mutable_enumvalue()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.Enum.enumvalue)
   return _add;
@@ -2275,12 +2290,12 @@ Enum::enumvalue() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumValue>&
 Enum::_internal_enumvalue() const {
-  PROTOBUF_TSAN_READ(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return _impl_.enumvalue_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumValue>*
 Enum::_internal_mutable_enumvalue() {
-  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return &_impl_.enumvalue_;
 }
 
@@ -2301,6 +2316,7 @@ inline ::google::protobuf::Option* Enum::mutable_options(int index) {
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >*
 Enum::mutable_options() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.Enum.options)
+  PROTOBUF_TSAN_WRITE(&_impl_);
   return _internal_mutable_options();
 }
 inline const ::google::protobuf::Option& Enum::options(int index) const {
@@ -2308,6 +2324,7 @@ inline const ::google::protobuf::Option& Enum::options(int index) const {
     return _internal_options().Get(index);
 }
 inline ::google::protobuf::Option* Enum::add_options() {
+  PROTOBUF_TSAN_WRITE(&_impl_);
   ::google::protobuf::Option* _add = _internal_mutable_options()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.Enum.options)
   return _add;
@@ -2319,12 +2336,12 @@ Enum::options() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>&
 Enum::_internal_options() const {
-  PROTOBUF_TSAN_READ(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return _impl_.options_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>*
 Enum::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return &_impl_.options_;
 }
 
@@ -2565,6 +2582,7 @@ inline ::google::protobuf::Option* EnumValue::mutable_options(int index) {
 inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >*
 EnumValue::mutable_options() {
   // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumValue.options)
+  PROTOBUF_TSAN_WRITE(&_impl_);
   return _internal_mutable_options();
 }
 inline const ::google::protobuf::Option& EnumValue::options(int index) const {
@@ -2572,6 +2590,7 @@ inline const ::google::protobuf::Option& EnumValue::options(int index) const {
     return _internal_options().Get(index);
 }
 inline ::google::protobuf::Option* EnumValue::add_options() {
+  PROTOBUF_TSAN_WRITE(&_impl_);
   ::google::protobuf::Option* _add = _internal_mutable_options()->Add();
   // @@protoc_insertion_point(field_add:google.protobuf.EnumValue.options)
   return _add;
@@ -2583,12 +2602,12 @@ EnumValue::options() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>&
 EnumValue::_internal_options() const {
-  PROTOBUF_TSAN_READ(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return _impl_.options_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>*
 EnumValue::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
+  PROTOBUF_TSAN_READ(&_impl_);
   return &_impl_.options_;
 }