This fixes a latent issue in maybe_build_generic_op.
Bootstrapped and tested on x86_64-unknown-linux-gnu, applied.
Richard.
2016-04-20 Richard Biener <rguent...@suse.de>
* gimple-match.h (maybe_build_generic_op): Adjust prototype.
* gimple-match-head.c (maybe_build_generic_op): Pass all ops
by reference, clear op1 and op2 when GENERICizing BIT_FIELD_REF.
(maybe_push_res_to_seq): Adjust.
* gimple-fold.c (maybe_build_generic_op): Likewise.
Index: gcc/gimple-fold.c
===================================================================
--- gcc/gimple-fold.c (revision 235272)
+++ gcc/gimple-fold.c (working copy)
@@ -3376,8 +3376,7 @@ replace_stmt_with_simplification (gimple
|| gimple_num_ops (stmt) > get_gimple_rhs_num_ops (rcode))
{
maybe_build_generic_op (rcode,
- TREE_TYPE (gimple_assign_lhs (stmt)),
- &ops[0], ops[1], ops[2]);
+ TREE_TYPE (gimple_assign_lhs (stmt)), ops);
gimple_assign_set_rhs_with_ops (gsi, rcode, ops[0], ops[1], ops[2]);
if (dump_file && (dump_flags & TDF_DETAILS))
{
Index: gcc/gimple-match-head.c
===================================================================
--- gcc/gimple-match-head.c (revision 235272)
+++ gcc/gimple-match-head.c (working copy)
@@ -233,18 +233,18 @@ gimple_resimplify3 (gimple_seq *seq,
a GENERIC tree for that expression into *OP0. */
void
-maybe_build_generic_op (enum tree_code code, tree type,
- tree *op0, tree op1, tree op2)
+maybe_build_generic_op (enum tree_code code, tree type, tree *ops)
{
switch (code)
{
case REALPART_EXPR:
case IMAGPART_EXPR:
case VIEW_CONVERT_EXPR:
- *op0 = build1 (code, type, *op0);
+ ops[0] = build1 (code, type, ops[0]);
break;
case BIT_FIELD_REF:
- *op0 = build3 (code, type, *op0, op1, op2);
+ ops[0] = build3 (code, type, ops[0], ops[1], ops[2]);
+ ops[1] = ops[2] = NULL_TREE;
break;
default:;
}
@@ -316,7 +316,7 @@ maybe_push_res_to_seq (code_helper rcode
else
res = create_tmp_reg (type);
}
- maybe_build_generic_op (rcode, type, &ops[0], ops[1], ops[2]);
+ maybe_build_generic_op (rcode, type, ops);
gimple *new_stmt = gimple_build_assign (res, rcode,
ops[0], ops[1], ops[2]);
gimple_seq_add_stmt_without_update (seq, new_stmt);
Index: gcc/gimple-match.h
===================================================================
--- gcc/gimple-match.h (revision 235272)
+++ gcc/gimple-match.h (working copy)
@@ -64,7 +64,7 @@ bool gimple_resimplify3 (gimple_seq *, c
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 *, tree, tree);
+void maybe_build_generic_op (enum tree_code, tree, tree *);
#endif /* GCC_GIMPLE_MATCH_H */
