aboutsummaryrefslogtreecommitdiff
path: root/bfd/dwarf2.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2009-09-24 00:11:51 +0000
committerAlan Modra <amodra@gmail.com>2009-09-24 00:11:51 +0000
commit107601c8478d2cdd01459eb870fb719adde1d30e (patch)
treeaca9cb9786a6abb7637029128e3a42373f99c813 /bfd/dwarf2.c
parentffa86b03e5aee9679bb395ed2a5ae5ee2866ccb8 (diff)
downloadgdb-107601c8478d2cdd01459eb870fb719adde1d30e.zip
gdb-107601c8478d2cdd01459eb870fb719adde1d30e.tar.gz
gdb-107601c8478d2cdd01459eb870fb719adde1d30e.tar.bz2
PR binutils/10654
* dwarf2.c (lookup_address_in_line_info_table): Remove workaround for invalid location lists generated by gcc-2.95 and Intel 6.0 C++. Remove "function" parm, adjust caller.
Diffstat (limited to 'bfd/dwarf2.c')
-rw-r--r--bfd/dwarf2.c92
1 files changed, 12 insertions, 80 deletions
diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
index b54ef6e..5d504c8 100644
--- a/bfd/dwarf2.c
+++ b/bfd/dwarf2.c
@@ -1495,95 +1495,27 @@ decode_line_info (struct comp_unit *unit, struct dwarf2_debug *stash)
static bfd_boolean
lookup_address_in_line_info_table (struct line_info_table *table,
bfd_vma addr,
- struct funcinfo *function,
const char **filename_ptr,
unsigned int *linenumber_ptr)
{
/* Note: table->last_line should be a descendingly sorted list. */
- struct line_info* next_line = table->last_line;
- struct line_info* each_line = NULL;
- *filename_ptr = NULL;
-
- if (!next_line)
- return FALSE;
-
- each_line = next_line->prev_line;
-
- /* Check for large addresses */
- if (addr > next_line->address)
- each_line = NULL; /* ensure we skip over the normal case */
-
- /* Normal case: search the list; save */
- while (each_line && next_line)
- {
- /* If we have an address match, save this info. This allows us
- to return as good as results as possible for strange debugging
- info. */
- bfd_boolean addr_match = FALSE;
- if (each_line->address <= addr && addr < next_line->address)
- {
- addr_match = TRUE;
-
- /* If this line appears to span functions, and addr is in the
- later function, return the first line of that function instead
- of the last line of the earlier one. This check is for GCC
- 2.95, which emits the first line number for a function late. */
-
- if (function != NULL)
- {
- bfd_vma lowest_pc;
- struct arange *arange;
-
- /* Find the lowest address in the function's range list */
- lowest_pc = function->arange.low;
- for (arange = &function->arange;
- arange;
- arange = arange->next)
- {
- if (function->arange.low < lowest_pc)
- lowest_pc = function->arange.low;
- }
- /* Check for spanning function and set outgoing line info */
- if (addr >= lowest_pc
- && each_line->address < lowest_pc
- && next_line->address > lowest_pc)
- {
- *filename_ptr = next_line->filename;
- *linenumber_ptr = next_line->line;
- }
- else
- {
- *filename_ptr = each_line->filename;
- *linenumber_ptr = each_line->line;
- }
- }
- else
- {
- *filename_ptr = each_line->filename;
- *linenumber_ptr = each_line->line;
- }
- }
-
- if (addr_match && !each_line->end_sequence)
- return TRUE; /* we have definitely found what we want */
+ struct line_info *each_line;
- next_line = each_line;
- each_line = each_line->prev_line;
- }
+ for (each_line = table->last_line;
+ each_line;
+ each_line = each_line->prev_line)
+ if (addr >= each_line->address)
+ break;
- /* At this point each_line is NULL but next_line is not. If we found
- a candidate end-of-sequence point in the loop above, we can return
- that (compatibility with a bug in the Intel compiler); otherwise,
- assuming that we found the containing function for this address in
- this compilation unit, return the first line we have a number for
- (compatibility with GCC 2.95). */
- if (*filename_ptr == NULL && function != NULL)
+ if (each_line
+ && !(each_line->end_sequence || each_line == table->last_line))
{
- *filename_ptr = next_line->filename;
- *linenumber_ptr = next_line->line;
+ *filename_ptr = each_line->filename;
+ *linenumber_ptr = each_line->line;
return TRUE;
}
+ *filename_ptr = NULL;
return FALSE;
}
@@ -2298,7 +2230,7 @@ comp_unit_find_nearest_line (struct comp_unit *unit,
if (func_p && (function->tag == DW_TAG_inlined_subroutine))
stash->inliner_chain = function;
line_p = lookup_address_in_line_info_table (unit->line_table, addr,
- function, filename_ptr,
+ filename_ptr,
linenumber_ptr);
return line_p || func_p;
}