From 2e0bf5de870fdd12e6f3a2ff831e9fcf2d24112c Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 27 Apr 2007 20:48:55 +0000 Subject: [PATCH] re PR middle-end/31710 (ICE in in set_value_range, at tree-vrp.c:278) ./: PR middle-end/31710 * tree.c (build_distinct_type_copy): If TYPE_MIN_VALUE or TYPE_MAX_VALUE exist, convert them to the new type. testsuite/: PR middle-end/31710 * gcc.c-torture/compile/pr31710.c: New test. From-SVN: r124238 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.c-torture/compile/pr31710.c | 6 ++++++ gcc/tree.c | 9 +++++++++ 4 files changed, 26 insertions(+) create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr31710.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 39096ce27c76..94f89424bf90 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2007-04-27 Ian Lance Taylor + + PR middle-end/31710 + * tree.c (build_distinct_type_copy): If TYPE_MIN_VALUE or + TYPE_MAX_VALUE exist, convert them to the new type. + 2007-04-26 Ian Lance Taylor PR target/28675 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 472da8bc5117..bdfa44307a94 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-04-27 Ian Lance Taylor + + PR middle-end/31710 + * gcc.c-torture/compile/pr31710.c: New test. + 2007-04-26 Ian Lance Taylor PR target/28675 diff --git a/gcc/testsuite/gcc.c-torture/compile/pr31710.c b/gcc/testsuite/gcc.c-torture/compile/pr31710.c new file mode 100644 index 000000000000..0c8562dbcde0 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr31710.c @@ -0,0 +1,6 @@ +typedef short SHORT; +struct v { SHORT i; }; +void f(struct v *pin, struct v *pout) { + if (pin->i == (-0x7fff)-1) + pout->i = -pin->i; +} diff --git a/gcc/tree.c b/gcc/tree.c index 82a2dc756867..8235a694efb7 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -3882,6 +3882,15 @@ build_distinct_type_copy (tree type) TYPE_MAIN_VARIANT (t) = t; TYPE_NEXT_VARIANT (t) = 0; + /* VRP assumes that TREE_TYPE (TYPE_MIN_VALUE (type)) == type. */ + if (INTEGRAL_TYPE_P (t) || SCALAR_FLOAT_TYPE_P (t)) + { + if (TYPE_MIN_VALUE (t) != NULL_TREE) + TYPE_MIN_VALUE (t) = fold_convert (t, TYPE_MIN_VALUE (t)); + if (TYPE_MAX_VALUE (t) != NULL_TREE) + TYPE_MAX_VALUE (t) = fold_convert (t, TYPE_MAX_VALUE (t)); + } + return t; }