From ad08ef098a8c8bb9c148d0a32e91456fdf58ffc1 Mon Sep 17 00:00:00 2001 From: Nathaniel Shead Date: Wed, 4 Sep 2024 02:42:58 +1000 Subject: c++/modules: Use decl_linkage in maybe_record_mergeable_decl This avoids any possible inconsistencies (current or future) about whether a declaration is internal or not. gcc/cp/ChangeLog: * name-lookup.cc (maybe_record_mergeable_decl): Use decl_linkage instead of ad-hoc checks. Signed-off-by: Nathaniel Shead Reviewed-by: Jason Merrill --- gcc/cp/name-lookup.cc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'gcc') diff --git a/gcc/cp/name-lookup.cc b/gcc/cp/name-lookup.cc index 50e169e..c0f89f9 100644 --- a/gcc/cp/name-lookup.cc +++ b/gcc/cp/name-lookup.cc @@ -3725,17 +3725,10 @@ maybe_record_mergeable_decl (tree *slot, tree name, tree decl) if (TREE_CODE (*slot) != BINDING_VECTOR) return; - if (!TREE_PUBLIC (CP_DECL_CONTEXT (decl))) - /* Member of internal namespace. */ + if (decl_linkage (decl) == lk_internal) return; tree not_tmpl = STRIP_TEMPLATE (decl); - if ((TREE_CODE (not_tmpl) == FUNCTION_DECL - || VAR_P (not_tmpl)) - && DECL_THIS_STATIC (not_tmpl)) - /* Internal linkage. */ - return; - bool is_attached = (DECL_LANG_SPECIFIC (not_tmpl) && DECL_MODULE_ATTACH_P (not_tmpl)); tree *gslot = get_fixed_binding_slot -- cgit v1.1