On Tue, Jun 15, 2021 at 03:45:15PM +0200, Tobias Burnus wrote:
> PR fortran/92568
>
> gcc/fortran/ChangeLog:
>
> * dump-parse-tree.c (show_omp_clauses): Update for defaultmap.
> * f95-lang.c (LANG_HOOKS_OMP_ALLOCATABLE_P,
> LANG_HOOKS_OMP_SCALAR_TARGET_P): New.
> * gfortran.h (enum gfc_omp_defaultmap,
> enum gfc_omp_defaultmap_category): New.
> * openmp.c (gfc_match_omp_clauses): Update defaultmap matching.
> * trans-decl.c (gfc_finish_decl_attrs): Set GFC_DECL_SCALAR_TARGET.
> * trans-openmp.c (gfc_omp_allocatable_p, gfc_omp_scalar_target_p): New.
> (gfc_omp_scalar_p): Take 'ptr_alloc_ok' argument.
> (gfc_trans_omp_clauses, gfc_split_omp_clauses): Update for
> defaultmap changes.
> * trans.h (gfc_omp_scalar_p): Update prototype.
> (gfc_omp_allocatable_p, gfc_omp_scalar_target_p): New.
> (struct lang_decl): Add scalar_target.
> (GFC_DECL_SCALAR_TARGET, GFC_DECL_GET_SCALAR_TARGET): New.
>
> gcc/ChangeLog:
>
> * gimplify.c (enum gimplify_defaultmap_kind): Add GDMK_SCALAR_TARGET.
> (struct gimplify_omp_ctx): Extend defaultmap array by one.
> (new_omp_context): Init defaultmap[GDMK_SCALAR_TARGET].
> (omp_notice_variable): Update type classification for Fortran.
> (gimplify_scan_omp_clauses): Update calls for new argument; handle
> GDMK_SCALAR_TARGET; for Fortran, GDMK_POINTER avoid GOVD_MAP_0LEN_ARRAY.
> * langhooks-def.h (lhd_omp_scalar_p): Add 'ptr_ok' argument.
> * langhooks.c (lhd_omp_scalar_p): Likewise.
> (LANG_HOOKS_OMP_ALLOCATABLE_P, LANG_HOOKS_OMP_SCALAR_TARGET_P): New.
> (LANG_HOOKS_DECLS): Add them.
> * langhooks.h (struct lang_hooks_for_decls): Add new hooks, update
> omp_scalar_p pointer type to include the new bool argument.
>
> libgomp/ChangeLog:
>
> * testsuite/libgomp.fortran/defaultmap-8.f90: New test.
>
> gcc/testsuite/ChangeLog:
>
> * gfortran.dg/gomp/pr99928-1.f90: Uncomment 'defaultmap(none)'.
> * gfortran.dg/gomp/pr99928-2.f90: Uncomment 'defaultmap(none)'.
> * gfortran.dg/gomp/pr99928-3.f90: Uncomment 'defaultmap(none)'.
> * gfortran.dg/gomp/pr99928-4.f90: Uncomment 'defaultmap(none)'.
> * gfortran.dg/gomp/pr99928-5.f90: Uncomment 'defaultmap(none)'.
> * gfortran.dg/gomp/pr99928-6.f90: Uncomment 'defaultmap(none)'.
> * gfortran.dg/gomp/pr99928-8.f90: Uncomment 'defaultmap(none)'.
> * gfortran.dg/gomp/defaultmap-1.f90: New test.
> * gfortran.dg/gomp/defaultmap-2.f90: New test.
> * gfortran.dg/gomp/defaultmap-3.f90: New test.
> * gfortran.dg/gomp/defaultmap-4.f90: New test.
> * gfortran.dg/gomp/defaultmap-5.f90: New test.
> * gfortran.dg/gomp/defaultmap-6.f90: New test.
> * gfortran.dg/gomp/defaultmap-7.f90: New test.
LGTM, thanks.
Jakub
