src/indexer.cc

@@ -325,9 +325,6 @@ try_again:
   switch (tp->getTypeClass()) {
   case Type::Typedef:
     d = cast<TypedefType>(tp)->getDecl();
-    tp = cast<TypedefType>(tp)->getDecl()->getUnderlyingType().getTypePtrOrNull();
-    if (tp)
-      goto try_again;
     break;
   case Type::ObjCObject:
     d = cast<ObjCObjectType>(tp)->getInterface();
@@ -364,11 +361,9 @@ try_again:
 
     // FIXME: Template type parameters!
 
-#if LLVM_VERSION_MAJOR < 22 // llvmorg-22-init-3166-g91cdd35008e9
   case Type::Elaborated:
     tp = cast<ElaboratedType>(tp)->getNamedType().getTypePtrOrNull();
     goto try_again;
-#endif
 
   default:
     break;
@@ -1268,7 +1263,7 @@ IndexResult index(WorkingFiles *wfiles, VFS *vfs, const std::string &opt_wdir, c
   clang->setInvocation(std::move(ci));
 #endif
   clang->createDiagnostics(
-#if LLVM_VERSION_MAJOR >= 20 && LLVM_VERSION_MAJOR < 22
+#if LLVM_VERSION_MAJOR >= 20
       *fs,
 #endif
       &dc, false);
@@ -1281,12 +1276,7 @@ IndexResult index(WorkingFiles *wfiles, VFS *vfs, const std::string &opt_wdir, c
   if (!clang->hasTarget())
     return {};
   clang->getPreprocessorOpts().RetainRemappedFileBuffers = true;
-#if LLVM_VERSION_MAJOR >= 22
-  clang->setVirtualFileSystem(fs);
-  clang->createFileManager();
-#else
   clang->createFileManager(fs);
-#endif
   clang->setSourceManager(new SourceManager(clang->getDiagnostics(), clang->getFileManager(), true));
 
   IndexParam param(*vfs, no_linkage);

src/messages/initialize.cc

@@ -345,11 +345,7 @@ void do_initialize(MessageHandler *m, InitializeParam &param, ReplyOnce &reply)
 
     if (g_config->cache.directory.size()) {
       SmallString<256> path(g_config->cache.directory);
-#if LLVM_VERSION_MAJOR >= 22
-      sys::path::make_absolute(project_path, path);
-#else
       sys::fs::make_absolute(project_path, path);
-#endif
       // Use upper case for the Driver letter on Windows.
       g_config->cache.directory = normalizePath(path.str());
       ensureEndsInSlash(g_config->cache.directory);

src/sema_manager.cc

@@ -268,7 +268,7 @@ std::unique_ptr<CompilerInstance> buildCompilerInstance(Session &session, std::u
   clang->setInvocation(std::move(ci));
 #endif
   clang->createDiagnostics(
-#if LLVM_VERSION_MAJOR >= 20 && LLVM_VERSION_MAJOR < 22
+#if LLVM_VERSION_MAJOR >= 20
       *fs,
 #endif
       &dc, false);
@@ -283,12 +283,7 @@ std::unique_ptr<CompilerInstance> buildCompilerInstance(Session &session, std::u
   // Construct SourceManager with UserFilesAreVolatile: true because otherwise
   // RequiresNullTerminator: true may cause out-of-bounds read when a file is
   // mmap'ed but is saved concurrently.
-#if LLVM_VERSION_MAJOR >= 22
-  clang->setVirtualFileSystem(fs);
-  clang->createFileManager();
-#else
   clang->createFileManager(fs);
-#endif
   clang->setSourceManager(new SourceManager(clang->getDiagnostics(), clang->getFileManager(), true));
   auto &isec = clang->getFrontendOpts().Inputs;
   if (isec.size()) {