From 9e479307485c35e9a95b563642ccae6250a61afd Mon Sep 17 00:00:00 2001
From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 11 Dec 2012 22:46:22 +0000
Subject: [PATCH] 	PR c++/54883 	* decl2.c (min_vis_r): Handle anon
 visibility for enums.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@194431 138bc75d-0d04-0410-961f-82ee72b054a4
---
 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 e7459e68a9e..678c55d6ba8 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-11  Jason Merrill  <jason@redhat.com>
+
+	PR c++/54883
+	* decl2.c (min_vis_r): Handle anon visibility for enums.
+
 2012-12-11  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/55643
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 36e74c7b380..f23062b59ad 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -1929,16 +1929,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 00000000000..c45917a1bd2
--- /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.11.0