Remove unnecessary branch.

PiperOrigin-RevId: 551006963
protocolbuffers · Jul 25, 2023 · caf5518 · caf5518
1 parent d4db41d
commit caf5518
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/google/protobuf/metadata_lite.h b/src/google/protobuf/metadata_lite.h
@@ -182,11 +182,10 @@ 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;
-    }
+    delete PtrValue<Container<T>>();
+    // TODO(b/188560391):  This store is load-bearing.  Since we are destructing
+    // the message at this point, see if we can eliminate it.
+    ptr_ = 0;
   }
 
   template <typename T>