diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/Wstringop-truncation-3.c | 22 | ||||
| -rw-r--r-- | gcc/tree-ssa-strlen.c | 2 |
4 files changed, 33 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b520609..c4d8c95 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2018-02-06 Marek Polacek <polacek@redhat.com> + + PR tree-optimization/84228 + * tree-ssa-strlen.c (maybe_diag_stxncpy_trunc): Skip debug statements. + 2018-02-06 Tamar Christina <tamar.christina@arm.com> PR target/82641 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index bdec47b..e8b123d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-02-06 Marek Polacek <polacek@redhat.com> + + PR tree-optimization/84228 + * c-c++-common/Wstringop-truncation-3.c: New test. + 2018-02-06 Tamar Christina <tamar.christina@arm.com> PR target/82641 diff --git a/gcc/testsuite/c-c++-common/Wstringop-truncation-3.c b/gcc/testsuite/c-c++-common/Wstringop-truncation-3.c new file mode 100644 index 0000000..ba6b7de --- /dev/null +++ b/gcc/testsuite/c-c++-common/Wstringop-truncation-3.c @@ -0,0 +1,22 @@ +/* PR tree-optimization/84228 */ +/* { dg-do compile } */ +/* { dg-options "-Wstringop-truncation -O2 -g" } */ + +char *strncpy (char *, const char *, __SIZE_TYPE__); +struct S +{ + char arr[64]; +}; + +int +foo (struct S *p1, const char *a) +{ + int b = 5, c = 6, d = 7; + if (a) + goto err; + strncpy (p1->arr, a, sizeof p1->arr); /* { dg-bogus "specified bound" } */ + b = 8; c = 9; d = 10; + p1->arr[3] = '\0'; +err: + return 0; +} diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c index c3cf432..f0f6535 100644 --- a/gcc/tree-ssa-strlen.c +++ b/gcc/tree-ssa-strlen.c @@ -1849,7 +1849,7 @@ maybe_diag_stxncpy_trunc (gimple_stmt_iterator gsi, tree src, tree cnt) /* Look for dst[i] = '\0'; after the stxncpy() call and if found avoid the truncation warning. */ - gsi_next (&gsi); + gsi_next_nondebug (&gsi); gimple *next_stmt = gsi_stmt (gsi); if (!gsi_end_p (gsi) && is_gimple_assign (next_stmt)) |