aboutsummaryrefslogtreecommitdiff
path: root/gdb/buildsym.c
diff options
context:
space:
mode:
authorUlrich Weigand <ulrich.weigand@de.ibm.com>2017-10-24 16:33:53 +0200
committerUlrich Weigand <ulrich.weigand@de.ibm.com>2017-10-24 16:33:53 +0200
commit5033013f17524964564dac5d422739ae5214729e (patch)
tree55a405e4aa9374571da53c069e836ae883922982 /gdb/buildsym.c
parent93f4de3929aeb3e21d57950bfa96539599a92f2a (diff)
downloadgdb-5033013f17524964564dac5d422739ae5214729e.zip
gdb-5033013f17524964564dac5d422739ae5214729e.tar.gz
gdb-5033013f17524964564dac5d422739ae5214729e.tar.bz2
Fix gdb.opt/inline-cmds.exp regressions
When sorting pending blocks in end_symtab_get_static_block, blocks with the same starting address must remain in the original order to preserve inline function caller/callee relationships. The original code seems to have implicitly relied on the fact that the glibc qsort implemention actually (in the common case) provides a stable sort, although this is not guaranteed by the standard. But the GNU libstdc++ std::sort implementation is *not* stable. gdb/ChangeLog: 2017-10-24 Ulrich Weigand <uweigand@de.ibm.com> * buildsym.c (end_symtab_get_static_block): Use std::stable_sort.
Diffstat (limited to 'gdb/buildsym.c')
-rw-r--r--gdb/buildsym.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index c556ac1..07bfbd5 100644
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -1249,12 +1249,14 @@ end_symtab_get_static_block (CORE_ADDR end_addr, int expandable, int required)
for (pb = pending_blocks; pb != NULL; pb = pb->next)
barray.push_back (pb->block);
- std::sort (barray.begin (), barray.end (),
- [] (const block *a, const block *b)
- {
- /* Sort blocks in descending order. */
- return BLOCK_START (a) > BLOCK_START (b);
- });
+ /* Sort blocks by start address in descending order. Blocks with the
+ same start address must remain in the original order to preserve
+ inline function caller/callee relationships. */
+ std::stable_sort (barray.begin (), barray.end (),
+ [] (const block *a, const block *b)
+ {
+ return BLOCK_START (a) > BLOCK_START (b);
+ });
int i = 0;
for (pb = pending_blocks; pb != NULL; pb = pb->next)