git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dwarf.c (read_function_entry): Add vec_inlined parameter. 

* dwarf.c (read_function_entry): Add vec_inlined parameter.
	Change all callers.

From-SVN: r226878
This commit is contained in:
Ian Lance Taylor 2015-08-13 22:56:01 +00:00 committed by Ian Lance Taylor
parent cfbbe6decf
commit d96fa208a5
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libbacktrace/ChangeLog
View File

@ -1,3 +1,8 @@
2015-08-13 Ian Lance Taylor <iant@google.com>
* dwarf.c (read_function_entry): Add vec_inlined parameter.
Change all callers.
2015-06-11 Martin Sebor <msebor@redhat.com> 2015-06-11 Martin Sebor <msebor@redhat.com>
PR sanitizer/65479 PR sanitizer/65479

17
libbacktrace/dwarf.c
View File

@ -2250,7 +2250,8 @@ read_function_entry (struct backtrace_state *state, struct dwarf_data *ddata,
struct unit *u, uint64_t base, struct dwarf_buf *unit_buf, struct unit *u, uint64_t base, struct dwarf_buf *unit_buf,
const struct line_header *lhdr, const struct line_header *lhdr,
backtrace_error_callback error_callback, void *data, backtrace_error_callback error_callback, void *data,
struct function_vector *vec) struct function_vector *vec_function,
struct function_vector *vec_inlined)
{ {
while (unit_buf->left > 0) while (unit_buf->left > 0)
{ {
@ -2258,6 +2259,7 @@ read_function_entry (struct backtrace_state *state, struct dwarf_data *ddata,
const struct abbrev *abbrev; const struct abbrev *abbrev;
int is_function; int is_function;
struct function *function; struct function *function;
struct function_vector *vec;
size_t i; size_t i;
uint64_t lowpc; uint64_t lowpc;
int have_lowpc; int have_lowpc;
@ -2279,6 +2281,11 @@ read_function_entry (struct backtrace_state *state, struct dwarf_data *ddata,
|| abbrev->tag == DW_TAG_entry_point || abbrev->tag == DW_TAG_entry_point
|| abbrev->tag == DW_TAG_inlined_subroutine); || abbrev->tag == DW_TAG_inlined_subroutine);
if (abbrev->tag == DW_TAG_inlined_subroutine)
vec = vec_inlined;
else
vec = vec_function;
function = NULL; function = NULL;
if (is_function) if (is_function)
{ {
@ -2458,7 +2465,8 @@ read_function_entry (struct backtrace_state *state, struct dwarf_data *ddata,
if (!is_function) if (!is_function)
{ {
if (!read_function_entry (state, ddata, u, base, unit_buf, lhdr, if (!read_function_entry (state, ddata, u, base, unit_buf, lhdr,
error_callback, data, vec)) error_callback, data, vec_function,
vec_inlined))
return 0; return 0;
} }
else else
@ -2471,7 +2479,8 @@ read_function_entry (struct backtrace_state *state, struct dwarf_data *ddata,
memset (&fvec, 0, sizeof fvec); memset (&fvec, 0, sizeof fvec);
if (!read_function_entry (state, ddata, u, base, unit_buf, lhdr, if (!read_function_entry (state, ddata, u, base, unit_buf, lhdr,
error_callback, data, &fvec)) error_callback, data, vec_function,
&fvec))
return 0; return 0;
if (fvec.count > 0) if (fvec.count > 0)
@ -2535,7 +2544,7 @@ read_function_info (struct backtrace_state *state, struct dwarf_data *ddata,
while (unit_buf.left > 0) while (unit_buf.left > 0)
{ {
if (!read_function_entry (state, ddata, u, 0, &unit_buf, lhdr, if (!read_function_entry (state, ddata, u, 0, &unit_buf, lhdr,
error_callback, data, pfvec)) error_callback, data, pfvec, pfvec))
return; return;
} }