@@ -77,11 +77,15 @@ struct InvocationOptions {
7777 const std::string PrimaryFile;
7878 const CompilerInvocation Invok;
7979
80+ // / If defined, all filesystem operations resulting from this invocation
81+ // / should use this filesystem instead of the real filesystem.
82+ const llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FileSystem;
83+
8084 InvocationOptions (ArrayRef<const char *> CArgs, StringRef PrimaryFile,
81- CompilerInvocation Invok)
82- : Args(_convertArgs(CArgs)),
83- PrimaryFile (PrimaryFile),
84- Invok(std::move(Invok)) {
85+ CompilerInvocation Invok,
86+ llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FileSystem)
87+ : Args(_convertArgs(CArgs)), PrimaryFile(PrimaryFile),
88+ Invok (std::move(Invok)), FileSystem(FileSystem ) {
8589 // Assert invocation with a primary file. We want to avoid full typechecking
8690 // for all files.
8791 assert (!this ->PrimaryFile .empty ());
@@ -163,6 +167,7 @@ void InvocationOptions::profile(llvm::FoldingSetNodeID &ID) const {
163167 for (auto &Arg : Args)
164168 ID.AddString (Arg);
165169 ID.AddString (PrimaryFile);
170+ ID.AddPointer (FileSystem.get ());
166171}
167172
168173// ===----------------------------------------------------------------------===//
@@ -373,11 +378,15 @@ struct SwiftASTManager::Implementation {
373378 " sourcekit.swift.ASTBuilding"
374379
375380 ASTProducerRef getASTProducer (SwiftInvocationRef InvokRef);
376- FileContent getFileContent (StringRef FilePath, bool IsPrimary,
377- std::string &Error);
378- BufferStamp getBufferStamp (StringRef FilePath);
379- std::unique_ptr<llvm::MemoryBuffer> getMemoryBuffer (StringRef Filename,
380- std::string &Error);
381+ FileContent
382+ getFileContent (StringRef FilePath, bool IsPrimary, std::string &Error,
383+ llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FileSystem);
384+ BufferStamp
385+ getBufferStamp (StringRef FilePath,
386+ llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FileSystem);
387+ std::unique_ptr<llvm::MemoryBuffer> getMemoryBuffer (
388+ StringRef Filename, std::string &Error,
389+ llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FileSystem = nullptr );
381390};
382391
383392SwiftASTManager::SwiftASTManager (
@@ -541,17 +550,17 @@ bool SwiftASTManager::initCompilerInvocationNoInputs(
541550 return false ;
542551}
543552
544- SwiftInvocationRef
545- SwiftASTManager::getInvocation (ArrayRef<const char *> OrigArgs,
546- StringRef PrimaryFile,
547- std::string &Error) {
553+ SwiftInvocationRef SwiftASTManager::getInvocation (
554+ ArrayRef<const char *> OrigArgs, StringRef PrimaryFile, std::string &Error,
555+ llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FileSystem) {
548556
549557 DiagnosticEngine Diags (Impl.SourceMgr );
550558 EditorDiagConsumer CollectDiagConsumer;
551559 Diags.addConsumer (CollectDiagConsumer);
552560
553561 CompilerInvocation CompInvok;
554- if (initCompilerInvocation (CompInvok, OrigArgs, Diags, PrimaryFile, Error)) {
562+ if (initCompilerInvocation (CompInvok, OrigArgs, Diags, PrimaryFile, Error,
563+ FileSystem)) {
555564 // We create a traced operation here to represent the failure to parse
556565 // arguments since we cannot reach `createAST` where that would normally
557566 // happen.
@@ -568,7 +577,7 @@ SwiftASTManager::getInvocation(ArrayRef<const char *> OrigArgs,
568577 return nullptr ;
569578 }
570579
571- InvocationOptions Opts (OrigArgs, PrimaryFile, CompInvok);
580+ InvocationOptions Opts (OrigArgs, PrimaryFile, CompInvok, FileSystem );
572581 return new SwiftInvocation (
573582 *new SwiftInvocation::Implementation (std::move (Opts)));
574583}
@@ -634,38 +643,45 @@ static FileContent getFileContentFromSnap(ImmutableTextSnapshotRef Snap,
634643}
635644
636645FileContent SwiftASTManager::Implementation::getFileContent (
637- StringRef UnresolvedPath, bool IsPrimary, std::string &Error) {
646+ StringRef UnresolvedPath, bool IsPrimary, std::string &Error,
647+ llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FileSystem) {
638648 std::string FilePath = SwiftLangSupport::resolvePathSymlinks (UnresolvedPath);
639649 if (auto EditorDoc = EditorDocs->findByPath (FilePath))
640650 return getFileContentFromSnap (EditorDoc->getLatestSnapshot (), IsPrimary,
641651 FilePath);
642652
643653 // FIXME: Is there a way to get timestamp and buffer for a file atomically ?
644- auto Stamp = getBufferStamp (FilePath);
645- auto Buffer = getMemoryBuffer (FilePath, Error);
654+ auto Stamp = getBufferStamp (FilePath, FileSystem );
655+ auto Buffer = getMemoryBuffer (FilePath, Error, FileSystem );
646656 return FileContent (nullptr , UnresolvedPath, std::move (Buffer), IsPrimary,
647657 Stamp);
648658}
649659
650- BufferStamp SwiftASTManager::Implementation::getBufferStamp (StringRef FilePath){
660+ BufferStamp SwiftASTManager::Implementation::getBufferStamp (
661+ StringRef FilePath,
662+ llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FileSystem) {
651663 if (auto EditorDoc = EditorDocs->findByPath (FilePath))
652664 return EditorDoc->getLatestSnapshot ()->getStamp ();
653665
654- llvm::sys::fs::file_status Status;
655- if (std::error_code Ret = llvm::sys::fs::status (FilePath, Status)) {
666+ auto StatusOrErr = FileSystem
667+ ? FileSystem->status (FilePath)
668+ : llvm::vfs::getRealFileSystem ()->status (FilePath);
669+ if (std::error_code Err = StatusOrErr.getError ()) {
656670 // Failure to read the file.
657- LOG_WARN_FUNC (" failed to stat file: "
658- << " ( " << Ret. message () << ' )'
671+ LOG_WARN_FUNC (" failed to stat file: " << " ( " << Err. message ()
672+ << ' )'
659673 return -1 ;
660674 }
661- return Status .getLastModificationTime ().time_since_epoch ().count ();
675+ return StatusOrErr. get () .getLastModificationTime ().time_since_epoch ().count ();
662676}
663677
664678std::unique_ptr<llvm::MemoryBuffer>
665- SwiftASTManager::Implementation::getMemoryBuffer (StringRef Filename,
666- std::string &Error) {
679+ SwiftASTManager::Implementation::getMemoryBuffer (
680+ StringRef Filename, std::string &Error,
681+ llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FileSystem) {
667682 llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> FileBufOrErr =
668- llvm::MemoryBuffer::getFile (Filename);
683+ FileSystem ? FileSystem->getBufferForFile (Filename)
684+ : llvm::vfs::getRealFileSystem ()->getBufferForFile (Filename);
669685 if (FileBufOrErr)
670686 return std::move (FileBufOrErr.get ());
671687
@@ -780,15 +796,17 @@ bool ASTProducer::shouldRebuild(SwiftASTManager::Implementation &MgrImpl,
780796 }
781797 }
782798 if (!FoundSnapshot)
783- InputStamps.push_back (MgrImpl.getBufferStamp (File));
799+ InputStamps.push_back (
800+ MgrImpl.getBufferStamp (File, Invok.Opts .FileSystem ));
784801 }
785802 assert (InputStamps.size () ==
786803 Invok.Opts .Invok .getFrontendOptions ().InputsAndOutputs .inputCount ());
787804 if (Stamps != InputStamps)
788805 return true ;
789806
790807 for (auto &Dependency : DependencyStamps) {
791- if (Dependency.second != MgrImpl.getBufferStamp (Dependency.first ))
808+ if (Dependency.second !=
809+ MgrImpl.getBufferStamp (Dependency.first , Invok.Opts .FileSystem ))
792810 return true ;
793811 }
794812
@@ -895,7 +913,7 @@ ASTUnitRef ASTProducer::createASTUnit(SwiftASTManager::Implementation &MgrImpl,
895913
896914 Invocation.getLangOptions ().CollectParsedToken = true ;
897915
898- if (CompIns.setup (Invocation)) {
916+ if (CompIns.setup (Invocation, InvokRef-> Impl . Opts . FileSystem )) {
899917 // FIXME: Report the diagnostic.
900918 LOG_WARN_FUNC (" Compilation setup failed!!!"
901919 Error = " compilation setup failed"
@@ -917,8 +935,9 @@ ASTUnitRef ASTProducer::createASTUnit(SwiftASTManager::Implementation &MgrImpl,
917935 // FIXME: There exists a small window where the module file may have been
918936 // modified after compilation finished and before we get its stamp.
919937 for (auto &Filename : Filenames) {
920- DependencyStamps.push_back (std::make_pair (Filename,
921- MgrImpl.getBufferStamp (Filename)));
938+ DependencyStamps.push_back (std::make_pair (
939+ Filename,
940+ MgrImpl.getBufferStamp (Filename, InvokRef->Impl .Opts .FileSystem )));
922941 }
923942
924943 // Since we only typecheck the primary file (plus referenced constructs
@@ -970,7 +989,8 @@ void ASTProducer::findSnapshotAndOpenFiles(
970989 if (FoundSnapshot)
971990 continue ;
972991
973- auto Content = MgrImpl.getFileContent (File, IsPrimary, Error);
992+ auto Content =
993+ MgrImpl.getFileContent (File, IsPrimary, Error, Opts.FileSystem );
974994 if (!Content.Buffer ) {
975995 LOG_WARN_FUNC (" failed getting file contents for " " : "
976996 << Error);
0 commit comments