Need to recurse for all operands of function-local metadata; and handle Instructions (which map to themselves)

llvm-svn: 94691

1 files changed, 3 insertions, 6 deletions

diff --git a/llvm/lib/Linker/LinkModules.cpp b/llvm/lib/Linker/LinkModules.cpp
index 86f3b84f1d7..279c4bec357 100644
--- a/llvm/lib/Linker/LinkModules.cpp
+++ b/llvm/lib/Linker/LinkModules.cpp
@@ -395,16 +395,13 @@ static Value *RemapOperand(const Value *In,
   } 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);
   }