Drop support for LLVM 7, 8, and 9

Author: MaskRay

CMakeLists.txt

@@ -201,7 +201,6 @@ target_sources(ccls PRIVATE
   src/filesystem.cc
   src/fuzzy_match.cc
   src/main.cc
-  src/include_complete.cc
   src/indexer.cc
   src/log.cc
   src/lsp.cc

src/clang_tu.cc

@@ -163,12 +163,7 @@ buildCompilerInvocation(const std::string &main, std::vector<const char *> args,
     return nullptr;
   const llvm::opt::ArgStringList &cc_args = cmd.getArguments();
   auto ci = std::make_unique<CompilerInvocation>();
-#if LLVM_VERSION_MAJOR >= 10 // rC370122
   if (!CompilerInvocation::CreateFromArgs(*ci, cc_args, *diags))
-#else
-  if (!CompilerInvocation::CreateFromArgs(
-          *ci, cc_args.data(), cc_args.data() + cc_args.size(), *diags))
-#endif
     return nullptr;
 
   ci->getDiagnosticOpts().IgnoreWarnings = true;
@@ -189,9 +184,7 @@ buildCompilerInvocation(const std::string &main, std::vector<const char *> args,
   auto &isec = ci->getFrontendOpts().Inputs;
   if (isec.size())
     isec[0] = FrontendInputFile(main, isec[0].getKind(), isec[0].isSystem());
-#if LLVM_VERSION_MAJOR >= 10 // llvmorg-11-init-2414-g75f09b54429
   ci->getPreprocessorOpts().DisablePragmaDebugCrash = true;
-#endif
   // clangSerialization has an unstable format. Disable PCH reading/writing
   // to work around PCH mismatch problems.
   ci->getPreprocessorOpts().ImplicitPCHInclude.clear();

src/clang_tu.hh

@@ -10,13 +10,6 @@
 #include <clang/Basic/SourceManager.h>
 #include <clang/Frontend/CompilerInstance.h>
 
-#if LLVM_VERSION_MAJOR < 8
-// D52783 Lift VFS from clang to llvm
-namespace llvm {
-namespace vfs = clang::vfs;
-}
-#endif
-
 #if LLVM_VERSION_MAJOR < 14 // llvmorg-14-init-3863-g601102d282d5
 #define isAsciiIdentifierContinue isIdentifierBody
 #endif

src/include_complete.cc

@@ -710,9 +710,6 @@ class IndexDataConsumer : public index::IndexDataConsumer {
 public:
   IndexDataConsumer(IndexParam &param) : param(param) {}
   void initialize(ASTContext &ctx) override { this->ctx = param.ctx = &ctx; }
-#if LLVM_VERSION_MAJOR < 10 // llvmorg-10-init-12036-g3b9715cb219
-# define handleDeclOccurrence handleDeclOccurence
-#endif
   bool handleDeclOccurrence(const Decl *d, index::SymbolRoleSet roles,
                             ArrayRef<index::SymbolRelation> relations,
                             SourceLocation src_loc,
@@ -899,31 +896,6 @@ class IndexDataConsumer : public index::IndexDataConsumer {
             if (!isa<EnumConstantDecl>(d))
               db->toType(usr1).instances.push_back(usr);
           } else if (const Decl *d1 = getAdjustedDecl(getTypeDecl(t))) {
-#if LLVM_VERSION_MAJOR < 9
-            if (isa<TemplateTypeParmDecl>(d1)) {
-              // e.g. TemplateTypeParmDecl is not handled by
-              // handleDeclOccurence.
-              SourceRange sr1 = d1->getSourceRange();
-              if (sm.getFileID(sr1.getBegin()) == fid) {
-                IndexParam::DeclInfo *info1;
-                Usr usr1 = getUsr(d1, &info1);
-                IndexType &type1 = db->toType(usr1);
-                SourceLocation sl1 = d1->getLocation();
-                type1.def.spell = {
-                    Use{{fromTokenRange(sm, lang, {sl1, sl1}), Role::Definition},
-                        lid},
-                    fromTokenRange(sm, lang, sr1)};
-                type1.def.detailed_name = intern(info1->short_name);
-                type1.def.short_name_size = int16_t(info1->short_name.size());
-                type1.def.kind = SymbolKind::TypeParameter;
-                type1.def.parent_kind = SymbolKind::Class;
-                var->def.type = usr1;
-                type1.instances.push_back(usr);
-                break;
-              }
-            }
-#endif
-
             IndexParam::DeclInfo *info1;
             Usr usr1 = getUsr(d1, &info1);
             var->def.type = usr1;
@@ -1237,10 +1209,8 @@ class IndexFrontendAction : public ASTFrontendAction {
         std::make_unique<IndexPPCallbacks>(pp->getSourceManager(), param));
     std::vector<std::unique_ptr<ASTConsumer>> consumers;
     consumers.push_back(std::make_unique<SkipProcessed>(param));
-#if LLVM_VERSION_MAJOR >= 10 // rC370337
     consumers.push_back(index::createIndexingASTConsumer(
         dataConsumer, indexOpts, std::move(pp)));
-#endif
     return std::make_unique<MultiplexConsumer>(std::move(consumers));
   }
 };
@@ -1349,12 +1319,7 @@ index(SemaManager *manager, WorkingFiles *wfiles, VFS *vfs,
   if (!clang->hasTarget())
     return {};
   clang->getPreprocessorOpts().RetainRemappedFileBuffers = true;
-#if LLVM_VERSION_MAJOR >= 9 // rC357037
   clang->createFileManager(fs);
-#else
-  clang->setVirtualFileSystem(fs);
-  clang->createFileManager();
-#endif
   clang->setSourceManager(new SourceManager(clang->getDiagnostics(),
                                             clang->getFileManager(), true));
 
@@ -1366,39 +1331,23 @@ index(SemaManager *manager, WorkingFiles *wfiles, VFS *vfs,
   if (no_linkage) {
     indexOpts.IndexFunctionLocals = true;
     indexOpts.IndexImplicitInstantiation = true;
-#if LLVM_VERSION_MAJOR >= 9
-
     indexOpts.IndexParametersInDeclarations =
         g_config->index.parametersInDeclarations;
     indexOpts.IndexTemplateParameters = true;
-#endif
   }
 
-#if LLVM_VERSION_MAJOR >= 10 // rC370337
   auto action = std::make_unique<IndexFrontendAction>(
       std::make_shared<IndexDataConsumer>(param), indexOpts, param);
-#else
-  auto dataConsumer = std::make_shared<IndexDataConsumer>(param);
-  auto action = createIndexingAction(
-      dataConsumer, indexOpts,
-      std::make_unique<IndexFrontendAction>(dataConsumer, indexOpts, param));
-#endif
-
   std::string reason;
   {
     llvm::CrashRecoveryContext crc;
     auto parse = [&]() {
       if (!action->BeginSourceFile(*clang, clang->getFrontendOpts().Inputs[0]))
         return;
-#if LLVM_VERSION_MAJOR >= 9 // rL364464
       if (llvm::Error e = action->Execute()) {
         reason = llvm::toString(std::move(e));
         return;
       }
-#else
-      if (!action->Execute())
-        return;
-#endif
       action->EndSourceFile();
       ok = true;
     };