bnbarham created this revision.
bnbarham added a reviewer: dexonsmith.
Herald added a project: All.
bnbarham requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
Prevent possible modulemap collisions by making sure to always use the
looked-up filename, regardless of any possible overlays.
Upstreamed from apple#llvm-project
72cf785051fb1b3ef22eee4dd33366e41a275981. As well as preventing the
collisions as above, it also highlighted an issue with the recent change
to narrow the FileManager hack of setting the `DirectoryEntry` in
`FileEntry` to the most recently looked up directory
(3fda0edc51fd68192a30e302d45db081bb02d7f9
<https://reviews.llvm.org/rG3fda0edc51fd68192a30e302d45db081bb02d7f9>).
Specifically, it would cause
the incorrect path to be used in `DoFrameworkLookup` in a crash
reproducer:
- Crash reproducers have `use-external-names` set to false
- `File->getFileEntry().getDir()->getName()` would then be the *cached* path,
not the just looked up one
- `crash-vfs-umbrella-frameworks.m` fails with this change since the correct
path is now looked up and causes B to be loaded twice
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D123104
Files:
clang/include/clang/Lex/HeaderSearch.h
clang/lib/Lex/HeaderSearch.cpp
clang/test/Modules/Inputs/all-product-headers.yaml
clang/test/Modules/modulemap-collision.m
STAMPS
actor(@bnbarham) application(Differential) author(@bnbarham) herald(H423)
herald(H576) herald(H864) monogram(D123104) object-type(DREV)
phid(PHID-DREV-h3pufxsxbgppzpajqza7) reviewer(@dexonsmith)
revision-repository(rG) revision-status(needs-review) subscriber(@cfe-commits)
tag(#all) tag(#clang) via(conduit)
Index: clang/test/Modules/modulemap-collision.m
===================================================================
--- /dev/null
+++ clang/test/Modules/modulemap-collision.m
@@ -0,0 +1,15 @@
+// REQUIRES: shell
+
+// RUN: rm -rf %t
+// RUN: mkdir -p %t/sources %t/build
+// RUN: echo "// A.h" > %t/sources/A.h
+// RUN: echo "framework module A {}" > %t/sources/module.modulemap
+// RUN: echo "framework module A.Private { umbrella header \"A.h\" }" > %t/sources/module.private.modulemap
+// RUN: cp %t/sources/module.modulemap %t/build/module.modulemap
+// RUN: cp %t/sources/module.private.modulemap %t/build/module.private.modulemap
+
+// RUN: sed -e "s:DUMMY_DIR:%t:g" %S/Inputs/all-product-headers.yaml > %t/build/all-product-headers.yaml
+// RUN: %clang_cc1 -fsyntax-only -ivfsoverlay %t/build/all-product-headers.yaml -F%t/build -fmodules -fimplicit-module-maps -fmodules-cache-path=tmp -x objective-c %s -verify
+
+// expected-no-diagnostics
+#import <A/A.h>
Index: clang/test/Modules/Inputs/all-product-headers.yaml
===================================================================
--- /dev/null
+++ clang/test/Modules/Inputs/all-product-headers.yaml
@@ -0,0 +1,33 @@
+{
+ 'version': 0,
+ 'case-sensitive': 'false',
+ 'roots': [
+ {
+ 'type': 'directory',
+ 'name': "DUMMY_DIR/build/A.framework/PrivateHeaders"
+ 'contents': [
+ {
+ 'type': 'file',
+ 'name': "A.h",
+ 'external-contents': "DUMMY_DIR/sources/A.h"
+ }
+ ]
+ },
+ {
+ 'type': 'directory',
+ 'name': "DUMMY_DIR/build/A.framework/Modules"
+ 'contents': [
+ {
+ 'type': 'file',
+ 'name': "module.modulemap",
+ 'external-contents': "DUMMY_DIR/build/module.modulemap"
+ },
+ {
+ 'type': 'file',
+ 'name': "module.private.modulemap",
+ 'external-contents': "DUMMY_DIR/build/module.private.modulemap"
+ }
+ ]
+ }
+ ]
+}
Index: clang/lib/Lex/HeaderSearch.cpp
===================================================================
--- clang/lib/Lex/HeaderSearch.cpp
+++ clang/lib/Lex/HeaderSearch.cpp
@@ -415,7 +415,7 @@
// If there is a module that corresponds to this header, suggest it.
if (!findUsableModuleForHeader(
&File->getFileEntry(), Dir ? Dir : File->getFileEntry().getDir(),
- RequestingModule, SuggestedModule, IsSystemHeaderDir))
+ RequestingModule, SuggestedModule, IsSystemHeaderDir, FileName))
return None;
return *File;
@@ -1563,10 +1563,18 @@
bool HeaderSearch::findUsableModuleForHeader(
const FileEntry *File, const DirectoryEntry *Root, Module *RequestingModule,
- ModuleMap::KnownHeader *SuggestedModule, bool IsSystemHeaderDir) {
+ ModuleMap::KnownHeader *SuggestedModule, bool IsSystemHeaderDir,
+ StringRef FileName) {
if (File && needModuleLookup(RequestingModule, SuggestedModule)) {
// If there is a module that corresponds to this header, suggest it.
- hasModuleMap(File->getName(), Root, IsSystemHeaderDir);
+
+ // FIXME: File->getName() *should* be the same as FileName, but because
+ // of the VFS and various hacks in FileManager, that's not necessarily the
+ // case. We should update this to use FileEntryRef instead and either
+ // always give back the originally-requested path, or provide a way to get
+ // to get it.
+ hasModuleMap(FileName.empty() ? File->getName() : FileName, Root,
+ IsSystemHeaderDir);
return suggestModule(*this, File, RequestingModule, SuggestedModule);
}
return true;
Index: clang/include/clang/Lex/HeaderSearch.h
===================================================================
--- clang/include/clang/Lex/HeaderSearch.h
+++ clang/include/clang/Lex/HeaderSearch.h
@@ -754,7 +754,8 @@
const DirectoryEntry *Root,
Module *RequestingModule,
ModuleMap::KnownHeader *SuggestedModule,
- bool IsSystemHeaderDir);
+ bool IsSystemHeaderDir,
+ StringRef FileName = "");
/// Find and suggest a usable module for the given file, which is part of
/// the specified framework.
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
