Update ROOT and Cling to LLVM22

.github/workflows/llvm-diff.yml

@@ -26,7 +26,7 @@
           path: llvm-project
       - name: Delete directories and files in llvm-project
         working-directory: llvm-project
         run: |
           for d in bindings benchmark benchmarks gn test tests unittest unittests; do
             find . -name $d -prune -exec rm -r "{}" \;
           done
@@ -34,5 +34,9 @@
           for f in $(ls -A); do
             [ -e ../root/interpreter/llvm-project/$f ] || rm -r $f
           done
+          # Only compare what is already there in third-party
+          for f in $(ls -A third-party); do
+            [ -e ../root/interpreter/llvm-project/third-party/$f ] || rm -r third-party/$f
+          done
       - name: Compare
         run: diff -ur llvm-project/ root/interpreter/llvm-project/

.github/workflows/root-ci-config/buildconfig/fedora43.txt

@@ -1,5 +1,5 @@
 CMAKE_CXX_STANDARD=23
-experimental_adaptivecpp=ON
+experimental_adaptivecpp=OFF
 pythia8=ON
 roofit_multiprocess=ON
 test_distrdf_dask=OFF

.github/workflows/root-ci-config/buildconfig/fedora44.txt

@@ -1,5 +1,5 @@
 CMAKE_CXX_STANDARD=23
-experimental_adaptivecpp=ON
+experimental_adaptivecpp=OFF
 pythia8=ON
 roofit_multiprocess=ON
 test_distrdf_pyspark=OFF

.github/workflows/root-ci-config/buildconfig/ubuntu2404-cuda.txt

@@ -1,7 +1,7 @@
 CMAKE_BUILD_TYPE=RelWithDebInfo
 cuda=ON
-experimental_adaptivecpp=ON
-experimental_genvectorx=ON
+experimental_adaptivecpp=OFF
+experimental_genvectorx=OFF
 gdml=OFF
 spectrum=OFF
 sqlite=OFF

.github/workflows/root-ci-config/buildconfig/ubuntu2404.txt

@@ -1,2 +1,2 @@
-experimental_adaptivecpp=ON
-experimental_genvectorx=ON
+experimental_adaptivecpp=OFF
+experimental_genvectorx=OFF

bindings/pyroot/cppyy/cppyy/test/test_templates.py

@@ -351,7 +351,6 @@ def test13_using_templated_method(self):
         assert type(d.get3()) == int
         assert d.get3() == 5
 
-    @mark.xfail(strict=True)
     def test14_templated_return_type(self):
         """Use of a templated return type"""
 

core/clingutils/res/TClingUtils.h

@@ -67,6 +67,7 @@ namespace clang {
    class Type;
    class TypeDecl;
    class TypedefNameDecl;
+   enum class ElaboratedTypeKeyword;
    struct PrintingPolicy;
 }
 
@@ -754,7 +755,7 @@ clang::QualType ReSubstTemplateArg(clang::QualType input, const clang::Type *ins
 int RemoveTemplateArgsFromName(std::string& name, unsigned int);
 
 //______________________________________________________________________________
-clang::TemplateName ExtractTemplateNameFromQualType(const clang::QualType& qt);
+void ExtractTemplateNameFromQualType(const clang::QualType& qt, clang::TemplateName& theTemplateName, clang::ElaboratedTypeKeyword& theKeyword);
 
 //______________________________________________________________________________
 bool QualType2Template(const clang::QualType& qt,

core/dictgen/src/DictSelectionReader.cxx

@@ -251,7 +251,7 @@ bool DictSelectionReader::FirstPass(const clang::RecordDecl &recordDecl)
 {
    std::string className;
    ROOT::TMetaUtils::GetQualifiedName(
-      className, *recordDecl.getTypeForDecl(), recordDecl);
+      className, recordDecl.getASTContext().getCanonicalTagType(&recordDecl), recordDecl);
 
    // Strip ROOT::Meta::Selection
    className.replace(0, 23, "");
@@ -312,7 +312,7 @@ bool DictSelectionReader::SecondPass(const clang::RecordDecl &recordDecl)
    if (InSelectionNamespace(recordDecl)) return true;
 
    std::string className;
-   GetQualifiedName(className, *recordDecl.getTypeForDecl(), recordDecl);
+   GetQualifiedName(className, recordDecl.getASTContext().getCanonicalTagType(&recordDecl), recordDecl);
 
    // If the class is not among those which have fields the type of which are to
    // be autoselected or excluded

core/dictgen/src/Scanner.cxx

@@ -544,7 +544,7 @@ int RScanner::AddAnnotatedRecordDecl(const ClassSelectionRule* selected,
        0 != ROOT::TMetaUtils::GetClassVersion(recordDecl,fInterpreter)) {
       std::string normName;
       TMetaUtils::GetNormalizedName(normName,
-                                    recordDecl->getASTContext().getTypeDeclType(recordDecl),
+                                    recordDecl->getASTContext().getCanonicalTagType(recordDecl),
                                     fInterpreter,
                                     fNormCtxt);
       ROOT::TMetaUtils::Error(nullptr,"Union %s has been selected for I/O. This is not supported. Interactive usage of unions is supported, as all C++ entities, without the need of dictionaries.\n",normName.c_str());
@@ -586,7 +586,7 @@ int RScanner::AddAnnotatedRecordDecl(const ClassSelectionRule* selected,
       GetDeclQualName(recordDecl,qual_name);
       std::string normName;
       TMetaUtils::GetNormalizedName(normName,
-                                    recordDecl->getASTContext().getTypeDeclType(recordDecl),
+                                    recordDecl->getASTContext().getCanonicalTagType(recordDecl),
                                     fInterpreter,
                                     fNormCtxt);
       std::string typedef_qual_name;
@@ -740,7 +740,7 @@ bool RScanner::TreatRecordDeclOrTypedefNameDecl(clang::TypeDecl* typeDecl)
             declSelRuleMapIt->second != selected) {
          std::string normName;
          TMetaUtils::GetNormalizedName(normName,
-                                       recordDecl->getASTContext().getTypeDeclType(recordDecl),
+                                       recordDecl->getASTContext().getCanonicalTagType(recordDecl),
                                        fInterpreter,
                                        fNormCtxt);
 
@@ -781,7 +781,7 @@ bool RScanner::TreatRecordDeclOrTypedefNameDecl(clang::TypeDecl* typeDecl)
       if (!isFileSelection) {
          std::string normName;
          TMetaUtils::GetNormalizedName(normName,
-                                       recordDecl->getASTContext().getTypeDeclType(recordDecl),
+                                       recordDecl->getASTContext().getCanonicalTagType(recordDecl),
                                        fInterpreter,
                                        fNormCtxt);
          auto msg = "Class or struct %s was selected but its dictionary cannot be generated: "
@@ -817,7 +817,7 @@ void RScanner::AddDelayedAnnotatedRecordDecls()
    for (auto &&info: fDelayedAnnotatedRecordDecls) {
       const clang::Type *thisType = info.fSelected->GetRequestedType();
       if (!thisType)
-         thisType = info.fDecl->getTypeForDecl();
+         thisType = info.fDecl->getASTContext().getCanonicalTagType(info.fDecl)->getTypePtr();
       const clang::CXXRecordDecl *recordDecl = info.fDecl;
       auto nameTypeForIO = ROOT::TMetaUtils::GetNameTypeForIO(clang::QualType(thisType, 0), fInterpreter, fNormCtxt);
       auto typeForIO = nameTypeForIO.second;

core/dictgen/src/rootcling_impl.cxx

@@ -1869,7 +1869,7 @@ static bool WriteAST(llvm::StringRef fileName, clang::CompilerInstance *compiler
    // From PCHGenerator and friends:
    llvm::SmallVector<char, 128> buffer;
    llvm::BitstreamWriter stream(buffer);
-   clang::ASTWriter writer(stream, buffer, compilerInstance->getModuleCache(), /*Extensions=*/{});
+   clang::ASTWriter writer(stream, buffer, compilerInstance->getModuleCache(), compilerInstance->getCodeGenOpts(), /*Extensions=*/{});
    std::unique_ptr<llvm::raw_ostream> out =
       compilerInstance->createOutputFile(fileName, /*Binary=*/true,
                                          /*RemoveFileOnSignal=*/false,
@@ -4305,9 +4305,13 @@ int RootClingMain(int argc,
       ROOT::TMetaUtils::Info(nullptr, "== Language Options\n");
       const clang::LangOptions& LangOpts
          = interp.getCI()->getASTContext().getLangOpts();
-#define LANGOPT(Name, Bits, Default, Description) \
+
+      // FIXME: Replace with C++20 `using enum LangOptions::CompatibilityKind`.
+      using CK = clang::LangOptions::CompatibilityKind;
+#define LANGOPT(Name, Bits, Default, Compatibility, Description) \
+   if constexpr (CK::Compatibility != CK::Benign)                \
       ROOT::TMetaUtils::Info(nullptr, "%s = %d // %s\n", #Name, (int)LangOpts.Name, Description);
-#define ENUM_LANGOPT(Name, Type, Bits, Default, Description)
+#define ENUM_LANGOPT(Name, Type, Bits, Default, Compatibility, Description)
 #include "clang/Basic/LangOptions.def"
       ROOT::TMetaUtils::Info(nullptr, "==== END interpreter configuration ====\n\n");
    }

core/metacling/src/TCling.cxx

@@ -1971,7 +1971,7 @@ bool TCling::RegisterPrebuiltModulePath(const std::string &FullPath,
    // We should look for modulemap files there too.
    if (auto DE = FM.getOptionalDirectoryRef(FullPath)) {
       HeaderSearch &HS = PP.getHeaderSearchInfo();
-      HeaderSearchOptions &HSOpts = HS.getHeaderSearchOpts();
+      HeaderSearchOptions &HSOpts = const_cast<HeaderSearchOptions&>(HS.getHeaderSearchOpts());
       const auto &ModPaths = HSOpts.PrebuiltModulePaths;
       bool pathExists = std::find(ModPaths.begin(), ModPaths.end(), FullPath) != ModPaths.end();
       if (!pathExists)
@@ -1984,7 +1984,7 @@ bool TCling::RegisterPrebuiltModulePath(const std::string &FullPath,
       llvm::sys::path::append(ModuleMapFileName, ModuleMapName);
       if (auto FE = FM.getOptionalFileRef(ModuleMapFileName, /*openFile*/ false,
                                           /*CacheFailure*/ false)) {
-         if (!HS.loadModuleMapFile(*FE, /*IsSystem*/ false))
+         if (!HS.parseAndLoadModuleMapFile(*FE, /*IsSystem*/ false))
             return true;
          Error("RegisterPrebuiltModulePath", "Could not load modulemap in %s", ModuleMapFileName.c_str());
       }
@@ -5200,11 +5200,11 @@ void TCling::GetFunctionOverloads(ClassInfo_t *cl, const char *funcname,
 
    if (RecDecl) {
       if (RecDecl->getNameAsString() == funcname) {
-         clang::QualType QT = Ctx.getTypeDeclType(RecDecl);
-         DName = Ctx.DeclarationNames.getCXXConstructorName(Ctx.getCanonicalType(QT));
+         clang::CanQualType QT = Ctx.getCanonicalTagType(RecDecl);
+         DName = Ctx.DeclarationNames.getCXXConstructorName(QT);
       } else if (funcname[0] == '~' && RecDecl->getNameAsString() == funcname + 1) {
-         clang::QualType QT = Ctx.getTypeDeclType(RecDecl);
-         DName = Ctx.DeclarationNames.getCXXDestructorName(Ctx.getCanonicalType(QT));
+         clang::CanQualType QT = Ctx.getCanonicalTagType(RecDecl);
+         DName = Ctx.DeclarationNames.getCXXDestructorName(QT);
       } else {
          DName = &Ctx.Idents.get(funcname);
       }
@@ -6860,7 +6860,7 @@ void TCling::UpdateClassInfoWithDecl(const NamedDecl* ND)
          return;
       }
 
-      clang::QualType type(tdDef->getTypeForDecl(), 0);
+      clang::QualType type = tdDef->getASTContext().getCanonicalTagType(tdDef);
       ROOT::TMetaUtils::GetNormalizedName(name, type, *fInterpreter, *fNormalizedCtxt);
    } else if (ns) {
       canon = ns->getCanonicalDecl();
@@ -8904,7 +8904,7 @@ static void ConstructorName(std::string &name, const clang::Decl *decl,
    const clang::TypeDecl* td = llvm::dyn_cast<clang::TypeDecl>(decl->getDeclContext());
    if (!td) return;
 
-   clang::QualType qualType(td->getTypeForDecl(),0);
+   clang::QualType qualType = td->getASTContext().getTypeDeclType(td);
    ROOT::TMetaUtils::GetNormalizedName(name, qualType, interp, normCtxt);
    unsigned int level = 0;
    for(size_t cursor = name.length()-1; cursor != 0; --cursor) {

core/metacling/src/TClingCallFunc.cxx

@@ -114,6 +114,7 @@ EvaluateExpr(cling::Interpreter &interp, const Expr *E, cling::Value &V)
    // compilation and other string operations.
    PrintingPolicy Policy(C.getPrintingPolicy());
    Policy.SuppressTagKeyword = true;
+   Policy.SuppressTagKeywordInAnonNames = true; // Skip printing tags for anonymous entities
    Policy.SuppressUnwrittenScope = false;
    Policy.SuppressInitializers = false;
    Policy.AnonymousTagLocations = false;
@@ -157,10 +158,11 @@ static void GetDeclName(const clang::Decl *D, ASTContext &Context, std::string &
 
    PrintingPolicy Policy(Context.getPrintingPolicy());
    Policy.SuppressTagKeyword = true;
+   Policy.SuppressTagKeywordInAnonNames = true; // Skip printing tags for anonymous entities
    Policy.SuppressUnwrittenScope = true;
    if (const TypeDecl *TD = dyn_cast<TypeDecl>(D)) {
       // This is a class, struct, or union member.
-      QualType QT(TD->getTypeForDecl(), 0);
+      QualType QT = TD->getASTContext().getTypeDeclType(TD);
       GetTypeAsString(QT, name, Context, Policy);
    } else if (const NamedDecl *ND = dyn_cast<NamedDecl>(D)) {
       // This is a namespace member.
@@ -1123,7 +1125,7 @@ void TClingCallFunc::exec_with_valref_return(void *address, cling::Value &ret)
      R__LOCKGUARD_CLING(gInterpreterMutex);
      ASTContext &Context = FD->getASTContext();
      const TypeDecl *TD = dyn_cast<TypeDecl>(GetDeclContext());
-     QualType ClassTy(TD->getTypeForDecl(), 0);
+     QualType ClassTy = TD->getASTContext().getTypeDeclType(TD);
      QT = Context.getLValueReferenceType(ClassTy);
      ret = cling::Value(QT, *fInterp);
    } else {

core/metacling/src/TClingCallbacks.cxx

@@ -531,7 +531,7 @@ bool TClingCallbacks::LookupObject(clang::TagDecl* Tag) {
       const ROOT::TMetaUtils::TNormalizedCtxt* tNormCtxt = nullptr;
       TCling__GetNormalizedContext(tNormCtxt);
       ROOT::TMetaUtils::GetNormalizedName(Name,
-                                          C.getTypeDeclType(RD),
+                                          C.getCanonicalTagType(RD),
                                           *m_Interpreter,
                                           *tNormCtxt);
       // Autoparse implies autoload

core/metacling/src/TClingClassInfo.cxx

@@ -100,9 +100,8 @@ TClingClassInfo::TClingClassInfo(cling::Interpreter *interp, const char *name, b
       }
    }
    if (!decl && type) {
-      const TagType *tagtype =type->getAs<TagType>();
-      if (tagtype) {
-         decl = tagtype->getDecl();
+      if (const auto *TD = type->getAsTagDecl()) {
+         decl = TD;
       }
    }
    SetDecl(decl);
@@ -747,9 +746,8 @@ void TClingClassInfo::Init(const char *name)
       }
    }
    if (!GetDecl() && fType) {
-      const TagType *tagtype =fType->getAs<TagType>();
-      if (tagtype) {
-         SetDecl(tagtype->getDecl());
+      if (const auto *TD = fType->getAsTagDecl()) {
+         SetDecl(TD);
       }
    }
 }
@@ -777,11 +775,9 @@ void TClingClassInfo::Init(const Type &tag)
 
    R__LOCKGUARD(gInterpreterMutex);
 
-   const TagType *tagtype = fType->getAs<TagType>();
-   if (tagtype) {
-      SetDecl(tagtype->getDecl());
-   }
-   else {
+   if (const auto *TD = fType->getAsTagDecl()) {
+      SetDecl(TD);
+   } else {
       SetDecl(nullptr);
    }
    if (!GetDecl()) {
@@ -1052,7 +1048,7 @@ int TClingClassInfo::InternalNext()
             }
             if (const RecordDecl *RD =
                   llvm::dyn_cast<RecordDecl>(GetDecl())) {
-               fType = RD->getASTContext().getRecordType(RD).getTypePtr();
+               fType = RD->getASTContext().getCanonicalTagType(RD).getTypePtr();
             }
          }
          return 1;

core/metacling/src/TClingDiagnostics.cxx

@@ -13,7 +13,7 @@
 
 TClingDelegateDiagnosticPrinter::TClingDelegateDiagnosticPrinter
 (clang::DiagnosticOptions *DiagOpts, clang::LangOptions &LangOpts, handler_t fn)
-  : TextDiagnosticPrinter(fOS, DiagOpts), fOS(fOS_out), fHandler(fn)
+  : TextDiagnosticPrinter(fOS, *DiagOpts), fOS(fOS_out), fHandler(fn)
 {
    // Required to initialize the internal `clang::TextDiagnostic` instance.
    TextDiagnosticPrinter::BeginSourceFile(LangOpts, nullptr);

core/metacling/src/TClingMethodInfo.cxx

@@ -200,11 +200,14 @@ TClingCXXRecMethIter::InstantiateTemplateWithDefaults(const clang::RedeclarableT
    auto *FTD = const_cast<clang::FunctionTemplateDecl *>(llvm::dyn_cast<clang::FunctionTemplateDecl>(TD));
    Sema::InstantiatingTemplate Inst(
       S, Info.getLocation(), FTD,
-      defaultTemplateArgs, Sema::CodeSynthesisContext::DeducedTemplateArgumentSubstitution, Info);
+      defaultTemplateArgs, Sema::CodeSynthesisContext::DeducedTemplateArgumentSubstitution, SourceRange());
 
    // Collect the function arguments of the templated function, substituting
    // dependent types as possible.
    MultiLevelTemplateArgumentList MLTAL{FTD, defaultTemplateArgs, /*Final=*/false};
+   // LLVM22 (CWG2369): alias templates are now eagerly expanded during substitution, which can emit hard diagnostics
+   // for non-SFINAE-safe alias templates. Suppress them explicitly.
+   Sema::SFINAETrap Trap(S, /*WithAccessChecking=*/true);
    for (const clang::ParmVarDecl *param : templatedDecl->parameters()) {
       QualType paramType = param->getOriginalType();
 
@@ -580,7 +583,7 @@ TClingTypeInfo *TClingMethodInfo::Type() const
       if (!ctorClass) {
          Error("TClingMethodInfo::Type", "Cannot find DeclContext for constructor!");
       } else {
-         clang::QualType qt(ctorClass->getTypeForDecl(), 0);
+         clang::QualType qt = ctorClass->getASTContext().getTypeDeclType(ctorClass);
          ti.Init(qt);
       }
    } else {
@@ -632,7 +635,7 @@ const char *TClingMethodInfo::GetPrototype()
    R__LOCKGUARD(gInterpreterMutex);
    if (const clang::TypeDecl *td = llvm::dyn_cast<clang::TypeDecl>(GetDecl()->getDeclContext())) {
       std::string name;
-      clang::QualType qualType(td->getTypeForDecl(),0);
+      clang::QualType qualType = td->getASTContext().getTypeDeclType(td);
       ROOT::TMetaUtils::GetFullyQualifiedTypeName(name,qualType,*fInterp);
       buf += name;
       buf += "::";

core/metacling/src/TClingTypedefInfo.cxx

@@ -244,7 +244,7 @@ const char *TClingTypedefInfo::TrueName(const ROOT::TMetaUtils::TNormalizedCtxt
       return "bool";
    }
    const clang::ASTContext &ctxt = fInterp->getCI()->getASTContext();
-   ROOT::TMetaUtils::GetNormalizedName(truename, ctxt.getTypedefType(td), *fInterp, normCtxt);
+   ROOT::TMetaUtils::GetNormalizedName(truename, ctxt.getTypedefType(ElaboratedTypeKeyword::None, /*Qualifier=*/std::nullopt, td), *fInterp, normCtxt);
 
    return truename.c_str();  // NOLINT
 }
@@ -262,7 +262,7 @@ const char *TClingTypedefInfo::Name() const
 
    const clang::TypedefNameDecl *td = llvm::cast<clang::TypedefNameDecl>(fDecl);
    const clang::ASTContext &ctxt = td->getASTContext();
-   ROOT::TMetaUtils::GetFullyQualifiedTypeName(fNameCache, ctxt.getTypedefType(td), *fInterp);
+   ROOT::TMetaUtils::GetFullyQualifiedTypeName(fNameCache, ctxt.getTypedefType(ElaboratedTypeKeyword::None, /*Qualifier=*/std::nullopt, td), *fInterp);
    return fNameCache.c_str();
 }
 

interpreter/CMakeLists.txt

@@ -43,7 +43,6 @@ else()
   set(LLVM_ENABLE_ZSTD FORCE_ON CACHE STRING "Always enabled because it's already a dependency of ROOT" FORCE)
 endif()
 set(CLANG_ENABLE_STATIC_ANALYZER OFF CACHE BOOL "")
-set(CLANG_ENABLE_ARCMT OFF CACHE BOOL "")
 set(LLVM_INCLUDE_TESTS OFF CACHE BOOL "")
 set(LLVM_INCLUDE_BENCHMARKS OFF CACHE BOOL "")
 set(CLANG_INCLUDE_TESTS OFF CACHE BOOL "")
@@ -437,7 +436,7 @@ if (builtin_clang)
     ${CMAKE_CURRENT_SOURCE_DIR}/llvm-project/clang/include
     ${CLANG_BINARY_DIR}/include
     CACHE STRING "Clang include directories.")
-  set(CLANG_CMAKE_DIR "${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/")
+  set(CLANG_CMAKE_DIR "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/")
 else()
   find_package(Clang REQUIRED CONFIG)
   message(STATUS "Found Clang ${CLANG_PACKAGE_VERSION} in ${CLANG_CMAKE_DIR}")

interpreter/cling/include/cling/Interpreter/ClangInternalState.h

@@ -79,7 +79,7 @@ namespace cling {
     ///
     bool differentContent(const std::string& file1, const std::string& file2,
                           const char* type = nullptr, bool verbose = false,
-               const llvm::SmallVectorImpl<llvm::StringRef>* ignores = nullptr) const;
+               const llvm::SmallVectorImpl<std::string>* ignores = nullptr) const;
 
     ///\brief Return the llvm::Module this state is bound too.
     ///

interpreter/cling/include/cling/Interpreter/IncrementalCUDADeviceCompiler.h

@@ -99,7 +99,7 @@ namespace cling {
     /// paths.
     void addHeaderSearchPathFlags(
         std::vector<std::string>& argv,
-        const std::shared_ptr<clang::HeaderSearchOptions> &headerSearchOptions);
+        const clang::HeaderSearchOptions& headerSearchOptions);
 
     ///\brief Compiles a PTX file from the current input. The PTX code is
     /// written to cling.ptx.