From: Nick Lewycky <nicholas@mxc.ca>
Date: Tue, 27 Dec 2011 01:17:40 +0000 (+0000)
Subject: Using Inst->setMetadata(..., NULL) should be safe to remove metadata even when
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=da32cc6176d8ca2cd9cf387f5818ae911c91dc3c;p=oota-llvm.git

Using Inst->setMetadata(..., NULL) should be safe to remove metadata even when
there is non of that type to remove. This fixes a crasher in the particular
case where the instruction has metadata but no metadata storage in the context
(this is only possible if the instruction has !dbg but no other metadata info).


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@147285 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/VMCore/Metadata.cpp b/lib/VMCore/Metadata.cpp
index 99664334962..993df41b469 100644
--- a/lib/VMCore/Metadata.cpp
+++ b/lib/VMCore/Metadata.cpp
@@ -470,9 +470,11 @@ void Instruction::setMetadata(unsigned KindID, MDNode *Node) {
   }
 
   // Otherwise, we're removing metadata from an instruction.
-  assert(hasMetadataHashEntry() &&
-         getContext().pImpl->MetadataStore.count(this) &&
+  assert((hasMetadataHashEntry() ==
+          getContext().pImpl->MetadataStore.count(this)) &&
          "HasMetadata bit out of date!");
+  if (!hasMetadataHashEntry())
+    return;  // Nothing to remove!
   LLVMContextImpl::MDMapTy &Info = getContext().pImpl->MetadataStore[this];
 
   // Common case is removing the only entry.