From 2f633e7c3c9ad6ebe45473774332118da980027c Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Mon, 22 Jun 2015 22:20:47 +0000 Subject: [modules] When building a module, if there are multiple matches for a header file in the loaded module maps and one of them is from the current module, that's the right match. llvm-svn: 240350 --- clang/lib/Lex/ModuleMap.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'clang/lib/Lex/ModuleMap.cpp') diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp index 075a17f68b1..4ef0674f8d6 100644 --- a/clang/lib/Lex/ModuleMap.cpp +++ b/clang/lib/Lex/ModuleMap.cpp @@ -346,6 +346,9 @@ ModuleMap::KnownHeader ModuleMap::findModuleForHeader(const FileEntry *File) { ModuleMap::KnownHeader Result; // 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) + return MakeResult(H); // Cannot use a module if it is unavailable. if (!H.getModule()->isAvailable()) continue; -- cgit v1.2.3