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

[Victor Hernandez]

Author: hernande
Date: Wed Jan 27 16:03:03 2010
New Revision: 94691

URL: http://llvm.org/viewvc/llvm-project?rev=94691&view=rev
Log:
Need to recurse for all operands of function-local metadata; and handle Instructions (which map to themselves)

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=94691&r1=94690&r2=94691&view=diff

==============================================================================
--- llvm/trunk/lib/Linker/LinkModules.cpp (original)
+++ llvm/trunk/lib/Linker/LinkModules.cpp Wed Jan 27 16:03:03 2010
@@ -395,16 +395,13 @@
   } 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) {
-        Value *Op = MD->getOperand(i);
-        // LinkFunctionBody() already handled non-argument values.
-        Elts.push_back(isa<Argument>(Op) ? RemapOperand(Op, ValueMap) : Op);
-      }
+      for (unsigned i = 0, e = MD->getNumOperands(); i != e; ++i)
+        Elts.push_back(RemapOperand(MD->getOperand(i), ValueMap));
       Result = MDNode::get(In->getContext(), Elts.data(), MD->getNumOperands());
     } else {
       Result = const_cast<Value*>(In);
     }
-  } else if (isa<MDString>(In) || isa<InlineAsm>(In)) {
+  } else if (isa<MDString>(In) || isa<InlineAsm>(In) || isa<Instruction>(In)) {
     Result = const_cast<Value*>(In);
   }