From a6ca9fb4072d32381079c3c699978bb1271bc3c9 Mon Sep 17 00:00:00 2001 From: Johnny Chen Date: Mon, 18 Apr 2011 22:11:31 +0000 Subject: [PATCH] Rename some variables, no functionality change. llvm-svn: 129724 --- .../SymbolFile/DWARF/DWARFDebugAranges.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp index 89d0d4a90f24..ebc3fdcd4f37 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp @@ -292,8 +292,6 @@ DWARFDebugAranges::AppendRange (dw_offset_t offset, dw_addr_t low_pc, dw_addr_t void DWARFDebugAranges::Sort() { - std::vector indices; - size_t end; Timer scoped_timer(__PRETTY_FUNCTION__, "%s this = %p", __PRETTY_FUNCTION__, this); @@ -302,8 +300,9 @@ DWARFDebugAranges::Sort() // 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 merged; + for (size_t merge, cursor = 1; cursor < old_size; ++cursor) { merge = cursor - 1; Range &r1 = m_aranges[merge]; @@ -312,18 +311,18 @@ DWARFDebugAranges::Sort() 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; }