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

diff --git a/tapsets.h b/tapsets.h
index bdaf3201..1d5ba942 100644
--- a/tapsets.h
+++ b/tapsets.h
@@ -50,8 +50,10 @@ struct var_expanding_visitor: public update_visitor
   static unsigned tick;
   std::stack<functioncall**> target_symbol_setter_functioncalls;
   std::stack<defined_op*> defined_ops;
+  std::set<std::string> valid_ops;
+  std::string *op;
 
-  var_expanding_visitor() {}
+  var_expanding_visitor ();
   void visit_assignment (assignment* e);
   void visit_defined_op (defined_op* e);
 };