Add a macro to make RepeatedField(Arena*) constructor private in a future release.

ClaytonKnittel · mkruskal-google · commit 768db1450359 · 2025-10-07T11:38:37.000-07:00
PiperOrigin-RevId: 816029788
diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
@@ -169,6 +169,10 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
 // Owner: cknittel@, mkruskal@
 #define PROTOBUF_FUTURE_REMOVE_MAP_FIELD_ARENA_CONSTRUCTOR 1
 
+// Removes the public RepeatedField(Arena*) constructor.
+// Owner: cknittel@, mkruskal@
+#define PROTOBUF_FUTURE_REMOVE_REPEATED_FIELD_ARENA_CONSTRUCTOR 1
+
 #else
 
 #define PROTOBUF_FUTURE_ADD_NODISCARD
diff --git a/src/google/protobuf/repeated_field.h b/src/google/protobuf/repeated_field.h
@@ -58,6 +58,8 @@ namespace protobuf {
 
 class Message;
 class UnknownField;  // For the allowlist
+class UnknownFieldSet;
+class DynamicMessage;
 
 namespace internal {
 
@@ -290,8 +292,10 @@ class ABSL_ATTRIBUTE_WARN_UNUSED RepeatedField final
   constexpr RepeatedField();
   RepeatedField(const RepeatedField& rhs) : RepeatedField(nullptr, rhs) {}
 
+#ifndef PROTOBUF_FUTURE_REMOVE_REPEATED_FIELD_ARENA_CONSTRUCTOR
   // TODO: make this constructor private
   explicit RepeatedField(Arena* arena);
+#endif
 
   template <typename Iter,
             typename = typename std::enable_if<std::is_constructible<
@@ -486,12 +490,22 @@ class ABSL_ATTRIBUTE_WARN_UNUSED RepeatedField final
 
   friend class Arena;
 
+#ifdef PROTOBUF_FUTURE_REMOVE_REPEATED_FIELD_ARENA_CONSTRUCTOR
+  // For access to private arena constructor.
+  friend class UnknownFieldSet;
+  friend class DynamicMessage;
+#endif
+
   static constexpr int kSooCapacityElements =
       internal::SooCapacityElements<Element>();
 
   static constexpr int kInitialSize = 0;
   static PROTOBUF_CONSTEXPR const size_t kHeapRepHeaderSize = sizeof(HeapRep);
 
+#ifdef PROTOBUF_FUTURE_REMOVE_REPEATED_FIELD_ARENA_CONSTRUCTOR
+  explicit RepeatedField(Arena* arena);
+#endif
+
   RepeatedField(Arena* arena, const RepeatedField& rhs);
   RepeatedField(Arena* arena, RepeatedField&& rhs);
 
