diff options
| author | Tobias Burnus <tobias@codesourcery.com> | 2020-06-03 12:28:25 +0200 |
|---|---|---|
| committer | Tobias Burnus <tobias@codesourcery.com> | 2020-06-03 12:30:04 +0200 |
| commit | 93535a2b40367e6f68433295b37dc52c0e9c2c55 (patch) | |
| tree | 3fd7c1567794717f5f0e8b88717e9106ab8748dd /gcc/cp | |
| parent | dda71670514e88dcd9b913c44c0ee64d8c3d6da9 (diff) | |
| download | gcc-93535a2b40367e6f68433295b37dc52c0e9c2c55.zip gcc-93535a2b40367e6f68433295b37dc52c0e9c2c55.tar.gz gcc-93535a2b40367e6f68433295b37dc52c0e9c2c55.tar.bz2 | |
[OpenMP] Fix mapping of artificial variables (PR94874)
gcc/c-family/ChangeLog:
* c-common.h (c_omp_predetermined_mapping): Declare.
* c-omp.c (c_omp_predetermined_mapping): New.
gcc/c/ChangeLog:
* c-objc-common.h (LANG_HOOKS_OMP_PREDETERMINED_MAPPING): Redefine.
gcc/cp/ChangeLog:
* cp-gimplify.c (cxx_omp_predetermined_mapping): New.
* cp-objcp-common.h (LANG_HOOKS_OMP_PREDETERMINED_MAPPING): Redfine.
* cp-tree.h (cxx_omp_predetermined_mapping): Declare.
gcc/fortran/ChangeLog:
* f95-lang.c (LANG_HOOKS_OMP_PREDETERMINED_MAPPING): Redefine.
* trans-openmp.c (gfc_omp_predetermined_mapping): New.
* trans.h (gfc_omp_predetermined_mapping): Declare.
gcc/ChangeLog:
* gimplify.c (omp_notice_variable): Use new hook.
* langhooks-def.h (lhd_omp_predetermined_mapping): Declare.
(LANG_HOOKS_OMP_PREDETERMINED_MAPPING): Define
(LANG_HOOKS_DECLS): Add it.
* langhooks.c (lhd_omp_predetermined_sharing): Remove bogus unused attr.
(lhd_omp_predetermined_mapping): New.
* langhooks.h (struct lang_hooks_for_decls): Add new hook.
gcc/testsuite/ChangeLog
2020-06-03 Thomas Schwinge <thomas@codesourcery.com>
Tobias Burnus <tobias@codesourcery.com>
PR middle-end/94874
* c-c++-common/gomp/pr94874.c: New.
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/cp-gimplify.c | 22 | ||||
| -rw-r--r-- | gcc/cp/cp-objcp-common.h | 2 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 1 |
3 files changed, 24 insertions, 1 deletions
diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c index d6723e4..6c29be9 100644 --- a/gcc/cp/cp-gimplify.c +++ b/gcc/cp/cp-gimplify.c @@ -2267,7 +2267,8 @@ cxx_omp_const_qual_no_mutable (tree decl) return false; } -/* True if OpenMP sharing attribute of DECL is predetermined. */ +/* OMP_CLAUSE_DEFAULT_UNSPECIFIED unless OpenMP sharing attribute + of DECL is predetermined. */ enum omp_clause_default_kind cxx_omp_predetermined_sharing_1 (tree decl) @@ -2321,6 +2322,25 @@ cxx_omp_predetermined_sharing (tree decl) return OMP_CLAUSE_DEFAULT_UNSPECIFIED; } +enum omp_clause_defaultmap_kind +cxx_omp_predetermined_mapping (tree decl) +{ + /* Predetermine artificial variables holding integral values, those + are usually result of gimplify_one_sizepos or SAVE_EXPR + gimplification. */ + if (VAR_P (decl) + && DECL_ARTIFICIAL (decl) + && INTEGRAL_TYPE_P (TREE_TYPE (decl)) + && !(DECL_LANG_SPECIFIC (decl) + && DECL_OMP_PRIVATIZED_MEMBER (decl))) + return OMP_CLAUSE_DEFAULTMAP_FIRSTPRIVATE; + + if (c_omp_predefined_variable (decl)) + return OMP_CLAUSE_DEFAULTMAP_TO; + + return OMP_CLAUSE_DEFAULTMAP_CATEGORY_UNSPECIFIED; +} + /* Finalize an implicitly determined clause. */ void diff --git a/gcc/cp/cp-objcp-common.h b/gcc/cp/cp-objcp-common.h index ff802dc..de8d606 100644 --- a/gcc/cp/cp-objcp-common.h +++ b/gcc/cp/cp-objcp-common.h @@ -162,6 +162,8 @@ extern tree cxx_simulate_enum_decl (location_t, const char *, #undef LANG_HOOKS_OMP_PREDETERMINED_SHARING #define LANG_HOOKS_OMP_PREDETERMINED_SHARING cxx_omp_predetermined_sharing +#undef LANG_HOOKS_OMP_PREDETERMINED_MAPPING +#define LANG_HOOKS_OMP_PREDETERMINED_MAPPING cxx_omp_predetermined_mapping #undef LANG_HOOKS_OMP_CLAUSE_DEFAULT_CTOR #define LANG_HOOKS_OMP_CLAUSE_DEFAULT_CTOR cxx_omp_clause_default_ctor #undef LANG_HOOKS_OMP_CLAUSE_COPY_CTOR diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index db125a3..1775b0a 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -7781,6 +7781,7 @@ extern void cp_genericize (tree); extern bool cxx_omp_const_qual_no_mutable (tree); extern enum omp_clause_default_kind cxx_omp_predetermined_sharing_1 (tree); extern enum omp_clause_default_kind cxx_omp_predetermined_sharing (tree); +extern enum omp_clause_defaultmap_kind cxx_omp_predetermined_mapping (tree); extern tree cxx_omp_clause_default_ctor (tree, tree, tree); extern tree cxx_omp_clause_copy_ctor (tree, tree, tree); extern tree cxx_omp_clause_assign_op (tree, tree, tree); |