diff options
Diffstat (limited to 'lib/AST/Decl.cpp')
| -rw-r--r-- | lib/AST/Decl.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp index 7db38a9130..f26747bdf6 100644 --- a/lib/AST/Decl.cpp +++ b/lib/AST/Decl.cpp @@ -291,7 +291,8 @@ static LinkageInfo getLVForNamespaceScopeDecl(const NamedDecl *D, LVFlags F) { } } - LV.mergeVisibility(Context.getLangOpts().getVisibilityMode()); + if (F.ConsiderGlobalVisibility) + LV.mergeVisibility(Context.getLangOpts().getVisibilityMode()); // C++ [basic.link]p4: @@ -532,7 +533,8 @@ static LinkageInfo getLVForClassMember(const NamedDecl *D, LVFlags F) { 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 |