2008-02-13 Dave Brolley <brolley@redhat.com>

        PR5609
        * staptree.h (probe::collect_derivation_chain): Now takes vector<probe*>.
        (probe::get_alias): New virtual method.
        * elaborate.h (derived_probe::collect_derivation_chain): Now takes vector<probe*>.
        * staptree.cxx (probe::collect_derivation_chain): Now takes vector<probe*>. Don't
        cast 'this' to (derived_probe*).
        * elaborate.cxx (derived_probe::collect_derivation_chain): Now takes vector<probe*>.
        (alias_derived_probe::get_alias): New virtual method.
        (alias_derived_probe::alias): New member.
        (alias_expansion_builder::build): Call checkForRecursiveExpansion and emit a
        diagnostic if recursion is detected. Pass alias to constructor of
        alias_derived_probe.
        (alias_expansion_builder::checkForRecursiveExpansion): New method.
        * coveragedb.cxx: Pass vector<probe*> on all calls to collect_derivation_chain.

1 files changed, 2 insertions, 1 deletions

diff --git a/staptree.h b/staptree.h
index de5b3726..8235a535 100644
--- a/staptree.h
+++ b/staptree.h
@@ -595,7 +595,8 @@ struct probe
   probe ();
   void print (std::ostream& o) const;
   virtual void printsig (std::ostream &o) const;
-  virtual void collect_derivation_chain (std::vector<derived_probe*> &probes_list);
+  virtual void collect_derivation_chain (std::vector<probe*> &probes_list);
+  virtual const probe_alias *get_alias () const { return 0; }
   virtual probe* basest () { return this; }
   virtual ~probe() {}
   bool privileged;