replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[modules] Fix "prefer own module over others" rule when selecting a module for a header to work in the presence of module hierarchy. 

llvm-svn: 241936
This commit is contained in:
Richard Smith 2015-07-10 20:09:49 +00:00
parent 45be9e0d24
commit 8692a4d199
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -347,7 +347,7 @@ ModuleMap::KnownHeader ModuleMap::findModuleForHeader(const FileEntry *File) {
// Iterate over all modules that 'File' is part of to find the best fit.
for (KnownHeader &H : Known->second) {
// Prefer a header from the current module over all others.
if (H.getModule() == CompilingModule)
if (H.getModule()->getTopLevelModule() == CompilingModule)
return MakeResult(H);
// Cannot use a module if it is unavailable.
if (!H.getModule()->isAvailable())

4
clang/test/Modules/Inputs/explicit-build-prefer-self/map
View File

@ -1,2 +1,2 @@
module a { header "a.h" header "x.h" }
module b { header "b.h" header "x.h" }
module a { module h { header "a.h" } module x { header "x.h" } }
module b { module h { header "b.h" } module x { header "x.h" } }