[cfe-commits] r69774 - in /cfe/trunk: include/clang/AST/Builtins.h lib/AST/ASTContext.cpp lib/AST/Builtins.cpp lib/Frontend/PCHReader.cpp
Douglas Gregor
dgregor at apple.com
Tue Apr 21 21:56:29 PDT 2009
Author: dgregor
Date: Tue Apr 21 23:56:28 2009
New Revision: 69774
URL: http://llvm.org/viewvc/llvm-project?rev=69774&view=rev
Log:
Reorganize built-in initialization to separate the creation of target builtins from marking IdentifierInfos as builtins. No functionality change
Modified:
cfe/trunk/include/clang/AST/Builtins.h
cfe/trunk/lib/AST/ASTContext.cpp
cfe/trunk/lib/AST/Builtins.cpp
cfe/trunk/lib/Frontend/PCHReader.cpp
Modified: cfe/trunk/include/clang/AST/Builtins.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Builtins.h?rev=69774&r1=69773&r2=69774&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/Builtins.h (original)
+++ cfe/trunk/include/clang/AST/Builtins.h Tue Apr 21 23:56:28 2009
@@ -51,12 +51,15 @@
unsigned NumTSRecords;
public:
Context() : TSRecords(0), NumTSRecords(0) {}
-
+
+ /// \brief Load all of the target builtins. This should be called
+ /// prior to initializing the builtin identifiers.
+ void InitializeTargetBuiltins(const TargetInfo &Target);
+
/// InitializeBuiltins - Mark the identifiers for all the builtins with their
/// appropriate builtin ID # and mark any non-portable builtin identifiers as
/// such.
- void InitializeBuiltins(IdentifierTable &Table, const TargetInfo &Target,
- bool NoBuiltins = false);
+ void InitializeBuiltins(IdentifierTable &Table, bool NoBuiltins = false);
/// Builtin::GetName - Return the identifier name for the specified builtin,
/// e.g. "__builtin_abs".
Modified: cfe/trunk/lib/AST/ASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ASTContext.cpp?rev=69774&r1=69773&r2=69774&view=diff
==============================================================================
--- cfe/trunk/lib/AST/ASTContext.cpp (original)
+++ cfe/trunk/lib/AST/ASTContext.cpp Tue Apr 21 23:56:28 2009
@@ -41,7 +41,8 @@
ExternalSource(0) {
if (size_reserve > 0) Types.reserve(size_reserve);
InitBuiltinTypes();
- BuiltinInfo.InitializeBuiltins(idents, Target, LangOpts.NoBuiltin);
+ BuiltinInfo.InitializeTargetBuiltins(Target);
+ BuiltinInfo.InitializeBuiltins(idents, LangOpts.NoBuiltin);
TUDecl = TranslationUnitDecl::Create(*this);
}
Modified: cfe/trunk/lib/AST/Builtins.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/Builtins.cpp?rev=69774&r1=69773&r2=69774&view=diff
==============================================================================
--- cfe/trunk/lib/AST/Builtins.cpp (original)
+++ cfe/trunk/lib/AST/Builtins.cpp Tue Apr 21 23:56:28 2009
@@ -32,12 +32,16 @@
return TSRecords[ID - Builtin::FirstTSBuiltin];
}
+/// \brief Load all of the target builtins. This must be called
+/// prior to initializing the builtin identifiers.
+void Builtin::Context::InitializeTargetBuiltins(const TargetInfo &Target) {
+ Target.getTargetBuiltins(TSRecords, NumTSRecords);
+}
/// InitializeBuiltins - Mark the identifiers for all the builtins with their
/// appropriate builtin ID # and mark any non-portable builtin identifiers as
/// such.
void Builtin::Context::InitializeBuiltins(IdentifierTable &Table,
- const TargetInfo &Target,
bool NoBuiltins) {
// Step #1: mark all target-independent builtins with their ID's.
for (unsigned i = Builtin::NotBuiltin+1; i != Builtin::FirstTSBuiltin; ++i)
@@ -45,10 +49,7 @@
(!NoBuiltins || !strchr(BuiltinInfo[i].Attributes, 'f')))
Table.get(BuiltinInfo[i].Name).setBuiltinID(i);
- // Step #2: Get target builtins.
- Target.getTargetBuiltins(TSRecords, NumTSRecords);
-
- // Step #3: Register target-specific builtins.
+ // Step #2: Register target-specific builtins.
for (unsigned i = 0, e = NumTSRecords; i != e; ++i)
if (!TSRecords[i].Suppressed &&
(!NoBuiltins ||
Modified: cfe/trunk/lib/Frontend/PCHReader.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/PCHReader.cpp?rev=69774&r1=69773&r2=69774&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/PCHReader.cpp (original)
+++ cfe/trunk/lib/Frontend/PCHReader.cpp Tue Apr 21 23:56:28 2009
@@ -1762,6 +1762,9 @@
if (Pos == IdTable->end())
continue;
+ fprintf(stderr, "Looked up pre-allocated IdentifierInfo \"%s\"\n",
+ II->getName());
+
// Dereferencing the iterator has the effect of populating the
// IdentifierInfo node with the various declarations it needs.
(void)*Pos;
More information about the cfe-commits
mailing list