diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2012-04-17 18:47:20 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2012-04-17 18:47:20 +0000 |
commit | 54881cb78e2c9054188c002c012b72175429e79b (patch) | |
tree | aab45e0d2296abd8c0d770ce8d08c820be29a3c2 | |
parent | 76a98bef86becf111af6a77a009aab7790a3c2e8 (diff) |
Simplify calls to mergeVisibility* by passing in the LinkageInfo. No
functionality change.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@154940 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/AST/Decl.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp index a3196b22f0..07098fdb3a 100644 --- a/lib/AST/Decl.cpp +++ b/lib/AST/Decl.cpp @@ -325,8 +325,7 @@ static LinkageInfo getLVForNamespaceScopeDecl(const NamedDecl *D, LVFlags F) { LinkageInfo TypeLV = getLVForType(Var->getType()); if (TypeLV.linkage() != ExternalLinkage) return LinkageInfo::uniqueExternal(); - LV.mergeVisibilityWithMin(TypeLV.visibility(), - TypeLV.visibilityExplicit()); + LV.mergeVisibilityWithMin(TypeLV); } if (Var->getStorageClass() == SC_PrivateExtern) @@ -581,7 +580,7 @@ static LinkageInfo getLVForClassMember(const NamedDecl *D, LVFlags F) { if (TypeLV.linkage() != ExternalLinkage) LV.mergeLinkage(UniqueExternalLinkage); if (!LV.visibilityExplicit()) - LV.mergeVisibility(TypeLV.visibility(), TypeLV.visibilityExplicit()); + LV.mergeVisibility(TypeLV); } return LV; |