From e68550ec2c92c8c6d40135009fbae45b976304ff Mon Sep 17 00:00:00 2001
From: Protobuf Team Bot <protobuf-team-bot@google.com>
Date: Thu, 8 Jun 2023 16:59:09 +0000
Subject: [PATCH] Auto-generate files after cl/538811990

---
 src/google/protobuf/api.pb.h        |  8 ++++++++
 src/google/protobuf/field_mask.pb.h |  2 ++
 src/google/protobuf/struct.pb.h     |  4 ++++
 src/google/protobuf/type.pb.h       | 14 ++++++++++++++
 4 files changed, 28 insertions(+)

diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h
index 8922881b82..977e1671aa 100644
--- a/src/google/protobuf/api.pb.h
+++ b/src/google/protobuf/api.pb.h
@@ -886,10 +886,12 @@ Api::methods() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Method>&
 Api::_internal_methods() const {
+  PROTOBUF_TSAN_READ(&_internal_metadata_);
   return _impl_.methods_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Method>*
 Api::_internal_mutable_methods() {
+  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
   return &_impl_.methods_;
 }
 
@@ -925,10 +927,12 @@ Api::options() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>&
 Api::_internal_options() const {
+  PROTOBUF_TSAN_READ(&_internal_metadata_);
   return _impl_.options_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>*
 Api::_internal_mutable_options() {
+  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
   return &_impl_.options_;
 }
 
@@ -1098,10 +1102,12 @@ Api::mixins() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Mixin>&
 Api::_internal_mixins() const {
+  PROTOBUF_TSAN_READ(&_internal_metadata_);
   return _impl_.mixins_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Mixin>*
 Api::_internal_mutable_mixins() {
+  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
   return &_impl_.mixins_;
 }
 
@@ -1336,10 +1342,12 @@ Method::options() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>&
 Method::_internal_options() const {
+  PROTOBUF_TSAN_READ(&_internal_metadata_);
   return _impl_.options_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>*
 Method::_internal_mutable_options() {
+  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
   return &_impl_.options_;
 }
 
diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h
index 65589ebc63..6b40e7dce9 100644
--- a/src/google/protobuf/field_mask.pb.h
+++ b/src/google/protobuf/field_mask.pb.h
@@ -342,10 +342,12 @@ inline ::google::protobuf::RepeatedPtrField<std::string>* FieldMask::mutable_pat
 }
 inline const ::google::protobuf::RepeatedPtrField<std::string>&
 FieldMask::_internal_paths() const {
+  PROTOBUF_TSAN_READ(&_internal_metadata_);
   return _impl_.paths_;
 }
 inline ::google::protobuf::RepeatedPtrField<std::string>*
 FieldMask::_internal_mutable_paths() {
+  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
   return &_impl_.paths_;
 }
 
diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h
index fa1e2af17a..59f4392328 100644
--- a/src/google/protobuf/struct.pb.h
+++ b/src/google/protobuf/struct.pb.h
@@ -779,6 +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_);
   return _impl_.fields_.GetMap();
 }
 inline const ::google::protobuf::Map<std::string, ::google::protobuf::Value>& Struct::fields() const {
@@ -786,6 +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_);
   return _impl_.fields_.MutableMap();
 }
 inline ::google::protobuf::Map<std::string, ::google::protobuf::Value>* Struct::mutable_fields() {
@@ -1175,10 +1177,12 @@ ListValue::values() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Value>&
 ListValue::_internal_values() const {
+  PROTOBUF_TSAN_READ(&_internal_metadata_);
   return _impl_.values_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Value>*
 ListValue::_internal_mutable_values() {
+  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
   return &_impl_.values_;
 }
 
diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h
index d2cd1a2cf0..96620ea3a9 100644
--- a/src/google/protobuf/type.pb.h
+++ b/src/google/protobuf/type.pb.h
@@ -1570,10 +1570,12 @@ Type::fields() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Field>&
 Type::_internal_fields() const {
+  PROTOBUF_TSAN_READ(&_internal_metadata_);
   return _impl_.fields_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Field>*
 Type::_internal_mutable_fields() {
+  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
   return &_impl_.fields_;
 }
 
@@ -1657,10 +1659,12 @@ inline ::google::protobuf::RepeatedPtrField<std::string>* Type::mutable_oneofs()
 }
 inline const ::google::protobuf::RepeatedPtrField<std::string>&
 Type::_internal_oneofs() const {
+  PROTOBUF_TSAN_READ(&_internal_metadata_);
   return _impl_.oneofs_;
 }
 inline ::google::protobuf::RepeatedPtrField<std::string>*
 Type::_internal_mutable_oneofs() {
+  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
   return &_impl_.oneofs_;
 }
 
@@ -1699,10 +1703,12 @@ Type::options() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>&
 Type::_internal_options() const {
+  PROTOBUF_TSAN_READ(&_internal_metadata_);
   return _impl_.options_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>*
 Type::_internal_mutable_options() {
+  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
   return &_impl_.options_;
 }
 
@@ -2086,10 +2092,12 @@ Field::options() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>&
 Field::_internal_options() const {
+  PROTOBUF_TSAN_READ(&_internal_metadata_);
   return _impl_.options_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>*
 Field::_internal_mutable_options() {
+  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
   return &_impl_.options_;
 }
 
@@ -2267,10 +2275,12 @@ Enum::enumvalue() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumValue>&
 Enum::_internal_enumvalue() const {
+  PROTOBUF_TSAN_READ(&_internal_metadata_);
   return _impl_.enumvalue_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::EnumValue>*
 Enum::_internal_mutable_enumvalue() {
+  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
   return &_impl_.enumvalue_;
 }
 
@@ -2309,10 +2319,12 @@ Enum::options() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>&
 Enum::_internal_options() const {
+  PROTOBUF_TSAN_READ(&_internal_metadata_);
   return _impl_.options_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>*
 Enum::_internal_mutable_options() {
+  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
   return &_impl_.options_;
 }
 
@@ -2571,10 +2583,12 @@ EnumValue::options() const {
 }
 inline const ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>&
 EnumValue::_internal_options() const {
+  PROTOBUF_TSAN_READ(&_internal_metadata_);
   return _impl_.options_;
 }
 inline ::google::protobuf::RepeatedPtrField<::google::protobuf::Option>*
 EnumValue::_internal_mutable_options() {
+  PROTOBUF_TSAN_WRITE(&_internal_metadata_);
   return &_impl_.options_;
 }