Implement (de-)serialization of the set of exported modules in a
module map.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@145695 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp
index d8fb311..26fca22 100644
--- a/lib/Serialization/ASTReader.cpp
+++ b/lib/Serialization/ASTReader.cpp
@@ -2533,6 +2533,19 @@
Id != IdEnd; ++Id)
Id->second->setOutOfDate(true);
+ // Resolve any unresolved module exports.
+ for (unsigned I = 0, N = UnresolvedModuleExports.size(); I != N; ++I) {
+ UnresolvedModuleExport &Unresolved = UnresolvedModuleExports[I];
+ SubmoduleID GlobalID = getGlobalSubmoduleID(*Unresolved.File,
+ Unresolved.ExportedID);
+ if (Module *Exported = getSubmodule(GlobalID)) {
+ Module *Exportee = Unresolved.ModuleAndWildcard.getPointer();
+ bool Wildcard = Unresolved.ModuleAndWildcard.getInt();
+ Exportee->Exports.push_back(Module::ExportDecl(Exported, Wildcard));
+ }
+ }
+ UnresolvedModuleExports.clear();
+
InitializeContext();
if (DeserializationListener)
@@ -3050,6 +3063,30 @@
}
break;
}
+
+ case SUBMODULE_EXPORTS: {
+ if (First) {
+ Error("missing submodule metadata record at beginning of block");
+ return Failure;
+ }
+
+ if (!CurrentModule)
+ break;
+
+ for (unsigned Idx = 0; Idx + 1 < Record.size(); Idx += 2) {
+ UnresolvedModuleExport Unresolved;
+ Unresolved.File = &F;
+ Unresolved.ModuleAndWildcard.setPointer(CurrentModule);
+ Unresolved.ModuleAndWildcard.setInt(Record[Idx + 1]);
+ Unresolved.ExportedID = Record[Idx];
+ UnresolvedModuleExports.push_back(Unresolved);
+ }
+
+ // Once we've loaded the set of exports, there's no reason to keep
+ // the parsed, unresolved exports around.
+ CurrentModule->UnresolvedExports.clear();
+ break;
+ }
}
}