[PATCH] D48367: [modules] Fix 37878; Autoload subdirectory modulemaps with specific LangOpts
Yuka Takahashi via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Wed Jun 20 07:41:38 PDT 2018
yamaguchi updated this revision to Diff 152086.
yamaguchi added a comment.
Update commmit message and comment, add ObjC2
https://reviews.llvm.org/D48367
Files:
clang/include/clang/Lex/ModuleMap.h
clang/lib/Lex/HeaderSearch.cpp
Index: clang/lib/Lex/HeaderSearch.cpp
===================================================================
--- clang/lib/Lex/HeaderSearch.cpp
+++ clang/lib/Lex/HeaderSearch.cpp
@@ -282,7 +282,8 @@
// Load all module maps in the immediate subdirectories of this search
// directory.
- loadSubdirectoryModuleMaps(SearchDirs[Idx]);
+ if (ModMap.getLangOpts().ObjC1 || ModMap.getLangOpts().ObjC2)
+ loadSubdirectoryModuleMaps(SearchDirs[Idx]);
// Look again for the module.
Module = ModMap.findModule(ModuleName);
Index: clang/include/clang/Lex/ModuleMap.h
===================================================================
--- clang/include/clang/Lex/ModuleMap.h
+++ clang/include/clang/Lex/ModuleMap.h
@@ -110,6 +110,11 @@
llvm::StringMap<llvm::StringSet<>> PendingLinkAsModule;
public:
+ /// Get LangOpts of ModuleMap
+ const LangOptions& getLangOpts() {
+ return LangOpts;
+ }
+
/// Use PendingLinkAsModule information to mark top level link names that
/// are going to be replaced by export_as aliases.
void resolveLinkAsDependencies(Module *Mod);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D48367.152086.patch
Type: text/x-patch
Size: 1105 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20180620/caf5011b/attachment.bin>
More information about the cfe-commits
mailing list