From 0ab544f1a57cb1cb4d6d977c9477ad44c2b87af8 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Fri, 13 Mar 2015 14:29:39 +0000 Subject: [PATCH] When building a module, all headers of submodules can be used. This extends r232159. llvm-svn: 232168 --- clang/lib/Lex/ModuleMap.cpp | 3 ++- clang/test/Modules/declare-use5.cpp | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 clang/test/Modules/declare-use5.cpp diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp index 6aefb03..b0195af 100644 --- a/clang/lib/Lex/ModuleMap.cpp +++ b/clang/lib/Lex/ModuleMap.cpp @@ -265,7 +265,8 @@ void ModuleMap::diagnoseHeaderInclusion(Module *RequestingModule, if (Known != Headers.end()) { for (const KnownHeader &Header : Known->second) { // If 'File' is part of 'RequestingModule' we can definitely include it. - if (Header.getModule() == RequestingModule) + if (Header.getModule() && + Header.getModule()->isSubModuleOf(RequestingModule)) return; // Remember private headers for later printing of a diagnostic. diff --git a/clang/test/Modules/declare-use5.cpp b/clang/test/Modules/declare-use5.cpp new file mode 100644 index 0000000..b34be0f --- /dev/null +++ b/clang/test/Modules/declare-use5.cpp @@ -0,0 +1,9 @@ +// RUN: rm -rf %t +// RUN: %clang_cc1 -fmodule-maps -fmodules-cache-path=%t -fmodules-decluse -fmodule-name=XN -I %S/Inputs/declare-use %s -verify + + +#include "sub.h" + +const int a = sub; + +// expected-no-diagnostics -- 2.7.4