From: Richard Biener Date: Wed, 6 May 2020 08:23:15 +0000 (+0200) Subject: middle-end/94964 - avoid EH loop entry with CP_SIMPLE_PREHEADERS X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6fc00b41e764219e2c88d8892d7c701c0d292a17;p=gcc.git middle-end/94964 - avoid EH loop entry with CP_SIMPLE_PREHEADERS Loop optimizers expect to be able to insert on the preheader edge w/o splitting it thus avoid ending up with a preheader that enters the loop via an EH edge (or an abnormal edge). 2020-05-06 Richard Biener PR middle-end/94964 * cfgloopmanip.c (create_preheader): Require non-complex preheader edge for CP_SIMPLE_PREHEADERS. --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 73a601528f0..ae6dd069578 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2020-05-06 Richard Biener + + PR middle-end/94964 + * cfgloopmanip.c (create_preheader): Require non-complex + preheader edge for CP_SIMPLE_PREHEADERS. + 2020-05-06 Richard Biener PR tree-optimization/94963 diff --git a/gcc/cfgloopmanip.c b/gcc/cfgloopmanip.c index 50c7267ec49..73134a20e33 100644 --- a/gcc/cfgloopmanip.c +++ b/gcc/cfgloopmanip.c @@ -1506,9 +1506,10 @@ create_preheader (class loop *loop, int flags) else { /* If we want simple preheaders, also force the preheader to have - just a single successor. */ + just a single successor and a normal edge. */ if ((flags & CP_SIMPLE_PREHEADERS) - && !single_succ_p (single_entry->src)) + && ((single_entry->flags & EDGE_COMPLEX) + || !single_succ_p (single_entry->src))) need_forwarder_block = true; /* If we want fallthru preheaders, also create forwarder block when preheader ends with a jump or has predecessors from loop. */