summaryrefslogtreecommitdiffstats
path: root/tapsets.cxx
diff options
context:
space:
mode:
authorJim Keniston <jkenisto@us.ibm.com>2008-10-03 14:11:41 -0700
committerJim Keniston <jkenisto@us.ibm.com>2008-10-03 14:11:41 -0700
commitb678f438a390da7f9a6712a22c95d069dfd6643b (patch)
tree2bf12daf34f2f534af8add9c3aa93afd1abdf38b /tapsets.cxx
parentde50692ab43992557f4e0b719e09c0a88127a603 (diff)
parent748eea887135ac44f5c4b0a7499225d4cb2cbefe (diff)
downloadsystemtap-steved-b678f438a390da7f9a6712a22c95d069dfd6643b.tar.gz
systemtap-steved-b678f438a390da7f9a6712a22c95d069dfd6643b.tar.xz
systemtap-steved-b678f438a390da7f9a6712a22c95d069dfd6643b.zip
Merge branch 'master' of ssh://kenistoj@sources.redhat.com/git/systemtap
Diffstat (limited to 'tapsets.cxx')
-rw-r--r--tapsets.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/tapsets.cxx b/tapsets.cxx
index b1475997..a5a62c7a 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -2241,7 +2241,8 @@ struct dwflpp
{
die = dwarf_formref_die (&attr_mem, &vardie);
stringstream alternatives;
- print_members(die,alternatives);
+ if (die != NULL)
+ print_members(die,alternatives);
throw semantic_error("unable to find local '" + local + "'"
+ " near pc " + lex_cast_hex<string>(pc)
+ (alternatives.str() == "" ? "" : (" (alternatives:" + alternatives.str () + ")")));
@@ -2317,7 +2318,8 @@ struct dwflpp
{
die = dwarf_formref_die (&attr_mem, vardie);
stringstream alternatives;
- print_members(die,alternatives);
+ if (die != NULL)
+ print_members(die,alternatives);
throw semantic_error("unable to find return value"
" near pc " + lex_cast_hex<string>(pc)
+ (alternatives.str() == "" ? "" : (" (alternatives:" + alternatives.str () + ")")));