protocolbuffers
diff --git a/‎src/google/protobuf/message_lite.h
+10-14 b/‎src/google/protobuf/message_lite.h
+10-14
diff --git a/‎src/google/protobuf/port.h
-3 b/‎src/google/protobuf/port.h
-3
@@ -128,11 +128,11 @@ class MessageCreator {
         func_(func) {}
 
   // Template for testing.
-  template <bool test_call = false, typename MessageLite>
+  template <typename MessageLite>
   MessageLite* New(const MessageLite* prototype_for_func,
                    const MessageLite* prototype_for_copy, Arena* arena) const;
 
-  template <bool test_call = false, typename MessageLite>
+  template <typename MessageLite>
   MessageLite* PlacementNew(const MessageLite* prototype_for_func,
                             const MessageLite* prototype_for_copy, void* mem,
                             Arena* arena) const;
@@ -1244,19 +1244,15 @@ T* OnShutdownDelete(T* p) {
   return p;
 }
 
-template <bool test_call, typename MessageLite>
+template <typename MessageLite>
 PROTOBUF_ALWAYS_INLINE MessageLite* MessageCreator::PlacementNew(
     const MessageLite* prototype_for_func,
     const MessageLite* prototype_for_copy, void* mem, Arena* arena) const {
   ABSL_DCHECK_EQ(reinterpret_cast<uintptr_t>(mem) % alignment_, 0u);
   const Tag as_tag = tag();
-  // When the feature is not enabled we skip the `as_tag` check since it is
-  // unnecessary. Except for testing, where we want to test the copy logic even
-  // when we can't use it for real messages.
-  constexpr bool kMustBeFunc = !test_call && !internal::EnableCustomNew();
   static_assert(kFunc < 0 && !(kZeroInit < 0) && !(kMemcpy < 0),
                 "Only kFunc must be the only negative value");
-  if (ABSL_PREDICT_FALSE(kMustBeFunc || (int8_t)as_tag < 0)) {
+  if (ABSL_PREDICT_FALSE(static_cast<int8_t>(as_tag) < 0)) {
     PROTOBUF_DEBUG_COUNTER("MessageCreator.Func").Inc();
     return static_cast<MessageLite*>(func_(prototype_for_func, mem, arena));
   }
@@ -1345,15 +1341,15 @@ PROTOBUF_ALWAYS_INLINE MessageLite* MessageCreator::PlacementNew(
   return Launder(reinterpret_cast<MessageLite*>(mem));
 }
 
-template <bool test_call, typename MessageLite>
+template <typename MessageLite>
 PROTOBUF_ALWAYS_INLINE MessageLite* MessageCreator::New(
     const MessageLite* prototype_for_func,
     const MessageLite* prototype_for_copy, Arena* arena) const {
-  return PlacementNew<test_call>(prototype_for_func, prototype_for_copy,
-                                 arena != nullptr
-                                     ? arena->AllocateAligned(allocation_size_)
-                                     : ::operator new(allocation_size_),
-                                 arena);
+  return PlacementNew(prototype_for_func, prototype_for_copy,
+                      arena != nullptr
+                          ? arena->AllocateAligned(allocation_size_)
+                          : ::operator new(allocation_size_),
+                      arena);
 }
 
 }  // namespace internal
 
@@ -454,19 +454,16 @@ constexpr T* Launder(T* p) {
 }
 
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-constexpr bool EnableCustomNew() { return true; }
 template <typename T>
 constexpr bool EnableCustomNewFor() {
   return true;
 }
 #elif ABSL_HAVE_BUILTIN(__is_bitwise_cloneable)
-constexpr bool EnableCustomNew() { return true; }
 template <typename T>
 constexpr bool EnableCustomNewFor() {
   return __is_bitwise_cloneable(T);
 }
 #else
-constexpr bool EnableCustomNew() { return false; }
 template <typename T>
 constexpr bool EnableCustomNewFor() {
   return false;
Original file line number	Diff line number	Diff line change
`@@ -454,19 +454,16 @@ constexpr T* Launder(T* p) {`
`454`	`454`	`}`
`455`	`455`
`456`	`456`	`#if defined(PROTOBUF_CUSTOM_VTABLE)`
`457`		`-constexpr bool EnableCustomNew() { return true; }`
`458`	`457`	`template <typename T>`
`459`	`458`	`constexpr bool EnableCustomNewFor() {`
`460`	`459`	`return true;`
`461`	`460`	`}`
`462`	`461`	`#elif ABSL_HAVE_BUILTIN(__is_bitwise_cloneable)`
`463`		`-constexpr bool EnableCustomNew() { return true; }`
`464`	`462`	`template <typename T>`
`465`	`463`	`constexpr bool EnableCustomNewFor() {`
`466`	`464`	`return __is_bitwise_cloneable(T);`
`467`	`465`	`}`
`468`	`466`	`#else`
`469`		`-constexpr bool EnableCustomNew() { return false; }`
`470`	`467`	`template <typename T>`
`471`	`468`	`constexpr bool EnableCustomNewFor() {`
`472`	`469`	`return false;`