Auto-generate files after cl/810533181
diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc
index c134939..b697068 100644
--- a/src/google/protobuf/api.pb.cc
+++ b/src/google/protobuf/api.pb.cc
@@ -742,15 +742,18 @@
cached_has_bits = from._impl_._has_bits_[0];
if (BatchCheckHasBit(cached_has_bits, 0x000000ffU)) {
if (CheckHasBitForRepeated(cached_has_bits, 0x00000001U)) {
- _this->_internal_mutable_methods()->MergeFrom(
+ _this->_internal_mutable_methods()->InternalMergeFromWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), arena,
from._internal_methods());
}
if (CheckHasBitForRepeated(cached_has_bits, 0x00000002U)) {
- _this->_internal_mutable_options()->MergeFrom(
+ _this->_internal_mutable_options()->InternalMergeFromWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), arena,
from._internal_options());
}
if (CheckHasBitForRepeated(cached_has_bits, 0x00000004U)) {
- _this->_internal_mutable_mixins()->MergeFrom(
+ _this->_internal_mutable_mixins()->InternalMergeFromWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), arena,
from._internal_mixins());
}
if (CheckHasBit(cached_has_bits, 0x00000008U)) {
@@ -1291,6 +1294,7 @@
if constexpr (::_pbi::DebugHardenCheckHasBitConsistency()) {
from.CheckHasBitConsistency();
}
+ ::google::protobuf::Arena* arena = _this->GetArena();
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Method)
ABSL_DCHECK_NE(&from, _this);
::uint32_t cached_has_bits = 0;
@@ -1299,7 +1303,8 @@
cached_has_bits = from._impl_._has_bits_[0];
if (BatchCheckHasBit(cached_has_bits, 0x000000ffU)) {
if (CheckHasBitForRepeated(cached_has_bits, 0x00000001U)) {
- _this->_internal_mutable_options()->MergeFrom(
+ _this->_internal_mutable_options()->InternalMergeFromWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), arena,
from._internal_options());
}
if (CheckHasBit(cached_has_bits, 0x00000002U)) {
diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h
index b539142..a3859fb 100644
--- a/src/google/protobuf/api.pb.h
+++ b/src/google/protobuf/api.pb.h
@@ -1020,7 +1020,9 @@
inline ::google::protobuf::Method* PROTOBUF_NONNULL Api::add_methods()
ABSL_ATTRIBUTE_LIFETIME_BOUND {
::google::protobuf::internal::TSanWrite(&_impl_);
- ::google::protobuf::Method* _add = _internal_mutable_methods()->Add();
+ ::google::protobuf::Method* _add =
+ _internal_mutable_methods()->InternalAddWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), GetArena());
SetHasBitForRepeated(_impl_._has_bits_[0], 0x00000001U);
// @@protoc_insertion_point(field_add:google.protobuf.Api.methods)
return _add;
@@ -1068,7 +1070,9 @@
inline ::google::protobuf::Option* PROTOBUF_NONNULL Api::add_options()
ABSL_ATTRIBUTE_LIFETIME_BOUND {
::google::protobuf::internal::TSanWrite(&_impl_);
- ::google::protobuf::Option* _add = _internal_mutable_options()->Add();
+ ::google::protobuf::Option* _add =
+ _internal_mutable_options()->InternalAddWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), GetArena());
SetHasBitForRepeated(_impl_._has_bits_[0], 0x00000002U);
// @@protoc_insertion_point(field_add:google.protobuf.Api.options)
return _add;
@@ -1280,7 +1284,9 @@
inline ::google::protobuf::Mixin* PROTOBUF_NONNULL Api::add_mixins()
ABSL_ATTRIBUTE_LIFETIME_BOUND {
::google::protobuf::internal::TSanWrite(&_impl_);
- ::google::protobuf::Mixin* _add = _internal_mutable_mixins()->Add();
+ ::google::protobuf::Mixin* _add =
+ _internal_mutable_mixins()->InternalAddWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), GetArena());
SetHasBitForRepeated(_impl_._has_bits_[0], 0x00000004U);
// @@protoc_insertion_point(field_add:google.protobuf.Api.mixins)
return _add;
@@ -1667,7 +1673,9 @@
inline ::google::protobuf::Option* PROTOBUF_NONNULL Method::add_options()
ABSL_ATTRIBUTE_LIFETIME_BOUND {
::google::protobuf::internal::TSanWrite(&_impl_);
- ::google::protobuf::Option* _add = _internal_mutable_options()->Add();
+ ::google::protobuf::Option* _add =
+ _internal_mutable_options()->InternalAddWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), GetArena());
SetHasBitForRepeated(_impl_._has_bits_[0], 0x00000001U);
// @@protoc_insertion_point(field_add:google.protobuf.Method.options)
return _add;
diff --git a/src/google/protobuf/field_mask.pb.cc b/src/google/protobuf/field_mask.pb.cc
index ec77aa2..f3bbbde 100644
--- a/src/google/protobuf/field_mask.pb.cc
+++ b/src/google/protobuf/field_mask.pb.cc
@@ -351,6 +351,7 @@
if constexpr (::_pbi::DebugHardenCheckHasBitConsistency()) {
from.CheckHasBitConsistency();
}
+ ::google::protobuf::Arena* arena = _this->GetArena();
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FieldMask)
ABSL_DCHECK_NE(&from, _this);
::uint32_t cached_has_bits = 0;
@@ -358,7 +359,9 @@
cached_has_bits = from._impl_._has_bits_[0];
if (CheckHasBitForRepeated(cached_has_bits, 0x00000001U)) {
- _this->_internal_mutable_paths()->MergeFrom(from._internal_paths());
+ _this->_internal_mutable_paths()->InternalMergeFromWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), arena,
+ from._internal_paths());
}
_this->_impl_._has_bits_[0] |= cached_has_bits;
_this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h
index 2eebc49..c1efc05 100644
--- a/src/google/protobuf/field_mask.pb.h
+++ b/src/google/protobuf/field_mask.pb.h
@@ -302,7 +302,9 @@
inline ::std::string* PROTOBUF_NONNULL FieldMask::add_paths()
ABSL_ATTRIBUTE_LIFETIME_BOUND {
::google::protobuf::internal::TSanWrite(&_impl_);
- ::std::string* _s = _internal_mutable_paths()->Add();
+ ::std::string* _s =
+ _internal_mutable_paths()->InternalAddWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), GetArena());
SetHasBitForRepeated(_impl_._has_bits_[0], 0x00000001U);
// @@protoc_insertion_point(field_add_mutable:google.protobuf.FieldMask.paths)
return _s;
@@ -326,9 +328,10 @@
template <typename Arg_, typename... Args_>
inline void FieldMask::add_paths(Arg_&& value, Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
- ::google::protobuf::internal::AddToRepeatedPtrField(*_internal_mutable_paths(),
- ::std::forward<Arg_>(value),
- args... );
+ ::google::protobuf::internal::AddToRepeatedPtrField(
+ ::google::protobuf::MessageLite::internal_visibility(), GetArena(),
+ *_internal_mutable_paths(), ::std::forward<Arg_>(value),
+ args... );
SetHasBitForRepeated(_impl_._has_bits_[0], 0x00000001U);
// @@protoc_insertion_point(field_add:google.protobuf.FieldMask.paths)
}
diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc
index a442d42..79b14a5 100644
--- a/src/google/protobuf/struct.pb.cc
+++ b/src/google/protobuf/struct.pb.cc
@@ -1340,6 +1340,7 @@
if constexpr (::_pbi::DebugHardenCheckHasBitConsistency()) {
from.CheckHasBitConsistency();
}
+ ::google::protobuf::Arena* arena = _this->GetArena();
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.ListValue)
ABSL_DCHECK_NE(&from, _this);
::uint32_t cached_has_bits = 0;
@@ -1347,7 +1348,8 @@
cached_has_bits = from._impl_._has_bits_[0];
if (CheckHasBitForRepeated(cached_has_bits, 0x00000001U)) {
- _this->_internal_mutable_values()->MergeFrom(
+ _this->_internal_mutable_values()->InternalMergeFromWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), arena,
from._internal_values());
}
_this->_impl_._has_bits_[0] |= cached_has_bits;
diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h
index a5d746f..ee07d49 100644
--- a/src/google/protobuf/struct.pb.h
+++ b/src/google/protobuf/struct.pb.h
@@ -1301,7 +1301,9 @@
inline ::google::protobuf::Value* PROTOBUF_NONNULL ListValue::add_values()
ABSL_ATTRIBUTE_LIFETIME_BOUND {
::google::protobuf::internal::TSanWrite(&_impl_);
- ::google::protobuf::Value* _add = _internal_mutable_values()->Add();
+ ::google::protobuf::Value* _add =
+ _internal_mutable_values()->InternalAddWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), GetArena());
SetHasBitForRepeated(_impl_._has_bits_[0], 0x00000001U);
// @@protoc_insertion_point(field_add:google.protobuf.ListValue.values)
return _add;
diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc
index 3109ba7..eda9c8b 100644
--- a/src/google/protobuf/type.pb.cc
+++ b/src/google/protobuf/type.pb.cc
@@ -836,14 +836,18 @@
cached_has_bits = from._impl_._has_bits_[0];
if (BatchCheckHasBit(cached_has_bits, 0x0000007fU)) {
if (CheckHasBitForRepeated(cached_has_bits, 0x00000001U)) {
- _this->_internal_mutable_fields()->MergeFrom(
+ _this->_internal_mutable_fields()->InternalMergeFromWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), arena,
from._internal_fields());
}
if (CheckHasBitForRepeated(cached_has_bits, 0x00000002U)) {
- _this->_internal_mutable_oneofs()->MergeFrom(from._internal_oneofs());
+ _this->_internal_mutable_oneofs()->InternalMergeFromWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), arena,
+ from._internal_oneofs());
}
if (CheckHasBitForRepeated(cached_has_bits, 0x00000004U)) {
- _this->_internal_mutable_options()->MergeFrom(
+ _this->_internal_mutable_options()->InternalMergeFromWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), arena,
from._internal_options());
}
if (CheckHasBit(cached_has_bits, 0x00000008U)) {
@@ -1426,6 +1430,7 @@
if constexpr (::_pbi::DebugHardenCheckHasBitConsistency()) {
from.CheckHasBitConsistency();
}
+ ::google::protobuf::Arena* arena = _this->GetArena();
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Field)
ABSL_DCHECK_NE(&from, _this);
::uint32_t cached_has_bits = 0;
@@ -1434,7 +1439,8 @@
cached_has_bits = from._impl_._has_bits_[0];
if (BatchCheckHasBit(cached_has_bits, 0x000000ffU)) {
if (CheckHasBitForRepeated(cached_has_bits, 0x00000001U)) {
- _this->_internal_mutable_options()->MergeFrom(
+ _this->_internal_mutable_options()->InternalMergeFromWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), arena,
from._internal_options());
}
if (CheckHasBit(cached_has_bits, 0x00000002U)) {
@@ -1960,11 +1966,13 @@
cached_has_bits = from._impl_._has_bits_[0];
if (BatchCheckHasBit(cached_has_bits, 0x0000003fU)) {
if (CheckHasBitForRepeated(cached_has_bits, 0x00000001U)) {
- _this->_internal_mutable_enumvalue()->MergeFrom(
+ _this->_internal_mutable_enumvalue()->InternalMergeFromWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), arena,
from._internal_enumvalue());
}
if (CheckHasBitForRepeated(cached_has_bits, 0x00000002U)) {
- _this->_internal_mutable_options()->MergeFrom(
+ _this->_internal_mutable_options()->InternalMergeFromWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), arena,
from._internal_options());
}
if (CheckHasBit(cached_has_bits, 0x00000004U)) {
@@ -2342,6 +2350,7 @@
if constexpr (::_pbi::DebugHardenCheckHasBitConsistency()) {
from.CheckHasBitConsistency();
}
+ ::google::protobuf::Arena* arena = _this->GetArena();
// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumValue)
ABSL_DCHECK_NE(&from, _this);
::uint32_t cached_has_bits = 0;
@@ -2350,7 +2359,8 @@
cached_has_bits = from._impl_._has_bits_[0];
if (BatchCheckHasBit(cached_has_bits, 0x00000007U)) {
if (CheckHasBitForRepeated(cached_has_bits, 0x00000001U)) {
- _this->_internal_mutable_options()->MergeFrom(
+ _this->_internal_mutable_options()->InternalMergeFromWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), arena,
from._internal_options());
}
if (CheckHasBit(cached_has_bits, 0x00000002U)) {
diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h
index fb274af..9f020f3 100644
--- a/src/google/protobuf/type.pb.h
+++ b/src/google/protobuf/type.pb.h
@@ -1748,7 +1748,9 @@
inline ::google::protobuf::Field* PROTOBUF_NONNULL Type::add_fields()
ABSL_ATTRIBUTE_LIFETIME_BOUND {
::google::protobuf::internal::TSanWrite(&_impl_);
- ::google::protobuf::Field* _add = _internal_mutable_fields()->Add();
+ ::google::protobuf::Field* _add =
+ _internal_mutable_fields()->InternalAddWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), GetArena());
SetHasBitForRepeated(_impl_._has_bits_[0], 0x00000001U);
// @@protoc_insertion_point(field_add:google.protobuf.Type.fields)
return _add;
@@ -1785,7 +1787,9 @@
inline ::std::string* PROTOBUF_NONNULL Type::add_oneofs()
ABSL_ATTRIBUTE_LIFETIME_BOUND {
::google::protobuf::internal::TSanWrite(&_impl_);
- ::std::string* _s = _internal_mutable_oneofs()->Add();
+ ::std::string* _s =
+ _internal_mutable_oneofs()->InternalAddWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), GetArena());
SetHasBitForRepeated(_impl_._has_bits_[0], 0x00000002U);
// @@protoc_insertion_point(field_add_mutable:google.protobuf.Type.oneofs)
return _s;
@@ -1809,9 +1813,10 @@
template <typename Arg_, typename... Args_>
inline void Type::add_oneofs(Arg_&& value, Args_... args) {
::google::protobuf::internal::TSanWrite(&_impl_);
- ::google::protobuf::internal::AddToRepeatedPtrField(*_internal_mutable_oneofs(),
- ::std::forward<Arg_>(value),
- args... );
+ ::google::protobuf::internal::AddToRepeatedPtrField(
+ ::google::protobuf::MessageLite::internal_visibility(), GetArena(),
+ *_internal_mutable_oneofs(), ::std::forward<Arg_>(value),
+ args... );
SetHasBitForRepeated(_impl_._has_bits_[0], 0x00000002U);
// @@protoc_insertion_point(field_add:google.protobuf.Type.oneofs)
}
@@ -1871,7 +1876,9 @@
inline ::google::protobuf::Option* PROTOBUF_NONNULL Type::add_options()
ABSL_ATTRIBUTE_LIFETIME_BOUND {
::google::protobuf::internal::TSanWrite(&_impl_);
- ::google::protobuf::Option* _add = _internal_mutable_options()->Add();
+ ::google::protobuf::Option* _add =
+ _internal_mutable_options()->InternalAddWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), GetArena());
SetHasBitForRepeated(_impl_._has_bits_[0], 0x00000004U);
// @@protoc_insertion_point(field_add:google.protobuf.Type.options)
return _add;
@@ -2367,7 +2374,9 @@
inline ::google::protobuf::Option* PROTOBUF_NONNULL Field::add_options()
ABSL_ATTRIBUTE_LIFETIME_BOUND {
::google::protobuf::internal::TSanWrite(&_impl_);
- ::google::protobuf::Option* _add = _internal_mutable_options()->Add();
+ ::google::protobuf::Option* _add =
+ _internal_mutable_options()->InternalAddWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), GetArena());
SetHasBitForRepeated(_impl_._has_bits_[0], 0x00000001U);
// @@protoc_insertion_point(field_add:google.protobuf.Field.options)
return _add;
@@ -2620,7 +2629,9 @@
inline ::google::protobuf::EnumValue* PROTOBUF_NONNULL Enum::add_enumvalue()
ABSL_ATTRIBUTE_LIFETIME_BOUND {
::google::protobuf::internal::TSanWrite(&_impl_);
- ::google::protobuf::EnumValue* _add = _internal_mutable_enumvalue()->Add();
+ ::google::protobuf::EnumValue* _add =
+ _internal_mutable_enumvalue()->InternalAddWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), GetArena());
SetHasBitForRepeated(_impl_._has_bits_[0], 0x00000001U);
// @@protoc_insertion_point(field_add:google.protobuf.Enum.enumvalue)
return _add;
@@ -2674,7 +2685,9 @@
inline ::google::protobuf::Option* PROTOBUF_NONNULL Enum::add_options()
ABSL_ATTRIBUTE_LIFETIME_BOUND {
::google::protobuf::internal::TSanWrite(&_impl_);
- ::google::protobuf::Option* _add = _internal_mutable_options()->Add();
+ ::google::protobuf::Option* _add =
+ _internal_mutable_options()->InternalAddWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), GetArena());
SetHasBitForRepeated(_impl_._has_bits_[0], 0x00000002U);
// @@protoc_insertion_point(field_add:google.protobuf.Enum.options)
return _add;
@@ -3005,7 +3018,9 @@
inline ::google::protobuf::Option* PROTOBUF_NONNULL EnumValue::add_options()
ABSL_ATTRIBUTE_LIFETIME_BOUND {
::google::protobuf::internal::TSanWrite(&_impl_);
- ::google::protobuf::Option* _add = _internal_mutable_options()->Add();
+ ::google::protobuf::Option* _add =
+ _internal_mutable_options()->InternalAddWithArena(
+ ::google::protobuf::MessageLite::internal_visibility(), GetArena());
SetHasBitForRepeated(_impl_._has_bits_[0], 0x00000001U);
// @@protoc_insertion_point(field_add:google.protobuf.EnumValue.options)
return _add;
