Implement (de-)serialization of the set of exported modules in a

module map. 

llvm-svn: 145695

1 files changed, 14 insertions, 1 deletions

diff --git a/clang/lib/Serialization/ASTWriter.cpp b/clang/lib/Serialization/ASTWriter.cpp
index 6d51dbce3e2..00dbfabb451 100644
--- a/clang/lib/Serialization/ASTWriter.cpp
+++ b/clang/lib/Serialization/ASTWriter.cpp
@@ -1893,6 +1893,7 @@ void ASTWriter::WriteSubmodules(Module *WritingModule) {
   while (!Q.empty()) {
     Module *Mod = Q.front();
     Q.pop();
+    assert(SubmoduleIDs.find(Mod) == SubmoduleIDs.end());
     SubmoduleIDs[Mod] = NextSubmoduleID++;
     
     // Emit the definition of the block.
@@ -1924,6 +1925,18 @@ void ASTWriter::WriteSubmodules(Module *WritingModule) {
                                 Mod->Headers[I]->getName());
     }
     
+    // Emit the exports. 
+    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 && "Unknown submodule!");                                           
+        Record.push_back(ExportedID);
+        Record.push_back(Mod->Exports[I].getInt());
+      }
+      Stream.EmitRecord(SUBMODULE_EXPORTS, Record);
+    }
+    
     // Queue up the submodules of this module.
     llvm::SmallVector<StringRef, 2> SubModules;
     
@@ -3214,7 +3227,7 @@ void ASTWriter::WriteASTCore(Sema &SemaRef, MemorizeStatCalls *StatCalls,
     {
       llvm::raw_svector_ostream Out(Buffer);
       for (ModuleManager::ModuleConstIterator M = Chain->ModuleMgr.begin(),
-           MEnd = Chain->ModuleMgr.end();
+                                           MEnd = Chain->ModuleMgr.end();
            M != MEnd; ++M) {
         StringRef FileName = (*M)->FileName;
         io::Emit16(Out, FileName.size());