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

PR tree-optimization/80497 - ICE at -O1 and above on valid code on x86_64-linux-gnu in tree_to_uhwi

Browse Source 
gcc/ChangeLog:

	PR tree-optimization/80497
	* gimple-ssa-sprintf.c (get_int_range): Avoid assuming all integer
	constants are representable in HOST_WIDE_INT.
	(parse_directive): Ditto.

gcc/testsuite/ChangeLog:

	PR tree-optimization/80497
	* gcc.dg/tree-ssa/builtin-sprintf-warn-17.c: New test.

From-SVN: r247264
This commit is contained in:
Martin Sebor 2017-04-25 17:58:32 +00:00 committed by Martin Sebor
parent 8ef2085d4c
commit 8550e48ac4
4 changed files with 59 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,3 +1,10 @@
2017-04-25 Martin Sebor <msebor@redhat.com>
PR tree-optimization/80497
* gimple-ssa-sprintf.c (get_int_range): Avoid assuming all integer
constants are representable in HOST_WIDE_INT.
(parse_directive): Ditto.
2017-04-25 Marek Polacek <polacek@redhat.com>
2017-04-25 Marek Polacek <polacek@redhat.com>

7
gcc/gimple-ssa-sprintf.c
View File

@ -948,7 +948,8 @@ get_int_range (tree arg, HOST_WIDE_INT *pmin, HOST_WIDE_INT *pmax,
*pmin = tree_to_shwi (TYPE_MIN_VALUE (type));
*pmax = tree_to_shwi (TYPE_MAX_VALUE (type));
}
else if (TREE_CODE (arg) == INTEGER_CST)
else if (TREE_CODE (arg) == INTEGER_CST
&& TYPE_PRECISION (TREE_TYPE (arg)) <= TYPE_PRECISION (type))
{
/* For a constant argument return its value adjusted as specified
by NEGATIVE and NEGBOUND and return true to indicate that the
@ -2916,7 +2917,9 @@ parse_directive (pass_sprintf_length::call_info &info,
if (width != -1)
dollar = width + info.argidx;
else if (star_width
&& TREE_CODE (star_width) == INTEGER_CST)
&& TREE_CODE (star_width) == INTEGER_CST
&& (TYPE_PRECISION (TREE_TYPE (star_width))
<= TYPE_PRECISION (integer_type_node)))
dollar = width + tree_to_shwi (star_width);
/* Bail when the numbered argument is out of range (it will

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2017-04-25 Martin Sebor <msebor@redhat.com>
PR tree-optimization/80497
* gcc.dg/tree-ssa/builtin-sprintf-warn-17.c: New test.
2017-04-25 Marek Polacek <polacek@redhat.com>
2017-04-25 Marek Polacek <polacek@redhat.com>

42
gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-warn-17.c Normal file
View File

@ -0,0 +1,42 @@
/* PR tree-optimization/80497 - ICE at -O1 and above on valid code on
x86_64-linux-gnu in "tree_to_uhwi"
{ dg-do compile }
{ dg-options "-O2 -Wall -Wformat-overflow" }
{ dg-require-effective-target int128 } */
extern char buf[];
const __int128_t sint128_max
= (__int128_t)1 << (sizeof sint128_max * __CHAR_BIT__ - 2);
void fn0 (void)
{
__int128_t si128 = 0;
__builtin_sprintf (buf, "%*i", si128, 0);
__builtin_sprintf (buf, "%.*i", si128, 0);
__builtin_sprintf (buf, "%i", si128);
__builtin_sprintf (buf, "%2$*1$i", si128, 0);
__builtin_sprintf (buf, "%2$.*1$i", si128, 0);
}
void fn1 (void)
{
__int128_t si128 = sint128_max;
__builtin_sprintf (buf, "%*i", si128, 0);
__builtin_sprintf (buf, "%.*i", si128, 0);
__builtin_sprintf (buf, "%i", si128);
__builtin_sprintf (buf, "%2$*1$i", si128, 0);
__builtin_sprintf (buf, "%2$.*1$i", si128, 0);
}
/* { dg-prune-output "expects argument of type .int." } */