commit 4d4d7aa96b0080593eea45f910cae40aa6ba96bb
author Clayton Knittel <cknittel@google.com> Wed Sep 17 13:26:33 2025 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Sep 17 13:29:26 2025 -0700
tree b6e5e191d93d116f9aa4fd4c94a7dbac9f04ac35
parent b64e490cf28041251616604047f64460b8a95eae

Add DCHECK to verify arenas are the same in `ExtensionSet::InternalSwap`.

This makes it clearer that `InternalSwap` is only called on `ExtensionSet` instances allocated on the same arena.

PiperOrigin-RevId: 808268211

src/google/protobuf/extension_set.cc

diff --git a/src/google/protobuf/extension_set.cc b/src/google/protobuf/extension_set.cc
index 3f3959a..1bc8599 100644
--- a/src/google/protobuf/extension_set.cc
+++ b/src/google/protobuf/extension_set.cc
@@ -1025,7 +1025,7 @@
 
 void ExtensionSet::InternalSwap(ExtensionSet* other) {
   using std::swap;
-  swap(arena_, other->arena_);
+  ABSL_DCHECK_EQ(arena_, other->arena_);
   swap(flat_capacity_, other->flat_capacity_);
   swap(flat_size_, other->flat_size_);
   swap(map_, other->map_);