From 5dcf6b7f1cfee8b04d3bbe6f0f1b526b0c628742 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 26 Jun 2012 10:02:20 +0200 Subject: [PATCH] re PR tree-optimization/53748 (ice in fold_convert_loc) PR tree-optimization/53748 * tree-ssa-phiopt.c (conditional_replacement): Only optimize if arg0/arg1 have integral or pointer types. * gcc.c-torture/compile/pr53748.c: New test. From-SVN: r188975 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.c-torture/compile/pr53748.c | 9 +++++++++ gcc/tree-ssa-phiopt.c | 8 ++++++-- 4 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr53748.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 677e813033f..d662298de99 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-06-26 Jakub Jelinek + + PR tree-optimization/53748 + * tree-ssa-phiopt.c (conditional_replacement): Only optimize + if arg0/arg1 have integral or pointer types. + 2012-06-25 Richard Henderson * config/i386/sse.md (sse2_sse4_1): Remove code attr. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a85b990ee8d..a3074591563 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-06-26 Jakub Jelinek + + PR tree-optimization/53748 + * gcc.c-torture/compile/pr53748.c: New test. + 2012-06-25 Jason Merrill PR c++/53498 diff --git a/gcc/testsuite/gcc.c-torture/compile/pr53748.c b/gcc/testsuite/gcc.c-torture/compile/pr53748.c new file mode 100644 index 00000000000..9aad70dd73a --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr53748.c @@ -0,0 +1,9 @@ +/* PR tree-optimization/53748 */ + +typedef unsigned int V __attribute__ ((__vector_size__ (sizeof (int) * 4))); + +void +foo (int x, V *y) +{ + *y = x ? ((V) { ~0U, ~0U, ~0U, ~0U }) : ((V) { 0, 0, 0, 0 }); +} diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c index 52be15006d0..46d8a2c4e60 100644 --- a/gcc/tree-ssa-phiopt.c +++ b/gcc/tree-ssa-phiopt.c @@ -615,8 +615,12 @@ conditional_replacement (basic_block cond_bb, basic_block middle_bb, bool neg; /* FIXME: Gimplification of complex type is too hard for now. */ - if (TREE_CODE (TREE_TYPE (arg0)) == COMPLEX_TYPE - || TREE_CODE (TREE_TYPE (arg1)) == COMPLEX_TYPE) + /* We aren't prepared to handle vectors either (and it is a question + if it would be worthwhile anyway). */ + if (!(INTEGRAL_TYPE_P (TREE_TYPE (arg0)) + || POINTER_TYPE_P (TREE_TYPE (arg0))) + || !(INTEGRAL_TYPE_P (TREE_TYPE (arg1)) + || POINTER_TYPE_P (TREE_TYPE (arg1)))) return false; /* The PHI arguments have the constants 0 and 1, or 0 and -1, then -- 2.30.2