[SourceKit] Accept a file system in SwiftASTManager::getMemoryBuffer

Author: ahoppen

tools/SourceKit/lib/SwiftLang/SwiftASTManager.cpp

@@ -648,9 +648,11 @@ SwiftASTManager::~SwiftASTManager() {
   delete &Impl;
 }
 
-std::unique_ptr<llvm::MemoryBuffer>
-SwiftASTManager::getMemoryBuffer(StringRef Filename, std::string &Error) {
-  return Impl.getMemoryBuffer(Filename, llvm::vfs::getRealFileSystem(), Error);
+std::unique_ptr<llvm::MemoryBuffer> SwiftASTManager::getMemoryBuffer(
+    StringRef Filename,
+    llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FileSystem,
+    std::string &Error) {
+  return Impl.getMemoryBuffer(Filename, FileSystem, Error);
 }
 
 static FrontendInputsAndOutputs

tools/SourceKit/lib/SwiftLang/SwiftASTManager.h

@@ -262,8 +262,10 @@ class SwiftASTManager : public std::enable_shared_from_this<SwiftASTManager> {
                   SourceKitCancellationToken CancellationToken,
                   llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> fileSystem);
 
-  std::unique_ptr<llvm::MemoryBuffer> getMemoryBuffer(StringRef Filename,
-                                                      std::string &Error);
+  std::unique_ptr<llvm::MemoryBuffer>
+  getMemoryBuffer(StringRef Filename,
+                  llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FileSystem,
+                  std::string &Error);
 
   bool initCompilerInvocation(swift::CompilerInvocation &Invocation,
                               ArrayRef<const char *> Args,

tools/SourceKit/lib/SwiftLang/SwiftIndexing.cpp

@@ -277,7 +277,8 @@ void SwiftLangSupport::indexSource(StringRef InputFile,
                                    IndexingConsumer &IdxConsumer,
                                    ArrayRef<const char *> OrigArgs) {
   std::string Error;
-  auto InputBuf = ASTMgr->getMemoryBuffer(InputFile, Error);
+  auto InputBuf =
+      ASTMgr->getMemoryBuffer(InputFile, llvm::vfs::getRealFileSystem(), Error);
   if (!InputBuf) {
     IdxConsumer.failed(Error);
     return;