This is an archive of the discontinued LLVM Phabricator instance.

Differential D80756

Preserve DbgLoc when DeadArgumentElimination rewrites a 'ret'.
ClosedPublic

Authored by probinson on May 28 2020, 1:25 PM.

Details

Reviewers
dblaikie
jmorse
Summary

Fixes PR46002.

Diff Detail

Event Timeline

probinson created this revision.May 28 2020, 1:25 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 28 2020, 1:25 PM
Herald added subscribers: llvm-commits, hiraditya. · View Herald Transcript
probinson added reviewers: dblaikie, jmorse.May 28 2020, 1:26 PM
probinson added a project: debug-info.
dblaikie accepted this revision.May 28 2020, 5:37 PM

Looks good, thanks!

This revision is now accepted and ready to land.May 28 2020, 5:37 PM
Harbormaster completed remote builds in B58318: Diff 267020.May 28 2020, 7:15 PM
probinson added a comment.May 29 2020, 10:08 AM

Fixed by llvmorg-11-init-16204-g8c2d2d971b2 (forgot to put the revision in the commit log).

probinson closed this revision.May 29 2020, 10:09 AM

Revision Contents

PathSize
llvm/
lib/
Transforms/
IPO/
3 lines
test/
Transforms/
DeadArgElim/
1 line

Diff 267020

llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp

Show First 20 Lines • Show All 1,050 Lines • ▼ Show 20 Lines for (BasicBlock &BB : *NF)
// We are now only returning a simple value, so just return the // We are now only returning a simple value, so just return the
// extracted value. // extracted value.
RetVal = EV; RetVal = EV;
} }
} }
} }
// Replace the return instruction with one returning the new return // Replace the return instruction with one returning the new return
// value (possibly 0 if we became void). // value (possibly 0 if we became void).
ReturnInst::Create(F->getContext(), RetVal, RI); auto *NewRet = ReturnInst::Create(F->getContext(), RetVal, RI);
NewRet->setDebugLoc(RI->getDebugLoc());
BB.getInstList().erase(RI); BB.getInstList().erase(RI);
} }
// Clone metadatas from the old function, including debug info descriptor. // Clone metadatas from the old function, including debug info descriptor.
SmallVector<std::pair<unsigned, MDNode *>, 1> MDs; SmallVector<std::pair<unsigned, MDNode *>, 1> MDs;
F->getAllMetadata(MDs); F->getAllMetadata(MDs);
for (auto MD : MDs) for (auto MD : MDs)
NF->addMetadata(MD.first, *MD.second); NF->addMetadata(MD.first, *MD.second);
▲ Show 20 Lines • Show All 48 Lines • Show Last 20 Lines

llvm/test/Transforms/DeadArgElim/dbginfo-preserve-dbgloc.ll

Show First 20 Lines • Show All 57 Lines • ▼ Show 20 Linesif.then2: ; preds = %if.end
call void (...) @baa(), !dbg !57 call void (...) @baa(), !dbg !57
br label %cleanup, !dbg !56 br label %cleanup, !dbg !56
if.end3: ; preds = %if.end if.end3: ; preds = %if.end
br label %cleanup, !dbg !56 br label %cleanup, !dbg !56
cleanup: ; preds = %if.end3, %if.then2, %if.then cleanup: ; preds = %if.end3, %if.then2, %if.then
%retval.0 = phi i1 [ false, %if.then2 ], [ true, %if.end3 ], [ false, %if.then ] %retval.0 = phi i1 [ false, %if.then2 ], [ true, %if.end3 ], [ false, %if.then ]
; CHECK: ret void, !dbg
ret i1 %retval.0, !dbg !56 ret i1 %retval.0, !dbg !56
} }
declare void @baa(...) local_unnamed_addr #1 declare void @baa(...) local_unnamed_addr #1
; Function Attrs: nounwind readnone speculatable ; Function Attrs: nounwind readnone speculatable
declare void @llvm.dbg.value(metadata, metadata, metadata) #3 declare void @llvm.dbg.value(metadata, metadata, metadata) #3
▲ Show 20 Lines • Show All 62 Lines • Show Last 20 Lines