diff options
| author | Kugan Vivekanandarajah <kuganv@linaro.org> | 2016-01-20 09:36:08 +1100 |
|---|---|---|
| committer | Linaro Code Review <review@review.linaro.org> | 2016-01-26 23:12:51 +0000 |
| commit | 84e4c94f2ac5ce21630779da264e2f362fe6400f (patch) | |
| tree | 3f71021c64e28cf61ac7b10529ba1c1179d5ea1c | |
| parent | b5709d728ac886b958608f83b3e8c2c0b53f0afa (diff) | |
gcc/
Backport from trunk r232267.
2016-01-12 Jakub Jelinek <jakub@redhat.com>
PR target/69175
* ifcvt.c (cond_exec_process_if_block): When removing the last
insn from then_bb, remove also any possible barriers that follow it.
gcc/testsuite/
Backport from trunk r232267.
2016-01-12 Jakub Jelinek <jakub@redhat.com>
PR target/69175
* g++.dg/opt/pr69175.C: New test.
Change-Id: Ic10619f909083a91034fe6933def72f4b3fefb26
| -rw-r--r-- | gcc/ifcvt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/opt/pr69175.C | 29 |
2 files changed, 30 insertions, 1 deletions
diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c index 8d0cf06a9c0..96ed723abef 100644 --- a/gcc/ifcvt.c +++ b/gcc/ifcvt.c @@ -780,7 +780,7 @@ cond_exec_process_if_block (ce_if_block * ce_info, rtx_insn *from = then_first_tail; if (!INSN_P (from)) from = find_active_insn_after (then_bb, from); - delete_insn_chain (from, BB_END (then_bb), false); + delete_insn_chain (from, get_last_bb_insn (then_bb), false); } if (else_last_head) delete_insn_chain (first_active_insn (else_bb), else_last_head, false); diff --git a/gcc/testsuite/g++.dg/opt/pr69175.C b/gcc/testsuite/g++.dg/opt/pr69175.C new file mode 100644 index 00000000000..e24f6816b5f --- /dev/null +++ b/gcc/testsuite/g++.dg/opt/pr69175.C @@ -0,0 +1,29 @@ +// PR target/69175 +// { dg-do compile } +// { dg-options "-O2" } +// { dg-additional-options "-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mthumb" { target { arm_hard_vfp_ok && arm_thumb2_ok } } } + +struct A { A *c, *d; } a; +struct B { A *e; A *f; void foo (); }; +void *b; + +void +B::foo () +{ + if (b) + { + A *n = (A *) b; + if (b == e) + if (n == f) + e = __null; + else + e->c = __null; + else + n->d->c = &a; + n->d = e; + if (e == __null) + e = f = n; + else + e = n; + } +} |