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, 12 insertions, 0 deletions

diff --git a/staptree.cxx b/staptree.cxx
index 9a69d11b..b6ee3fdf 100644
--- a/staptree.cxx
+++ b/staptree.cxx
@@ -42,6 +42,18 @@ statement::statement ():
 }
 
 
+statement::statement (const token* tok):
+  tok (tok)
+{
+}
+
+
+null_statement::null_statement (const token* tok):
+  statement(tok)
+{
+}
+
+
 statement::~statement ()
 {
 }