diff options
Diffstat (limited to 'clang')
6 files changed, 12 insertions, 0 deletions
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; diff --git a/clang/test/Modules/Inputs/explicit-build-prefer-self/a.h b/clang/test/Modules/Inputs/explicit-build-prefer-self/a.h new file mode 100644 index 00000000000..d45761275d8 --- /dev/null +++ b/clang/test/Modules/Inputs/explicit-build-prefer-self/a.h @@ -0,0 +1,2 @@ +// a +#include "x.h" diff --git a/clang/test/Modules/Inputs/explicit-build-prefer-self/b.h b/clang/test/Modules/Inputs/explicit-build-prefer-self/b.h new file mode 100644 index 00000000000..76e2042cb91 --- /dev/null +++ b/clang/test/Modules/Inputs/explicit-build-prefer-self/b.h @@ -0,0 +1,2 @@ +// b +#include "x.h" diff --git a/clang/test/Modules/Inputs/explicit-build-prefer-self/map b/clang/test/Modules/Inputs/explicit-build-prefer-self/map new file mode 100644 index 00000000000..26be8e69073 --- /dev/null +++ b/clang/test/Modules/Inputs/explicit-build-prefer-self/map @@ -0,0 +1,2 @@ +module a { header "a.h" header "x.h" } +module b { header "b.h" header "x.h" } diff --git a/clang/test/Modules/Inputs/explicit-build-prefer-self/x.h b/clang/test/Modules/Inputs/explicit-build-prefer-self/x.h new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Modules/Inputs/explicit-build-prefer-self/x.h diff --git a/clang/test/Modules/explicit-build-prefer-self.cpp b/clang/test/Modules/explicit-build-prefer-self.cpp new file mode 100644 index 00000000000..aa2197995b4 --- /dev/null +++ b/clang/test/Modules/explicit-build-prefer-self.cpp @@ -0,0 +1,3 @@ +// RUN: rm -rf %t +// RUN: %clang_cc1 -fmodules -fno-implicit-modules -emit-module -fmodule-name=a %S/Inputs/explicit-build-prefer-self/map -o a.pcm +// RUN: %clang_cc1 -fmodules -fno-implicit-modules -emit-module -fmodule-name=b %S/Inputs/explicit-build-prefer-self/map -o b.pcm |
