From 3fd406847c6942d6400b16094cc780364e174d81 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Thu, 6 Sep 2007 23:56:41 -0400
Subject: [PATCH] * decl2.c (get_guard): Copy visibility from the guarded
 variable.

From-SVN: r128226
---
 gcc/cp/ChangeLog                             |  4 +++
 gcc/cp/decl2.c                               |  2 ++
 gcc/testsuite/g++.dg/ext/visibility/guard1.C | 29 ++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/ext/visibility/guard1.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 12cdd809750..b5229b3814d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-06  Jason Merrill  <jason@redhat.com>
+
+	* decl2.c (get_guard): Copy visibility from the guarded variable.
+
 2007-09-06  Jan Hubicka  <jh@suse.cz>
 
 	* semantics.c (expand_body): Do not mark arguments of clones used.
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 2708e5819f9..db578d85cc3 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -2215,6 +2215,8 @@ get_guard (tree decl)
       DECL_ONE_ONLY (guard) = DECL_ONE_ONLY (decl);
       if (TREE_PUBLIC (decl))
 	DECL_WEAK (guard) = DECL_WEAK (decl);
+      DECL_VISIBILITY (guard) = DECL_VISIBILITY (decl);
+      DECL_VISIBILITY_SPECIFIED (guard) = DECL_VISIBILITY_SPECIFIED (decl);
 
       DECL_ARTIFICIAL (guard) = 1;
       DECL_IGNORED_P (guard) = 1;
diff --git a/gcc/testsuite/g++.dg/ext/visibility/guard1.C b/gcc/testsuite/g++.dg/ext/visibility/guard1.C
new file mode 100644
index 00000000000..5290e2f8e1b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/visibility/guard1.C
@@ -0,0 +1,29 @@
+// { dg-options "-fvisibility=hidden" }
+// { dg-require-visibility "" }
+// { dg-final { scan-not-hidden "_ZGVZN5otherclEvE4s_cd" } }
+
+extern "C" int printf (const char *, ...);
+
+#define DLLEXPORT __attribute__ ((visibility("default")))
+
+struct class_data
+{
+  int apple;
+  class_data() { printf("non trivial ctor\n"); }
+};
+
+struct DLLEXPORT other
+{
+  class_data* operator ()()
+  {
+    static class_data s_cd;
+    return &s_cd;
+  }
+};
+
+int main()
+{
+  other aFoo;
+  aFoo();
+  return 0;
+}