diff options
| author | Martin Sebor <msebor@redhat.com> | 2018-01-11 05:13:57 +0000 |
|---|---|---|
| committer | Martin Sebor <msebor@gcc.gnu.org> | 2018-01-10 22:13:57 -0700 |
| commit | 1bfd6a0038c9ade9db7cbae3b550d14a62c91ebf (patch) | |
| tree | 40c6d997cc3c2c18557c8bfa2bf6a706c9c9ed30 /gcc | |
| parent | 05ef31736c431ca4721ba8d05156e99af79a5aac (diff) | |
| download | gcc-1bfd6a0038c9ade9db7cbae3b550d14a62c91ebf.zip gcc-1bfd6a0038c9ade9db7cbae3b550d14a62c91ebf.tar.gz gcc-1bfd6a0038c9ade9db7cbae3b550d14a62c91ebf.tar.bz2 | |
PR tree-optimization/83781 - Bootstrap failed on x86 with --with-arch=corei7
PR tree-optimization/83781 - Bootstrap failed on x86 with --with-arch=corei7
--with-cpu=corei7
gcc/ChangeLog:
* gimple-fold.c (get_range_strlen): Avoid treating arrays of pointers
as string arrays.
gcc/testsuite/ChangeLog:
* gcc.dg/strlenopt-42.c: New test.
From-SVN: r256477
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/gimple-fold.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/strlenopt-42.c | 22 |
4 files changed, 40 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bb6bf49..f69ddc6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2018-01-10 Martin Sebor <msebor@redhat.com> + + PR tree-optimization/83781 + * gimple-fold.c (get_range_strlen): Avoid treating arrays of pointers + as string arrays. + 2018-01-11 Martin Sebor <msebor@gmail.com> Prathamesh Kulkarni <prathamesh.kulkarni@linaro.org> diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c index 504a85d..3861692 100644 --- a/gcc/gimple-fold.c +++ b/gcc/gimple-fold.c @@ -1360,10 +1360,17 @@ get_range_strlen (tree arg, tree length[2], bitmap *visited, int type, { tree type = TREE_TYPE (TREE_OPERAND (arg, 0)); + /* Determine the "innermost" array type. */ while (TREE_CODE (type) == ARRAY_TYPE && TREE_CODE (TREE_TYPE (type)) == ARRAY_TYPE) type = TREE_TYPE (type); + /* Avoid arrays of pointers. */ + tree eltype = TREE_TYPE (type); + if (TREE_CODE (type) != ARRAY_TYPE + || !INTEGRAL_TYPE_P (eltype)) + return false; + val = TYPE_SIZE_UNIT (type); if (!val || integer_zerop (val)) return false; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index dd4bfce..8572bfc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-01-10 Martin Sebor <msebor@redhat.com> + + PR tree-optimization/83781 + * gcc.dg/strlenopt-42.c: New test. + 2018-01-11 Martin Sebor <msebor@gmail.com> Prathamesh Kulkarni <prathamesh.kulkarni@linaro.org> diff --git a/gcc/testsuite/gcc.dg/strlenopt-42.c b/gcc/testsuite/gcc.dg/strlenopt-42.c new file mode 100644 index 0000000..019b89e --- /dev/null +++ b/gcc/testsuite/gcc.dg/strlenopt-42.c @@ -0,0 +1,22 @@ +/* PR tree-optimization/83781 - Bootstrap failed on x86 with --with-arch=corei7 + --with-cpu=corei7 + Verify that the upper bound of the size of an array of pointers + to strings isn't considered to be the upper bound of the lengths + of the pointed-to strings. + { dg-do compile } + { dg-options "-O2 -Wall" } */ + +const char* const ap[32] = { "1", "12", "123" }; + +char d4[4]; +char d7[7]; + +void nowarn_range_ptr_var_1 (int i) +{ + __builtin_sprintf (d4, "%s", ap[i]); +} + +void nowarn_range_ptr_var_2 (int i, int j) +{ + __builtin_sprintf (d7, "%s%s", ap[i], ap[j]); +} |