This is an archive of the discontinued LLVM Phabricator instance.

Differential D123769

[clang] NFCI: Use DirectoryEntryRef in collectIncludePCH
ClosedPublic

Authored by jansvoboda11 on Apr 14 2022, 1:54 AM.

Details

Reviewers
dexonsmith
bnbarham
Commits
rG99b4874a53cf: [clang] NFCI: Use DirectoryEntryRef in collectIncludePCH
Summary

This patch removes use of the deprecated DirectoryEntry::getName() from collectIncludePCH by using {File,Directory}EntryRef instead.

Diff Detail

Event Timeline

jansvoboda11 created this revision.Apr 14 2022, 1:54 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 14 2022, 1:54 AM
jansvoboda11 requested review of this revision.Apr 14 2022, 1:54 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 14 2022, 1:54 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B159630: Diff 422774.Apr 14 2022, 4:28 AM
bnbarham accepted this revision.Apr 14 2022, 9:12 AM
This revision is now accepted and ready to land.Apr 14 2022, 9:12 AM
This revision was landed with ongoing or failed builds.Apr 15 2022, 6:16 AM
Closed by commit rG99b4874a53cf: [clang] NFCI: Use DirectoryEntryRef in collectIncludePCH (authored by jansvoboda11). · Explain Why
This revision was automatically updated to reflect the committed changes.
jansvoboda11 added a commit: rG99b4874a53cf: [clang] NFCI: Use DirectoryEntryRef in collectIncludePCH.

Revision Contents

PathSize
clang/
lib/
Frontend/
4 lines

Diff 423075

clang/lib/Frontend/CompilerInstance.cpp

Show First 20 Lines • Show All 226 Lines • ▼ Show 20 Lines
static void collectIncludePCH(CompilerInstance &CI, static void collectIncludePCH(CompilerInstance &CI,
std::shared_ptr<ModuleDependencyCollector> MDC) { std::shared_ptr<ModuleDependencyCollector> MDC) {
const PreprocessorOptions &PPOpts = CI.getPreprocessorOpts(); const PreprocessorOptions &PPOpts = CI.getPreprocessorOpts();
if (PPOpts.ImplicitPCHInclude.empty()) if (PPOpts.ImplicitPCHInclude.empty())
return; return;
StringRef PCHInclude = PPOpts.ImplicitPCHInclude; StringRef PCHInclude = PPOpts.ImplicitPCHInclude;
FileManager &FileMgr = CI.getFileManager(); FileManager &FileMgr = CI.getFileManager();
auto PCHDir = FileMgr.getDirectory(PCHInclude); auto PCHDir = FileMgr.getOptionalDirectoryRef(PCHInclude);
if (!PCHDir) { if (!PCHDir) {
MDC->addFile(PCHInclude); MDC->addFile(PCHInclude);
return; return;
} }
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);
llvm::vfs::FileSystem &FS = FileMgr.getVirtualFileSystem(); llvm::vfs::FileSystem &FS = FileMgr.getVirtualFileSystem();
SimpleASTReaderListener Validator(CI.getPreprocessor()); SimpleASTReaderListener Validator(CI.getPreprocessor());
for (llvm::vfs::directory_iterator Dir = FS.dir_begin(DirNative, EC), DirEnd; for (llvm::vfs::directory_iterator Dir = FS.dir_begin(DirNative, EC), DirEnd;
Dir != DirEnd && !EC; Dir.increment(EC)) { Dir != DirEnd && !EC; Dir.increment(EC)) {
// Check whether this is an AST file. ASTReader::isAcceptableASTFile is not // Check whether this is an AST file. ASTReader::isAcceptableASTFile is not
// used here since we're not interested in validating the PCH at this time, // used here since we're not interested in validating the PCH at this time,
// but only to check whether this is a file containing an AST. // but only to check whether this is a file containing an AST.
if (!ASTReader::readASTFileControlBlock( if (!ASTReader::readASTFileControlBlock(
▲ Show 20 Lines • Show All 2,034 Lines • Show Last 20 Lines