Automated rollback of commit 3fec30f.

PiperOrigin-RevId: 546409814
protocolbuffers · Jul 7, 2023 · 51f79d4 · 51f79d4
1 parent 3fec30f
commit 51f79d4
Showing 1 changed file with 5 additions and 5 deletions.
diff --git 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() {
-    ABSL_DCHECK(!arena());
-    delete PtrValue<Container<T>>();
-#ifndef NDEBUG
-    ptr_ = 0;
-#endif  // NDEBUG
+    // TODO(b/188560391): Determine if this branch is needed.
+    if (!arena()) {
+      delete PtrValue<Container<T>>();
+      ptr_ = 0;
+    }
   }
 
   template <typename T>