This is an archive of the discontinued LLVM Phabricator instance.

Differential D123853

[clang] NFCI: Use DirectoryEntryRef in FrontendAction::BeginSourceFile()
ClosedPublic

Authored by jansvoboda11 on Apr 15 2022, 6:52 AM.

Details

Reviewers
dexonsmith
bnbarham
Commits
rGba118f30676d: [clang] NFCI: Use DirectoryEntryRef in FrontendAction::BeginSourceFile()
Summary

This patch removes use of the deprecated DirectoryEntry::getName() from FrontendAction::BeginSourceFile().

Diff Detail

Event Timeline

jansvoboda11 created this revision.Apr 15 2022, 6:52 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 15 2022, 6:52 AM
jansvoboda11 requested review of this revision.Apr 15 2022, 6:52 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 15 2022, 6:52 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B159826: Diff 423087.Apr 15 2022, 7:39 AM
bnbarham accepted this revision.Apr 15 2022, 9:08 AM
This revision is now accepted and ready to land.Apr 15 2022, 9:08 AM
This revision was landed with ongoing or failed builds.Apr 20 2022, 9:55 AM
Closed by commit rGba118f30676d: [clang] NFCI: Use DirectoryEntryRef in FrontendAction::BeginSourceFile() (authored by jansvoboda11). · Explain Why
This revision was automatically updated to reflect the committed changes.
jansvoboda11 added a commit: rGba118f30676d: [clang] NFCI: Use DirectoryEntryRef in FrontendAction::BeginSourceFile().

Revision Contents

PathSize
clang/
lib/
Frontend/
4 lines

Diff 423943

clang/lib/Frontend/FrontendAction.cpp

Show First 20 Lines • Show All 755 Lines • ▼ Show 20 Linesbool FrontendAction::BeginSourceFile(CompilerInstance &CI,
// If the implicit PCH include is actually a directory, rather than // If the implicit PCH include is actually a directory, rather than
// a single file, search for a suitable PCH file in that directory. // a single file, search for a suitable PCH file in that directory.
if (!CI.getPreprocessorOpts().ImplicitPCHInclude.empty()) { if (!CI.getPreprocessorOpts().ImplicitPCHInclude.empty()) {
FileManager &FileMgr = CI.getFileManager(); FileManager &FileMgr = CI.getFileManager();
PreprocessorOptions &PPOpts = CI.getPreprocessorOpts(); PreprocessorOptions &PPOpts = CI.getPreprocessorOpts();
StringRef PCHInclude = PPOpts.ImplicitPCHInclude; StringRef PCHInclude = PPOpts.ImplicitPCHInclude;
std::string SpecificModuleCachePath = CI.getSpecificModuleCachePath(); std::string SpecificModuleCachePath = CI.getSpecificModuleCachePath();
if (auto PCHDir = FileMgr.getDirectory(PCHInclude)) { if (auto PCHDir = FileMgr.getOptionalDirectoryRef(PCHInclude)) {
std::error_code EC; std::error_code EC;
SmallString<128> DirNative; SmallString<128> DirNative;
llvm::sys::path::native((*PCHDir)->getName(), DirNative); llvm::sys::path::native(PCHDir->getName(), DirNative);
bool Found = false; bool Found = false;
llvm::vfs::FileSystem &FS = FileMgr.getVirtualFileSystem(); llvm::vfs::FileSystem &FS = FileMgr.getVirtualFileSystem();
for (llvm::vfs::directory_iterator Dir = FS.dir_begin(DirNative, EC), for (llvm::vfs::directory_iterator Dir = FS.dir_begin(DirNative, EC),
DirEnd; DirEnd;
Dir != DirEnd && !EC; Dir.increment(EC)) { Dir != DirEnd && !EC; Dir.increment(EC)) {
// Check whether this is an acceptable AST file. // Check whether this is an acceptable AST file.
if (ASTReader::isAcceptableASTFile( if (ASTReader::isAcceptableASTFile(
Dir->path(), FileMgr, CI.getPCHContainerReader(), Dir->path(), FileMgr, CI.getPCHContainerReader(),
▲ Show 20 Lines • Show All 428 Lines • Show Last 20 Lines