diff options
| author | Josh Stone <jistone@redhat.com> | 2010-03-18 15:39:42 -0700 |
|---|---|---|
| committer | Josh Stone <jistone@redhat.com> | 2010-03-18 15:48:06 -0700 |
| commit | 9fab2262961c9cd1ab3efea5d362b8a6a1c0c7c3 (patch) | |
| tree | 4710c7737f853cc7d921e21ff1f9136ef32e991d /elaborate.cxx | |
| parent | 8fb91f5fe6cdcab379144f4ebddae6f72816f2c3 (diff) | |
| download | systemtap-steved-9fab2262961c9cd1ab3efea5d362b8a6a1c0c7c3.tar.gz systemtap-steved-9fab2262961c9cd1ab3efea5d362b8a6a1c0c7c3.tar.xz systemtap-steved-9fab2262961c9cd1ab3efea5d362b8a6a1c0c7c3.zip | |
PR11346: Move the skip-badvars logic into const-folding
The const_folder is where we prune constant expressions, like
conditionals based on a @defined($foo), so we want to give this a chance
to work before skip-badvars comes in and throws a warning.
As an added bonus, this makes skip-badvars more generic, so it will work
even for non-dwarf $target variables.
* elaborate.cxx (const_folder::visit_target_symbol): Enact skip-badvars.
* tapsets.cxx (dwarf_var_expanding_visitor::visit_target_symbol): Don't
worry about badvars here anymore. Save the error now, clean up later.
* testsuite/semok/badvar_undefined.stp: Test that @defined with
skip-badvars doesn't throw any warnings.
Diffstat (limited to 'elaborate.cxx')
| -rw-r--r-- | elaborate.cxx | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/elaborate.cxx b/elaborate.cxx index db8abfbb..717192f2 100644 --- a/elaborate.cxx +++ b/elaborate.cxx @@ -3067,6 +3067,7 @@ struct const_folder: public update_visitor void visit_concatenation (concatenation* e); void visit_ternary_expression (ternary_expression* e); void visit_defined_op (defined_op* e); + void visit_target_symbol (target_symbol* e); }; void @@ -3542,6 +3543,29 @@ const_folder::visit_defined_op (defined_op* e) n->visit (this); } +void +const_folder::visit_target_symbol (target_symbol* e) +{ + if (e->probe_context_var.empty() && session.skip_badvars) + { + // Upon user request for ignoring context, the symbol is replaced + // with a literal 0 and a warning message displayed + // XXX this ignores possible side-effects, e.g. in array indexes + literal_number* ln_zero = new literal_number (0); + ln_zero->tok = e->tok; + provide (ln_zero); + if (!session.suppress_warnings) + session.print_warning ("Bad $context variable being substituted with literal 0", + e->tok); + else if (session.verbose > 2) + clog << "Bad $context variable being substituted with literal 0, " + << *e->tok << endl; + relaxed_p = false; + } + else + update_visitor::visit_target_symbol (e); +} + static void semantic_pass_const_fold (systemtap_session& s, bool& relaxed_p) { // Let's simplify statements with constant values. |