Update ROOT's llvm to llvm13.

CMakeLists.txt

@@ -41,6 +41,7 @@ project(ROOT)
 set(ENV{LANG} C)
 
 #---Set paths where to put the libraries, executables and headers------------------------------
+file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/lib) # prevent mkdir races
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

bindings/pyroot/cppyy/CPyCppyy/src/ProxyWrappers.cxx

@@ -364,9 +364,9 @@ static int BuildScopeProxyDict(Cppyy::TCppScope_t scope, PyObject* pyclass)
 
             PyErr_Clear();
 
-        // it could still be that this is an anonymous enum, which is not in the list
+        // it could still be that this is an unnamed enum, which is not in the list
         // provided by the class
-            if (strstr(Cppyy::GetDatamemberType(scope, idata).c_str(), "(anonymous)") != 0) {
+            if (strstr(Cppyy::GetDatamemberType(scope, idata).c_str(), "(unnamed)") != 0) {
                 AddPropertyToClass(pyclass, scope, idata);
                 continue;
             }

bindings/pyroot/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx

@@ -448,7 +448,7 @@ std::string Cppyy::ResolveEnum(const std::string& enum_type)
 
 // desugar the type before resolving
     std::string et_short = TClassEdit::ShortType(enum_type.c_str(), 1);
-    if (et_short.find("(anonymous") == std::string::npos) {
+    if (et_short.find("(unnamed") == std::string::npos) {
         std::ostringstream decl;
     // TODO: now presumed fixed with https://sft.its.cern.ch/jira/browse/ROOT-6988
         for (auto& itype : {"unsigned int"}) {
@@ -2123,7 +2123,7 @@ bool Cppyy::IsEnumData(TCppScope_t scope, TCppIndex_t idata)
         std::string ti = m->GetTypeName();
 
     // can't check anonymous enums by type name, so just accept them as enums
-        if (ti.rfind("(anonymous)") != std::string::npos)
+        if (ti.rfind("(unnamed)") != std::string::npos)
             return m->Property() & kIsEnum;
 
     // since there seems to be no distinction between data of enum type and enum values,

bindings/pyroot/pythonizations/test/CMakeLists.txt

@@ -113,7 +113,9 @@ if (dataframe)
         ROOT_ADD_PYUNITTEST(pyroot_pyz_rdataframe_makenumpy rdataframe_makenumpy.py PYTHON_DEPS numpy)
     endif()
     if(NOT MSVC OR win_broken_tests OR CMAKE_CXX_STANDARD GREATER 14)
-        ROOT_ADD_PYUNITTEST(pyroot_pyz_rdataframe_asnumpy rdataframe_asnumpy.py PYTHON_DEPS numpy)
+        if(NOT MSVC OR ${LLVM_VERSION} VERSION_LESS 13.0.0 OR llvm13_broken_tests)
+            ROOT_ADD_PYUNITTEST(pyroot_pyz_rdataframe_asnumpy rdataframe_asnumpy.py PYTHON_DEPS numpy)
+        endif()
         ROOT_ADD_PYUNITTEST(pyroot_pyz_rdataframe_histo_profile rdataframe_histo_profile.py)
     endif()
 endif()

bindings/pyroot_legacy/src/RootWrapper.cxx

@@ -398,9 +398,9 @@ static int BuildScopeProxyDict( Cppyy::TCppScope_t scope, PyObject* pyclass ) {
 
          PyErr_Clear();
 
-      // it could still be that this is an anonymous enum, which is not in the list
+      // it could still be that this is an unnamed enum, which is not in the list
       // provided by the class
-         if ( strstr( Cppyy::GetDatamemberType( scope, idata ).c_str(), "(anonymous)" ) != 0 ) {
+         if ( strstr( Cppyy::GetDatamemberType( scope, idata ).c_str(), "(unnamed)" ) != 0 ) {
             AddPropertyToClass( pyclass, scope, idata );
             continue;
          }

builtins/zlib/CMakeLists.txt

@@ -126,7 +126,7 @@ endif()
 
 add_library(ZLIB::ZLIB ALIAS ZLIB)
 
-set(ZLIB_LIBRARY $<TARGET_FILE:ZLIB> CACHE INTERNAL "")
+set(ZLIB_LIBRARY $<TARGET_FILE:ZLIB::ZLIB> CACHE INTERNAL FORCE "")
 set(ZLIB_LIBRARIES ZLIB::ZLIB CACHE INTERNAL "")
 
 if(DEFINED ZLIB_LIBRARY_DEBUG)

cmake/modules/RootBuildOptions.cmake

@@ -191,6 +191,7 @@ ROOT_BUILD_OPTION(vdt ON "Enable support for VDT (fast and vectorisable mathemat
 ROOT_BUILD_OPTION(veccore OFF "Enable support for VecCore SIMD abstraction library")
 ROOT_BUILD_OPTION(vecgeom OFF "Enable support for VecGeom vectorized geometry library")
 ROOT_BUILD_OPTION(win_broken_tests OFF "Enable broken tests on Windows")
+ROOT_BUILD_OPTION(llvm13_broken_tests OFF "Enable broken tests with LLVM 13 on Windows")
 ROOT_BUILD_OPTION(winrtdebug OFF "Link against the Windows debug runtime library")
 ROOT_BUILD_OPTION(x11 ON "Enable support for X11/Xft")
 ROOT_BUILD_OPTION(xml ON "Enable support for XML (requires libxml2)")

cmake/modules/SetUpWindows.cmake

@@ -45,6 +45,9 @@ elseif(MSVC)
     if(win_broken_tests)
       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DR__ENABLE_BROKEN_WIN_TESTS")
     endif()
+    if(llvm13_broken_tests)
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DR__ENABLE_LLVM13_BROKEN_TESTS")
+    endif()
   else()
     set(CMAKE_CXX_FLAGS "-nologo -FIw32pragma.h -FIsehmap.h ${BLDCXXFLAGS} -EHsc- -W3 -wd4244 -D_WIN32 ${ARCH}")
     set(CMAKE_C_FLAGS   "-nologo -FIw32pragma.h -FIsehmap.h ${BLDCFLAGS} -EHsc- -W3 -D_WIN32 ${ARCH}")

core/base/src/TApplication.cxx

@@ -823,7 +823,7 @@ GetUrlForDataMember(const TString &scopeName, const TString &dataMemberName, TDa
    // We create a TString with the name of the scope and the enumeration from which the enumerator is.
    TString scopeEnumeration = dataMember->GetTrueTypeName();
    TString md5EnumClass;
-   if (scopeEnumeration.Contains("(anonymous)")) {
+   if (scopeEnumeration.Contains("(unnamed)")) {
       // FIXME: need to investigate the numbering scheme.
       md5EnumClass.Append(scopeName);
       md5EnumClass.Append("::@1@1");

core/clingutils/res/TClingUtils.h

@@ -569,6 +569,24 @@ std::string GetModuleFileName(const char* moduleName);
 // that can be used in C++ as a variable name.
 void GetCppName(std::string &output, const char *input);
 
+//______________________________________________________________________________
+// Demangle the input symbol name for dlsym.
+static inline std::string DemangleNameForDlsym(const std::string& name)
+{
+   std::string nameForDlsym = name;
+
+#ifdef R__MACOSX
+   // The JIT gives us a mangled name which has an additional leading underscore
+   // macOS, for instance __ZN8TRandom34RndmEv. However, dlsym requires us to
+   // remove it.
+   // FIXME: get this information from the DataLayout via getGlobalPrefix()!
+   if (nameForDlsym[0] == '_')
+      nameForDlsym.erase(0, 1);
+#endif //R__MACOSX
+
+   return nameForDlsym;
+}
+
 //______________________________________________________________________________
 // Return the type with all parts fully qualified (most typedefs),
 // including template arguments, appended to name.

core/clingutils/src/TClingUtils.cxx

@@ -1380,7 +1380,7 @@ void ROOT::TMetaUtils::GetQualifiedName(std::string &qual_name, const clang::Nam
    cl.getNameForDiagnostic(stream,policy,true);
    stream.flush(); // flush to string.
 
-   if ( qual_name ==  "(anonymous " ) {
+   if ( qual_name ==  "(anonymous " || qual_name ==  "(unnamed" ) {
       size_t pos = qual_name.find(':');
       qual_name.erase(0,pos+2);
    }
@@ -1622,7 +1622,7 @@ int ROOT::TMetaUtils::extractAttrString(clang::Attr* attribute, std::string& att
       //TMetaUtils::Error(0,"Could not cast Attribute to AnnotatedAttribute\n");
       return 1;
    }
-   attrString = annAttr->getAnnotation();
+   attrString = annAttr->getAnnotation().str();
    return 0;
 }
 
@@ -1669,7 +1669,7 @@ bool ROOT::TMetaUtils::ExtractAttrPropertyFromName(const clang::Decl& decl,
       std::pair<llvm::StringRef,llvm::StringRef> split = attribute.split(propNames::separator.c_str());
       if (split.first != propName.c_str()) continue;
       else {
-         propValue = split.second;
+         propValue = split.second.str();
          return true;
       }
    }
@@ -2590,14 +2590,12 @@ ROOT::TMetaUtils::GetTrivialIntegralReturnValue(const clang::FunctionDecl *funcC
    // ClassDef argument. It's usually just be an integer literal but it could
    // also be an enum or a variable template for all we know.
    // Go through ICE to be more general.
-   llvm::APSInt RetRes;
-   if (!RetExpr->isIntegerConstantExpr(RetRes, funcCV->getASTContext()))
-      return res_t{false, -1};
-   if (RetRes.isSigned()) {
-      return res_t{true, (Version_t)RetRes.getSExtValue()};
+   if (auto RetRes = RetExpr->getIntegerConstantExpr(funcCV->getASTContext())) {
+      if (RetRes->isSigned())
+         return res_t{true, (Version_t)RetRes->getSExtValue()};
+      return res_t{true, (Version_t)RetRes->getZExtValue()};
    }
-   // else
-   return res_t{true, (Version_t)RetRes.getZExtValue()};
+   return res_t{false, -1};
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -3347,7 +3345,7 @@ std::string ROOT::TMetaUtils::GetFileName(const clang::Decl& decl,
       // use HeaderSearch on the basename, to make sure it takes a header from
       // the include path (e.g. not from /usr/include/bits/)
       assert(headerFE && "Couldn't find FileEntry from FID!");
-      const FileEntry *FEhdr
+      auto FEhdr
          = HdrSearch.LookupFile(llvm::sys::path::filename(headerFE->getName()),
                                 SourceLocation(),
                                 true /*isAngled*/, 0/*FromDir*/, foundDir,
@@ -3392,7 +3390,7 @@ std::string ROOT::TMetaUtils::GetFileName(const clang::Decl& decl,
    // points to the same file as the long version. If such a short version
    // exists it will be returned. If it doesn't the long version is returned.
    bool isAbsolute = llvm::sys::path::is_absolute(headerFileName);
-   const FileEntry* FELong = 0;
+   llvm::Optional<clang::FileEntryRef> FELong;
    // Find the longest available match.
    for (llvm::sys::path::const_iterator
            IDir = llvm::sys::path::begin(headerFileName),
@@ -3441,7 +3439,7 @@ std::string ROOT::TMetaUtils::GetFileName(const clang::Decl& decl,
                                0/*Searchpath*/, 0/*RelPath*/,
                                0/*SuggestedModule*/, 0/*RequestingModule*/,
                                0/*IsMapped*/, nullptr /*IsFrameworkFound*/) == FELong) {
-         return trailingPart;
+         return trailingPart.str();
       }
    }
 
@@ -3675,7 +3673,8 @@ static bool areEqualValues(const clang::TemplateArgument& tArg,
    llvm::APSInt defaultValueAPSInt(64, false);
    if (Expr* defArgExpr = nttpd.getDefaultArgument()) {
       const ASTContext& astCtxt = nttpdPtr->getASTContext();
-      defArgExpr->isIntegerConstantExpr(defaultValueAPSInt, astCtxt);
+      if (auto Value = defArgExpr->getIntegerConstantExpr(astCtxt))
+         defaultValueAPSInt = *Value;
    }
 
    const int value = tArg.getAsIntegral().getLimitedValue();
@@ -4609,8 +4608,9 @@ clang::QualType ROOT::TMetaUtils::ReSubstTemplateArg(clang::QualType input, cons
          QualType newQT= ReSubstTemplateArg(arr->getElementType(),instance);
 
          if (newQT == arr->getElementType()) return QT;
-         QT = Ctxt.getConstantArrayType (newQT,
+         QT = Ctxt.getConstantArrayType(newQT,
                                         arr->getSize(),
+                                        arr->getSizeExpr(),
                                         arr->getSizeModifier(),
                                         arr->getIndexTypeCVRQualifiers());
 
@@ -4723,7 +4723,7 @@ clang::QualType ROOT::TMetaUtils::ReSubstTemplateArg(clang::QualType input, cons
       } else {
          std::string astDump;
          llvm::raw_string_ostream ostream(astDump);
-         instance->dump(ostream);
+         instance->dump(ostream, Ctxt);
          ostream.flush();
          ROOT::TMetaUtils::Warning("ReSubstTemplateArg","Unexpected type of declaration context for template parameter: %s.\n\tThe responsible class is:\n\t%s\n",
                                    replacedDeclCtxt->getDeclKindName(), astDump.c_str());

core/dictgen/CMakeLists.txt

@@ -29,6 +29,12 @@ ROOT_OBJECT_LIBRARY(Dictgen
 
 add_dependencies(Dictgen CLING)
 
+if(NOT builtin_cling)
+  # FIXME: Resolve this once the ClangTargets.cmake allows us to specify the
+  # targets we need.
+  add_dependencies(Dictgen clang-tablegen-targets)
+endif()
+
 target_include_directories(Dictgen PRIVATE
   ${CMAKE_SOURCE_DIR}/core/dictgen/src
   ${CMAKE_SOURCE_DIR}/core/dictgen/res

core/dictgen/src/DictSelectionReader.cxx

@@ -359,7 +359,6 @@ bool DictSelectionReader::SecondPass(const clang::RecordDecl &recordDecl)
          // Now we take care of the transient and unsplittable members
          if (tInfo.fTransientMembers.empty() && tInfo.fUnsplittableMembers.empty()) continue;
          clang::ASTContext &C = recordDecl.getASTContext();
-         clang::SourceRange commentRange; // Empty: this is a fake comment
          std::string userDefinedProperty;
          userDefinedProperty.reserve(100);
          for (auto fieldPtr : recordDecl.fields()) {
@@ -370,7 +369,7 @@ bool DictSelectionReader::SecondPass(const clang::RecordDecl &recordDecl)
                userDefinedProperty = propNames::comment + propNames::separator + "||";
             }
             if (!userDefinedProperty.empty()) {
-               fieldPtr->addAttr(new(C) clang::AnnotateAttr(commentRange, C, userDefinedProperty, 0));
+               fieldPtr->addAttr(clang::AnnotateAttr::CreateImplicit(C, userDefinedProperty));
                userDefinedProperty = "";
             }
          }

core/dictgen/src/LinkdefReader.cxx

@@ -768,7 +768,7 @@ class PragmaExtraInclude : public LinkdefReaderPragmaHandler {
       } else {
          llvm::StringRef include(start, fSourceManager.getCharacterData(end.getLocation()) - start + end.getLength());
 
-         if (!fOwner.AddInclude(include)) {
+         if (!fOwner.AddInclude(include.str())) {
             Error("", tok);
          }
       }
@@ -926,7 +926,7 @@ class PragmaLinkCollector : public LinkdefReaderPragmaHandler {
       } else {
          llvm::StringRef identifier(start, fSourceManager.getCharacterData(end.getLocation()) - start + end.getLength());
 
-         if (!fOwner.AddRule(type, identifier, linkOn, false, options.get())) {
+         if (!fOwner.AddRule(type.str(), identifier.str(), linkOn, false, options.get())) {
             Error(type.data(), tok, false);
          }
       }
@@ -985,7 +985,7 @@ class PragmaCreateCollector : public LinkdefReaderPragmaHandler {
 
       llvm::StringRef identifier(start, fSourceManager.getCharacterData(end.getLocation()) - start + end.getLength());
 
-      if (!fOwner.AddRule("class", identifier, true, true)) {
+      if (!fOwner.AddRule("class", identifier.str(), true, true)) {
          Error("", tok);
       }
 

core/dictgen/src/Scanner.cxx

@@ -152,7 +152,7 @@ inline long APIntToLong(const llvm::APInt& num)
 
 inline std::string APIntToStr(const llvm::APInt& num)
 {
-   return num.toString(10, true);
+   return llvm::toString(num, /*radix*/10, /*signed*/true);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -742,7 +742,7 @@ bool RScanner::TreatRecordDeclOrTypedefNameDecl(clang::TypeDecl* typeDecl)
          auto previouslyMatchingRule = (const ClassSelectionRule*)declSelRuleMapIt->second;
          int previouslineno = previouslyMatchingRule->GetLineNumber();
 
-         std::string cleanFileName =  llvm::sys::path::filename(selected->GetSelFileName());
+         std::string cleanFileName =  llvm::sys::path::filename(selected->GetSelFileName()).str();
          auto lineno = selected->GetLineNumber();
          auto rulesAreCompatible = SelectionRulesUtils::areEqual<ClassSelectionRule>(selected, previouslyMatchingRule, true /*moduloNameOrPattern*/);
          if (!rulesAreCompatible){

core/dictgen/src/TModuleGenerator.cxx

@@ -116,7 +116,7 @@ TModuleGenerator::GetSourceFileKind(const char *filename) const
       clang::Preprocessor &PP = fCI->getPreprocessor();
       clang::HeaderSearch &HdrSearch = PP.getHeaderSearchInfo();
       const clang::DirectoryLookup *CurDir = nullptr;
-      const clang::FileEntry *hdrFileEntry
+      auto hdrFileEntry
          =  HdrSearch.LookupFile(filename, clang::SourceLocation(),
                                  true /*isAngled*/, nullptr /*FromDir*/, CurDir,
                                  clang::ArrayRef<std::pair<const clang::FileEntry*,
@@ -578,15 +578,15 @@ bool TModuleGenerator::FindHeader(const std::string &hdrName, std::string &hdrFu
    clang::Preprocessor &PP = fCI->getPreprocessor();
    clang::HeaderSearch &HdrSearch = PP.getHeaderSearchInfo();
    const clang::DirectoryLookup *CurDir = nullptr;
-   if (const clang::FileEntry *hdrFileEntry
+   if (auto hdrFileEntry
          =  HdrSearch.LookupFile(hdrName, clang::SourceLocation(),
                                  true /*isAngled*/, nullptr /*FromDir*/, CurDir,
                                  clang::ArrayRef<std::pair<const clang::FileEntry*,
                                                          const clang::DirectoryEntry*>>(),
                                  nullptr /*SearchPath*/, nullptr /*RelativePath*/,
                                  nullptr /*RequestingModule*/, nullptr/*SuggestedModule*/,
                                  nullptr /*IsMapped*/, nullptr /*IsFrameworkFound*/)) {
-      hdrFullPath = hdrFileEntry->getName();
+      hdrFullPath = hdrFileEntry->getName().str();
       return true;
    }