From 5717e1f6488ce9b376e1f4a45787687538ec2993 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 25 Sep 2012 14:46:54 +0200 Subject: [PATCH] re PR tree-optimization/54676 (ICE: in set_value_range, at tree-vrp.c:433) PR tree-optimization/54676 * tree-vrp.c (set_and_canonicalize_value_range): Handle one bit precision properly. * gcc.dg/pr54676.c: New test. From-SVN: r191703 --- gcc/ChangeLog | 4 ++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/pr54676.c | 23 +++++++++++++++++++++++ gcc/tree-vrp.c | 33 +++++++++++++++++++++++++++++++-- 4 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr54676.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 44c2ed1a80a6..df7ab16a2b34 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,9 @@ 2012-09-25 Jakub Jelinek + PR tree-optimization/54676 + * tree-vrp.c (set_and_canonicalize_value_range): Handle + one bit precision properly. + PR other/54692 * configure.ac (CFLAGS, CXXFLAGS): Remove -Ofast or -Og properly. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d94545905e9c..078ebbf04800 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-09-25 Jakub Jelinek + + PR tree-optimization/54676 + * gcc.dg/pr54676.c: New test. + 2012-09-25 Richard Guenther PR tree-optimization/53663 diff --git a/gcc/testsuite/gcc.dg/pr54676.c b/gcc/testsuite/gcc.dg/pr54676.c new file mode 100644 index 000000000000..97032edf623f --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr54676.c @@ -0,0 +1,23 @@ +/* PR tree-optimization/54676 */ +/* { dg-do compile } */ +/* { dg-options "-O -fno-tree-ccp -fno-tree-copy-prop -fno-tree-fre -ftree-vrp" } */ + +struct S +{ + int s:1; +}; + +struct S bar (void); + +int a; + +void +foo (int x) +{ + struct S s = bar (); + while (!a) + { + int l = 94967295; + a = x || (s.s &= l); + } +} diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c index a84c4b96feef..b728dddb8711 100644 --- a/gcc/tree-vrp.c +++ b/gcc/tree-vrp.c @@ -501,8 +501,19 @@ set_and_canonicalize_value_range (value_range_t *vr, enum value_range_type t, to adjust them. */ if (tree_int_cst_lt (max, min)) { - tree one = build_int_cst (TREE_TYPE (min), 1); - tree tmp = int_const_binop (PLUS_EXPR, max, one); + tree one, tmp; + + /* For one bit precision if max < min, then the swapped + range covers all values, so for VR_RANGE it is varying and + for VR_ANTI_RANGE empty range, so drop to varying as well. */ + if (TYPE_PRECISION (TREE_TYPE (min)) == 1) + { + set_value_range_to_varying (vr); + return; + } + + one = build_int_cst (TREE_TYPE (min), 1); + tmp = int_const_binop (PLUS_EXPR, max, one); max = int_const_binop (MINUS_EXPR, min, one); min = tmp; @@ -531,6 +542,24 @@ set_and_canonicalize_value_range (value_range_t *vr, enum value_range_type t, set_value_range_to_varying (vr); return; } + else if (TYPE_PRECISION (TREE_TYPE (min)) == 1 + && !TYPE_UNSIGNED (TREE_TYPE (min)) + && (is_min || is_max)) + { + /* For signed 1-bit precision, one is not in-range and + thus adding/subtracting it would result in overflows. */ + if (operand_equal_p (min, max, 0)) + { + min = max = is_min ? vrp_val_max (TREE_TYPE (min)) + : vrp_val_min (TREE_TYPE (min)); + t = VR_RANGE; + } + else + { + set_value_range_to_varying (vr); + return; + } + } else if (is_min /* As a special exception preserve non-null ranges. */ && !(TYPE_UNSIGNED (TREE_TYPE (min)) -- 2.47.2