From 03d40603d9f29a107a5cede0f94e6c0241cd6099 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= <raulcumplido@gmail.com>
Date: Mon, 2 Mar 2026 12:43:21 +0100
Subject: [PATCH 1/3] GH-49428: [C++][Gandiva] Add support for LLVM 22.1.0

---
 cpp/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 5629261973e7..44186494ecf8 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -177,6 +177,7 @@ set(ARROW_DOC_DIR "share/doc/${PROJECT_NAME}")
 set(BUILD_SUPPORT_DIR "${CMAKE_SOURCE_DIR}/build-support")
 
 set(ARROW_LLVM_VERSIONS
+    "22.1"
     "21.1"
     "20.1"
     "19.1"

From 7b9135aab4ce6b8a79e0037ead8093d10174e7d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= <raulcumplido@gmail.com>
Date: Tue, 3 Mar 2026 11:05:51 +0100
Subject: [PATCH 2/3] Use new header for PassPlugin.h

---
 cpp/src/gandiva/engine.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cpp/src/gandiva/engine.cc b/cpp/src/gandiva/engine.cc
index cc10eb352dbd..572c1d133082 100644
--- a/cpp/src/gandiva/engine.cc
+++ b/cpp/src/gandiva/engine.cc
@@ -72,7 +72,11 @@
 #if LLVM_VERSION_MAJOR >= 14
 #  include <llvm/IR/PassManager.h>
 #  include <llvm/MC/TargetRegistry.h>
-#  include <llvm/Passes/PassPlugin.h>
+#  if LLVM_VERSION_MAJOR >= 22
+#    include "llvm/Plugins/PassPlugin.h"
+#  else
+#    include <llvm/Passes/PassPlugin.h>
+#  endif
 #  include <llvm/Transforms/IPO/GlobalOpt.h>
 #  include <llvm/Transforms/Scalar/NewGVN.h>
 #  include <llvm/Transforms/Scalar/SimplifyCFG.h>

From c6cacd1ad7293a28bbd935b11b91694f4be57cd1 Mon Sep 17 00:00:00 2001
From: Sutou Kouhei <kou@cozmixng.org>
Date: Wed, 4 Mar 2026 09:31:58 +0900
Subject: [PATCH 3/3] Use <...> for third party headers

---
 cpp/src/gandiva/engine.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/src/gandiva/engine.cc b/cpp/src/gandiva/engine.cc
index 572c1d133082..901421c86cb3 100644
--- a/cpp/src/gandiva/engine.cc
+++ b/cpp/src/gandiva/engine.cc
@@ -73,7 +73,7 @@
 #  include <llvm/IR/PassManager.h>
 #  include <llvm/MC/TargetRegistry.h>
 #  if LLVM_VERSION_MAJOR >= 22
-#    include "llvm/Plugins/PassPlugin.h"
+#    include <llvm/Plugins/PassPlugin.h>
 #  else
 #    include <llvm/Passes/PassPlugin.h>
 #  endif