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, 1 insertions, 5 deletions

diff --git a/parse.cxx b/parse.cxx
index b867f98d..b2daa178 100644
--- a/parse.cxx
+++ b/parse.cxx
@@ -1289,11 +1289,7 @@ parser::parse_statement ()
   statement *ret;
   const token* t = peek ();
   if (t && t->type == tok_operator && t->content == ";")
-    {
-      null_statement* n = new null_statement ();
-      n->tok = next ();
-      return n;
-    }
+    return new null_statement (next ());
   else if (t && t->type == tok_operator && t->content == "{")
     return parse_stmt_block (); // Don't squash semicolons.
   else if (t && t->type == tok_keyword && t->content == "if")