Move option test earlier in the function.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@160202 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index 7ca8d397f1fb6aeb8f02fb5af9028e06503213f9..fa7b066ce6519f991f2e094d92c889aff31d84b0 100644 (file)
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -170,8 +170,8 @@ shouldConsiderTemplateVis(const ClassTemplateSpecializationDecl *d) {
 
 static bool useInlineVisibilityHidden(const NamedDecl *D) {
   // FIXME: we should warn if -fvisibility-inlines-hidden is used with c.
-  ASTContext &Context = D->getASTContext();
-  if (!Context.getLangOpts().CPlusPlus)
+  const LangOptions &Opts = D->getASTContext().getLangOpts();
+  if (!Opts.CPlusPlus || !Opts.InlineVisibilityHidden)
     return false;
 
   const FunctionDecl *FD = dyn_cast<FunctionDecl>(D);
@@ -193,7 +193,6 @@ static bool useInlineVisibilityHidden(const NamedDecl *D) {
   // anyway.
   return TSK != TSK_ExplicitInstantiationDeclaration &&
     TSK != TSK_ExplicitInstantiationDefinition &&
-    FD->getASTContext().getLangOpts().InlineVisibilityHidden &&
     FD->hasBody(Def) && Def->isInlined();
 }