Use GetArena() instead of GetOwningArena() #1

PiperOrigin-RevId: 573070911
protocolbuffers · Oct 13, 2023 · c80298b · c80298b
1 parent 7eef3c9
commit c80298b
Show file tree

Hide file tree

Showing 9 changed files with 250 additions and 253 deletions.
diff --git a/src/google/protobuf/arena_unittest.cc b/src/google/protobuf/arena_unittest.cc
@@ -723,7 +723,7 @@ TEST(ArenaTest, SetAllocatedAcrossArenasWithReflection) {
 #if GTEST_HAS_DEATH_TEST
     EXPECT_DEBUG_DEATH(
         r->SetAllocatedMessage(arena1_message, arena2_submessage, msg_field),
-        "GetOwningArena");
+        "GetArena");
 #endif
     EXPECT_NE(arena2_submessage,
               arena1_message->mutable_optional_nested_message());
@@ -736,7 +736,7 @@ TEST(ArenaTest, SetAllocatedAcrossArenasWithReflection) {
 #if GTEST_HAS_DEATH_TEST
   EXPECT_DEBUG_DEATH(
       r->SetAllocatedMessage(heap_message, arena1_submessage, msg_field),
-      "GetOwningArena");
+      "GetArena");
 #endif
   EXPECT_NE(arena1_submessage, heap_message->mutable_optional_nested_message());
   delete heap_message;

diff --git a/src/google/protobuf/compiler/cpp/message.cc b/src/google/protobuf/compiler/cpp/message.cc
@@ -1297,9 +1297,9 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) {
       "}\n"
       "inline $classname$& operator=($classname$&& from) noexcept {\n"
       "  if (this == &from) return *this;\n"
-      "  if (GetOwningArena() == from.GetOwningArena()\n"
+      "  if (GetArena() == from.GetArena()\n"
       "#ifdef PROTOBUF_FORCE_COPY_IN_MOVE\n"
-      "      && GetOwningArena() != nullptr\n"
+      "      && GetArena() != nullptr\n"
       "#endif  // !PROTOBUF_FORCE_COPY_IN_MOVE\n"
       "  ) {\n"
       "    InternalSwap(&from);\n"
@@ -1459,10 +1459,10 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) {
       "inline void Swap($classname$* other) {\n"
       "  if (other == this) return;\n"
       "#ifdef PROTOBUF_FORCE_COPY_IN_SWAP\n"
-      "  if (GetOwningArena() != nullptr &&\n"
-      "      GetOwningArena() == other->GetOwningArena()) {\n "
+      "  if (GetArena() != nullptr &&\n"
+      "      GetArena() == other->GetArena()) {\n "
       "#else  // PROTOBUF_FORCE_COPY_IN_SWAP\n"
-      "  if (GetOwningArena() == other->GetOwningArena()) {\n"
+      "  if (GetArena() == other->GetArena()) {\n"
       "#endif  // !PROTOBUF_FORCE_COPY_IN_SWAP\n"
       "    InternalSwap(other);\n"
       "  } else {\n"
@@ -1471,7 +1471,7 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) {
       "}\n"
       "void UnsafeArenaSwap($classname$* other) {\n"
       "  if (other == this) return;\n"
-      "  $DCHK$(GetOwningArena() == other->GetOwningArena());\n"
+      "  $DCHK$(GetArena() == other->GetArena());\n"
       "  InternalSwap(other);\n"
       "}\n");
 

diff --git a/src/google/protobuf/compiler/java/java_features.pb.h b/src/google/protobuf/compiler/java/java_features.pb.h
diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h
diff --git a/src/google/protobuf/cpp_features.pb.h b/src/google/protobuf/cpp_features.pb.h