Revert r154749 for now at John McCall's request.
llvm-svn: 154846
diff --git a/clang/lib/AST/Decl.cpp b/clang/lib/AST/Decl.cpp
index ef833d8..a3196b2 100644
--- a/clang/lib/AST/Decl.cpp
+++ b/clang/lib/AST/Decl.cpp
@@ -273,6 +273,25 @@
LinkageInfo LV;
LV.mergeVisibility(Context.getLangOpts().getVisibilityMode());
+ if (F.ConsiderVisibilityAttributes) {
+ if (llvm::Optional<Visibility> Vis = D->getExplicitVisibility()) {
+ LV.setVisibility(*Vis, true);
+ } else {
+ // If we're declared in a namespace with a visibility attribute,
+ // use that namespace's visibility, but don't call it explicit.
+ for (const DeclContext *DC = D->getDeclContext();
+ !isa<TranslationUnitDecl>(DC);
+ DC = DC->getParent()) {
+ const NamespaceDecl *ND = dyn_cast<NamespaceDecl>(DC);
+ if (!ND) continue;
+ if (llvm::Optional<Visibility> Vis = ND->getExplicitVisibility()) {
+ LV.setVisibility(*Vis, true);
+ break;
+ }
+ }
+ }
+ }
+
// C++ [basic.link]p4:
// A name having namespace scope has external linkage if it is the
@@ -443,25 +462,6 @@
return LinkageInfo::none();
}
- if (F.ConsiderVisibilityAttributes) {
- if (llvm::Optional<Visibility> Vis = D->getExplicitVisibility()) {
- LV.setVisibility(*Vis, true);
- } else {
- // If we're declared in a namespace with a visibility attribute,
- // use that namespace's visibility, but don't call it explicit.
- for (const DeclContext *DC = D->getDeclContext();
- !isa<TranslationUnitDecl>(DC);
- DC = DC->getParent()) {
- const NamespaceDecl *ND = dyn_cast<NamespaceDecl>(DC);
- if (!ND) continue;
- if (llvm::Optional<Visibility> Vis = ND->getExplicitVisibility()) {
- LV.setVisibility(*Vis, true);
- break;
- }
- }
- }
- }
-
// If we ended up with non-external linkage, visibility should
// always be default.
if (LV.linkage() != ExternalLinkage)