From 92a5de3df2dc958d6b3d18a0466189ad31f5ae79 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Wed, 17 Aug 2022 14:17:08 +0200 Subject: OpenMP/C++: Allow classes with static members to be mappable [PR104493] As this is the last lang-specific user of the omp_mappable_type hook, the hook is removed, keeping only a generic omp_mappable_type for incomplete types (or error_node). PR c++/104493 gcc/c/ChangeLog: * c-decl.cc (c_decl_attributes, finish_decl): Call omp_mappable_type instead of removed langhook. * c-typeck.cc (c_finish_omp_clauses): Likewise. gcc/cp/ChangeLog: * cp-objcp-common.h (LANG_HOOKS_OMP_MAPPABLE_TYPE): Remove. * cp-tree.h (cp_omp_mappable_type, cp_omp_emit_unmappable_type_notes): Remove. * decl2.cc (cp_omp_mappable_type_1, cp_omp_mappable_type, cp_omp_emit_unmappable_type_notes): Remove. (cplus_decl_attributes): Call omp_mappable_type instead of removed langhook. * decl.cc (cp_finish_decl): Likewise; call cxx_incomplete_type_inform in lieu of cp_omp_emit_unmappable_type_notes. * semantics.cc (finish_omp_clauses): Likewise. gcc/ChangeLog: * gimplify.cc (omp_notice_variable): Call omp_mappable_type instead of removed langhook. * omp-general.h (omp_mappable_type): New prototype. * omp-general.cc (omp_mappable_type): New; moved from ... * langhooks.cc (lhd_omp_mappable_type): ... here. * langhooks-def.h (lhd_omp_mappable_type, LANG_HOOKS_OMP_MAPPABLE_TYPE): Remove. (LANG_HOOKS_FOR_TYPES_INITIALIZER): Remote the latter. * langhooks.h (struct lang_hooks_for_types): Remove omp_mappable_type. gcc/testsuite/ChangeLog: * g++.dg/gomp/unmappable-1.C: Remove dg-error; remove dg-note no longer shown as TYPE_MAIN_DECL is NULL. * c-c++-common/gomp/map-incomplete-type.c: New test. Co-authored-by: Chung-Lin Tang --- gcc/c/c-decl.cc | 5 ++--- gcc/c/c-typeck.cc | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'gcc/c') diff --git a/gcc/c/c-decl.cc b/gcc/c/c-decl.cc index ae8990c..9e590c6 100644 --- a/gcc/c/c-decl.cc +++ b/gcc/c/c-decl.cc @@ -5074,8 +5074,7 @@ c_decl_attributes (tree *node, tree attributes, int flags) && ((VAR_P (*node) && is_global_var (*node)) || TREE_CODE (*node) == FUNCTION_DECL)) { - if (VAR_P (*node) - && !lang_hooks.types.omp_mappable_type (TREE_TYPE (*node))) + if (VAR_P (*node) && !omp_mappable_type (TREE_TYPE (*node))) attributes = tree_cons (get_identifier ("omp declare target implicit"), NULL_TREE, attributes); else @@ -5701,7 +5700,7 @@ finish_decl (tree decl, location_t init_loc, tree init, DECL_ATTRIBUTES (decl) = remove_attribute ("omp declare target implicit", DECL_ATTRIBUTES (decl)); - if (!lang_hooks.types.omp_mappable_type (TREE_TYPE (decl))) + if (!omp_mappable_type (TREE_TYPE (decl))) error ("%q+D in declare target directive does not have mappable type", decl); else if (!lookup_attribute ("omp declare target", diff --git a/gcc/c/c-typeck.cc b/gcc/c/c-typeck.cc index d37de2a..de8780a 100644 --- a/gcc/c/c-typeck.cc +++ b/gcc/c/c-typeck.cc @@ -14955,7 +14955,7 @@ c_finish_omp_clauses (tree clauses, enum c_omp_region_type ort) else { t = OMP_CLAUSE_DECL (c); - if (!lang_hooks.types.omp_mappable_type (TREE_TYPE (t))) + if (!omp_mappable_type (TREE_TYPE (t))) { error_at (OMP_CLAUSE_LOCATION (c), "array section does not have mappable type " @@ -15092,7 +15092,7 @@ c_finish_omp_clauses (tree clauses, enum c_omp_region_type ort) t, omp_clause_code_name[OMP_CLAUSE_CODE (c)]); remove = true; } - else if (!lang_hooks.types.omp_mappable_type (TREE_TYPE (t))) + else if (!omp_mappable_type (TREE_TYPE (t))) { error_at (OMP_CLAUSE_LOCATION (c), "%qE does not have a mappable type in %qs clause", @@ -15173,7 +15173,7 @@ c_finish_omp_clauses (tree clauses, enum c_omp_region_type ort) || (OMP_CLAUSE_MAP_KIND (c) == GOMP_MAP_FORCE_DEVICEPTR))) && t == OMP_CLAUSE_DECL (c) - && !lang_hooks.types.omp_mappable_type (TREE_TYPE (t))) + && !omp_mappable_type (TREE_TYPE (t))) { error_at (OMP_CLAUSE_LOCATION (c), "%qD does not have a mappable type in %qs clause", t, @@ -15290,7 +15290,7 @@ c_finish_omp_clauses (tree clauses, enum c_omp_region_type ort) cname); remove = true; } - else if (!lang_hooks.types.omp_mappable_type (TREE_TYPE (t))) + else if (!omp_mappable_type (TREE_TYPE (t))) { error_at (OMP_CLAUSE_LOCATION (c), "%qD does not have a mappable type in %qs clause", t, -- cgit v1.1