diff options
| author | Martin Sebor <msebor@redhat.com> | 2017-04-25 17:40:58 +0000 |
|---|---|---|
| committer | Martin Sebor <msebor@gcc.gnu.org> | 2017-04-25 11:40:58 -0600 |
| commit | e602bbfc30cd7d40509edaba120429dc4a92cbce (patch) | |
| tree | 46f475ef5106615483c9a5128dfd8f3f33fd2ff2 /gcc | |
| parent | 8e640712d5af13fec089a36c6f7fa089ffc2d062 (diff) | |
| download | gcc-e602bbfc30cd7d40509edaba120429dc4a92cbce.zip gcc-e602bbfc30cd7d40509edaba120429dc4a92cbce.tar.gz gcc-e602bbfc30cd7d40509edaba120429dc4a92cbce.tar.bz2 | |
PR tree-optimization/80497 - ICE at -O1 and above on valid code on x86_64-linux-gnu in tree_to_uhwi
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: r247262
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/gimple-ssa-sprintf.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-warn-17.c | 42 |
4 files changed, 59 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1c9ebbe..7c549a4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,12 @@ 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 Martin Sebor <msebor@redhat.com> + PR bootstrap/80486 * dominance.c (dom_info::m_n_basic_blocks): Change type to unsigned. (new_zero_array): Adjust signature. diff --git a/gcc/gimple-ssa-sprintf.c b/gcc/gimple-ssa-sprintf.c index 2e62086..d3771dd 100644 --- a/gcc/gimple-ssa-sprintf.c +++ b/gcc/gimple-ssa-sprintf.c @@ -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 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index cd4d100..70b5682 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -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 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com> Jakub Jelinek <jakub@redhat.com> diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-warn-17.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-warn-17.c new file mode 100644 index 0000000..27aa839 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-warn-17.c @@ -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." } */ |