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.

3 files changed, 18 insertions, 0 deletions

diff --git a/testsuite/semko/fortyfour.stp b/testsuite/semko/fortyfour.stp
new file mode 100755
index 00000000..8f3caeeb
--- /dev/null
+++ b/testsuite/semko/fortyfour.stp
@@ -0,0 +1,5 @@
+#! stap -p2
+
+probe foo = bar {}
+probe bar = foo {}
+probe foo {}
diff --git a/testsuite/semko/fortythree.stp b/testsuite/semko/fortythree.stp
new file mode 100755
index 00000000..cbf52a91
--- /dev/null
+++ b/testsuite/semko/fortythree.stp
@@ -0,0 +1,4 @@
+#! stap -p2
+
+probe foo.bar = foo.* { }
+probe foo.* { }
diff --git a/testsuite/semok/thirty.stp b/testsuite/semok/thirty.stp
new file mode 100755
index 00000000..27612ed0
--- /dev/null
+++ b/testsuite/semok/thirty.stp
@@ -0,0 +1,9 @@
+#! stap -p2
+
+probe foo.a.one = foo.b, foo.c {} // not recursive
+probe foo.a.two = foo.c, foo.b {} // not recursive
+probe foo.b = foo.c {}
+probe foo.c = begin {}
+probe foo.a.one {}
+probe foo.a.two {}
+