diff options
| author | Martin Sebor <msebor@redhat.com> | 2018-08-28 00:10:46 +0000 |
|---|---|---|
| committer | Martin Sebor <msebor@gcc.gnu.org> | 2018-08-27 18:10:46 -0600 |
| commit | 1583124e4fdfa4c60f7cfa4063e3ef47087927ca (patch) | |
| tree | 79a8a2437a23485a87f39f56eb6b737742601de4 /gcc | |
| parent | bdd039843c2df9c7ab1ebcd914a70208aaa14c23 (diff) | |
| download | gcc-1583124e4fdfa4c60f7cfa4063e3ef47087927ca.zip gcc-1583124e4fdfa4c60f7cfa4063e3ef47087927ca.tar.gz gcc-1583124e4fdfa4c60f7cfa4063e3ef47087927ca.tar.bz2 | |
PR tree-optimization/87112 - ICE in fold_binary_loc on strnlen of mixed integer types
gcc/ChangeLog:
PR tree-optimization/87112
* builtins.c (expand_builtin_strnlen): Convert c_strlen result to
the type of the bound argument.
gcc/testsuite/ChangeLog:
PR tree-optimization/87112
* gcc.dg/pr87112.c: New test.
From-SVN: r263900
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/builtins.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr87112.c | 31 |
4 files changed, 46 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a8ab835..2449672 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2018-08-27 Martin Sebor <msebor@redhat.com> + + PR tree-optimization/87112 + * builtins.c (expand_builtin_strnlen): Convert c_strlen result to + the type of the bound argument. + 2018-08-27 Jeff Law <law@redhat.com> * tree-ssa-dse.c (compute_trims): Handle case where the reference's diff --git a/gcc/builtins.c b/gcc/builtins.c index c4b52b9..eb69a40 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -2970,6 +2970,10 @@ expand_builtin_strnlen (tree exp, rtx target, machine_mode target_mode) tree func = get_callee_fndecl (exp); tree len = c_strlen (src, 0); + /* FIXME: Change c_strlen() to return sizetype instead of ssizetype + so these conversions aren't necessary. */ + if (len) + len = fold_convert_loc (loc, TREE_TYPE (bound), len); if (TREE_CODE (bound) == INTEGER_CST) { @@ -2984,7 +2988,6 @@ expand_builtin_strnlen (tree exp, rtx target, machine_mode target_mode) if (!len || TREE_CODE (len) != INTEGER_CST) return NULL_RTX; - len = fold_convert_loc (loc, size_type_node, len); len = fold_build2_loc (loc, MIN_EXPR, size_type_node, len, bound); return expand_expr (len, target, target_mode, EXPAND_NORMAL); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8ecb60b..92f1540 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-08-27 Martin Sebor <msebor@redhat.com> + + PR tree-optimization/87112 + * gcc.dg/pr87112.c: New test. + 2018-08-27 David Malcolm <dmalcolm@redhat.com> PR c++/63392 diff --git a/gcc/testsuite/gcc.dg/pr87112.c b/gcc/testsuite/gcc.dg/pr87112.c new file mode 100644 index 0000000..7510956 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr87112.c @@ -0,0 +1,31 @@ +/* PR tree-optimization/87112 - ICE due to strnlen mixing integer types + { dg-do compile } + { dg-options "-Os -Wall" } */ + +typedef __SIZE_TYPE__ size_t; + +extern size_t strnlen (const char*, size_t); + +size_t fi (int i) +{ + int n = i & 3; + return strnlen ("int", n); +} + +size_t fui (unsigned i) +{ + unsigned n = i & 3; + return strnlen ("unsigned", n); +} + +size_t fl (long i) +{ + long n = i & 3; + return strnlen ("long", n); +} + +size_t fsz (size_t i) +{ + size_t n = i & 3; + return strnlen ("size_t", n); +} |