intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-28 10:38:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't build modules with (submodules with) missing headers

Browse Source 
Unless they are in submodules that aren't available anyway, due to
requirements not being met.  Also, mark children as unavailable when the
parent is.

llvm-svn: 206664
This commit is contained in:
Ben Langmuir
2014-04-18 22:07:31 +00:00
parent b5d368e838
commit ec8c975214
7 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
clang/lib/Lex/ModuleMap.cpp
View File

@@ -1477,6 +1477,15 @@ void ModuleMapParser::parseModuleDecl() {
inferFrameworkLink(ActiveModule, Directory, SourceMgr.getFileManager());
}
// If the module meets all requirements but is still unavailable, mark the
// whole tree as unavailable to prevent it from building.
if (!ActiveModule->IsAvailable && !ActiveModule->IsMissingRequirement &&
ActiveModule->Parent) {
ActiveModule->getTopLevelModule()->markUnavailable();
ActiveModule->getTopLevelModule()->MissingHeaders.append(
ActiveModule->MissingHeaders.begin(), ActiveModule->MissingHeaders.end());
}
// We're done parsing this module. Pop back to the previous module.
ActiveModule = PreviousActiveModule;
}
@@ -1705,9 +1714,8 @@ void ModuleMapParser::parseHeaderDecl(MMToken::TokenKind LeadingToken,
// If we find a module that has a missing header, we mark this module as
// unavailable and store the header directive for displaying diagnostics.
// Other submodules in the same module can still be used.
Header.IsUmbrella = LeadingToken == MMToken::UmbrellaKeyword;
ActiveModule->IsAvailable = false;
ActiveModule->markUnavailable();
ActiveModule->MissingHeaders.push_back(Header);
}
}