diff options
| author | Douglas Gregor <dgregor@apple.com> | 2011-12-12 23:17:57 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2011-12-12 23:17:57 +0000 |
| commit | bab9f4afaeb99319ac3567239d41cc1be3fb7e8c (patch) | |
| tree | 5ebe47db59cffea68de79b1b8048e38374f07822 /lib/Serialization/ASTWriter.cpp | |
| parent | ba96ffcb2a444d12ffcc4781bd443279c7250d7e (diff) | |
Tweak submodule ID handling in the AST writer
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@146445 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Serialization/ASTWriter.cpp')
| -rw-r--r-- | lib/Serialization/ASTWriter.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/Serialization/ASTWriter.cpp b/lib/Serialization/ASTWriter.cpp index 83ad885969..6cce0afc50 100644 --- a/lib/Serialization/ASTWriter.cpp +++ b/lib/Serialization/ASTWriter.cpp @@ -1970,7 +1970,7 @@ void ASTWriter::WriteSubmodules(Module *WritingModule) { if (!Mod->Imports.empty()) { Record.clear(); for (unsigned I = 0, N = Mod->Imports.size(); I != N; ++I) { - unsigned ImportedID = SubmoduleIDs[Mod->Imports[I]]; + unsigned ImportedID = getSubmoduleID(Mod->Imports[I]); assert(ImportedID && "Unknown submodule!"); Record.push_back(ImportedID); } @@ -1981,10 +1981,14 @@ void ASTWriter::WriteSubmodules(Module *WritingModule) { if (!Mod->Exports.empty()) { Record.clear(); for (unsigned I = 0, N = Mod->Exports.size(); I != N; ++I) { - unsigned ExportedID = SubmoduleIDs[Mod->Exports[I].getPointer()]; - assert((ExportedID || !Mod->Exports[I].getPointer()) && - "Unknown submodule!"); - Record.push_back(ExportedID); + if (Module *Exported = Mod->Exports[I].getPointer()) { + unsigned ExportedID = SubmoduleIDs[Exported]; + assert(ExportedID > 0 && "Unknown submodule ID?"); + Record.push_back(ExportedID); + } else { + Record.push_back(0); + } + Record.push_back(Mod->Exports[I].getInt()); } Stream.EmitRecord(SUBMODULE_EXPORTS, Record); |