diff options
7 files changed, 52 insertions, 2 deletions
diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp index db834ede022..1488f624da6 100644 --- a/clang/lib/Lex/ModuleMap.cpp +++ b/clang/lib/Lex/ModuleMap.cpp @@ -446,9 +446,19 @@ ModuleMap::isHeaderUnavailableInModule(const FileEntry *Header, I = Known->second.begin(), E = Known->second.end(); I != E; ++I) { - if (I->isAvailable() && (!RequestingModule || - I->getModule()->isSubModuleOf(RequestingModule))) + + if (I->isAvailable() && + (!RequestingModule || + I->getModule()->isSubModuleOf(RequestingModule))) { + // When no requesting module is available, the caller is looking if a + // header is part a module by only looking into the module map. This is + // done by warn_uncovered_module_header checks; don't consider textual + // headers part of it in this mode, otherwise we get misleading warnings + // that a umbrella header is not including a textual header. + if (!RequestingModule && I->getRole() == ModuleMap::TextualHeader) + continue; return false; + } } return true; } diff --git a/clang/test/Modules/Inputs/FooFramework.framework/Modules/module.modulemap b/clang/test/Modules/Inputs/FooFramework.framework/Modules/module.modulemap new file mode 100644 index 00000000000..62e56364aba --- /dev/null +++ b/clang/test/Modules/Inputs/FooFramework.framework/Modules/module.modulemap @@ -0,0 +1,12 @@ +framework module FooFramework { + umbrella header "FooUmbrella.h" + + export * + module * { + export * + } + + explicit module Private { + textual header "Baz_Private.h" + } +} diff --git a/clang/test/Modules/Inputs/FooFramework.framework/PrivateHeaders/Bar.h b/clang/test/Modules/Inputs/FooFramework.framework/PrivateHeaders/Bar.h new file mode 100644 index 00000000000..d16b395055f --- /dev/null +++ b/clang/test/Modules/Inputs/FooFramework.framework/PrivateHeaders/Bar.h @@ -0,0 +1,2 @@ +@interface Bar +@end diff --git a/clang/test/Modules/Inputs/FooFramework.framework/PrivateHeaders/Baz_Private.h b/clang/test/Modules/Inputs/FooFramework.framework/PrivateHeaders/Baz_Private.h new file mode 100644 index 00000000000..3ea082b874c --- /dev/null +++ b/clang/test/Modules/Inputs/FooFramework.framework/PrivateHeaders/Baz_Private.h @@ -0,0 +1,3 @@ +#ifndef Baz_h +#define Baz_h +#endif /* Baz_h */ diff --git a/clang/test/Modules/Inputs/FooFramework.framework/PrivateHeaders/Foo.h b/clang/test/Modules/Inputs/FooFramework.framework/PrivateHeaders/Foo.h new file mode 100644 index 00000000000..26b96988d58 --- /dev/null +++ b/clang/test/Modules/Inputs/FooFramework.framework/PrivateHeaders/Foo.h @@ -0,0 +1,10 @@ +__attribute__((objc_root_class)) +@interface NSObject ++ (instancetype) alloc; +- (instancetype) init; +- (instancetype)retain; +- (void)release; +@end + +@interface Foo : NSObject +@end diff --git a/clang/test/Modules/Inputs/FooFramework.framework/PrivateHeaders/FooUmbrella.h b/clang/test/Modules/Inputs/FooFramework.framework/PrivateHeaders/FooUmbrella.h new file mode 100644 index 00000000000..c752fb299e0 --- /dev/null +++ b/clang/test/Modules/Inputs/FooFramework.framework/PrivateHeaders/FooUmbrella.h @@ -0,0 +1,3 @@ +#import <FooFramework/Foo.h> +#import <FooFramework/Bar.h> + diff --git a/clang/test/Modules/textual-hdr-in-umbrella-hdr.m b/clang/test/Modules/textual-hdr-in-umbrella-hdr.m new file mode 100644 index 00000000000..f92cdb91b23 --- /dev/null +++ b/clang/test/Modules/textual-hdr-in-umbrella-hdr.m @@ -0,0 +1,10 @@ +// RUN: rm -rf %t.cache +// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t.cache \ +// RUN: %s -fsyntax-only -F %S/Inputs -Wincomplete-umbrella -verify + +// expected-no-diagnostics + +#import <FooFramework/Foo.h> + +@implementation Foo +@end |
