diff --git a/src/google/protobuf/metadata_lite.h b/src/google/protobuf/metadata_lite.h index fa2bcea360..f1f09509e3 100644 --- a/src/google/protobuf/metadata_lite.h +++ b/src/google/protobuf/metadata_lite.h @@ -182,11 +182,10 @@ class PROTOBUF_EXPORT InternalMetadata { template PROTOBUF_NOINLINE void DeleteOutOfLineHelper() { - // TODO(b/188560391): Determine if this branch is needed. - if (!arena()) { - delete PtrValue>(); - ptr_ = 0; - } + delete PtrValue>(); + // 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