diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2016-05-11 15:16:48 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2016-05-11 15:16:48 +0200 |
| commit | 56a3d28ba3f48c5d4c6d00c558e2432fd8b03d6e (patch) | |
| tree | 13b79caf08a610290df73a849e568e1a0a26bbac | |
| parent | 3d73ae6ea92ead3b4a0ed0965eea01ec6e97c52a (diff) | |
| download | gcc-56a3d28ba3f48c5d4c6d00c558e2432fd8b03d6e.zip gcc-56a3d28ba3f48c5d4c6d00c558e2432fd8b03d6e.tar.gz gcc-56a3d28ba3f48c5d4c6d00c558e2432fd8b03d6e.tar.bz2 | |
re PR fortran/70855 (ICE with -fopenmp in gfc_trans_omp_workshare(): Bad statement code)
PR fortran/70855
* frontend-passes.c (inline_matmul_assign): Disable in !$omp workshare.
* gfortran.dg/gomp/pr70855.f90: New test.
From-SVN: r236119
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/frontend-passes.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/gomp/pr70855.f90 | 18 |
4 files changed, 34 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index f683869..3d79fca 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2016-05-11 Jakub Jelinek <jakub@redhat.com> + + PR fortran/70855 + * frontend-passes.c (inline_matmul_assign): Disable in !$omp workshare. + 2016-05-09 Richard Biener <rguenther@suse.de> PR fortran/70937 diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c index 7eeb5a6..9d724de 100644 --- a/gcc/fortran/frontend-passes.c +++ b/gcc/fortran/frontend-passes.c @@ -2812,6 +2812,12 @@ inline_matmul_assign (gfc_code **c, int *walk_subtrees, if (in_where) return 0; + /* For now don't do anything in OpenMP workshare, it confuses + its translation, which expects only the allowed statements in there. + We should figure out how to parallelize this eventually. */ + if (in_omp_workshare) + return 0; + expr1 = co->expr1; expr2 = co->expr2; if (expr2->expr_type != EXPR_FUNCTION diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 12fd1d0..0190872 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-05-11 Jakub Jelinek <jakub@redhat.com> + + PR fortran/70855 + * gfortran.dg/gomp/pr70855.f90: New test. + 2016-05-11 Richard Biener <rguenther@suse.de> PR middle-end/71002 diff --git a/gcc/testsuite/gfortran.dg/gomp/pr70855.f90 b/gcc/testsuite/gfortran.dg/gomp/pr70855.f90 new file mode 100644 index 0000000..247e4ed --- /dev/null +++ b/gcc/testsuite/gfortran.dg/gomp/pr70855.f90 @@ -0,0 +1,18 @@ +! PR fortran/70855 +! { dg-do compile } +! { dg-additional-options "-O2" } + +program pr70855 + integer, parameter :: m = 4 + integer, parameter :: n = 2 + real :: a(m,n) + real :: x(n) + real :: y(m) + a = 1.0 + x = 1.0 +!$omp parallel +!$omp workshare + y(1:m) = matmul ( a(1:m,1:n), x(1:n) ) +!$omp end workshare +!$omp end parallel +end program pr70855 |