From 3fec30fe289571b5ba23efcb82a044329608b3b9 Mon Sep 17 00:00:00 2001
From: Chris Kennelly <ckennelly@google.com>
Date: Fri, 7 Jul 2023 14:21:06 -0700
Subject: [PATCH] Remove TODO and unnecessary branch/store in optimized builds.

PiperOrigin-RevId: 546382890
---
 src/google/protobuf/metadata_lite.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/google/protobuf/metadata_lite.h b/src/google/protobuf/metadata_lite.h
index fa2bcea360..d7ee5c97c9 100644
--- a/src/google/protobuf/metadata_lite.h
+++ b/src/google/protobuf/metadata_lite.h
@@ -182,11 +182,11 @@ class PROTOBUF_EXPORT InternalMetadata {
 
   template <typename T>
   PROTOBUF_NOINLINE void DeleteOutOfLineHelper() {
-    // TODO(b/188560391): Determine if this branch is needed.
-    if (!arena()) {
-      delete PtrValue<Container<T>>();
-      ptr_ = 0;
-    }
+    ABSL_DCHECK(!arena());
+    delete PtrValue<Container<T>>();
+#ifndef NDEBUG
+    ptr_ = 0;
+#endif  // NDEBUG
   }
 
   template <typename T>