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  <rguenther@suse.de>

	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 73a601528f0e76a6081362373ac5a05908dadeeb..ae6dd069578d6cada7099208b1010d7736fd5b85 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2020-05-06  Richard Biener  <rguenther@suse.de>
+
+       PR middle-end/94964
+       * cfgloopmanip.c (create_preheader): Require non-complex
+       preheader edge for CP_SIMPLE_PREHEADERS.
+
 2020-05-06  Richard Biener  <rguenther@suse.de>
 
        PR tree-optimization/94963

diff --git a/gcc/cfgloopmanip.c b/gcc/cfgloopmanip.c
index 50c7267ec49e7a01fb80407fbc2838a188bd309f..73134a20e3376b5d41ceb2820fb4827d3a9d5fac 100644 (file)
--- 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.  */