re PR middle-end/45172 (internal compiler error: verify_flow_info failed)

2010-11-16  Richard Guenther  <rguenther@suse.de>

	PR middle-end/45172
	* tree-eh.c (cleanup_empty_eh_unsplit): Avoid creating duplicate
	edges.

	* gfortran.dg/gomp/pr45172.f90: New testcase.

From-SVN: r166794

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f55283ec6bd3f859e45ce4696640c00f05035a83..7f68583fa076df94aaac8f5aa05903e54167d01f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-16  Richard Guenther  <rguenther@suse.de>
+
+       PR middle-end/45172
+       * tree-eh.c (cleanup_empty_eh_unsplit): Avoid creating duplicate
+       edges.
+
 2010-11-16  Nick Clifton  <nickc@redhat.com>
 
        * config/rx/rx.c (rx_is_ms_bitfield_layout): Return false if the

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ee1bcceb8e46e3a83c434a23da0b3a6689dc08f0..b2ee19ced9a6215fe78eec293548ae1942de8fd4 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-16  Richard Guenther  <rguenther@suse.de>
+
+       PR middle-end/45172
+       * gfortran.dg/gomp/pr45172.f90: New testcase.
+
 2010-11-16  Nick Clifton  <nickc@redhat.com>
 
        * gcc.target/rx/pack.c: New test.

diff --git a/gcc/testsuite/gfortran.dg/gomp/pr45172.f90 b/gcc/testsuite/gfortran.dg/gomp/pr45172.f90
new file mode 100644 (file)
index 0000000..dbb242b
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/gomp/pr45172.f90
@@ -0,0 +1,21 @@
+! { dg-do compile }
+! { dg-options "-O -fopenmp -fexceptions" }
+
+  SUBROUTINE dbcsr_mult_m_e_e ( )
+    LOGICAL, PARAMETER   :: use_combined_types = .FALSE.
+    INTEGER, ALLOCATABLE, DIMENSION(:, :) ::  right_index_sr
+    INTEGER, ALLOCATABLE, DIMENSION(:, :, :) ::  my_sizes
+    INTEGER, ALLOCATABLE,  DIMENSION(:, :, :, :) :: all_sizes
+    ALLOCATE (all_sizes(4, LBOUND(my_sizes,2):UBOUND(my_sizes,2), &
+              LBOUND(my_sizes,3):UBOUND(my_sizes,3), 0:numnodes-1))
+          IF (use_combined_types) THEN
+             CALL mp_waitall (right_index_sr)
+          ENDIF
+          DO ki = 0, min_nimages-1
+!$omp parallel default (none) &
+!$omp reduction (+: flop_single, t_all, t_dgemm)
+!$omp end parallel
+          ENDDO
+       checksum = dbcsr_checksum (product_matrix, error)
+  END SUBROUTINE dbcsr_mult_m_e_e
+

diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index 8a99ad3aa4fa7545dd75ac4ba622ae0709998e6d..270d76d9480d882f7a85327c652945599583c3a4 100644 (file)
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -3670,6 +3670,8 @@ cleanup_empty_eh_unsplit (basic_block bb, edge e_out, eh_landing_pad lp)
 {
   gimple_stmt_iterator gsi;
   tree lab;
+  edge_iterator ei;
+  edge e;
 
   /* We really ought not have totally lost everything following
      a landing pad label.  Given that BB is empty, there had better
@@ -3692,6 +3694,22 @@ cleanup_empty_eh_unsplit (basic_block bb, edge e_out, eh_landing_pad lp)
        return false;
     }
 
+  /* The destination block must not be a regular successor for any
+     of the preds of the landing pad.  Thus, avoid turning
+        <..>
+        |  \ EH
+        |  <..>
+        |  /
+       <..>
+     into
+        <..>
+       |  | EH
+       <..>
+     which CFG verification would choke on.  See PR45172.  */
+  FOR_EACH_EDGE (e, ei, bb->preds)
+    if (find_edge (e->src, e_out->dest))
+      return false;
+
   /* Attempt to move the PHIs into the successor block.  */
   if (cleanup_empty_eh_merge_phis (e_out->dest, bb, e_out, false))
     {