From f00b6283fbc6d1489f403764fd25c64d37f18ad3 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Sat, 1 Oct 2016 14:34:18 +0000 Subject: re PR middle-end/77798 (465.tonto ICE with trunk with -O2) 2016-10-01 Richard Biener PR middle-end/77798 * genmatch.c (get_operand_type): Add operand position arg and handle COND_EXPR comparison operand with fixed boolean_type_node. (expr::gen_transform): Adjust. (dt_simplify::gen_1): Likewise. * gfortran.fortran-torture/compile/pr77798.f90: New testcase. From-SVN: r240696 --- gcc/genmatch.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'gcc/genmatch.c') diff --git a/gcc/genmatch.c b/gcc/genmatch.c index 6195a3b..aa291ec 100644 --- a/gcc/genmatch.c +++ b/gcc/genmatch.c @@ -2216,11 +2216,12 @@ is_conversion (id_base *op) || *op == VIEW_CONVERT_EXPR); } -/* Get the type to be used for generating operands of OP from the +/* Get the type to be used for generating operand POS of OP from the various sources. */ static const char * -get_operand_type (id_base *op, const char *in_type, +get_operand_type (id_base *op, unsigned pos, + const char *in_type, const char *expr_type, const char *other_oprnd_type) { @@ -2235,6 +2236,9 @@ get_operand_type (id_base *op, const char *in_type, else if (is_a (op) && strcmp (as_a (op)->tcc, "tcc_comparison") == 0) return other_oprnd_type; + else if (*op == COND_EXPR + && pos == 0) + return "boolean_type_node"; else { /* Otherwise all types should match - choose one in order of @@ -2319,7 +2323,7 @@ expr::gen_transform (FILE *f, int indent, const char *dest, bool gimple, char dest[32]; snprintf (dest, 32, "ops%d[%u]", depth, i); const char *optype - = get_operand_type (opr, in_type, expr_type, + = get_operand_type (opr, i, in_type, expr_type, i == 0 ? NULL : op0type); ops[i]->gen_transform (f, indent, dest, gimple, depth + 1, optype, cinfo, indexes, @@ -3157,7 +3161,7 @@ dt_simplify::gen_1 (FILE *f, int indent, bool gimple, operand *result) char dest[32]; snprintf (dest, 32, "res_ops[%d]", j); const char *optype - = get_operand_type (opr, + = get_operand_type (opr, j, "type", e->expr_type, j == 0 ? NULL : "TREE_TYPE (res_ops[0])"); /* We need to expand GENERIC conditions we captured from @@ -3247,7 +3251,7 @@ dt_simplify::gen_1 (FILE *f, int indent, bool gimple, operand *result) snprintf (dest, 32, "res_op%d", j); } const char *optype - = get_operand_type (opr, + = get_operand_type (opr, j, "type", e->expr_type, j == 0 ? NULL : "TREE_TYPE (res_op0)"); -- cgit v1.1