diff options
| author | Dave Brolley <brolley@redhat.com> | 2008-09-12 11:26:06 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2008-09-12 11:26:06 -0400 |
| commit | 87fa559f6de5e781f3ba2fe150d7421fb7d75efa (patch) | |
| tree | 5d4218da9b0f949954a1e0ce320b17d131a369fd /tapsets.cxx | |
| parent | 2c92c3026644f70f2628949a5cc0f94506a46ff5 (diff) | |
| parent | 3438f38f647db43bfc06b12930b7dfc14af7d67d (diff) | |
| download | systemtap-steved-87fa559f6de5e781f3ba2fe150d7421fb7d75efa.tar.gz systemtap-steved-87fa559f6de5e781f3ba2fe150d7421fb7d75efa.tar.xz systemtap-steved-87fa559f6de5e781f3ba2fe150d7421fb7d75efa.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Conflicts:
ChangeLog
Diffstat (limited to 'tapsets.cxx')
| -rw-r--r-- | tapsets.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/tapsets.cxx b/tapsets.cxx index 308cef1f..4d47dca1 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -3458,13 +3458,8 @@ query_func_info (Dwarf_Addr entrypc, } else { - if (q->sess.prologue_searching - && !q->has_statement_str && !q->has_statement_num - && !q->sess.ignore_vmlinux && !q->sess.ignore_dwarf) // PR 2608 + if (fi.prologue_end != 0) { - if (fi.prologue_end == 0) - throw semantic_error("could not find prologue-end " - "for probed function '" + fi.name + "'"); query_statement (fi.name, fi.decl_file, fi.decl_line, &fi.die, fi.prologue_end, q); } @@ -3718,7 +3713,7 @@ query_cu (Dwarf_Die * cudie, void * arg) if (rc != DWARF_CB_OK) q->query_done = true; - if (q->sess.prologue_searching + if ((q->sess.prologue_searching || q->has_process) // PR 6871 && !q->has_statement_str && !q->has_statement_num) // PR 2608 if (! q->filtered_functions.empty()) q->dw.resolve_prologue_endings (q->filtered_functions); |