diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2019-01-11 20:04:32 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2019-01-11 20:04:32 +0100 |
| commit | e17fa93eca7611415368af47d6e4dd2796c8fd7b (patch) | |
| tree | e9be5dbe9676ad05dd0f5d1a798704ef081424ea /gcc | |
| parent | 0f64d96d93ce2fb7b7e5cd174c17e903f66c4a1e (diff) | |
| download | gcc-e17fa93eca7611415368af47d6e4dd2796c8fd7b.zip gcc-e17fa93eca7611415368af47d6e4dd2796c8fd7b.tar.gz gcc-e17fa93eca7611415368af47d6e4dd2796c8fd7b.tar.bz2 | |
re PR tree-optimization/88693 (Wrong code since r263018)
PR tree-optimization/88693
* tree-ssa-strlen.c (get_min_string_length): Don't set *full_string_p
for STRING_CSTs that don't contain any NUL characters in the first
TREE_STRING_LENGTH bytes.
* gcc.c-torture/execute/pr88693.c: New test.
From-SVN: r267852
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/execute/pr88693.c | 54 | ||||
| -rw-r--r-- | gcc/tree-ssa-strlen.c | 5 |
4 files changed, 69 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index cab2430..bca96c0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2019-01-11 Jakub Jelinek <jakub@redhat.com> + + PR tree-optimization/88693 + * tree-ssa-strlen.c (get_min_string_length): Don't set *full_string_p + for STRING_CSTs that don't contain any NUL characters in the first + TREE_STRING_LENGTH bytes. + 2019-01-11 Alan Modra <amodra@gmail.com> PR 88777 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6baaa8e..3b1de48 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-01-11 Jakub Jelinek <jakub@redhat.com> + + PR tree-optimization/88693 + * gcc.c-torture/execute/pr88693.c: New test. + 2019-01-11 Tamar Christina <tamar.christina@arm.com> * gcc.target/aarch64/advsimd-intrinsics/vector-complex_f16.c: Require neon diff --git a/gcc/testsuite/gcc.c-torture/execute/pr88693.c b/gcc/testsuite/gcc.c-torture/execute/pr88693.c new file mode 100644 index 0000000..7e78aea --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/pr88693.c @@ -0,0 +1,54 @@ +/* PR tree-optimization/88693 */ + +__attribute__((noipa)) void +foo (char *p) +{ + if (__builtin_strlen (p) != 9) + __builtin_abort (); +} + +__attribute__((noipa)) void +quux (char *p) +{ + int i; + for (i = 0; i < 100; i++) + if (p[i] != 'x') + __builtin_abort (); +} + +__attribute__((noipa)) void +qux (void) +{ + char b[100]; + __builtin_memset (b, 'x', sizeof (b)); + quux (b); +} + +__attribute__((noipa)) void +bar (void) +{ + static unsigned char u[9] = "abcdefghi"; + char b[100]; + __builtin_memcpy (b, u, sizeof (u)); + b[sizeof (u)] = 0; + foo (b); +} + +__attribute__((noipa)) void +baz (void) +{ + static unsigned char u[] = { 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r' }; + char b[100]; + __builtin_memcpy (b, u, sizeof (u)); + b[sizeof (u)] = 0; + foo (b); +} + +int +main () +{ + qux (); + bar (); + baz (); + return 0; +} diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c index 55fba88..02ed1b4 100644 --- a/gcc/tree-ssa-strlen.c +++ b/gcc/tree-ssa-strlen.c @@ -3232,8 +3232,9 @@ get_min_string_length (tree rhs, bool *full_string_p) if (rhs && TREE_CODE (rhs) == STRING_CST) { - *full_string_p = true; - return strlen (TREE_STRING_POINTER (rhs)); + HOST_WIDE_INT len = strlen (TREE_STRING_POINTER (rhs)); + *full_string_p = len < TREE_STRING_LENGTH (rhs); + return len; } return -1; |