1 files changed, 2 insertions, 10 deletions
diff --git a/llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp b/llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp
index 580f682b9a6..82e14dc13cb 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp
@@ -190,9 +190,8 @@ void DebugHandlerBase::beginFunction(const MachineFunction *MF) {
 
   // Calculate history for local variables.
   assert(DbgValues.empty() && "DbgValues map wasn't cleaned!");
-  assert(DbgLabels.empty() && "DbgLabels map wasn't cleaned!");
-  calculateDbgEntityHistory(MF, Asm->MF->getSubtarget().getRegisterInfo(),
-                            DbgValues, DbgLabels);
+  calculateDbgValueHistory(MF, Asm->MF->getSubtarget().getRegisterInfo(),
+                           DbgValues);
   LLVM_DEBUG(DbgValues.dump());
 
   // Request labels for the full history.
@@ -230,12 +229,6 @@ void DebugHandlerBase::beginFunction(const MachineFunction *MF) {
     }
   }
 
-  // Ensure there is a symbol before DBG_LABEL.
-  for (const auto &I : DbgLabels) {
-    const MachineInstr *MI = I.second;
-    requestLabelBeforeInsn(MI);
-  }
-
   PrevInstLoc = DebugLoc();
   PrevLabel = Asm->getFunctionBegin();
   beginFunctionImpl(MF);
@@ -303,7 +296,6 @@ void DebugHandlerBase::endFunction(const MachineFunction *MF) {
   if (hasDebugInfo(MMI, MF))
     endFunctionImpl(MF);
   DbgValues.clear();
-  DbgLabels.clear();
   LabelsBeforeInsn.clear();
   LabelsAfterInsn.clear();
 }