From 751a243337660bfb64bb0a6ded40688e9c3c7cf6 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 26 Nov 2012 10:19:30 +0100 Subject: [PATCH] re PR tree-optimization/54471 (FAIL: gcc.dg/sms-8.c execution test) PR tree-optimization/54471 * tree-vrp.c (extract_range_from_binary_expr_1): For MULT_EXPR, don't canonicalize range if min2 is zero. * gcc.dg/tree-ssa/vrp86.c: New test. * gcc.c-torture/execute/pr54471.c: New test. From-SVN: r193806 --- gcc/ChangeLog | 6 ++++ gcc/testsuite/ChangeLog | 6 ++++ gcc/testsuite/gcc.c-torture/execute/pr54471.c | 36 +++++++++++++++++++ gcc/testsuite/gcc.dg/tree-ssa/vrp86.c | 28 +++++++++++++++ gcc/tree-vrp.c | 4 +-- 5 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.c-torture/execute/pr54471.c create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/vrp86.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a682183fc78..e58b1e66512 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-11-26 Jakub Jelinek + + PR tree-optimization/54471 + * tree-vrp.c (extract_range_from_binary_expr_1): For MULT_EXPR, + don't canonicalize range if min2 is zero. + 2012-11-26 Hans-Peter Nilsson PR middle-end/55030 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 320bd647323..c8b4b6bf25f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2012-11-26 Jakub Jelinek + + PR tree-optimization/54471 + * gcc.dg/tree-ssa/vrp86.c: New test. + * gcc.c-torture/execute/pr54471.c: New test. + 2012-11-26 Hans-Peter Nilsson PR middle-end/55030 diff --git a/gcc/testsuite/gcc.c-torture/execute/pr54471.c b/gcc/testsuite/gcc.c-torture/execute/pr54471.c new file mode 100644 index 00000000000..a169873b069 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/pr54471.c @@ -0,0 +1,36 @@ +/* PR tree-optimization/54471 */ + +#ifdef __SIZEOF_INT128__ +#define T __int128 +#else +#define T long long +#endif + +extern void abort (void); + +__attribute__ ((noinline)) +unsigned T +foo (T ixi, unsigned ctr) +{ + unsigned T irslt = 1; + T ix = ixi; + + for (; ctr; ctr--) + { + irslt *= ix; + ix *= ix; + } + + if (irslt != 14348907) + abort (); + return irslt; +} + +int +main () +{ + unsigned T res; + + res = foo (3, 4); + return 0; +} diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp86.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp86.c new file mode 100644 index 00000000000..ee7ed5f0852 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp86.c @@ -0,0 +1,28 @@ +/* PR tree-optimization/54471 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-vrp1" } */ + +#ifdef __SIZEOF_INT128__ +#define T __int128 +#else +#define T long long +#endif + +void fn1call (void); +void fn2call (void); + +void +foo (unsigned T x) +{ + if (x > (unsigned T) -3) + return; + unsigned T y = 2 * x; + if (y == 42) + fn1call (); + else + fn2call (); +} + +/* { dg-final { scan-tree-dump "fn1call" "vrp1"} } */ +/* { dg-final { scan-tree-dump "fn2call" "vrp1"} } */ +/* { dg-final { cleanup-tree-dump "vrp1" } } */ diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c index 7f3e082446a..c9e4e313692 100644 --- a/gcc/tree-vrp.c +++ b/gcc/tree-vrp.c @@ -2653,7 +2653,7 @@ extract_range_from_binary_expr_1 (value_range_t *vr, if (TYPE_UNSIGNED (expr_type)) { double_int min2 = size - min0; - if (min2.cmp (max0, true) < 0) + if (!min2.is_zero () && min2.cmp (max0, true) < 0) { min0 = -min2; max0 -= size; @@ -2661,7 +2661,7 @@ extract_range_from_binary_expr_1 (value_range_t *vr, } min2 = size - min1; - if (min2.cmp (max1, true) < 0) + if (!min2.is_zero () && min2.cmp (max1, true) < 0) { min1 = -min2; max1 -= size; -- 2.30.2