6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-11-03 14:08:57 +00:00
Code Issues Projects Releases Wiki Activity

Use DebugLocs instead of MDNodes.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@108967 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Gohman 2010-07-20 23:49:05 +00:00
parent 539673579e
commit 333a94765a
1 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
lib/Transforms/Utils/CloneFunction.cpp
View File

@ -334,25 +334,16 @@ ConstantFoldMappedInstruction(const Instruction *I) {
Ops.size(), TD);
}
static MDNode *UpdateInlinedAtInfo(MDNode *InsnMD, MDNode *TheCallMD) {
DILocation ILoc(InsnMD);
if (!ILoc.Verify()) return InsnMD;
static DebugLoc
UpdateInlinedAtInfo(const DebugLoc &InsnDL, const DebugLoc &TheCallDL,
LLVMContext &Ctx) {
DebugLoc NewLoc = TheCallDL;
if (MDNode *IA = InsnDL.getInlinedAt(Ctx))
NewLoc = UpdateInlinedAtInfo(DebugLoc::getFromDILocation(IA), TheCallDL,
Ctx);
DILocation CallLoc(TheCallMD);
if (!CallLoc.Verify()) return InsnMD;
DILocation OrigLocation = ILoc.getOrigLocation();
MDNode *NewLoc = TheCallMD;
if (OrigLocation.Verify())
NewLoc = UpdateInlinedAtInfo(OrigLocation, TheCallMD);
Value *MDVs[] = {
InsnMD->getOperand(0), // Line
InsnMD->getOperand(1), // Col
InsnMD->getOperand(2), // Scope
NewLoc
};
return MDNode::get(InsnMD->getContext(), MDVs, 4);
return DebugLoc::get(InsnDL.getLine(), InsnDL.getCol(),
InsnDL.getScope(Ctx), NewLoc.getAsMDNode(Ctx));
}
/// CloneAndPruneFunctionInto - This works exactly like CloneFunctionInto,
@ -408,9 +399,9 @@ void llvm::CloneAndPruneFunctionInto(Function *NewFunc, const Function *OldFunc,
//
BasicBlock::iterator I = NewBB->begin();
MDNode *TheCallMD = NULL;
if (TheCall && TheCall->hasMetadata())
TheCallMD = TheCall->getMetadata(LLVMContext::MD_dbg);
DebugLoc TheCallDL;
if (TheCall)
TheCallDL = TheCall->getDebugLoc();
// Handle PHI nodes specially, as we have to remove references to dead
// blocks.
@ -419,15 +410,17 @@ void llvm::CloneAndPruneFunctionInto(Function *NewFunc, const Function *OldFunc,
BasicBlock::const_iterator OldI = BI->begin();
for (; (PN = dyn_cast<PHINode>(I)); ++I, ++OldI) {
if (I->hasMetadata()) {
if (TheCallMD) {
if (MDNode *IMD = I->getMetadata(LLVMContext::MD_dbg)) {
MDNode *NewMD = UpdateInlinedAtInfo(IMD, TheCallMD);
I->setMetadata(LLVMContext::MD_dbg, NewMD);
if (!TheCallDL.isUnknown()) {
DebugLoc IDL = I->getDebugLoc();
if (!IDL.isUnknown()) {
DebugLoc NewDL = UpdateInlinedAtInfo(IDL, TheCallDL,
I->getContext());
I->setDebugLoc(NewDL);
}
} else {
// The cloned instruction has dbg info but the call instruction
// does not have dbg info. Remove dbg info from cloned instruction.
I->setMetadata(LLVMContext::MD_dbg, 0);
I->setDebugLoc(DebugLoc());
}
}
PHIToResolve.push_back(cast<PHINode>(OldI));
@ -443,15 +436,17 @@ void llvm::CloneAndPruneFunctionInto(Function *NewFunc, const Function *OldFunc,
// Otherwise, remap the rest of the instructions normally.
for (; I != NewBB->end(); ++I) {
if (I->hasMetadata()) {
if (TheCallMD) {
if (MDNode *IMD = I->getMetadata(LLVMContext::MD_dbg)) {
MDNode *NewMD = UpdateInlinedAtInfo(IMD, TheCallMD);
I->setMetadata(LLVMContext::MD_dbg, NewMD);
if (!TheCallDL.isUnknown()) {
DebugLoc IDL = I->getDebugLoc();
if (!IDL.isUnknown()) {
DebugLoc NewDL = UpdateInlinedAtInfo(IDL, TheCallDL,
I->getContext());
I->setDebugLoc(NewDL);
}
} else {
// The cloned instruction has dbg info but the call instruction
// does not have dbg info. Remove dbg info from cloned instruction.
I->setMetadata(LLVMContext::MD_dbg, 0);
I->setDebugLoc(DebugLoc());
}
}
RemapInstruction(I, VMap);