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/tree-ssa-strlen.c | |
| 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/tree-ssa-strlen.c')
| -rw-r--r-- | gcc/tree-ssa-strlen.c | 5 |
1 files changed, 3 insertions, 2 deletions
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; |