Skip to content

Commit 1da5db9

Browse files
authored
[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.
1 parent 32e2294 commit 1da5db9

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
@@ -142,10 +142,11 @@ void Symtab::Dump(Stream *s, Target *target, SortOrder sort_order,
142142
for (const Symbol &symbol : m_symbols)
143143
size_map.emplace(symbol.GetByteSize(), &symbol);
144144

145+
size_t idx = 0;
145146
for (const auto &size_to_symbol : size_map) {
146147
const Symbol *symbol = size_to_symbol.second;
147148
s->Indent();
148-
symbol->Dump(s, target, symbol - &m_symbols[0], name_preference);
149+
symbol->Dump(s, target, idx++, name_preference);
149150
}
150151
} break;
151152

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)