[Lldb-commits] [lldb] r129724 - /lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp

[Johnny Chen]

Author: johnny
Date: Mon Apr 18 17:11:31 2011
New Revision: 129724

URL: http://llvm.org/viewvc/llvm-project?rev=129724&view=rev
Log:
Rename some variables, no functionality change.

Modified:
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp

Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp?rev=129724&r1=129723&r2=129724&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp Mon Apr 18 17:11:31 2011
@@ -292,8 +292,6 @@
 void
 DWARFDebugAranges::Sort()
 {    
-    std::vector<size_t> indices;
-    size_t end;
     Timer scoped_timer(__PRETTY_FUNCTION__, "%s this = %p",
                        __PRETTY_FUNCTION__, this);
 
@@ -302,8 +300,9 @@
 
     // Merge all neighbouring ranges into a single range and remember the
     // indices of all ranges merged.
-    end = m_aranges.size();
-    for (size_t merge, cursor = 1; cursor < end; ++cursor)
+    const size_t old_size = m_aranges.size();
+    std::vector<size_t> merged;
+    for (size_t merge, cursor = 1; cursor < old_size; ++cursor)
     {
         merge = cursor - 1;
         Range &r1 = m_aranges[merge];
@@ -312,18 +311,18 @@
         if (r1.hi_pc == r2.lo_pc && r1.offset == r2.offset)
         {
             r2.lo_pc = r1.lo_pc;
-            indices.push_back(merge);
+            merged.push_back(merge);
         }
     }
 
-    if (indices.empty())
+    if (merged.empty())
         return;
 
     // Remove the merged ranges by shifting down all the keepers...
-    size_t new_size = m_aranges.size() - indices.size();
+    const size_t new_size = old_size - merged.size();
     for (size_t i = 0, src = 0, dst = 0; dst < new_size; ++src, ++dst)
     {
-        while (src == indices[i]) {
+        while (src == merged[i]) {
             ++src;
             ++i;
         }