1 files changed, 9 insertions, 10 deletions
diff --git a/lib/CodeGen/MachineDebugInfo.cpp b/lib/CodeGen/MachineDebugInfo.cpp
index a1f4f1338b..380b8a9656 100644
--- a/lib/CodeGen/MachineDebugInfo.cpp
+++ b/lib/CodeGen/MachineDebugInfo.cpp
@@ -1451,6 +1451,7 @@ MachineDebugInfo::MachineDebugInfo()
 , LabelID(0)
 , ScopeMap()
 , RootScope(NULL)
+, DeletedLabelIDs()
 , FrameMoves()
 {}
 MachineDebugInfo::~MachineDebugInfo() {
@@ -1543,20 +1544,18 @@ unsigned MachineDebugInfo::RecordLabel(unsigned Line, unsigned Column,
   return ID;
 }
 
-static bool LabelUIDComparison(const SourceLineInfo &LI, unsigned UID) {
-  return LI.getLabelID() < UID;
+/// InvalidateLabel - Inhibit use of the specified label # from
+/// MachineDebugInfo, for example because the code was deleted.
+void MachineDebugInfo::InvalidateLabel(unsigned LabelID) {
+  DeletedLabelIDs.insert(LabelID);
 }
 
-/// RemoveLabelInfo - Remove the specified label # from MachineDebugInfo, for
-/// example because the code was deleted.
-void MachineDebugInfo::RemoveLabelInfo(unsigned LabelUID) {
-  std::vector<SourceLineInfo>::iterator I =
-    std::lower_bound(Lines.begin(), Lines.end(), LabelUID, LabelUIDComparison);
-  assert(I != Lines.end() && "Didn't find label UID in MachineDebugInfo!");
-  Lines.erase(I);
+/// isLabelValid - Check to make sure the label is still valid before
+/// attempting to use.
+bool MachineDebugInfo::isLabelValid(unsigned LabelID) {
+  return DeletedLabelIDs.find(LabelID) == DeletedLabelIDs.end();
 }
 
-
 /// RecordSource - Register a source file with debug info. Returns an source
 /// ID.
 unsigned MachineDebugInfo::RecordSource(const std::string &Directory,