commit 2ec06a53ed10f16efd120ecfc77440f83cdb99e5
author Clayton Knittel <cknittel@google.com> Mon Sep 22 13:49:24 2025 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Sep 22 13:53:10 2025 -0700
tree b08c40a072fa8a74f3ef702ffef7f3778fda8306
parent 74920273c8597973250462e3cfbce2781f31d908

Don't swap arena pointers in `UntypedMapBase::InternalSwap`.

The arenas should be equal in `InternalSwap`, since it is only called from other swap methods if the arenas match.

PiperOrigin-RevId: 810141319

src/google/protobuf/map.h

diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h
index a9b933c..6c1d57f 100644
--- a/src/google/protobuf/map.h
+++ b/src/google/protobuf/map.h
@@ -364,7 +364,6 @@
     std::swap(index_of_first_non_null_, other->index_of_first_non_null_);
     std::swap(type_info_, other->type_info_);
     std::swap(table_, other->table_);
-    std::swap(arena_, other->arena_);
   }
 
   void UntypedMergeFrom(const UntypedMapBase& other);