git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Richard Guenther 2010-11-16 11:42:50 +00:00 committed by Richard Biener
parent 27128fc317
commit 05613877bd
4 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -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> 2010-11-16 Nick Clifton <nickc@redhat.com>
* config/rx/rx.c (rx_is_ms_bitfield_layout): Return false if the * config/rx/rx.c (rx_is_ms_bitfield_layout): Return false if the

5
gcc/testsuite/ChangeLog
View File

@ -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> 2010-11-16 Nick Clifton <nickc@redhat.com>
* gcc.target/rx/pack.c: New test. * gcc.target/rx/pack.c: New test.

21
gcc/testsuite/gfortran.dg/gomp/pr45172.f90 Normal file
View File

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

18
gcc/tree-eh.c
View File

@ -3670,6 +3670,8 @@ cleanup_empty_eh_unsplit (basic_block bb, edge e_out, eh_landing_pad lp)
{ {
gimple_stmt_iterator gsi; gimple_stmt_iterator gsi;
tree lab; tree lab;
edge_iterator ei;
edge e;
/* We really ought not have totally lost everything following /* We really ought not have totally lost everything following
a landing pad label. Given that BB is empty, there had better 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; 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. */ /* Attempt to move the PHIs into the successor block. */
if (cleanup_empty_eh_merge_phis (e_out->dest, bb, e_out, false)) if (cleanup_empty_eh_merge_phis (e_out->dest, bb, e_out, false))
{ {