When writing a PCH file, write multiple type and declaration blocks as
necessary and iterate until all types and declarations have been
written. This reduces the Cocoa.h PCH file size by about 4% (since we
don't write types we don't need), and fixes problems where writing a
declaration generates a new type.
This doesn't seem to have any impact on performance either way.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@70109 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Frontend/PCHReader.cpp b/lib/Frontend/PCHReader.cpp
index 9970eb2..0407ed8 100644
--- a/lib/Frontend/PCHReader.cpp
+++ b/lib/Frontend/PCHReader.cpp
@@ -2563,6 +2563,7 @@
}
Index -= pch::NUM_PREDEF_TYPE_IDS;
+ assert(Index < TypesLoaded.size() && "Type index out-of-range");
if (!TypesLoaded[Index])
TypesLoaded[Index] = ReadTypeRecord(TypeOffsets[Index]).getTypePtr();
diff --git a/lib/Frontend/PCHWriter.cpp b/lib/Frontend/PCHWriter.cpp
index 9056f58..a43e599 100644
--- a/lib/Frontend/PCHWriter.cpp
+++ b/lib/Frontend/PCHWriter.cpp
@@ -1674,15 +1674,12 @@
// Enter the types block.
Stream.EnterSubblock(pch::TYPES_BLOCK_ID, 2);
- // Emit all of the types in the ASTContext
- for (std::vector<Type*>::const_iterator T = Context.getTypes().begin(),
- TEnd = Context.getTypes().end();
- T != TEnd; ++T) {
- // Builtin types are never serialized.
- if (isa<BuiltinType>(*T))
- continue;
-
- WriteType(*T);
+ // Emit all of the types that need to be emitted (so far).
+ while (!TypesToEmit.empty()) {
+ const Type *T = TypesToEmit.front();
+ TypesToEmit.pop();
+ assert(!isa<BuiltinType>(T) && "Built-in types are not serialized");
+ WriteType(T);
}
// Exit the types block
@@ -2409,8 +2406,16 @@
WriteLanguageOptions(Context.getLangOptions());
WriteSourceManagerBlock(Context.getSourceManager(), PP);
WritePreprocessor(PP);
- WriteTypesBlock(Context);
- WriteDeclsBlock(Context);
+
+ // Keep writing types and declarations until all types and
+ // declarations have been written.
+ do {
+ if (!DeclsToEmit.empty())
+ WriteDeclsBlock(Context);
+ if (!TypesToEmit.empty())
+ WriteTypesBlock(Context);
+ } while (!(DeclsToEmit.empty() && TypesToEmit.empty()));
+
WriteMethodPool(SemaRef);
WriteIdentifierTable(PP);
@@ -2559,8 +2564,12 @@
}
pch::TypeID &ID = TypeIDs[T.getTypePtr()];
- if (ID == 0) // we haven't seen this type before
+ if (ID == 0) {
+ // We haven't seen this type before. Assign it a new ID and put it
+ // into the queu of types to emit.
ID = NextTypeID++;
+ TypesToEmit.push(T.getTypePtr());
+ }
// Encode the type qualifiers in the type reference.
Record.push_back((ID << 3) | T.getCVRQualifiers());