maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Rename some variables, no functionality change. 

llvm-svn: 129724
This commit is contained in:
Johnny Chen 2011-04-18 22:11:31 +00:00
parent ddac5dd269
commit a6ca9fb407
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp
View File

@ -292,8 +292,6 @@ DWARFDebugAranges::AppendRange (dw_offset_t offset, dw_addr_t low_pc, dw_addr_t
void void
DWARFDebugAranges::Sort() DWARFDebugAranges::Sort()
{ {
std::vector<size_t> indices;
size_t end;
Timer scoped_timer(__PRETTY_FUNCTION__, "%s this = %p", Timer scoped_timer(__PRETTY_FUNCTION__, "%s this = %p",
__PRETTY_FUNCTION__, this); __PRETTY_FUNCTION__, this);
@ -302,8 +300,9 @@ DWARFDebugAranges::Sort()
// Merge all neighbouring ranges into a single range and remember the // Merge all neighbouring ranges into a single range and remember the
// indices of all ranges merged. // indices of all ranges merged.
end = m_aranges.size(); const size_t old_size = m_aranges.size();
for (size_t merge, cursor = 1; cursor < end; ++cursor) std::vector<size_t> merged;
for (size_t merge, cursor = 1; cursor < old_size; ++cursor)
{ {
merge = cursor - 1; merge = cursor - 1;
Range &r1 = m_aranges[merge]; Range &r1 = m_aranges[merge];
@ -312,18 +311,18 @@ DWARFDebugAranges::Sort()
if (r1.hi_pc == r2.lo_pc && r1.offset == r2.offset) if (r1.hi_pc == r2.lo_pc && r1.offset == r2.offset)
{ {
r2.lo_pc = r1.lo_pc; r2.lo_pc = r1.lo_pc;
indices.push_back(merge); merged.push_back(merge);
} }
} }
if (indices.empty()) if (merged.empty())
return; return;
// Remove the merged ranges by shifting down all the keepers... // 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) for (size_t i = 0, src = 0, dst = 0; dst < new_size; ++src, ++dst)
{ {
while (src == indices[i]) { while (src == merged[i]) {
++src; ++src;
++i; ++i;
} }