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

ClaytonKnittel · copybara-github · commit 6422b9d30b64 · 2025-09-28T22:49:35.000-07:00
PiperOrigin-RevId: 812633485
diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
@@ -161,6 +161,10 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
 // Owner: cknittel@, mkruskal@
 #define PROTOBUF_FUTURE_NO_RECURSIVE_MESSAGE_COPY 1
 
+// Removes the public RepeatedPtrField(Arena*) constructor.
+// Owner: cknittel@, mkruskal@
+#define PROTOBUF_FUTURE_REMOVE_REPEATED_PTR_FIELD_ARENA_CONSTRUCTOR 1
+
 #else
 
 #define PROTOBUF_FUTURE_ADD_NODISCARD
diff --git a/src/google/protobuf/port_undef.inc b/src/google/protobuf/port_undef.inc
@@ -75,6 +75,7 @@
 #undef PROTOBUF_FUTURE_REMOVE_CREATEMESSAGE
 #undef PROTOBUF_FUTURE_ADD_NODISCARD
 #undef PROTOBUF_FUTURE_NO_RECURSIVE_MESSAGE_COPY
+#undef PROTOBUF_FUTURE_REMOVE_REPEATED_PTR_FIELD_ARENA_CONSTRUCTOR
 #endif
 
 #include "google/protobuf/os_macros_restore.inc"
diff --git a/src/google/protobuf/repeated_ptr_field.h b/src/google/protobuf/repeated_ptr_field.h
@@ -55,6 +55,7 @@ namespace protobuf {
 
 class Message;
 class Reflection;
+class DynamicMessage;
 
 template <typename T>
 struct WeakRepeatedPtrField;
@@ -1029,9 +1030,11 @@ class ABSL_ATTRIBUTE_WARN_UNUSED RepeatedPtrField final
                    RepeatedPtrField&& rhs)
       : RepeatedPtrField(arena, std::move(rhs)) {}
 
+#ifndef PROTOBUF_FUTURE_REMOVE_REPEATED_PTR_FIELD_ARENA_CONSTRUCTOR
   // TODO: make constructor private
   [[deprecated("Use Arena::Create<RepeatedPtrField<...>>(Arena*) instead")]]
   explicit RepeatedPtrField(Arena* arena);
+#endif
 
   template <typename Iter,
             typename = typename std::enable_if<std::is_constructible<
@@ -1336,6 +1339,10 @@ class ABSL_ATTRIBUTE_WARN_UNUSED RepeatedPtrField final
 
   friend class Arena;
 
+#ifdef PROTOBUF_FUTURE_REMOVE_REPEATED_PTR_FIELD_ARENA_CONSTRUCTOR
+  friend class DynamicMessage;
+#endif
+
   friend class internal::TcParser;
 
   template <typename T>
@@ -1351,6 +1358,10 @@ class ABSL_ATTRIBUTE_WARN_UNUSED RepeatedPtrField final
   RepeatedPtrField(Arena* arena, const RepeatedPtrField& rhs);
   RepeatedPtrField(Arena* arena, RepeatedPtrField&& rhs);
 
+#ifdef PROTOBUF_FUTURE_REMOVE_REPEATED_PTR_FIELD_ARENA_CONSTRUCTOR
+  explicit RepeatedPtrField(Arena* arena);
+#endif
+
 
   void AddAllocatedForParse(Element* p, Arena* arena) {
     return RepeatedPtrFieldBase::AddAllocatedForParse(p, arena);
