[WIP][C++][Gandiva] Upgrade LLVM to 21

.env

@@ -67,7 +67,7 @@ HDFS=3.2.1
 JDK=11
 KARTOTHEK=latest
 # LLVM 12 and GCC 11 reports -Wmismatched-new-delete.
-LLVM=18
+LLVM=21
 MAVEN=3.8.7
 NODE=20
 NUMBA=latest

ci/vcpkg/overlay/llvm/0001-fix-install-package-dir.patch

@@ -0,0 +1,13 @@
+ openmp/tools/Modules/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/openmp/tools/Modules/CMakeLists.txt b/openmp/tools/Modules/CMakeLists.txt
+index 22d818eea72d..75aacc4468d4 100644
+--- a/openmp/tools/Modules/CMakeLists.txt
++++ b/openmp/tools/Modules/CMakeLists.txt
+@@ -12,4 +12,4 @@
+
+
+ install(FILES "FindOpenMPTarget.cmake"
+-              DESTINATION "${OPENMP_INSTALL_LIBDIR}/cmake/openmp")
++              DESTINATION "share/openmp")

ci/vcpkg/overlay/llvm/0002-fix-tools-install-dir.patch

@@ -0,0 +1,205 @@
+ bolt/cmake/modules/AddBOLT.cmake                 | 2 +-
+ clang-tools-extra/clang-tidy/tool/CMakeLists.txt | 2 +-
+ clang-tools-extra/modularize/CMakeLists.txt      | 2 +-
+ clang/cmake/modules/AddClang.cmake               | 4 ++--
+ clang/tools/c-index-test/CMakeLists.txt          | 2 +-
+ clang/tools/clang-format/CMakeLists.txt          | 4 ++--
+ clang/tools/scan-build-py/CMakeLists.txt         | 4 ++--
+ clang/tools/scan-build/CMakeLists.txt            | 2 +-
+ clang/tools/scan-view/CMakeLists.txt             | 2 +-
+ flang/cmake/modules/AddFlang.cmake               | 2 +-
+ flang/tools/flang-driver/CMakeLists.txt          | 2 +-
+ lld/cmake/modules/AddLLD.cmake                   | 4 ++--
+ lldb/cmake/modules/AddLLDB.cmake                 | 2 +-
+ 13 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/bolt/cmake/modules/AddBOLT.cmake b/bolt/cmake/modules/AddBOLT.cmake
+index c7ac662c6b12..f5a7e7c01c66 100644
+--- a/bolt/cmake/modules/AddBOLT.cmake
++++ b/bolt/cmake/modules/AddBOLT.cmake
+@@ -16,7 +16,7 @@ macro(add_bolt_tool name)
+     get_target_export_arg(${name} BOLT export_to_bolttargets)
+     install(TARGETS ${name}
+       ${export_to_bolttargets}
+-      RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++      RUNTIME DESTINATION "${BOLT_TOOLS_INSTALL_DIR}"
+       COMPONENT bolt)
+
+     if(NOT LLVM_ENABLE_IDE)
+diff --git a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt
+index 0d4501d1eac0..a6ff0261f5f3 100644
+--- a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt
++++ b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt
+@@ -66,6 +66,6 @@ install(PROGRAMS clang-tidy-diff.py
+   DESTINATION "${CMAKE_INSTALL_DATADIR}/clang"
+   COMPONENT clang-tidy)
+ install(PROGRAMS run-clang-tidy.py
+-  DESTINATION "${CMAKE_INSTALL_BINDIR}"
++  DESTINATION "${CLANG_TOOLS_INSTALL_DIR}"
+   COMPONENT clang-tidy
+   RENAME run-clang-tidy)
+diff --git a/clang-tools-extra/modularize/CMakeLists.txt b/clang-tools-extra/modularize/CMakeLists.txt
+index eb5383c3ad44..39a34dfe8c71 100644
+--- a/clang-tools-extra/modularize/CMakeLists.txt
++++ b/clang-tools-extra/modularize/CMakeLists.txt
+@@ -27,5 +27,5 @@ clang_target_link_libraries(modularize
+   )
+
+ install(TARGETS modularize
+-        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++        RUNTIME DESTINATION "${CLANG_TOOLS_INSTALL_DIR}"
+         COMPONENT clang-extras)
+diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake
+index 4059fc3e986c..2dc34826ba1e 100644
+--- a/clang/cmake/modules/AddClang.cmake
++++ b/clang/cmake/modules/AddClang.cmake
+@@ -183,11 +183,11 @@ macro(add_clang_tool name)
+       get_target_export_arg(${name} Clang export_to_clangtargets)
+       install(TARGETS ${name}
+         ${export_to_clangtargets}
+-        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++        RUNTIME DESTINATION "${CLANG_TOOLS_INSTALL_DIR}"
+         COMPONENT ${name})
+
+       if (LLVM_ENABLE_PDB)
+-        install(FILES $<TARGET_PDB_FILE:${name}> DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name} OPTIONAL)
++        install(FILES $<TARGET_PDB_FILE:${name}> DESTINATION "${CLANG_TOOLS_INSTALL_DIR}" COMPONENT ${name} OPTIONAL)
+       endif()
+
+       if(NOT LLVM_ENABLE_IDE)
+diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt
+index 24e7c9692ca5..841f49cd5e0b 100644
+--- a/clang/tools/c-index-test/CMakeLists.txt
++++ b/clang/tools/c-index-test/CMakeLists.txt
+@@ -48,7 +48,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
+     set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH
+        "@executable_path/../../lib")
+   else()
+-    set(INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}")
++    set(INSTALL_DESTINATION "${CLANG_TOOLS_INSTALL_DIR}")
+   endif()
+
+   install(TARGETS c-index-test
+diff --git a/clang/tools/clang-format/CMakeLists.txt b/clang/tools/clang-format/CMakeLists.txt
+index 1c61a3c8fb80..41f019c1fbf9 100644
+--- a/clang/tools/clang-format/CMakeLists.txt
++++ b/clang/tools/clang-format/CMakeLists.txt
+@@ -36,11 +36,11 @@ install(FILES clang-format.py
+   DESTINATION "${CMAKE_INSTALL_DATADIR}/clang"
+   COMPONENT clang-format)
+ install(PROGRAMS git-clang-format
+-  DESTINATION "${CMAKE_INSTALL_BINDIR}"
++  DESTINATION "${CLANG_TOOLS_INSTALL_DIR}"
+   COMPONENT clang-format)
+
+ if (WIN32 AND NOT CYGWIN)
+   install(PROGRAMS git-clang-format.bat
+-    DESTINATION "${CMAKE_INSTALL_BINDIR}"
++    DESTINATION "${CLANG_TOOLS_INSTALL_DIR}"
+     COMPONENT clang-format)
+ endif()
+diff --git a/clang/tools/scan-build-py/CMakeLists.txt b/clang/tools/scan-build-py/CMakeLists.txt
+index 9273eb5ed977..f9abcb2ca248 100644
+--- a/clang/tools/scan-build-py/CMakeLists.txt
++++ b/clang/tools/scan-build-py/CMakeLists.txt
+@@ -43,7 +43,7 @@ foreach(BinFile ${BinFiles})
+                          ${CMAKE_BINARY_DIR}/bin/scan-build-py
+                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/scan-build)
+     install (PROGRAMS "bin/scan-build"
+-             DESTINATION "${CMAKE_INSTALL_BINDIR}"
++             DESTINATION "${CLANG_TOOLS_INSTALL_DIR}"
+              RENAME scan-build-py
+              COMPONENT scan-build-py)
+     list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/scan-build-py)
+@@ -56,7 +56,7 @@ foreach(BinFile ${BinFiles})
+                          ${CMAKE_BINARY_DIR}/bin/
+                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})
+     install(PROGRAMS bin/${BinFile}
+-            DESTINATION "${CMAKE_INSTALL_BINDIR}"
++            DESTINATION "${CLANG_TOOLS_INSTALL_DIR}"
+             COMPONENT scan-build-py)
+     list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})
+   endif()
+diff --git a/clang/tools/scan-build/CMakeLists.txt b/clang/tools/scan-build/CMakeLists.txt
+index ef687b0e90a1..47f31efc9174 100644
+--- a/clang/tools/scan-build/CMakeLists.txt
++++ b/clang/tools/scan-build/CMakeLists.txt
+@@ -47,7 +47,7 @@ if(CLANG_INSTALL_SCANBUILD)
+                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})
+     list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})
+     install(PROGRAMS bin/${BinFile}
+-            DESTINATION "${CMAKE_INSTALL_BINDIR}"
++            DESTINATION "${CLANG_TOOLS_INSTALL_DIR}"
+             COMPONENT scan-build)
+   endforeach()
+
+diff --git a/clang/tools/scan-view/CMakeLists.txt b/clang/tools/scan-view/CMakeLists.txt
+index 07aec76ee66f..55a945bb278d 100644
+--- a/clang/tools/scan-view/CMakeLists.txt
++++ b/clang/tools/scan-view/CMakeLists.txt
+@@ -20,7 +20,7 @@ if(CLANG_INSTALL_SCANVIEW)
+                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})
+     list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})
+     install(PROGRAMS bin/${BinFile}
+-            DESTINATION "${CMAKE_INSTALL_BINDIR}"
++            DESTINATION "${CLANG_TOOLS_INSTALL_DIR}"
+             COMPONENT scan-view)
+   endforeach()
+
+diff --git a/flang/cmake/modules/AddFlang.cmake b/flang/cmake/modules/AddFlang.cmake
+index ca233103ccdb..e079f33d9426 100644
+--- a/flang/cmake/modules/AddFlang.cmake
++++ b/flang/cmake/modules/AddFlang.cmake
+@@ -122,7 +122,7 @@ macro(add_flang_tool name)
+     get_target_export_arg(${name} Flang export_to_flangtargets)
+     install(TARGETS ${name}
+       ${export_to_flangtargets}
+-      RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++      RUNTIME DESTINATION "${FLANG_TOOLS_INSTALL_DIR}"
+       COMPONENT ${name})
+
+     if(NOT LLVM_ENABLE_IDE)
+diff --git a/flang/tools/flang-driver/CMakeLists.txt b/flang/tools/flang-driver/CMakeLists.txt
+index b5d672702512..67f5d4304dac 100644
+--- a/flang/tools/flang-driver/CMakeLists.txt
++++ b/flang/tools/flang-driver/CMakeLists.txt
+@@ -43,7 +43,7 @@ if(FLANG_PLUGIN_SUPPORT)
+   export_executable_symbols_for_plugins(flang)
+ endif()
+
+-install(TARGETS flang DESTINATION "${CMAKE_INSTALL_BINDIR}")
++install(TARGETS flang DESTINATION "${FLANG_TOOLS_INSTALL_DIR}")
+
+ # Keep "flang-new" as a symlink for backwards compatiblity. Remove once "flang"
+ # is a widely adopted name.
+diff --git a/lld/cmake/modules/AddLLD.cmake b/lld/cmake/modules/AddLLD.cmake
+index 37f73afa915f..7df335698aab 100644
+--- a/lld/cmake/modules/AddLLD.cmake
++++ b/lld/cmake/modules/AddLLD.cmake
+@@ -55,11 +55,11 @@ macro(add_lld_tool name)
+       get_target_export_arg(${name} LLD export_to_lldtargets)
+       install(TARGETS ${name}
+         ${export_to_lldtargets}
+-        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++        RUNTIME DESTINATION "${LLD_TOOLS_INSTALL_DIR}"
+         COMPONENT ${name})
+
+       if (LLVM_ENABLE_PDB)
+-        install(FILES $<TARGET_PDB_FILE:${name}> DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name} OPTIONAL)
++        install(FILES $<TARGET_PDB_FILE:${name}> DESTINATION "${LLD_TOOLS_INSTALL_DIR}" COMPONENT ${name} OPTIONAL)
+       endif()
+
+       if(NOT CMAKE_CONFIGURATION_TYPES)
+diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake
+index 28bf8d816d89..372eec626160 100644
+--- a/lldb/cmake/modules/AddLLDB.cmake
++++ b/lldb/cmake/modules/AddLLDB.cmake
+@@ -184,7 +184,7 @@ function(add_lldb_executable name)
+   endif()
+
+   if(ARG_GENERATE_INSTALL)
+-    set(install_dest bin)
++    set(install_dest "${LLVM_TOOLS_INSTALL_DIR}")
+     if(ARG_INSTALL_PREFIX)
+       set(install_dest ${ARG_INSTALL_PREFIX})
+     endif()

ci/vcpkg/overlay/llvm/0003-fix-llvm-config.patch

@@ -0,0 +1,16 @@
+ llvm/tools/llvm-config/llvm-config.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/llvm/tools/llvm-config/llvm-config.cpp b/llvm/tools/llvm-config/llvm-config.cpp
+index d5b76b1bb6c1..9fedcb2ab75f 100644
+--- a/llvm/tools/llvm-config/llvm-config.cpp
++++ b/llvm/tools/llvm-config/llvm-config.cpp
+@@ -304,7 +304,7 @@ int main(int argc, char **argv) {
+   // bin dir).
+   sys::fs::make_absolute(CurrentPath);
+   CurrentExecPrefix =
+-      sys::path::parent_path(sys::path::parent_path(CurrentPath)).str();
++      sys::path::parent_path(sys::path::parent_path(sys::path::parent_path(CurrentPath))).str();
+
+   // Check to see if we are inside a development tree by comparing to possible
+   // locations (prefix style or CMake style).

ci/vcpkg/overlay/llvm/0004-disable-libomp-aliases.patch

@@ -0,0 +1,32 @@
+ openmp/runtime/src/CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt
+index bb5822264514..340cef14df89 100644
+--- a/openmp/runtime/src/CMakeLists.txt
++++ b/openmp/runtime/src/CMakeLists.txt
+@@ -215,7 +215,7 @@ endif()
+ set(LIBOMP_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
+
+ # Add symbolic links to libomp
+-if(NOT WIN32)
++if(0)
+   add_custom_command(TARGET omp POST_BUILD
+     COMMAND ${CMAKE_COMMAND} -E create_symlink ${LIBOMP_LIB_FILE}
+       libgomp${LIBOMP_LIBRARY_SUFFIX}
+@@ -367,6 +367,7 @@ if(WIN32)
+   install(TARGETS omp ${export_to_llvmexports} RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+   install(TARGETS ${LIBOMP_IMP_LIB_TARGET} ARCHIVE DESTINATION "${OPENMP_INSTALL_LIBDIR}")
+   # Create aliases (regular copies) of the library for backwards compatibility
++  if(0)
+   set(LIBOMP_ALIASES "libiomp5md")
+   foreach(alias IN LISTS LIBOMP_ALIASES)
+     install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E copy \"${LIBOMP_LIB_FILE}\"
+@@ -375,6 +376,7 @@ if(WIN32)
+     install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E copy \"${LIBOMP_IMP_LIB_FILE}\"
+       \"${alias}${CMAKE_STATIC_LIBRARY_SUFFIX}\" WORKING_DIRECTORY \"${outdir}\")")
+   endforeach()
++  endif()
+ else()
+
+   install(TARGETS omp ${export_to_llvmexports} ${LIBOMP_INSTALL_KIND} DESTINATION "${OPENMP_INSTALL_LIBDIR}")

ci/vcpkg/overlay/llvm/0005-fix-runtimes.patch

@@ -0,0 +1,23 @@
+ llvm/runtimes/CMakeLists.txt | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt
+index 94a43b96d218..fff91366fbb2 100644
+--- a/llvm/runtimes/CMakeLists.txt
++++ b/llvm/runtimes/CMakeLists.txt
+@@ -504,11 +504,13 @@ if(build_runtimes)
+   # Forward user-provived system configuration to runtimes for requirement introspection.
+   # CMAKE_PREFIX_PATH is the search path for CMake packages.
+   if(CMAKE_PREFIX_PATH)
+-    list(APPEND extra_cmake_args "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}")
++    string(REPLACE ";" "|" new_value "${CMAKE_PREFIX_PATH}")
++    list(APPEND extra_cmake_args "-DCMAKE_PREFIX_PATH=${new_value}")
+   endif()
+   # CMAKE_PROGRAM_PATH is the search path for executables such as python.
+   if(CMAKE_PROGRAM_PATH)
+-    list(APPEND extra_cmake_args "-DCMAKE_PROGRAM_PATH=${CMAKE_PROGRAM_PATH}")
++    string(REPLACE ";" "|" new_value "${CMAKE_PROGRAM_PATH}")
++    list(APPEND extra_cmake_args "-DCMAKE_PROGRAM_PATH=${new_value}")
+   endif()
+
+   # TODO: We need to consider passing it as '-DRUNTIMES_x86_64_LLVM_ENABLE_RUNTIMES'.

ci/vcpkg/overlay/llvm/0006-create-destination-mlir-directory.patch

@@ -0,0 +1,16 @@
+ mlir/python/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/mlir/python/CMakeLists.txt b/mlir/python/CMakeLists.txt
+index 50fbca38a08f..957a6722c21c 100644
+--- a/mlir/python/CMakeLists.txt
++++ b/mlir/python/CMakeLists.txt
+@@ -527,6 +527,8 @@ add_mlir_python_common_capi_library(MLIRPythonCAPI
+     ${_ADDL_TEST_SOURCES}
+ )
+
++file(MAKE_DIRECTORY "${MLIR_BINARY_DIR}/python_packages/mlir_core/mlir/_mlir_libs")
++
+ ################################################################################
+ # Custom targets.
+ ################################################################################

ci/vcpkg/overlay/llvm/clang_usage

@@ -0,0 +1,5 @@
+The package clang provides CMake targets:
+
+    find_package(Clang CONFIG REQUIRED)
+    target_include_directories(main PRIVATE ${CLANG_INCLUDE_DIRS})
+    target_link_libraries(main PRIVATE clangBasic clangLex clangParse clangAST ...)