diff options
| -rw-r--r-- | include/clang/AST/ASTContext.h | 2 | ||||
| -rw-r--r-- | lib/AST/ASTContext.cpp | 2 | ||||
| -rw-r--r-- | lib/CodeGen/CodeGenModule.cpp | 2 | ||||
| -rw-r--r-- | lib/Frontend/PCHWriterDecl.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/clang/AST/ASTContext.h b/include/clang/AST/ASTContext.h index 3744473228..3c94970016 100644 --- a/include/clang/AST/ASTContext.h +++ b/include/clang/AST/ASTContext.h @@ -1348,7 +1348,7 @@ public: /// /// \returns true if the function/var must be CodeGen'ed/deserialized even if /// it is not used. - bool DeclIsRequiredFunctionOrFileScopedVar(const Decl *D); + bool DeclMustBeEmitted(const Decl *D); //===--------------------------------------------------------------------===// // Statistics diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp index 633538f312..ef1138eee7 100644 --- a/lib/AST/ASTContext.cpp +++ b/lib/AST/ASTContext.cpp @@ -5543,7 +5543,7 @@ GVALinkage ASTContext::GetGVALinkageForVariable(const VarDecl *VD) { return GVA_StrongExternal; } -bool ASTContext::DeclIsRequiredFunctionOrFileScopedVar(const Decl *D) { +bool ASTContext::DeclMustBeEmitted(const Decl *D) { if (const VarDecl *VD = dyn_cast<VarDecl>(D)) { if (!VD->isFileVarDecl()) return false; diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index 06c6f5da21..63d79132b1 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -587,7 +587,7 @@ bool CodeGenModule::MayDeferGeneration(const ValueDecl *Global) { if (Features.EmitAllDecls) return false; - return !getContext().DeclIsRequiredFunctionOrFileScopedVar(Global); + return !getContext().DeclMustBeEmitted(Global); } llvm::Constant *CodeGenModule::GetWeakRefReference(const ValueDecl *VD) { diff --git a/lib/Frontend/PCHWriterDecl.cpp b/lib/Frontend/PCHWriterDecl.cpp index 5d66c218bb..28a82cd23f 100644 --- a/lib/Frontend/PCHWriterDecl.cpp +++ b/lib/Frontend/PCHWriterDecl.cpp @@ -1086,7 +1086,7 @@ static bool isRequiredDecl(const Decl *D, ASTContext &Context) { if (isa<FileScopeAsmDecl>(D)) return true; - return Context.DeclIsRequiredFunctionOrFileScopedVar(D); + return Context.DeclMustBeEmitted(D); } void PCHWriter::WriteDecl(ASTContext &Context, Decl *D) { |