From e95aa0a29e74e365c3211015aacb301b545dad1c Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 11 Dec 2012 17:46:37 -0500 Subject: [PATCH] re PR c++/54883 (Name mangling of types in an unnamed namespace) PR c++/54883 * decl2.c (min_vis_r): Handle anon visibility for enums. From-SVN: r194432 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/decl2.c | 15 +++++++-------- gcc/testsuite/g++.dg/abi/anon1.C | 5 +++++ 3 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 gcc/testsuite/g++.dg/abi/anon1.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 2a607b896c26..f3048c182b77 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2012-12-11 Jason Merrill + + PR c++/54883 + * decl2.c (min_vis_r): Handle anon visibility for enums. + 2012-12-06 Jason Merrill PR c++/55249 diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 51f23f47c66a..4c55f4fc381f 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -1914,16 +1914,15 @@ min_vis_r (tree *tp, int *walk_subtrees, void *data) { *walk_subtrees = 0; } - else if (CLASS_TYPE_P (*tp)) + else if (TAGGED_TYPE_P (*tp) + && !TREE_PUBLIC (TYPE_MAIN_DECL (*tp))) { - if (!TREE_PUBLIC (TYPE_MAIN_DECL (*tp))) - { - *vis_p = VISIBILITY_ANON; - return *tp; - } - else if (CLASSTYPE_VISIBILITY (*tp) > *vis_p) - *vis_p = CLASSTYPE_VISIBILITY (*tp); + *vis_p = VISIBILITY_ANON; + return *tp; } + else if (CLASS_TYPE_P (*tp) + && CLASSTYPE_VISIBILITY (*tp) > *vis_p) + *vis_p = CLASSTYPE_VISIBILITY (*tp); return NULL; } diff --git a/gcc/testsuite/g++.dg/abi/anon1.C b/gcc/testsuite/g++.dg/abi/anon1.C new file mode 100644 index 000000000000..c45917a1bd2a --- /dev/null +++ b/gcc/testsuite/g++.dg/abi/anon1.C @@ -0,0 +1,5 @@ +// PR c++/54883 + +namespace { enum E { E1 }; } void f(E e) { } + +// { dg-final { scan-assembler-not "globl" } } -- 2.47.2