[Clang] Fix compile error

rdar://140448660

Author: egorzhdan

clang/tools/clang-cas-test/ClangCASTest.cpp

@@ -68,7 +68,8 @@ int main(int Argc, const char **Argv) {
   }
 
   IntrusiveRefCntPtr<DiagnosticsEngine> Diags(
-      CompilerInstance::createDiagnostics(new DiagnosticOptions));
+      CompilerInstance::createDiagnostics(*llvm::vfs::getRealFileSystem(),
+                                          new DiagnosticOptions));
 
   CASOptions Opts;
   // Printing a cache key only makes sense in an existing CAS, so default to

clang/tools/driver/CacheLauncherMode.cpp

@@ -44,8 +44,9 @@ static bool shouldCacheInvocation(ArrayRef<const char *> Args,
   CreateInvocationOptions Opts;
   // Ignore diagnostic parsing diagnostics; if they are real issues they will be
   // seen when compiling. Just fallback to disabling caching here.
-  Opts.Diags = CompilerInstance::createDiagnostics(new DiagnosticOptions,
-                                                   new IgnoringDiagConsumer);
+  Opts.Diags = CompilerInstance::createDiagnostics(
+      *llvm::vfs::getRealFileSystem(), new DiagnosticOptions,
+      new IgnoringDiagConsumer);
   // This enables picking the first invocation in a multi-arch build.
   Opts.RecoverOnError = true;
   std::shared_ptr<CompilerInvocation> CInvok =

clang/tools/libclang/Driver.cpp

@@ -42,14 +42,15 @@ clang_Driver_getExternalActionsForCommand_v0(int ArgC, const char **ArgV,
 
   CXDiagnosticSetDiagnosticConsumer DiagConsumer;
   auto DiagOpts = CreateAndPopulateDiagOpts(ArrayRef(ArgV, ArgC));
-  auto Diags = CompilerInstance::createDiagnostics(DiagOpts.release(),
-                                                   &DiagConsumer, false);
 
   // Use createPhysicalFileSystem instead of getRealFileSystem so that
   // setCurrentWorkingDirectory doesn't change the working directory of the
   // process.
   std::unique_ptr<llvm::vfs::FileSystem> VFS =
       llvm::vfs::createPhysicalFileSystem();
+
+  auto Diags = CompilerInstance::createDiagnostics(*VFS, DiagOpts.release(),
+                                                   &DiagConsumer, false);
   if (WorkingDirectory)
     if (std::error_code EC =
           VFS->setCurrentWorkingDirectory(WorkingDirectory)) {