From 20230942fe3674150ab661738d72f1618b3d4b1b Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sun, 1 Oct 2017 17:39:00 +1030 Subject: [PATCH] PR21957, addr2line incorrectly handles non-increasing sequences in line table PR 21957 * dwarf2.c (new_line_sorts_after): Remove end_sequence comparison. (add_line_info): Always put end_sequence last. --- bfd/ChangeLog | 6 ++++++ bfd/dwarf2.c | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 9a6af67c57c..b51311ec1f1 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2017-10-01 Alan Modra + + PR 21957 + * dwarf2.c (new_line_sorts_after): Remove end_sequence comparison. + (add_line_info): Always put end_sequence last. + 2017-10-01 Alan Modra PR 22047 diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c index 4cf50ccddd0..248e621ad33 100644 --- a/bfd/dwarf2.c +++ b/bfd/dwarf2.c @@ -1420,9 +1420,7 @@ new_line_sorts_after (struct line_info *new_line, struct line_info *line) { return (new_line->address > line->address || (new_line->address == line->address - && (new_line->op_index > line->op_index - || (new_line->op_index == line->op_index - && new_line->end_sequence < line->end_sequence)))); + && new_line->op_index > line->op_index)); } @@ -1508,7 +1506,8 @@ add_line_info (struct line_info_table *table, table->sequences = seq; table->num_sequences++; } - else if (new_line_sorts_after (info, seq->last_line)) + else if (info->end_sequence + || new_line_sorts_after (info, seq->last_line)) { /* Normal case: add 'info' to the beginning of the current sequence. */ info->prev_line = seq->last_line; -- 2.30.2