re PR fortran/62107 (libgomp.fortran/target2.f90 error while compiling for OpenMP...

	PR fortran/62107
	* trans-openmp.c (gfc_omp_finish_clause): Handle scalar pointer
	or allocatable passed by reference.
	(gfc_trans_omp_clauses) <case OMP_LIST_MAP>: Likewise.

From-SVN: r214003

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index a8930a9f6365a500c631388d26eb864024dc5008..f6e3082d1c649d58e5479dc19ec471821e92a648 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2014-08-15  Jakub Jelinek  <jakub@redhat.com>
+
+       PR fortran/62107
+       * trans-openmp.c (gfc_omp_finish_clause): Handle scalar pointer
+       or allocatable passed by reference.
+       (gfc_trans_omp_clauses) <case OMP_LIST_MAP>: Likewise.
+
 2014-08-14  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
        PR fortran/62106

diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c
index da01a9034cb5126b679c488c15cc38725de4631b..548b5d3a4857d68beccbb3f7f93a3440d3689690 100644 (file)
--- a/gcc/fortran/trans-openmp.c
+++ b/gcc/fortran/trans-openmp.c
@@ -1022,6 +1022,7 @@ gfc_omp_finish_clause (tree c, gimple_seq *pre_p)
          && !GFC_DECL_CRAY_POINTEE (decl)
          && !GFC_DESCRIPTOR_TYPE_P (TREE_TYPE (TREE_TYPE (decl))))
        return;
+      tree orig_decl = decl;
       c4 = build_omp_clause (OMP_CLAUSE_LOCATION (c), OMP_CLAUSE_MAP);
       OMP_CLAUSE_MAP_KIND (c4) = OMP_CLAUSE_MAP_POINTER;
       OMP_CLAUSE_DECL (c4) = decl;
@@ -1029,6 +1030,17 @@ gfc_omp_finish_clause (tree c, gimple_seq *pre_p)
       decl = build_fold_indirect_ref (decl);
       OMP_CLAUSE_DECL (c) = decl;
       OMP_CLAUSE_SIZE (c) = NULL_TREE;
+      if (TREE_CODE (TREE_TYPE (orig_decl)) == REFERENCE_TYPE
+         && (GFC_DECL_GET_SCALAR_POINTER (orig_decl)
+             || GFC_DECL_GET_SCALAR_ALLOCATABLE (orig_decl)))
+       {
+         c3 = build_omp_clause (OMP_CLAUSE_LOCATION (c), OMP_CLAUSE_MAP);
+         OMP_CLAUSE_MAP_KIND (c3) = OMP_CLAUSE_MAP_POINTER;
+         OMP_CLAUSE_DECL (c3) = unshare_expr (decl);
+         OMP_CLAUSE_SIZE (c3) = size_int (0);
+         decl = build_fold_indirect_ref (decl);
+         OMP_CLAUSE_DECL (c) = decl;
+       }
     }
   if (GFC_DESCRIPTOR_TYPE_P (TREE_TYPE (decl)))
     {
@@ -1884,14 +1896,32 @@ gfc_trans_omp_clauses (stmtblock_t *block, gfc_omp_clauses *clauses,
                TREE_ADDRESSABLE (decl) = 1;
              if (n->expr == NULL || n->expr->ref->u.ar.type == AR_FULL)
                {
-                 if (POINTER_TYPE_P (TREE_TYPE (decl)))
+                 if (POINTER_TYPE_P (TREE_TYPE (decl))
+                     && (gfc_omp_privatize_by_reference (decl)
+                         || GFC_DECL_GET_SCALAR_POINTER (decl)
+                         || GFC_DECL_GET_SCALAR_ALLOCATABLE (decl)
+                         || GFC_DECL_CRAY_POINTEE (decl)
+                         || GFC_DESCRIPTOR_TYPE_P
+                                       (TREE_TYPE (TREE_TYPE (decl)))))
                    {
+                     tree orig_decl = decl;
                      node4 = build_omp_clause (input_location,
                                                OMP_CLAUSE_MAP);
                      OMP_CLAUSE_MAP_KIND (node4) = OMP_CLAUSE_MAP_POINTER;
                      OMP_CLAUSE_DECL (node4) = decl;
                      OMP_CLAUSE_SIZE (node4) = size_int (0);
                      decl = build_fold_indirect_ref (decl);
+                     if (TREE_CODE (TREE_TYPE (orig_decl)) == REFERENCE_TYPE
+                         && (GFC_DECL_GET_SCALAR_POINTER (orig_decl)
+                             || GFC_DECL_GET_SCALAR_ALLOCATABLE (orig_decl)))
+                       {
+                         node3 = build_omp_clause (input_location,
+                                                   OMP_CLAUSE_MAP);
+                         OMP_CLAUSE_MAP_KIND (node3) = OMP_CLAUSE_MAP_POINTER;
+                         OMP_CLAUSE_DECL (node3) = decl;
+                         OMP_CLAUSE_SIZE (node3) = size_int (0);
+                         decl = build_fold_indirect_ref (decl);
+                       }
                    }
                  if (GFC_DESCRIPTOR_TYPE_P (TREE_TYPE (decl)))
                    {