diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2007-12-14 11:08:51 -0500 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2007-12-14 11:08:51 -0500 |
| commit | 06e0853b32f53f33d791a99d21e630800642a442 (patch) | |
| tree | d94038318e93302e360e2f855f77dc6b8eec1f3f /tapsets.cxx | |
| parent | e9369426e1146a2373ac47c11647bdd70d41f7be (diff) | |
| parent | 149eaccd1d42882b20471c4fdae07c32024cc654 (diff) | |
| download | systemtap-steved-06e0853b32f53f33d791a99d21e630800642a442.tar.gz systemtap-steved-06e0853b32f53f33d791a99d21e630800642a442.tar.xz systemtap-steved-06e0853b32f53f33d791a99d21e630800642a442.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Diffstat (limited to 'tapsets.cxx')
| -rw-r--r-- | tapsets.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tapsets.cxx b/tapsets.cxx index 35fe1e4b..d2cd3bcd 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -3642,11 +3642,16 @@ dwarf_derived_probe::dwarf_derived_probe(const string& funcname, this->tok = q.base_probe->tok; + // add condition from base location + if (q.base_loc->condition) + add_condition (q.base_loc->condition); + insert_condition_statement (); + // Make a target-variable-expanded copy of the probe body if (scope_die) { dwarf_var_expanding_copy_visitor v (q, scope_die, dwfl_addr); - require <block*> (&v, &(this->body), q.base_probe->body); + require <block*> (&v, &(this->body), this->body); // If during target-variable-expanding the probe, we added a new block // of code, add it to the start of the probe. @@ -3718,9 +3723,6 @@ dwarf_derived_probe::dwarf_derived_probe(const string& funcname, (TOK_MAXACTIVE, new literal_number(maxactive_val))); locations.push_back(new probe_point(comps, q.base_loc->tok)); - if (q.base_loc->condition) - add_condition (q.base_loc->condition); - insert_condition_statement (); } |