From 1bfd6a0038c9ade9db7cbae3b550d14a62c91ebf Mon Sep 17 00:00:00 2001 From: Martin Sebor Date: Thu, 11 Jan 2018 05:13:57 +0000 Subject: [PATCH] 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 --- gcc/ChangeLog | 6 ++++++ gcc/gimple-fold.c | 7 +++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/strlenopt-42.c | 22 ++++++++++++++++++++++ 4 files changed, 40 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/strlenopt-42.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bb6bf49107d..f69ddc6d257 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2018-01-10 Martin Sebor + + PR tree-optimization/83781 + * gimple-fold.c (get_range_strlen): Avoid treating arrays of pointers + as string arrays. + 2018-01-11 Martin Sebor Prathamesh Kulkarni diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c index 504a85d1441..38616923555 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 dd4bfcec00c..8572bfc9d4a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-01-10 Martin Sebor + + PR tree-optimization/83781 + * gcc.dg/strlenopt-42.c: New test. + 2018-01-11 Martin Sebor Prathamesh Kulkarni diff --git a/gcc/testsuite/gcc.dg/strlenopt-42.c b/gcc/testsuite/gcc.dg/strlenopt-42.c new file mode 100644 index 00000000000..019b89e7568 --- /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]); +} -- 2.30.2