From 56735d40cafbfb1cf1d4bb052480372b020d98f5 Mon Sep 17 00:00:00 2001 From: Martin Sebor Date: Mon, 18 Dec 2017 03:31:05 +0000 Subject: [PATCH] PR bootstrap/83446 - Bootstrap failed on i686 gcc/testsuite/ChangeLog: PR bootstrap/83446 * c-c++-common/Warray-bounds-3.c: Adjust. * gcc.dg/Warray-bounds-25.c: New test. gcc/ChangeLog: PR bootstrap/83446 * gimple-ssa-warn-restrict.c (builtin_memref::offset_out_of_bounds): Correct the handling of anti-ranges. From-SVN: r255772 --- gcc/ChangeLog | 7 +++++ gcc/gimple-ssa-warn-restrict.c | 4 ++- gcc/testsuite/c-c++-common/Warray-bounds-3.c | 7 +++-- gcc/testsuite/gcc.dg/Warray-bounds-25.c | 33 ++++++++++++++++++++ 4 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/Warray-bounds-25.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5b6b6772e46..13b8cc70671 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2017-12-17 Martin Sebor + + PR bootstrap/83446 + * gimple-ssa-warn-restrict.c + (builtin_memref::offset_out_of_bounds): Correct the handling of + anti-ranges. + 2017-12-17 Sandra Loosemore * doc/invoke.texi (ARC Options): Add missing -mlra entry. diff --git a/gcc/gimple-ssa-warn-restrict.c b/gcc/gimple-ssa-warn-restrict.c index f524e1dc3d5..4d424735d2a 100644 --- a/gcc/gimple-ssa-warn-restrict.c +++ b/gcc/gimple-ssa-warn-restrict.c @@ -413,7 +413,9 @@ builtin_memref::offset_out_of_bounds (int strict, offset_int ooboff[2]) const if (DECL_P (base) && TREE_CODE (TREE_TYPE (base)) == ARRAY_TYPE) { - if (offrng[1] < offrng[0]) + /* Check for offset in an anti-range with a negative lower bound. + For such a range, consider only the non-negative subrange. */ + if (offrng[1] < offrng[0] && offrng[1] < 0) offrng[1] = maxobjsize; } diff --git a/gcc/testsuite/c-c++-common/Warray-bounds-3.c b/gcc/testsuite/c-c++-common/Warray-bounds-3.c index 8bb4f1c1b3e..85c8f6a6d02 100644 --- a/gcc/testsuite/c-c++-common/Warray-bounds-3.c +++ b/gcc/testsuite/c-c++-common/Warray-bounds-3.c @@ -123,8 +123,11 @@ void test_memcpy_bounds_anti_range (char *d, const char *s, size_t n) (yet). */ T (char, 9, a, a + SAR ( 1, 6), 3); /* { dg-warning "forming offset \\\[9, 0] is out of the bounds \\\[0, 9] of object " "memcpy" { xfail *-*-* } } */ - T (char, 9, a, a + SAR ( 2, 6), 3); /* { dg-warning "forming offset 10 is out of the bounds \\\[0, 9] of object " "memcpy" } */ - T (char, 9, a, a + SAR ( 3, 6), 3); /* { dg-warning "forming offset 10 is out of the bounds \\\[0, 9] of object " "memcpy" } */ + /* The range of offsets is the union of [0, 1] and [7, PTRDIFF_MAX] + of which the first subrange is valid and thus no warming for memcpy + is issued. Similarly for the next test. */ + T (char, 9, a, a + SAR ( 2, 6), 3); + T (char, 9, a, a + SAR ( 3, 6), 3); T (char, 9, a, a + SAR (-1, 7), 3); /* { dg-warning "forming offset \\\[10, 11] is out of the bounds \\\[0, 9] of object " "memcpy" } */ T (char, 9, a, a + SAR (-2, 8), 3); /* { dg-warning "forming offset \\\[10, 12] is out of the bounds \\\[0, 9] of object " "memcpy" } */ diff --git a/gcc/testsuite/gcc.dg/Warray-bounds-25.c b/gcc/testsuite/gcc.dg/Warray-bounds-25.c new file mode 100644 index 00000000000..37fb9ccf4df --- /dev/null +++ b/gcc/testsuite/gcc.dg/Warray-bounds-25.c @@ -0,0 +1,33 @@ +/* PR tree-optimization/83446 - Bootstrap failed on i686 + { dg-do compile } + { dg-options "-O2 -Warray-bounds" } */ + +char a[4]; + +void f0i (void *d, int n) +{ + if (n < 0) n = 0; + + __builtin_memcpy (d, a + sizeof a - n, n); +} + +void f0L (void *d, long n) +{ + if (n < 0) n = 0; + + __builtin_memcpy (d, a + sizeof a - n, n); +} + +void f0u (void *d, unsigned n) +{ + if (n < 0) n = 1; + + __builtin_memcpy (d, a + sizeof a - n, n); /* { dg-bogus "\\\[-Warray-bounds" } */ +} + +void f1lu (void *d, unsigned long n) +{ + if (n < 1) n = 1; + + __builtin_memcpy (d, a + sizeof a - n, n); /* { dg-bogus "\\\[-Warray-bounds" } */ +} -- 2.30.2