CU-2083 Update scip-clang to newer Clang version

Amp-Thread-ID: https://ampcode.com/threads/T-019b7003-fbd1-73b0-84e1-30b1483d9aed
Co-authored-by: Amp <amp@ampcode.com>

Author: chrapkowski-sg

README.md

@@ -1,6 +1,6 @@
 # scip-clang: SCIP indexer for C and C++ ![(Status: Beta)](https://img.shields.io/badge/status-beta-yellow?style=flat)
 
-scip-clang is a precise code indexer based on Clang 16,
+scip-clang is a precise code indexer based on Clang 21,
 which supports cross-repository code navigation for C, C++ and CUDA
 in Sourcegraph.
 
@@ -201,7 +201,7 @@ scip-clang --compdb-path=build/small_compdb.json --show-compiler-diagnostics
 <summary>Known diagnostics when indexing CUDA</summary>
 
 1. If you see an error related to the `texture` template, that is likely
-   because of the Clang version not being Clang 16 or newer.
+   because of the Clang version not being Clang 21 or newer.
    See https://github.com/llvm/llvm-project/issues/61340
 2. If you see any errors related to GCC headers, that's a
    [known issue](https://github.com/sourcegraph/scip-clang/issues/440).

fetch_deps.bzl

@@ -4,12 +4,12 @@ _BAZEL_SKYLIB_VERSION = "1.3.0"
 _PLATFORMS_COMMIT = "3fbc687756043fb58a407c2ea8c944bc2fe1d922"  # 2022 Nov 10
 _BAZEL_TOOLCHAIN_VERSION = "0.10.3"
 _RULES_BOOST_COMMIT = "00b9b9ecb9b43564de44ea0b10e22b29dcf84d79"
-_LLVM_COMMIT = "e0f3110b854a476c16cce7b44472cd7838d344e9"  # Keep in sync with Version.h
+_LLVM_COMMIT = "2078da43e25a4623cab2d0d60decddf709aaea28"  # Keep in sync with Version.h
 _ABSL_COMMIT = "4ffaea74c1f5408e0757547a1ca0518ad43fa9f1"
 _CXXOPTS_VERSION = "3.0.0"
 _RAPIDJSON_COMMIT = "a98e99992bd633a2736cc41f96ec85ef0c50e44d"
 _WYHASH_COMMIT = "ea3b25e1aef55d90f707c3a292eeb9162e2615d8"
-_SPDLOG_COMMIT = "edc51df1bdad8667b628999394a1e7c4dc6f3658"
+_SPDLOG_COMMIT = "486b55554f11c9cccc913e11a87085b2a91f706f"  # v1.16.0
 _PROTOBUF_VERSION = "3.21.12"
 _SCIP_COMMIT = "aa0e511dcfefbacc3b96dcc2fe2abd9894416b1e"
 _UTFCPP_VERSION = "4.0.5"
@@ -22,7 +22,7 @@ _UTFCPP_VERSION = "4.0.5"
 # See https://github.com/google/perfetto/issues/271#issuecomment-1527691232
 _PERFETTO_VERSION = "33.1"  # Keep in sync with docs/Development.md
 _DOCTEST_VERSION = "2.4.9"
-_DTL_VERSION = "1.20"
+_DTL_VERSION = "1.21"
 _RULES_PYTHON_VERSION = "0.18.1"
 
 def fetch_direct_dependencies():
@@ -100,9 +100,20 @@ def fetch_direct_dependencies():
         ],
     )
 
+    # LLVM 18+ uses zlib-ng instead of zlib
+    http_archive(
+        name = "llvm_zlib",
+        build_file = "@llvm-raw//utils/bazel/third_party_build:zlib-ng.BUILD",
+        sha256 = "e36bb346c00472a1f9ff2a0a4643e590a254be6379da7cddd9daeb9a7f296731",
+        strip_prefix = "zlib-ng-2.0.7",
+        urls = [
+            "https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.0.7.zip",
+        ],
+    )
+
     http_archive(
         name = "llvm-raw",
-        sha256 = "04b76a5be88331f71a4e4fe96bccfebec302ddd0dbd9418fd5c186a7361c54fb",
+        sha256 = "536a4d64ab21bc85bf95ae4dc412b36e8a9c72d487a476839f3c31c3ded69e96",
         strip_prefix = "llvm-project-%s" % _LLVM_COMMIT,
         build_file_content = "# empty",
         urls = ["https://github.com/llvm/llvm-project/archive/%s.tar.gz" % _LLVM_COMMIT],
@@ -165,7 +176,7 @@ def fetch_direct_dependencies():
     # NOTE: fmt also comes through spdlog, we don't have an explicit dep on fmt.
     http_archive(
         name = "spdlog",
-        sha256 = "93a270dd7ec8fa672eb4feaef443dc14a4a9edc7b59aea998ae5da6cbf7b7119",
+        sha256 = "d2fef585c9879dd239dc498e2e8a1e22982b3ed67b2d14e78622b7ef25bdfdfa",
         build_file = "@scip_clang//third_party:spdlog.BUILD",
         strip_prefix = "spdlog-%s" % _SPDLOG_COMMIT,
         urls = ["https://github.com/gabime/spdlog/archive/%s.tar.gz" % _SPDLOG_COMMIT],
@@ -180,7 +191,7 @@ def fetch_direct_dependencies():
 
     http_archive(
         name = "dtl",
-        sha256 = "579f81bca88f4b9760a59d99c5a95bd8dd5dc2f20f33f1f9b5f64cb08979f54d",
+        sha256 = "90ed2dbf4e6d687737fe25f118bbcb6aed778cecc3f2115d191a032bf8643dbd",
         build_file = "@scip_clang//third_party:dtl.BUILD",
         strip_prefix = "dtl-%s" % _DTL_VERSION,
         urls = ["https://github.com/cubicdaiya/dtl/archive/v%s.tar.gz" % _DTL_VERSION],

indexer/ApproximateNameResolver.cc

@@ -14,6 +14,37 @@
 
 namespace scip_clang {
 
+namespace {
+// Reimplementation of the removed CXXRecordDecl::lookupDependentName
+llvm::SmallVector<clang::NamedDecl *, 4>
+lookupDependentName(clang::CXXRecordDecl *record, clang::DeclarationName name,
+                    llvm::function_ref<bool(const clang::NamedDecl *)> filter) {
+  llvm::SmallVector<clang::NamedDecl *, 4> results;
+  for (auto *decl : record->lookup(name)) {
+    if (filter(decl)) {
+      results.push_back(decl);
+    }
+  }
+  if (!results.empty())
+    return results;
+
+  // Search in base classes
+  for (const auto &base : record->bases()) {
+    auto *baseType = base.getType()->getAs<clang::RecordType>();
+    if (!baseType)
+      continue;
+    auto *baseRecord =
+        llvm::dyn_cast<clang::CXXRecordDecl>(baseType->getDecl());
+    if (!baseRecord || !baseRecord->hasDefinition())
+      continue;
+    auto baseResults =
+        lookupDependentName(baseRecord->getDefinition(), name, filter);
+    results.append(baseResults.begin(), baseResults.end());
+  }
+  return results;
+}
+} // namespace
+
 MemberLookupKey::MemberLookupKey(const clang::Type *type,
                                  const clang::DeclarationNameInfo &declNameInfo)
     : canonicalTypePtr(type->getCanonicalTypeInternal().getTypePtrOrNull()),
@@ -66,7 +97,7 @@ ApproximateNameResolver::tryResolveMember(
     }
     cxxRecordDecl = cxxRecordDecl->getDefinition();
     auto lookupResults =
-        cxxRecordDecl->lookupDependentName(declNameInfo.getName(), filter);
+        lookupDependentName(cxxRecordDecl, declNameInfo.getName(), filter);
     for (auto *namedDecl : lookupResults) {
       auto *unresolvedUsingValueDecl =
           llvm::dyn_cast<clang::UnresolvedUsingValueDecl>(namedDecl);

indexer/CompilationDatabase.cc

@@ -20,6 +20,7 @@
 #include "rapidjson/rapidjson.h"
 #include "rapidjson/reader.h"
 #include "spdlog/fmt/fmt.h"
+#include "spdlog/fmt/ranges.h"
 
 #include "indexer/CommandLineCleaner.h"
 #include "indexer/CompilationDatabase.h"
@@ -97,7 +98,7 @@ struct ClangToolchainInfo : public ToolchainInfo {
         findResourceDirInvocation(findResourceDirInvocation),
         compilerDriverPath(compilerDriverPath),
         findDriverInvocation(findDriverInvocation),
-        cleaner(std::move(cleaner)){};
+        cleaner(std::move(cleaner)) {};
 
   virtual CompilerKind kind() const override {
     return CompilerKind::Clang;

indexer/DebugHelpers.cc

@@ -175,7 +175,6 @@ std::string formatKind(clang::NestedNameSpecifier::SpecifierKind kind) {
     HANDLE_KIND(Namespace)
     HANDLE_KIND(NamespaceAlias)
     HANDLE_KIND(TypeSpec)
-    HANDLE_KIND(TypeSpecWithTemplate)
     HANDLE_KIND(Global)
     HANDLE_KIND(Super)
   }

indexer/Driver.cc

@@ -31,6 +31,7 @@
 #include "rapidjson/error/en.h"
 #include "rapidjson/filereadstream.h"
 #include "spdlog/fmt/fmt.h"
+#include "spdlog/fmt/ranges.h"
 #include "spdlog/sinks/stdout_sinks.h"
 #include "spdlog/spdlog.h"
 
@@ -231,8 +232,8 @@ struct DriverOptions {
         projectRootPath(AbsolutePath("/"), RootKind::Project), compdbPath(),
         indexOutputPath(), statsFilePath(), packageMapPath(),
         showCompilerDiagnostics(cliOpts.showCompilerDiagnostics),
-        showProgress(cliOpts.showProgress), ipcOptions{cliOpts.ipcSizeHintBytes,
-                                                       cliOpts.receiveTimeout},
+        showProgress(cliOpts.showProgress),
+        ipcOptions{cliOpts.ipcSizeHintBytes, cliOpts.receiveTimeout},
         numWorkers(cliOpts.numWorkers), deterministic(cliOpts.deterministic),
         preprocessorRecordHistoryFilterRegex(
             cliOpts.preprocessorRecordHistoryFilterRegex),
@@ -257,7 +258,7 @@ struct DriverOptions {
                 : (llvm::sys::path::is_absolute(path)
                        ? AbsolutePath(std::string(path))
                        : this->projectRootPath.makeAbsolute(
-                           RootRelativePathRef(path, RootKind::Project)));
+                             RootRelativePathRef(path, RootKind::Project)));
     };
 
     // Strictly speaking, there is a TOCTOU problem here, as scip-clang

indexer/Indexer.cc

@@ -530,7 +530,7 @@ void TuIndexer::saveFunctionDecl(const clang::FunctionDecl &functionDecl) {
   }
   auto symbol = optSymbol.value();
 
-  if (functionDecl.isPure() || functionDecl.isThisDeclarationADefinition()) {
+  if (functionDecl.isPureVirtual() || functionDecl.isThisDeclarationADefinition()) {
     scip::SymbolInformation symbolInfo{};
     this->getDocComment(functionDecl).addTo(symbolInfo);
     if (auto *cxxMethodDecl =
@@ -671,33 +671,6 @@ void TuIndexer::saveNestedNameSpecifierLoc(
     case Kind::NamespaceAlias:
     case Kind::Global:
     case Kind::Super:
-    case Kind::TypeSpecWithTemplate:
-      // FIXME(def: template-specialization-support)
-      // Adding support for TypeSpecWithTemplate needs extra care
-      // for (partial) template specializations. Example code:
-      //
-      //   template <typename T0>
-      //   struct X {
-      //     template <typename T1>
-      //     struct Y {};
-      //   };
-      //
-      //   template <>
-      //   struct X {
-      //     template <typename A>
-      //     struct Y { int[42] magic; };
-      //   };
-      //
-      //   template <typename U0> void f() {
-      //     typename X<U0>::template Y<U0> y{};
-      //                   //^^^^^^^^^^^^^^ TypeSpecWithTemplate
-      //     std::cout << sizeof(y) << '\n';
-      //   }
-      //
-      // In 'template Y<U0>', clangd will navigate to 'Y' in the body of 'X',
-      // even when there is partial template specialization of X
-      // (so calling f<int>() will print a different value).
-      // Ideally, we should surface such specializations too.
       break;
     }
     nameSpecLoc = nameSpecLoc.getPrefix();

indexer/Indexer.h

@@ -80,7 +80,6 @@ struct FileLocalSourceRange {
                       r.endLine);
   }
   DERIVE_CMP_ALL(FileLocalSourceRange)
-  DERIVE_EQ_ALL(FileLocalSourceRange)
 
   static std::pair<FileLocalSourceRange, clang::FileID>
   fromNonEmpty(const clang::SourceManager &, clang::SourceRange inclusiveRange);

indexer/JsonIpcQueue.h

@@ -11,7 +11,6 @@
 #include "boost/interprocess/ipc/message_queue.hpp"
 #pragma clang diagnostic pop
 
-#include "llvm/ADT/Optional.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/JSON.h"
 #include "llvm/Support/raw_ostream.h"

indexer/PackageMap.cc

@@ -64,7 +64,7 @@ PackageMap::PackageMap(const RootPath &projectRootPath,
 
 void PackageMap::populate(const StdPath &packageMapPath) {
   std::error_code error;
-  auto path = std::string_view(packageMapPath.c_str());
+  std::string path(packageMapPath.c_str());
   if (!llvm::sys::fs::exists(path)) {
     spdlog::error("package map not found at path: {}", path);
     std::exit(EXIT_FAILURE);