diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-06-22 11:37:08 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-06-22 11:37:08 -0400 |
| commit | d6454850dd3c9d74b700924b56378c4c9ab9fa57 (patch) | |
| tree | 6665a24339ca689b1156ea7e93d4f93811c3f794 /tapsets.cxx | |
| parent | d729143af5242b17645d3f405141918940680894 (diff) | |
| parent | 4116c576d5654287b0af598aee4a14eb2af73224 (diff) | |
| download | systemtap-steved-d6454850dd3c9d74b700924b56378c4c9ab9fa57.tar.gz systemtap-steved-d6454850dd3c9d74b700924b56378c4c9ab9fa57.tar.xz systemtap-steved-d6454850dd3c9d74b700924b56378c4c9ab9fa57.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Diffstat (limited to 'tapsets.cxx')
| -rw-r--r-- | tapsets.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tapsets.cxx b/tapsets.cxx index 2c5e11bc..694905d9 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -1642,6 +1642,7 @@ query_cu (Dwarf_Die * cudie, void * arg) // statement. This is a somewhat lame check that the address // is at the start of an assembly instruction. Mark probes are in the // middle of a macro and thus not strictly at a statement beginning. + // Guru mode may override this check. if (q->has_statement_num && ! q->has_mark) { Dwarf_Addr queryaddr = q->statement_num_val; @@ -1654,7 +1655,12 @@ query_cu (Dwarf_Die * cudie, void * arg) stringstream msg; msg << "address 0x" << hex << queryaddr << " does not match the beginning of a statement"; - throw semantic_error(msg.str()); + if (address_line) + msg << " (try 0x" << hex << lineaddr << ")"; + if (! q->sess.guru_mode) + throw semantic_error(msg.str()); + else if (! q->sess.suppress_warnings) + q->sess.print_warning(msg.str()); } } // Pick up [entrypc, name, DIE] tuples for all the functions |