Skip to content

Commit c61df29

Browse files
raulcdkou
andauthored
GH-49428: [C++][Gandiva] Add support for LLVM 22.1.0 (#49429)
### Rationale for this change Some of our CI jobs fail because conda jobs are pulling LLVM 22.1.0 and we are not compatible. ### What changes are included in this PR? Add 22.1.0 as compatible LLVM and minor fix to update the location of PassPlugin.h due to: - llvm/llvm-project#173279 ### Are these changes tested? Yes via CI ### Are there any user-facing changes? No, the only change is that LLVM 22.1.0 will be supported. * GitHub Issue: #49428 Lead-authored-by: Raúl Cumplido <raulcumplido@gmail.com> Co-authored-by: Sutou Kouhei <kou@cozmixng.org> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
1 parent edfb24d commit c61df29

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

cpp/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ set(ARROW_DOC_DIR "share/doc/${PROJECT_NAME}")
177177
set(BUILD_SUPPORT_DIR "${CMAKE_SOURCE_DIR}/build-support")
178178

179179
set(ARROW_LLVM_VERSIONS
180+
"22.1"
180181
"21.1"
181182
"20.1"
182183
"19.1"

cpp/src/gandiva/engine.cc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,11 @@
7272
#if LLVM_VERSION_MAJOR >= 14
7373
# include <llvm/IR/PassManager.h>
7474
# include <llvm/MC/TargetRegistry.h>
75-
# include <llvm/Passes/PassPlugin.h>
75+
# if LLVM_VERSION_MAJOR >= 22
76+
# include <llvm/Plugins/PassPlugin.h>
77+
# else
78+
# include <llvm/Passes/PassPlugin.h>
79+
# endif
7680
# include <llvm/Transforms/IPO/GlobalOpt.h>
7781
# include <llvm/Transforms/Scalar/NewGVN.h>
7882
# include <llvm/Transforms/Scalar/SimplifyCFG.h>

0 commit comments

Comments
 (0)