https://gcc.gnu.org/g:ad08ef098a8c8bb9c148d0a32e91456fdf58ffc1
commit r15-3911-gad08ef098a8c8bb9c148d0a32e91456fdf58ffc1
Author: Nathaniel Shead <nathanielosh...@gmail.com>
Date: Wed Sep 4 02:42:58 2024 +1000
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 <nathanielosh...@gmail.com>
Reviewed-by: Jason Merrill <ja...@redhat.com>
Diff:
---
gcc/cp/name-lookup.cc | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/gcc/cp/name-lookup.cc b/gcc/cp/name-lookup.cc
index 50e169eca43e..c0f89f98d87e 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
