diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2017-11-06 17:29:11 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2017-11-06 17:29:11 +0100 |
| commit | 3e2927a1b05739384d2080f46cd0836980911822 (patch) | |
| tree | d4e1447199945de3d15e2dc1eb1c2252b048b070 /gcc | |
| parent | 7a1bdd662bc670ee14646b371699c724df3ba643 (diff) | |
| download | gcc-3e2927a1b05739384d2080f46cd0836980911822.zip gcc-3e2927a1b05739384d2080f46cd0836980911822.tar.gz gcc-3e2927a1b05739384d2080f46cd0836980911822.tar.bz2 | |
re PR tree-optimization/82838 (ICE in verify_ssa failed w/ store-merging)
PR tree-optimization/82838
* gimple-ssa-store-merging.c
(imm_store_chain_info::output_merged_store): Call force_gimple_operand_1
on a separate gimple_seq which is then appended to seq.
* gcc.c-torture/compile/pr82838.c: New test.
From-SVN: r254457
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/gimple-ssa-store-merging.c | 12 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/compile/pr82838.c | 12 |
4 files changed, 32 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1cda8a3..7c04aa9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2017-11-06 Jakub Jelinek <jakub@redhat.com> + + PR tree-optimization/82838 + * gimple-ssa-store-merging.c + (imm_store_chain_info::output_merged_store): Call force_gimple_operand_1 + on a separate gimple_seq which is then appended to seq. + 2017-11-06 Jeff Law <law@redhat.com> PR target/82788 diff --git a/gcc/gimple-ssa-store-merging.c b/gcc/gimple-ssa-store-merging.c index 5366a9b..3c29a5f 100644 --- a/gcc/gimple-ssa-store-merging.c +++ b/gcc/gimple-ssa-store-merging.c @@ -1642,10 +1642,14 @@ imm_store_chain_info::output_merged_store (merged_store_group *group) else if (operand_equal_p (base_addr, op.base_addr, 0)) load_addr[j] = addr; else - load_addr[j] - = force_gimple_operand_1 (unshare_expr (op.base_addr), - &seq, is_gimple_mem_ref_addr, - NULL_TREE); + { + gimple_seq this_seq; + load_addr[j] + = force_gimple_operand_1 (unshare_expr (op.base_addr), + &this_seq, is_gimple_mem_ref_addr, + NULL_TREE); + gimple_seq_add_seq_without_update (&seq, this_seq); + } } FOR_EACH_VEC_ELT (split_stores, i, split_store) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index de0e0a8..edb3797 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-11-06 Jakub Jelinek <jakub@redhat.com> + + PR tree-optimization/82838 + * gcc.c-torture/compile/pr82838.c: New test. + 2017-11-06 Jeff Law <law@redhat.com> PR target/82788 diff --git a/gcc/testsuite/gcc.c-torture/compile/pr82838.c b/gcc/testsuite/gcc.c-torture/compile/pr82838.c new file mode 100644 index 0000000..a6ca163 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr82838.c @@ -0,0 +1,12 @@ +/* PR tree-optimization/82838 */ + +struct S { unsigned short a, b, c; }; +struct S f[10]; + +void +foo (int e) +{ + struct S *x; + f[e].b = x[e].a; + f[e].c = x[e].b; +} |