Merge pull request #41636 from apple/revert-41546-use-overlay-fs-instead

Revert "[Importer] Wrap the VFS passed to Clang with an overlay FS instead"

Author: bnbarham

lib/ClangImporter/ClangImporter.cpp

@@ -1102,7 +1102,8 @@ ClangImporter::create(ASTContext &ctx,
 
   // Wrap Swift's FS to allow Clang to override the working directory
   llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> VFS =
-    new llvm::vfs::OverlayFileSystem(ctx.SourceMgr.getFileSystem());
+      llvm::vfs::RedirectingFileSystem::create({}, true,
+                                               *ctx.SourceMgr.getFileSystem());
 
   // Create a new Clang compiler invocation.
   {