diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2011-05-10 08:08:18 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2011-05-10 08:08:18 +0200 |
| commit | 6ae70ea2e6f12a97415896b4721bf4df536e3b09 (patch) | |
| tree | eeaa46393953dd5b9765c18fe9332858b16a475a /gcc | |
| parent | e7f7802150169bf0ec2b8a3ad309c53f87280927 (diff) | |
| download | gcc-6ae70ea2e6f12a97415896b4721bf4df536e3b09.zip gcc-6ae70ea2e6f12a97415896b4721bf4df536e3b09.tar.gz gcc-6ae70ea2e6f12a97415896b4721bf4df536e3b09.tar.bz2 | |
re PR tree-optimization/48611 (ICE: SIGSEGV in remap_eh_region_nr (tree-inline.c:1194) with -Os -fopenmp -fexceptions -fno-tree-ccp -fno-tree-copy-prop on basic code)
PR tree-optimization/48611
PR tree-optimization/48794
* tree-eh.c (remove_unreachable_handlers): Don't remove regions
referenced from RESX or EH_DISPATCH arguments.
* gfortran.dg/gomp/pr48611.f90: New test.
* gfortran.dg/gomp/pr48794.f90: New test.
From-SVN: r173607
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/gomp/pr48611.f90 | 12 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/gomp/pr48794.f90 | 12 | ||||
| -rw-r--r-- | gcc/tree-eh.c | 13 |
5 files changed, 47 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0c0efe4..b98c123 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2011-05-10 Jakub Jelinek <jakub@redhat.com> + PR tree-optimization/48611 + PR tree-optimization/48794 + * tree-eh.c (remove_unreachable_handlers): Don't remove regions + referenced from RESX or EH_DISPATCH arguments. + PR debug/48928 * dfp.c (decimal_to_decnumber): Handle conversion from dconst{1,2,m1,half}. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index eb2f073..c63b45e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2011-05-10 Jakub Jelinek <jakub@redhat.com> + PR tree-optimization/48611 + PR tree-optimization/48794 + * gfortran.dg/gomp/pr48611.f90: New test. + * gfortran.dg/gomp/pr48794.f90: New test. + PR debug/48928 * gcc.dg/dfp/pr48928.c: New test. diff --git a/gcc/testsuite/gfortran.dg/gomp/pr48611.f90 b/gcc/testsuite/gfortran.dg/gomp/pr48611.f90 new file mode 100644 index 0000000..643cc5c --- /dev/null +++ b/gcc/testsuite/gfortran.dg/gomp/pr48611.f90 @@ -0,0 +1,12 @@ +! PR tree-optimization/48611 +! { dg-do compile } +! { dg-options "-Os -fopenmp -fexceptions -fno-tree-ccp -fno-tree-copy-prop" } + + integer, allocatable :: a(:) + logical :: l +!$omp parallel private (a) reduction (.or.:l) + do i = 1, 7 + a(:) = i + end do +!$omp end parallel +end diff --git a/gcc/testsuite/gfortran.dg/gomp/pr48794.f90 b/gcc/testsuite/gfortran.dg/gomp/pr48794.f90 new file mode 100644 index 0000000..11edb0b --- /dev/null +++ b/gcc/testsuite/gfortran.dg/gomp/pr48794.f90 @@ -0,0 +1,12 @@ +! PR tree-optimization/48794 +! { dg-do compile } +! { dg-options "-Os -fopenmp -fexceptions -fno-tree-ccp -fno-tree-copy-prop" } + + integer, allocatable :: a(:) + logical :: l + if (allocated (a)) call abort +!$omp parallel private (a) reduction (.or.:l) + do i = 1, 7 + end do +!$omp end parallel +end diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c index cd6c428..e87c32e 100644 --- a/gcc/tree-eh.c +++ b/gcc/tree-eh.c @@ -3316,6 +3316,19 @@ remove_unreachable_handlers (void) SET_BIT (r_reachable, region->index); SET_BIT (lp_reachable, lp_nr); } + + /* Avoid removing regions referenced from RESX/EH_DISPATCH. */ + switch (gimple_code (stmt)) + { + case GIMPLE_RESX: + SET_BIT (r_reachable, gimple_resx_region (stmt)); + break; + case GIMPLE_EH_DISPATCH: + SET_BIT (r_reachable, gimple_eh_dispatch_region (stmt)); + break; + default: + break; + } } } |