summaryrefslogtreecommitdiffstats
path: root/tapsets.cxx
diff options
context:
space:
mode:
authorDave Brolley <brolley@redhat.com>2009-11-10 14:26:34 -0500
committerDave Brolley <brolley@redhat.com>2009-11-10 14:26:34 -0500
commitb513cd75dac185ac258dc8260a01891c30be6251 (patch)
treeb8e44de21178425a34e3b0d2f749b730f20d9610 /tapsets.cxx
parentfd212bd5d99abc3518cf523eb7af2fea5ae206ba (diff)
parentf94baaeed17aba11aa46e9b46f0564217fc9978c (diff)
downloadsystemtap-steved-b513cd75dac185ac258dc8260a01891c30be6251.tar.gz
systemtap-steved-b513cd75dac185ac258dc8260a01891c30be6251.tar.xz
systemtap-steved-b513cd75dac185ac258dc8260a01891c30be6251.zip
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Diffstat (limited to 'tapsets.cxx')
-rw-r--r--tapsets.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/tapsets.cxx b/tapsets.cxx
index 2a893c95..21eeabbe 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -2775,7 +2775,7 @@ dwarf_derived_probe::dwarf_derived_probe(const string& funcname,
if (has_maxactive && (maxactive_val < 0 || maxactive_val > USHRT_MAX))
throw semantic_error ("maxactive value out of range [0,"
+ lex_cast(USHRT_MAX) + "]",
- q.base_loc->tok);
+ q.base_loc->components.front()->tok);
// Expand target variables in the probe body
if (!null_die(scope_die))
@@ -2947,7 +2947,7 @@ dwarf_derived_probe::saveargs(dwarf_query& q, Dwarf_Die* scope_die, dwarf_var_ex
/* trick from visit_target_symbol_context */
target_symbol *tsym = new target_symbol;
- tsym->tok = q.base_loc->tok;
+ tsym->tok = q.base_loc->components.front()->tok;
tsym->base_name = "$";
tsym->base_name += arg_name;