commit b660efd57a669863b3618e5f4b6b9dc5a7034075
author Rafael Espindola <rafael.espindola@gmail.com> Thu Apr 19 04:37:16 2012 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Thu Apr 19 04:37:16 2012 +0000
tree d34d35c88ab6726cbb0e0604b479e145cdaaeeea
parent 3d3d339357651dfdc1ca12ff91ec12369ba388e0

Check ConsiderGlobalVisibility before using -fvisibility.

llvm-svn: 155100

clang/lib/AST/Decl.cpp

diff --git a/clang/lib/AST/Decl.cpp b/clang/lib/AST/Decl.cpp
index 7db38a9..f26747b 100644
--- a/clang/lib/AST/Decl.cpp
+++ b/clang/lib/AST/Decl.cpp
@@ -291,7 +291,8 @@
     }
   }
 
-  LV.mergeVisibility(Context.getLangOpts().getVisibilityMode());
+  if (F.ConsiderGlobalVisibility)
+    LV.mergeVisibility(Context.getLangOpts().getVisibilityMode());
 
   // C++ [basic.link]p4:
 
@@ -532,7 +533,8 @@
   if (LV.linkage() == UniqueExternalLinkage)
     return LinkageInfo::uniqueExternal();
 
-  LV.mergeVisibility(D->getASTContext().getLangOpts().getVisibilityMode());
+  if (F.ConsiderGlobalVisibility)
+    LV.mergeVisibility(D->getASTContext().getLangOpts().getVisibilityMode());
 
   if (const CXXMethodDecl *MD = dyn_cast<CXXMethodDecl>(D)) {
     // If the type of the function uses a type with unique-external