diff options
| -rw-r--r-- | clang/include/clang/Driver/Options.td | 4 | ||||
| -rw-r--r-- | clang/lib/Lex/HeaderSearch.cpp | 5 | ||||
| -rw-r--r-- | clang/test/Modules/no-check-relocated-fw-private.c | 23 |
3 files changed, 28 insertions, 4 deletions
diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index c45eb69..348d791 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -2588,6 +2588,10 @@ defm modules_search_all : BoolFOption<"modules-search-all", defm implicit_modules : BoolFOption<"implicit-modules", LangOpts<"ImplicitModules">, DefaultTrue, NegFlag<SetFalse, [CC1Option]>, PosFlag<SetTrue>, BothFlags<[NoXarchOption,CoreOption]>>; +def fno_modules_check_relocated : Joined<["-"], "fno-modules-check-relocated">, + Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Skip checks for relocated modules when loading PCM files">, + MarshallingInfoNegativeFlag<PreprocessorOpts<"ModulesCheckRelocated">>; def fretain_comments_from_system_headers : Flag<["-"], "fretain-comments-from-system-headers">, Group<f_Group>, Flags<[CC1Option]>, MarshallingInfoFlag<LangOpts<"RetainCommentsFromSystemHeaders">>; def fmodule_header : Flag <["-"], "fmodule-header">, Group<f_Group>, diff --git a/clang/lib/Lex/HeaderSearch.cpp b/clang/lib/Lex/HeaderSearch.cpp index 6fe655f..3200d3d 100644 --- a/clang/lib/Lex/HeaderSearch.cpp +++ b/clang/lib/Lex/HeaderSearch.cpp @@ -1783,9 +1783,6 @@ HeaderSearch::lookupModuleMapFile(DirectoryEntryRef Dir, bool IsFramework) { Module *HeaderSearch::loadFrameworkModule(StringRef Name, DirectoryEntryRef Dir, bool IsSystem) { - if (Module *Module = ModMap.findModule(Name)) - return Module; - // Try to load a module map file. switch (loadModuleMapFile(Dir, IsSystem, /*IsFramework*/true)) { case LMM_InvalidModuleMap: @@ -1794,10 +1791,10 @@ Module *HeaderSearch::loadFrameworkModule(StringRef Name, DirectoryEntryRef Dir, ModMap.inferFrameworkModule(Dir, IsSystem, /*Parent=*/nullptr); break; - case LMM_AlreadyLoaded: case LMM_NoDirectory: return nullptr; + case LMM_AlreadyLoaded: case LMM_NewlyLoaded: break; } diff --git a/clang/test/Modules/no-check-relocated-fw-private.c b/clang/test/Modules/no-check-relocated-fw-private.c new file mode 100644 index 0000000..e97100a --- /dev/null +++ b/clang/test/Modules/no-check-relocated-fw-private.c @@ -0,0 +1,23 @@ +// RUN: rm -rf %t +// RUN: split-file %s %t + +//--- frameworks1/FW1.framework/Modules/module.modulemap +framework module FW1 { header "FW1.h" } +//--- frameworks1/FW1.framework/Headers/FW1.h +#import <FW2/FW2.h> + +//--- frameworks2/FW2.framework/Modules/module.modulemap +framework module FW2 { header "FW2.h" } +//--- frameworks2/FW2.framework/Modules/module.private.modulemap +framework module FW2_Private { header "FW2_Private.h" } +//--- frameworks2/FW2.framework/Headers/FW2.h +//--- frameworks2/FW2.framework/PrivateHeaders/FW2_Private.h + +//--- tu.c +#import <FW1/FW1.h> // expected-remark{{importing module 'FW1'}} \ + // expected-remark{{importing module 'FW2'}} +#import <FW2/FW2_Private.h> // expected-remark{{importing module 'FW2_Private'}} + +// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t/cache -fimplicit-module-maps \ +// RUN: -F %t/frameworks1 -F %t/frameworks2 -fsyntax-only %t/tu.c \ +// RUN: -fno-modules-check-relocated -Rmodule-import -verify |