Fix misleading indentation error.

This patch fixes a compile error introduced by my previous change, which
caused the indentation of the following code block to become incorrect.

ChangeLog:

2018-03-20  Stephen Roberts  <stephen.roberts@arm.com>

        * gdb/symtab.c (find_pc_sect_line): fixed indentation.
This commit is contained in:
Stephen Roberts
2018-03-20 16:24:37 +00:00
parent 8c5b71ad6d
commit 7cbe16e99d
2 changed files with 16 additions and 12 deletions

View File

@@ -1,3 +1,7 @@
2018-03-20 Stephen Roberts <stephen.roberts@arm.com>
* gdb/symtab.c (find_pc_sect_line): fixed indentation.
2018-03-20 Stephen Roberts <stephen.roberts@arm.com>
* gdb/symtab.c (find_pc_sect_line): now uses binary search.

View File

@@ -3212,17 +3212,17 @@ find_pc_sect_line (CORE_ADDR pc, struct obj_section *section, int notcurrent)
if (item->pc > pc && (!alt || item->pc < alt->pc))
alt = item;
auto pc_compare = [](const CORE_ADDR & pc,
const struct linetable_entry & lhs)->bool
{
return pc < lhs.pc;
};
auto pc_compare = [](const CORE_ADDR & pc,
const struct linetable_entry & lhs)->bool
{
return pc < lhs.pc;
};
struct linetable_entry *first = item;
struct linetable_entry *last = item + len;
item = std::upper_bound (first, last, pc, pc_compare);
if (item != first)
prev = item - 1; /* Found a matching item. */
struct linetable_entry *first = item;
struct linetable_entry *last = item + len;
item = std::upper_bound (first, last, pc, pc_compare);
if (item != first)
prev = item - 1; /* Found a matching item. */
/* At this point, prev points at the line whose start addr is <= pc, and
item points at the next line. If we ran off the end of the linetable
@@ -3245,10 +3245,10 @@ find_pc_sect_line (CORE_ADDR pc, struct obj_section *section, int notcurrent)
}
/* If another line (denoted by ITEM) is in the linetable and its
PC is after BEST's PC, but before the current BEST_END, then
PC is after BEST's PC, but before the current BEST_END, then
use ITEM's PC as the new best_end. */
if (best && item < last && item->pc > best->pc
&& (best_end == 0 || best_end > item->pc))
&& (best_end == 0 || best_end > item->pc))
best_end = item->pc;
}