diff options
| author | Martin Sebor <msebor@redhat.com> | 2019-01-02 06:02:37 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 2019-01-01 23:02:37 -0700 |
| commit | 5d6655ebcc96030644f99eb1c431dd96e374db90 (patch) | |
| tree | 254a28a425e845f22414200219cf3f13aec1f0a6 /gcc/tree-ssa-strlen.c | |
| parent | 79b1c2295b3031764904ce66ae294aa57aef50ae (diff) | |
| download | gcc-5d6655ebcc96030644f99eb1c431dd96e374db90.zip gcc-5d6655ebcc96030644f99eb1c431dd96e374db90.tar.gz gcc-5d6655ebcc96030644f99eb1c431dd96e374db90.tar.bz2 | |
gimple-fold.h (get_range_strlen): Update prototype.
* gimple-fold.h (get_range_strlen): Update prototype.
* builtins.c (check_access): Update call to get_range_strlen to use
c_strlen_data pointer. Change various variable accesses to instead
pull data from the c_strlen_data structure.
(check_strncat_sizes, expand_builtin_strncat): Likewise.
* calls.c (maybe_warn_nonstring_arg): Likewise.
* tree-ssa-strlen.c (maybe_diag_stxncpy_trunc): Likewise. Reset
minimum length if maximum lengh is unknown.
* gimple-ssa-sprintf.c (get_string_length): Likewise. Drop code
that used c_strlen, it's no longer needed. Restructure slightly.
(format_string): Set unlikely range appropriately.
* gimple-fold.c (get_range_strlen): Update comments. Fix minor
formatting issues.
(get_range_strlen): Accept c_strlen_data pointer for external
call sites as well. Pass through to call to internal get_range_strlen.
Adjust minlen, maxlen and maxbound as needed.
(get_maxval_strlen): Update comments.
(gimple_fold_builtin_strlen): Update call to get_range_strlen
to use c_strlen_data pointer. Change variable accesses to instead
use c_strlen_data data members.
* gcc.dg/strlenopt-40.c: Disable a couple tests.
* gcc.dg/strlenopt-48.c: Twiddle test.
* gcc.dg/strlenopt-59.c: New test.
* gcc.dg/tree-ssa/builtin-snprintf-5.c: New test.
* g++.dg/init/strlen.C: New test.
Co-Authored-By: Jeff Law <law@redhat.com>
From-SVN: r267503
Diffstat (limited to 'gcc/tree-ssa-strlen.c')
| -rw-r--r-- | gcc/tree-ssa-strlen.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c index 80309e4..f64bc9b 100644 --- a/gcc/tree-ssa-strlen.c +++ b/gcc/tree-ssa-strlen.c @@ -1989,15 +1989,18 @@ maybe_diag_stxncpy_trunc (gimple_stmt_iterator gsi, tree src, tree cnt) lenrange[0] = lenrange[1] = wi::shwi (~sidx, prec); else { - tree range[2]; - get_range_strlen (src, range); - if (range[0] != NULL_TREE - && TREE_CODE (range[0]) == INTEGER_CST - && range[1] != NULL_TREE - && TREE_CODE (range[1]) == INTEGER_CST) - { - lenrange[0] = wi::to_wide (range[0], prec); - lenrange[1] = wi::to_wide (range[1], prec); + c_strlen_data lendata = { }; + get_range_strlen (src, &lendata, /* eltsize = */1); + if (TREE_CODE (lendata.minlen) == INTEGER_CST + && TREE_CODE (lendata.maxbound) == INTEGER_CST) + { + /* When LENDATA.MAXLEN is unknown, reset LENDATA.MINLEN + which stores the length of the shortest known string. */ + if (integer_all_onesp (lendata.maxlen)) + lenrange[0] = wi::shwi (0, prec); + else + lenrange[0] = wi::to_wide (lendata.minlen, prec); + lenrange[1] = wi::to_wide (lendata.maxbound, prec); } else { |