The explicit bit in LV already tracks exactly the same information as
DHasExplicitVisibility. Simplify the code a bit.
llvm-svn: 155099
diff --git a/clang/lib/AST/Decl.cpp b/clang/lib/AST/Decl.cpp
index 12f8f7e..7db38a9 100644
--- a/clang/lib/AST/Decl.cpp
+++ b/clang/lib/AST/Decl.cpp
@@ -484,18 +484,14 @@
LinkageInfo LV;
- bool DHasExplicitVisibility = false;
// If we have an explicit visibility attribute, merge that in.
if (F.ConsiderVisibilityAttributes) {
- if (llvm::Optional<Visibility> Vis = D->getExplicitVisibility()) {
+ if (llvm::Optional<Visibility> Vis = D->getExplicitVisibility())
LV.mergeVisibility(*Vis, true);
-
- DHasExplicitVisibility = true;
- }
}
// Ignore both global visibility and attributes when computing our
// parent's visibility if we already have an explicit one.
- LVFlags ClassF = DHasExplicitVisibility ?
+ LVFlags ClassF = LV.visibilityExplicit() ?
LVFlags::CreateOnlyDeclLinkage() : F;
// If we're paying attention to global visibility, apply