diff options
author | Jakub Jelinek <jakub@redhat.com> | 2017-06-27 09:22:14 +0200 |
---|---|---|
committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2017-06-27 09:22:14 +0200 |
commit | 00296d7f68fe3f6ce378fed88eab9999af3a2449 (patch) | |
tree | 6e7f1bf44e0d32edb9abff6bcb8c280997b28bf9 | |
parent | 0c41863093aedb7bc7e3771bebb070e8f433b17f (diff) | |
download | gcc-00296d7f68fe3f6ce378fed88eab9999af3a2449.zip gcc-00296d7f68fe3f6ce378fed88eab9999af3a2449.tar.gz gcc-00296d7f68fe3f6ce378fed88eab9999af3a2449.tar.bz2 |
re PR middle-end/81207 (tree check fail in simplify_builtin_call)
PR middle-end/81207
* gimple-fold.c (replace_call_with_call_and_fold): Handle
gimple_vuse copying separately from gimple_vdef copying.
* gcc.c-torture/compile/pr81207.c: New test.
From-SVN: r249677
-rw-r--r-- | gcc/ChangeLog | 8 | ||||
-rw-r--r-- | gcc/gimple-fold.c | 3 | ||||
-rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/testsuite/gcc.c-torture/compile/pr81207.c | 13 |
4 files changed, 26 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d2c4260..e9dc0d6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,10 +1,14 @@ +2017-06-27 Jakub Jelinek <jakub@redhat.com> + + PR middle-end/81207 + * gimple-fold.c (replace_call_with_call_and_fold): Handle + gimple_vuse copying separately from gimple_vdef copying. + 2017-06-27 Prathamesh Kulkarni <prathamesh.kulkarni@linaro.org> * value-prof.c (free_hist): Remove call to memset and the enclosing if condition. -gcc/ChangeLog: - 2017-06-26 Jerome Lambourg <lambourg@adacore.com> Olivier Hainque <hainque@adacore.com> diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c index a00c2c8..8e315fe 100644 --- a/gcc/gimple-fold.c +++ b/gcc/gimple-fold.c @@ -607,9 +607,10 @@ replace_call_with_call_and_fold (gimple_stmt_iterator *gsi, gimple *repl) && TREE_CODE (gimple_vdef (stmt)) == SSA_NAME) { gimple_set_vdef (repl, gimple_vdef (stmt)); - gimple_set_vuse (repl, gimple_vuse (stmt)); SSA_NAME_DEF_STMT (gimple_vdef (repl)) = repl; } + if (gimple_vuse (stmt)) + gimple_set_vuse (repl, gimple_vuse (stmt)); gsi_replace (gsi, repl, false); fold_stmt (gsi); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 38e5c7a..0217b7f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-06-27 Jakub Jelinek <jakub@redhat.com> + + PR middle-end/81207 + * gcc.c-torture/compile/pr81207.c: New test. + 2017-06-27 Marek Polacek <polacek@redhat.com> PR bootstrap/81216 diff --git a/gcc/testsuite/gcc.c-torture/compile/pr81207.c b/gcc/testsuite/gcc.c-torture/compile/pr81207.c new file mode 100644 index 0000000..f0faa8c --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr81207.c @@ -0,0 +1,13 @@ +/* PR middle-end/81207 */ + +static const char *b[2] = { "'", "" }; + +int +foo (const char *d) +{ + int e; + for (e = 0; b[e]; e++) + if (__builtin_strstr (d, b[e])) + return 1; + return 0; +} |