maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Simplify calls to mergeVisibility* by passing in the LinkageInfo. No 

functionality change.

llvm-svn: 154940
This commit is contained in:
Rafael Espindola 2012-04-17 18:47:20 +00:00
parent 88773764e9
commit 2dd5ed5e5f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/lib/AST/Decl.cpp
View File

@ -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;