Retire the llvm.dbg.mir hack after r311594.

llvm-svn: 311610

4 files changed, 0 insertions, 12 deletions

diff --git a/llvm/lib/CodeGen/LiveDebugValues.cpp b/llvm/lib/CodeGen/LiveDebugValues.cpp
index 89a66496ddd..12451174643 100644
--- a/llvm/lib/CodeGen/LiveDebugValues.cpp
+++ b/llvm/lib/CodeGen/LiveDebugValues.cpp
@@ -447,12 +447,9 @@ void LiveDebugValues::transferSpillInst(MachineInstr &MI,
       // iterator in our caller.
       unsigned SpillBase;
       int SpillOffset = extractSpillBaseRegAndOffset(MI, SpillBase);
-      const Module *M = MF->getMMI().getModule();
       const MachineInstr *DMI = &VarLocIDs[ID].MI;
       auto *SpillExpr = DIExpression::prepend(
           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 =
           BuildMI(*MF, DMI->getDebugLoc(), DMI->getDesc(), true, SpillBase,
                   DMI->getDebugVariable(), SpillExpr);
diff --git a/llvm/lib/CodeGen/MachineModuleInfo.cpp b/llvm/lib/CodeGen/MachineModuleInfo.cpp
index 3999cd5eb7e..f0dd77ef0da 100644
--- a/llvm/lib/CodeGen/MachineModuleInfo.cpp
+++ b/llvm/lib/CodeGen/MachineModuleInfo.cpp
@@ -210,8 +210,6 @@ bool MachineModuleInfo::doInitialization(Module &M) {
   DbgInfoAvailable = UsesVAFloatArgument = UsesMorestackAddr = false;
   AddrLabelSymbols = nullptr;
   TheModule = &M;
-  if (getDebugMetadataVersionFromModule(M))
-    M.getOrInsertNamedMetadata("llvm.dbg.mir");
   return false;
 }
 
diff --git a/llvm/lib/CodeGen/PrologEpilogInserter.cpp b/llvm/lib/CodeGen/PrologEpilogInserter.cpp
index 1b82cd2158a..6e442065ef7 100644
--- a/llvm/lib/CodeGen/PrologEpilogInserter.cpp
+++ b/llvm/lib/CodeGen/PrologEpilogInserter.cpp
@@ -1086,9 +1086,6 @@ void PEI::replaceFrameIndices(MachineBasicBlock *BB, MachineFunction &Fn,
         auto *DIExpr = DIExpression::prepend(MI.getDebugExpression(),
                                              DIExpression::NoDeref, Offset);
         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;
       }
 
diff --git a/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp b/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
index 9321a956fbd..4e6e90fc4bb 100644
--- a/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
@@ -848,10 +848,6 @@ static void transferDbgValues(SelectionDAG &DAG, DIBuilder &DIB, SDValue From,
                         Dbg->getDebugLoc(), Dbg->getOrder());
     Dbg->setIsInvalidated();
     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)