Merge 201317535d into 3640f899f1

src/clang_tu.cc

@@ -124,11 +124,9 @@ buildCompilerInvocation(const std::string &main, std::vector<const char *> args,
     args.insert(args.begin() + 1, std::begin(arr), std::end(arr));
   }
 
-  IntrusiveRefCntPtr<DiagnosticsEngine> diags(CompilerInstance::createDiagnostics(
+  IntrusiveRefCntPtr<DiagnosticsEngine> diags(
-#if LLVM_VERSION_MAJOR >= 20
+      CompilerInstance::createDiagnostics(new DiagnosticOptions,
-      *vfs,
+                                          new IgnoringDiagConsumer, true));
-#endif
-      new DiagnosticOptions, new IgnoringDiagConsumer, true));
 #if LLVM_VERSION_MAJOR < 12 // llvmorg-12-init-5498-g257b29715bb
   driver::Driver d(args[0], llvm::sys::getDefaultTargetTriple(), *diags, vfs);
 #else

src/indexer.cc

@@ -1312,11 +1312,7 @@ index(SemaManager *manager, WorkingFiles *wfiles, VFS *vfs,
   IndexDiags dc;
   auto clang = std::make_unique<CompilerInstance>(pch);
   clang->setInvocation(std::move(ci));
-  clang->createDiagnostics(
+  clang->createDiagnostics(&dc, false);
-#if LLVM_VERSION_MAJOR >= 20
-      *fs,
-#endif
-      &dc, false);
   clang->getDiagnostics().setIgnoreAllWarnings(true);
   clang->setTarget(TargetInfo::CreateTargetInfo(
       clang->getDiagnostics(), clang->getInvocation().TargetOpts));

src/sema_manager.cc

@@ -288,11 +288,7 @@ buildCompilerInstance(Session &session, std::unique_ptr<CompilerInvocation> ci,
 
   auto clang = std::make_unique<CompilerInstance>(session.pch);
   clang->setInvocation(std::move(ci));
-  clang->createDiagnostics(
+  clang->createDiagnostics(&dc, false);
-#if LLVM_VERSION_MAJOR >= 20
-      *fs,
-#endif
-      &dc, false);
   clang->setTarget(TargetInfo::CreateTargetInfo(
       clang->getDiagnostics(), clang->getInvocation().TargetOpts));
   if (!clang->hasTarget())
@@ -372,11 +368,8 @@ void buildPreamble(Session &session, CompilerInvocation &ci,
 #endif
 
   StoreDiags dc(task.path);
-  IntrusiveRefCntPtr<DiagnosticsEngine> de = CompilerInstance::createDiagnostics(
+  IntrusiveRefCntPtr<DiagnosticsEngine> de =
-#if LLVM_VERSION_MAJOR >= 20
+      CompilerInstance::createDiagnostics(&ci.getDiagnosticOpts(), &dc, false);
-      *fs,
-#endif
-      &ci.getDiagnosticOpts(), &dc, false);
   if (oldP) {
     std::lock_guard lock(session.wfiles->mutex);
     for (auto &include : oldP->includes)