Merge branch 'master' into pr6429-comp-unwindsyms

* master:
  PR6466: broad side-effect free statement elision
  Made utrace probes more robust.
  2008-04-27  William Cohen  <wcohen@redhat.com>
  2008-04-27  William Cohen  <wcohen@redhat.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/staptree.h b/staptree.h
index 136472fd..9adbc822 100644
--- a/staptree.h
+++ b/staptree.h
@@ -470,6 +470,8 @@ struct block: public statement
   std::vector<statement*> statements;
   void print (std::ostream& o) const;
   void visit (visitor* u);
+  block () {}
+  block (statement* car, statement* cdr);
 };
 
 
@@ -605,7 +607,7 @@ std::ostream& operator << (std::ostream& o, const probe_point& k);
 struct probe
 {
   std::vector<probe_point*> locations;
-  block* body;
+  statement* body;
   const token* tok;
   std::vector<vardecl*> locals;
   std::vector<vardecl*> unused_locals;