Continuing to improve and generalize how IDs are handled in ASTReader. This patch...

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

diff --git a/include/clang/Serialization/ASTReader.h b/include/clang/Serialization/ASTReader.h
index 5bce761a5503b232d023cd56d889423171efc04a..a024cb88a4996de74eac603794044d6416597061 100644 (file)
--- a/include/clang/Serialization/ASTReader.h
+++ b/include/clang/Serialization/ASTReader.h
@@ -457,6 +457,15 @@ private:
   /// ID = (I + 1) << FastQual::Width has already been loaded
   std::vector<QualType> TypesLoaded;
 
+  typedef ContinuousRangeMap<serialization::TypeID,
+      std::pair<PerFileData *, int32_t>, 4>
+    GlobalTypeMapType;
+
+  /// \brief Mapping from global type IDs to the module in which the
+  /// type resides along with the offset that should be added to the
+  /// global type ID to produce a local ID.
+  GlobalTypeMapType GlobalTypeMap;
+
   /// \brief Map that provides the ID numbers of each type within the
   /// output stream, plus those deserialized from a chained PCH.
   ///

diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp
index f31fb751ab365135e4d3570712bd531e3524d127..884cc1556bf8b94b46b4d95f830aec8d73a34404 100644 (file)
--- a/lib/Serialization/ASTReader.cpp
+++ b/lib/Serialization/ASTReader.cpp
@@ -2033,6 +2033,13 @@ ASTReader::ReadASTBlock(PerFileData &F) {
       }
       F.TypeOffsets = (const uint32_t *)BlobStart;
       F.LocalNumTypes = Record[0];
+
+      // Introduce the global -> local mapping for types within this
+      // AST file.
+      GlobalTypeMap.insert(std::make_pair(getTotalNumTypes() + 1,
+                                          std::make_pair(&F,
+                                                         -getTotalNumTypes())));
+      TypesLoaded.resize(TypesLoaded.size() + F.LocalNumTypes);
       break;
 
     case DECL_OFFSET:
@@ -2551,14 +2558,12 @@ ASTReader::ASTReadResult ASTReader::ReadAST(const std::string &FileName,
   }
 
   // Allocate space for loaded slocentries, identifiers, decls and types.
-  unsigned TotalNumTypes = 0, TotalNumPreallocatedPreprocessingEntities = 0;
+  unsigned TotalNumPreallocatedPreprocessingEntities = 0;
   for (unsigned I = 0, N = Chain.size(); I != N; ++I) {
     TotalNumSLocEntries += Chain[I]->LocalNumSLocEntries;
-    TotalNumTypes += Chain[I]->LocalNumTypes;
     TotalNumPreallocatedPreprocessingEntities +=
         Chain[I]->NumPreallocatedPreprocessingEntities;
   }
-  TypesLoaded.resize(TotalNumTypes);
   if (PP) {
     PP->getHeaderSearchInfo().SetExternalLookup(this);
     if (TotalNumPreallocatedPreprocessingEntities > 0) {
@@ -3157,15 +3162,10 @@ void ASTReader::ReadPragmaDiagnosticMappings(Diagnostic &Diag) {
 
 /// \brief Get the correct cursor and offset for loading a type.
 ASTReader::RecordLocation ASTReader::TypeCursorForIndex(unsigned Index) {
-  PerFileData *F = 0;
-  for (unsigned I = 0, N = Chain.size(); I != N; ++I) {
-    F = Chain[N - I - 1];
-    if (Index < F->LocalNumTypes)
-      break;
-    Index -= F->LocalNumTypes;
-  }
-  assert(F && F->LocalNumTypes > Index && "Broken chain");
-  return RecordLocation(F, F->TypeOffsets[Index]);
+  GlobalTypeMapType::iterator I = GlobalTypeMap.find(Index+1);
+  assert(I != GlobalTypeMap.end() && "Corrupted global type map");
+  return RecordLocation(I->second.first,
+      I->second.first->TypeOffsets[Index + I->second.second]);
 }
 
 /// \brief Read and return the type with the given index..