From 2947d3b29ca4008d6ed4bf53851c04972c56ede1 Mon Sep 17 00:00:00 2001 From: Ilya Enkovich Date: Mon, 25 Jan 2016 12:48:54 +0000 Subject: [PATCH] re PR target/69421 (ICE in maybe_legitimize_operand, at optabs.c:6888 with -O3) gcc/ PR target/69421 * tree-vect-stmts.c (vectorizable_condition): Check vectype of operands is compatible with a statement vectype. gcc/testsuite/ PR target/69421 * gcc.dg/pr69421.c: New test. From-SVN: r232792 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/pr69421.c | 16 ++++++++++++++++ gcc/tree-vect-stmts.c | 13 +++++++++++-- 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr69421.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index abf3f2f..bd851ed 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-01-25 Ilya Enkovich + + PR target/69421 + * tree-vect-stmts.c (vectorizable_condition): Check vectype + of operands is compatible with a statement vectype. + 2016-01-25 Eric Botcazou * doc/extend.texi (scalar_storage_order type attribute): Fix typo and diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e91ae13..bd3f892 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-01-25 Ilya Enkovich + + PR target/69421 + * gcc.dg/pr69421.c: New test. + 2016-01-25 Bilyan Borisov * gcc.target/aarch64/simd/vcvt_s64_f64_1.c: New. diff --git a/gcc/testsuite/gcc.dg/pr69421.c b/gcc/testsuite/gcc.dg/pr69421.c new file mode 100644 index 0000000..252e22c --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr69421.c @@ -0,0 +1,16 @@ +/* { dg-do compile } */ +/* { dg-options "-O3" } */ + +struct A { double a; }; +double a; + +void +foo (_Bool *x) +{ + long i; + for (i = 0; i < 64; i++) + { + struct A c; + x[i] = c.a || a; + } +} diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c index c986a00..1dcd129 100644 --- a/gcc/tree-vect-stmts.c +++ b/gcc/tree-vect-stmts.c @@ -7528,6 +7528,7 @@ vectorizable_condition (gimple *stmt, gimple_stmt_iterator *gsi, tree vectype = STMT_VINFO_VECTYPE (stmt_info); int nunits = TYPE_VECTOR_SUBPARTS (vectype); + tree vectype1 = NULL_TREE, vectype2 = NULL_TREE; if (slp_node || PURE_SLP_STMT (stmt_info)) ncopies = 1; @@ -7547,9 +7548,17 @@ vectorizable_condition (gimple *stmt, gimple_stmt_iterator *gsi, return false; gimple *def_stmt; - if (!vect_is_simple_use (then_clause, stmt_info->vinfo, &def_stmt, &dt)) + if (!vect_is_simple_use (then_clause, stmt_info->vinfo, &def_stmt, &dt, + &vectype1)) + return false; + if (!vect_is_simple_use (else_clause, stmt_info->vinfo, &def_stmt, &dt, + &vectype2)) return false; - if (!vect_is_simple_use (else_clause, stmt_info->vinfo, &def_stmt, &dt)) + + if (vectype1 && !useless_type_conversion_p (vectype, vectype1)) + return false; + + if (vectype2 && !useless_type_conversion_p (vectype, vectype2)) return false; masked = !COMPARISON_CLASS_P (cond_expr); -- 2.7.4