No need to keep size of DebugLocations vector separately.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@63070 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/CodeGen/DebugLoc.h b/include/llvm/CodeGen/DebugLoc.h
index b6097afe306dbbdd664a91237645c31733324247..baf6583a8ba7ba813fa4d136307e75d8a6cd13a9 100644 (file)
--- a/include/llvm/CodeGen/DebugLoc.h
+++ b/include/llvm/CodeGen/DebugLoc.h
@@ -69,9 +69,6 @@ namespace llvm {
   /// DebugLocTracker - This class tracks debug location information.
   ///
   struct DebugLocTracker {
-    // NumDebugLocations - Size of the DebugLocations vector.
-    unsigned NumDebugLocations;
-
     // DebugLocations - A vector of unique DebugLocTuple's.
     //
     std::vector<DebugLocTuple> DebugLocations;
@@ -80,7 +77,7 @@ namespace llvm {
     // DebugLocations vector.
     DebugIdMapType DebugIdMap;
 
-    DebugLocTracker() : NumDebugLocations(0) {}
+    DebugLocTracker() {}
 
     ~DebugLocTracker() {
       DebugLocations.clear();

diff --git a/lib/CodeGen/MachineFunction.cpp b/lib/CodeGen/MachineFunction.cpp
index c1ab9afe9f68f18fb1e69ea02fe44cace411a894..abd84ecbd5c353fc13f8e6c920025897b096bb31 100644 (file)
--- a/lib/CodeGen/MachineFunction.cpp
+++ b/lib/CodeGen/MachineFunction.cpp
@@ -388,9 +388,10 @@ unsigned MachineFunction::lookUpDebugLocId(unsigned Src, unsigned Line,
   if (II != DebugLocInfo.DebugIdMap.end())
     return II->second;
   // Add a new tuple.
+  unsigned Id = DebugLocInfo.DebugLocations.size();
   DebugLocInfo.DebugLocations.push_back(Tuple);
-  DebugLocInfo.DebugIdMap[Tuple] = DebugLocInfo.NumDebugLocations;
-  return DebugLocInfo.NumDebugLocations++;
+  DebugLocInfo.DebugIdMap[Tuple] = Id;
+  return Id;
 }
 
 //===----------------------------------------------------------------------===//