diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2018-02-15 12:18:47 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2018-02-15 12:18:47 +0100 |
| commit | 44e60df333a5fa63428a12887d9c8b5471e1a01b (patch) | |
| tree | 3ec7961a4fa2f92e2770e60e2c4424051e745a9b /gcc | |
| parent | 3eb1eecf29e1e28982b297e565ee291be8636532 (diff) | |
| download | gcc-44e60df333a5fa63428a12887d9c8b5471e1a01b.zip gcc-44e60df333a5fa63428a12887d9c8b5471e1a01b.tar.gz gcc-44e60df333a5fa63428a12887d9c8b5471e1a01b.tar.bz2 | |
re PR tree-optimization/84383 (ICE in maybe_diag_stxncpy_trunc)
PR tree-optimization/84383
* tree-ssa-strlen.c (maybe_diag_stxncpy_trunc): Don't look at
dstoff nor call operand_equal_p if dstbase is NULL.
* gcc.c-torture/compile/pr84383.c: New test.
From-SVN: r257684
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/compile/pr84383.c | 14 | ||||
| -rw-r--r-- | gcc/tree-ssa-strlen.c | 1 |
4 files changed, 22 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 05b7710..2768ada 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,9 @@ 2018-02-15 Jakub Jelinek <jakub@redhat.com> + PR tree-optimization/84383 + * tree-ssa-strlen.c (maybe_diag_stxncpy_trunc): Don't look at + dstoff nor call operand_equal_p if dstbase is NULL. + PR tree-optimization/84334 * match.pd ((A +- CST1) +- CST2 -> A + CST3): If A is also a CONSTANT_CLASS_P, punt. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2ac6e7b..c9f53d8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2018-02-15 Jakub Jelinek <jakub@redhat.com> + PR tree-optimization/84383 + * gcc.c-torture/compile/pr84383.c: New test. + PR tree-optimization/84334 * gcc.dg/pr84334.c: New test. diff --git a/gcc/testsuite/gcc.c-torture/compile/pr84383.c b/gcc/testsuite/gcc.c-torture/compile/pr84383.c new file mode 100644 index 0000000..b46f781 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr84383.c @@ -0,0 +1,14 @@ +/* PR tree-optimization/84383 */ + +struct S { char *s; }; +void bar (struct S *); + +void +foo (int a, char *b) +{ + struct S c[4]; + bar (c); + __builtin_strncpy (c[a].s, b, 32); + c[a].s[31] = '\0'; + bar (c); +} diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c index 94ed2be..09ffa15 100644 --- a/gcc/tree-ssa-strlen.c +++ b/gcc/tree-ssa-strlen.c @@ -1878,6 +1878,7 @@ maybe_diag_stxncpy_trunc (gimple_stmt_iterator gsi, tree src, tree cnt) poly_int64 lhsoff; tree lhsbase = get_addr_base_and_unit_offset (lhs, &lhsoff); if (lhsbase + && dstbase && known_eq (dstoff, lhsoff) && operand_equal_p (dstbase, lhsbase, 0)) return false; |