Internal change

PiperOrigin-RevId: 890673373

Author: protobuf-github-bot

src/google/protobuf/arena.h

@@ -177,7 +177,7 @@ struct ABSL_ATTRIBUTE_WARN_UNUSED ArenaOptions final {
   // individual arena allocation request occurs with a size larger than this
   // maximum). Requested block sizes increase up to this value, then remain
   // here.
-  size_t max_block_size = internal::AllocationPolicy::kDefaultMaxBlockSize;
+  size_t max_block_size = internal::AllocationPolicy::DefaultMaxBlockSize();
 
   // An initial block of memory for the arena to use, or nullptr for none. If
   // provided, the block must live at least as long as the arena itself. The

src/google/protobuf/arena_allocation_policy.cc

@@ -0,0 +1,18 @@
+#include "google/protobuf/arena_allocation_policy.h"
+
+#include <cstddef>
+
+#include "third_party/tcmalloc/experiment.h"
+#include "third_party/tcmalloc/experiment_config.h"
+
+namespace google {
+namespace protobuf {
+namespace internal {
+
+size_t AllocationPolicy::DefaultMaxBlockSize() {
+  return 32 << 10;
+}
+
+}  // namespace internal
+}  // namespace protobuf
+}  // namespace google

src/google/protobuf/arena_allocation_policy.h

@@ -22,17 +22,17 @@ namespace internal {
 // public configuration class such as `ArenaOptions`.
 struct AllocationPolicy {
   static constexpr size_t kDefaultStartBlockSize = 256;
-  static constexpr size_t kDefaultMaxBlockSize = 32 << 10;
+  static size_t DefaultMaxBlockSize();
 
   size_t start_block_size = kDefaultStartBlockSize;
-  size_t max_block_size = kDefaultMaxBlockSize;
+  size_t max_block_size = DefaultMaxBlockSize();
 
   void* (*block_alloc)(size_t) = nullptr;
   void (*block_dealloc)(void*, size_t) = nullptr;
 
   bool IsDefault() const {
     return start_block_size == kDefaultStartBlockSize &&
-           max_block_size == kDefaultMaxBlockSize && block_alloc == nullptr &&
+           max_block_size == DefaultMaxBlockSize() && block_alloc == nullptr &&
            block_dealloc == nullptr;
   }
 };