Linker: correctly link in dbg.declare

Given source IR:
call void @llvm.dbg.declare(metadata !{i32* %argc.addr}, metadata !14), !dbg !15
we used to generate 
call void @llvm.dbg.declare(metadata !27, metadata !28), !dbg !29
!27 = metadata !{null}

With this patch, we will correctly generate
call void @llvm.dbg.declare(metadata !{i32* %argc.addr}, metadata !27), !dbg !28

Looking up %argc.addr in ValueMap will return null, since %argc.addr is already
correctly set up, we can use identity mapping.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@173946 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Manman Ren
2013-01-30 17:42:15 +00:00
parent 0f156af831
commit 1229c0cb10
3 changed files with 145 additions and 2 deletions

View File

@@ -63,14 +63,23 @@ Value *llvm::MapValue(const Value *V, ValueToValueMapTy &VM, RemapFlags Flags,
// Check all operands to see if any need to be remapped.
for (unsigned i = 0, e = MD->getNumOperands(); i != e; ++i) {
Value *OP = MD->getOperand(i);
if (OP == 0 || MapValue(OP, VM, Flags, TypeMapper) == OP) continue;
if (OP == 0) continue;
Value *Mapped_OP = MapValue(OP, VM, Flags, TypeMapper);
// If Mapped_Op is null, we should use indentity map.
if (Mapped_OP == OP || Mapped_OP == 0) continue;
// Ok, at least one operand needs remapping.
SmallVector<Value*, 4> Elts;
Elts.reserve(MD->getNumOperands());
for (i = 0; i != e; ++i) {
Value *Op = MD->getOperand(i);
Elts.push_back(Op ? MapValue(Op, VM, Flags, TypeMapper) : 0);
if (Op == 0)
Elts.push_back(0);
else {
Value *Mapped_Op = MapValue(Op, VM, Flags, TypeMapper);
// If Mapped_Op is null, we should use indentity map.
Elts.push_back(Mapped_Op ? Mapped_Op : Op);
}
}
MDNode *NewMD = MDNode::get(V->getContext(), Elts);
Dummy->replaceAllUsesWith(NewMD);