From bd65538abb6a48c97f9fd02d037b41e5a6397a70 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 7 Jan 2020 10:05:25 -0500 Subject: PR c++/47877 - -fvisibility-inlines-hidden and member templates. DECL_VISIBILITY_SPECIFIED is also true if an enclosing scope has explicit visibility, and we don't want that to override -fvisibility-inlines-hidden. So check for the attribute specifically on the function, like we already do for template argument visibility restriction. * decl2.c (determine_visibility): -fvisibility-inlines-hidden beats explicit class visibility for a template. From-SVN: r279960 --- gcc/cp/decl2.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gcc/cp/decl2.c') diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 9fb1d81..a641667 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -2629,6 +2629,7 @@ determine_visibility (tree decl) tree attribs = (TREE_CODE (decl) == TYPE_DECL ? TYPE_ATTRIBUTES (TREE_TYPE (decl)) : DECL_ATTRIBUTES (decl)); + tree attr = lookup_attribute ("visibility", attribs); if (args != error_mark_node) { @@ -2636,7 +2637,7 @@ determine_visibility (tree decl) if (!DECL_VISIBILITY_SPECIFIED (decl)) { - if (!DECL_VISIBILITY_SPECIFIED (pattern) + if (!attr && determine_hidden_inline (decl)) DECL_VISIBILITY (decl) = VISIBILITY_HIDDEN; else @@ -2650,7 +2651,7 @@ determine_visibility (tree decl) if (args /* Template argument visibility outweighs #pragma or namespace visibility, but not an explicit attribute. */ - && !lookup_attribute ("visibility", attribs)) + && !attr) { int depth = TMPL_ARGS_DEPTH (args); if (DECL_VISIBILITY_SPECIFIED (decl)) -- cgit v1.1