Move the base type ID from the ASTReader's global type map into the
Module itself, which makes more sense. This pattern to be repeated
several more times.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@136436 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/Serialization/ASTReader.h b/include/clang/Serialization/ASTReader.h
index 41cf09a..a42d97e 100644
--- a/include/clang/Serialization/ASTReader.h
+++ b/include/clang/Serialization/ASTReader.h
@@ -360,6 +360,9 @@
/// type ID, or the representation of a Type*.
const uint32_t *TypeOffsets;
+ /// \brief Base type ID for types local to this module.
+ serialization::TypeID BaseTypeID;
+
// === Miscellaneous ===
/// \brief Diagnostic IDs and their mappings that the user changed.
@@ -537,8 +540,7 @@
/// ID = (I + 1) << FastQual::Width has already been loaded
std::vector<QualType> TypesLoaded;
- typedef ContinuousRangeMap<serialization::TypeID,
- std::pair<Module *, int32_t>, 4>
+ typedef ContinuousRangeMap<serialization::TypeID, Module *, 4>
GlobalTypeMapType;
/// \brief Mapping from global type IDs to the module in which the
diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp
index 34af0b7..77286b7 100644
--- a/lib/Serialization/ASTReader.cpp
+++ b/lib/Serialization/ASTReader.cpp
@@ -2054,12 +2054,11 @@
}
F.TypeOffsets = (const uint32_t *)BlobStart;
F.LocalNumTypes = Record[0];
-
+ F.BaseTypeID = getTotalNumTypes();
+
// Introduce the global -> local mapping for types within this
// AST file.
- GlobalTypeMap.insert(std::make_pair(getTotalNumTypes() + 1,
- std::make_pair(&F,
- -getTotalNumTypes())));
+ GlobalTypeMap.insert(std::make_pair(getTotalNumTypes() + 1, &F));
TypesLoaded.resize(TypesLoaded.size() + F.LocalNumTypes);
break;
@@ -3218,8 +3217,8 @@
ASTReader::RecordLocation ASTReader::TypeCursorForIndex(unsigned 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]);
+ Module *M = I->second;
+ return RecordLocation(M, M->TypeOffsets[Index - M->BaseTypeID]);
}
/// \brief Read and return the type with the given index..
@@ -4374,7 +4373,7 @@
llvm::errs() << "*** AST File Remapping:\n";
dumpModuleIDMap("Global bit offset map", GlobalBitOffsetsMap);
dumpModuleIDMap("Global source location entry map", GlobalSLocEntryMap);
- dumpModuleIDOffsetMap("Global type map", GlobalTypeMap);
+ dumpModuleIDMap("Global type map", GlobalTypeMap);
dumpModuleIDOffsetMap("Global declaration map", GlobalDeclMap);
dumpModuleIDOffsetMap("Global identifier map", GlobalIdentifierMap);
dumpModuleIDOffsetMap("Global selector map", GlobalSelectorMap);