From 56a3d28ba3f48c5d4c6d00c558e2432fd8b03d6e Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 11 May 2016 15:16:48 +0200 Subject: 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 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/frontend-passes.c | 6 ++++++ 2 files changed, 11 insertions(+) (limited to 'gcc/fortran') 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 + + PR fortran/70855 + * frontend-passes.c (inline_matmul_assign): Disable in !$omp workshare. + 2016-05-09 Richard Biener 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 -- cgit v1.1