More complete solution to deleting blocks and debug info.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@31129 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/MachineDebugInfo.cpp b/lib/CodeGen/MachineDebugInfo.cpp
index a1f4f13..380b8a9 100644
--- a/lib/CodeGen/MachineDebugInfo.cpp
+++ b/lib/CodeGen/MachineDebugInfo.cpp
@@ -1451,6 +1451,7 @@
, LabelID(0)
, ScopeMap()
, RootScope(NULL)
+, DeletedLabelIDs()
, FrameMoves()
{}
MachineDebugInfo::~MachineDebugInfo() {
@@ -1543,20 +1544,18 @@
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,