diff options
author | Douglas Gregor <dgregor@apple.com> | 2011-12-05 22:27:44 +0000 |
---|---|---|
committer | Douglas Gregor <dgregor@apple.com> | 2011-12-05 22:27:44 +0000 |
commit | 1e12368db12005ddd92fd9188c86383fe30ef443 (patch) | |
tree | 8715bebf398d98fa142c8ac7b80c642b1eb56615 /lib/Serialization/ASTReader.cpp | |
parent | bd7d82878c1588afccbee6c68fa6e17bbbab7f2c (diff) |
Parse inferred submodules in module maps, track their contents in
Module, and (de-)serialize this information. Semantics of inferred
submodules to follow.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@145864 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Serialization/ASTReader.cpp')
-rw-r--r-- | lib/Serialization/ASTReader.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp index 8d957e2633..ebc1795a26 100644 --- a/lib/Serialization/ASTReader.cpp +++ b/lib/Serialization/ASTReader.cpp @@ -3049,11 +3049,19 @@ ASTReader::ASTReadResult ASTReader::ReadSubmoduleBlock(ModuleFile &F) { return Failure; } + if (Record.size() < 6) { + Error("malformed module definition"); + return Failure; + } + StringRef Name(BlobStart, BlobLen); unsigned Parent = getGlobalSubmoduleID(F, Record[0]); bool IsFramework = Record[1]; bool IsExplicit = Record[2]; - + bool InferSubmodules = Record[3]; + bool InferExplicitSubmodules = Record[4]; + bool InferExportWildcard = Record[5]; + Module *ParentModule = 0; if (Parent) ParentModule = getSubmodule(Parent); @@ -3070,6 +3078,9 @@ ASTReader::ASTReadResult ASTReader::ReadSubmoduleBlock(ModuleFile &F) { return Failure; } + CurrentModule->InferSubmodules = InferSubmodules; + CurrentModule->InferExplicitSubmodules = InferExplicitSubmodules; + CurrentModule->InferExportWildcard = InferExportWildcard; if (DeserializationListener) DeserializationListener->ModuleRead( CurrentModuleGlobalIndex + NUM_PREDEF_SUBMODULE_IDS, |