Merge pull request #10294 from vgvassilev/llvm13

Update ROOT's llvm to llvm13.

Author: vgvassilev

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.