diff --git a/llvm/lib/CodeGen/MachineDebugify.cpp b/llvm/lib/CodeGen/MachineDebugify.cpp
index bffdd51bfbca7..9b9cebc74054d 100644
--- a/llvm/lib/CodeGen/MachineDebugify.cpp
+++ b/llvm/lib/CodeGen/MachineDebugify.cpp
@@ -123,10 +123,14 @@ bool applyDebugifyMetadataToMachineFunction(MachineModuleInfo &MMI,
 
       // Find a suitable local variable for the DBG_VALUE.
       unsigned Line = MI.getDebugLoc().getLine();
-      if (!Line2Var.count(Line))
+      auto It = Line2Var.find(Line);
+      if (It == Line2Var.end()) {
         Line = EarliestDVI ? EarliestDVI->getDebugLoc().getLine()
                            : EarliestDVR->getDebugLoc().getLine();
-      DILocalVariable *LocalVar = Line2Var[Line];
+        It = Line2Var.find(Line);
+        assert(It != Line2Var.end());
+      }
+      DILocalVariable *LocalVar = It->second;
       assert(LocalVar && "No variable for current line?");
       VarSet.insert(LocalVar);