Skip to content

Commit 9bf40fd

Browse files
committed
[lldb] Use sort-ordering for indexes when sorting by size (llvm#83889)
Use sort-ordering for indexes when sorting by size. This addresses Jason's post commit review feedback. (cherry picked from commit 1da5db9)
1 parent 26679c8 commit 9bf40fd

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

lldb/source/Symbol/Symtab.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,11 @@ void Symtab::Dump(Stream *s, Target *target, SortOrder sort_order,
146146
for (const Symbol &symbol : m_symbols)
147147
size_map.emplace(symbol.GetByteSize(), &symbol);
148148

149+
size_t idx = 0;
149150
for (const auto &size_to_symbol : size_map) {
150151
const Symbol *symbol = size_to_symbol.second;
151152
s->Indent();
152-
symbol->Dump(s, target, symbol - &m_symbols[0], name_preference);
153+
symbol->Dump(s, target, idx++, name_preference);
153154
}
154155
} break;
155156

lldb/test/Shell/SymbolFile/Breakpad/symtab-sorted-by-size.test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
# CHECK: num_symbols = 4 (sorted by size):
66
# CHECK: [ 0] 0 SX Code 0x0000000000400000 0x00000000000000b0 0x00000000 ___lldb_unnamed_symbol0
7-
# CHECK: [ 3] 0 X Code 0x00000000004000d0 0x0000000000000022 0x00000000 _start
8-
# CHECK: [ 1] 0 X Code 0x00000000004000b0 0x0000000000000010 0x00000000 f1
9-
# CHECK: [ 2] 0 X Code 0x00000000004000c0 0x0000000000000010 0x00000000 f2
7+
# CHECK: [ 1] 0 X Code 0x00000000004000d0 0x0000000000000022 0x00000000 _start
8+
# CHECK: [ 2] 0 X Code 0x00000000004000b0 0x0000000000000010 0x00000000 f1
9+
# CHECK: [ 3] 0 X Code 0x00000000004000c0 0x0000000000000010 0x00000000 f2
1010

1111
image dump symtab -s size symtab.out

0 commit comments

Comments
 (0)