[llvm-commits] [llvm] r95468 - /llvm/trunk/lib/Linker/LinkModules.cpp

[Victor Hernandez]

Author: hernande
Date: Fri Feb  5 19:31:55 2010
New Revision: 95468

URL: http://llvm.org/viewvc/llvm-project?rev=95468&view=rev
Log:
Linker should not remap null operands of metadata

Modified:
    llvm/trunk/lib/Linker/LinkModules.cpp

Modified: llvm/trunk/lib/Linker/LinkModules.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Linker/LinkModules.cpp?rev=95468&r1=95467&r2=95468&view=diff

==============================================================================
--- llvm/trunk/lib/Linker/LinkModules.cpp (original)
+++ llvm/trunk/lib/Linker/LinkModules.cpp Fri Feb  5 19:31:55 2010
@@ -395,8 +395,12 @@
   } else if (const MDNode *MD = dyn_cast<MDNode>(In)) {
     if (MD->isFunctionLocal()) {
       SmallVector<Value*, 4> Elts;
-      for (unsigned i = 0, e = MD->getNumOperands(); i != e; ++i)
-        Elts.push_back(RemapOperand(MD->getOperand(i), ValueMap));
+      for (unsigned i = 0, e = MD->getNumOperands(); i != e; ++i) {
+        if (MD->getOperand(i))
+          Elts.push_back(RemapOperand(MD->getOperand(i), ValueMap));
+        else
+          Elts.push_back(NULL);
+      }
       Result = MDNode::get(In->getContext(), Elts.data(), MD->getNumOperands());
     } else {
       Result = const_cast<Value*>(In);