FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PR c++/47877 - -fvisibility-inlines-hidden and member templates.

Browse source 
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
This commit is contained in:
Jason Merrill 2020-01-07 10:05:25 -05:00 • committed by Jason Merrill
parent 66b01cc342
commit bd65538abb
4 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/cp/ChangeLog
View file

@ -1,3 +1,9 @@
2020-01-07 Jason Merrill <jason@redhat.com>
PR c++/47877 - -fvisibility-inlines-hidden and member templates.
* decl2.c (determine_visibility): -fvisibility-inlines-hidden beats
explicit class visibility for a template.
2020-01-07 Richard Sandiford <richard.sandiford@arm.com>
* mangle.c (mangle_type_attribute_p): New function, split out from...

5
gcc/cp/decl2.c
View file

@ -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))

13
gcc/testsuite/g++.dg/ext/visibility/fvisibility-inlines-hidden-5.C Normal file
View file

@ -0,0 +1,13 @@
// PR c++/47877
// { dg-options "-fvisibility-inlines-hidden" }
// { dg-require-visibility "" }
// { dg-final { scan-hidden "_ZN3Foo3barIS_EEvv" } }
struct __attribute__((visibility("default"))) Foo {
template <class C> inline void bar() {};
};
int main()
{
Foo().bar<Foo>();
}

4
gcc/tree.h
View file

@ -2903,8 +2903,8 @@ extern void decl_value_expr_insert (tree, tree);
#define DECL_VISIBILITY(NODE) \
(DECL_WITH_VIS_CHECK (NODE)->decl_with_vis.visibility)
/* Nonzero means that the decl had its visibility specified rather than
being inferred. */
/* Nonzero means that the decl (or an enclosing scope) had its
visibility specified rather than being inferred. */
#define DECL_VISIBILITY_SPECIFIED(NODE) \
(DECL_WITH_VIS_CHECK (NODE)->decl_with_vis.visibility_specified)