--- a/gcc/gimple-match.h	Fri Oct 27 22:46:09 2017 +0900
+++ b/gcc/gimple-match.h	Thu Oct 25 07:37:49 2018 +0900
@@ -1,6 +1,6 @@
 /* Gimple simplify definitions.
 
-   Copyright (C) 2011-2017 Free Software Foundation, Inc.
+   Copyright (C) 2011-2018 Free Software Foundation, Inc.
    Contributed by Richard Guenther <rguenther@suse.de>
 
 This file is part of GCC.
@@ -40,31 +40,305 @@
   int rep;
 };
 
-/* Return whether OPS[0] with CODE is a non-expression result and
-   a gimple value.  */
+/* Represents the condition under which an operation should happen,
+   and the value to use otherwise.  The condition applies elementwise
+   (as for VEC_COND_EXPR) if the values are vectors.  */
+struct gimple_match_cond
+{
+  enum uncond { UNCOND };
+
+  /* Build an unconditional op.  */
+  gimple_match_cond (uncond) : cond (NULL_TREE), else_value (NULL_TREE) {}
+  gimple_match_cond (tree, tree);
+
+  gimple_match_cond any_else () const;
+
+  /* The condition under which the operation occurs, or NULL_TREE
+     if the operation is unconditional.  */
+  tree cond;
+
+  /* The value to use when the condition is false.  This is NULL_TREE if
+     the operation is unconditional or if the value doesn't matter.  */
+  tree else_value;
+};
+
+inline
+gimple_match_cond::gimple_match_cond (tree cond_in, tree else_value_in)
+  : cond (cond_in), else_value (else_value_in)
+{
+}
+
+/* Return a gimple_match_cond with the same condition but with an
+   arbitrary ELSE_VALUE.  */
+
+inline gimple_match_cond
+gimple_match_cond::any_else () const
+{
+  return gimple_match_cond (cond, NULL_TREE);
+}
+
+/* Represents an operation to be simplified, or the result of the
+   simplification.  */
+struct gimple_match_op
+{
+  gimple_match_op ();
+  gimple_match_op (const gimple_match_cond &, code_helper, tree, unsigned int);
+  gimple_match_op (const gimple_match_cond &,
+		   code_helper, tree, tree);
+  gimple_match_op (const gimple_match_cond &,
+		   code_helper, tree, tree, tree);
+  gimple_match_op (const gimple_match_cond &,
+		   code_helper, tree, tree, tree, tree);
+  gimple_match_op (const gimple_match_cond &,
+		   code_helper, tree, tree, tree, tree, tree);
+  gimple_match_op (const gimple_match_cond &,
+		   code_helper, tree, tree, tree, tree, tree, tree);
+
+  void set_op (code_helper, tree, unsigned int);
+  void set_op (code_helper, tree, tree);
+  void set_op (code_helper, tree, tree, tree);
+  void set_op (code_helper, tree, tree, tree, tree);
+  void set_op (code_helper, tree, tree, tree, tree, bool);
+  void set_op (code_helper, tree, tree, tree, tree, tree);
+  void set_op (code_helper, tree, tree, tree, tree, tree, tree);
+  void set_value (tree);
+
+  tree op_or_null (unsigned int) const;
+
+  /* The maximum value of NUM_OPS.  */
+  static const unsigned int MAX_NUM_OPS = 5;
 
-inline bool
-gimple_simplified_result_is_gimple_val (code_helper code, tree *ops)
+  /* The conditions under which the operation is performed, and the value to
+     use as a fallback.  */
+  gimple_match_cond cond;
+
+  /* The operation being performed.  */
+  code_helper code;
+
+  /* The type of the result.  */
+  tree type;
+
+  /* For a BIT_FIELD_REF, whether the group of bits is stored in reverse order
+     from the target order.  */
+  bool reverse;
+
+  /* The number of operands to CODE.  */
+  unsigned int num_ops;
+
+  /* The operands to CODE.  Only the first NUM_OPS entries are meaningful.  */
+  tree ops[MAX_NUM_OPS];
+};
+
+inline
+gimple_match_op::gimple_match_op ()
+  : cond (gimple_match_cond::UNCOND), type (NULL_TREE), reverse (false),
+    num_ops (0)
 {
-  return (code.is_tree_code ()
-	  && (TREE_CODE_LENGTH ((tree_code) code) == 0
-	      || ((tree_code) code) == ADDR_EXPR)
-	  && is_gimple_val (ops[0]));
+}
+
+/* Constructor that takes the condition, code, type and number of
+   operands, but leaves the caller to fill in the operands.  */
+
+inline
+gimple_match_op::gimple_match_op (const gimple_match_cond &cond_in,
+				  code_helper code_in, tree type_in,
+				  unsigned int num_ops_in)
+  : cond (cond_in), code (code_in), type (type_in), reverse (false),
+    num_ops (num_ops_in)
+{
+}
+
+/* Constructors for various numbers of operands.  */
+
+inline
+gimple_match_op::gimple_match_op (const gimple_match_cond &cond_in,
+				  code_helper code_in, tree type_in,
+				  tree op0)
+  : cond (cond_in), code (code_in), type (type_in), reverse (false),
+    num_ops (1)
+{
+  ops[0] = op0;
+}
+
+inline
+gimple_match_op::gimple_match_op (const gimple_match_cond &cond_in,
+				  code_helper code_in, tree type_in,
+				  tree op0, tree op1)
+  : cond (cond_in), code (code_in), type (type_in), reverse (false), 
+    num_ops (2)
+{
+  ops[0] = op0;
+  ops[1] = op1;
+}
+
+inline
+gimple_match_op::gimple_match_op (const gimple_match_cond &cond_in,
+				  code_helper code_in, tree type_in,
+				  tree op0, tree op1, tree op2)
+  : cond (cond_in), code (code_in), type (type_in), reverse (false),
+    num_ops (3)
+{
+  ops[0] = op0;
+  ops[1] = op1;
+  ops[2] = op2;
 }
 
-extern tree (*mprts_hook) (code_helper, tree, tree *);
+inline
+gimple_match_op::gimple_match_op (const gimple_match_cond &cond_in,
+				  code_helper code_in, tree type_in,
+				  tree op0, tree op1, tree op2, tree op3)
+  : cond (cond_in), code (code_in), type (type_in), reverse (false),
+    num_ops (4)
+{
+  ops[0] = op0;
+  ops[1] = op1;
+  ops[2] = op2;
+  ops[3] = op3;
+}
+
+inline
+gimple_match_op::gimple_match_op (const gimple_match_cond &cond_in,
+				  code_helper code_in, tree type_in,
+				  tree op0, tree op1, tree op2, tree op3,
+				  tree op4)
+  : cond (cond_in), code (code_in), type (type_in), reverse (false),
+    num_ops (5)
+{
+  ops[0] = op0;
+  ops[1] = op1;
+  ops[2] = op2;
+  ops[3] = op3;
+  ops[4] = op4;
+}
+
+/* Change the operation performed to CODE_IN, the type of the result to
+   TYPE_IN, and the number of operands to NUM_OPS_IN.  The caller needs
+   to set the operands itself.  */
+
+inline void
+gimple_match_op::set_op (code_helper code_in, tree type_in,
+			 unsigned int num_ops_in)
+{
+  code = code_in;
+  type = type_in;
+  num_ops = num_ops_in;
+}
+
+/* Functions for changing the operation performed, for various numbers
+   of operands.  */
+
+inline void
+gimple_match_op::set_op (code_helper code_in, tree type_in, tree op0)
+{
+  code = code_in;
+  type = type_in;
+  num_ops = 1;
+  ops[0] = op0;
+}
+
+inline void
+gimple_match_op::set_op (code_helper code_in, tree type_in, tree op0, tree op1)
+{
+  code = code_in;
+  type = type_in;
+  num_ops = 2;
+  ops[0] = op0;
+  ops[1] = op1;
+}
 
-bool gimple_simplify (gimple *, code_helper *, tree *, gimple_seq *,
+inline void
+gimple_match_op::set_op (code_helper code_in, tree type_in,
+			 tree op0, tree op1, tree op2)
+{
+  code = code_in;
+  type = type_in;
+  num_ops = 3;
+  ops[0] = op0;
+  ops[1] = op1;
+  ops[2] = op2;
+}
+
+inline void
+gimple_match_op::set_op (code_helper code_in, tree type_in,
+			 tree op0, tree op1, tree op2, bool reverse_in)
+{
+  code = code_in;
+  type = type_in;
+  reverse = reverse_in;
+  num_ops = 3;
+  ops[0] = op0;
+  ops[1] = op1;
+  ops[2] = op2;
+}
+
+inline void
+gimple_match_op::set_op (code_helper code_in, tree type_in,
+			 tree op0, tree op1, tree op2, tree op3)
+{
+  code = code_in;
+  type = type_in;
+  num_ops = 4;
+  ops[0] = op0;
+  ops[1] = op1;
+  ops[2] = op2;
+  ops[3] = op3;
+}
+
+inline void
+gimple_match_op::set_op (code_helper code_in, tree type_in,
+			 tree op0, tree op1, tree op2, tree op3, tree op4)
+{
+  code = code_in;
+  type = type_in;
+  num_ops = 5;
+  ops[0] = op0;
+  ops[1] = op1;
+  ops[2] = op2;
+  ops[3] = op3;
+  ops[4] = op4;
+}
+
+/* Set the "operation" to be the single value VALUE, such as a constant
+   or SSA_NAME.  */
+
+inline void
+gimple_match_op::set_value (tree value)
+{
+  set_op (TREE_CODE (value), TREE_TYPE (value), value);
+}
+
+/* Return the value of operand I, or null if there aren't that many
+   operands.  */
+
+inline tree
+gimple_match_op::op_or_null (unsigned int i) const
+{
+  return i < num_ops ? ops[i] : NULL_TREE;
+}
+
+/* Return whether OP is a non-expression result and a gimple value.  */
+
+inline bool
+gimple_simplified_result_is_gimple_val (const gimple_match_op *op)
+{
+  return (op->code.is_tree_code ()
+	  && (TREE_CODE_LENGTH ((tree_code) op->code) == 0
+	      || ((tree_code) op->code) == ADDR_EXPR)
+	  && is_gimple_val (op->ops[0]));
+}
+
+extern tree (*mprts_hook) (gimple_match_op *);
+
+bool gimple_simplify (gimple *, gimple_match_op *, gimple_seq *,
 		      tree (*)(tree), tree (*)(tree));
-bool gimple_resimplify1 (gimple_seq *, code_helper *, tree, tree *,
-			 tree (*)(tree));
-bool gimple_resimplify2 (gimple_seq *, code_helper *, tree, tree *,
-			 tree (*)(tree));
-bool gimple_resimplify3 (gimple_seq *, code_helper *, tree, tree *,
-			 tree (*)(tree));
-tree maybe_push_res_to_seq (code_helper, tree, tree *,
-			    gimple_seq *, tree res = NULL_TREE);
-void maybe_build_generic_op (enum tree_code, tree, tree *);
+bool gimple_resimplify1 (gimple_seq *, gimple_match_op *, tree (*)(tree));
+bool gimple_resimplify2 (gimple_seq *, gimple_match_op *, tree (*)(tree));
+bool gimple_resimplify3 (gimple_seq *, gimple_match_op *, tree (*)(tree));
+bool gimple_resimplify4 (gimple_seq *, gimple_match_op *, tree (*)(tree));
+bool gimple_resimplify5 (gimple_seq *, gimple_match_op *, tree (*)(tree));
+tree maybe_push_res_to_seq (gimple_match_op *, gimple_seq *,
+			    tree res = NULL_TREE);
+void maybe_build_generic_op (gimple_match_op *);
 
 
 #endif  /* GCC_GIMPLE_MATCH_H */