summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--tapsets.cxx6
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e37549dc..18bfc8df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-11 Przemysław Pawełczyk <przemyslaw@pawelczyk.it>
+ Mark Wielaard <mjw@redhat.com>
+
+ * tapsets.cxx (find_variable_and_frame_base): Add scope name to
+ semantic error messages if available.
+
2008-11-06 Wenji Huang <wenji.huang@oracle.com>
PR 6998
diff --git a/tapsets.cxx b/tapsets.cxx
index 8d371a8a..f3b6d3ff 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -1677,6 +1677,9 @@ struct dwflpp
{
throw semantic_error ("unable to find any scopes containing "
+ lex_cast_hex<string>(pc)
+ + ((scope_die == NULL) ? ""
+ : (string (" in ") + dwarf_diename (scope_die)
+ + "(" + dwarf_diename (cu) + ")"))
+ " while searching for local '" + local + "'");
}
@@ -1690,6 +1693,9 @@ struct dwflpp
print_locals (scopes, alternatives);
throw semantic_error ("unable to find local '" + local + "'"
+ " near pc " + lex_cast_hex<string>(pc)
+ + ((scope_die == NULL) ? ""
+ : (string (" in ") + dwarf_diename (scope_die)
+ + "(" + dwarf_diename (cu) + ")"))
+ (alternatives.str() == "" ? "" : (" (alternatives:" + alternatives.str () + ")")));
}