diff --git a/python/google/protobuf/pyext/message.cc b/python/google/protobuf/pyext/message.cc index dc7991b9ff..449a11d997 100644 --- a/python/google/protobuf/pyext/message.cc +++ b/python/google/protobuf/pyext/message.cc @@ -899,7 +899,7 @@ int DeleteRepeatedField( } } - Arena* arena = Arena::InternalGetArenaForAllocation(message); + Arena* arena = message->GetArena(); ABSL_DCHECK_EQ(arena, nullptr) << "python protobuf is expected to be allocated from heap"; // Remove items, starting from the end. diff --git a/src/google/protobuf/arena.h b/src/google/protobuf/arena.h index e64d6cf6aa..10ce61b3c8 100644 --- a/src/google/protobuf/arena.h +++ b/src/google/protobuf/arena.h @@ -389,8 +389,7 @@ class PROTOBUF_EXPORT PROTOBUF_ALIGNAS(8) Arena final { // mutually exclusive fashion, we use implicit conversions to base classes // to force an explicit ranking for our preferences. The lowest ranked // version that compiles will be accepted. - struct Rank2 {}; - struct Rank1 : Rank2 {}; + struct Rank1 {}; struct Rank0 : Rank1 {}; static Arena* GetOwningArena(const T* p) { @@ -410,31 +409,16 @@ class PROTOBUF_EXPORT PROTOBUF_ALIGNAS(8) Arena final { static void InternalSwap(T* a, T* b) { a->InternalSwap(b); } - static Arena* GetArenaForAllocation(T* p) { - return GetArenaForAllocation(Rank0{}, p); - } - - static Arena* GetArena(T* p) { - // Rather than replicate probing for `GetArena` with fallback to nullptr, - // we borrow the implementation of `GetArenaForAllocation` but skip - // `Rank0` which probes for `GetArenaForAllocation`. - return GetArenaForAllocation(Rank1{}, p); - } - - template - static auto GetArenaForAllocation(Rank0, U* p) - -> EnableIfArenaGetArenaForAllocation())> { - return p->GetArenaForAllocation(); - } + static Arena* GetArena(T* p) { return GetArena(Rank0{}, p); } template - static auto GetArenaForAllocation(Rank1, U* p) + static auto GetArena(Rank0, U* p) -> EnableIfArenaGetArena())> { return p->GetArena(); } template - static Arena* GetArenaForAllocation(Rank2, U*) { + static Arena* GetArena(Rank1, U*) { return nullptr; } @@ -481,11 +465,18 @@ class PROTOBUF_EXPORT PROTOBUF_ALIGNAS(8) Arena final { return InternalHelper::GetOwningArena(p); } - // Provides access to protected GetArenaForAllocation to generated messages. + // Wraps InternalGetArena() and will be removed soon. // For internal use only. template static Arena* InternalGetArenaForAllocation(T* p) { - return InternalHelper::GetArenaForAllocation(p); + return InternalHelper::GetArena(p); + } + + // Provides access to protected GetArena to generated messages. + // For internal use only. + template + static Arena* InternalGetArena(T* p) { + return InternalHelper::GetArena(p); } // Helper typetraits that indicates support for arenas in a type T at compile diff --git a/src/google/protobuf/compiler/cpp/field_generators/cord_field.cc b/src/google/protobuf/compiler/cpp/field_generators/cord_field.cc index 8e5851da28..88e2afacaf 100644 --- a/src/google/protobuf/compiler/cpp/field_generators/cord_field.cc +++ b/src/google/protobuf/compiler/cpp/field_generators/cord_field.cc @@ -366,8 +366,8 @@ void CordOneofFieldGenerator::GenerateInlineAccessorDefinitions( clear_$oneof_name$(); set_has_$name$(); $field$ = new ::absl::Cord; - if (GetArenaForAllocation() != nullptr) { - GetArenaForAllocation()->Own($field$); + if (GetArena() != nullptr) { + GetArena()->Own($field$); } } *$field$ = value; @@ -386,8 +386,8 @@ void CordOneofFieldGenerator::GenerateInlineAccessorDefinitions( clear_$oneof_name$(); set_has_$name$(); $field$ = new ::absl::Cord; - if (GetArenaForAllocation() != nullptr) { - GetArenaForAllocation()->Own($field$); + if (GetArena() != nullptr) { + GetArena()->Own($field$); } } *$field$ = value; @@ -401,8 +401,8 @@ void CordOneofFieldGenerator::GenerateInlineAccessorDefinitions( clear_$oneof_name$(); set_has_$name$(); $field$ = new ::absl::Cord; - if (GetArenaForAllocation() != nullptr) { - GetArenaForAllocation()->Own($field$); + if (GetArena() != nullptr) { + GetArena()->Own($field$); } } return $field$; @@ -425,7 +425,7 @@ void CordOneofFieldGenerator::GenerateNonInlineAccessorDefinitions( void CordOneofFieldGenerator::GenerateClearingCode(io::Printer* printer) const { Formatter format(printer, variables_); format( - "if (GetArenaForAllocation() == nullptr) {\n" + "if (GetArena() == nullptr) {\n" " delete $field$;\n" "}\n"); } diff --git a/src/google/protobuf/compiler/cpp/field_generators/enum_field.cc b/src/google/protobuf/compiler/cpp/field_generators/enum_field.cc index e925c36adf..d9613e7edb 100644 --- a/src/google/protobuf/compiler/cpp/field_generators/enum_field.cc +++ b/src/google/protobuf/compiler/cpp/field_generators/enum_field.cc @@ -450,8 +450,8 @@ void RepeatedEnum::GenerateInlineAccessorDefinitions(io::Printer* p) const { $TsanDetectConcurrentRead$; $PrepareSplitMessageForWrite$; if ($field_$.IsDefault()) { - $field_$.Set($pb$::Arena::CreateMessage<$pb$::RepeatedField>( - GetArenaForAllocation())); + $field_$.Set( + $pb$::Arena::CreateMessage<$pb$::RepeatedField>(GetArena())); } return $field_$.Get(); } diff --git a/src/google/protobuf/compiler/cpp/field_generators/message_field.cc b/src/google/protobuf/compiler/cpp/field_generators/message_field.cc index 412349d264..9da586c609 100644 --- a/src/google/protobuf/compiler/cpp/field_generators/message_field.cc +++ b/src/google/protobuf/compiler/cpp/field_generators/message_field.cc @@ -212,7 +212,7 @@ void SingularMessage::GenerateInlineAccessorDefinitions(io::Printer* p) const { $PrepareSplitMessageForWrite$; //~ If we're not on an arena, free whatever we were holding before. //~ (If we are on arena, we can just forget the earlier pointer.) - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete reinterpret_cast<$pb$::MessageLite*>($field_$); } $field_$ = reinterpret_cast<$MemberType$*>(value); @@ -232,11 +232,11 @@ void SingularMessage::GenerateInlineAccessorDefinitions(io::Printer* p) const { #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE auto* old = reinterpret_cast<$pb$::MessageLite*>(released); released = $pbi$::DuplicateIfNonNull(released); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete old; } #else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { released = $pbi$::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE @@ -259,7 +259,7 @@ void SingularMessage::GenerateInlineAccessorDefinitions(io::Printer* p) const { $StrongRef$; $set_hasbit$; if ($field_$ == nullptr) { - auto* p = CreateMaybeMessage<$Submsg$>(GetArenaForAllocation()); + auto* p = CreateMaybeMessage<$Submsg$>(GetArena()); $field_$ = reinterpret_cast<$MemberType$*>(p); } return $cast_field_$; @@ -276,7 +276,7 @@ void SingularMessage::GenerateInlineAccessorDefinitions(io::Printer* p) const { //~ We handle the most common case inline, and delegate less common //~ cases to the slow fallback function. inline void $Msg$::set_allocated_$name$($Submsg$* value) { - $pb$::Arena* message_arena = GetArenaForAllocation(); + $pb$::Arena* message_arena = GetArena(); $TsanDetectConcurrentMutation$; $PrepareSplitMessageForWrite$; if (message_arena == nullptr) { @@ -378,7 +378,7 @@ void SingularMessage::GenerateInternalAccessorDefinitions( $update_hasbit$; if ($is_already_set$) { $clear_oneof$; - msg->$field_$ = $kDefaultPtr$->New(msg->GetArenaForAllocation()); + msg->$field_$ = $kDefaultPtr$->New(msg->GetArena()); } return msg->$field_$; } @@ -390,7 +390,7 @@ void SingularMessage::GenerateClearingCode(io::Printer* p) const { // If we don't have has-bits, message presence is indicated only by ptr != // nullptr. Thus on clear, we need to delete the object. p->Emit( - "if (GetArenaForAllocation() == nullptr && $field_$ != nullptr) {\n" + "if (GetArena() == nullptr && $field_$ != nullptr) {\n" " delete $field_$;\n" "}\n" "$field_$ = nullptr;\n"); @@ -404,7 +404,7 @@ void SingularMessage::GenerateMessageClearingCode(io::Printer* p) const { // If we don't have has-bits, message presence is indicated only by ptr != // nullptr. Thus on clear, we need to delete the object. p->Emit( - "if (GetArenaForAllocation() == nullptr && $field_$ != nullptr) {\n" + "if (GetArena() == nullptr && $field_$ != nullptr) {\n" " delete $field_$;\n" "}\n" "$field_$ = nullptr;\n"); @@ -572,7 +572,7 @@ class OneofMessage : public SingularMessage { void OneofMessage::GenerateNonInlineAccessorDefinitions(io::Printer* p) const { p->Emit(R"cc( void $Msg$::set_allocated_$name$($Submsg$* $name$) { - $pb$::Arena* message_arena = GetArenaForAllocation(); + $pb$::Arena* message_arena = GetArena(); clear_$oneof_name$(); if ($name$) { $pb$::Arena* submessage_arena = @@ -602,7 +602,7 @@ void OneofMessage::GenerateInlineAccessorDefinitions(io::Printer* p) const { if ($has_field$) { clear_has_$oneof_name$(); auto* temp = $cast_field_$; - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { temp = $pbi$::DuplicateIfNonNull(temp); } $field_$ = nullptr; @@ -660,8 +660,7 @@ void OneofMessage::GenerateInlineAccessorDefinitions(io::Printer* p) const { if ($not_has_field$) { clear_$oneof_name$(); set_has_$name$(); - $field_$ = - $weak_cast$(CreateMaybeMessage<$Submsg$>(GetArenaForAllocation())); + $field_$ = $weak_cast$(CreateMaybeMessage<$Submsg$>(GetArena())); } return $cast_field_$; } @@ -678,7 +677,7 @@ void OneofMessage::GenerateInlineAccessorDefinitions(io::Printer* p) const { void OneofMessage::GenerateClearingCode(io::Printer* p) const { p->Emit(R"cc( - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete $field_$; })cc"); } @@ -858,7 +857,7 @@ void RepeatedMessage::GenerateInlineAccessorDefinitions(io::Printer* p) const { if ($field_$.IsDefault()) { $field_$.Set( CreateMaybeMessage<$pb$::$Weak$RepeatedPtrField<$Submsg$>>( - GetArenaForAllocation())); + GetArena())); } return $field_$.Get(); } diff --git a/src/google/protobuf/compiler/cpp/field_generators/primitive_field.cc b/src/google/protobuf/compiler/cpp/field_generators/primitive_field.cc index b50293f90c..f96d35511d 100644 --- a/src/google/protobuf/compiler/cpp/field_generators/primitive_field.cc +++ b/src/google/protobuf/compiler/cpp/field_generators/primitive_field.cc @@ -520,7 +520,7 @@ void RepeatedPrimitive::GenerateInlineAccessorDefinitions( $PrepareSplitMessageForWrite$; if ($field_$.IsDefault()) { $field_$.Set($pb$::Arena::CreateMessage<$pb$::RepeatedField<$Type$>>( - GetArenaForAllocation())); + GetArena())); } return $field_$.Get(); } diff --git a/src/google/protobuf/compiler/cpp/field_generators/string_field.cc b/src/google/protobuf/compiler/cpp/field_generators/string_field.cc index 4ca140271e..748a8d6882 100644 --- a/src/google/protobuf/compiler/cpp/field_generators/string_field.cc +++ b/src/google/protobuf/compiler/cpp/field_generators/string_field.cc @@ -291,11 +291,11 @@ void UpdateHasbitSet(io::Printer* p, bool is_oneof) { void ArgsForSetter(io::Printer* p, bool inlined) { if (!inlined) { - p->Emit("GetArenaForAllocation()"); + p->Emit("GetArena()"); return; } p->Emit( - "GetArenaForAllocation(), _internal_$name$_donated(), " + "GetArena(), _internal_$name$_donated(), " "&$donating_states_word$, $mask_for_undonate$, this"); } @@ -325,7 +325,7 @@ void SingularString::ReleaseImpl(io::Printer* p) const { } $clear_hasbit$; - return $field_$.Release(GetArenaForAllocation(), _internal_$name$_donated()); + return $field_$.Release(GetArena(), _internal_$name$_donated()); )cc"); return; } @@ -361,7 +361,7 @@ void SingularString::SetAllocatedImpl(io::Printer* p) const { } if (value != nullptr) { set_has_$name$(); - $field_$.InitAllocated(value, GetArenaForAllocation()); + $field_$.InitAllocated(value, GetArena()); } )cc"); return; @@ -512,7 +512,7 @@ void SingularString::GenerateClearingCode(io::Printer* p) const { ABSL_DCHECK(!is_inlined()); p->Emit(R"cc( - $field_$.ClearToDefault($lazy_var$, GetArenaForAllocation()); + $field_$.ClearToDefault($lazy_var$, GetArena()); )cc"); } @@ -551,7 +551,7 @@ void SingularString::GenerateMessageClearingCode(io::Printer* p) const { // Clear to a non-empty default is more involved, as we try to use the // Arena if one is present and may need to reallocate the string. p->Emit(R"cc( - $field_$.ClearToDefault($lazy_var$, GetArenaForAllocation()); + $field_$.ClearToDefault($lazy_var$, GetArena()); )cc"); return; } @@ -599,7 +599,7 @@ void SingularString::GenerateConstructorCode(io::Printer* p) const { if (IsString(field_, *opts_) && EmptyDefault()) { p->Emit(R"cc( #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - $field_$.Set("", GetArenaForAllocation()); + $field_$.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING )cc"); } @@ -626,10 +626,10 @@ void SingularString::GenerateCopyConstructorCode(io::Printer* p) const { {"set_args", [&] { if (!is_inlined()) { - p->Emit("_this->GetArenaForAllocation()"); + p->Emit("_this->GetArena()"); } else { p->Emit( - "_this->GetArenaForAllocation(), " + "_this->GetArena(), " "_this->_internal_$name$_donated(), " "&_this->$donating_states_word$, $mask_for_undonate$, _this"); } @@ -972,7 +972,7 @@ void RepeatedString::GenerateInlineAccessorDefinitions(io::Printer* p) const { if ($field_$.IsDefault()) { $field_$.Set( $pb$::Arena::CreateMessage<$pb$::RepeatedPtrField>( - GetArenaForAllocation())); + GetArena())); } return $field_$.Get(); } diff --git a/src/google/protobuf/compiler/cpp/message.cc b/src/google/protobuf/compiler/cpp/message.cc index 062ea96d10..7888e46795 100644 --- a/src/google/protobuf/compiler/cpp/message.cc +++ b/src/google/protobuf/compiler/cpp/message.cc @@ -2099,7 +2099,7 @@ void MessageGenerator::GenerateClassMethods(io::Printer* p) { "void $classname$::PrepareSplitMessageForWrite() {\n" " if (PROTOBUF_PREDICT_TRUE(IsSplitMessageDefault())) {\n" " void* chunk = $pbi$::CreateSplitMessageGeneric(" - "GetArenaForAllocation(), &$1$, sizeof(Impl_::Split), this, &$2$);\n" + "GetArena(), &$1$, sizeof(Impl_::Split), this, &$2$);\n" " $split$ = reinterpret_cast(chunk);\n" " }\n" "}\n", @@ -2749,7 +2749,7 @@ void MessageGenerator::GenerateSharedDestructorCode(io::Printer* p) { }, R"cc( inline void $classname$::SharedDtor() { - $DCHK$(GetArenaForAllocation() == nullptr); + $DCHK$(GetArena() == nullptr); $extensions_dtor$; $field_dtors$; $split_field_dtors$; @@ -3854,8 +3854,8 @@ void MessageGenerator::GenerateSwap(io::Printer* p) { if (HasNonSplitOptionalString(descriptor_, options_)) { p->Emit(R"cc( - auto* arena = GetArenaForAllocation(); - ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation()); + auto* arena = GetArena(); + ABSL_DCHECK_EQ(arena, other->GetArena()); )cc"); } format("_internal_metadata_.InternalSwap(&other->_internal_metadata_);\n"); diff --git a/src/google/protobuf/compiler/plugin.pb.cc b/src/google/protobuf/compiler/plugin.pb.cc index 36d50d080b..f6c5113bc7 100644 --- a/src/google/protobuf/compiler/plugin.pb.cc +++ b/src/google/protobuf/compiler/plugin.pb.cc @@ -374,7 +374,7 @@ Version::~Version() { SharedDtor(); } inline void Version::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.suffix_.Destroy(); _impl_.~Impl_(); } @@ -592,8 +592,8 @@ PROTOBUF_NOINLINE bool Version::IsInitialized() const { } void Version::InternalSwap(Version* PROTOBUF_RESTRICT other) { using std::swap; - auto* arena = GetArenaForAllocation(); - ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation()); + auto* arena = GetArena(); + ABSL_DCHECK_EQ(arena, other->GetArena()); _internal_metadata_.InternalSwap(&other->_internal_metadata_); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.suffix_, &other->_impl_.suffix_, arena); @@ -687,7 +687,7 @@ CodeGeneratorRequest::~CodeGeneratorRequest() { SharedDtor(); } inline void CodeGeneratorRequest::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.parameter_.Destroy(); if (this != internal_default_instance()) delete _impl_.compiler_version_; _impl_.~Impl_(); @@ -940,8 +940,8 @@ PROTOBUF_NOINLINE bool CodeGeneratorRequest::IsInitialized() const { } void CodeGeneratorRequest::InternalSwap(CodeGeneratorRequest* PROTOBUF_RESTRICT other) { using std::swap; - auto* arena = GetArenaForAllocation(); - ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation()); + auto* arena = GetArena(); + ABSL_DCHECK_EQ(arena, other->GetArena()); _internal_metadata_.InternalSwap(&other->_internal_metadata_); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); _impl_.file_to_generate_.InternalSwap(&other->_impl_.file_to_generate_); @@ -1034,7 +1034,7 @@ CodeGeneratorResponse_File::~CodeGeneratorResponse_File() { SharedDtor(); } inline void CodeGeneratorResponse_File::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.name_.Destroy(); _impl_.insertion_point_.Destroy(); _impl_.content_.Destroy(); @@ -1267,8 +1267,8 @@ PROTOBUF_NOINLINE bool CodeGeneratorResponse_File::IsInitialized() const { } void CodeGeneratorResponse_File::InternalSwap(CodeGeneratorResponse_File* PROTOBUF_RESTRICT other) { using std::swap; - auto* arena = GetArenaForAllocation(); - ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation()); + auto* arena = GetArena(); + ABSL_DCHECK_EQ(arena, other->GetArena()); _internal_metadata_.InternalSwap(&other->_internal_metadata_); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, &other->_impl_.name_, arena); @@ -1340,7 +1340,7 @@ CodeGeneratorResponse::~CodeGeneratorResponse() { SharedDtor(); } inline void CodeGeneratorResponse::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.error_.Destroy(); _impl_.~Impl_(); } @@ -1534,8 +1534,8 @@ PROTOBUF_NOINLINE bool CodeGeneratorResponse::IsInitialized() const { } void CodeGeneratorResponse::InternalSwap(CodeGeneratorResponse* PROTOBUF_RESTRICT other) { using std::swap; - auto* arena = GetArenaForAllocation(); - ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation()); + auto* arena = GetArena(); + ABSL_DCHECK_EQ(arena, other->GetArena()); _internal_metadata_.InternalSwap(&other->_internal_metadata_); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); _impl_.file_.InternalSwap(&other->_impl_.file_); diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h index 564e2e8c3c..81b3706012 100644 --- a/src/google/protobuf/compiler/plugin.pb.h +++ b/src/google/protobuf/compiler/plugin.pb.h @@ -1210,7 +1210,7 @@ inline PROTOBUF_ALWAYS_INLINE void Version::set_suffix(Arg_&& arg, Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.suffix_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.suffix_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.compiler.Version.suffix) } inline std::string* Version::mutable_suffix() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -1225,12 +1225,12 @@ inline const std::string& Version::_internal_suffix() const { inline void Version::_internal_set_suffix(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.suffix_.Set(value, GetArenaForAllocation()); + _impl_.suffix_.Set(value, GetArena()); } inline std::string* Version::_internal_mutable_suffix() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - return _impl_.suffix_.Mutable( GetArenaForAllocation()); + return _impl_.suffix_.Mutable( GetArena()); } inline std::string* Version::release_suffix() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -1241,7 +1241,7 @@ inline std::string* Version::release_suffix() { _impl_._has_bits_[0] &= ~0x00000001u; auto* released = _impl_.suffix_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.suffix_.Set("", GetArenaForAllocation()); + _impl_.suffix_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -1252,10 +1252,10 @@ inline void Version::set_allocated_suffix(std::string* value) { } else { _impl_._has_bits_[0] &= ~0x00000001u; } - _impl_.suffix_.SetAllocated(value, GetArenaForAllocation()); + _impl_.suffix_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.suffix_.IsDefault()) { - _impl_.suffix_.Set("", GetArenaForAllocation()); + _impl_.suffix_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.compiler.Version.suffix) @@ -1386,7 +1386,7 @@ inline PROTOBUF_ALWAYS_INLINE void CodeGeneratorRequest::set_parameter(Arg_&& ar Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.parameter_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.parameter_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.compiler.CodeGeneratorRequest.parameter) } inline std::string* CodeGeneratorRequest::mutable_parameter() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -1401,12 +1401,12 @@ inline const std::string& CodeGeneratorRequest::_internal_parameter() const { inline void CodeGeneratorRequest::_internal_set_parameter(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.parameter_.Set(value, GetArenaForAllocation()); + _impl_.parameter_.Set(value, GetArena()); } inline std::string* CodeGeneratorRequest::_internal_mutable_parameter() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - return _impl_.parameter_.Mutable( GetArenaForAllocation()); + return _impl_.parameter_.Mutable( GetArena()); } inline std::string* CodeGeneratorRequest::release_parameter() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -1417,7 +1417,7 @@ inline std::string* CodeGeneratorRequest::release_parameter() { _impl_._has_bits_[0] &= ~0x00000001u; auto* released = _impl_.parameter_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.parameter_.Set("", GetArenaForAllocation()); + _impl_.parameter_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -1428,10 +1428,10 @@ inline void CodeGeneratorRequest::set_allocated_parameter(std::string* value) { } else { _impl_._has_bits_[0] &= ~0x00000001u; } - _impl_.parameter_.SetAllocated(value, GetArenaForAllocation()); + _impl_.parameter_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.parameter_.IsDefault()) { - _impl_.parameter_.Set("", GetArenaForAllocation()); + _impl_.parameter_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.compiler.CodeGeneratorRequest.parameter) @@ -1549,7 +1549,7 @@ inline const ::google::protobuf::compiler::Version& CodeGeneratorRequest::compil } inline void CodeGeneratorRequest::unsafe_arena_set_allocated_compiler_version(::google::protobuf::compiler::Version* value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.compiler_version_); } _impl_.compiler_version_ = reinterpret_cast<::google::protobuf::compiler::Version*>(value); @@ -1569,11 +1569,11 @@ inline ::google::protobuf::compiler::Version* CodeGeneratorRequest::release_comp #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released); released = ::google::protobuf::internal::DuplicateIfNonNull(released); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete old; } #else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { released = ::google::protobuf::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE @@ -1592,7 +1592,7 @@ inline ::google::protobuf::compiler::Version* CodeGeneratorRequest::_internal_mu PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; if (_impl_.compiler_version_ == nullptr) { - auto* p = CreateMaybeMessage<::google::protobuf::compiler::Version>(GetArenaForAllocation()); + auto* p = CreateMaybeMessage<::google::protobuf::compiler::Version>(GetArena()); _impl_.compiler_version_ = reinterpret_cast<::google::protobuf::compiler::Version*>(p); } return _impl_.compiler_version_; @@ -1603,7 +1603,7 @@ inline ::google::protobuf::compiler::Version* CodeGeneratorRequest::mutable_comp return _msg; } inline void CodeGeneratorRequest::set_allocated_compiler_version(::google::protobuf::compiler::Version* value) { - ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); + ::google::protobuf::Arena* message_arena = GetArena(); PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::compiler::Version*>(_impl_.compiler_version_); @@ -1648,7 +1648,7 @@ inline PROTOBUF_ALWAYS_INLINE void CodeGeneratorResponse_File::set_name(Arg_&& a Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.name_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.name_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.compiler.CodeGeneratorResponse.File.name) } inline std::string* CodeGeneratorResponse_File::mutable_name() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -1663,12 +1663,12 @@ inline const std::string& CodeGeneratorResponse_File::_internal_name() const { inline void CodeGeneratorResponse_File::_internal_set_name(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.name_.Set(value, GetArenaForAllocation()); + _impl_.name_.Set(value, GetArena()); } inline std::string* CodeGeneratorResponse_File::_internal_mutable_name() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - return _impl_.name_.Mutable( GetArenaForAllocation()); + return _impl_.name_.Mutable( GetArena()); } inline std::string* CodeGeneratorResponse_File::release_name() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -1679,7 +1679,7 @@ inline std::string* CodeGeneratorResponse_File::release_name() { _impl_._has_bits_[0] &= ~0x00000001u; auto* released = _impl_.name_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.name_.Set("", GetArenaForAllocation()); + _impl_.name_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -1690,10 +1690,10 @@ inline void CodeGeneratorResponse_File::set_allocated_name(std::string* value) { } else { _impl_._has_bits_[0] &= ~0x00000001u; } - _impl_.name_.SetAllocated(value, GetArenaForAllocation()); + _impl_.name_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArenaForAllocation()); + _impl_.name_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.compiler.CodeGeneratorResponse.File.name) @@ -1719,7 +1719,7 @@ inline PROTOBUF_ALWAYS_INLINE void CodeGeneratorResponse_File::set_insertion_poi Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; - _impl_.insertion_point_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.insertion_point_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.compiler.CodeGeneratorResponse.File.insertion_point) } inline std::string* CodeGeneratorResponse_File::mutable_insertion_point() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -1734,12 +1734,12 @@ inline const std::string& CodeGeneratorResponse_File::_internal_insertion_point( inline void CodeGeneratorResponse_File::_internal_set_insertion_point(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; - _impl_.insertion_point_.Set(value, GetArenaForAllocation()); + _impl_.insertion_point_.Set(value, GetArena()); } inline std::string* CodeGeneratorResponse_File::_internal_mutable_insertion_point() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; - return _impl_.insertion_point_.Mutable( GetArenaForAllocation()); + return _impl_.insertion_point_.Mutable( GetArena()); } inline std::string* CodeGeneratorResponse_File::release_insertion_point() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -1750,7 +1750,7 @@ inline std::string* CodeGeneratorResponse_File::release_insertion_point() { _impl_._has_bits_[0] &= ~0x00000002u; auto* released = _impl_.insertion_point_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.insertion_point_.Set("", GetArenaForAllocation()); + _impl_.insertion_point_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -1761,10 +1761,10 @@ inline void CodeGeneratorResponse_File::set_allocated_insertion_point(std::strin } else { _impl_._has_bits_[0] &= ~0x00000002u; } - _impl_.insertion_point_.SetAllocated(value, GetArenaForAllocation()); + _impl_.insertion_point_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.insertion_point_.IsDefault()) { - _impl_.insertion_point_.Set("", GetArenaForAllocation()); + _impl_.insertion_point_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.compiler.CodeGeneratorResponse.File.insertion_point) @@ -1790,7 +1790,7 @@ inline PROTOBUF_ALWAYS_INLINE void CodeGeneratorResponse_File::set_content(Arg_& Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000004u; - _impl_.content_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.content_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.compiler.CodeGeneratorResponse.File.content) } inline std::string* CodeGeneratorResponse_File::mutable_content() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -1805,12 +1805,12 @@ inline const std::string& CodeGeneratorResponse_File::_internal_content() const inline void CodeGeneratorResponse_File::_internal_set_content(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000004u; - _impl_.content_.Set(value, GetArenaForAllocation()); + _impl_.content_.Set(value, GetArena()); } inline std::string* CodeGeneratorResponse_File::_internal_mutable_content() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000004u; - return _impl_.content_.Mutable( GetArenaForAllocation()); + return _impl_.content_.Mutable( GetArena()); } inline std::string* CodeGeneratorResponse_File::release_content() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -1821,7 +1821,7 @@ inline std::string* CodeGeneratorResponse_File::release_content() { _impl_._has_bits_[0] &= ~0x00000004u; auto* released = _impl_.content_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.content_.Set("", GetArenaForAllocation()); + _impl_.content_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -1832,10 +1832,10 @@ inline void CodeGeneratorResponse_File::set_allocated_content(std::string* value } else { _impl_._has_bits_[0] &= ~0x00000004u; } - _impl_.content_.SetAllocated(value, GetArenaForAllocation()); + _impl_.content_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.content_.IsDefault()) { - _impl_.content_.Set("", GetArenaForAllocation()); + _impl_.content_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.compiler.CodeGeneratorResponse.File.content) @@ -1858,7 +1858,7 @@ inline const ::google::protobuf::GeneratedCodeInfo& CodeGeneratorResponse_File:: } inline void CodeGeneratorResponse_File::unsafe_arena_set_allocated_generated_code_info(::google::protobuf::GeneratedCodeInfo* value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.generated_code_info_); } _impl_.generated_code_info_ = reinterpret_cast<::google::protobuf::GeneratedCodeInfo*>(value); @@ -1878,11 +1878,11 @@ inline ::google::protobuf::GeneratedCodeInfo* CodeGeneratorResponse_File::releas #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released); released = ::google::protobuf::internal::DuplicateIfNonNull(released); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete old; } #else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { released = ::google::protobuf::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE @@ -1901,7 +1901,7 @@ inline ::google::protobuf::GeneratedCodeInfo* CodeGeneratorResponse_File::_inter PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000008u; if (_impl_.generated_code_info_ == nullptr) { - auto* p = CreateMaybeMessage<::google::protobuf::GeneratedCodeInfo>(GetArenaForAllocation()); + auto* p = CreateMaybeMessage<::google::protobuf::GeneratedCodeInfo>(GetArena()); _impl_.generated_code_info_ = reinterpret_cast<::google::protobuf::GeneratedCodeInfo*>(p); } return _impl_.generated_code_info_; @@ -1912,7 +1912,7 @@ inline ::google::protobuf::GeneratedCodeInfo* CodeGeneratorResponse_File::mutabl return _msg; } inline void CodeGeneratorResponse_File::set_allocated_generated_code_info(::google::protobuf::GeneratedCodeInfo* value) { - ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); + ::google::protobuf::Arena* message_arena = GetArena(); PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.generated_code_info_); @@ -1957,7 +1957,7 @@ inline PROTOBUF_ALWAYS_INLINE void CodeGeneratorResponse::set_error(Arg_&& arg, Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.error_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.error_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.compiler.CodeGeneratorResponse.error) } inline std::string* CodeGeneratorResponse::mutable_error() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -1972,12 +1972,12 @@ inline const std::string& CodeGeneratorResponse::_internal_error() const { inline void CodeGeneratorResponse::_internal_set_error(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.error_.Set(value, GetArenaForAllocation()); + _impl_.error_.Set(value, GetArena()); } inline std::string* CodeGeneratorResponse::_internal_mutable_error() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - return _impl_.error_.Mutable( GetArenaForAllocation()); + return _impl_.error_.Mutable( GetArena()); } inline std::string* CodeGeneratorResponse::release_error() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -1988,7 +1988,7 @@ inline std::string* CodeGeneratorResponse::release_error() { _impl_._has_bits_[0] &= ~0x00000001u; auto* released = _impl_.error_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.error_.Set("", GetArenaForAllocation()); + _impl_.error_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -1999,10 +1999,10 @@ inline void CodeGeneratorResponse::set_allocated_error(std::string* value) { } else { _impl_._has_bits_[0] &= ~0x00000001u; } - _impl_.error_.SetAllocated(value, GetArenaForAllocation()); + _impl_.error_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.error_.IsDefault()) { - _impl_.error_.Set("", GetArenaForAllocation()); + _impl_.error_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.compiler.CodeGeneratorResponse.error) diff --git a/src/google/protobuf/cpp_features.pb.cc b/src/google/protobuf/cpp_features.pb.cc index 0be19addbb..5bf11bebb3 100644 --- a/src/google/protobuf/cpp_features.pb.cc +++ b/src/google/protobuf/cpp_features.pb.cc @@ -151,7 +151,7 @@ CppFeatures::~CppFeatures() { SharedDtor(); } inline void CppFeatures::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.~Impl_(); } diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc index cdbf4d8ece..f3462babdb 100644 --- a/src/google/protobuf/descriptor.pb.cc +++ b/src/google/protobuf/descriptor.pb.cc @@ -2387,7 +2387,7 @@ FileDescriptorSet::~FileDescriptorSet() { SharedDtor(); } inline void FileDescriptorSet::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.~Impl_(); } @@ -2633,7 +2633,7 @@ FileDescriptorProto::~FileDescriptorProto() { SharedDtor(); } inline void FileDescriptorProto::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.name_.Destroy(); _impl_.package_.Destroy(); _impl_.syntax_.Destroy(); @@ -3103,8 +3103,8 @@ PROTOBUF_NOINLINE bool FileDescriptorProto::IsInitialized() const { } void FileDescriptorProto::InternalSwap(FileDescriptorProto* PROTOBUF_RESTRICT other) { using std::swap; - auto* arena = GetArenaForAllocation(); - ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation()); + auto* arena = GetArena(); + ABSL_DCHECK_EQ(arena, other->GetArena()); _internal_metadata_.InternalSwap(&other->_internal_metadata_); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); _impl_.dependency_.InternalSwap(&other->_impl_.dependency_); @@ -3206,7 +3206,7 @@ DescriptorProto_ExtensionRange::~DescriptorProto_ExtensionRange() { SharedDtor(); } inline void DescriptorProto_ExtensionRange::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); if (this != internal_default_instance()) delete _impl_.options_; _impl_.~Impl_(); } @@ -3464,7 +3464,7 @@ DescriptorProto_ReservedRange::~DescriptorProto_ReservedRange() { SharedDtor(); } inline void DescriptorProto_ReservedRange::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.~Impl_(); } @@ -3723,7 +3723,7 @@ DescriptorProto::~DescriptorProto() { SharedDtor(); } inline void DescriptorProto::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.name_.Destroy(); if (this != internal_default_instance()) delete _impl_.options_; _impl_.~Impl_(); @@ -4111,8 +4111,8 @@ PROTOBUF_NOINLINE bool DescriptorProto::IsInitialized() const { } void DescriptorProto::InternalSwap(DescriptorProto* PROTOBUF_RESTRICT other) { using std::swap; - auto* arena = GetArenaForAllocation(); - ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation()); + auto* arena = GetArena(); + ABSL_DCHECK_EQ(arena, other->GetArena()); _internal_metadata_.InternalSwap(&other->_internal_metadata_); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); _impl_.field_.InternalSwap(&other->_impl_.field_); @@ -4210,7 +4210,7 @@ ExtensionRangeOptions_Declaration::~ExtensionRangeOptions_Declaration() { SharedDtor(); } inline void ExtensionRangeOptions_Declaration::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.full_name_.Destroy(); _impl_.type_.Destroy(); _impl_.~Impl_(); @@ -4458,8 +4458,8 @@ PROTOBUF_NOINLINE bool ExtensionRangeOptions_Declaration::IsInitialized() const } void ExtensionRangeOptions_Declaration::InternalSwap(ExtensionRangeOptions_Declaration* PROTOBUF_RESTRICT other) { using std::swap; - auto* arena = GetArenaForAllocation(); - ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation()); + auto* arena = GetArena(); + ABSL_DCHECK_EQ(arena, other->GetArena()); _internal_metadata_.InternalSwap(&other->_internal_metadata_); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.full_name_, &other->_impl_.full_name_, arena); @@ -4547,7 +4547,7 @@ ExtensionRangeOptions::~ExtensionRangeOptions() { SharedDtor(); } inline void ExtensionRangeOptions::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); if (this != internal_default_instance()) delete _impl_.features_; _impl_.~Impl_(); } @@ -4916,7 +4916,7 @@ FieldDescriptorProto::~FieldDescriptorProto() { SharedDtor(); } inline void FieldDescriptorProto::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.name_.Destroy(); _impl_.extendee_.Destroy(); _impl_.type_name_.Destroy(); @@ -5337,8 +5337,8 @@ PROTOBUF_NOINLINE bool FieldDescriptorProto::IsInitialized() const { } void FieldDescriptorProto::InternalSwap(FieldDescriptorProto* PROTOBUF_RESTRICT other) { using std::swap; - auto* arena = GetArenaForAllocation(); - ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation()); + auto* arena = GetArena(); + ABSL_DCHECK_EQ(arena, other->GetArena()); _internal_metadata_.InternalSwap(&other->_internal_metadata_); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, &other->_impl_.name_, arena); @@ -5422,7 +5422,7 @@ OneofDescriptorProto::~OneofDescriptorProto() { SharedDtor(); } inline void OneofDescriptorProto::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.name_.Destroy(); if (this != internal_default_instance()) delete _impl_.options_; _impl_.~Impl_(); @@ -5601,8 +5601,8 @@ PROTOBUF_NOINLINE bool OneofDescriptorProto::IsInitialized() const { } void OneofDescriptorProto::InternalSwap(OneofDescriptorProto* PROTOBUF_RESTRICT other) { using std::swap; - auto* arena = GetArenaForAllocation(); - ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation()); + auto* arena = GetArena(); + ABSL_DCHECK_EQ(arena, other->GetArena()); _internal_metadata_.InternalSwap(&other->_internal_metadata_); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, &other->_impl_.name_, arena); @@ -5659,7 +5659,7 @@ EnumDescriptorProto_EnumReservedRange::~EnumDescriptorProto_EnumReservedRange() SharedDtor(); } inline void EnumDescriptorProto_EnumReservedRange::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.~Impl_(); } @@ -5908,7 +5908,7 @@ EnumDescriptorProto::~EnumDescriptorProto() { SharedDtor(); } inline void EnumDescriptorProto::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.name_.Destroy(); if (this != internal_default_instance()) delete _impl_.options_; _impl_.~Impl_(); @@ -6163,8 +6163,8 @@ PROTOBUF_NOINLINE bool EnumDescriptorProto::IsInitialized() const { } void EnumDescriptorProto::InternalSwap(EnumDescriptorProto* PROTOBUF_RESTRICT other) { using std::swap; - auto* arena = GetArenaForAllocation(); - ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation()); + auto* arena = GetArena(); + ABSL_DCHECK_EQ(arena, other->GetArena()); _internal_metadata_.InternalSwap(&other->_internal_metadata_); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); _impl_.value_.InternalSwap(&other->_impl_.value_); @@ -6251,7 +6251,7 @@ EnumValueDescriptorProto::~EnumValueDescriptorProto() { SharedDtor(); } inline void EnumValueDescriptorProto::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.name_.Destroy(); if (this != internal_default_instance()) delete _impl_.options_; _impl_.~Impl_(); @@ -6455,8 +6455,8 @@ PROTOBUF_NOINLINE bool EnumValueDescriptorProto::IsInitialized() const { } void EnumValueDescriptorProto::InternalSwap(EnumValueDescriptorProto* PROTOBUF_RESTRICT other) { using std::swap; - auto* arena = GetArenaForAllocation(); - ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation()); + auto* arena = GetArena(); + ABSL_DCHECK_EQ(arena, other->GetArena()); _internal_metadata_.InternalSwap(&other->_internal_metadata_); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, &other->_impl_.name_, arena); @@ -6538,7 +6538,7 @@ ServiceDescriptorProto::~ServiceDescriptorProto() { SharedDtor(); } inline void ServiceDescriptorProto::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.name_.Destroy(); if (this != internal_default_instance()) delete _impl_.options_; _impl_.~Impl_(); @@ -6744,8 +6744,8 @@ PROTOBUF_NOINLINE bool ServiceDescriptorProto::IsInitialized() const { } void ServiceDescriptorProto::InternalSwap(ServiceDescriptorProto* PROTOBUF_RESTRICT other) { using std::swap; - auto* arena = GetArenaForAllocation(); - ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation()); + auto* arena = GetArena(); + ABSL_DCHECK_EQ(arena, other->GetArena()); _internal_metadata_.InternalSwap(&other->_internal_metadata_); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); _impl_.method_.InternalSwap(&other->_impl_.method_); @@ -6849,7 +6849,7 @@ MethodDescriptorProto::~MethodDescriptorProto() { SharedDtor(); } inline void MethodDescriptorProto::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.name_.Destroy(); _impl_.input_type_.Destroy(); _impl_.output_type_.Destroy(); @@ -7132,8 +7132,8 @@ PROTOBUF_NOINLINE bool MethodDescriptorProto::IsInitialized() const { } void MethodDescriptorProto::InternalSwap(MethodDescriptorProto* PROTOBUF_RESTRICT other) { using std::swap; - auto* arena = GetArenaForAllocation(); - ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation()); + auto* arena = GetArena(); + ABSL_DCHECK_EQ(arena, other->GetArena()); _internal_metadata_.InternalSwap(&other->_internal_metadata_); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, &other->_impl_.name_, arena); @@ -7309,7 +7309,7 @@ FileOptions::~FileOptions() { SharedDtor(); } inline void FileOptions::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.java_package_.Destroy(); _impl_.java_outer_classname_.Destroy(); _impl_.go_package_.Destroy(); @@ -8018,8 +8018,8 @@ PROTOBUF_NOINLINE bool FileOptions::IsInitialized() const { void FileOptions::InternalSwap(FileOptions* PROTOBUF_RESTRICT other) { using std::swap; _impl_._extensions_.InternalSwap(&other->_impl_._extensions_); - auto* arena = GetArenaForAllocation(); - ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation()); + auto* arena = GetArena(); + ABSL_DCHECK_EQ(arena, other->GetArena()); _internal_metadata_.InternalSwap(&other->_internal_metadata_); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); _impl_.uninterpreted_option_.InternalSwap(&other->_impl_.uninterpreted_option_); @@ -8136,7 +8136,7 @@ MessageOptions::~MessageOptions() { SharedDtor(); } inline void MessageOptions::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); if (this != internal_default_instance()) delete _impl_.features_; _impl_.~Impl_(); } @@ -8502,7 +8502,7 @@ FieldOptions_EditionDefault::~FieldOptions_EditionDefault() { SharedDtor(); } inline void FieldOptions_EditionDefault::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.value_.Destroy(); _impl_.~Impl_(); } @@ -8671,8 +8671,8 @@ PROTOBUF_NOINLINE bool FieldOptions_EditionDefault::IsInitialized() const { } void FieldOptions_EditionDefault::InternalSwap(FieldOptions_EditionDefault* PROTOBUF_RESTRICT other) { using std::swap; - auto* arena = GetArenaForAllocation(); - ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation()); + auto* arena = GetArena(); + ABSL_DCHECK_EQ(arena, other->GetArena()); _internal_metadata_.InternalSwap(&other->_internal_metadata_); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.value_, &other->_impl_.value_, arena); @@ -8790,7 +8790,7 @@ FieldOptions::~FieldOptions() { SharedDtor(); } inline void FieldOptions::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); if (this != internal_default_instance()) delete _impl_.features_; _impl_.~Impl_(); } @@ -9318,7 +9318,7 @@ OneofOptions::~OneofOptions() { SharedDtor(); } inline void OneofOptions::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); if (this != internal_default_instance()) delete _impl_.features_; _impl_.~Impl_(); } @@ -9596,7 +9596,7 @@ EnumOptions::~EnumOptions() { SharedDtor(); } inline void EnumOptions::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); if (this != internal_default_instance()) delete _impl_.features_; _impl_.~Impl_(); } @@ -9947,7 +9947,7 @@ EnumValueOptions::~EnumValueOptions() { SharedDtor(); } inline void EnumValueOptions::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); if (this != internal_default_instance()) delete _impl_.features_; _impl_.~Impl_(); } @@ -10271,7 +10271,7 @@ ServiceOptions::~ServiceOptions() { SharedDtor(); } inline void ServiceOptions::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); if (this != internal_default_instance()) delete _impl_.features_; _impl_.~Impl_(); } @@ -10579,7 +10579,7 @@ MethodOptions::~MethodOptions() { SharedDtor(); } inline void MethodOptions::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); if (this != internal_default_instance()) delete _impl_.features_; _impl_.~Impl_(); } @@ -10895,7 +10895,7 @@ UninterpretedOption_NamePart::~UninterpretedOption_NamePart() { SharedDtor(); } inline void UninterpretedOption_NamePart::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.name_part_.Destroy(); _impl_.~Impl_(); } @@ -11066,8 +11066,8 @@ PROTOBUF_NOINLINE bool UninterpretedOption_NamePart::IsInitialized() const { } void UninterpretedOption_NamePart::InternalSwap(UninterpretedOption_NamePart* PROTOBUF_RESTRICT other) { using std::swap; - auto* arena = GetArenaForAllocation(); - ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation()); + auto* arena = GetArena(); + ABSL_DCHECK_EQ(arena, other->GetArena()); _internal_metadata_.InternalSwap(&other->_internal_metadata_); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_part_, &other->_impl_.name_part_, arena); @@ -11164,7 +11164,7 @@ UninterpretedOption::~UninterpretedOption() { SharedDtor(); } inline void UninterpretedOption::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.identifier_value_.Destroy(); _impl_.string_value_.Destroy(); _impl_.aggregate_value_.Destroy(); @@ -11461,8 +11461,8 @@ PROTOBUF_NOINLINE bool UninterpretedOption::IsInitialized() const { } void UninterpretedOption::InternalSwap(UninterpretedOption* PROTOBUF_RESTRICT other) { using std::swap; - auto* arena = GetArenaForAllocation(); - ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation()); + auto* arena = GetArena(); + ABSL_DCHECK_EQ(arena, other->GetArena()); _internal_metadata_.InternalSwap(&other->_internal_metadata_); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); _impl_.name_.InternalSwap(&other->_impl_.name_); @@ -11562,7 +11562,7 @@ FeatureSet::~FeatureSet() { SharedDtor(); } inline void FeatureSet::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.~Impl_(); } @@ -11915,7 +11915,7 @@ FeatureSetDefaults_FeatureSetEditionDefault::~FeatureSetDefaults_FeatureSetEditi SharedDtor(); } inline void FeatureSetDefaults_FeatureSetEditionDefault::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); if (this != internal_default_instance()) delete _impl_.features_; _impl_.~Impl_(); } @@ -12169,7 +12169,7 @@ FeatureSetDefaults::~FeatureSetDefaults() { SharedDtor(); } inline void FeatureSetDefaults::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.~Impl_(); } @@ -12440,7 +12440,7 @@ SourceCodeInfo_Location::~SourceCodeInfo_Location() { SharedDtor(); } inline void SourceCodeInfo_Location::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.leading_comments_.Destroy(); _impl_.trailing_comments_.Destroy(); _impl_.~Impl_(); @@ -12701,8 +12701,8 @@ PROTOBUF_NOINLINE bool SourceCodeInfo_Location::IsInitialized() const { } void SourceCodeInfo_Location::InternalSwap(SourceCodeInfo_Location* PROTOBUF_RESTRICT other) { using std::swap; - auto* arena = GetArenaForAllocation(); - ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation()); + auto* arena = GetArena(); + ABSL_DCHECK_EQ(arena, other->GetArena()); _internal_metadata_.InternalSwap(&other->_internal_metadata_); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); _impl_.path_.InternalSwap(&other->_impl_.path_); @@ -12761,7 +12761,7 @@ SourceCodeInfo::~SourceCodeInfo() { SharedDtor(); } inline void SourceCodeInfo::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.~Impl_(); } @@ -12976,7 +12976,7 @@ GeneratedCodeInfo_Annotation::~GeneratedCodeInfo_Annotation() { SharedDtor(); } inline void GeneratedCodeInfo_Annotation::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.source_file_.Destroy(); _impl_.~Impl_(); } @@ -13226,8 +13226,8 @@ PROTOBUF_NOINLINE bool GeneratedCodeInfo_Annotation::IsInitialized() const { } void GeneratedCodeInfo_Annotation::InternalSwap(GeneratedCodeInfo_Annotation* PROTOBUF_RESTRICT other) { using std::swap; - auto* arena = GetArenaForAllocation(); - ABSL_DCHECK_EQ(arena, other->GetArenaForAllocation()); + auto* arena = GetArena(); + ABSL_DCHECK_EQ(arena, other->GetArena()); _internal_metadata_.InternalSwap(&other->_internal_metadata_); swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]); _impl_.path_.InternalSwap(&other->_impl_.path_); @@ -13289,7 +13289,7 @@ GeneratedCodeInfo::~GeneratedCodeInfo() { SharedDtor(); } inline void GeneratedCodeInfo::SharedDtor() { - ABSL_DCHECK(GetArenaForAllocation() == nullptr); + ABSL_DCHECK(GetArena() == nullptr); _impl_.~Impl_(); } diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index dbe2c160ff..63a8dd00f0 100644 --- a/src/google/protobuf/descriptor.pb.h +++ b/src/google/protobuf/descriptor.pb.h @@ -10951,7 +10951,7 @@ inline PROTOBUF_ALWAYS_INLINE void FileDescriptorProto::set_name(Arg_&& arg, Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.name_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.name_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.name) } inline std::string* FileDescriptorProto::mutable_name() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -10966,12 +10966,12 @@ inline const std::string& FileDescriptorProto::_internal_name() const { inline void FileDescriptorProto::_internal_set_name(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.name_.Set(value, GetArenaForAllocation()); + _impl_.name_.Set(value, GetArena()); } inline std::string* FileDescriptorProto::_internal_mutable_name() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - return _impl_.name_.Mutable( GetArenaForAllocation()); + return _impl_.name_.Mutable( GetArena()); } inline std::string* FileDescriptorProto::release_name() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -10982,7 +10982,7 @@ inline std::string* FileDescriptorProto::release_name() { _impl_._has_bits_[0] &= ~0x00000001u; auto* released = _impl_.name_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.name_.Set("", GetArenaForAllocation()); + _impl_.name_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -10993,10 +10993,10 @@ inline void FileDescriptorProto::set_allocated_name(std::string* value) { } else { _impl_._has_bits_[0] &= ~0x00000001u; } - _impl_.name_.SetAllocated(value, GetArenaForAllocation()); + _impl_.name_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArenaForAllocation()); + _impl_.name_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileDescriptorProto.name) @@ -11022,7 +11022,7 @@ inline PROTOBUF_ALWAYS_INLINE void FileDescriptorProto::set_package(Arg_&& arg, Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; - _impl_.package_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.package_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.package) } inline std::string* FileDescriptorProto::mutable_package() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -11037,12 +11037,12 @@ inline const std::string& FileDescriptorProto::_internal_package() const { inline void FileDescriptorProto::_internal_set_package(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; - _impl_.package_.Set(value, GetArenaForAllocation()); + _impl_.package_.Set(value, GetArena()); } inline std::string* FileDescriptorProto::_internal_mutable_package() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; - return _impl_.package_.Mutable( GetArenaForAllocation()); + return _impl_.package_.Mutable( GetArena()); } inline std::string* FileDescriptorProto::release_package() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -11053,7 +11053,7 @@ inline std::string* FileDescriptorProto::release_package() { _impl_._has_bits_[0] &= ~0x00000002u; auto* released = _impl_.package_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.package_.Set("", GetArenaForAllocation()); + _impl_.package_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -11064,10 +11064,10 @@ inline void FileDescriptorProto::set_allocated_package(std::string* value) { } else { _impl_._has_bits_[0] &= ~0x00000002u; } - _impl_.package_.SetAllocated(value, GetArenaForAllocation()); + _impl_.package_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.package_.IsDefault()) { - _impl_.package_.Set("", GetArenaForAllocation()); + _impl_.package_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileDescriptorProto.package) @@ -11482,7 +11482,7 @@ inline const ::google::protobuf::FileOptions& FileDescriptorProto::options() con } inline void FileDescriptorProto::unsafe_arena_set_allocated_options(::google::protobuf::FileOptions* value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_); } _impl_.options_ = reinterpret_cast<::google::protobuf::FileOptions*>(value); @@ -11502,11 +11502,11 @@ inline ::google::protobuf::FileOptions* FileDescriptorProto::release_options() { #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released); released = ::google::protobuf::internal::DuplicateIfNonNull(released); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete old; } #else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { released = ::google::protobuf::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE @@ -11525,7 +11525,7 @@ inline ::google::protobuf::FileOptions* FileDescriptorProto::_internal_mutable_o PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000008u; if (_impl_.options_ == nullptr) { - auto* p = CreateMaybeMessage<::google::protobuf::FileOptions>(GetArenaForAllocation()); + auto* p = CreateMaybeMessage<::google::protobuf::FileOptions>(GetArena()); _impl_.options_ = reinterpret_cast<::google::protobuf::FileOptions*>(p); } return _impl_.options_; @@ -11536,7 +11536,7 @@ inline ::google::protobuf::FileOptions* FileDescriptorProto::mutable_options() A return _msg; } inline void FileDescriptorProto::set_allocated_options(::google::protobuf::FileOptions* value) { - ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); + ::google::protobuf::Arena* message_arena = GetArena(); PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::FileOptions*>(_impl_.options_); @@ -11579,7 +11579,7 @@ inline const ::google::protobuf::SourceCodeInfo& FileDescriptorProto::source_cod } inline void FileDescriptorProto::unsafe_arena_set_allocated_source_code_info(::google::protobuf::SourceCodeInfo* value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_code_info_); } _impl_.source_code_info_ = reinterpret_cast<::google::protobuf::SourceCodeInfo*>(value); @@ -11599,11 +11599,11 @@ inline ::google::protobuf::SourceCodeInfo* FileDescriptorProto::release_source_c #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released); released = ::google::protobuf::internal::DuplicateIfNonNull(released); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete old; } #else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { released = ::google::protobuf::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE @@ -11622,7 +11622,7 @@ inline ::google::protobuf::SourceCodeInfo* FileDescriptorProto::_internal_mutabl PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000010u; if (_impl_.source_code_info_ == nullptr) { - auto* p = CreateMaybeMessage<::google::protobuf::SourceCodeInfo>(GetArenaForAllocation()); + auto* p = CreateMaybeMessage<::google::protobuf::SourceCodeInfo>(GetArena()); _impl_.source_code_info_ = reinterpret_cast<::google::protobuf::SourceCodeInfo*>(p); } return _impl_.source_code_info_; @@ -11633,7 +11633,7 @@ inline ::google::protobuf::SourceCodeInfo* FileDescriptorProto::mutable_source_c return _msg; } inline void FileDescriptorProto::set_allocated_source_code_info(::google::protobuf::SourceCodeInfo* value) { - ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); + ::google::protobuf::Arena* message_arena = GetArena(); PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::SourceCodeInfo*>(_impl_.source_code_info_); @@ -11674,7 +11674,7 @@ inline PROTOBUF_ALWAYS_INLINE void FileDescriptorProto::set_syntax(Arg_&& arg, Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000004u; - _impl_.syntax_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.syntax_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.syntax) } inline std::string* FileDescriptorProto::mutable_syntax() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -11689,12 +11689,12 @@ inline const std::string& FileDescriptorProto::_internal_syntax() const { inline void FileDescriptorProto::_internal_set_syntax(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000004u; - _impl_.syntax_.Set(value, GetArenaForAllocation()); + _impl_.syntax_.Set(value, GetArena()); } inline std::string* FileDescriptorProto::_internal_mutable_syntax() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000004u; - return _impl_.syntax_.Mutable( GetArenaForAllocation()); + return _impl_.syntax_.Mutable( GetArena()); } inline std::string* FileDescriptorProto::release_syntax() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -11705,7 +11705,7 @@ inline std::string* FileDescriptorProto::release_syntax() { _impl_._has_bits_[0] &= ~0x00000004u; auto* released = _impl_.syntax_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.syntax_.Set("", GetArenaForAllocation()); + _impl_.syntax_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -11716,10 +11716,10 @@ inline void FileDescriptorProto::set_allocated_syntax(std::string* value) { } else { _impl_._has_bits_[0] &= ~0x00000004u; } - _impl_.syntax_.SetAllocated(value, GetArenaForAllocation()); + _impl_.syntax_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.syntax_.IsDefault()) { - _impl_.syntax_.Set("", GetArenaForAllocation()); + _impl_.syntax_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileDescriptorProto.syntax) @@ -11836,7 +11836,7 @@ inline const ::google::protobuf::ExtensionRangeOptions& DescriptorProto_Extensio } inline void DescriptorProto_ExtensionRange::unsafe_arena_set_allocated_options(::google::protobuf::ExtensionRangeOptions* value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_); } _impl_.options_ = reinterpret_cast<::google::protobuf::ExtensionRangeOptions*>(value); @@ -11856,11 +11856,11 @@ inline ::google::protobuf::ExtensionRangeOptions* DescriptorProto_ExtensionRange #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released); released = ::google::protobuf::internal::DuplicateIfNonNull(released); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete old; } #else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { released = ::google::protobuf::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE @@ -11879,7 +11879,7 @@ inline ::google::protobuf::ExtensionRangeOptions* DescriptorProto_ExtensionRange PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; if (_impl_.options_ == nullptr) { - auto* p = CreateMaybeMessage<::google::protobuf::ExtensionRangeOptions>(GetArenaForAllocation()); + auto* p = CreateMaybeMessage<::google::protobuf::ExtensionRangeOptions>(GetArena()); _impl_.options_ = reinterpret_cast<::google::protobuf::ExtensionRangeOptions*>(p); } return _impl_.options_; @@ -11890,7 +11890,7 @@ inline ::google::protobuf::ExtensionRangeOptions* DescriptorProto_ExtensionRange return _msg; } inline void DescriptorProto_ExtensionRange::set_allocated_options(::google::protobuf::ExtensionRangeOptions* value) { - ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); + ::google::protobuf::Arena* message_arena = GetArena(); PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::ExtensionRangeOptions*>(_impl_.options_); @@ -11995,7 +11995,7 @@ inline PROTOBUF_ALWAYS_INLINE void DescriptorProto::set_name(Arg_&& arg, Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.name_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.name_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.name) } inline std::string* DescriptorProto::mutable_name() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -12010,12 +12010,12 @@ inline const std::string& DescriptorProto::_internal_name() const { inline void DescriptorProto::_internal_set_name(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.name_.Set(value, GetArenaForAllocation()); + _impl_.name_.Set(value, GetArena()); } inline std::string* DescriptorProto::_internal_mutable_name() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - return _impl_.name_.Mutable( GetArenaForAllocation()); + return _impl_.name_.Mutable( GetArena()); } inline std::string* DescriptorProto::release_name() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -12026,7 +12026,7 @@ inline std::string* DescriptorProto::release_name() { _impl_._has_bits_[0] &= ~0x00000001u; auto* released = _impl_.name_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.name_.Set("", GetArenaForAllocation()); + _impl_.name_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -12037,10 +12037,10 @@ inline void DescriptorProto::set_allocated_name(std::string* value) { } else { _impl_._has_bits_[0] &= ~0x00000001u; } - _impl_.name_.SetAllocated(value, GetArenaForAllocation()); + _impl_.name_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArenaForAllocation()); + _impl_.name_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.DescriptorProto.name) @@ -12362,7 +12362,7 @@ inline const ::google::protobuf::MessageOptions& DescriptorProto::options() cons } inline void DescriptorProto::unsafe_arena_set_allocated_options(::google::protobuf::MessageOptions* value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_); } _impl_.options_ = reinterpret_cast<::google::protobuf::MessageOptions*>(value); @@ -12382,11 +12382,11 @@ inline ::google::protobuf::MessageOptions* DescriptorProto::release_options() { #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released); released = ::google::protobuf::internal::DuplicateIfNonNull(released); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete old; } #else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { released = ::google::protobuf::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE @@ -12405,7 +12405,7 @@ inline ::google::protobuf::MessageOptions* DescriptorProto::_internal_mutable_op PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; if (_impl_.options_ == nullptr) { - auto* p = CreateMaybeMessage<::google::protobuf::MessageOptions>(GetArenaForAllocation()); + auto* p = CreateMaybeMessage<::google::protobuf::MessageOptions>(GetArena()); _impl_.options_ = reinterpret_cast<::google::protobuf::MessageOptions*>(p); } return _impl_.options_; @@ -12416,7 +12416,7 @@ inline ::google::protobuf::MessageOptions* DescriptorProto::mutable_options() AB return _msg; } inline void DescriptorProto::set_allocated_options(::google::protobuf::MessageOptions* value) { - ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); + ::google::protobuf::Arena* message_arena = GetArena(); PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::MessageOptions*>(_impl_.options_); @@ -12639,7 +12639,7 @@ inline PROTOBUF_ALWAYS_INLINE void ExtensionRangeOptions_Declaration::set_full_n Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.full_name_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.full_name_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.ExtensionRangeOptions.Declaration.full_name) } inline std::string* ExtensionRangeOptions_Declaration::mutable_full_name() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -12654,12 +12654,12 @@ inline const std::string& ExtensionRangeOptions_Declaration::_internal_full_name inline void ExtensionRangeOptions_Declaration::_internal_set_full_name(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.full_name_.Set(value, GetArenaForAllocation()); + _impl_.full_name_.Set(value, GetArena()); } inline std::string* ExtensionRangeOptions_Declaration::_internal_mutable_full_name() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - return _impl_.full_name_.Mutable( GetArenaForAllocation()); + return _impl_.full_name_.Mutable( GetArena()); } inline std::string* ExtensionRangeOptions_Declaration::release_full_name() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -12670,7 +12670,7 @@ inline std::string* ExtensionRangeOptions_Declaration::release_full_name() { _impl_._has_bits_[0] &= ~0x00000001u; auto* released = _impl_.full_name_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.full_name_.Set("", GetArenaForAllocation()); + _impl_.full_name_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -12681,10 +12681,10 @@ inline void ExtensionRangeOptions_Declaration::set_allocated_full_name(std::stri } else { _impl_._has_bits_[0] &= ~0x00000001u; } - _impl_.full_name_.SetAllocated(value, GetArenaForAllocation()); + _impl_.full_name_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.full_name_.IsDefault()) { - _impl_.full_name_.Set("", GetArenaForAllocation()); + _impl_.full_name_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.ExtensionRangeOptions.Declaration.full_name) @@ -12710,7 +12710,7 @@ inline PROTOBUF_ALWAYS_INLINE void ExtensionRangeOptions_Declaration::set_type(A Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; - _impl_.type_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.type_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.ExtensionRangeOptions.Declaration.type) } inline std::string* ExtensionRangeOptions_Declaration::mutable_type() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -12725,12 +12725,12 @@ inline const std::string& ExtensionRangeOptions_Declaration::_internal_type() co inline void ExtensionRangeOptions_Declaration::_internal_set_type(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; - _impl_.type_.Set(value, GetArenaForAllocation()); + _impl_.type_.Set(value, GetArena()); } inline std::string* ExtensionRangeOptions_Declaration::_internal_mutable_type() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; - return _impl_.type_.Mutable( GetArenaForAllocation()); + return _impl_.type_.Mutable( GetArena()); } inline std::string* ExtensionRangeOptions_Declaration::release_type() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -12741,7 +12741,7 @@ inline std::string* ExtensionRangeOptions_Declaration::release_type() { _impl_._has_bits_[0] &= ~0x00000002u; auto* released = _impl_.type_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.type_.Set("", GetArenaForAllocation()); + _impl_.type_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -12752,10 +12752,10 @@ inline void ExtensionRangeOptions_Declaration::set_allocated_type(std::string* v } else { _impl_._has_bits_[0] &= ~0x00000002u; } - _impl_.type_.SetAllocated(value, GetArenaForAllocation()); + _impl_.type_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.type_.IsDefault()) { - _impl_.type_.Set("", GetArenaForAllocation()); + _impl_.type_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.ExtensionRangeOptions.Declaration.type) @@ -12941,7 +12941,7 @@ inline const ::google::protobuf::FeatureSet& ExtensionRangeOptions::features() c } inline void ExtensionRangeOptions::unsafe_arena_set_allocated_features(::google::protobuf::FeatureSet* value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.features_); } _impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(value); @@ -12961,11 +12961,11 @@ inline ::google::protobuf::FeatureSet* ExtensionRangeOptions::release_features() #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released); released = ::google::protobuf::internal::DuplicateIfNonNull(released); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete old; } #else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { released = ::google::protobuf::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE @@ -12984,7 +12984,7 @@ inline ::google::protobuf::FeatureSet* ExtensionRangeOptions::_internal_mutable_ PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; if (_impl_.features_ == nullptr) { - auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArenaForAllocation()); + auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArena()); _impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(p); } return _impl_.features_; @@ -12995,7 +12995,7 @@ inline ::google::protobuf::FeatureSet* ExtensionRangeOptions::mutable_features() return _msg; } inline void ExtensionRangeOptions::set_allocated_features(::google::protobuf::FeatureSet* value) { - ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); + ::google::protobuf::Arena* message_arena = GetArena(); PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::FeatureSet*>(_impl_.features_); @@ -13069,7 +13069,7 @@ inline PROTOBUF_ALWAYS_INLINE void FieldDescriptorProto::set_name(Arg_&& arg, Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.name_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.name_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.name) } inline std::string* FieldDescriptorProto::mutable_name() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -13084,12 +13084,12 @@ inline const std::string& FieldDescriptorProto::_internal_name() const { inline void FieldDescriptorProto::_internal_set_name(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.name_.Set(value, GetArenaForAllocation()); + _impl_.name_.Set(value, GetArena()); } inline std::string* FieldDescriptorProto::_internal_mutable_name() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - return _impl_.name_.Mutable( GetArenaForAllocation()); + return _impl_.name_.Mutable( GetArena()); } inline std::string* FieldDescriptorProto::release_name() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -13100,7 +13100,7 @@ inline std::string* FieldDescriptorProto::release_name() { _impl_._has_bits_[0] &= ~0x00000001u; auto* released = _impl_.name_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.name_.Set("", GetArenaForAllocation()); + _impl_.name_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -13111,10 +13111,10 @@ inline void FieldDescriptorProto::set_allocated_name(std::string* value) { } else { _impl_._has_bits_[0] &= ~0x00000001u; } - _impl_.name_.SetAllocated(value, GetArenaForAllocation()); + _impl_.name_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArenaForAllocation()); + _impl_.name_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.FieldDescriptorProto.name) @@ -13226,7 +13226,7 @@ inline PROTOBUF_ALWAYS_INLINE void FieldDescriptorProto::set_type_name(Arg_&& ar Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000004u; - _impl_.type_name_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.type_name_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.type_name) } inline std::string* FieldDescriptorProto::mutable_type_name() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -13241,12 +13241,12 @@ inline const std::string& FieldDescriptorProto::_internal_type_name() const { inline void FieldDescriptorProto::_internal_set_type_name(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000004u; - _impl_.type_name_.Set(value, GetArenaForAllocation()); + _impl_.type_name_.Set(value, GetArena()); } inline std::string* FieldDescriptorProto::_internal_mutable_type_name() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000004u; - return _impl_.type_name_.Mutable( GetArenaForAllocation()); + return _impl_.type_name_.Mutable( GetArena()); } inline std::string* FieldDescriptorProto::release_type_name() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -13257,7 +13257,7 @@ inline std::string* FieldDescriptorProto::release_type_name() { _impl_._has_bits_[0] &= ~0x00000004u; auto* released = _impl_.type_name_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.type_name_.Set("", GetArenaForAllocation()); + _impl_.type_name_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -13268,10 +13268,10 @@ inline void FieldDescriptorProto::set_allocated_type_name(std::string* value) { } else { _impl_._has_bits_[0] &= ~0x00000004u; } - _impl_.type_name_.SetAllocated(value, GetArenaForAllocation()); + _impl_.type_name_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.type_name_.IsDefault()) { - _impl_.type_name_.Set("", GetArenaForAllocation()); + _impl_.type_name_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.FieldDescriptorProto.type_name) @@ -13297,7 +13297,7 @@ inline PROTOBUF_ALWAYS_INLINE void FieldDescriptorProto::set_extendee(Arg_&& arg Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; - _impl_.extendee_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.extendee_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.extendee) } inline std::string* FieldDescriptorProto::mutable_extendee() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -13312,12 +13312,12 @@ inline const std::string& FieldDescriptorProto::_internal_extendee() const { inline void FieldDescriptorProto::_internal_set_extendee(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; - _impl_.extendee_.Set(value, GetArenaForAllocation()); + _impl_.extendee_.Set(value, GetArena()); } inline std::string* FieldDescriptorProto::_internal_mutable_extendee() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; - return _impl_.extendee_.Mutable( GetArenaForAllocation()); + return _impl_.extendee_.Mutable( GetArena()); } inline std::string* FieldDescriptorProto::release_extendee() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -13328,7 +13328,7 @@ inline std::string* FieldDescriptorProto::release_extendee() { _impl_._has_bits_[0] &= ~0x00000002u; auto* released = _impl_.extendee_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.extendee_.Set("", GetArenaForAllocation()); + _impl_.extendee_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -13339,10 +13339,10 @@ inline void FieldDescriptorProto::set_allocated_extendee(std::string* value) { } else { _impl_._has_bits_[0] &= ~0x00000002u; } - _impl_.extendee_.SetAllocated(value, GetArenaForAllocation()); + _impl_.extendee_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.extendee_.IsDefault()) { - _impl_.extendee_.Set("", GetArenaForAllocation()); + _impl_.extendee_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.FieldDescriptorProto.extendee) @@ -13368,7 +13368,7 @@ inline PROTOBUF_ALWAYS_INLINE void FieldDescriptorProto::set_default_value(Arg_& Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000008u; - _impl_.default_value_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.default_value_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.default_value) } inline std::string* FieldDescriptorProto::mutable_default_value() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -13383,12 +13383,12 @@ inline const std::string& FieldDescriptorProto::_internal_default_value() const inline void FieldDescriptorProto::_internal_set_default_value(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000008u; - _impl_.default_value_.Set(value, GetArenaForAllocation()); + _impl_.default_value_.Set(value, GetArena()); } inline std::string* FieldDescriptorProto::_internal_mutable_default_value() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000008u; - return _impl_.default_value_.Mutable( GetArenaForAllocation()); + return _impl_.default_value_.Mutable( GetArena()); } inline std::string* FieldDescriptorProto::release_default_value() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -13399,7 +13399,7 @@ inline std::string* FieldDescriptorProto::release_default_value() { _impl_._has_bits_[0] &= ~0x00000008u; auto* released = _impl_.default_value_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.default_value_.Set("", GetArenaForAllocation()); + _impl_.default_value_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -13410,10 +13410,10 @@ inline void FieldDescriptorProto::set_allocated_default_value(std::string* value } else { _impl_._has_bits_[0] &= ~0x00000008u; } - _impl_.default_value_.SetAllocated(value, GetArenaForAllocation()); + _impl_.default_value_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.default_value_.IsDefault()) { - _impl_.default_value_.Set("", GetArenaForAllocation()); + _impl_.default_value_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.FieldDescriptorProto.default_value) @@ -13467,7 +13467,7 @@ inline PROTOBUF_ALWAYS_INLINE void FieldDescriptorProto::set_json_name(Arg_&& ar Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000010u; - _impl_.json_name_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.json_name_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.json_name) } inline std::string* FieldDescriptorProto::mutable_json_name() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -13482,12 +13482,12 @@ inline const std::string& FieldDescriptorProto::_internal_json_name() const { inline void FieldDescriptorProto::_internal_set_json_name(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000010u; - _impl_.json_name_.Set(value, GetArenaForAllocation()); + _impl_.json_name_.Set(value, GetArena()); } inline std::string* FieldDescriptorProto::_internal_mutable_json_name() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000010u; - return _impl_.json_name_.Mutable( GetArenaForAllocation()); + return _impl_.json_name_.Mutable( GetArena()); } inline std::string* FieldDescriptorProto::release_json_name() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -13498,7 +13498,7 @@ inline std::string* FieldDescriptorProto::release_json_name() { _impl_._has_bits_[0] &= ~0x00000010u; auto* released = _impl_.json_name_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.json_name_.Set("", GetArenaForAllocation()); + _impl_.json_name_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -13509,10 +13509,10 @@ inline void FieldDescriptorProto::set_allocated_json_name(std::string* value) { } else { _impl_._has_bits_[0] &= ~0x00000010u; } - _impl_.json_name_.SetAllocated(value, GetArenaForAllocation()); + _impl_.json_name_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.json_name_.IsDefault()) { - _impl_.json_name_.Set("", GetArenaForAllocation()); + _impl_.json_name_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.FieldDescriptorProto.json_name) @@ -13540,7 +13540,7 @@ inline const ::google::protobuf::FieldOptions& FieldDescriptorProto::options() c } inline void FieldDescriptorProto::unsafe_arena_set_allocated_options(::google::protobuf::FieldOptions* value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_); } _impl_.options_ = reinterpret_cast<::google::protobuf::FieldOptions*>(value); @@ -13560,11 +13560,11 @@ inline ::google::protobuf::FieldOptions* FieldDescriptorProto::release_options() #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released); released = ::google::protobuf::internal::DuplicateIfNonNull(released); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete old; } #else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { released = ::google::protobuf::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE @@ -13583,7 +13583,7 @@ inline ::google::protobuf::FieldOptions* FieldDescriptorProto::_internal_mutable PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000020u; if (_impl_.options_ == nullptr) { - auto* p = CreateMaybeMessage<::google::protobuf::FieldOptions>(GetArenaForAllocation()); + auto* p = CreateMaybeMessage<::google::protobuf::FieldOptions>(GetArena()); _impl_.options_ = reinterpret_cast<::google::protobuf::FieldOptions*>(p); } return _impl_.options_; @@ -13594,7 +13594,7 @@ inline ::google::protobuf::FieldOptions* FieldDescriptorProto::mutable_options() return _msg; } inline void FieldDescriptorProto::set_allocated_options(::google::protobuf::FieldOptions* value) { - ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); + ::google::protobuf::Arena* message_arena = GetArena(); PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::FieldOptions*>(_impl_.options_); @@ -13667,7 +13667,7 @@ inline PROTOBUF_ALWAYS_INLINE void OneofDescriptorProto::set_name(Arg_&& arg, Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.name_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.name_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.OneofDescriptorProto.name) } inline std::string* OneofDescriptorProto::mutable_name() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -13682,12 +13682,12 @@ inline const std::string& OneofDescriptorProto::_internal_name() const { inline void OneofDescriptorProto::_internal_set_name(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.name_.Set(value, GetArenaForAllocation()); + _impl_.name_.Set(value, GetArena()); } inline std::string* OneofDescriptorProto::_internal_mutable_name() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - return _impl_.name_.Mutable( GetArenaForAllocation()); + return _impl_.name_.Mutable( GetArena()); } inline std::string* OneofDescriptorProto::release_name() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -13698,7 +13698,7 @@ inline std::string* OneofDescriptorProto::release_name() { _impl_._has_bits_[0] &= ~0x00000001u; auto* released = _impl_.name_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.name_.Set("", GetArenaForAllocation()); + _impl_.name_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -13709,10 +13709,10 @@ inline void OneofDescriptorProto::set_allocated_name(std::string* value) { } else { _impl_._has_bits_[0] &= ~0x00000001u; } - _impl_.name_.SetAllocated(value, GetArenaForAllocation()); + _impl_.name_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArenaForAllocation()); + _impl_.name_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.OneofDescriptorProto.name) @@ -13740,7 +13740,7 @@ inline const ::google::protobuf::OneofOptions& OneofDescriptorProto::options() c } inline void OneofDescriptorProto::unsafe_arena_set_allocated_options(::google::protobuf::OneofOptions* value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_); } _impl_.options_ = reinterpret_cast<::google::protobuf::OneofOptions*>(value); @@ -13760,11 +13760,11 @@ inline ::google::protobuf::OneofOptions* OneofDescriptorProto::release_options() #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released); released = ::google::protobuf::internal::DuplicateIfNonNull(released); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete old; } #else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { released = ::google::protobuf::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE @@ -13783,7 +13783,7 @@ inline ::google::protobuf::OneofOptions* OneofDescriptorProto::_internal_mutable PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; if (_impl_.options_ == nullptr) { - auto* p = CreateMaybeMessage<::google::protobuf::OneofOptions>(GetArenaForAllocation()); + auto* p = CreateMaybeMessage<::google::protobuf::OneofOptions>(GetArena()); _impl_.options_ = reinterpret_cast<::google::protobuf::OneofOptions*>(p); } return _impl_.options_; @@ -13794,7 +13794,7 @@ inline ::google::protobuf::OneofOptions* OneofDescriptorProto::mutable_options() return _msg; } inline void OneofDescriptorProto::set_allocated_options(::google::protobuf::OneofOptions* value) { - ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); + ::google::protobuf::Arena* message_arena = GetArena(); PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::OneofOptions*>(_impl_.options_); @@ -13899,7 +13899,7 @@ inline PROTOBUF_ALWAYS_INLINE void EnumDescriptorProto::set_name(Arg_&& arg, Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.name_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.name_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.EnumDescriptorProto.name) } inline std::string* EnumDescriptorProto::mutable_name() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -13914,12 +13914,12 @@ inline const std::string& EnumDescriptorProto::_internal_name() const { inline void EnumDescriptorProto::_internal_set_name(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.name_.Set(value, GetArenaForAllocation()); + _impl_.name_.Set(value, GetArena()); } inline std::string* EnumDescriptorProto::_internal_mutable_name() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - return _impl_.name_.Mutable( GetArenaForAllocation()); + return _impl_.name_.Mutable( GetArena()); } inline std::string* EnumDescriptorProto::release_name() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -13930,7 +13930,7 @@ inline std::string* EnumDescriptorProto::release_name() { _impl_._has_bits_[0] &= ~0x00000001u; auto* released = _impl_.name_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.name_.Set("", GetArenaForAllocation()); + _impl_.name_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -13941,10 +13941,10 @@ inline void EnumDescriptorProto::set_allocated_name(std::string* value) { } else { _impl_._has_bits_[0] &= ~0x00000001u; } - _impl_.name_.SetAllocated(value, GetArenaForAllocation()); + _impl_.name_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArenaForAllocation()); + _impl_.name_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.EnumDescriptorProto.name) @@ -14021,7 +14021,7 @@ inline const ::google::protobuf::EnumOptions& EnumDescriptorProto::options() con } inline void EnumDescriptorProto::unsafe_arena_set_allocated_options(::google::protobuf::EnumOptions* value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_); } _impl_.options_ = reinterpret_cast<::google::protobuf::EnumOptions*>(value); @@ -14041,11 +14041,11 @@ inline ::google::protobuf::EnumOptions* EnumDescriptorProto::release_options() { #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released); released = ::google::protobuf::internal::DuplicateIfNonNull(released); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete old; } #else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { released = ::google::protobuf::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE @@ -14064,7 +14064,7 @@ inline ::google::protobuf::EnumOptions* EnumDescriptorProto::_internal_mutable_o PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; if (_impl_.options_ == nullptr) { - auto* p = CreateMaybeMessage<::google::protobuf::EnumOptions>(GetArenaForAllocation()); + auto* p = CreateMaybeMessage<::google::protobuf::EnumOptions>(GetArena()); _impl_.options_ = reinterpret_cast<::google::protobuf::EnumOptions*>(p); } return _impl_.options_; @@ -14075,7 +14075,7 @@ inline ::google::protobuf::EnumOptions* EnumDescriptorProto::mutable_options() A return _msg; } inline void EnumDescriptorProto::set_allocated_options(::google::protobuf::EnumOptions* value) { - ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); + ::google::protobuf::Arena* message_arena = GetArena(); PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::EnumOptions*>(_impl_.options_); @@ -14270,7 +14270,7 @@ inline PROTOBUF_ALWAYS_INLINE void EnumValueDescriptorProto::set_name(Arg_&& arg Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.name_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.name_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.EnumValueDescriptorProto.name) } inline std::string* EnumValueDescriptorProto::mutable_name() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -14285,12 +14285,12 @@ inline const std::string& EnumValueDescriptorProto::_internal_name() const { inline void EnumValueDescriptorProto::_internal_set_name(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.name_.Set(value, GetArenaForAllocation()); + _impl_.name_.Set(value, GetArena()); } inline std::string* EnumValueDescriptorProto::_internal_mutable_name() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - return _impl_.name_.Mutable( GetArenaForAllocation()); + return _impl_.name_.Mutable( GetArena()); } inline std::string* EnumValueDescriptorProto::release_name() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -14301,7 +14301,7 @@ inline std::string* EnumValueDescriptorProto::release_name() { _impl_._has_bits_[0] &= ~0x00000001u; auto* released = _impl_.name_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.name_.Set("", GetArenaForAllocation()); + _impl_.name_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -14312,10 +14312,10 @@ inline void EnumValueDescriptorProto::set_allocated_name(std::string* value) { } else { _impl_._has_bits_[0] &= ~0x00000001u; } - _impl_.name_.SetAllocated(value, GetArenaForAllocation()); + _impl_.name_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArenaForAllocation()); + _impl_.name_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.EnumValueDescriptorProto.name) @@ -14371,7 +14371,7 @@ inline const ::google::protobuf::EnumValueOptions& EnumValueDescriptorProto::opt } inline void EnumValueDescriptorProto::unsafe_arena_set_allocated_options(::google::protobuf::EnumValueOptions* value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_); } _impl_.options_ = reinterpret_cast<::google::protobuf::EnumValueOptions*>(value); @@ -14391,11 +14391,11 @@ inline ::google::protobuf::EnumValueOptions* EnumValueDescriptorProto::release_o #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released); released = ::google::protobuf::internal::DuplicateIfNonNull(released); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete old; } #else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { released = ::google::protobuf::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE @@ -14414,7 +14414,7 @@ inline ::google::protobuf::EnumValueOptions* EnumValueDescriptorProto::_internal PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; if (_impl_.options_ == nullptr) { - auto* p = CreateMaybeMessage<::google::protobuf::EnumValueOptions>(GetArenaForAllocation()); + auto* p = CreateMaybeMessage<::google::protobuf::EnumValueOptions>(GetArena()); _impl_.options_ = reinterpret_cast<::google::protobuf::EnumValueOptions*>(p); } return _impl_.options_; @@ -14425,7 +14425,7 @@ inline ::google::protobuf::EnumValueOptions* EnumValueDescriptorProto::mutable_o return _msg; } inline void EnumValueDescriptorProto::set_allocated_options(::google::protobuf::EnumValueOptions* value) { - ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); + ::google::protobuf::Arena* message_arena = GetArena(); PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::EnumValueOptions*>(_impl_.options_); @@ -14470,7 +14470,7 @@ inline PROTOBUF_ALWAYS_INLINE void ServiceDescriptorProto::set_name(Arg_&& arg, Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.name_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.name_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.ServiceDescriptorProto.name) } inline std::string* ServiceDescriptorProto::mutable_name() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -14485,12 +14485,12 @@ inline const std::string& ServiceDescriptorProto::_internal_name() const { inline void ServiceDescriptorProto::_internal_set_name(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.name_.Set(value, GetArenaForAllocation()); + _impl_.name_.Set(value, GetArena()); } inline std::string* ServiceDescriptorProto::_internal_mutable_name() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - return _impl_.name_.Mutable( GetArenaForAllocation()); + return _impl_.name_.Mutable( GetArena()); } inline std::string* ServiceDescriptorProto::release_name() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -14501,7 +14501,7 @@ inline std::string* ServiceDescriptorProto::release_name() { _impl_._has_bits_[0] &= ~0x00000001u; auto* released = _impl_.name_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.name_.Set("", GetArenaForAllocation()); + _impl_.name_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -14512,10 +14512,10 @@ inline void ServiceDescriptorProto::set_allocated_name(std::string* value) { } else { _impl_._has_bits_[0] &= ~0x00000001u; } - _impl_.name_.SetAllocated(value, GetArenaForAllocation()); + _impl_.name_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArenaForAllocation()); + _impl_.name_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.ServiceDescriptorProto.name) @@ -14592,7 +14592,7 @@ inline const ::google::protobuf::ServiceOptions& ServiceDescriptorProto::options } inline void ServiceDescriptorProto::unsafe_arena_set_allocated_options(::google::protobuf::ServiceOptions* value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_); } _impl_.options_ = reinterpret_cast<::google::protobuf::ServiceOptions*>(value); @@ -14612,11 +14612,11 @@ inline ::google::protobuf::ServiceOptions* ServiceDescriptorProto::release_optio #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released); released = ::google::protobuf::internal::DuplicateIfNonNull(released); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete old; } #else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { released = ::google::protobuf::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE @@ -14635,7 +14635,7 @@ inline ::google::protobuf::ServiceOptions* ServiceDescriptorProto::_internal_mut PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; if (_impl_.options_ == nullptr) { - auto* p = CreateMaybeMessage<::google::protobuf::ServiceOptions>(GetArenaForAllocation()); + auto* p = CreateMaybeMessage<::google::protobuf::ServiceOptions>(GetArena()); _impl_.options_ = reinterpret_cast<::google::protobuf::ServiceOptions*>(p); } return _impl_.options_; @@ -14646,7 +14646,7 @@ inline ::google::protobuf::ServiceOptions* ServiceDescriptorProto::mutable_optio return _msg; } inline void ServiceDescriptorProto::set_allocated_options(::google::protobuf::ServiceOptions* value) { - ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); + ::google::protobuf::Arena* message_arena = GetArena(); PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::ServiceOptions*>(_impl_.options_); @@ -14691,7 +14691,7 @@ inline PROTOBUF_ALWAYS_INLINE void MethodDescriptorProto::set_name(Arg_&& arg, Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.name_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.name_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.name) } inline std::string* MethodDescriptorProto::mutable_name() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -14706,12 +14706,12 @@ inline const std::string& MethodDescriptorProto::_internal_name() const { inline void MethodDescriptorProto::_internal_set_name(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.name_.Set(value, GetArenaForAllocation()); + _impl_.name_.Set(value, GetArena()); } inline std::string* MethodDescriptorProto::_internal_mutable_name() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - return _impl_.name_.Mutable( GetArenaForAllocation()); + return _impl_.name_.Mutable( GetArena()); } inline std::string* MethodDescriptorProto::release_name() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -14722,7 +14722,7 @@ inline std::string* MethodDescriptorProto::release_name() { _impl_._has_bits_[0] &= ~0x00000001u; auto* released = _impl_.name_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.name_.Set("", GetArenaForAllocation()); + _impl_.name_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -14733,10 +14733,10 @@ inline void MethodDescriptorProto::set_allocated_name(std::string* value) { } else { _impl_._has_bits_[0] &= ~0x00000001u; } - _impl_.name_.SetAllocated(value, GetArenaForAllocation()); + _impl_.name_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArenaForAllocation()); + _impl_.name_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.MethodDescriptorProto.name) @@ -14762,7 +14762,7 @@ inline PROTOBUF_ALWAYS_INLINE void MethodDescriptorProto::set_input_type(Arg_&& Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; - _impl_.input_type_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.input_type_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.input_type) } inline std::string* MethodDescriptorProto::mutable_input_type() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -14777,12 +14777,12 @@ inline const std::string& MethodDescriptorProto::_internal_input_type() const { inline void MethodDescriptorProto::_internal_set_input_type(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; - _impl_.input_type_.Set(value, GetArenaForAllocation()); + _impl_.input_type_.Set(value, GetArena()); } inline std::string* MethodDescriptorProto::_internal_mutable_input_type() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; - return _impl_.input_type_.Mutable( GetArenaForAllocation()); + return _impl_.input_type_.Mutable( GetArena()); } inline std::string* MethodDescriptorProto::release_input_type() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -14793,7 +14793,7 @@ inline std::string* MethodDescriptorProto::release_input_type() { _impl_._has_bits_[0] &= ~0x00000002u; auto* released = _impl_.input_type_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.input_type_.Set("", GetArenaForAllocation()); + _impl_.input_type_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -14804,10 +14804,10 @@ inline void MethodDescriptorProto::set_allocated_input_type(std::string* value) } else { _impl_._has_bits_[0] &= ~0x00000002u; } - _impl_.input_type_.SetAllocated(value, GetArenaForAllocation()); + _impl_.input_type_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.input_type_.IsDefault()) { - _impl_.input_type_.Set("", GetArenaForAllocation()); + _impl_.input_type_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.MethodDescriptorProto.input_type) @@ -14833,7 +14833,7 @@ inline PROTOBUF_ALWAYS_INLINE void MethodDescriptorProto::set_output_type(Arg_&& Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000004u; - _impl_.output_type_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.output_type_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.output_type) } inline std::string* MethodDescriptorProto::mutable_output_type() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -14848,12 +14848,12 @@ inline const std::string& MethodDescriptorProto::_internal_output_type() const { inline void MethodDescriptorProto::_internal_set_output_type(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000004u; - _impl_.output_type_.Set(value, GetArenaForAllocation()); + _impl_.output_type_.Set(value, GetArena()); } inline std::string* MethodDescriptorProto::_internal_mutable_output_type() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000004u; - return _impl_.output_type_.Mutable( GetArenaForAllocation()); + return _impl_.output_type_.Mutable( GetArena()); } inline std::string* MethodDescriptorProto::release_output_type() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -14864,7 +14864,7 @@ inline std::string* MethodDescriptorProto::release_output_type() { _impl_._has_bits_[0] &= ~0x00000004u; auto* released = _impl_.output_type_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.output_type_.Set("", GetArenaForAllocation()); + _impl_.output_type_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -14875,10 +14875,10 @@ inline void MethodDescriptorProto::set_allocated_output_type(std::string* value) } else { _impl_._has_bits_[0] &= ~0x00000004u; } - _impl_.output_type_.SetAllocated(value, GetArenaForAllocation()); + _impl_.output_type_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.output_type_.IsDefault()) { - _impl_.output_type_.Set("", GetArenaForAllocation()); + _impl_.output_type_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.MethodDescriptorProto.output_type) @@ -14906,7 +14906,7 @@ inline const ::google::protobuf::MethodOptions& MethodDescriptorProto::options() } inline void MethodDescriptorProto::unsafe_arena_set_allocated_options(::google::protobuf::MethodOptions* value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_); } _impl_.options_ = reinterpret_cast<::google::protobuf::MethodOptions*>(value); @@ -14926,11 +14926,11 @@ inline ::google::protobuf::MethodOptions* MethodDescriptorProto::release_options #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released); released = ::google::protobuf::internal::DuplicateIfNonNull(released); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete old; } #else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { released = ::google::protobuf::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE @@ -14949,7 +14949,7 @@ inline ::google::protobuf::MethodOptions* MethodDescriptorProto::_internal_mutab PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000008u; if (_impl_.options_ == nullptr) { - auto* p = CreateMaybeMessage<::google::protobuf::MethodOptions>(GetArenaForAllocation()); + auto* p = CreateMaybeMessage<::google::protobuf::MethodOptions>(GetArena()); _impl_.options_ = reinterpret_cast<::google::protobuf::MethodOptions*>(p); } return _impl_.options_; @@ -14960,7 +14960,7 @@ inline ::google::protobuf::MethodOptions* MethodDescriptorProto::mutable_options return _msg; } inline void MethodDescriptorProto::set_allocated_options(::google::protobuf::MethodOptions* value) { - ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); + ::google::protobuf::Arena* message_arena = GetArena(); PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::MethodOptions*>(_impl_.options_); @@ -15061,7 +15061,7 @@ inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_java_package(Arg_&& arg, Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.java_package_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.java_package_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_package) } inline std::string* FileOptions::mutable_java_package() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -15076,12 +15076,12 @@ inline const std::string& FileOptions::_internal_java_package() const { inline void FileOptions::_internal_set_java_package(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.java_package_.Set(value, GetArenaForAllocation()); + _impl_.java_package_.Set(value, GetArena()); } inline std::string* FileOptions::_internal_mutable_java_package() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - return _impl_.java_package_.Mutable( GetArenaForAllocation()); + return _impl_.java_package_.Mutable( GetArena()); } inline std::string* FileOptions::release_java_package() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -15092,7 +15092,7 @@ inline std::string* FileOptions::release_java_package() { _impl_._has_bits_[0] &= ~0x00000001u; auto* released = _impl_.java_package_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.java_package_.Set("", GetArenaForAllocation()); + _impl_.java_package_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -15103,10 +15103,10 @@ inline void FileOptions::set_allocated_java_package(std::string* value) { } else { _impl_._has_bits_[0] &= ~0x00000001u; } - _impl_.java_package_.SetAllocated(value, GetArenaForAllocation()); + _impl_.java_package_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.java_package_.IsDefault()) { - _impl_.java_package_.Set("", GetArenaForAllocation()); + _impl_.java_package_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.java_package) @@ -15132,7 +15132,7 @@ inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_java_outer_classname(Arg_&& Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; - _impl_.java_outer_classname_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.java_outer_classname_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_outer_classname) } inline std::string* FileOptions::mutable_java_outer_classname() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -15147,12 +15147,12 @@ inline const std::string& FileOptions::_internal_java_outer_classname() const { inline void FileOptions::_internal_set_java_outer_classname(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; - _impl_.java_outer_classname_.Set(value, GetArenaForAllocation()); + _impl_.java_outer_classname_.Set(value, GetArena()); } inline std::string* FileOptions::_internal_mutable_java_outer_classname() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; - return _impl_.java_outer_classname_.Mutable( GetArenaForAllocation()); + return _impl_.java_outer_classname_.Mutable( GetArena()); } inline std::string* FileOptions::release_java_outer_classname() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -15163,7 +15163,7 @@ inline std::string* FileOptions::release_java_outer_classname() { _impl_._has_bits_[0] &= ~0x00000002u; auto* released = _impl_.java_outer_classname_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.java_outer_classname_.Set("", GetArenaForAllocation()); + _impl_.java_outer_classname_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -15174,10 +15174,10 @@ inline void FileOptions::set_allocated_java_outer_classname(std::string* value) } else { _impl_._has_bits_[0] &= ~0x00000002u; } - _impl_.java_outer_classname_.SetAllocated(value, GetArenaForAllocation()); + _impl_.java_outer_classname_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.java_outer_classname_.IsDefault()) { - _impl_.java_outer_classname_.Set("", GetArenaForAllocation()); + _impl_.java_outer_classname_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.java_outer_classname) @@ -15316,7 +15316,7 @@ inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_go_package(Arg_&& arg, Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000004u; - _impl_.go_package_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.go_package_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.go_package) } inline std::string* FileOptions::mutable_go_package() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -15331,12 +15331,12 @@ inline const std::string& FileOptions::_internal_go_package() const { inline void FileOptions::_internal_set_go_package(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000004u; - _impl_.go_package_.Set(value, GetArenaForAllocation()); + _impl_.go_package_.Set(value, GetArena()); } inline std::string* FileOptions::_internal_mutable_go_package() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000004u; - return _impl_.go_package_.Mutable( GetArenaForAllocation()); + return _impl_.go_package_.Mutable( GetArena()); } inline std::string* FileOptions::release_go_package() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -15347,7 +15347,7 @@ inline std::string* FileOptions::release_go_package() { _impl_._has_bits_[0] &= ~0x00000004u; auto* released = _impl_.go_package_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.go_package_.Set("", GetArenaForAllocation()); + _impl_.go_package_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -15358,10 +15358,10 @@ inline void FileOptions::set_allocated_go_package(std::string* value) { } else { _impl_._has_bits_[0] &= ~0x00000004u; } - _impl_.go_package_.SetAllocated(value, GetArenaForAllocation()); + _impl_.go_package_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.go_package_.IsDefault()) { - _impl_.go_package_.Set("", GetArenaForAllocation()); + _impl_.go_package_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.go_package) @@ -15555,7 +15555,7 @@ inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_objc_class_prefix(Arg_&& arg Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000008u; - _impl_.objc_class_prefix_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.objc_class_prefix_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.objc_class_prefix) } inline std::string* FileOptions::mutable_objc_class_prefix() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -15570,12 +15570,12 @@ inline const std::string& FileOptions::_internal_objc_class_prefix() const { inline void FileOptions::_internal_set_objc_class_prefix(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000008u; - _impl_.objc_class_prefix_.Set(value, GetArenaForAllocation()); + _impl_.objc_class_prefix_.Set(value, GetArena()); } inline std::string* FileOptions::_internal_mutable_objc_class_prefix() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000008u; - return _impl_.objc_class_prefix_.Mutable( GetArenaForAllocation()); + return _impl_.objc_class_prefix_.Mutable( GetArena()); } inline std::string* FileOptions::release_objc_class_prefix() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -15586,7 +15586,7 @@ inline std::string* FileOptions::release_objc_class_prefix() { _impl_._has_bits_[0] &= ~0x00000008u; auto* released = _impl_.objc_class_prefix_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.objc_class_prefix_.Set("", GetArenaForAllocation()); + _impl_.objc_class_prefix_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -15597,10 +15597,10 @@ inline void FileOptions::set_allocated_objc_class_prefix(std::string* value) { } else { _impl_._has_bits_[0] &= ~0x00000008u; } - _impl_.objc_class_prefix_.SetAllocated(value, GetArenaForAllocation()); + _impl_.objc_class_prefix_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.objc_class_prefix_.IsDefault()) { - _impl_.objc_class_prefix_.Set("", GetArenaForAllocation()); + _impl_.objc_class_prefix_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.objc_class_prefix) @@ -15626,7 +15626,7 @@ inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_csharp_namespace(Arg_&& arg, Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000010u; - _impl_.csharp_namespace_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.csharp_namespace_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.csharp_namespace) } inline std::string* FileOptions::mutable_csharp_namespace() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -15641,12 +15641,12 @@ inline const std::string& FileOptions::_internal_csharp_namespace() const { inline void FileOptions::_internal_set_csharp_namespace(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000010u; - _impl_.csharp_namespace_.Set(value, GetArenaForAllocation()); + _impl_.csharp_namespace_.Set(value, GetArena()); } inline std::string* FileOptions::_internal_mutable_csharp_namespace() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000010u; - return _impl_.csharp_namespace_.Mutable( GetArenaForAllocation()); + return _impl_.csharp_namespace_.Mutable( GetArena()); } inline std::string* FileOptions::release_csharp_namespace() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -15657,7 +15657,7 @@ inline std::string* FileOptions::release_csharp_namespace() { _impl_._has_bits_[0] &= ~0x00000010u; auto* released = _impl_.csharp_namespace_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.csharp_namespace_.Set("", GetArenaForAllocation()); + _impl_.csharp_namespace_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -15668,10 +15668,10 @@ inline void FileOptions::set_allocated_csharp_namespace(std::string* value) { } else { _impl_._has_bits_[0] &= ~0x00000010u; } - _impl_.csharp_namespace_.SetAllocated(value, GetArenaForAllocation()); + _impl_.csharp_namespace_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.csharp_namespace_.IsDefault()) { - _impl_.csharp_namespace_.Set("", GetArenaForAllocation()); + _impl_.csharp_namespace_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.csharp_namespace) @@ -15697,7 +15697,7 @@ inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_swift_prefix(Arg_&& arg, Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000020u; - _impl_.swift_prefix_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.swift_prefix_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.swift_prefix) } inline std::string* FileOptions::mutable_swift_prefix() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -15712,12 +15712,12 @@ inline const std::string& FileOptions::_internal_swift_prefix() const { inline void FileOptions::_internal_set_swift_prefix(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000020u; - _impl_.swift_prefix_.Set(value, GetArenaForAllocation()); + _impl_.swift_prefix_.Set(value, GetArena()); } inline std::string* FileOptions::_internal_mutable_swift_prefix() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000020u; - return _impl_.swift_prefix_.Mutable( GetArenaForAllocation()); + return _impl_.swift_prefix_.Mutable( GetArena()); } inline std::string* FileOptions::release_swift_prefix() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -15728,7 +15728,7 @@ inline std::string* FileOptions::release_swift_prefix() { _impl_._has_bits_[0] &= ~0x00000020u; auto* released = _impl_.swift_prefix_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.swift_prefix_.Set("", GetArenaForAllocation()); + _impl_.swift_prefix_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -15739,10 +15739,10 @@ inline void FileOptions::set_allocated_swift_prefix(std::string* value) { } else { _impl_._has_bits_[0] &= ~0x00000020u; } - _impl_.swift_prefix_.SetAllocated(value, GetArenaForAllocation()); + _impl_.swift_prefix_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.swift_prefix_.IsDefault()) { - _impl_.swift_prefix_.Set("", GetArenaForAllocation()); + _impl_.swift_prefix_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.swift_prefix) @@ -15768,7 +15768,7 @@ inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_php_class_prefix(Arg_&& arg, Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000040u; - _impl_.php_class_prefix_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.php_class_prefix_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.php_class_prefix) } inline std::string* FileOptions::mutable_php_class_prefix() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -15783,12 +15783,12 @@ inline const std::string& FileOptions::_internal_php_class_prefix() const { inline void FileOptions::_internal_set_php_class_prefix(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000040u; - _impl_.php_class_prefix_.Set(value, GetArenaForAllocation()); + _impl_.php_class_prefix_.Set(value, GetArena()); } inline std::string* FileOptions::_internal_mutable_php_class_prefix() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000040u; - return _impl_.php_class_prefix_.Mutable( GetArenaForAllocation()); + return _impl_.php_class_prefix_.Mutable( GetArena()); } inline std::string* FileOptions::release_php_class_prefix() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -15799,7 +15799,7 @@ inline std::string* FileOptions::release_php_class_prefix() { _impl_._has_bits_[0] &= ~0x00000040u; auto* released = _impl_.php_class_prefix_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.php_class_prefix_.Set("", GetArenaForAllocation()); + _impl_.php_class_prefix_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -15810,10 +15810,10 @@ inline void FileOptions::set_allocated_php_class_prefix(std::string* value) { } else { _impl_._has_bits_[0] &= ~0x00000040u; } - _impl_.php_class_prefix_.SetAllocated(value, GetArenaForAllocation()); + _impl_.php_class_prefix_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.php_class_prefix_.IsDefault()) { - _impl_.php_class_prefix_.Set("", GetArenaForAllocation()); + _impl_.php_class_prefix_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.php_class_prefix) @@ -15839,7 +15839,7 @@ inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_php_namespace(Arg_&& arg, Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000080u; - _impl_.php_namespace_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.php_namespace_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.php_namespace) } inline std::string* FileOptions::mutable_php_namespace() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -15854,12 +15854,12 @@ inline const std::string& FileOptions::_internal_php_namespace() const { inline void FileOptions::_internal_set_php_namespace(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000080u; - _impl_.php_namespace_.Set(value, GetArenaForAllocation()); + _impl_.php_namespace_.Set(value, GetArena()); } inline std::string* FileOptions::_internal_mutable_php_namespace() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000080u; - return _impl_.php_namespace_.Mutable( GetArenaForAllocation()); + return _impl_.php_namespace_.Mutable( GetArena()); } inline std::string* FileOptions::release_php_namespace() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -15870,7 +15870,7 @@ inline std::string* FileOptions::release_php_namespace() { _impl_._has_bits_[0] &= ~0x00000080u; auto* released = _impl_.php_namespace_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.php_namespace_.Set("", GetArenaForAllocation()); + _impl_.php_namespace_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -15881,10 +15881,10 @@ inline void FileOptions::set_allocated_php_namespace(std::string* value) { } else { _impl_._has_bits_[0] &= ~0x00000080u; } - _impl_.php_namespace_.SetAllocated(value, GetArenaForAllocation()); + _impl_.php_namespace_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.php_namespace_.IsDefault()) { - _impl_.php_namespace_.Set("", GetArenaForAllocation()); + _impl_.php_namespace_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.php_namespace) @@ -15910,7 +15910,7 @@ inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_php_metadata_namespace(Arg_& Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000100u; - _impl_.php_metadata_namespace_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.php_metadata_namespace_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.php_metadata_namespace) } inline std::string* FileOptions::mutable_php_metadata_namespace() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -15925,12 +15925,12 @@ inline const std::string& FileOptions::_internal_php_metadata_namespace() const inline void FileOptions::_internal_set_php_metadata_namespace(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000100u; - _impl_.php_metadata_namespace_.Set(value, GetArenaForAllocation()); + _impl_.php_metadata_namespace_.Set(value, GetArena()); } inline std::string* FileOptions::_internal_mutable_php_metadata_namespace() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000100u; - return _impl_.php_metadata_namespace_.Mutable( GetArenaForAllocation()); + return _impl_.php_metadata_namespace_.Mutable( GetArena()); } inline std::string* FileOptions::release_php_metadata_namespace() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -15941,7 +15941,7 @@ inline std::string* FileOptions::release_php_metadata_namespace() { _impl_._has_bits_[0] &= ~0x00000100u; auto* released = _impl_.php_metadata_namespace_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.php_metadata_namespace_.Set("", GetArenaForAllocation()); + _impl_.php_metadata_namespace_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -15952,10 +15952,10 @@ inline void FileOptions::set_allocated_php_metadata_namespace(std::string* value } else { _impl_._has_bits_[0] &= ~0x00000100u; } - _impl_.php_metadata_namespace_.SetAllocated(value, GetArenaForAllocation()); + _impl_.php_metadata_namespace_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.php_metadata_namespace_.IsDefault()) { - _impl_.php_metadata_namespace_.Set("", GetArenaForAllocation()); + _impl_.php_metadata_namespace_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.php_metadata_namespace) @@ -15981,7 +15981,7 @@ inline PROTOBUF_ALWAYS_INLINE void FileOptions::set_ruby_package(Arg_&& arg, Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000200u; - _impl_.ruby_package_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.ruby_package_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.ruby_package) } inline std::string* FileOptions::mutable_ruby_package() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -15996,12 +15996,12 @@ inline const std::string& FileOptions::_internal_ruby_package() const { inline void FileOptions::_internal_set_ruby_package(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000200u; - _impl_.ruby_package_.Set(value, GetArenaForAllocation()); + _impl_.ruby_package_.Set(value, GetArena()); } inline std::string* FileOptions::_internal_mutable_ruby_package() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000200u; - return _impl_.ruby_package_.Mutable( GetArenaForAllocation()); + return _impl_.ruby_package_.Mutable( GetArena()); } inline std::string* FileOptions::release_ruby_package() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -16012,7 +16012,7 @@ inline std::string* FileOptions::release_ruby_package() { _impl_._has_bits_[0] &= ~0x00000200u; auto* released = _impl_.ruby_package_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.ruby_package_.Set("", GetArenaForAllocation()); + _impl_.ruby_package_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -16023,10 +16023,10 @@ inline void FileOptions::set_allocated_ruby_package(std::string* value) { } else { _impl_._has_bits_[0] &= ~0x00000200u; } - _impl_.ruby_package_.SetAllocated(value, GetArenaForAllocation()); + _impl_.ruby_package_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.ruby_package_.IsDefault()) { - _impl_.ruby_package_.Set("", GetArenaForAllocation()); + _impl_.ruby_package_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.ruby_package) @@ -16054,7 +16054,7 @@ inline const ::google::protobuf::FeatureSet& FileOptions::features() const ABSL_ } inline void FileOptions::unsafe_arena_set_allocated_features(::google::protobuf::FeatureSet* value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.features_); } _impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(value); @@ -16074,11 +16074,11 @@ inline ::google::protobuf::FeatureSet* FileOptions::release_features() { #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released); released = ::google::protobuf::internal::DuplicateIfNonNull(released); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete old; } #else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { released = ::google::protobuf::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE @@ -16097,7 +16097,7 @@ inline ::google::protobuf::FeatureSet* FileOptions::_internal_mutable_features() PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000400u; if (_impl_.features_ == nullptr) { - auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArenaForAllocation()); + auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArena()); _impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(p); } return _impl_.features_; @@ -16108,7 +16108,7 @@ inline ::google::protobuf::FeatureSet* FileOptions::mutable_features() ABSL_ATTR return _msg; } inline void FileOptions::set_allocated_features(::google::protobuf::FeatureSet* value) { - ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); + ::google::protobuf::Arena* message_arena = GetArena(); PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::FeatureSet*>(_impl_.features_); @@ -16344,7 +16344,7 @@ inline const ::google::protobuf::FeatureSet& MessageOptions::features() const AB } inline void MessageOptions::unsafe_arena_set_allocated_features(::google::protobuf::FeatureSet* value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.features_); } _impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(value); @@ -16364,11 +16364,11 @@ inline ::google::protobuf::FeatureSet* MessageOptions::release_features() { #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released); released = ::google::protobuf::internal::DuplicateIfNonNull(released); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete old; } #else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { released = ::google::protobuf::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE @@ -16387,7 +16387,7 @@ inline ::google::protobuf::FeatureSet* MessageOptions::_internal_mutable_feature PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; if (_impl_.features_ == nullptr) { - auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArenaForAllocation()); + auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArena()); _impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(p); } return _impl_.features_; @@ -16398,7 +16398,7 @@ inline ::google::protobuf::FeatureSet* MessageOptions::mutable_features() ABSL_A return _msg; } inline void MessageOptions::set_allocated_features(::google::protobuf::FeatureSet* value) { - ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); + ::google::protobuf::Arena* message_arena = GetArena(); PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::FeatureSet*>(_impl_.features_); @@ -16521,7 +16521,7 @@ inline PROTOBUF_ALWAYS_INLINE void FieldOptions_EditionDefault::set_value(Arg_&& Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.value_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.value_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.EditionDefault.value) } inline std::string* FieldOptions_EditionDefault::mutable_value() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -16536,12 +16536,12 @@ inline const std::string& FieldOptions_EditionDefault::_internal_value() const { inline void FieldOptions_EditionDefault::_internal_set_value(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.value_.Set(value, GetArenaForAllocation()); + _impl_.value_.Set(value, GetArena()); } inline std::string* FieldOptions_EditionDefault::_internal_mutable_value() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - return _impl_.value_.Mutable( GetArenaForAllocation()); + return _impl_.value_.Mutable( GetArena()); } inline std::string* FieldOptions_EditionDefault::release_value() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -16552,7 +16552,7 @@ inline std::string* FieldOptions_EditionDefault::release_value() { _impl_._has_bits_[0] &= ~0x00000001u; auto* released = _impl_.value_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.value_.Set("", GetArenaForAllocation()); + _impl_.value_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -16563,10 +16563,10 @@ inline void FieldOptions_EditionDefault::set_allocated_value(std::string* value) } else { _impl_._has_bits_[0] &= ~0x00000001u; } - _impl_.value_.SetAllocated(value, GetArenaForAllocation()); + _impl_.value_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.value_.IsDefault()) { - _impl_.value_.Set("", GetArenaForAllocation()); + _impl_.value_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.FieldOptions.EditionDefault.value) @@ -16948,7 +16948,7 @@ inline const ::google::protobuf::FeatureSet& FieldOptions::features() const ABSL } inline void FieldOptions::unsafe_arena_set_allocated_features(::google::protobuf::FeatureSet* value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.features_); } _impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(value); @@ -16968,11 +16968,11 @@ inline ::google::protobuf::FeatureSet* FieldOptions::release_features() { #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released); released = ::google::protobuf::internal::DuplicateIfNonNull(released); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete old; } #else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { released = ::google::protobuf::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE @@ -16991,7 +16991,7 @@ inline ::google::protobuf::FeatureSet* FieldOptions::_internal_mutable_features( PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; if (_impl_.features_ == nullptr) { - auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArenaForAllocation()); + auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArena()); _impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(p); } return _impl_.features_; @@ -17002,7 +17002,7 @@ inline ::google::protobuf::FeatureSet* FieldOptions::mutable_features() ABSL_ATT return _msg; } inline void FieldOptions::set_allocated_features(::google::protobuf::FeatureSet* value) { - ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); + ::google::protobuf::Arena* message_arena = GetArena(); PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::FeatureSet*>(_impl_.features_); @@ -17098,7 +17098,7 @@ inline const ::google::protobuf::FeatureSet& OneofOptions::features() const ABSL } inline void OneofOptions::unsafe_arena_set_allocated_features(::google::protobuf::FeatureSet* value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.features_); } _impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(value); @@ -17118,11 +17118,11 @@ inline ::google::protobuf::FeatureSet* OneofOptions::release_features() { #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released); released = ::google::protobuf::internal::DuplicateIfNonNull(released); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete old; } #else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { released = ::google::protobuf::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE @@ -17141,7 +17141,7 @@ inline ::google::protobuf::FeatureSet* OneofOptions::_internal_mutable_features( PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; if (_impl_.features_ == nullptr) { - auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArenaForAllocation()); + auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArena()); _impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(p); } return _impl_.features_; @@ -17152,7 +17152,7 @@ inline ::google::protobuf::FeatureSet* OneofOptions::mutable_features() ABSL_ATT return _msg; } inline void OneofOptions::set_allocated_features(::google::protobuf::FeatureSet* value) { - ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); + ::google::protobuf::Arena* message_arena = GetArena(); PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::FeatureSet*>(_impl_.features_); @@ -17332,7 +17332,7 @@ inline const ::google::protobuf::FeatureSet& EnumOptions::features() const ABSL_ } inline void EnumOptions::unsafe_arena_set_allocated_features(::google::protobuf::FeatureSet* value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.features_); } _impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(value); @@ -17352,11 +17352,11 @@ inline ::google::protobuf::FeatureSet* EnumOptions::release_features() { #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released); released = ::google::protobuf::internal::DuplicateIfNonNull(released); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete old; } #else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { released = ::google::protobuf::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE @@ -17375,7 +17375,7 @@ inline ::google::protobuf::FeatureSet* EnumOptions::_internal_mutable_features() PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; if (_impl_.features_ == nullptr) { - auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArenaForAllocation()); + auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArena()); _impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(p); } return _impl_.features_; @@ -17386,7 +17386,7 @@ inline ::google::protobuf::FeatureSet* EnumOptions::mutable_features() ABSL_ATTR return _msg; } inline void EnumOptions::set_allocated_features(::google::protobuf::FeatureSet* value) { - ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); + ::google::protobuf::Arena* message_arena = GetArena(); PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::FeatureSet*>(_impl_.features_); @@ -17510,7 +17510,7 @@ inline const ::google::protobuf::FeatureSet& EnumValueOptions::features() const } inline void EnumValueOptions::unsafe_arena_set_allocated_features(::google::protobuf::FeatureSet* value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.features_); } _impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(value); @@ -17530,11 +17530,11 @@ inline ::google::protobuf::FeatureSet* EnumValueOptions::release_features() { #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released); released = ::google::protobuf::internal::DuplicateIfNonNull(released); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete old; } #else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { released = ::google::protobuf::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE @@ -17553,7 +17553,7 @@ inline ::google::protobuf::FeatureSet* EnumValueOptions::_internal_mutable_featu PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; if (_impl_.features_ == nullptr) { - auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArenaForAllocation()); + auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArena()); _impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(p); } return _impl_.features_; @@ -17564,7 +17564,7 @@ inline ::google::protobuf::FeatureSet* EnumValueOptions::mutable_features() ABSL return _msg; } inline void EnumValueOptions::set_allocated_features(::google::protobuf::FeatureSet* value) { - ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); + ::google::protobuf::Arena* message_arena = GetArena(); PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::FeatureSet*>(_impl_.features_); @@ -17688,7 +17688,7 @@ inline const ::google::protobuf::FeatureSet& ServiceOptions::features() const AB } inline void ServiceOptions::unsafe_arena_set_allocated_features(::google::protobuf::FeatureSet* value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.features_); } _impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(value); @@ -17708,11 +17708,11 @@ inline ::google::protobuf::FeatureSet* ServiceOptions::release_features() { #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released); released = ::google::protobuf::internal::DuplicateIfNonNull(released); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete old; } #else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { released = ::google::protobuf::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE @@ -17731,7 +17731,7 @@ inline ::google::protobuf::FeatureSet* ServiceOptions::_internal_mutable_feature PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; if (_impl_.features_ == nullptr) { - auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArenaForAllocation()); + auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArena()); _impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(p); } return _impl_.features_; @@ -17742,7 +17742,7 @@ inline ::google::protobuf::FeatureSet* ServiceOptions::mutable_features() ABSL_A return _msg; } inline void ServiceOptions::set_allocated_features(::google::protobuf::FeatureSet* value) { - ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); + ::google::protobuf::Arena* message_arena = GetArena(); PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::FeatureSet*>(_impl_.features_); @@ -17923,7 +17923,7 @@ inline const ::google::protobuf::FeatureSet& MethodOptions::features() const ABS } inline void MethodOptions::unsafe_arena_set_allocated_features(::google::protobuf::FeatureSet* value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.features_); } _impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(value); @@ -17943,11 +17943,11 @@ inline ::google::protobuf::FeatureSet* MethodOptions::release_features() { #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released); released = ::google::protobuf::internal::DuplicateIfNonNull(released); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete old; } #else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { released = ::google::protobuf::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE @@ -17966,7 +17966,7 @@ inline ::google::protobuf::FeatureSet* MethodOptions::_internal_mutable_features PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; if (_impl_.features_ == nullptr) { - auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArenaForAllocation()); + auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArena()); _impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(p); } return _impl_.features_; @@ -17977,7 +17977,7 @@ inline ::google::protobuf::FeatureSet* MethodOptions::mutable_features() ABSL_AT return _msg; } inline void MethodOptions::set_allocated_features(::google::protobuf::FeatureSet* value) { - ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); + ::google::protobuf::Arena* message_arena = GetArena(); PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::FeatureSet*>(_impl_.features_); @@ -18071,7 +18071,7 @@ inline PROTOBUF_ALWAYS_INLINE void UninterpretedOption_NamePart::set_name_part(A Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.name_part_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.name_part_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.NamePart.name_part) } inline std::string* UninterpretedOption_NamePart::mutable_name_part() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -18086,12 +18086,12 @@ inline const std::string& UninterpretedOption_NamePart::_internal_name_part() co inline void UninterpretedOption_NamePart::_internal_set_name_part(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.name_part_.Set(value, GetArenaForAllocation()); + _impl_.name_part_.Set(value, GetArena()); } inline std::string* UninterpretedOption_NamePart::_internal_mutable_name_part() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - return _impl_.name_part_.Mutable( GetArenaForAllocation()); + return _impl_.name_part_.Mutable( GetArena()); } inline std::string* UninterpretedOption_NamePart::release_name_part() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -18102,7 +18102,7 @@ inline std::string* UninterpretedOption_NamePart::release_name_part() { _impl_._has_bits_[0] &= ~0x00000001u; auto* released = _impl_.name_part_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.name_part_.Set("", GetArenaForAllocation()); + _impl_.name_part_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -18113,10 +18113,10 @@ inline void UninterpretedOption_NamePart::set_allocated_name_part(std::string* v } else { _impl_._has_bits_[0] &= ~0x00000001u; } - _impl_.name_part_.SetAllocated(value, GetArenaForAllocation()); + _impl_.name_part_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.name_part_.IsDefault()) { - _impl_.name_part_.Set("", GetArenaForAllocation()); + _impl_.name_part_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.NamePart.name_part) @@ -18223,7 +18223,7 @@ inline PROTOBUF_ALWAYS_INLINE void UninterpretedOption::set_identifier_value(Arg Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.identifier_value_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.identifier_value_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.identifier_value) } inline std::string* UninterpretedOption::mutable_identifier_value() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -18238,12 +18238,12 @@ inline const std::string& UninterpretedOption::_internal_identifier_value() cons inline void UninterpretedOption::_internal_set_identifier_value(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.identifier_value_.Set(value, GetArenaForAllocation()); + _impl_.identifier_value_.Set(value, GetArena()); } inline std::string* UninterpretedOption::_internal_mutable_identifier_value() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - return _impl_.identifier_value_.Mutable( GetArenaForAllocation()); + return _impl_.identifier_value_.Mutable( GetArena()); } inline std::string* UninterpretedOption::release_identifier_value() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -18254,7 +18254,7 @@ inline std::string* UninterpretedOption::release_identifier_value() { _impl_._has_bits_[0] &= ~0x00000001u; auto* released = _impl_.identifier_value_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.identifier_value_.Set("", GetArenaForAllocation()); + _impl_.identifier_value_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -18265,10 +18265,10 @@ inline void UninterpretedOption::set_allocated_identifier_value(std::string* val } else { _impl_._has_bits_[0] &= ~0x00000001u; } - _impl_.identifier_value_.SetAllocated(value, GetArenaForAllocation()); + _impl_.identifier_value_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.identifier_value_.IsDefault()) { - _impl_.identifier_value_.Set("", GetArenaForAllocation()); + _impl_.identifier_value_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.identifier_value) @@ -18378,7 +18378,7 @@ inline PROTOBUF_ALWAYS_INLINE void UninterpretedOption::set_string_value(Arg_&& Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; - _impl_.string_value_.SetBytes(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.string_value_.SetBytes(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.string_value) } inline std::string* UninterpretedOption::mutable_string_value() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -18393,12 +18393,12 @@ inline const std::string& UninterpretedOption::_internal_string_value() const { inline void UninterpretedOption::_internal_set_string_value(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; - _impl_.string_value_.Set(value, GetArenaForAllocation()); + _impl_.string_value_.Set(value, GetArena()); } inline std::string* UninterpretedOption::_internal_mutable_string_value() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; - return _impl_.string_value_.Mutable( GetArenaForAllocation()); + return _impl_.string_value_.Mutable( GetArena()); } inline std::string* UninterpretedOption::release_string_value() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -18409,7 +18409,7 @@ inline std::string* UninterpretedOption::release_string_value() { _impl_._has_bits_[0] &= ~0x00000002u; auto* released = _impl_.string_value_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.string_value_.Set("", GetArenaForAllocation()); + _impl_.string_value_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -18420,10 +18420,10 @@ inline void UninterpretedOption::set_allocated_string_value(std::string* value) } else { _impl_._has_bits_[0] &= ~0x00000002u; } - _impl_.string_value_.SetAllocated(value, GetArenaForAllocation()); + _impl_.string_value_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.string_value_.IsDefault()) { - _impl_.string_value_.Set("", GetArenaForAllocation()); + _impl_.string_value_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.string_value) @@ -18449,7 +18449,7 @@ inline PROTOBUF_ALWAYS_INLINE void UninterpretedOption::set_aggregate_value(Arg_ Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000004u; - _impl_.aggregate_value_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.aggregate_value_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.aggregate_value) } inline std::string* UninterpretedOption::mutable_aggregate_value() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -18464,12 +18464,12 @@ inline const std::string& UninterpretedOption::_internal_aggregate_value() const inline void UninterpretedOption::_internal_set_aggregate_value(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000004u; - _impl_.aggregate_value_.Set(value, GetArenaForAllocation()); + _impl_.aggregate_value_.Set(value, GetArena()); } inline std::string* UninterpretedOption::_internal_mutable_aggregate_value() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000004u; - return _impl_.aggregate_value_.Mutable( GetArenaForAllocation()); + return _impl_.aggregate_value_.Mutable( GetArena()); } inline std::string* UninterpretedOption::release_aggregate_value() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -18480,7 +18480,7 @@ inline std::string* UninterpretedOption::release_aggregate_value() { _impl_._has_bits_[0] &= ~0x00000004u; auto* released = _impl_.aggregate_value_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.aggregate_value_.Set("", GetArenaForAllocation()); + _impl_.aggregate_value_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -18491,10 +18491,10 @@ inline void UninterpretedOption::set_allocated_aggregate_value(std::string* valu } else { _impl_._has_bits_[0] &= ~0x00000004u; } - _impl_.aggregate_value_.SetAllocated(value, GetArenaForAllocation()); + _impl_.aggregate_value_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.aggregate_value_.IsDefault()) { - _impl_.aggregate_value_.Set("", GetArenaForAllocation()); + _impl_.aggregate_value_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.aggregate_value) @@ -18733,7 +18733,7 @@ inline const ::google::protobuf::FeatureSet& FeatureSetDefaults_FeatureSetEditio } inline void FeatureSetDefaults_FeatureSetEditionDefault::unsafe_arena_set_allocated_features(::google::protobuf::FeatureSet* value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.features_); } _impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(value); @@ -18753,11 +18753,11 @@ inline ::google::protobuf::FeatureSet* FeatureSetDefaults_FeatureSetEditionDefau #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released); released = ::google::protobuf::internal::DuplicateIfNonNull(released); - if (GetArenaForAllocation() == nullptr) { + if (GetArena() == nullptr) { delete old; } #else // PROTOBUF_FORCE_COPY_IN_RELEASE - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { released = ::google::protobuf::internal::DuplicateIfNonNull(released); } #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE @@ -18776,7 +18776,7 @@ inline ::google::protobuf::FeatureSet* FeatureSetDefaults_FeatureSetEditionDefau PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; if (_impl_.features_ == nullptr) { - auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArenaForAllocation()); + auto* p = CreateMaybeMessage<::google::protobuf::FeatureSet>(GetArena()); _impl_.features_ = reinterpret_cast<::google::protobuf::FeatureSet*>(p); } return _impl_.features_; @@ -18787,7 +18787,7 @@ inline ::google::protobuf::FeatureSet* FeatureSetDefaults_FeatureSetEditionDefau return _msg; } inline void FeatureSetDefaults_FeatureSetEditionDefault::set_allocated_features(::google::protobuf::FeatureSet* value) { - ::google::protobuf::Arena* message_arena = GetArenaForAllocation(); + ::google::protobuf::Arena* message_arena = GetArena(); PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); if (message_arena == nullptr) { delete reinterpret_cast<::google::protobuf::FeatureSet*>(_impl_.features_); @@ -19033,7 +19033,7 @@ inline PROTOBUF_ALWAYS_INLINE void SourceCodeInfo_Location::set_leading_comments Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.leading_comments_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.leading_comments_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.leading_comments) } inline std::string* SourceCodeInfo_Location::mutable_leading_comments() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -19048,12 +19048,12 @@ inline const std::string& SourceCodeInfo_Location::_internal_leading_comments() inline void SourceCodeInfo_Location::_internal_set_leading_comments(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.leading_comments_.Set(value, GetArenaForAllocation()); + _impl_.leading_comments_.Set(value, GetArena()); } inline std::string* SourceCodeInfo_Location::_internal_mutable_leading_comments() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - return _impl_.leading_comments_.Mutable( GetArenaForAllocation()); + return _impl_.leading_comments_.Mutable( GetArena()); } inline std::string* SourceCodeInfo_Location::release_leading_comments() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -19064,7 +19064,7 @@ inline std::string* SourceCodeInfo_Location::release_leading_comments() { _impl_._has_bits_[0] &= ~0x00000001u; auto* released = _impl_.leading_comments_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.leading_comments_.Set("", GetArenaForAllocation()); + _impl_.leading_comments_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -19075,10 +19075,10 @@ inline void SourceCodeInfo_Location::set_allocated_leading_comments(std::string* } else { _impl_._has_bits_[0] &= ~0x00000001u; } - _impl_.leading_comments_.SetAllocated(value, GetArenaForAllocation()); + _impl_.leading_comments_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.leading_comments_.IsDefault()) { - _impl_.leading_comments_.Set("", GetArenaForAllocation()); + _impl_.leading_comments_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.SourceCodeInfo.Location.leading_comments) @@ -19104,7 +19104,7 @@ inline PROTOBUF_ALWAYS_INLINE void SourceCodeInfo_Location::set_trailing_comment Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; - _impl_.trailing_comments_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.trailing_comments_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.trailing_comments) } inline std::string* SourceCodeInfo_Location::mutable_trailing_comments() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -19119,12 +19119,12 @@ inline const std::string& SourceCodeInfo_Location::_internal_trailing_comments() inline void SourceCodeInfo_Location::_internal_set_trailing_comments(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; - _impl_.trailing_comments_.Set(value, GetArenaForAllocation()); + _impl_.trailing_comments_.Set(value, GetArena()); } inline std::string* SourceCodeInfo_Location::_internal_mutable_trailing_comments() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000002u; - return _impl_.trailing_comments_.Mutable( GetArenaForAllocation()); + return _impl_.trailing_comments_.Mutable( GetArena()); } inline std::string* SourceCodeInfo_Location::release_trailing_comments() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -19135,7 +19135,7 @@ inline std::string* SourceCodeInfo_Location::release_trailing_comments() { _impl_._has_bits_[0] &= ~0x00000002u; auto* released = _impl_.trailing_comments_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.trailing_comments_.Set("", GetArenaForAllocation()); + _impl_.trailing_comments_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -19146,10 +19146,10 @@ inline void SourceCodeInfo_Location::set_allocated_trailing_comments(std::string } else { _impl_._has_bits_[0] &= ~0x00000002u; } - _impl_.trailing_comments_.SetAllocated(value, GetArenaForAllocation()); + _impl_.trailing_comments_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.trailing_comments_.IsDefault()) { - _impl_.trailing_comments_.Set("", GetArenaForAllocation()); + _impl_.trailing_comments_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.SourceCodeInfo.Location.trailing_comments) @@ -19378,7 +19378,7 @@ inline PROTOBUF_ALWAYS_INLINE void GeneratedCodeInfo_Annotation::set_source_file Args_... args) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.source_file_.Set(static_cast(arg), args..., GetArenaForAllocation()); + _impl_.source_file_.Set(static_cast(arg), args..., GetArena()); // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.source_file) } inline std::string* GeneratedCodeInfo_Annotation::mutable_source_file() ABSL_ATTRIBUTE_LIFETIME_BOUND { @@ -19393,12 +19393,12 @@ inline const std::string& GeneratedCodeInfo_Annotation::_internal_source_file() inline void GeneratedCodeInfo_Annotation::_internal_set_source_file(const std::string& value) { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - _impl_.source_file_.Set(value, GetArenaForAllocation()); + _impl_.source_file_.Set(value, GetArena()); } inline std::string* GeneratedCodeInfo_Annotation::_internal_mutable_source_file() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); _impl_._has_bits_[0] |= 0x00000001u; - return _impl_.source_file_.Mutable( GetArenaForAllocation()); + return _impl_.source_file_.Mutable( GetArena()); } inline std::string* GeneratedCodeInfo_Annotation::release_source_file() { PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race); @@ -19409,7 +19409,7 @@ inline std::string* GeneratedCodeInfo_Annotation::release_source_file() { _impl_._has_bits_[0] &= ~0x00000001u; auto* released = _impl_.source_file_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.source_file_.Set("", GetArenaForAllocation()); + _impl_.source_file_.Set("", GetArena()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return released; } @@ -19420,10 +19420,10 @@ inline void GeneratedCodeInfo_Annotation::set_allocated_source_file(std::string* } else { _impl_._has_bits_[0] &= ~0x00000001u; } - _impl_.source_file_.SetAllocated(value, GetArenaForAllocation()); + _impl_.source_file_.SetAllocated(value, GetArena()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING if (_impl_.source_file_.IsDefault()) { - _impl_.source_file_.Set("", GetArenaForAllocation()); + _impl_.source_file_.Set("", GetArena()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING // @@protoc_insertion_point(field_set_allocated:google.protobuf.GeneratedCodeInfo.Annotation.source_file) diff --git a/src/google/protobuf/dynamic_message.cc b/src/google/protobuf/dynamic_message.cc index a962814341..64427553cc 100644 --- a/src/google/protobuf/dynamic_message.cc +++ b/src/google/protobuf/dynamic_message.cc @@ -354,7 +354,7 @@ void DynamicMessage::SharedCtor(bool lock_factory) { } if (type_info_->extensions_offset != -1) { - new (MutableExtensionsRaw()) ExtensionSet(GetArenaForAllocation()); + new (MutableExtensionsRaw()) ExtensionSet(GetArena()); } for (int i = 0; i < descriptor->field_count(); i++) { const FieldDescriptor* field = descriptor->field(i); @@ -363,13 +363,13 @@ void DynamicMessage::SharedCtor(bool lock_factory) { continue; } switch (field->cpp_type()) { -#define HANDLE_TYPE(CPPTYPE, TYPE) \ - case FieldDescriptor::CPPTYPE_##CPPTYPE: \ - if (!field->is_repeated()) { \ - new (field_ptr) TYPE(field->default_value_##TYPE()); \ - } else { \ - new (field_ptr) RepeatedField(GetArenaForAllocation()); \ - } \ +#define HANDLE_TYPE(CPPTYPE, TYPE) \ + case FieldDescriptor::CPPTYPE_##CPPTYPE: \ + if (!field->is_repeated()) { \ + new (field_ptr) TYPE(field->default_value_##TYPE()); \ + } else { \ + new (field_ptr) RepeatedField(GetArena()); \ + } \ break; HANDLE_TYPE(INT32, int32_t); @@ -385,7 +385,7 @@ void DynamicMessage::SharedCtor(bool lock_factory) { if (!field->is_repeated()) { new (field_ptr) int{field->default_value_enum()->number()}; } else { - new (field_ptr) RepeatedField(GetArenaForAllocation()); + new (field_ptr) RepeatedField(GetArena()); } break; @@ -397,8 +397,7 @@ void DynamicMessage::SharedCtor(bool lock_factory) { ArenaStringPtr* asp = new (field_ptr) ArenaStringPtr(); asp->InitDefault(); } else { - new (field_ptr) - RepeatedPtrField(GetArenaForAllocation()); + new (field_ptr) RepeatedPtrField(GetArena()); } break; } @@ -413,20 +412,20 @@ void DynamicMessage::SharedCtor(bool lock_factory) { // when the constructor is called inside GetPrototype(), in which // case we have already locked the factory. if (lock_factory) { - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { new (field_ptr) DynamicMapField( type_info_->factory->GetPrototype(field->message_type()), - GetArenaForAllocation()); + GetArena()); } else { new (field_ptr) DynamicMapField( type_info_->factory->GetPrototype(field->message_type())); } } else { - if (GetArenaForAllocation() != nullptr) { + if (GetArena() != nullptr) { new (field_ptr) DynamicMapField(type_info_->factory->GetPrototypeNoLock( field->message_type()), - GetArenaForAllocation()); + GetArena()); } else { new (field_ptr) DynamicMapField(type_info_->factory->GetPrototypeNoLock( @@ -434,7 +433,7 @@ void DynamicMessage::SharedCtor(bool lock_factory) { } } } else { - new (field_ptr) RepeatedPtrField(GetArenaForAllocation()); + new (field_ptr) RepeatedPtrField(GetArena()); } } break; diff --git a/src/google/protobuf/generated_message_reflection.cc b/src/google/protobuf/generated_message_reflection.cc index 16b96c109f..1e9be1ee22 100644 --- a/src/google/protobuf/generated_message_reflection.cc +++ b/src/google/protobuf/generated_message_reflection.cc @@ -627,8 +627,8 @@ void SwapFieldHelper::SwapInlinedStrings(const Reflection* r, Message* lhs, Message* rhs, const FieldDescriptor* field) { // Inlined string field. - Arena* lhs_arena = lhs->GetArenaForAllocation(); - Arena* rhs_arena = rhs->GetArenaForAllocation(); + Arena* lhs_arena = lhs->GetArena(); + Arena* rhs_arena = rhs->GetArena(); auto* lhs_string = r->MutableRaw(lhs, field); auto* rhs_string = r->MutableRaw(rhs, field); uint32_t index = r->schema_.InlinedStringIndex(field); @@ -664,9 +664,8 @@ void SwapFieldHelper::SwapNonInlinedStrings(const Reflection* r, Message* lhs, if (unsafe_shallow_swap) { ArenaStringPtr::UnsafeShallowSwap(lhs_string, rhs_string); } else { - SwapFieldHelper::SwapArenaStringPtr( - lhs_string, lhs->GetArenaForAllocation(), // - rhs_string, rhs->GetArenaForAllocation()); + SwapFieldHelper::SwapArenaStringPtr(lhs_string, lhs->GetArena(), // + rhs_string, rhs->GetArena()); } } @@ -749,8 +748,7 @@ void SwapFieldHelper::SwapMessageField(const Reflection* r, Message* lhs, std::swap(*r->MutableRaw(lhs, field), *r->MutableRaw(rhs, field)); } else { - SwapMessage(r, lhs, lhs->GetArenaForAllocation(), rhs, - rhs->GetArenaForAllocation(), field); + SwapMessage(r, lhs, lhs->GetArena(), rhs, rhs->GetArena(), field); } } @@ -1155,8 +1153,7 @@ void Reflection::SwapFieldsImpl( if (field->options().ctype() == FieldOptions::STRING && IsInlined(field)) { ABSL_DCHECK(!unsafe_shallow_swap || - message1->GetArenaForAllocation() == - message2->GetArenaForAllocation()); + message1->GetArena() == message2->GetArena()); SwapInlinedStringDonated(message1, message2, field); } } @@ -1174,8 +1171,7 @@ void Reflection::SwapFields( void Reflection::UnsafeShallowSwapFields( Message* message1, Message* message2, const std::vector& fields) const { - ABSL_DCHECK_EQ(message1->GetArenaForAllocation(), - message2->GetArenaForAllocation()); + ABSL_DCHECK_EQ(message1->GetArena(), message2->GetArena()); SwapFieldsImpl(message1, message2, fields); } @@ -1183,7 +1179,7 @@ void Reflection::UnsafeShallowSwapFields( void Reflection::UnsafeArenaSwapFields( Message* lhs, Message* rhs, const std::vector& fields) const { - ABSL_DCHECK_EQ(lhs->GetArenaForAllocation(), rhs->GetArenaForAllocation()); + ABSL_DCHECK_EQ(lhs->GetArena(), rhs->GetArena()); UnsafeShallowSwapFields(lhs, rhs, fields); } @@ -1400,7 +1396,7 @@ void Reflection::ClearField(Message* message, if (schema_.HasBitIndex(field) == static_cast(-1)) { // Proto3 does not have has-bits and we need to set a message field // to nullptr in order to indicate its un-presence. - if (message->GetArenaForAllocation() == nullptr) { + if (message->GetArena() == nullptr) { delete *MutableRaw(message, field); } *MutableRaw(message, field) = nullptr; @@ -1520,7 +1516,7 @@ Message* Reflection::ReleaseLast(Message* message, } } #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE - return MaybeForceCopy(message->GetArenaForAllocation(), released); + return MaybeForceCopy(message->GetArena(), released); #else // PROTOBUF_FORCE_COPY_IN_RELEASE return released; #endif // !PROTOBUF_FORCE_COPY_IN_RELEASE @@ -1878,7 +1874,7 @@ void Reflection::SetString(Message* message, const FieldDescriptor* field, if (!HasOneofField(*message, field)) { ClearOneof(message, field->containing_oneof()); *MutableField(message, field) = - Arena::Create(message->GetArenaForAllocation()); + Arena::Create(message->GetArena()); } *(*MutableField(message, field)) = value; break; @@ -1894,7 +1890,7 @@ void Reflection::SetString(Message* message, const FieldDescriptor* field, &MutableInlinedStringDonatedArray(message)[index / 32]; uint32_t mask = ~(static_cast(1) << (index % 32)); MutableField(message, field) - ->Set(value, message->GetArenaForAllocation(), + ->Set(value, message->GetArena(), IsInlinedStringDonated(*message, field), states, mask, message); break; @@ -1909,7 +1905,7 @@ void Reflection::SetString(Message* message, const FieldDescriptor* field, MutableField(message, field)->InitDefault(); } MutableField(message, field) - ->Set(std::move(value), message->GetArenaForAllocation()); + ->Set(std::move(value), message->GetArena()); break; } } @@ -1930,7 +1926,7 @@ void Reflection::SetString(Message* message, const FieldDescriptor* field, if (!HasOneofField(*message, field)) { ClearOneof(message, field->containing_oneof()); *MutableField(message, field) = - Arena::Create(message->GetArenaForAllocation()); + Arena::Create(message->GetArena()); } *(*MutableField(message, field)) = value; } else { @@ -1954,12 +1950,12 @@ void Reflection::SetString(Message* message, const FieldDescriptor* field, uint32_t* states = &MutableInlinedStringDonatedArray(message)[index / 32]; uint32_t mask = ~(static_cast(1) << (index % 32)); - str->Set(std::string(value), message->GetArenaForAllocation(), + str->Set(std::string(value), message->GetArena(), IsInlinedStringDonated(*message, field), states, mask, message); } else { auto* str = MutableField(message, field); - str->Set(std::string(value), message->GetArenaForAllocation()); + str->Set(std::string(value), message->GetArena()); } break; } @@ -2264,7 +2260,7 @@ Message* Reflection::MutableMessage(Message* message, ClearOneof(message, field->containing_oneof()); result_holder = MutableField(message, field); const Message* default_message = GetDefaultMessageInstance(field); - *result_holder = default_message->New(message->GetArenaForAllocation()); + *result_holder = default_message->New(message->GetArena()); } } else { SetBit(message, field); @@ -2272,7 +2268,7 @@ Message* Reflection::MutableMessage(Message* message, if (*result_holder == nullptr) { const Message* default_message = GetDefaultMessageInstance(field); - *result_holder = default_message->New(message->GetArenaForAllocation()); + *result_holder = default_message->New(message->GetArena()); } result = *result_holder; return result; @@ -2306,7 +2302,7 @@ void Reflection::UnsafeArenaSetAllocatedMessage( SetBit(message, field); } Message** sub_message_holder = MutableRaw(message, field); - if (message->GetArenaForAllocation() == nullptr) { + if (message->GetArena() == nullptr) { delete *sub_message_holder; } *sub_message_holder = sub_message; @@ -2315,21 +2311,21 @@ void Reflection::UnsafeArenaSetAllocatedMessage( void Reflection::SetAllocatedMessage(Message* message, Message* sub_message, const FieldDescriptor* field) const { - ABSL_DCHECK( - sub_message == nullptr || sub_message->GetOwningArena() == nullptr || - sub_message->GetOwningArena() == message->GetArenaForAllocation()); + ABSL_DCHECK(sub_message == nullptr || + sub_message->GetOwningArena() == nullptr || + sub_message->GetOwningArena() == message->GetArena()); // If message and sub-message are in different memory ownership domains // (different arenas, or one is on heap and one is not), then we may need to // do a copy. if (sub_message != nullptr && - sub_message->GetOwningArena() != message->GetArenaForAllocation()) { + sub_message->GetOwningArena() != message->GetArena()) { if (sub_message->GetOwningArena() == nullptr && - message->GetArenaForAllocation() != nullptr) { + message->GetArena() != nullptr) { // Case 1: parent is on an arena and child is heap-allocated. We can add // the child to the arena's Own() list to free on arena destruction, then // set our pointer. - message->GetArenaForAllocation()->Own(sub_message); + message->GetArena()->Own(sub_message); UnsafeArenaSetAllocatedMessage(message, sub_message, field); } else { // Case 2: all other cases. We need to make a copy. MutableMessage() will @@ -2378,9 +2374,9 @@ Message* Reflection::ReleaseMessage(Message* message, MessageFactory* factory) const { Message* released = UnsafeArenaReleaseMessage(message, field, factory); #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE - released = MaybeForceCopy(message->GetArenaForAllocation(), released); + released = MaybeForceCopy(message->GetArena(), released); #endif // PROTOBUF_FORCE_COPY_IN_RELEASE - if (message->GetArenaForAllocation() != nullptr && released != nullptr) { + if (message->GetArena() != nullptr && released != nullptr) { Message* copy_from_arena = released->New(); copy_from_arena->CopyFrom(*released); released = copy_from_arena; @@ -2459,7 +2455,7 @@ Message* Reflection::AddMessage(Message* message, const FieldDescriptor* field, } else { prototype = &repeated->Get >(0); } - result = prototype->New(message->GetArenaForAllocation()); + result = prototype->New(message->GetArena()); // We can guarantee here that repeated and result are either both heap // allocated or arena owned. So it is safe to call the unsafe version // of AddAllocated. @@ -2679,7 +2675,7 @@ void Reflection::PrepareSplitMessageForWrite(Message* message) const { const void* default_split = GetSplitField(schema_.default_instance_); if (*split == default_split) { uint32_t size = schema_.SizeofSplit(); - Arena* arena = message->GetArenaForAllocation(); + Arena* arena = message->GetArena(); *split = (arena == nullptr) ? ::operator new(size) : arena->AllocateAligned(size); memcpy(*split, default_split, size); @@ -2717,7 +2713,7 @@ Type* Reflection::MutableRawNonOneof(Message* message, if (SplitFieldHasExtraIndirection(field)) { return AllocIfDefault(field, *GetPointerAtOffset(*split, field_offset), - message->GetArenaForAllocation()); + message->GetArena()); } return GetPointerAtOffset(*split, field_offset); } @@ -2734,7 +2730,7 @@ Type* Reflection::MutableRaw(Message* message, if (SplitFieldHasExtraIndirection(field)) { return AllocIfDefault(field, *GetPointerAtOffset(*split, field_offset), - message->GetArenaForAllocation()); + message->GetArena()); } return GetPointerAtOffset(*split, field_offset); } @@ -2815,8 +2811,8 @@ inline void ClearInlinedStringDonated(uint32_t index, uint32_t* array) { void Reflection::SwapInlinedStringDonated(Message* lhs, Message* rhs, const FieldDescriptor* field) const { - Arena* lhs_arena = lhs->GetArenaForAllocation(); - Arena* rhs_arena = rhs->GetArenaForAllocation(); + Arena* lhs_arena = lhs->GetArena(); + Arena* rhs_arena = rhs->GetArena(); // If arenas differ, inined string fields are swapped by copying values. // Donation status should not be swapped. if (lhs_arena != rhs_arena) { @@ -2982,7 +2978,7 @@ void Reflection::ClearOneof(Message* message, uint32_t oneof_case = GetOneofCase(*message, oneof_descriptor); if (oneof_case > 0) { const FieldDescriptor* field = descriptor_->FindFieldByNumber(oneof_case); - if (message->GetArenaForAllocation() == nullptr) { + if (message->GetArena() == nullptr) { switch (field->cpp_type()) { case FieldDescriptor::CPPTYPE_STRING: { switch (internal::cpp::EffectiveStringCType(field)) { diff --git a/src/google/protobuf/generated_message_tctable_impl.h b/src/google/protobuf/generated_message_tctable_impl.h index a47addf42d..8e173c2e20 100644 --- a/src/google/protobuf/generated_message_tctable_impl.h +++ b/src/google/protobuf/generated_message_tctable_impl.h @@ -598,7 +598,7 @@ class PROTOBUF_EXPORT TcParser final { if (!is_split) return RefAt(x, offset); void*& ptr = RefAt(x, offset); if (ptr == DefaultRawPtr()) { - ptr = Arena::CreateMessage(msg->GetArenaForAllocation()); + ptr = Arena::CreateMessage(msg->GetArena()); } return *static_cast(ptr); } diff --git a/src/google/protobuf/generated_message_tctable_lite.cc b/src/google/protobuf/generated_message_tctable_lite.cc index 7839d92f2b..77f66b0557 100644 --- a/src/google/protobuf/generated_message_tctable_lite.cc +++ b/src/google/protobuf/generated_message_tctable_lite.cc @@ -383,7 +383,7 @@ inline PROTOBUF_ALWAYS_INLINE const char* TcParser::SingularParseMessageAuxImpl( if (aux_is_table) { const auto* inner_table = table->field_aux(data.aux_idx())->table; if (field == nullptr) { - field = inner_table->default_instance->New(msg->GetArenaForAllocation()); + field = inner_table->default_instance->New(msg->GetArena()); } if (group_coding) { return ctx->ParseGroup(field, ptr, FastDecodeTag(saved_tag), @@ -394,7 +394,7 @@ inline PROTOBUF_ALWAYS_INLINE const char* TcParser::SingularParseMessageAuxImpl( if (field == nullptr) { const MessageLite* default_instance = table->field_aux(data.aux_idx())->message_default(); - field = default_instance->New(msg->GetArenaForAllocation()); + field = default_instance->New(msg->GetArena()); } if (group_coding) { return ctx->ParseGroup(field, ptr, FastDecodeTag(saved_tag)); @@ -1432,7 +1432,7 @@ PROTOBUF_ALWAYS_INLINE const char* TcParser::SingularString( ptr += sizeof(TagType); hasbits |= (uint64_t{1} << data.hasbit_idx()); auto& field = RefAt(msg, data.offset()); - auto arena = msg->GetArenaForAllocation(); + auto arena = msg->GetArena(); if (arena) { ptr = ReadStringIntoArena(msg, ptr, ctx, data.aux_idx(), table, field, arena); @@ -1676,7 +1676,7 @@ bool TcParser::ChangeOneof(const TcParseTableBase* table, case field_layout::kRepMessage: case field_layout::kRepGroup: { auto& field = RefAt(msg, current_entry->offset); - if (!msg->GetArenaForAllocation()) { + if (!msg->GetArena()) { delete field; } break; @@ -1711,7 +1711,7 @@ void* TcParser::MaybeGetSplitBase(MessageLite* msg, const bool is_split, if (split == default_split) { // Allocate split instance when needed. uint32_t size = GetSizeofSplit(table); - Arena* arena = msg->GetArenaForAllocation(); + Arena* arena = msg->GetArena(); split = (arena == nullptr) ? ::operator new(size) : arena->AllocateAligned(size); memcpy(split, default_split, size); @@ -2184,7 +2184,7 @@ PROTOBUF_NOINLINE const char* TcParser::MpString(PROTOBUF_TC_PARAM_DECL) { case field_layout::kRepAString: { auto& field = RefAt(base, entry.offset); if (need_init) field.InitDefault(); - Arena* arena = msg->GetArenaForAllocation(); + Arena* arena = msg->GetArena(); if (arena) { ptr = ctx->ReadArenaString(ptr, &field, arena); } else { @@ -2201,7 +2201,7 @@ PROTOBUF_NOINLINE const char* TcParser::MpString(PROTOBUF_TC_PARAM_DECL) { absl::Cord* field; if (is_oneof) { if (need_init) { - field = Arena::Create(msg->GetArenaForAllocation()); + field = Arena::Create(msg->GetArena()); RefAt(msg, entry.offset) = field; } else { field = RefAt(msg, entry.offset); @@ -2366,7 +2366,7 @@ PROTOBUF_NOINLINE const char* TcParser::MpMessage(PROTOBUF_TC_PARAM_DECL) { if ((type_card & field_layout::kTvMask) == field_layout::kTvTable) { auto* inner_table = table->field_aux(&entry)->table; if (need_init || field == nullptr) { - field = inner_table->default_instance->New(msg->GetArenaForAllocation()); + field = inner_table->default_instance->New(msg->GetArena()); } if (is_group) { return ctx->ParseGroup(field, ptr, decoded_tag, inner_table); @@ -2382,7 +2382,7 @@ PROTOBUF_NOINLINE const char* TcParser::MpMessage(PROTOBUF_TC_PARAM_DECL) { +field_layout::kTvWeakPtr); def = table->field_aux(&entry)->message_default_weak(); } - field = def->New(msg->GetArenaForAllocation()); + field = def->New(msg->GetArena()); } if (is_group) { return ctx->ParseGroup(field, ptr, decoded_tag); diff --git a/src/google/protobuf/map_entry.h b/src/google/protobuf/map_entry.h index 0f1d79b8e6..c2ee31f088 100644 --- a/src/google/protobuf/map_entry.h +++ b/src/google/protobuf/map_entry.h @@ -111,7 +111,7 @@ class MapEntry : public Message { MapEntry& operator=(const MapEntry&) = delete; ~MapEntry() override { - if (GetArenaForAllocation() != nullptr) return; + if (GetArena() != nullptr) return; Message::_internal_metadata_.template Delete(); KeyTypeHandler::DeleteNoArena(key_); ValueTypeHandler::DeleteNoArena(value_); @@ -130,11 +130,11 @@ class MapEntry : public Message { } inline auto* mutable_key() { _has_bits_[0] |= 0x00000001u; - return KeyTypeHandler::EnsureMutable(&key_, GetArenaForAllocation()); + return KeyTypeHandler::EnsureMutable(&key_, GetArena()); } inline auto* mutable_value() { _has_bits_[0] |= 0x00000002u; - return ValueTypeHandler::EnsureMutable(&value_, GetArenaForAllocation()); + return ValueTypeHandler::EnsureMutable(&value_, GetArena()); } // TODO: These methods currently differ in behavior from the ones diff --git a/src/google/protobuf/message_lite.h b/src/google/protobuf/message_lite.h index a30c65dfe9..de8bd19aa0 100644 --- a/src/google/protobuf/message_lite.h +++ b/src/google/protobuf/message_lite.h @@ -521,10 +521,6 @@ class PROTOBUF_EXPORT MessageLite { // of this message or its internal memory could be changed. Arena* GetOwningArena() const { return _internal_metadata_.arena(); } - // Returns the arena, used for allocating internal objects(e.g., child - // messages, etc), or owning incoming objects (e.g., set allocated). - Arena* GetArenaForAllocation() const { return _internal_metadata_.arena(); } - struct ClassData { // Note: The order of arguments in the functions is chosen so that it has // the same ABI as the member function that calls them. Eg the `this`