Enable MDNode uniquing.

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

diff --git a/lib/VMCore/Metadata.cpp b/lib/VMCore/Metadata.cpp
index 76f25285b80f9da4bbd158bd89eb3c4bc81ef9ee..8e025b6d7a2cf2737f202c5c2985255a6cf18009 100644 (file)
--- a/lib/VMCore/Metadata.cpp
+++ b/lib/VMCore/Metadata.cpp
@@ -90,16 +90,11 @@ MDNode *MDNode::get(LLVMContext &Context, Value*const* Vals, unsigned NumVals) {
   for (unsigned i = 0; i != NumVals; ++i)
     ID.AddPointer(Vals[i]);
 
-  // FIXME: MDNode uniquing disabled temporarily.
-#ifndef ENABLE_MDNODE_UNIQUING
-  return new MDNode(Context, Vals, NumVals);
-#endif
-
   pImpl->ConstantsLock.reader_acquire();
   void *InsertPoint;
   MDNode *N = pImpl->MDNodeSet.FindNodeOrInsertPos(ID, InsertPoint);
   pImpl->ConstantsLock.reader_release();
-
+  
   if (!N) {
     sys::SmartScopedWriter<true> Writer(pImpl->ConstantsLock);
     N = pImpl->MDNodeSet.FindNodeOrInsertPos(ID, InsertPoint);
@@ -120,27 +115,12 @@ void MDNode::dropAllReferences() {
 }
 
 MDNode::~MDNode() {
-  // FIXME: MDNode uniquing disabled temporarily.
-#ifdef ENABLE_MDNODE_UNIQUING
   getType()->getContext().pImpl->MDNodeSet.RemoveNode(this);
-#endif
   dropAllReferences();
 }
 
 // Replace value from this node's element list.
 void MDNode::replaceElement(Value *From, Value *To) {
-  // FIXME: MDNode uniquing disabled temporarily.
-#ifndef ENABLE_MDNODE_UNIQUING
-  if (From == To || !getType())
-    return;
-
-  for (SmallVector<ElementVH, 4>::iterator I = Node.begin(),
-         E = Node.end(); I != E; ++I)
-    if (*I && *I == From)
-      *I = ElementVH(To, this);
-  return;
-#endif
-
   if (From == To || !getType())
     return;
   LLVMContext &Context = getType()->getContext();