Revert "[ClangImporter] Merge Swift & Clang VFS"

This commit is contained in:
Jonas Devlieghere
2019-07-05 15:30:43 -07:00
committed by GitHub
parent 820a16b25e
commit fe2ad03f93
10 changed files with 37 additions and 76 deletions

View File

@@ -273,7 +273,7 @@ static Optional<StringRef> getRelativeDepPath(StringRef DepPath,
/// output path.
/// \note Needs to be in the swift namespace so CompilerInvocation can see it.
class swift::ParseableInterfaceBuilder {
llvm::vfs::OverlayFileSystem &fs;
llvm::vfs::FileSystem &fs;
DiagnosticEngine &diags;
const StringRef interfacePath;
const StringRef moduleName;
@@ -765,7 +765,7 @@ class ParseableInterfaceModuleLoaderImpl {
using AccessPathElem = std::pair<Identifier, SourceLoc>;
friend class swift::ParseableInterfaceModuleLoader;
ASTContext &ctx;
llvm::vfs::OverlayFileSystem &fs;
llvm::vfs::FileSystem &fs;
DiagnosticEngine &diags;
ModuleRebuildInfo rebuildInfo;
const StringRef modulePath;