OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PR tree-optimization/87112 - ICE in fold_binary_loc on strnlen of mixed integer types

Browse Source 
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
This commit is contained in:
Martin Sebor 2018-08-28 00:10:46 +00:00 committed by Martin Sebor
parent bdd039843c
commit 1583124e4f
4 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -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

5
gcc/builtins.c
View File

@ -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);
}

5
gcc/testsuite/ChangeLog
View File

@ -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

31
gcc/testsuite/gcc.dg/pr87112.c Normal file
View File

@ -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);
}