From c39cdd5565f718302057242bbfe50e71b69c4f4d Mon Sep 17 00:00:00 2001 From: Wenji Huang Date: Wed, 4 Nov 2009 10:58:58 +0800 Subject: PR10466: print the set-intersection of variables retrieved from each branch * elaborate.h: Remove printargs and add getargs. * tapset-mark.cxx (mark_derived_probe): Ditto. * tapsets.cxx (dwarf_derived_probe,tracepoint_derived_probe): Ditto. * main.cxx (printscript): Make intersection before printing. --- tapset-mark.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tapset-mark.cxx') diff --git a/tapset-mark.cxx b/tapset-mark.cxx index fc9cb274..1ce3c919 100644 --- a/tapset-mark.cxx +++ b/tapset-mark.cxx @@ -59,7 +59,7 @@ struct mark_derived_probe: public derived_probe void print_dupe_stamp (ostream& o); void emit_probe_context_vars (translator_output* o); void initialize_probe_context_vars (translator_output* o); - void printargs (std::ostream &o) const; + void getargs (std::set &arg_set) const; void parse_probe_format (); }; @@ -465,7 +465,7 @@ mark_derived_probe::initialize_probe_context_vars (translator_output* o) } void -mark_derived_probe::printargs(std::ostream &o) const +mark_derived_probe::getargs(std::set &arg_set) const { for (unsigned i = 0; i < mark_args.size(); i++) { @@ -473,13 +473,13 @@ mark_derived_probe::printargs(std::ostream &o) const switch (mark_args[i]->stp_type) { case pe_long: - o << " " << localname << ":long"; + arg_set.insert(localname+":long"); break; case pe_string: - o << " " << localname << ":string"; + arg_set.insert(localname+":string"); break; default: - o << " " << localname << ":unknown"; + arg_set.insert(localname+":unknown"); break; } } -- cgit