From a27070db0c9fb2048b818a1aba8f425c1436b1d3 Mon Sep 17 00:00:00 2001
From: Fariborz Jahanian <fjahanian@apple.com>
Date: Thu, 16 Jun 2011 14:49:42 +0000
Subject: Set the visibility to 'hidden' when previous declaration of global
 var is __private_extern__. // rdar://9609649

llvm-svn: 133157
---
 clang/lib/CodeGen/CodeGenModule.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'clang/lib/CodeGen/CodeGenModule.cpp')

diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
index 78c57b4..c15ef9b 100644
--- a/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/clang/lib/CodeGen/CodeGenModule.cpp
@@ -206,8 +206,17 @@ void CodeGenModule::setGlobalVisibility(llvm::GlobalValue *GV,
 
   // Set visibility for definitions.
   NamedDecl::LinkageInfo LV = D->getLinkageAndVisibility();
-  if (LV.visibilityExplicit() || !GV->hasAvailableExternallyLinkage())
-    GV->setVisibility(GetLLVMVisibility(LV.visibility()));
+  if (LV.visibilityExplicit() || !GV->hasAvailableExternallyLinkage()) {
+    Visibility Vis = LV.visibility();
+    if (Vis == DefaultVisibility)
+      if (const VarDecl *VD = dyn_cast<VarDecl>(D))
+        if (const VarDecl *Old = VD->getPreviousDeclaration()) {
+          Visibility OldVis = Old->getLinkageAndVisibility().visibility();
+          if (OldVis == HiddenVisibility)
+            Vis = HiddenVisibility;
+        }
+    GV->setVisibility(GetLLVMVisibility(Vis));
+  }
 }
 
 /// Set the symbol visibility of type information (vtable and RTTI)
-- 
cgit v1.1