diff options
author | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-08-24 21:59:32 +0000 |
---|---|---|
committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-08-24 21:59:32 +0000 |
commit | 3e7ae32b9c618b056a827820d8f61d5bca5bdd44 (patch) | |
tree | 68de584afe04ffbc6eaef94269f346a3f9f7e03c /lib/Lex/ModuleMap.cpp | |
parent | 97161a74dc711c9677013c24fb835ceab210d02e (diff) |
[modules] Remove unnecessary deserialization of fully-external HeaderFileInfos for all files we've seen in this compilation.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@245881 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Lex/ModuleMap.cpp')
-rw-r--r-- | lib/Lex/ModuleMap.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/Lex/ModuleMap.cpp b/lib/Lex/ModuleMap.cpp index d619b52bef..e1594eee36 100644 --- a/lib/Lex/ModuleMap.cpp +++ b/lib/Lex/ModuleMap.cpp @@ -796,7 +796,7 @@ static Module::HeaderKind headerRoleToKind(ModuleMap::ModuleHeaderRole Role) { } void ModuleMap::addHeader(Module *Mod, Module::Header Header, - ModuleHeaderRole Role) { + ModuleHeaderRole Role, bool Imported) { KnownHeader KH(Mod, Role); // Only add each header to the headers list once. @@ -811,7 +811,12 @@ void ModuleMap::addHeader(Module *Mod, Module::Header Header, Mod->Headers[headerRoleToKind(Role)].push_back(std::move(Header)); bool isCompilingModuleHeader = Mod->getTopLevelModule() == CompilingModule; - HeaderInfo.MarkFileModuleHeader(Header.Entry, Role, isCompilingModuleHeader); + if (!Imported || isCompilingModuleHeader) { + // When we import HeaderFileInfo, the external source is expected to + // set the isModuleHeader flag itself. + HeaderInfo.MarkFileModuleHeader(Header.Entry, Role, + isCompilingModuleHeader); + } } void ModuleMap::excludeHeader(Module *Mod, Module::Header Header) { |