From 97a03cf921ccc16ef9d16d965a5ef28631090f6a Mon Sep 17 00:00:00 2001 From: Eli Bendersky Date: Thu, 11 Jul 2013 16:53:04 +0000 Subject: [PATCH] Simplify GetBuiltinNames by hoising the NoBuiltins argument out of it. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@186106 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/Builtins.h | 5 ++--- lib/Basic/Builtins.cpp | 7 +++---- lib/Serialization/ASTWriter.cpp | 5 +++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/include/clang/Basic/Builtins.h b/include/clang/Basic/Builtins.h index eb156519ae..ef8955c94b 100644 --- a/include/clang/Basic/Builtins.h +++ b/include/clang/Basic/Builtins.h @@ -75,9 +75,8 @@ public: /// such. void InitializeBuiltins(IdentifierTable &Table, const LangOptions& LangOpts); - /// \brief Popular the vector with the names of all of the builtins. - void GetBuiltinNames(SmallVectorImpl &Names, - bool NoBuiltins); + /// \brief Populate the vector with the names of all of the builtins. + void GetBuiltinNames(SmallVectorImpl &Names); /// \brief Return the identifier name for the specified builtin, /// e.g. "__builtin_abs". diff --git a/lib/Basic/Builtins.cpp b/lib/Basic/Builtins.cpp index e71e053bcd..d8aaa6e8c9 100644 --- a/lib/Basic/Builtins.cpp +++ b/lib/Basic/Builtins.cpp @@ -63,16 +63,15 @@ void Builtin::Context::InitializeBuiltins(IdentifierTable &Table, } void -Builtin::Context::GetBuiltinNames(SmallVectorImpl &Names, - bool NoBuiltins) { +Builtin::Context::GetBuiltinNames(SmallVectorImpl &Names) { // Final all target-independent names for (unsigned i = Builtin::NotBuiltin+1; i != Builtin::FirstTSBuiltin; ++i) - if (!NoBuiltins || !strchr(BuiltinInfo[i].Attributes, 'f')) + if (!strchr(BuiltinInfo[i].Attributes, 'f')) Names.push_back(BuiltinInfo[i].Name); // Find target-specific names. for (unsigned i = 0, e = NumTSRecords; i != e; ++i) - if (!NoBuiltins || !strchr(TSRecords[i].Attributes, 'f')) + if (!strchr(TSRecords[i].Attributes, 'f')) Names.push_back(TSRecords[i].Name); } diff --git a/lib/Serialization/ASTWriter.cpp b/lib/Serialization/ASTWriter.cpp index b9061ad756..5f9da8a4a3 100644 --- a/lib/Serialization/ASTWriter.cpp +++ b/lib/Serialization/ASTWriter.cpp @@ -3836,8 +3836,9 @@ void ASTWriter::WriteASTCore(Sema &SemaRef, // FIXME: Modules won't like this at all. IdentifierTable &Table = PP.getIdentifierTable(); SmallVector BuiltinNames; - Context.BuiltinInfo.GetBuiltinNames(BuiltinNames, - Context.getLangOpts().NoBuiltin); + if (!Context.getLangOpts().NoBuiltin) { + Context.BuiltinInfo.GetBuiltinNames(BuiltinNames); + } for (unsigned I = 0, N = BuiltinNames.size(); I != N; ++I) getIdentifierRef(&Table.get(BuiltinNames[I])); } -- 2.40.0