maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Retire the llvm.dbg.mir hack after r311594. 

llvm-svn: 311610
This commit is contained in:
Adrian Prantl 2017-08-23 22:02:36 +00:00
parent 850b983455
commit 7db6b5e2b3
5 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/lib/CodeGen/LiveDebugValues.cpp
View File

@ -447,12 +447,9 @@ void LiveDebugValues::transferSpillInst(MachineInstr &MI,
// iterator in our caller. // iterator in our caller.
unsigned SpillBase; unsigned SpillBase;
int SpillOffset = extractSpillBaseRegAndOffset(MI, SpillBase); int SpillOffset = extractSpillBaseRegAndOffset(MI, SpillBase);
const Module *M = MF->getMMI().getModule();
const MachineInstr *DMI = &VarLocIDs[ID].MI; const MachineInstr *DMI = &VarLocIDs[ID].MI;
auto *SpillExpr = DIExpression::prepend( auto *SpillExpr = DIExpression::prepend(
DMI->getDebugExpression(), DIExpression::NoDeref, SpillOffset); DMI->getDebugExpression(), DIExpression::NoDeref, SpillOffset);
// Add the expression to the metadata graph so isn't lost in MIR dumps.
M->getNamedMetadata("llvm.dbg.mir")->addOperand(SpillExpr);
MachineInstr *SpDMI = MachineInstr *SpDMI =
BuildMI(*MF, DMI->getDebugLoc(), DMI->getDesc(), true, SpillBase, BuildMI(*MF, DMI->getDebugLoc(), DMI->getDesc(), true, SpillBase,
DMI->getDebugVariable(), SpillExpr); DMI->getDebugVariable(), SpillExpr);

2
llvm/lib/CodeGen/MachineModuleInfo.cpp
View File

@ -210,8 +210,6 @@ bool MachineModuleInfo::doInitialization(Module &M) {
DbgInfoAvailable = UsesVAFloatArgument = UsesMorestackAddr = false; DbgInfoAvailable = UsesVAFloatArgument = UsesMorestackAddr = false;
AddrLabelSymbols = nullptr; AddrLabelSymbols = nullptr;
TheModule = &M; TheModule = &M;
if (getDebugMetadataVersionFromModule(M))
M.getOrInsertNamedMetadata("llvm.dbg.mir");
return false; return false;
} }

3
llvm/lib/CodeGen/PrologEpilogInserter.cpp
View File

@ -1086,9 +1086,6 @@ void PEI::replaceFrameIndices(MachineBasicBlock *BB, MachineFunction &Fn,
auto *DIExpr = DIExpression::prepend(MI.getDebugExpression(), auto *DIExpr = DIExpression::prepend(MI.getDebugExpression(),
DIExpression::NoDeref, Offset); DIExpression::NoDeref, Offset);
MI.getOperand(3).setMetadata(DIExpr); MI.getOperand(3).setMetadata(DIExpr);
const Module *M = Fn.getMMI().getModule();
// Add the expression to the metadata graph so isn't lost in MIR dumps.
M->getNamedMetadata("llvm.dbg.mir")->addOperand(DIExpr);
continue; continue;
} }

4
llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
View File

@ -848,10 +848,6 @@ static void transferDbgValues(SelectionDAG &DAG, DIBuilder &DIB, SDValue From,
Dbg->getDebugLoc(), Dbg->getOrder()); Dbg->getDebugLoc(), Dbg->getOrder());
Dbg->setIsInvalidated(); Dbg->setIsInvalidated();
ClonedDVs.push_back(Clone); ClonedDVs.push_back(Clone);
// Add the expression to the metadata graph so isn't lost in MIR dumps.
const Module *M = DAG.getMachineFunction().getMMI().getModule();
M->getNamedMetadata("llvm.dbg.mir")->addOperand(Fragment);
} }
for (SDDbgValue *Dbg : ClonedDVs) for (SDDbgValue *Dbg : ClonedDVs)

2
llvm/lib/IR/Verifier.cpp
View File

@ -736,7 +736,7 @@ void Verifier::visitNamedMDNode(const NamedMDNode &NMD) {
// There used to be various other llvm.dbg.* nodes, but we don't support // There used to be various other llvm.dbg.* nodes, but we don't support
// upgrading them and we want to reserve the namespace for future uses. // upgrading them and we want to reserve the namespace for future uses.
if (NMD.getName().startswith("llvm.dbg.")) if (NMD.getName().startswith("llvm.dbg."))
AssertDI(NMD.getName() == "llvm.dbg.cu" || NMD.getName() == "llvm.dbg.mir", AssertDI(NMD.getName() == "llvm.dbg.cu",
"unrecognized named metadata node in the llvm.dbg namespace", "unrecognized named metadata node in the llvm.dbg namespace",
&NMD); &NMD);
for (const MDNode *MD : NMD.operands()) { for (const MDNode *MD : NMD.operands()) {