averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Plumbing for a Virtual File System

Browse Source 
Adds the -vfsoverlay frontend option that enables the user to pass
VFS overlay YAML files to Swift. These files define a (potentially
many-layered) virtual mapping on which we predicate a VFS.

Switch all input-based memory buffer reads in the Frontend to the new
FileSystem-based approach.
This commit is contained in:
Robert Widmann
2018-07-28 01:21:17 -04:00
parent 2dfa303975
commit 0e58b7fd14
22 changed files with 234 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/Frontend/Frontend.cpp
View File

@@ -136,6 +136,7 @@ void CompilerInstance::recordPrimarySourceFile(SourceFile *SF) {
bool CompilerInstance::setup(const CompilerInvocation &Invok) {
Invocation = Invok;
setUpFileSystem();
setUpLLVMArguments();
setUpDiagnosticOptions();
@@ -166,6 +167,39 @@ bool CompilerInstance::setup(const CompilerInvocation &Invok) {
return setUpInputs();
}
void CompilerInstance::setUpFileSystem() {
auto BaseFS = clang::vfs::getRealFileSystem();
auto Overlay = llvm::IntrusiveRefCntPtr<clang::vfs::OverlayFileSystem>(
new clang::vfs::OverlayFileSystem(BaseFS));
for (const auto &File : Invocation.getSearchPathOptions().VFSOverlayFiles) {
auto Buffer = BaseFS->getBufferForFile(File);
if (!Buffer) {
continue;
}
auto FS = clang::vfs::getVFSFromYAML(std::move(Buffer.get()),
nullptr, File);
if (!FS) {
continue;
}
Overlay->pushOverlay(FS);
}
// If there weren't any overlays or we couldn't load any overlays then fall
// back to the local FS.
if (Overlay->overlays_begin() == Overlay->overlays_end()) {
FS = BaseFS;
return;
}
// Initialize the overlays file system.
FS = Overlay;
// Reset the source manager and diagnostic engine to take advantage of the
// overlay file system.
SourceMgr.setFileSystem(FS);
}
void CompilerInstance::setUpLLVMArguments() {
// Honor -Xllvm.
if (!Invocation.getFrontendOptions().LLVMArgs.empty()) {
@@ -326,7 +360,8 @@ CompilerInstance::getInputBufferAndModuleDocBufferIfPresent(
// FIXME: Working with filenames is fragile, maybe use the real path
// or have some kind of FileManager.
using FileOrError = llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>>;
FileOrError inputFileOrErr = llvm::MemoryBuffer::getFileOrSTDIN(input.file());
FileOrError inputFileOrErr = swift::vfs::getFileOrSTDIN(getFileSystem(),
input.file());
if (!inputFileOrErr) {
Diagnostics.diagnose(SourceLoc(), diag::error_open_input_file, input.file(),
inputFileOrErr.getError().message());
@@ -351,7 +386,7 @@ CompilerInstance::openModuleDoc(const InputFile &input) {
file_types::getExtension(file_types::TY_SwiftModuleDocFile));
using FileOrError = llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>>;
FileOrError moduleDocFileOrErr =
llvm::MemoryBuffer::getFileOrSTDIN(moduleDocFilePath);
swift::vfs::getFileOrSTDIN(getFileSystem(), moduleDocFilePath);
if (moduleDocFileOrErr)
return std::move(*moduleDocFileOrErr);