[committed] Fix OpenMP handling of character allocatable scalars (PR fortran/88377)

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[committed] Fix OpenMP handling of character allocatable scalars (PR fortran/88377)

Jakub Jelinek
Hi!

Apparently the length decls corresponding to allocatable scalars with
character type are also GFC_DECL_GET_SCALAR_ALLOCATABLE; the OpenMP
clause handling code was relying on those to have POINTER_TYPEs, but
the lengths are integrals and should be handled normally.

Bootstrapped/regtested on x86_64-linux and i686-linux, committed to trunk.

2018-12-07  Jakub Jelinek  <[hidden email]>

        PR fortran/88377
        * trans-openmp.c (gfc_omp_clause_default_ctor,
        gfc_omp_clause_copy_ctor, gfc_omp_clause_assign_op,
        gfc_omp_clause_linear_ctor, gfc_omp_clause_dtor): Only consider
        GFC_DECL_GET_SCALAR_ALLOCATABLE vars as scalar allocatables if they
        have pointer type.

        * gfortran.dg/gomp/pr88377.f90: New test.

--- gcc/fortran/trans-openmp.c.jj 2018-11-08 18:07:56.253072145 +0100
+++ gcc/fortran/trans-openmp.c 2018-12-06 15:58:54.647301230 +0100
@@ -460,7 +460,8 @@ gfc_omp_clause_default_ctor (tree clause
 
   if ((! GFC_DESCRIPTOR_TYPE_P (type)
        || GFC_TYPE_ARRAY_AKIND (type) != GFC_ARRAY_ALLOCATABLE)
-      && !GFC_DECL_GET_SCALAR_ALLOCATABLE (OMP_CLAUSE_DECL (clause)))
+      && (!GFC_DECL_GET_SCALAR_ALLOCATABLE (OMP_CLAUSE_DECL (clause))
+  || !POINTER_TYPE_P (type)))
     {
       if (gfc_has_alloc_comps (type, OMP_CLAUSE_DECL (clause)))
  {
@@ -567,7 +568,8 @@ gfc_omp_clause_copy_ctor (tree clause, t
 
   if ((! GFC_DESCRIPTOR_TYPE_P (type)
        || GFC_TYPE_ARRAY_AKIND (type) != GFC_ARRAY_ALLOCATABLE)
-      && !GFC_DECL_GET_SCALAR_ALLOCATABLE (OMP_CLAUSE_DECL (clause)))
+      && (!GFC_DECL_GET_SCALAR_ALLOCATABLE (OMP_CLAUSE_DECL (clause))
+  || !POINTER_TYPE_P (type)))
     {
       if (gfc_has_alloc_comps (type, OMP_CLAUSE_DECL (clause)))
  {
@@ -667,7 +669,8 @@ gfc_omp_clause_assign_op (tree clause, t
 
   if ((! GFC_DESCRIPTOR_TYPE_P (type)
        || GFC_TYPE_ARRAY_AKIND (type) != GFC_ARRAY_ALLOCATABLE)
-      && !GFC_DECL_GET_SCALAR_ALLOCATABLE (OMP_CLAUSE_DECL (clause)))
+      && (!GFC_DECL_GET_SCALAR_ALLOCATABLE (OMP_CLAUSE_DECL (clause))
+  || !POINTER_TYPE_P (type)))
     {
       if (gfc_has_alloc_comps (type, OMP_CLAUSE_DECL (clause)))
  {
@@ -905,7 +908,8 @@ gfc_omp_clause_linear_ctor (tree clause,
 
   if ((! GFC_DESCRIPTOR_TYPE_P (type)
        || GFC_TYPE_ARRAY_AKIND (type) != GFC_ARRAY_ALLOCATABLE)
-      && !GFC_DECL_GET_SCALAR_ALLOCATABLE (OMP_CLAUSE_DECL (clause)))
+      && (!GFC_DECL_GET_SCALAR_ALLOCATABLE (OMP_CLAUSE_DECL (clause))
+  || !POINTER_TYPE_P (type)))
     {
       gcc_assert (TREE_CODE (type) == ARRAY_TYPE);
       if (!TYPE_DOMAIN (type)
@@ -989,7 +993,8 @@ gfc_omp_clause_dtor (tree clause, tree d
 
   if ((! GFC_DESCRIPTOR_TYPE_P (type)
        || GFC_TYPE_ARRAY_AKIND (type) != GFC_ARRAY_ALLOCATABLE)
-      && !GFC_DECL_GET_SCALAR_ALLOCATABLE (OMP_CLAUSE_DECL (clause)))
+      && (!GFC_DECL_GET_SCALAR_ALLOCATABLE (OMP_CLAUSE_DECL (clause))
+  || !POINTER_TYPE_P (type)))
     {
       if (gfc_has_alloc_comps (type, OMP_CLAUSE_DECL (clause)))
  return gfc_walk_alloc_comps (decl, NULL_TREE,
--- gcc/testsuite/gfortran.dg/gomp/pr88377.f90.jj 2018-12-06 16:00:28.779775783 +0100
+++ gcc/testsuite/gfortran.dg/gomp/pr88377.f90 2018-12-06 16:00:02.714198182 +0100
@@ -0,0 +1,15 @@
+! PR fortran/88377
+! { dg-do compile }
+
+program pr88377
+  call s(3)
+contains
+  subroutine s(n)
+    integer :: n
+    character(n), allocatable :: x
+    x = 'abc'
+    !$omp task
+    print *, x, (x == 'abc')
+    !$omp end task
+  end
+end

        Jakub