This is an archive of the discontinued LLVM Phabricator instance.

Differential D90957

Frontend: Skip namespace around createVFSFromCompilerInvocation definition, NFC
ClosedPublic

Authored by dexonsmith on Nov 6 2020, 9:42 AM.

Details

Reviewers
arphaman
jansvoboda11
JDevlieghere
Commits
rG4e9af3d47847: Frontend: Skip namespace around createVFSFromCompilerInvocation definition, NFC
Summary

Qualify definitions with clang:: rather than opening/closing a namespace.

Diff Detail

Event Timeline

dexonsmith created this revision.Nov 6 2020, 9:42 AM
Herald added a subscriber: ributzka. · View Herald TranscriptNov 6 2020, 9:42 AM
dexonsmith requested review of this revision.Nov 6 2020, 9:42 AM
jansvoboda11 accepted this revision.Nov 9 2020, 5:03 AM

LGTM

This revision is now accepted and ready to land.Nov 9 2020, 5:03 AM
Closed by commit rG4e9af3d47847: Frontend: Skip namespace around createVFSFromCompilerInvocation definition, NFC (authored by dexonsmith). · Explain WhyNov 11 2020, 1:17 PM
This revision was automatically updated to reflect the committed changes.
dexonsmith added a commit: rG4e9af3d47847: Frontend: Skip namespace around createVFSFromCompilerInvocation definition, NFC.
Herald added a project: Restricted Project. · View Herald TranscriptNov 11 2020, 1:17 PM

Revision Contents

PathSize
clang/
lib/
Frontend/
11 lines

Diff 304631

clang/lib/Frontend/CompilerInvocation.cpp

Show First 20 Lines • Show All 4,018 Lines • ▼ Show 20 Lines if (((FLAGS) & options::CC1Option) && \
} \ } \
} }
#include "clang/Driver/Options.inc" #include "clang/Driver/Options.inc"
#undef OPTION_WITH_MARSHALLING_STRING #undef OPTION_WITH_MARSHALLING_STRING
#undef OPTION_WITH_MARSHALLING_FLAG #undef OPTION_WITH_MARSHALLING_FLAG
} }
namespace clang {
IntrusiveRefCntPtr<llvm::vfs::FileSystem> IntrusiveRefCntPtr<llvm::vfs::FileSystem>
createVFSFromCompilerInvocation(const CompilerInvocation &CI, clang::createVFSFromCompilerInvocation(const CompilerInvocation &CI,
DiagnosticsEngine &Diags) { DiagnosticsEngine &Diags) {
return createVFSFromCompilerInvocation(CI, Diags, return createVFSFromCompilerInvocation(CI, Diags,
llvm::vfs::getRealFileSystem()); llvm::vfs::getRealFileSystem());
} }
IntrusiveRefCntPtr<llvm::vfs::FileSystem> createVFSFromCompilerInvocation( IntrusiveRefCntPtr<llvm::vfs::FileSystem>
clang::createVFSFromCompilerInvocation(
const CompilerInvocation &CI, DiagnosticsEngine &Diags, const CompilerInvocation &CI, DiagnosticsEngine &Diags,
IntrusiveRefCntPtr<llvm::vfs::FileSystem> BaseFS) { IntrusiveRefCntPtr<llvm::vfs::FileSystem> BaseFS) {
if (CI.getHeaderSearchOpts().VFSOverlayFiles.empty()) if (CI.getHeaderSearchOpts().VFSOverlayFiles.empty())
return BaseFS; return BaseFS;
IntrusiveRefCntPtr<llvm::vfs::FileSystem> Result = BaseFS; IntrusiveRefCntPtr<llvm::vfs::FileSystem> Result = BaseFS;
// earlier vfs files are on the bottom // earlier vfs files are on the bottom
for (const auto &File : CI.getHeaderSearchOpts().VFSOverlayFiles) { for (const auto &File : CI.getHeaderSearchOpts().VFSOverlayFiles) {
Show All 11 Lines if (!FS) {
Diags.Report(diag::err_invalid_vfs_overlay) << File; Diags.Report(diag::err_invalid_vfs_overlay) << File;
continue; continue;
} }
Result = FS; Result = FS;
} }
return Result; return Result;
} }
} // namespace clang