[llvm] Update ROOT and Cling to LLVM22

Author: dpiparo

.github/workflows/llvm-diff.yml

@@ -34,5 +34,9 @@ jobs:
           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/clingutils/src/TClingUtils.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/DictSelectionReader.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;