re PR target/69175 (ICE in haifa_luid_for_non_insn, at haifa-sched.c:7895)

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.

	* g++.dg/opt/pr69175.C: New test.

From-SVN: r232267
This commit is contained in:
Jakub Jelinek 2016-01-12 14:19:49 +01:00 committed by Jakub Jelinek
parent 5cc2af593f
commit 5664cea1cd
4 changed files with 41 additions and 1 deletions

View File

@ -1,3 +1,9 @@
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.
2016-01-12 H.J. Lu <hongjiu.lu@intel.com>
PR target/68456

View File

@ -740,7 +740,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);

View File

@ -1,3 +1,8 @@
2016-01-12 Jakub Jelinek <jakub@redhat.com>
PR target/69175
* g++.dg/opt/pr69175.C: New test.
2016-01-12 Alan Lawrence <alan.lawrence@arm.com>
* gcc.dg/vect/fast-math-bb-slp-call-3.c: Declare functions as 'extern'

View File

@ -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;
}
}