From 18cda88d873b67cfa06ac2a9c8b2e85468a73f4c Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 10 Oct 2014 13:08:37 +0200 Subject: [PATCH] re PR fortran/59488 ([OpenMP] named constant in parallel construct leads to "not specified in enclosing parallel" error.) PR fortran/59488 * trans-openmp.c (gfc_omp_predetermined_sharing): Return OMP_CLAUSE_DEFAULT_SHARED for parameters or vtables. * gfortran.dg/gomp/pr59488-1.f90: New test. * gfortran.dg/gomp/pr59488-2.f90: New test. From-SVN: r216067 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/trans-openmp.c | 10 ++++++++++ gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/gfortran.dg/gomp/pr59488-1.f90 | 13 +++++++++++++ gcc/testsuite/gfortran.dg/gomp/pr59488-2.f90 | 16 ++++++++++++++++ 5 files changed, 51 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/gomp/pr59488-1.f90 create mode 100644 gcc/testsuite/gfortran.dg/gomp/pr59488-2.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 907e32a7cbc..88fc33f87b4 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2014-10-10 Jakub Jelinek + + PR fortran/59488 + * trans-openmp.c (gfc_omp_predetermined_sharing): Return + OMP_CLAUSE_DEFAULT_SHARED for parameters or vtables. + 2014-10-10 Tobias Burnus * gfortran.h (gfc_set_implicit_none): Update prototype. diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c index c8028ab269a..038c3e9a6e4 100644 --- a/gcc/fortran/trans-openmp.c +++ b/gcc/fortran/trans-openmp.c @@ -135,6 +135,16 @@ gfc_omp_predetermined_sharing (tree decl) if (GFC_DECL_RESULT (decl) && ! DECL_HAS_VALUE_EXPR_P (decl)) return OMP_CLAUSE_DEFAULT_SHARED; + /* These are either array or derived parameters, or vtables. + In the former cases, the OpenMP standard doesn't consider them to be + variables at all (they can't be redefined), but they can nevertheless appear + in parallel/task regions and for default(none) purposes treat them as shared. + For vtables likely the same handling is desirable. */ + if (TREE_CODE (decl) == VAR_DECL + && TREE_READONLY (decl) + && TREE_STATIC (decl)) + return OMP_CLAUSE_DEFAULT_SHARED; + return OMP_CLAUSE_DEFAULT_UNSPECIFIED; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2ed4d4a0612..d9e93d352a9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-10-10 Jakub Jelinek + + PR fortran/59488 + * gfortran.dg/gomp/pr59488-1.f90: New test. + * gfortran.dg/gomp/pr59488-2.f90: New test. + 2014-10-10 Richard Biener PR tree-optimization/63476 diff --git a/gcc/testsuite/gfortran.dg/gomp/pr59488-1.f90 b/gcc/testsuite/gfortran.dg/gomp/pr59488-1.f90 new file mode 100644 index 00000000000..9db17dd2769 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/gomp/pr59488-1.f90 @@ -0,0 +1,13 @@ +! PR fortran/59488 +! { dg-do compile } +! { dg-options "-fopenmp" } + + implicit none + integer, parameter :: p(2) = (/ 11, 12 /) + integer :: r + + !$omp parallel do default(none) + do r = 1, 2 + print *, p(r) + end do +end diff --git a/gcc/testsuite/gfortran.dg/gomp/pr59488-2.f90 b/gcc/testsuite/gfortran.dg/gomp/pr59488-2.f90 new file mode 100644 index 00000000000..38f157b81ad --- /dev/null +++ b/gcc/testsuite/gfortran.dg/gomp/pr59488-2.f90 @@ -0,0 +1,16 @@ +! PR fortran/59488 +! { dg-do compile } +! { dg-options "-fopenmp" } + + implicit none + type t + integer :: s1, s2, s3 + end type + integer :: r + type(t), parameter :: u = t(1, 2, 3) + + !$omp parallel do default(none) + do r = 1, 2 + print *, u + end do +end -- 2.30.2