maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[clang][lex] NFCI: Use DirectoryEntryRef in HeaderSearch::load*()" 

This reverts commit 1d3ba05e4a which caused failures of the VFS/real-path-found-first.m test on Windows build bots.
This commit is contained in:
Jan Svoboda 2022-04-20 20:09:04 +02:00
parent 99cfccdcb3
commit 340654e0f2
2 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clang/include/clang/Lex/HeaderSearch.h
View File

@ -738,7 +738,8 @@ private:
/// frameworks. /// frameworks.
/// ///
/// \returns The module, if found; otherwise, null. /// \returns The module, if found; otherwise, null.
Module *loadFrameworkModule(StringRef Name, DirectoryEntryRef Dir, Module *loadFrameworkModule(StringRef Name,
const DirectoryEntry *Dir,
bool IsSystem); bool IsSystem);
/// Load all of the module maps within the immediate subdirectories /// Load all of the module maps within the immediate subdirectories
@ -887,7 +888,7 @@ private:
LoadModuleMapResult loadModuleMapFileImpl(const FileEntry *File, LoadModuleMapResult loadModuleMapFileImpl(const FileEntry *File,
bool IsSystem, bool IsSystem,
DirectoryEntryRef Dir, const DirectoryEntry *Dir,
FileID ID = FileID(), FileID ID = FileID(),
unsigned *Offset = nullptr); unsigned *Offset = nullptr);
@ -911,8 +912,8 @@ private:
/// ///
/// \returns The result of attempting to load the module map file from the /// \returns The result of attempting to load the module map file from the
/// named directory. /// named directory.
LoadModuleMapResult loadModuleMapFile(DirectoryEntryRef Dir, bool IsSystem, LoadModuleMapResult loadModuleMapFile(const DirectoryEntry *Dir,
bool IsFramework); bool IsSystem, bool IsFramework);
}; };
/// Apply the header search options to get given HeaderSearch object. /// Apply the header search options to get given HeaderSearch object.

69
clang/lib/Lex/HeaderSearch.cpp
View File

@ -319,8 +319,7 @@ Module *HeaderSearch::lookupModule(StringRef ModuleName, StringRef SearchName,
SmallString<128> FrameworkDirName; SmallString<128> FrameworkDirName;
FrameworkDirName += Dir.getFrameworkDir()->getName(); FrameworkDirName += Dir.getFrameworkDir()->getName();
llvm::sys::path::append(FrameworkDirName, SearchName + ".framework"); llvm::sys::path::append(FrameworkDirName, SearchName + ".framework");
if (auto FrameworkDir = if (auto FrameworkDir = FileMgr.getDirectory(FrameworkDirName)) {
FileMgr.getOptionalDirectoryRef(FrameworkDirName)) {
bool IsSystem = Dir.getDirCharacteristic() != SrcMgr::C_User; bool IsSystem = Dir.getDirCharacteristic() != SrcMgr::C_User;
Module = loadFrameworkModule(ModuleName, *FrameworkDir, IsSystem); Module = loadFrameworkModule(ModuleName, *FrameworkDir, IsSystem);
if (Module) if (Module)
@ -335,10 +334,8 @@ Module *HeaderSearch::lookupModule(StringRef ModuleName, StringRef SearchName,
continue; continue;
bool IsSystem = Dir.isSystemHeaderDirectory(); bool IsSystem = Dir.isSystemHeaderDirectory();
// Only returns None if not a normal directory, which we just checked
DirectoryEntryRef NormalDir = *Dir.getDirRef();
// Search for a module map file in this directory. // Search for a module map file in this directory.
if (loadModuleMapFile(NormalDir, IsSystem, if (loadModuleMapFile(Dir.getDir(), IsSystem,
/*IsFramework*/false) == LMM_NewlyLoaded) { /*IsFramework*/false) == LMM_NewlyLoaded) {
// We just loaded a module map file; check whether the module is // We just loaded a module map file; check whether the module is
// available now. // available now.
@ -510,7 +507,7 @@ Optional<FileEntryRef> DirectoryLookup::LookupFile(
/// \param DirName The name of the framework directory. /// \param DirName The name of the framework directory.
/// \param SubmodulePath Will be populated with the submodule path from the /// \param SubmodulePath Will be populated with the submodule path from the
/// returned top-level module to the originally named framework. /// returned top-level module to the originally named framework.
static Optional<DirectoryEntryRef> static const DirectoryEntry *
getTopFrameworkDir(FileManager &FileMgr, StringRef DirName, getTopFrameworkDir(FileManager &FileMgr, StringRef DirName,
SmallVectorImpl<std::string> &SubmodulePath) { SmallVectorImpl<std::string> &SubmodulePath) {
assert(llvm::sys::path::extension(DirName) == ".framework" && assert(llvm::sys::path::extension(DirName) == ".framework" &&
@ -530,10 +527,12 @@ getTopFrameworkDir(FileManager &FileMgr, StringRef DirName,
// //
// Similar issues occur when a top-level framework has moved into an // Similar issues occur when a top-level framework has moved into an
// embedded framework. // embedded framework.
auto TopFrameworkDir = FileMgr.getOptionalDirectoryRef(DirName); const DirectoryEntry *TopFrameworkDir = nullptr;
if (auto TopFrameworkDirOrErr = FileMgr.getDirectory(DirName))
TopFrameworkDir = *TopFrameworkDirOrErr;
if (TopFrameworkDir) if (TopFrameworkDir)
DirName = FileMgr.getCanonicalName(*TopFrameworkDir); DirName = FileMgr.getCanonicalName(TopFrameworkDir);
do { do {
// Get the parent directory name. // Get the parent directory name.
DirName = llvm::sys::path::parent_path(DirName); DirName = llvm::sys::path::parent_path(DirName);
@ -541,7 +540,7 @@ getTopFrameworkDir(FileManager &FileMgr, StringRef DirName,
break; break;
// Determine whether this directory exists. // Determine whether this directory exists.
auto Dir = FileMgr.getOptionalDirectoryRef(DirName); auto Dir = FileMgr.getDirectory(DirName);
if (!Dir) if (!Dir)
break; break;
@ -1477,13 +1476,13 @@ bool HeaderSearch::hasModuleMap(StringRef FileName,
return false; return false;
// Determine whether this directory exists. // Determine whether this directory exists.
auto Dir = FileMgr.getOptionalDirectoryRef(DirName); auto Dir = FileMgr.getDirectory(DirName);
if (!Dir) if (!Dir)
return false; return false;
// Try to load the module map file in this directory. // Try to load the module map file in this directory.
switch (loadModuleMapFile(*Dir, IsSystem, switch (loadModuleMapFile(*Dir, IsSystem,
llvm::sys::path::extension(Dir->getName()) == llvm::sys::path::extension((*Dir)->getName()) ==
".framework")) { ".framework")) {
case LMM_NewlyLoaded: case LMM_NewlyLoaded:
case LMM_AlreadyLoaded: case LMM_AlreadyLoaded:
@ -1580,16 +1579,15 @@ bool HeaderSearch::findUsableModuleForFrameworkHeader(
if (needModuleLookup(RequestingModule, SuggestedModule)) { if (needModuleLookup(RequestingModule, SuggestedModule)) {
// Find the top-level framework based on this framework. // Find the top-level framework based on this framework.
SmallVector<std::string, 4> SubmodulePath; SmallVector<std::string, 4> SubmodulePath;
Optional<DirectoryEntryRef> TopFrameworkDir = const DirectoryEntry *TopFrameworkDir
::getTopFrameworkDir(FileMgr, FrameworkName, SubmodulePath); = ::getTopFrameworkDir(FileMgr, FrameworkName, SubmodulePath);
assert(TopFrameworkDir && "Could not find the top-most framework dir");
// Determine the name of the top-level framework. // Determine the name of the top-level framework.
StringRef ModuleName = llvm::sys::path::stem(TopFrameworkDir->getName()); StringRef ModuleName = llvm::sys::path::stem(TopFrameworkDir->getName());
// Load this framework module. If that succeeds, find the suggested module // Load this framework module. If that succeeds, find the suggested module
// for this header, if any. // for this header, if any.
loadFrameworkModule(ModuleName, *TopFrameworkDir, IsSystemFramework); loadFrameworkModule(ModuleName, TopFrameworkDir, IsSystemFramework);
// FIXME: This can find a module not part of ModuleName, which is // FIXME: This can find a module not part of ModuleName, which is
// important so that we're consistent about whether this header // important so that we're consistent about whether this header
@ -1620,38 +1618,39 @@ bool HeaderSearch::loadModuleMapFile(const FileEntry *File, bool IsSystem,
StringRef OriginalModuleMapFile) { StringRef OriginalModuleMapFile) {
// Find the directory for the module. For frameworks, that may require going // Find the directory for the module. For frameworks, that may require going
// up from the 'Modules' directory. // up from the 'Modules' directory.
Optional<DirectoryEntryRef> Dir; const DirectoryEntry *Dir = nullptr;
if (getHeaderSearchOpts().ModuleMapFileHomeIsCwd) { if (getHeaderSearchOpts().ModuleMapFileHomeIsCwd) {
Dir = FileMgr.getOptionalDirectoryRef("."); if (auto DirOrErr = FileMgr.getDirectory("."))
Dir = *DirOrErr;
} else { } else {
if (!OriginalModuleMapFile.empty()) { if (!OriginalModuleMapFile.empty()) {
// We're building a preprocessed module map. Find or invent the directory // We're building a preprocessed module map. Find or invent the directory
// that it originally occupied. // that it originally occupied.
Dir = FileMgr.getOptionalDirectoryRef( auto DirOrErr = FileMgr.getDirectory(
llvm::sys::path::parent_path(OriginalModuleMapFile)); llvm::sys::path::parent_path(OriginalModuleMapFile));
if (!Dir) { if (DirOrErr) {
auto FakeFile = FileMgr.getVirtualFileRef(OriginalModuleMapFile, 0, 0); Dir = *DirOrErr;
Dir = FakeFile.getDir(); } else {
auto *FakeFile = FileMgr.getVirtualFile(OriginalModuleMapFile, 0, 0);
Dir = FakeFile->getDir();
} }
} else { } else {
Dir = File->getLastRef().getDir(); Dir = File->getDir();
} }
assert(Dir && "parent must exist");
StringRef DirName(Dir->getName()); StringRef DirName(Dir->getName());
if (llvm::sys::path::filename(DirName) == "Modules") { if (llvm::sys::path::filename(DirName) == "Modules") {
DirName = llvm::sys::path::parent_path(DirName); DirName = llvm::sys::path::parent_path(DirName);
if (DirName.endswith(".framework")) if (DirName.endswith(".framework"))
if (auto MaybeDir = FileMgr.getOptionalDirectoryRef(DirName)) if (auto DirOrErr = FileMgr.getDirectory(DirName))
Dir = *MaybeDir; Dir = *DirOrErr;
// FIXME: This assert can fail if there's a race between the above check // FIXME: This assert can fail if there's a race between the above check
// and the removal of the directory. // and the removal of the directory.
assert(Dir && "parent must exist"); assert(Dir && "parent must exist");
} }
} }
assert(Dir && "module map home directory must exist"); switch (loadModuleMapFileImpl(File, IsSystem, Dir, ID, Offset)) {
switch (loadModuleMapFileImpl(File, IsSystem, *Dir, ID, Offset)) {
case LMM_AlreadyLoaded: case LMM_AlreadyLoaded:
case LMM_NewlyLoaded: case LMM_NewlyLoaded:
return false; return false;
@ -1664,7 +1663,7 @@ bool HeaderSearch::loadModuleMapFile(const FileEntry *File, bool IsSystem,
HeaderSearch::LoadModuleMapResult HeaderSearch::LoadModuleMapResult
HeaderSearch::loadModuleMapFileImpl(const FileEntry *File, bool IsSystem, HeaderSearch::loadModuleMapFileImpl(const FileEntry *File, bool IsSystem,
DirectoryEntryRef Dir, FileID ID, const DirectoryEntry *Dir, FileID ID,
unsigned *Offset) { unsigned *Offset) {
assert(File && "expected FileEntry"); assert(File && "expected FileEntry");
@ -1722,7 +1721,8 @@ HeaderSearch::lookupModuleMapFile(const DirectoryEntry *Dir, bool IsFramework) {
return nullptr; return nullptr;
} }
Module *HeaderSearch::loadFrameworkModule(StringRef Name, DirectoryEntryRef Dir, Module *HeaderSearch::loadFrameworkModule(StringRef Name,
const DirectoryEntry *Dir,
bool IsSystem) { bool IsSystem) {
if (Module *Module = ModMap.findModule(Name)) if (Module *Module = ModMap.findModule(Name))
return Module; return Module;
@ -1749,14 +1749,14 @@ Module *HeaderSearch::loadFrameworkModule(StringRef Name, DirectoryEntryRef Dir,
HeaderSearch::LoadModuleMapResult HeaderSearch::LoadModuleMapResult
HeaderSearch::loadModuleMapFile(StringRef DirName, bool IsSystem, HeaderSearch::loadModuleMapFile(StringRef DirName, bool IsSystem,
bool IsFramework) { bool IsFramework) {
if (auto Dir = FileMgr.getOptionalDirectoryRef(DirName)) if (auto Dir = FileMgr.getDirectory(DirName))
return loadModuleMapFile(*Dir, IsSystem, IsFramework); return loadModuleMapFile(*Dir, IsSystem, IsFramework);
return LMM_NoDirectory; return LMM_NoDirectory;
} }
HeaderSearch::LoadModuleMapResult HeaderSearch::LoadModuleMapResult
HeaderSearch::loadModuleMapFile(DirectoryEntryRef Dir, bool IsSystem, HeaderSearch::loadModuleMapFile(const DirectoryEntry *Dir, bool IsSystem,
bool IsFramework) { bool IsFramework) {
auto KnownDir = DirectoryHasModuleMap.find(Dir); auto KnownDir = DirectoryHasModuleMap.find(Dir);
if (KnownDir != DirectoryHasModuleMap.end()) if (KnownDir != DirectoryHasModuleMap.end())
@ -1797,7 +1797,8 @@ void HeaderSearch::collectAllModules(SmallVectorImpl<Module *> &Modules) {
if (llvm::sys::path::extension(Dir->path()) != ".framework") if (llvm::sys::path::extension(Dir->path()) != ".framework")
continue; continue;
auto FrameworkDir = FileMgr.getOptionalDirectoryRef(Dir->path()); auto FrameworkDir =
FileMgr.getDirectory(Dir->path());
if (!FrameworkDir) if (!FrameworkDir)
continue; continue;
@ -1813,7 +1814,7 @@ void HeaderSearch::collectAllModules(SmallVectorImpl<Module *> &Modules) {
continue; continue;
// Try to load a module map file for the search directory. // Try to load a module map file for the search directory.
loadModuleMapFile(*DL.getDirRef(), IsSystem, /*IsFramework*/ false); loadModuleMapFile(DL.getDir(), IsSystem, /*IsFramework*/ false);
// Try to load module map files for immediate subdirectories of this // Try to load module map files for immediate subdirectories of this
// search directory. // search directory.
@ -1837,7 +1838,7 @@ void HeaderSearch::loadTopLevelSystemModules() {
continue; continue;
// Try to load a module map file for the search directory. // Try to load a module map file for the search directory.
loadModuleMapFile(*DL.getDirRef(), DL.isSystemHeaderDirectory(), loadModuleMapFile(DL.getDir(), DL.isSystemHeaderDirectory(),
DL.isFramework()); DL.isFramework());
} }
} }