Merge branch 'master' of ssh://sources.redhat.com/git/systemtap

* 'master' of ssh://sources.redhat.com/git/systemtap:
  PR10719 part 1: Partial constant folding
  Simplify null_statement construction
  Fixed PR 11269 by properly handling mmap syscall 'fd' argument.
  Removed rvalue operator check.
  PR 10690 (partial fix).  Handle '.=' operator in procfs probes.

Conflicts:
	tapsets.h

1 files changed, 2 insertions, 0 deletions

diff --git a/staptree.h b/staptree.h
index 5bd69124..62ce37fe 100644
--- a/staptree.h
+++ b/staptree.h
@@ -500,6 +500,7 @@ struct statement
   virtual void visit (visitor* u) = 0;
   const token* tok;
   statement ();
+  statement (const token* tok);
   virtual ~statement ();
 };
 
@@ -555,6 +556,7 @@ struct null_statement: public statement
 {
   void print (std::ostream& o) const;
   void visit (visitor* u);
+  null_statement (const token* tok);
 };