diff options
author | Tobias Burnus <tobias@codesourcery.com> | 2019-11-11 09:19:29 +0000 |
---|---|---|
committer | Tobias Burnus <burnus@gcc.gnu.org> | 2019-11-11 10:19:29 +0100 |
commit | a2c26c50310a336361d8129ecdd43d3001d6cb3a (patch) | |
tree | 652752017ebc9459258438136af1d92a63535d0d /gcc/fortran/trans-expr.c | |
parent | bfa1837b010feaa81a56cbc46ce7c17dc909c3bb (diff) | |
download | gcc-a2c26c50310a336361d8129ecdd43d3001d6cb3a.zip gcc-a2c26c50310a336361d8129ecdd43d3001d6cb3a.tar.gz gcc-a2c26c50310a336361d8129ecdd43d3001d6cb3a.tar.bz2 |
Fortran] Support absent optional args with use_device_{ptr,addr}
2019-11-11 Tobias Burnus <tobias@codesourcery.com>
Kwok Cheung Yeung <kcy@codesourcery.com>
gcc/
* langhooks-def.h (LANG_HOOKS_OMP_CHECK_OPTIONAL_ARGUMENT):
Renamed from LANG_HOOKS_OMP_IS_OPTIONAL_ARGUMENT; update define.
(LANG_HOOKS_DECLS): Rename also here.
* langhooks.h (lang_hooks_for_decls): Rename
omp_is_optional_argument to omp_check_optional_argument; take
additional bool argument.
* omp-general.h (omp_check_optional_argument): Likewise.
* omp-general.h (omp_check_optional_argument): Likewise.
* omp-low.c (lower_omp_target): Update calls; handle absent
Fortran optional arguments with USE_DEVICE_ADDR/USE_DEVICE_PTR.
gcc/fortran/
* trans-expr.c (gfc_conv_expr_present): Check for DECL_ARTIFICIAL
for the VALUE hidden argument avoiding -fallow-underscore issues.
* trans-decl.c (create_function_arglist): Also set
GFC_DECL_OPTIONAL_ARGUMENT for per-value arguments.
* f95-lang.c (LANG_HOOKS_OMP_CHECK_OPTIONAL_ARGUMENT):
Renamed from LANG_HOOKS_OMP_IS_OPTIONAL_ARGUMENT; point
to gfc_omp_check_optional_argument.
* trans.h (gfc_omp_check_optional_argument): Subsitutes
gfc_omp_is_optional_argument declaration.
* trans-openmp.c (gfc_omp_is_optional_argument): Make static.
(gfc_omp_check_optional_argument): New function.
libgomp/
* testsuite/libgomp.fortran/use_device_ptr-optional-1.f90: Extend.
* testsuite/libgomp.fortran/use_device_ptr-optional-2.f90: New.
Co-Authored-By: Kwok Cheung Yeung <kcy@codesourcery.com>
From-SVN: r278046
Diffstat (limited to 'gcc/fortran/trans-expr.c')
-rw-r--r-- | gcc/fortran/trans-expr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index f800faa..6355938 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -1725,7 +1725,8 @@ gfc_conv_expr_present (gfc_symbol * sym) /* Walk function argument list to find hidden arg. */ cond = DECL_ARGUMENTS (DECL_CONTEXT (decl)); for ( ; cond != NULL_TREE; cond = TREE_CHAIN (cond)) - if (DECL_NAME (cond) == tree_name) + if (DECL_NAME (cond) == tree_name + && DECL_ARTIFICIAL (cond)) break; gcc_assert (cond); |