commit 235cd3b026ec9fd1cca86e1f5e11aed1b1d1e3eb
author Clayton Knittel <cknittel@google.com> Wed Sep 10 16:58:55 2025 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Sep 10 17:03:50 2025 -0700
tree e6bb5a8291d37992b17c29d8ac002d6a27f0aced
parent 8d51e346ac6801387475fb63dd9d420e620c8c75

Make required `Arena` argument to `Arena::InternalHelper::Construct` explicit.

PiperOrigin-RevId: 805571054

src/google/protobuf/arena.h

diff --git a/src/google/protobuf/arena.h b/src/google/protobuf/arena.h
index 23fdde2..3ed71de 100644
--- a/src/google/protobuf/arena.h
+++ b/src/google/protobuf/arena.h
@@ -429,8 +429,9 @@
 
     template <typename... Args>
     static T* PROTOBUF_NONNULL Construct(void* PROTOBUF_NONNULL ptr,
+                                         Arena* PROTOBUF_NULLABLE arena,
                                          Args&&... args) {
-      return new (ptr) T(static_cast<Args&&>(args)...);
+      return new (ptr) T(arena, static_cast<Args&&>(args)...);
     }
 
     static PROTOBUF_ALWAYS_INLINE T* PROTOBUF_NONNULL New() {