From 6744f8369e333b9ddba1a4bfccb6df26df966151 Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@did.science>
Date: Tue, 3 Dec 2024 03:35:32 +0900
Subject: [PATCH 01/23] fix(#14): build script does not rebuild when the LLVM
 prefix has been corrected from an invalid path to a valid one

---
 llvm-plugin/build.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/llvm-plugin/build.rs b/llvm-plugin/build.rs
index aa3796d..b9d1689 100644
--- a/llvm-plugin/build.rs
+++ b/llvm-plugin/build.rs
@@ -4,6 +4,7 @@ fn main() {
     let (major, minor) = *llvm_sys::LLVM_VERSION_FROM_FEATURES;
     println!("cargo:rustc-env=LLVM_VERSION_MAJOR={}{}", major, minor);
 
+    println!("cargo:rerun-if-env-changed={}", &*llvm_sys::ENV_LLVM_PREFIX);
     if llvm_sys::LLVM_CONFIG_PATH.is_none() {
         println!("cargo:rustc-cfg=LLVM_NOT_FOUND");
         return;
@@ -54,7 +55,6 @@ fn main() {
     }
 
     println!("cargo:rerun-if-changed=cpp");
-    println!("cargo:rerun-if-env-changed={}", &*llvm_sys::ENV_LLVM_PREFIX);
 }
 
 // Most code from this module was taken from the `llvm-sys` crate.

From e03dde05d2649296b5011ed627054d07d0ffc044 Mon Sep 17 00:00:00 2001
From: James Smith <jamesmth@proton.me>
Date: Fri, 10 Jan 2025 10:03:33 +0100
Subject: [PATCH 02/23] refactor: fix rust 1.82 `unused_must_use` lint

---
 llvm-plugin/src/analysis.rs     |  4 ++--
 llvm-plugin/src/pass_builder.rs | 20 ++++++++++----------
 llvm-plugin/src/pass_manager.rs |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/llvm-plugin/src/analysis.rs b/llvm-plugin/src/analysis.rs
index b408ab3..e207080 100644
--- a/llvm-plugin/src/analysis.rs
+++ b/llvm-plugin/src/analysis.rs
@@ -128,7 +128,7 @@ impl FunctionAnalysisManager {
                 *res_deleter = result_deleter::<T>;
             }
 
-            Box::into_raw(pass);
+            let _ = Box::into_raw(pass);
             #[allow(forgetting_copy_types)]
             std::mem::forget(function);
         }
@@ -282,7 +282,7 @@ impl ModuleAnalysisManager {
                 *res_deleter = result_deleter::<T>;
             }
 
-            Box::into_raw(pass);
+            let _ = Box::into_raw(pass);
             std::mem::forget(module);
         }
 
diff --git a/llvm-plugin/src/pass_builder.rs b/llvm-plugin/src/pass_builder.rs
index 3afa1e2..a535ab8 100644
--- a/llvm-plugin/src/pass_builder.rs
+++ b/llvm-plugin/src/pass_builder.rs
@@ -49,7 +49,7 @@ impl PassBuilder {
 
             let res = cb(name, &mut manager);
 
-            Box::into_raw(cb);
+            let _ = Box::into_raw(cb);
             matches!(res, PipelineParsing::Parsed)
         }
 
@@ -93,7 +93,7 @@ impl PassBuilder {
 
             let res = cb(name, &mut manager);
 
-            Box::into_raw(cb);
+            let _ = Box::into_raw(cb);
             matches!(res, PipelineParsing::Parsed)
         }
 
@@ -130,7 +130,7 @@ impl PassBuilder {
 
             cb(&mut manager);
 
-            Box::into_raw(cb);
+            let _ = Box::into_raw(cb);
         }
 
         unsafe {
@@ -166,7 +166,7 @@ impl PassBuilder {
 
             cb(&mut manager);
 
-            Box::into_raw(cb);
+            let _ = Box::into_raw(cb);
         }
 
         unsafe {
@@ -211,7 +211,7 @@ impl PassBuilder {
 
             cb(&mut manager, opt);
 
-            Box::into_raw(cb);
+            let _ = Box::into_raw(cb);
         }
 
         unsafe {
@@ -254,7 +254,7 @@ impl PassBuilder {
 
             cb(&mut manager, opt);
 
-            Box::into_raw(cb);
+            let _ = Box::into_raw(cb);
         }
 
         unsafe {
@@ -297,7 +297,7 @@ impl PassBuilder {
 
             cb(&mut manager, opt);
 
-            Box::into_raw(cb);
+            let _ = Box::into_raw(cb);
         }
 
         unsafe {
@@ -341,7 +341,7 @@ impl PassBuilder {
 
             cb(&mut manager, opt);
 
-            Box::into_raw(cb);
+            let _ = Box::into_raw(cb);
         }
 
         unsafe {
@@ -384,7 +384,7 @@ impl PassBuilder {
 
             cb(&mut manager, opt);
 
-            Box::into_raw(cb);
+            let _ = Box::into_raw(cb);
         }
 
         unsafe {
@@ -427,7 +427,7 @@ impl PassBuilder {
 
             cb(&mut manager, opt);
 
-            Box::into_raw(cb);
+            let _ = Box::into_raw(cb);
         }
 
         unsafe {
diff --git a/llvm-plugin/src/pass_manager.rs b/llvm-plugin/src/pass_manager.rs
index 3d1e083..cd96eb8 100644
--- a/llvm-plugin/src/pass_manager.rs
+++ b/llvm-plugin/src/pass_manager.rs
@@ -48,7 +48,7 @@ impl ModulePassManager {
 
             let preserve = pass.run_pass(&mut module, &manager);
 
-            Box::into_raw(pass);
+            let _ = Box::into_raw(pass);
             std::mem::forget(module);
 
             preserve
@@ -110,7 +110,7 @@ impl FunctionPassManager {
 
             let preserve = pass.run_pass(&mut function, &manager);
 
-            Box::into_raw(pass);
+            let _ = Box::into_raw(pass);
             #[allow(forgetting_copy_types)]
             std::mem::forget(function);
 

From 2d4df38c20358d17bbf23df7052ba70888e878bc Mon Sep 17 00:00:00 2001
From: James Smith <jamesmth@proton.me>
Date: Fri, 10 Jan 2025 10:36:54 +0100
Subject: [PATCH 03/23] fix: rename feature `llvm18-0` to `llvm18-1`

LLVM 18.0 doesn't exist for some reason.

A side-effect is that we can no longer use the convenient macro
`inkwell_internals::llvm_versions` (which only works if the feature is named
"llvm18-0").
---
 .github/workflows/linux.yml          |  4 +-
 .github/workflows/macos.yml          |  2 +-
 .github/workflows/windows.yml        |  4 +-
 README.md                            |  4 +-
 examples/strings.rs                  | 12 ++---
 llvm-plugin/Cargo.toml               |  3 +-
 llvm-plugin/build.rs                 |  4 +-
 llvm-plugin/src/ffi.rs               | 74 ++++++++++++++++++++++++----
 llvm-plugin/src/pass_builder.rs      | 54 +++++++++++++++++---
 llvm-plugin/src/pass_manager.rs      | 21 ++++++--
 tests/plugins/plugin1-lld/Cargo.toml |  2 +-
 tests/plugins/plugin1/Cargo.toml     |  2 +-
 tests/plugins/plugin2/Cargo.toml     |  2 +-
 tests/plugins/plugin3/Cargo.toml     |  2 +-
 tests/plugins/plugin4/Cargo.toml     |  2 +-
 tests/plugins/plugin5/Cargo.toml     |  2 +-
 tests/plugins/plugin6/Cargo.toml     |  2 +-
 tests/plugins/plugin6/src/lib.rs     |  8 +--
 tests/plugins/plugin7/Cargo.toml     |  2 +-
 tests/plugins/plugin7/src/lib.rs     |  4 +-
 20 files changed, 158 insertions(+), 52 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 80c3fa5..22d46f7 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -23,7 +23,7 @@ jobs:
           - ["15", "15-0", "v15.0.0-rust-1.65/llvm-lld-15.0.0-rust-1.65-linux-x86_64.tar.gz", "libLLVM-15.so"]
           - ["16", "16-0", "v16.0.2-rust-1.71/llvm-lld-16.0.2-rust-1.71-linux-x86_64.tar.gz", "libLLVM-16.so"]
           - ["17", "17-0", "v17.0.6-rust-1.75/llvm-lld-17.0.6-rust-1.75-linux-x86_64.tar.gz", "libLLVM-17.so"]
-          - ["18", "18-0", "v18.1.2-rust-1.78/llvm-lld-18.1.2-rust-1.78-linux-x86_64.tar.gz", "libLLVM.so.18.1"]
+          - ["18", "18-1", "v18.1.2-rust-1.78/llvm-lld-18.1.2-rust-1.78-linux-x86_64.tar.gz", "libLLVM.so.18.1"]
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -113,7 +113,7 @@ jobs:
           - ["15", "15-0", "1.65", "v15.0.0-rust-1.65/llvm-lld-15.0.0-rust-1.65-linux-x86_64.tar.gz", "libLLVM-15.so"]
           - ["16", "16-0", "1.71", "v16.0.2-rust-1.71/llvm-lld-16.0.2-rust-1.71-linux-x86_64.tar.gz", "libLLVM-16.so"]
           - ["17", "17-0", "1.75", "v17.0.6-rust-1.75/llvm-lld-17.0.6-rust-1.75-linux-x86_64.tar.gz", "libLLVM-17.so"]
-          - ["18", "18-0", "1.78", "v18.1.2-rust-1.78/llvm-lld-18.1.2-rust-1.78-linux-x86_64.tar.gz", "libLLVM.so.18.1"]
+          - ["18", "18-1", "1.78", "v18.1.2-rust-1.78/llvm-lld-18.1.2-rust-1.78-linux-x86_64.tar.gz", "libLLVM.so.18.1"]
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 3e0b4db..ea2fd58 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -22,7 +22,7 @@ jobs:
           - ["15", "15-0", "v15.0.0-rust-1.65/llvm-lld-15.0.0-rust-1.65-macos-x86_64.tar.gz", "macos-13"]
           - ["16", "16-0", "v16.0.2-rust-1.71/llvm-lld-16.0.2-rust-1.71-macos-x86_64.tar.gz", "macos-13"]
           - ["17", "17-0", "v17.0.6-rust-1.75/llvm-lld-17.0.6-rust-1.75-macos-x86_64.tar.gz", "macos-13"]
-          - ["18", "18-0", "v18.1.2-rust-1.78/llvm-lld-18.1.2-rust-1.78-macos-arm64.tar.gz", "macos-latest"]
+          - ["18", "18-1", "v18.1.2-rust-1.78/llvm-lld-18.1.2-rust-1.78-macos-arm64.tar.gz", "macos-latest"]
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 3ef98f8..c38f613 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -22,7 +22,7 @@ jobs:
           - ["15", "15-0", "v15.0.0-rust-1.65/llvm-lld-15.0.0-rust-1.65-windows-x86_64.7z"]
           - ["16", "16-0", "v16.0.2-rust-1.71/llvm-lld-16.0.2-rust-1.71-windows-x86_64.7z"]
           - ["17", "17-0", "v17.0.6-rust-1.75/llvm-lld-17.0.6-rust-1.75-windows-x86_64.7z"]
-          - ["18", "18-0", "v18.1.2-rust-1.78/llvm-lld-18.1.2-rust-1.78-windows-x86_64.7z"]
+          - ["18", "18-1", "v18.1.2-rust-1.78/llvm-lld-18.1.2-rust-1.78-windows-x86_64.7z"]
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -111,7 +111,7 @@ jobs:
           - ["15", "15-0", "1.65", "v15.0.0-rust-1.65/llvm-lld-15.0.0-rust-1.65-windows-x86_64.7z"]
           - ["16", "16-0", "1.71", "v16.0.2-rust-1.71/llvm-lld-16.0.2-rust-1.71-windows-x86_64.7z"]
           - ["17", "17-0", "1.75", "v17.0.6-rust-1.75/llvm-lld-17.0.6-rust-1.75-windows-x86_64.7z"]
-          - ["18", "18-0", "1.78", "v18.1.2-rust-1.78/llvm-lld-18.1.2-rust-1.78-windows-x86_64.7z"]
+          - ["18", "18-1", "1.78", "v18.1.2-rust-1.78/llvm-lld-18.1.2-rust-1.78-windows-x86_64.7z"]
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
diff --git a/README.md b/README.md
index 1576437..725a64c 100644
--- a/README.md
+++ b/README.md
@@ -27,10 +27,10 @@ When importing this crate in your `Cargo.toml`, you will need to specify the LLV
 
 ```toml
 [dependencies]
-llvm-plugin = { version = "0.6", features = ["llvm18-0"] }
+llvm-plugin = { version = "0.6", features = ["llvm18-1"] }
 ```
 
-Supported versions: LLVM 10-18 mapping to a cargo feature flag `llvm*-0` where `*` corresponds to the LLVM major version.
+Supported versions: LLVM 10-18 mapping to a cargo feature flag `llvmX-Y` where `X` and `Y` are the LLVM major and minor versions.
 
 ## Getting Started
 
diff --git a/examples/strings.rs b/examples/strings.rs
index 8a75f46..7b8cfb8 100644
--- a/examples/strings.rs
+++ b/examples/strings.rs
@@ -155,7 +155,7 @@ fn create_decode_fn<'a>(module: &mut Module<'a>) -> FunctionValue<'a> {
         feature = "llvm15-0",
         feature = "llvm16-0",
         feature = "llvm17-0",
-        feature = "llvm18-0",
+        feature = "llvm18-1",
     )))]
     let var10 = unsafe {
         builder.build_gep(
@@ -169,7 +169,7 @@ fn create_decode_fn<'a>(module: &mut Module<'a>) -> FunctionValue<'a> {
         feature = "llvm15-0",
         feature = "llvm16-0",
         feature = "llvm17-0",
-        feature = "llvm18-0",
+        feature = "llvm18-1",
     ))]
     let var10 = unsafe {
         builder.build_gep(
@@ -184,14 +184,14 @@ fn create_decode_fn<'a>(module: &mut Module<'a>) -> FunctionValue<'a> {
         feature = "llvm15-0",
         feature = "llvm16-0",
         feature = "llvm17-0",
-        feature = "llvm18-0",
+        feature = "llvm18-1",
     )))]
     let var11 = builder.build_load(phi1.as_basic_value().into_pointer_value(), "");
     #[cfg(any(
         feature = "llvm15-0",
         feature = "llvm16-0",
         feature = "llvm17-0",
-        feature = "llvm18-0",
+        feature = "llvm18-1",
     ))]
     let var11 = builder
         .build_load(cx.i8_type(), phi1.as_basic_value().into_pointer_value(), "")
@@ -253,7 +253,7 @@ fn create_decode_stub<'a>(
                     feature = "llvm15-0",
                     feature = "llvm16-0",
                     feature = "llvm17-0",
-                    feature = "llvm18-0",
+                    feature = "llvm18-1",
                 )))]
                 let s = builder
                     .build_struct_gep(gs.as_pointer_value(), id, "")
@@ -262,7 +262,7 @@ fn create_decode_stub<'a>(
                     feature = "llvm15-0",
                     feature = "llvm16-0",
                     feature = "llvm17-0",
-                    feature = "llvm18-0",
+                    feature = "llvm18-1",
                 ))]
                 let s = {
                     let i8_ty_ptr = cx.i8_type().ptr_type(AddressSpace::default());
diff --git a/llvm-plugin/Cargo.toml b/llvm-plugin/Cargo.toml
index 794c6d6..ac49a8f 100644
--- a/llvm-plugin/Cargo.toml
+++ b/llvm-plugin/Cargo.toml
@@ -32,7 +32,7 @@ llvm14-0 = ["inkwell/llvm14-0-no-llvm-linking"]
 llvm15-0 = ["inkwell/llvm15-0-no-llvm-linking"]
 llvm16-0 = ["inkwell/llvm16-0-no-llvm-linking"]
 llvm17-0 = ["inkwell/llvm17-0-no-llvm-linking"]
-llvm18-0 = ["inkwell/llvm18-0-no-llvm-linking"]
+llvm18-1 = ["inkwell/llvm18-0-no-llvm-linking"]
 
 target-x86 = ["inkwell/target-x86"]
 target-arm = ["inkwell/target-arm"]
@@ -54,7 +54,6 @@ target-all = ["inkwell/target-all"]
 
 [dependencies]
 inkwell = "0.5"
-inkwell_internals = "0.10.0"
 llvm-plugin-macros = { path = "../llvm-plugin-macros", version = "0.2", optional = true }
 
 [build-dependencies]
diff --git a/llvm-plugin/build.rs b/llvm-plugin/build.rs
index b9d1689..6ca43b5 100644
--- a/llvm-plugin/build.rs
+++ b/llvm-plugin/build.rs
@@ -215,8 +215,8 @@ mod llvm_sys {
             (16, 0)
         } else if cfg!(feature = "llvm17-0") {
             (17, 0)
-        } else if cfg!(feature = "llvm18-0") {
-            (18, 0)
+        } else if cfg!(feature = "llvm18-1") {
+            (18, 1)
         } else {
             panic!("Missing llvm* feature")
         }
diff --git a/llvm-plugin/src/ffi.rs b/llvm-plugin/src/ffi.rs
index ea9fed5..59d1f05 100644
--- a/llvm-plugin/src/ffi.rs
+++ b/llvm-plugin/src/ffi.rs
@@ -1,12 +1,15 @@
 use std::ffi::c_void;
 
-use inkwell_internals::llvm_versions;
-
 pub type AnalysisKey = *const u8;
 
 #[link(name = "llvm-plugin-cpp")]
 extern "C" {
-    #[llvm_versions(15..)]
+    #[cfg(any(
+        feature = "llvm15-0",
+        feature = "llvm16-0",
+        feature = "llvm17-0",
+        feature = "llvm18-1",
+    ))]
     pub(crate) fn passBuilderAddFullLinkTimeOptimizationLastEPCallback(
         builder: *mut c_void,
         cb: *const c_void,
@@ -14,7 +17,12 @@ extern "C" {
         cb_sys: extern "C" fn(*const c_void, *mut c_void, crate::OptimizationLevel),
     );
 
-    #[llvm_versions(15..)]
+    #[cfg(any(
+        feature = "llvm15-0",
+        feature = "llvm16-0",
+        feature = "llvm17-0",
+        feature = "llvm18-1",
+    ))]
     pub(crate) fn passBuilderAddFullLinkTimeOptimizationEarlyEPCallback(
         builder: *mut c_void,
         cb: *const c_void,
@@ -22,7 +30,12 @@ extern "C" {
         cb_sys: extern "C" fn(*const c_void, *mut c_void, crate::OptimizationLevel),
     );
 
-    #[llvm_versions(15..)]
+    #[cfg(any(
+        feature = "llvm15-0",
+        feature = "llvm16-0",
+        feature = "llvm17-0",
+        feature = "llvm18-1",
+    ))]
     pub(crate) fn passBuilderAddOptimizerEarlyEPCallback(
         builder: *mut c_void,
         cb: *const c_void,
@@ -30,7 +43,16 @@ extern "C" {
         cb_sys: extern "C" fn(*const c_void, *mut c_void, crate::OptimizationLevel),
     );
 
-    #[llvm_versions(11..)]
+    #[cfg(any(
+        feature = "llvm11-0",
+        feature = "llvm12-0",
+        feature = "llvm13-0",
+        feature = "llvm14-0",
+        feature = "llvm15-0",
+        feature = "llvm16-0",
+        feature = "llvm17-0",
+        feature = "llvm18-1",
+    ))]
     pub(crate) fn passBuilderAddOptimizerLastEPCallback(
         builder: *mut c_void,
         cb: *const c_void,
@@ -38,7 +60,15 @@ extern "C" {
         cb_sys: extern "C" fn(*const c_void, *mut c_void, crate::OptimizationLevel),
     );
 
-    #[llvm_versions(12..)]
+    #[cfg(any(
+        feature = "llvm12-0",
+        feature = "llvm13-0",
+        feature = "llvm14-0",
+        feature = "llvm15-0",
+        feature = "llvm16-0",
+        feature = "llvm17-0",
+        feature = "llvm18-1",
+    ))]
     pub(crate) fn passBuilderAddPipelineEarlySimplificationEPCallback(
         builder: *mut c_void,
         cb: *const c_void,
@@ -46,7 +76,15 @@ extern "C" {
         cb_sys: extern "C" fn(*const c_void, *mut c_void, crate::OptimizationLevel),
     );
 
-    #[llvm_versions(12..)]
+    #[cfg(any(
+        feature = "llvm12-0",
+        feature = "llvm13-0",
+        feature = "llvm14-0",
+        feature = "llvm15-0",
+        feature = "llvm16-0",
+        feature = "llvm17-0",
+        feature = "llvm18-1",
+    ))]
     pub(crate) fn passBuilderAddPipelineStartEPCallback(
         builder: *mut c_void,
         cb: *const c_void,
@@ -110,7 +148,15 @@ extern "C" {
         pass_sys: extern "C" fn(*mut c_void, *mut c_void, *mut c_void) -> crate::PreservedAnalyses,
     );
 
-    #[llvm_versions(12..)]
+    #[cfg(any(
+        feature = "llvm12-0",
+        feature = "llvm13-0",
+        feature = "llvm14-0",
+        feature = "llvm15-0",
+        feature = "llvm16-0",
+        feature = "llvm17-0",
+        feature = "llvm18-1",
+    ))]
     pub(crate) fn modulePassManagerIsEmpty(manager: *mut c_void) -> bool;
 
     pub(crate) fn functionPassManagerAddPass(
@@ -120,7 +166,15 @@ extern "C" {
         pass_sys: extern "C" fn(*mut c_void, *mut c_void, *mut c_void) -> crate::PreservedAnalyses,
     );
 
-    #[llvm_versions(12..)]
+    #[cfg(any(
+        feature = "llvm12-0",
+        feature = "llvm13-0",
+        feature = "llvm14-0",
+        feature = "llvm15-0",
+        feature = "llvm16-0",
+        feature = "llvm17-0",
+        feature = "llvm18-1",
+    ))]
     pub(crate) fn functionPassManagerIsEmpty(manager: *mut c_void) -> bool;
 
     pub(crate) fn moduleAnalysisManagerRegisterPass(
diff --git a/llvm-plugin/src/pass_builder.rs b/llvm-plugin/src/pass_builder.rs
index a535ab8..7efe9b1 100644
--- a/llvm-plugin/src/pass_builder.rs
+++ b/llvm-plugin/src/pass_builder.rs
@@ -1,7 +1,5 @@
 use std::ffi::c_void;
 
-use inkwell_internals::llvm_versions;
-
 use super::{
     FunctionAnalysisManager, FunctionPassManager, ModuleAnalysisManager, ModulePassManager,
 };
@@ -318,7 +316,15 @@ impl PassBuilder {
     /// This extension point allows adding optimization once at the start
     /// of the pipeline. This does not apply to 'backend' compiles (LTO and
     /// ThinLTO link-time pipelines).
-    #[llvm_versions(12..)]
+    #[cfg(any(
+        feature = "llvm12-0",
+        feature = "llvm13-0",
+        feature = "llvm14-0",
+        feature = "llvm15-0",
+        feature = "llvm16-0",
+        feature = "llvm17-0",
+        feature = "llvm18-1",
+    ))]
     pub fn add_pipeline_start_ep_callback<T>(&mut self, cb: T)
     where
         T: Fn(&mut ModulePassManager, OptimizationLevel) + 'static,
@@ -361,7 +367,15 @@ impl PassBuilder {
     ///
     /// This extension point allows adding optimization right after passes
     /// that do basic simplification of the input IR.
-    #[llvm_versions(12..)]
+    #[cfg(any(
+        feature = "llvm12-0",
+        feature = "llvm13-0",
+        feature = "llvm14-0",
+        feature = "llvm15-0",
+        feature = "llvm16-0",
+        feature = "llvm17-0",
+        feature = "llvm18-1",
+    ))]
     pub fn add_pipeline_early_simplification_ep_callback<T>(&mut self, cb: T)
     where
         T: Fn(&mut ModulePassManager, OptimizationLevel) + 'static,
@@ -404,7 +418,16 @@ impl PassBuilder {
     ///
     /// This extension point allows adding passes that run after everything
     /// else.
-    #[llvm_versions(11..)]
+    #[cfg(any(
+        feature = "llvm11-0",
+        feature = "llvm12-0",
+        feature = "llvm13-0",
+        feature = "llvm14-0",
+        feature = "llvm15-0",
+        feature = "llvm16-0",
+        feature = "llvm17-0",
+        feature = "llvm18-1",
+    ))]
     pub fn add_optimizer_last_ep_callback<T>(&mut self, cb: T)
     where
         T: Fn(&mut ModulePassManager, OptimizationLevel) + 'static,
@@ -447,7 +470,12 @@ impl PassBuilder {
     ///
     /// This extension point allow adding passes that run at Link Time,
     /// before Full Link Time Optimization.
-    #[llvm_versions(15..)]
+    #[cfg(any(
+        feature = "llvm15-0",
+        feature = "llvm16-0",
+        feature = "llvm17-0",
+        feature = "llvm18-1",
+    ))]
     pub fn add_full_lto_early_ep_callback<T>(&mut self, cb: T)
     where
         T: Fn(&mut ModulePassManager, OptimizationLevel) + 'static,
@@ -490,7 +518,12 @@ impl PassBuilder {
     ///
     /// This extensions point allow adding passes that run at Link Time,
     /// after Full Link Time Optimization.
-    #[llvm_versions(15..)]
+    #[cfg(any(
+        feature = "llvm15-0",
+        feature = "llvm16-0",
+        feature = "llvm17-0",
+        feature = "llvm18-1",
+    ))]
     pub fn add_full_lto_last_ep_callback<T>(&mut self, cb: T)
     where
         T: Fn(&mut ModulePassManager, OptimizationLevel) + 'static,
@@ -533,7 +566,12 @@ impl PassBuilder {
     ///
     /// This extension point allows adding passes just before the main
     /// module-level optimization passes.
-    #[llvm_versions(15..)]
+    #[cfg(any(
+        feature = "llvm15-0",
+        feature = "llvm16-0",
+        feature = "llvm17-0",
+        feature = "llvm18-1",
+    ))]
     pub fn add_optimizer_early_ep_callback<T>(&mut self, cb: T)
     where
         T: Fn(&mut ModulePassManager, OptimizationLevel) + 'static,
diff --git a/llvm-plugin/src/pass_manager.rs b/llvm-plugin/src/pass_manager.rs
index cd96eb8..c3e6251 100644
--- a/llvm-plugin/src/pass_manager.rs
+++ b/llvm-plugin/src/pass_manager.rs
@@ -2,7 +2,6 @@ use std::ffi::c_void;
 
 use inkwell::module::Module;
 use inkwell::values::FunctionValue;
-use inkwell_internals::llvm_versions;
 
 use super::{
     FunctionAnalysisManager, LlvmFunctionPass, LlvmModulePass, ModuleAnalysisManager,
@@ -65,7 +64,15 @@ impl ModulePassManager {
     }
 
     /// Returns if the pass manager contains any passes.
-    #[llvm_versions(12..)]
+    #[cfg(any(
+        feature = "llvm12-0",
+        feature = "llvm13-0",
+        feature = "llvm14-0",
+        feature = "llvm15-0",
+        feature = "llvm16-0",
+        feature = "llvm17-0",
+        feature = "llvm18-1",
+    ))]
     pub fn is_empty(&self) -> bool {
         unsafe { super::modulePassManagerIsEmpty(self.inner) }
     }
@@ -128,7 +135,15 @@ impl FunctionPassManager {
     }
 
     /// Returns if the pass manager contains any passes.
-    #[llvm_versions(12..)]
+    #[cfg(any(
+        feature = "llvm12-0",
+        feature = "llvm13-0",
+        feature = "llvm14-0",
+        feature = "llvm15-0",
+        feature = "llvm16-0",
+        feature = "llvm17-0",
+        feature = "llvm18-1",
+    ))]
     pub fn is_empty(&self) -> bool {
         unsafe { super::functionPassManagerIsEmpty(self.inner) }
     }
diff --git a/tests/plugins/plugin1-lld/Cargo.toml b/tests/plugins/plugin1-lld/Cargo.toml
index 155881c..1b4c90a 100644
--- a/tests/plugins/plugin1-lld/Cargo.toml
+++ b/tests/plugins/plugin1-lld/Cargo.toml
@@ -17,7 +17,7 @@ llvm14-0 = ["llvm-plugin/llvm14-0"]
 llvm15-0 = ["llvm-plugin/llvm15-0"]
 llvm16-0 = ["llvm-plugin/llvm16-0"]
 llvm17-0 = ["llvm-plugin/llvm17-0"]
-llvm18-0 = ["llvm-plugin/llvm18-0"]
+llvm18-1 = ["llvm-plugin/llvm18-1"]
 
 target-x86 = ["llvm-plugin/target-x86"]
 target-arm = ["llvm-plugin/target-arm"]
diff --git a/tests/plugins/plugin1/Cargo.toml b/tests/plugins/plugin1/Cargo.toml
index a415336..aa50e4d 100644
--- a/tests/plugins/plugin1/Cargo.toml
+++ b/tests/plugins/plugin1/Cargo.toml
@@ -18,7 +18,7 @@ llvm14-0 = ["llvm-plugin/llvm14-0"]
 llvm15-0 = ["llvm-plugin/llvm15-0"]
 llvm16-0 = ["llvm-plugin/llvm16-0"]
 llvm17-0 = ["llvm-plugin/llvm17-0"]
-llvm18-0 = ["llvm-plugin/llvm18-0"]
+llvm18-1 = ["llvm-plugin/llvm18-1"]
 
 target-x86 = ["llvm-plugin/target-x86"]
 target-arm = ["llvm-plugin/target-arm"]
diff --git a/tests/plugins/plugin2/Cargo.toml b/tests/plugins/plugin2/Cargo.toml
index 6cc5538..11a2a9a 100644
--- a/tests/plugins/plugin2/Cargo.toml
+++ b/tests/plugins/plugin2/Cargo.toml
@@ -18,7 +18,7 @@ llvm14-0 = ["llvm-plugin/llvm14-0"]
 llvm15-0 = ["llvm-plugin/llvm15-0"]
 llvm16-0 = ["llvm-plugin/llvm16-0"]
 llvm17-0 = ["llvm-plugin/llvm17-0"]
-llvm18-0 = ["llvm-plugin/llvm18-0"]
+llvm18-1 = ["llvm-plugin/llvm18-1"]
 
 target-x86 = ["llvm-plugin/target-x86"]
 target-arm = ["llvm-plugin/target-arm"]
diff --git a/tests/plugins/plugin3/Cargo.toml b/tests/plugins/plugin3/Cargo.toml
index a703fdd..246c5f6 100644
--- a/tests/plugins/plugin3/Cargo.toml
+++ b/tests/plugins/plugin3/Cargo.toml
@@ -18,7 +18,7 @@ llvm14-0 = ["llvm-plugin/llvm14-0"]
 llvm15-0 = ["llvm-plugin/llvm15-0"]
 llvm16-0 = ["llvm-plugin/llvm16-0"]
 llvm17-0 = ["llvm-plugin/llvm17-0"]
-llvm18-0 = ["llvm-plugin/llvm18-0"]
+llvm18-1 = ["llvm-plugin/llvm18-1"]
 
 target-x86 = ["llvm-plugin/target-x86"]
 target-arm = ["llvm-plugin/target-arm"]
diff --git a/tests/plugins/plugin4/Cargo.toml b/tests/plugins/plugin4/Cargo.toml
index 62deea3..a024b40 100644
--- a/tests/plugins/plugin4/Cargo.toml
+++ b/tests/plugins/plugin4/Cargo.toml
@@ -18,7 +18,7 @@ llvm14-0 = ["llvm-plugin/llvm14-0"]
 llvm15-0 = ["llvm-plugin/llvm15-0"]
 llvm16-0 = ["llvm-plugin/llvm16-0"]
 llvm17-0 = ["llvm-plugin/llvm17-0"]
-llvm18-0 = ["llvm-plugin/llvm18-0"]
+llvm18-1 = ["llvm-plugin/llvm18-1"]
 
 target-x86 = ["llvm-plugin/target-x86"]
 target-arm = ["llvm-plugin/target-arm"]
diff --git a/tests/plugins/plugin5/Cargo.toml b/tests/plugins/plugin5/Cargo.toml
index c162e63..a10c583 100644
--- a/tests/plugins/plugin5/Cargo.toml
+++ b/tests/plugins/plugin5/Cargo.toml
@@ -18,7 +18,7 @@ llvm14-0 = ["llvm-plugin/llvm14-0"]
 llvm15-0 = ["llvm-plugin/llvm15-0"]
 llvm16-0 = ["llvm-plugin/llvm16-0"]
 llvm17-0 = ["llvm-plugin/llvm17-0"]
-llvm18-0 = ["llvm-plugin/llvm18-0"]
+llvm18-1 = ["llvm-plugin/llvm18-1"]
 
 target-x86 = ["llvm-plugin/target-x86"]
 target-arm = ["llvm-plugin/target-arm"]
diff --git a/tests/plugins/plugin6/Cargo.toml b/tests/plugins/plugin6/Cargo.toml
index 0ec75fa..3a34fc4 100644
--- a/tests/plugins/plugin6/Cargo.toml
+++ b/tests/plugins/plugin6/Cargo.toml
@@ -18,7 +18,7 @@ llvm14-0 = ["llvm-plugin/llvm14-0"]
 llvm15-0 = ["llvm-plugin/llvm15-0"]
 llvm16-0 = ["llvm-plugin/llvm16-0"]
 llvm17-0 = ["llvm-plugin/llvm17-0"]
-llvm18-0 = ["llvm-plugin/llvm18-0"]
+llvm18-1 = ["llvm-plugin/llvm18-1"]
 
 target-x86 = ["llvm-plugin/target-x86"]
 target-arm = ["llvm-plugin/target-arm"]
diff --git a/tests/plugins/plugin6/src/lib.rs b/tests/plugins/plugin6/src/lib.rs
index 3a4c4e2..c1b54e6 100644
--- a/tests/plugins/plugin6/src/lib.rs
+++ b/tests/plugins/plugin6/src/lib.rs
@@ -29,7 +29,7 @@ fn plugin_registrar(builder: &mut PassBuilder) {
         feature = "llvm15-0",
         feature = "llvm16-0",
         feature = "llvm17-0",
-        feature = "llvm18-0",
+        feature = "llvm18-1",
     ))]
     builder.add_pipeline_start_ep_callback(|manager, opt| {
         assert!(matches!(opt, OptimizationLevel::O3));
@@ -43,7 +43,7 @@ fn plugin_registrar(builder: &mut PassBuilder) {
         feature = "llvm15-0",
         feature = "llvm16-0",
         feature = "llvm17-0",
-        feature = "llvm18-0",
+        feature = "llvm18-1",
     ))]
     builder.add_pipeline_early_simplification_ep_callback(|manager, opt| {
         assert!(matches!(opt, OptimizationLevel::O3));
@@ -58,7 +58,7 @@ fn plugin_registrar(builder: &mut PassBuilder) {
         feature = "llvm15-0",
         feature = "llvm16-0",
         feature = "llvm17-0",
-        feature = "llvm18-0",
+        feature = "llvm18-1",
     ))]
     builder.add_optimizer_last_ep_callback(|manager, opt| {
         assert!(matches!(opt, OptimizationLevel::O3));
@@ -69,7 +69,7 @@ fn plugin_registrar(builder: &mut PassBuilder) {
         feature = "llvm15-0",
         feature = "llvm16-0",
         feature = "llvm17-0",
-        feature = "llvm18-0",
+        feature = "llvm18-1",
     ))]
     builder.add_optimizer_early_ep_callback(|manager, opt| {
         assert!(matches!(opt, OptimizationLevel::O3));
diff --git a/tests/plugins/plugin7/Cargo.toml b/tests/plugins/plugin7/Cargo.toml
index 1943c8a..f9b5ab1 100644
--- a/tests/plugins/plugin7/Cargo.toml
+++ b/tests/plugins/plugin7/Cargo.toml
@@ -18,7 +18,7 @@ llvm14-0 = ["llvm-plugin/llvm14-0"]
 llvm15-0 = ["llvm-plugin/llvm15-0"]
 llvm16-0 = ["llvm-plugin/llvm16-0"]
 llvm17-0 = ["llvm-plugin/llvm17-0"]
-llvm18-0 = ["llvm-plugin/llvm18-0"]
+llvm18-1 = ["llvm-plugin/llvm18-1"]
 
 target-x86 = ["llvm-plugin/target-x86"]
 target-arm = ["llvm-plugin/target-arm"]
diff --git a/tests/plugins/plugin7/src/lib.rs b/tests/plugins/plugin7/src/lib.rs
index fae2d09..9baa749 100644
--- a/tests/plugins/plugin7/src/lib.rs
+++ b/tests/plugins/plugin7/src/lib.rs
@@ -7,7 +7,7 @@ fn plugin_registrar(builder: &mut PassBuilder) {
         feature = "llvm15-0",
         feature = "llvm16-0",
         feature = "llvm17-0",
-        feature = "llvm18-0",
+        feature = "llvm18-1",
     ))]
     builder.add_full_lto_early_ep_callback(|manager, opt| {
         assert!(matches!(opt, llvm_plugin::OptimizationLevel::O3));
@@ -18,7 +18,7 @@ fn plugin_registrar(builder: &mut PassBuilder) {
         feature = "llvm15-0",
         feature = "llvm16-0",
         feature = "llvm17-0",
-        feature = "llvm18-0",
+        feature = "llvm18-1",
     ))]
     builder.add_full_lto_last_ep_callback(|manager, opt| {
         assert!(matches!(opt, llvm_plugin::OptimizationLevel::O3));

From cc6469a4a9e604bcc68ae823d4e2d842096c652c Mon Sep 17 00:00:00 2001
From: James Smith <jamesmth@proton.me>
Date: Sun, 12 Jan 2025 14:58:47 +0100
Subject: [PATCH 04/23] ci: check PR formatting (#19)

---
 .github/pull_request_template.md |  1 +
 .github/workflows/check-pr.yml   | 85 ++++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+)
 create mode 100644 .github/pull_request_template.md
 create mode 100644 .github/workflows/check-pr.yml

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000..e918f36
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1 @@
+<!-- Please read .github/CONTRIBUTING.md before submitting any pull request. -->
diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml
new file mode 100644
index 0000000..1b3a2a8
--- /dev/null
+++ b/.github/workflows/check-pr.yml
@@ -0,0 +1,85 @@
+name: Check Pull Requests
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - edited
+      - synchronize
+      - labeled
+      - unlabeled
+  merge_group:
+
+permissions:
+  pull-requests: write
+
+jobs:
+  check-title:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check PR title
+        if: github.event_name == 'pull_request_target'
+        uses: amannn/action-semantic-pull-request@v5
+        id: check_pr_title
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      # Add comment indicating we require pull request titles to follow conventional commits specification
+      - uses: marocchino/sticky-pull-request-comment@v2
+        if: always() && (steps.check_pr_title.outputs.error_message != null)
+        with:
+          header: pr-title-lint-error
+          message: |
+            Thank you for opening this pull request!
+
+            We require pull request titles to follow the [Conventional Commits specification](https://www.conventionalcommits.org/en/v1.0.0/) and it looks like your proposed title needs to be adjusted.
+
+            Details:
+
+            > ${{ steps.check_pr_title.outputs.error_message }}
+      # Delete a previous comment when the issue has been resolved
+      - if: ${{ steps.check_pr_title.outputs.error_message == null }}
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          header: pr-title-lint-error
+          delete: true
+
+  check-breaking-change-label:
+    runs-on: ubuntu-latest
+    env:
+      # use an environment variable to pass untrusted input to the script
+      # see https://securitylab.github.com/research/github-actions-untrusted-input/
+      PR_TITLE: ${{ github.event.pull_request.title }}
+    steps:
+    - name: Check breaking change label
+      id: check_breaking_change
+      run: |
+        pattern='^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)(\(\w+\))?!:'
+        # Check if pattern matches
+        if echo "${PR_TITLE}" | grep -qE "$pattern"; then
+          echo "breaking_change=true" >> $GITHUB_OUTPUT
+        else
+          echo "breaking_change=false" >> $GITHUB_OUTPUT
+        fi
+    - name: Add label
+      if: steps.check_breaking_change.outputs.breaking_change == 'true'
+      uses: actions/github-script@v7
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        script: |
+          github.rest.issues.addLabels({
+            issue_number: context.issue.number,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            labels: ['Type: Breaking Change']
+          })
+
+  do-not-merge:
+    if: ${{ contains(github.event.*.labels.*.name, 'do not merge') }}
+    name: Prevent Merging
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check for label
+        run: |
+          echo "Pull request is labeled as 'do not merge'"
+          echo "This workflow fails so that the pull request cannot be merged"
+          exit 1

From a4aa6e4f0daa739d7743701da8026db3f9ed209d Mon Sep 17 00:00:00 2001
From: James Smith <jamesmth@proton.me>
Date: Sun, 12 Jan 2025 15:09:54 +0100
Subject: [PATCH 05/23] chore: add issue templates (#20)

---
 .github/ISSUE_TEMPLATE/bug_report.md      | 52 +++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.md | 32 ++++++++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..1c81720
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,52 @@
+---
+name: Bug report
+about: Create an issue about a bug you encountered
+title: ''
+labels: 'Type: Bug'
+assignees: ''
+---
+
+<!--
+Hi there, sorry `llvm-plugin` is not working as expected.
+Please fill this bug report conscientiously.
+A detailed and complete issue is more likely to be processed quickly.
+-->
+
+## Description
+<!--
+A clear and concise description of what the bug is.
+-->
+
+## To Reproduce
+<!--
+Try to reduce the issue to a simple code sample exhibiting the problem.
+Ideally, fork the project and add a test or an example.
+-->
+
+## Expected behavior
+<!--
+A clear and concise description of what you expected to happen.
+-->
+
+## Screenshots
+<!--
+If applicable, add screenshots, gifs or videos to help explain your problem.
+-->
+
+## Environment
+<!--
+Add a description of the systems where you are observing the issue. For example:
+- OS: Linux
+- Crate version: 0.7
+- LLVM version: 19.1.5
+-->
+
+- OS:
+- Crate version:
+- LLVM version:
+
+## Additional context
+<!--
+Add any other context about the problem here.
+If you already looked into the issue, include all the leads you have explored.
+-->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..7b95452
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,32 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: 'Type: Enhancement'
+assignees: ''
+
+---
+
+## Problem
+<!--
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+-->
+
+## Solution
+<!--
+A clear and concise description of what you want to happen.
+Things to consider:
+- backward compatibility
+- ease of use of the API (https://rust-lang.github.io/api-guidelines/)
+- consistency with the rest of the crate
+-->
+
+## Alternatives
+<!--
+A clear and concise description of any alternative solutions or features you've considered.
+-->
+
+## Additional context
+<!--
+Add any other context or screenshots about the feature request here.
+-->

From 14d8a3caa35a046e007b3bfd939a98f0779a9a10 Mon Sep 17 00:00:00 2001
From: James Smith <jamesmth@proton.me>
Date: Mon, 13 Jan 2025 15:31:30 +0100
Subject: [PATCH 06/23] chore(changelog): use `git-cliff` to generate changelog
 (#21)

[`git-cliff`](https://git-cliff.org): configurable changelog generator
that follows the conventional commits specification.
---
 .cz.toml                |  77 ++++++++++++++++++++++
 .github/CONTRIBUTING.md |  12 ++++
 CHANGELOG.md            |   6 ++
 cliff.toml              | 137 ++++++++++++++++++++++++++++++++++++++++
 committed.toml          |  37 +++++++++++
 5 files changed, 269 insertions(+)
 create mode 100644 .cz.toml
 create mode 100644 CHANGELOG.md
 create mode 100644 cliff.toml
 create mode 100644 committed.toml

diff --git a/.cz.toml b/.cz.toml
new file mode 100644
index 0000000..3495de7
--- /dev/null
+++ b/.cz.toml
@@ -0,0 +1,77 @@
+# configuration for https://github.com/commitizen-tools/commitizen
+
+[tool.commitizen]
+name = "cz_customize"
+tag_format = "$version"
+version_type = "semver"
+version_provider = "cargo"
+update_changelog_on_bump = true
+major_version_zero = true
+use_shortcuts = true
+
+[tool.commitizen.customize]
+message_template = """{{change_type}}{% if scope %}({{scope}}){% endif %}{% if is_breaking_change %}!{% endif %}: {{subject}}
+
+{% if body %}\
+{{body}}\
+{% endif %}
+
+{%if is_breaking_change %}\
+BREAKING_CHANGE: \
+{% endif %}\
+{{footer}}\
+"""
+example = "feature: this feature enable customize through config file"
+schema = "<type>(<scope>): <subject>\n\n<body>\n\n<footer>"
+
+# The order needs to be preserved, as it influences the order when executing cz commit/cz c
+
+# Change types
+[[tool.commitizen.customize.questions]]
+type = "list"
+name = "change_type"
+choices = [
+  { value = "build", name = "build: Changes that affect the build system or external dependencies (example scopes: pip, docker, npm)", key = "b" },
+  { value = "chore", name = "chore: A modification that generally does not fall into any other category", key = "c" },
+  { value = "ci", name = "ci: Changes to our CI configuration files and scripts (example scopes: GitLabCI)", key = "i" },
+  { value = "docs", name = "docs: Documentation only changes", key = "d" },
+  { value = "feat", name = "feat: A new feature.", key = "f" },
+  { value = "fix", name = "fix: A bug fix.", key = "x" },
+  { value = "perf", name = "perf: A code change that improves performance", key = "p" },
+  { value = "refactor", name = "refactor: A code change that neither fixes a bug nor adds a feature", key = "r" },
+  { value = "revert", name = "revert: Revert previous commits", key = "v" },
+  { value = "style", name = "style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)", key = "s" },
+  { value = "test", name = "test: Adding missing or correcting existing tests", key = "t" },
+]
+message = "Select the type of change you are committing"
+
+# The scope of the change, can be a file, class name or other context
+[[tool.commitizen.customize.questions]]
+type = "input"
+name = "scope"
+message = "What is the scope of this change? (class or file name): (press [enter] to skip)\n"
+
+# Summary of the changes
+[[tool.commitizen.customize.questions]]
+"type" = "input"
+"name" = "subject"
+"message" = "Write a short and imperative summary of the code changes: (lower case and no period)\n"
+
+# The commit body, elaborate the changes if need be.
+[[tool.commitizen.customize.questions]]
+type = "input"
+name = "body"
+message = "Provide additional contextual information about the code changes: (press [enter] to skip)\n"
+
+# Specify if the changes are breaking
+[[tool.commitizen.customize.questions]]
+type = "confirm"
+name = "is_breaking_change"
+message = "Is this a BREAKING CHANGE?"
+default = false
+
+# Reference closing issues and share other
+[[tool.commitizen.customize.questions]]
+type = "input"
+name = "footer"
+message = "Footer. Information about Breaking Changes and reference issues that this commit closes: (press [enter] to skip)"
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 32bc9b8..5b11007 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -33,4 +33,16 @@ Please ensure your PR follows these guidelines:
 * You are basing your changes off master
 * You will keep your code reasonably up to date via rebasing over merging whenever possible
 
+### Use conventional commits
+
+We use [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/) and check for them as
+a lint build step. To help adhere to the format, we recommend to install
+[Commitizen](https://commitizen-tools.github.io/commitizen/). By using this tool you automatically
+follow the configuration defined in [.cz.toml](../.cz.toml). Your commit messages should have enough
+information to help someone reading the [CHANGELOG](../CHANGELOG.md) understand what is new just from
+the title. The summary helps expand on that to provide information that helps provide more context,
+describes the nature of the problem that the commit is solving and any unintuitive effects of the
+change. It's rare that code changes can easily communicate intent, so make sure this is clearly
+documented.
+
 Thanks!
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..c6a2779
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,6 @@
+# Changelog
+
+All notable changes to this project are documented in this file.
+
+<!-- generated by git-cliff -->
+
diff --git a/cliff.toml b/cliff.toml
new file mode 100644
index 0000000..ccfcdfe
--- /dev/null
+++ b/cliff.toml
@@ -0,0 +1,137 @@
+# configuration for https://git-cliff.org/docs/configuration
+
+[remote.github]
+owner = "jamesmth"
+repo = "llvm-plugin-rs"
+
+[changelog]
+header = """
+# Changelog
+
+All notable changes to this project are documented in this file.
+"""
+# template for the changelog body
+# https://keats.github.io/tera/docs/#introduction
+body = """
+{%- if not version %}
+## [unreleased]
+{% else -%}
+## [{{ version }}](https://github.com/jamesmth/llvm-plugin-rs/releases/tag/{{ version }}) - {{ timestamp | date(format="%Y-%m-%d") }}
+{% endif -%}
+
+{% macro commit(commit) -%}
+- [{{ commit.id | truncate(length=7, end="") }}]({{ "https://github.com/jamesmth/llvm-plugin-rs/commit/" ~ commit.id }}) \
+  *({{commit.scope | default(value = "uncategorized") | lower }})* {{ commit.message | upper_first | trim }}\
+  {% if commit.remote.username %} by @{{ commit.remote.username }}{%- endif -%}\
+  {% if commit.remote.pr_number %} in [#{{ commit.remote.pr_number }}]({{ self::remote_url() }}/pull/{{ commit.remote.pr_number }}){%- endif %}\
+{%- if commit.breaking %} [**breaking**]{% endif %}
+{%- if commit.body %}\n\n{{ commit.body | indent(prefix="  > ", first=true, blank=true) }}
+{%- endif %}
+{%- for footer in commit.footers %}\n
+{%- if footer.token != "Signed-off-by" and footer.token != "Co-authored-by" %}
+  >
+{{ footer.token | indent(prefix="  > ", first=true, blank=true) }}
+{{- footer.separator }}
+{{- footer.value| indent(prefix="  > ", first=false, blank=true)  }}
+{%- endif %}
+{%- endfor %}
+{% endmacro -%}
+
+{% for group, commits in commits | group_by(attribute="group") %}
+### {{ group | striptags | trim | upper_first }}
+{% for commit in commits | filter(attribute="scope") | sort(attribute="scope") %}
+{{ self::commit(commit=commit) }}
+{%- endfor -%}
+{% for commit in commits %}
+{%- if not commit.scope %}
+{{ self::commit(commit=commit) }}
+{%- endif -%}
+{%- endfor -%}
+{%- endfor %}
+
+{% if github.contributors | filter(attribute="is_first_time", value=true) | length != 0 %}
+### New Contributors
+{%- endif %}\
+{% for contributor in github.contributors | filter(attribute="is_first_time", value=true) %}
+* @{{ contributor.username }} made their first contribution
+{%- if contributor.pr_number %} in \
+[#{{ contributor.pr_number }}]({{ self::remote_url() }}/pull/{{ contributor.pr_number }}) \
+{%- endif %}
+{%- endfor -%}
+
+{% if version %}
+{% if previous.version %}
+**Full Changelog**: {{ self::remote_url() }}/compare/{{ previous.version }}...{{ version }}
+{% endif %}
+{% else -%}
+  {% raw %}\n{% endraw %}
+{% endif %}
+
+{%- macro remote_url() -%}
+https://github.com/{{ remote.github.owner }}/{{ remote.github.repo }}\
+{% endmacro %}
+"""
+
+# remove the leading and trailing whitespace from the template
+trim = false
+
+# changelog footer
+footer = """
+<!-- generated by git-cliff -->
+"""
+postprocessors = [
+  { pattern = ' +\n', replace = "\n" },
+  { pattern = '<!-- Please read .github/CONTRIBUTING.md before submitting any pull request. -->', replace = "" },
+  { pattern = '>---+\n', replace = '' },
+]
+
+[git]
+# parse the commits based on https://www.conventionalcommits.org
+conventional_commits = true
+
+# filter out the commits that are not conventional
+filter_unconventional = true
+
+# process each line of a commit as an individual commit
+split_commits = false
+
+# regex for preprocessing the commit messages
+commit_preprocessors = [
+  { pattern = '(fix: )(rename feature)', replace = "refactor(cargo-feature)!: ${2}" },
+]
+
+# regex for parsing and grouping commits
+commit_parsers = [
+  { body = ".*security", group = "<!-- 08 -->Security" },
+  { message = "^[fF]ix", group = "<!-- 01 -->Bug Fixes" },
+  { message = "^build", group = "<!-- 09 -->Build" },
+  { message = "^chore\\(changelog\\)", skip = true },
+  { message = "^chore\\(deps\\)", skip = true },
+  { message = "^chore\\(pr\\)", skip = true },
+  { message = "^chore\\(pull\\)", skip = true },
+  { message = "^chore\\(release\\): prepare for", skip = true },
+  { message = "^[cC]hore", group = "<!-- 07 -->Miscellaneous Tasks" },
+  { message = "^ci", group = "<!-- 10 -->Continuous Integration" },
+  { message = "^doc", group = "<!-- 03 -->Documentation" },
+  { message = "^feat", group = "<!-- 00 -->Features" },
+  { message = "^perf", group = "<!-- 04 -->Performance" },
+  { message = "^refactor", group = "<!-- 02 -->Refactor" },
+  { message = "^revert", group = "<!-- 11 -->Reverted Commits" },
+  { message = "^style", group = "<!-- 05 -->Styling" },
+  { message = "^test", group = "<!-- 06 -->Testing" },
+]
+
+# protect breaking changes from being skipped due to matching a skipping commit_parser
+protect_breaking_commits = false
+
+# filter out the commits that are not matched by commit parsers
+filter_commits = false
+
+# glob pattern for matching git tags
+tag_pattern = "v[0-9]*"
+
+# sort the tags topologically
+topo_order = false
+
+# sort the commits inside sections by oldest/newest order
+sort_commits = "newest"
diff --git a/committed.toml b/committed.toml
new file mode 100644
index 0000000..7628bde
--- /dev/null
+++ b/committed.toml
@@ -0,0 +1,37 @@
+# configuration for https://github.com/crate-ci/committed
+
+# https://www.conventionalcommits.org
+style = "conventional"
+
+# disallow merge commits
+merge_commit = false
+
+# subject is not required to be capitalized
+subject_capitalized = false
+
+# subject should start with an imperative verb
+imperative_subject = true
+
+# subject should not end with a punctuation
+subject_not_punctuated = true
+
+# disable line length
+line_length = 0
+
+# disable subject length
+subject_length = 0
+
+# default allowed_types [ "chore", "docs", "feat", "fix", "perf", "refactor", "style", "test" ]
+allowed_types = [
+  "build",
+  "chore",
+  "ci",
+  "docs",
+  "feat",
+  "fix",
+  "perf",
+  "refactor",
+  "revert",
+  "style",
+  "test",
+]

From 9cbe8991b205f1d3f8898cae49011a6f5c35fabc Mon Sep 17 00:00:00 2001
From: James Smith <jamesmth@proton.me>
Date: Sat, 18 Jan 2025 13:29:04 +0100
Subject: [PATCH 07/23] ci(clang-format): update to clang-format-19 (#24)

---
 .github/workflows/lint.yml | 3 ++-
 llvm-plugin/cpp/ffi.cc     | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 43e12c7..40abf85 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -14,8 +14,9 @@ jobs:
         uses: actions/checkout@v2
       
       - name: Clang-Format Formatting
-        uses: jidicula/clang-format-action@v4.8.0
+        uses: jidicula/clang-format-action@v4.14.0
         with:
+          clang-format-version: '19'
           check-path: llvm-plugin/cpp
 
       - name: Rustfmt Formatting
diff --git a/llvm-plugin/cpp/ffi.cc b/llvm-plugin/cpp/ffi.cc
index 8bf3ff3..7847d6c 100644
--- a/llvm-plugin/cpp/ffi.cc
+++ b/llvm-plugin/cpp/ffi.cc
@@ -69,9 +69,8 @@ auto moduleAnalysisManagerRegisterPass(
     Analysis<ModuleIR>::Entrypoint Entrypoint, llvm::AnalysisKey *Key) -> bool {
   const auto Lock = std::lock_guard{Analysis<ModuleIR>::MutexCurrentKey};
   Analysis<ModuleIR>::CurrentKey = Key;
-  return AM.registerPass([&] {
-    return Analysis<ModuleIR>{Entrypoint, {AnalysisData, Deleter}};
-  });
+  return AM.registerPass(
+      [&] { return Analysis<ModuleIR>{Entrypoint, {AnalysisData, Deleter}}; });
 }
 
 auto functionAnalysisManagerRegisterPass(

From f95d8d80f440c1c39090132c55a2489164f888a1 Mon Sep 17 00:00:00 2001
From: James Smith <jamesmth@proton.me>
Date: Sat, 18 Jan 2025 13:42:07 +0100
Subject: [PATCH 08/23] refactor(lint): fix clang-tidy lints (#23)

---
 llvm-plugin/cpp/analysis.hh | 2 --
 llvm-plugin/cpp/common.hh   | 2 ++
 llvm-plugin/cpp/ffi.cc      | 7 +++++++
 llvm-plugin/cpp/pass.hh     | 4 ++--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/llvm-plugin/cpp/analysis.hh b/llvm-plugin/cpp/analysis.hh
index ff7f04e..d5f0cee 100644
--- a/llvm-plugin/cpp/analysis.hh
+++ b/llvm-plugin/cpp/analysis.hh
@@ -7,8 +7,6 @@
 
 #include <llvm/IR/PassManager.h>
 
-#include "common.hh"
-
 namespace {
 
 template <typename IR>
diff --git a/llvm-plugin/cpp/common.hh b/llvm-plugin/cpp/common.hh
index 43af1fa..2449370 100644
--- a/llvm-plugin/cpp/common.hh
+++ b/llvm-plugin/cpp/common.hh
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <llvm/IR/Function.h>
+#include <llvm/IR/Module.h>
 #include <llvm/IR/PassManager.h>
 
 struct ModuleIR {
diff --git a/llvm-plugin/cpp/ffi.cc b/llvm-plugin/cpp/ffi.cc
index 7847d6c..39b3e6f 100644
--- a/llvm-plugin/cpp/ffi.cc
+++ b/llvm-plugin/cpp/ffi.cc
@@ -1,6 +1,11 @@
+#include <cstdint>
 #include <memory>
 #include <mutex>
+#include <utility>
 
+#include <llvm/ADT/ArrayRef.h>
+#include <llvm/IR/Function.h>
+#include <llvm/IR/Module.h>
 #include <llvm/IR/PassManager.h>
 #include <llvm/Passes/PassBuilder.h>
 #include <llvm/Passes/PassPlugin.h>
@@ -18,6 +23,7 @@ using LlvmOptLevel = llvm::PassBuilder::OptimizationLevel;
 
 enum class OptimizationLevel { kO0, kO1, kO2, kO3, kOs, kOz };
 
+namespace {
 auto getFFIOptimizationLevel(LlvmOptLevel Opt) -> OptimizationLevel {
 #if defined(LLVM_VERSION_MAJOR) && (LLVM_VERSION_MAJOR == 10)
   if (Opt == LlvmOptLevel::O0) {
@@ -61,6 +67,7 @@ auto getFFIOptimizationLevel(LlvmOptLevel Opt) -> OptimizationLevel {
 #endif
   return OptimizationLevel::kOz;
 }
+} // namespace
 
 extern "C" {
 auto moduleAnalysisManagerRegisterPass(
diff --git a/llvm-plugin/cpp/pass.hh b/llvm-plugin/cpp/pass.hh
index 5b8da24..1799fae 100644
--- a/llvm-plugin/cpp/pass.hh
+++ b/llvm-plugin/cpp/pass.hh
@@ -1,11 +1,11 @@
 #pragma once
 
 #include <memory>
+#include <type_traits>
+#include <utility>
 
 #include <llvm/IR/PassManager.h>
 
-#include "common.hh"
-
 namespace {
 enum class PreservedAnalyses {
   kAll,

From f79da6e53338a016d56ed0db40dce0d0d45393a0 Mon Sep 17 00:00:00 2001
From: James Smith <jamesmth@proton.me>
Date: Sun, 12 Jan 2025 12:46:18 +0100
Subject: [PATCH 09/23] style(config): apply taplo formatting to toml files
 (#22)

---
 .taplo.toml                   | 5 +++++
 Cargo.toml                    | 5 +----
 llvm-plugin-macros/Cargo.toml | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 .taplo.toml

diff --git a/.taplo.toml b/.taplo.toml
new file mode 100644
index 0000000..11d163e
--- /dev/null
+++ b/.taplo.toml
@@ -0,0 +1,5 @@
+# configuration for https://github.com/tamasfe/taplo
+
+[formatting]
+indent_string = "  "
+reorder_arrays = true
diff --git a/Cargo.toml b/Cargo.toml
index e333215..3061bb4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,3 @@
 [workspace]
 resolver = "2"
-members = [
-    "llvm-plugin",
-    "llvm-plugin-macros",
-]
+members = ["llvm-plugin", "llvm-plugin-macros"]
diff --git a/llvm-plugin-macros/Cargo.toml b/llvm-plugin-macros/Cargo.toml
index 919b9b1..f2e0200 100644
--- a/llvm-plugin-macros/Cargo.toml
+++ b/llvm-plugin-macros/Cargo.toml
@@ -16,4 +16,4 @@ proc-macro = true
 [dependencies]
 proc-macro2 = { version = "1", default-features = false }
 syn = { version = "1", features = ["full"] }
-quote = {version = "1", default-features = false }
+quote = { version = "1", default-features = false }

From a1b957fd6924a0a861f0d7f062d57efebaa20a4f Mon Sep 17 00:00:00 2001
From: James Smith <jamesmth@proton.me>
Date: Sat, 18 Jan 2025 11:22:23 +0100
Subject: [PATCH 10/23] ci(release): add workflow to publish crate when tagging
 (#22)

---
 .github/workflows/release.yml | 70 +++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..c5e0851
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,70 @@
+name: Release stable version
+
+on:
+  push:
+    tags:
+      - "v*.*.*"
+
+jobs:
+  publish-stable:
+    name: Create a stable release
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Generate a changelog
+        uses: orhun/git-cliff-action@v4
+        with:
+          config: cliff.toml
+          args: --latest --strip header
+        env:
+          OUTPUT: BODY.md
+
+      - name: Publish on GitHub
+        uses: ncipollo/release-action@v1
+        with:
+          prerelease: false
+          bodyFile: BODY.md
+
+  publish-crate:
+    name: Publish crate
+    runs-on: ubuntu-latest
+    env:
+      LLVM_INSTALL_PATH: ~/llvm
+      LLVM_VERSION: "14"
+      LLVM_LIB_NAME: "libLLVM-14.so"
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+
+      - name: Setup LLVM Installation Path
+        run: |
+          mkdir ${{ env.LLVM_INSTALL_PATH }}
+          echo "$HOME/llvm/bin" >> $GITHUB_PATH
+
+      - name: Check LLVM Artifacts In Cache
+        id: cache-llvm
+        uses: actions/cache@v3
+        with:
+          path: |
+            ${{ env.LLVM_INSTALL_PATH }}/bin/llvm-config
+            ${{ env.LLVM_INSTALL_PATH }}/bin/opt
+            ${{ env.LLVM_INSTALL_PATH }}/lib/${{ env.LLVM_LIB_NAME }}
+            ${{ env.LLVM_INSTALL_PATH }}/lib/libLLVM.so
+            ${{ env.LLVM_INSTALL_PATH }}/include
+          key: ${{ runner.os }}-llvm-${{ env.LLVM_VERSION }}-opt
+      
+      - name: Install cargo-release
+        uses: taiki-e/install-action@v1
+        with:
+          tool: cargo-release
+
+      - name: Publish
+        run: cargo release publish -x --no-confirm --workspace --features llvm-plugin/llvm${{ env.LLVM_VERSION }}-0
+        env:
+          CARGO_REGISTRY_TOKEN: ${{ secrets.CRATES_IO_TOKEN }}

From f64726ce8e55e21ae04c1ee5fb4098c3d91c3309 Mon Sep 17 00:00:00 2001
From: James Smith <jamesmth@proton.me>
Date: Sat, 18 Jan 2025 13:57:34 +0100
Subject: [PATCH 11/23] ci(clippy): run clippy with feature `llvm18-1` (#25)

---
 .github/workflows/lint.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 40abf85..e0895bd 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -28,8 +28,9 @@ jobs:
     runs-on: ubuntu-latest
     env:
       LLVM_INSTALL_PATH: ~/llvm
-      LLVM_VERSION: "14"
-      LLVM_LIB_NAME: "libLLVM-14.so"
+      LLVM_VERSION: "18"
+      LLVM_VERSION_IN_FEATURE: "18-1"
+      LLVM_LIB_NAME: "libLLVM.so.18.1"
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -67,5 +68,5 @@ jobs:
           cargo clippy \
             -p llvm-plugin \
             --no-default-features \
-            --features target-x86,llvm${{ env.LLVM_VERSION }}-0 \
+            --features target-x86,llvm${{ env.LLVM_VERSION_IN_FEATURE }} \
             -- -D warnings

From 664dfab20ffe618cf071397c309130fb72249c9b Mon Sep 17 00:00:00 2001
From: James Smith <jamesmth@proton.me>
Date: Sat, 18 Jan 2025 14:07:18 +0100
Subject: [PATCH 12/23] ci(release): run cargo-release with feature `llvm18-1`
 (#25)

---
 .github/workflows/release.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c5e0851..612647b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -36,8 +36,9 @@ jobs:
     runs-on: ubuntu-latest
     env:
       LLVM_INSTALL_PATH: ~/llvm
-      LLVM_VERSION: "14"
-      LLVM_LIB_NAME: "libLLVM-14.so"
+      LLVM_VERSION: "18"
+      LLVM_VERSION_IN_FEATURE: "18-1"
+      LLVM_LIB_NAME: "libLLVM.so.18.1"
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v4
@@ -65,6 +66,10 @@ jobs:
           tool: cargo-release
 
       - name: Publish
-        run: cargo release publish -x --no-confirm --workspace --features llvm-plugin/llvm${{ env.LLVM_VERSION }}-0
+        run: |
+          cargo release \
+            publish -x --no-confirm \
+            --workspace \
+            --features llvm-plugin/llvm${{ env.LLVM_VERSION_IN_FEATURE }}
         env:
           CARGO_REGISTRY_TOKEN: ${{ secrets.CRATES_IO_TOKEN }}

From 1a897d8b341cd738a0a94a9b9bb5254fe54417b1 Mon Sep 17 00:00:00 2001
From: James Smith <jamesmth@proton.me>
Date: Sat, 18 Jan 2025 14:09:44 +0100
Subject: [PATCH 13/23] refactor(lint): fix clippy lints (#25)

---
 llvm-plugin/src/pass_builder.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/llvm-plugin/src/pass_builder.rs b/llvm-plugin/src/pass_builder.rs
index 7efe9b1..86059ac 100644
--- a/llvm-plugin/src/pass_builder.rs
+++ b/llvm-plugin/src/pass_builder.rs
@@ -498,7 +498,7 @@ impl PassBuilder {
 
             cb(&mut manager, opt);
 
-            Box::into_raw(cb);
+            let _ = Box::into_raw(cb);
         }
 
         unsafe {
@@ -546,7 +546,7 @@ impl PassBuilder {
 
             cb(&mut manager, opt);
 
-            Box::into_raw(cb);
+            let _ = Box::into_raw(cb);
         }
 
         unsafe {
@@ -594,7 +594,7 @@ impl PassBuilder {
 
             cb(&mut manager, opt);
 
-            Box::into_raw(cb);
+            let _ = Box::into_raw(cb);
         }
 
         unsafe {

From 651c33004b1d2095dac340f50a0c2ddc81509844 Mon Sep 17 00:00:00 2001
From: James Smith <jamesmth@proton.me>
Date: Mon, 23 Jun 2025 15:04:26 +0200
Subject: [PATCH 14/23] refactor(examples): remove deprecated inkwell api

---
 examples/inject_printf.rs | 31 ++++++++++++++++----
 examples/strings.rs       | 59 +++++++++++++++++++++++++++++----------
 2 files changed, 70 insertions(+), 20 deletions(-)

diff --git a/examples/inject_printf.rs b/examples/inject_printf.rs
index 47126c2..99167d4 100644
--- a/examples/inject_printf.rs
+++ b/examples/inject_printf.rs
@@ -8,6 +8,29 @@ use llvm_plugin::{
     LlvmModulePass, ModuleAnalysisManager, PassBuilder, PipelineParsing, PreservedAnalyses,
 };
 
+#[cfg(not(any(
+    feature = "llvm15-0",
+    feature = "llvm16-0",
+    feature = "llvm17-0",
+    feature = "llvm18-1",
+)))]
+macro_rules! ptr_type {
+    ($cx:ident, $ty:ident) => {
+        $cx.$ty().ptr_type(AddressSpace::default())
+    };
+}
+#[cfg(any(
+    feature = "llvm15-0",
+    feature = "llvm16-0",
+    feature = "llvm17-0",
+    feature = "llvm18-1",
+))]
+macro_rules! ptr_type {
+    ($cx:ident, $ty:ident) => {
+        $cx.ptr_type(AddressSpace::default())
+    };
+}
+
 #[llvm_plugin::plugin(name = "inject-func-call", version = "0.1")]
 fn plugin_registrar(builder: &mut PassBuilder) {
     builder.add_module_pipeline_parsing_callback(|name, pass_manager| {
@@ -29,7 +52,7 @@ impl LlvmModulePass for InjectFuncCallPass {
             Some(func) => func,
             None => {
                 // create type `int32 printf(int8*, ...)`
-                let arg_ty = cx.i8_type().ptr_type(AddressSpace::default());
+                let arg_ty = ptr_type!(cx, i8_type);
                 let func_ty = cx.i32_type().fn_type(&[arg_ty.into()], true);
                 module.add_function("printf", func_ty, None)
             }
@@ -73,11 +96,7 @@ impl LlvmModulePass for InjectFuncCallPass {
             eprintln!(" Injecting call to printf inside {}", func_name);
 
             let format_str_g = builder
-                .build_pointer_cast(
-                    format_str_g.as_pointer_value(),
-                    cx.i8_type().ptr_type(AddressSpace::default()),
-                    "",
-                )
+                .build_pointer_cast(format_str_g.as_pointer_value(), ptr_type!(cx, i8_type), "")
                 .unwrap();
 
             builder
diff --git a/examples/strings.rs b/examples/strings.rs
index 7b8cfb8..345895e 100644
--- a/examples/strings.rs
+++ b/examples/strings.rs
@@ -1,6 +1,7 @@
 // See https://github.com/tsarpaul/llvm-string-obfuscator
 // for a more detailed explanation.
 
+use inkwell::values::{ArrayValue, AsValueRef};
 use llvm_plugin::inkwell::basic_block::BasicBlock;
 use llvm_plugin::inkwell::module::{Linkage, Module};
 use llvm_plugin::inkwell::values::{BasicValueEnum, FunctionValue, GlobalValue};
@@ -9,6 +10,29 @@ use llvm_plugin::{
     LlvmModulePass, ModuleAnalysisManager, PassBuilder, PipelineParsing, PreservedAnalyses,
 };
 
+#[cfg(not(any(
+    feature = "llvm15-0",
+    feature = "llvm16-0",
+    feature = "llvm17-0",
+    feature = "llvm18-1",
+)))]
+macro_rules! ptr_type {
+    ($cx:ident, $ty:ident) => {
+        $cx.$ty().ptr_type(AddressSpace::default())
+    };
+}
+#[cfg(any(
+    feature = "llvm15-0",
+    feature = "llvm16-0",
+    feature = "llvm17-0",
+    feature = "llvm18-1",
+))]
+macro_rules! ptr_type {
+    ($cx:ident, $ty:ident) => {
+        $cx.ptr_type(AddressSpace::default())
+    };
+}
+
 #[llvm_plugin::plugin(name = "StringObfuscatorPass", version = "v0.1")]
 fn plugin_registrar(builder: &mut PassBuilder) {
     builder.add_module_pipeline_parsing_callback(|name, pass_manager| {
@@ -71,12 +95,12 @@ fn encode_global_strings<'a>(module: &mut Module<'a>) -> Vec<GlobalString<'a>> {
             _ => None,
         })
         .filter(|(_, _, arr)| {
-            // needs to be called before `get_string_constant`, otherwise it may crash
+            // needs to be called before `array_as_const_string`, otherwise it may crash
             arr.is_const_string()
         })
         .filter_map(|(global, stru, arr)| {
             // we ignore non-UTF8 strings, since they are probably not human-readable
-            let s = arr.get_string_constant().and_then(|s| s.to_str().ok())?;
+            let s = array_as_const_string(&arr).and_then(|s| str::from_utf8(s).ok())?;
             let encoded_str = s.bytes().map(|c| c + 1).collect::<Vec<_>>();
             Some((global, stru, encoded_str))
         })
@@ -101,11 +125,22 @@ fn encode_global_strings<'a>(module: &mut Module<'a>) -> Vec<GlobalString<'a>> {
         .collect()
 }
 
+pub fn array_as_const_string<'a>(arr: &'a ArrayValue) -> Option<&'a [u8]> {
+    let mut len = 0;
+    let ptr = unsafe { inkwell::llvm_sys::core::LLVMGetAsString(arr.as_value_ref(), &mut len) };
+
+    if ptr.is_null() {
+        None
+    } else {
+        unsafe { Some(std::slice::from_raw_parts(ptr.cast(), len)) }
+    }
+}
+
 fn create_decode_fn<'a>(module: &mut Module<'a>) -> FunctionValue<'a> {
     let cx = module.get_context();
 
     // create type `void decode(int8*, int32)`
-    let arg1_ty = cx.i8_type().ptr_type(AddressSpace::default());
+    let arg1_ty = ptr_type!(cx, i8_type);
     let arg2_ty = cx.i32_type();
     let fn_ty = cx
         .void_type()
@@ -140,9 +175,7 @@ fn create_decode_fn<'a>(module: &mut Module<'a>) -> FunctionValue<'a> {
         .unwrap();
 
     builder.position_at_end(loop_body_bb);
-    let phi1 = builder
-        .build_phi(cx.i8_type().ptr_type(AddressSpace::default()), "")
-        .unwrap();
+    let phi1 = builder.build_phi(ptr_type!(cx, i8_type), "").unwrap();
     let phi2 = builder.build_phi(cx.i32_type(), "").unwrap();
     let var9 = builder
         .build_int_nsw_add(
@@ -186,7 +219,9 @@ fn create_decode_fn<'a>(module: &mut Module<'a>) -> FunctionValue<'a> {
         feature = "llvm17-0",
         feature = "llvm18-1",
     )))]
-    let var11 = builder.build_load(phi1.as_basic_value().into_pointer_value(), "");
+    let var11 = builder
+        .build_load(phi1.as_basic_value().into_pointer_value(), "")
+        .unwrap();
     #[cfg(any(
         feature = "llvm15-0",
         feature = "llvm16-0",
@@ -240,11 +275,7 @@ fn create_decode_stub<'a>(
         let (s, len) = match globstr {
             GlobalString::Array(gs, len) => {
                 let s = builder
-                    .build_pointer_cast(
-                        gs.as_pointer_value(),
-                        cx.i8_type().ptr_type(AddressSpace::default()),
-                        "",
-                    )
+                    .build_pointer_cast(gs.as_pointer_value(), ptr_type!(cx, i8_type), "")
                     .unwrap();
                 (s, len)
             }
@@ -265,14 +296,14 @@ fn create_decode_stub<'a>(
                     feature = "llvm18-1",
                 ))]
                 let s = {
-                    let i8_ty_ptr = cx.i8_type().ptr_type(AddressSpace::default());
+                    let i8_ty_ptr = ptr_type!(cx, i8_type);
                     let struct_ty = cx.struct_type(&[i8_ty_ptr.into()], false);
                     builder
                         .build_struct_gep(struct_ty, gs.as_pointer_value(), id, "")
                         .unwrap()
                 };
                 let s = builder
-                    .build_pointer_cast(s, cx.i8_type().ptr_type(AddressSpace::default()), "")
+                    .build_pointer_cast(s, ptr_type!(cx, i8_type), "")
                     .unwrap();
                 (s, len)
             }

From e22dee034bcfc7eeef288ff62ab881078a3c340c Mon Sep 17 00:00:00 2001
From: James Smith <jamesmth@proton.me>
Date: Mon, 23 Jun 2025 15:05:18 +0200
Subject: [PATCH 15/23] chore(tests): remove redundant '\n' in string literal

---
 tests/plugins/plugin1/src/lib.rs | 2 +-
 tests/plugins/plugin2/src/lib.rs | 4 ++--
 tests/plugins/plugin3/src/lib.rs | 4 ++--
 tests/plugins/plugin4/src/lib.rs | 4 ++--
 tests/test.ll                    | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/plugins/plugin1/src/lib.rs b/tests/plugins/plugin1/src/lib.rs
index b9ea407..7fa2b93 100644
--- a/tests/plugins/plugin1/src/lib.rs
+++ b/tests/plugins/plugin1/src/lib.rs
@@ -46,7 +46,7 @@ impl LlvmModulePass for Pass1 {
             .get_result::<Ana1>(module)
             .as_ref()
             .expect("get_result");
-        assert_eq!(result.to_string(), "[13 x i8] c\"hello world\\0A\\00\"");
+        assert_eq!(result.to_string(), "[12 x i8] c\"hello world\\00\"");
         PreservedAnalyses::All
     }
 }
diff --git a/tests/plugins/plugin2/src/lib.rs b/tests/plugins/plugin2/src/lib.rs
index 2539b15..5876ce6 100644
--- a/tests/plugins/plugin2/src/lib.rs
+++ b/tests/plugins/plugin2/src/lib.rs
@@ -32,7 +32,7 @@ impl LlvmModulePass for Pass1 {
             .get_result::<Ana1>(module)
             .as_ref()
             .expect("get_result");
-        assert_eq!(result.to_string(), "[13 x i8] c\"hello world\\0A\\00\"");
+        assert_eq!(result.to_string(), "[12 x i8] c\"hello world\\00\"");
         PreservedAnalyses::All
     }
 }
@@ -44,7 +44,7 @@ impl LlvmModulePass for Pass2 {
             .get_result::<Ana1>(module)
             .as_ref()
             .expect("get_result");
-        assert_eq!(result.to_string(), "[13 x i8] c\"hello world\\0A\\00\"");
+        assert_eq!(result.to_string(), "[12 x i8] c\"hello world\\00\"");
         assert_eq!(unsafe { ANA1_CALL_COUNT }, 1);
         PreservedAnalyses::All
     }
diff --git a/tests/plugins/plugin3/src/lib.rs b/tests/plugins/plugin3/src/lib.rs
index faab881..d2a6bf5 100644
--- a/tests/plugins/plugin3/src/lib.rs
+++ b/tests/plugins/plugin3/src/lib.rs
@@ -32,7 +32,7 @@ impl LlvmModulePass for Pass1 {
             .get_result::<Ana1>(module)
             .as_ref()
             .expect("get_result");
-        assert_eq!(result.to_string(), "[13 x i8] c\"hello world\\0A\\00\"");
+        assert_eq!(result.to_string(), "[12 x i8] c\"hello world\\00\"");
         PreservedAnalyses::None
     }
 }
@@ -44,7 +44,7 @@ impl LlvmModulePass for Pass2 {
             .get_result::<Ana1>(module)
             .as_ref()
             .expect("get_result");
-        assert_eq!(result.to_string(), "[13 x i8] c\"hello world\\0A\\00\"");
+        assert_eq!(result.to_string(), "[12 x i8] c\"hello world\\00\"");
         assert_eq!(unsafe { ANA1_CALL_COUNT }, 2);
         PreservedAnalyses::All
     }
diff --git a/tests/plugins/plugin4/src/lib.rs b/tests/plugins/plugin4/src/lib.rs
index 1014a3a..77d953a 100644
--- a/tests/plugins/plugin4/src/lib.rs
+++ b/tests/plugins/plugin4/src/lib.rs
@@ -49,12 +49,12 @@ impl LlvmModulePass for Pass1 {
             .get_result::<Ana1>(module)
             .as_ref()
             .expect("get_result");
-        assert_eq!(result.to_string(), "[13 x i8] c\"hello world\\0A\\00\"");
+        assert_eq!(result.to_string(), "[12 x i8] c\"hello world\\00\"");
 
         let result = manager.get_cached_result::<Ana1>(module);
         assert!(matches!(
             result.and_then(|res| res.as_ref()).map(|res| res.to_string()),
-            Some(res) if res == "[13 x i8] c\"hello world\\0A\\00\""
+            Some(res) if res == "[12 x i8] c\"hello world\\00\""
         ));
 
         PreservedAnalyses::All
diff --git a/tests/test.ll b/tests/test.ll
index def3dbf..420abd9 100644
--- a/tests/test.ll
+++ b/tests/test.ll
@@ -1,9 +1,9 @@
-@.str = private unnamed_addr constant [13 x i8] c"hello world\0A\00"
+@.str = private unnamed_addr constant [12 x i8] c"hello world\00"
 
 declare i32 @puts(i8* nocapture) nounwind
 
 define i32 @main() { ; i32()*
-    %cast210 = getelementptr [13 x i8],[13 x i8]* @.str, i64 0, i64 0
+    %cast210 = getelementptr [12 x i8],[12 x i8]* @.str, i64 0, i64 0
     call i32 @puts(i8* %cast210)
     ret i32 0
 }

From 6dee016bf5d2b3f784f540c60e9c867a69ec24a7 Mon Sep 17 00:00:00 2001
From: James Smith <jamesmth@proton.me>
Date: Mon, 23 Jun 2025 15:28:09 +0200
Subject: [PATCH 16/23] ci: add jobs to build and test examples

---
 .github/workflows/linux.yml   | 51 +++++++++++++++++++++++++++++------
 .github/workflows/macos.yml   | 51 +++++++++++++++++++++++++++++------
 .github/workflows/windows.yml | 51 +++++++++++++++++++++++++++++------
 3 files changed, 129 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 22d46f7..e4580c7 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -11,7 +11,8 @@ jobs:
     runs-on: ubuntu-latest
     env:
       LLVM_INSTALL_PATH: ~/llvm
-      PLUGINS_PATH: tests/plugins/target/debug
+      TEST_PLUGINS_PATH: tests/plugins/target/debug
+      EX_PLUGINS_PATH: target/debug/examples
     strategy:
       matrix:
         llvm-version:
@@ -62,41 +63,75 @@ jobs:
       - name: Run Tests
         run: |
           opt \
-            --load-pass-plugin="${{ env.PLUGINS_PATH }}/libplugin1.so" \
+            --load-pass-plugin="${{ env.TEST_PLUGINS_PATH }}/libplugin1.so" \
             --passes="mpass,function(fpass)" \
             tests/test.ll \
             -disable-output
           opt \
-            --load-pass-plugin="${{ env.PLUGINS_PATH }}/libplugin2.so" \
+            --load-pass-plugin="${{ env.TEST_PLUGINS_PATH }}/libplugin2.so" \
             --passes="mpass1,mpass2" \
             tests/test.ll \
             -disable-output
           opt \
-            --load-pass-plugin="${{ env.PLUGINS_PATH }}/libplugin3.so" \
+            --load-pass-plugin="${{ env.TEST_PLUGINS_PATH }}/libplugin3.so" \
             --passes="mpass1,mpass2" \
             tests/test.ll \
             -disable-output
           opt \
-            --load-pass-plugin="${{ env.PLUGINS_PATH }}/libplugin4.so" \
+            --load-pass-plugin="${{ env.TEST_PLUGINS_PATH }}/libplugin4.so" \
             --passes="mpass,function(fpass)" \
             tests/test.ll \
             -disable-output
           opt \
-            --load-pass-plugin="${{ env.PLUGINS_PATH }}/libplugin5.so" \
+            --load-pass-plugin="${{ env.TEST_PLUGINS_PATH }}/libplugin5.so" \
             --passes="mpass,function(fpass)" \
             tests/test.ll \
             -disable-output
           opt \
-            --load-pass-plugin="${{ env.PLUGINS_PATH }}/libplugin6.so" \
+            --load-pass-plugin="${{ env.TEST_PLUGINS_PATH }}/libplugin6.so" \
             --passes="default<O3>" \
             tests/test.ll \
             -disable-output
           opt \
-            --load-pass-plugin="${{ env.PLUGINS_PATH }}/libplugin7.so" \
+            --load-pass-plugin="${{ env.TEST_PLUGINS_PATH }}/libplugin7.so" \
             --passes="lto<O3>" \
             tests/test.ll \
             -disable-output
 
+      - name: Build Examples
+        run: |
+          cargo b \
+            --examples \
+            --features llvm${{ matrix.llvm-version[1] }}
+
+      - name: Run Examples
+        run: |
+          opt \
+            --load-pass-plugin="${{ env.EX_PLUGINS_PATH }}/libhello_world.so" \
+            --passes="hello-world" \
+            tests/test.ll \
+            -disable-output
+          opt \
+            --load-pass-plugin="${{ env.EX_PLUGINS_PATH }}/libopcode_counter.so" \
+            --passes="opcode-counter-printer" \
+            tests/test.ll \
+            -disable-output
+          opt \
+            --load-pass-plugin="${{ env.EX_PLUGINS_PATH }}/libinject_printf.so" \
+            --passes="inject-func-call" \
+            tests/test.ll \
+            -disable-output
+          opt \
+            --load-pass-plugin="${{ env.EX_PLUGINS_PATH }}/libstatic_call_counter.so" \
+            --passes="static-cc-printer" \
+            tests/test.ll \
+            -disable-output
+          opt \
+            --load-pass-plugin="${{ env.EX_PLUGINS_PATH }}/libstring_obf.so" \
+            --passes="string-obfuscator-pass" \
+            tests/test.ll \
+            -disable-output
+
   linux-tests-lld:
     name: "LLVM/LLD ${{ matrix.llvm-version[0] }} Linux"
     runs-on: ubuntu-latest
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index ea2fd58..7a54e68 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -11,7 +11,8 @@ jobs:
     runs-on: ${{ matrix.llvm-version[3] }}
     env:
       LLVM_INSTALL_PATH: ~/llvm
-      PLUGINS_PATH: tests/plugins/target/debug
+      TEST_PLUGINS_PATH: tests/plugins/target/debug
+      EX_PLUGINS_PATH: target/debug/examples
     strategy:
       matrix:
         llvm-version:
@@ -61,37 +62,71 @@ jobs:
       - name: Run Tests
         run: |
           opt \
-            --load-pass-plugin="${{ env.PLUGINS_PATH }}/libplugin1.dylib" \
+            --load-pass-plugin="${{ env.TEST_PLUGINS_PATH }}/libplugin1.dylib" \
             --passes="mpass,function(fpass)" \
             tests/test.ll \
             -disable-output
           opt \
-            --load-pass-plugin="${{ env.PLUGINS_PATH }}/libplugin2.dylib" \
+            --load-pass-plugin="${{ env.TEST_PLUGINS_PATH }}/libplugin2.dylib" \
             --passes="mpass1,mpass2" \
             tests/test.ll \
             -disable-output
           opt \
-            --load-pass-plugin="${{ env.PLUGINS_PATH }}/libplugin3.dylib" \
+            --load-pass-plugin="${{ env.TEST_PLUGINS_PATH }}/libplugin3.dylib" \
             --passes="mpass1,mpass2" \
             tests/test.ll \
             -disable-output
           opt \
-            --load-pass-plugin="${{ env.PLUGINS_PATH }}/libplugin4.dylib" \
+            --load-pass-plugin="${{ env.TEST_PLUGINS_PATH }}/libplugin4.dylib" \
             --passes="mpass,function(fpass)" \
             tests/test.ll \
             -disable-output
           opt \
-            --load-pass-plugin="${{ env.PLUGINS_PATH }}/libplugin5.dylib" \
+            --load-pass-plugin="${{ env.TEST_PLUGINS_PATH }}/libplugin5.dylib" \
             --passes="mpass,function(fpass)" \
             tests/test.ll \
             -disable-output
           opt \
-            --load-pass-plugin="${{ env.PLUGINS_PATH }}/libplugin6.dylib" \
+            --load-pass-plugin="${{ env.TEST_PLUGINS_PATH }}/libplugin6.dylib" \
             --passes="default<O3>" \
             tests/test.ll \
             -disable-output
           opt \
-            --load-pass-plugin="${{ env.PLUGINS_PATH }}/libplugin7.dylib" \
+            --load-pass-plugin="${{ env.TEST_PLUGINS_PATH }}/libplugin7.dylib" \
             --passes="lto<O3>" \
             tests/test.ll \
             -disable-output
+
+      - name: Build Examples
+        run: |
+          cargo b \
+            --examples \
+            --features llvm${{ matrix.llvm-version[1] }}
+
+      - name: Run Examples
+        run: |
+          opt \
+            --load-pass-plugin="${{ env.EX_PLUGINS_PATH }}/libhello_world.dylib" \
+            --passes="hello-world" \
+            tests/test.ll \
+            -disable-output
+          opt \
+            --load-pass-plugin="${{ env.EX_PLUGINS_PATH }}/libopcode_counter.dylib" \
+            --passes="opcode-counter-printer" \
+            tests/test.ll \
+            -disable-output
+          opt \
+            --load-pass-plugin="${{ env.EX_PLUGINS_PATH }}/libinject_printf.dylib" \
+            --passes="inject-func-call" \
+            tests/test.ll \
+            -disable-output
+          opt \
+            --load-pass-plugin="${{ env.EX_PLUGINS_PATH }}/libstatic_call_counter.dylib" \
+            --passes="static-cc-printer" \
+            tests/test.ll \
+            -disable-output
+          opt \
+            --load-pass-plugin="${{ env.EX_PLUGINS_PATH }}/libstring_obf.dylib" \
+            --passes="string-obfuscator-pass" \
+            tests/test.ll \
+            -disable-output
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index c38f613..7e6f837 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -11,7 +11,8 @@ jobs:
     runs-on: windows-latest
     env:
       LLVM_INSTALL_PATH: C:\LLVM
-      PLUGINS_PATH: tests\plugins\target\debug
+      TEST_PLUGINS_PATH: tests\plugins\target\debug
+      EX_PLUGINS_PATH: target\debug\examples
     strategy:
       matrix:
         llvm-version:
@@ -62,41 +63,75 @@ jobs:
       - name: Run Tests
         run: |
           opt `
-            --load-pass-plugin="${{ env.PLUGINS_PATH }}\plugin1.dll" `
+            --load-pass-plugin="${{ env.TEST_PLUGINS_PATH }}\plugin1.dll" `
             --passes="mpass,function(fpass)" `
             tests/test.ll `
             -disable-output
           opt `
-            --load-pass-plugin="${{ env.PLUGINS_PATH }}\plugin2.dll" `
+            --load-pass-plugin="${{ env.TEST_PLUGINS_PATH }}\plugin2.dll" `
             --passes="mpass1,mpass2" `
             tests/test.ll `
             -disable-output
           opt `
-            --load-pass-plugin="${{ env.PLUGINS_PATH }}\plugin3.dll" `
+            --load-pass-plugin="${{ env.TEST_PLUGINS_PATH }}\plugin3.dll" `
             --passes="mpass1,mpass2" `
             tests/test.ll `
             -disable-output
           opt `
-            --load-pass-plugin="${{ env.PLUGINS_PATH }}\plugin4.dll" `
+            --load-pass-plugin="${{ env.TEST_PLUGINS_PATH }}\plugin4.dll" `
             --passes="mpass,function(fpass)" `
             tests/test.ll `
             -disable-output
           opt `
-            --load-pass-plugin="${{ env.PLUGINS_PATH }}\plugin5.dll" `
+            --load-pass-plugin="${{ env.TEST_PLUGINS_PATH }}\plugin5.dll" `
             --passes="mpass,function(fpass)" `
             tests/test.ll `
             -disable-output
           opt `
-            --load-pass-plugin="${{ env.PLUGINS_PATH }}\plugin6.dll" `
+            --load-pass-plugin="${{ env.TEST_PLUGINS_PATH }}\plugin6.dll" `
             --passes="default<O3>" `
             tests/test.ll `
             -disable-output
           opt `
-            --load-pass-plugin="${{ env.PLUGINS_PATH }}\plugin7.dll" `
+            --load-pass-plugin="${{ env.TEST_PLUGINS_PATH }}\plugin7.dll" `
             --passes="lto<O3>" `
             tests/test.ll `
             -disable-output
 
+      - name: Build Examples
+        run: |
+          cargo b `
+            --examples `
+            --features llvm${{ matrix.llvm-version[1] }},win-link-opt
+
+      - name: Run Examples
+        run: |
+          opt `
+            --load-pass-plugin="${{ env.EX_PLUGINS_PATH }}\hello_world.dll" `
+            --passes="hello-world" `
+            tests/test.ll `
+            -disable-output
+          opt `
+            --load-pass-plugin="${{ env.EX_PLUGINS_PATH }}\opcode_counter.dll" `
+            --passes="opcode-counter-printer" `
+            tests/test.ll `
+            -disable-output
+          opt `
+            --load-pass-plugin="${{ env.EX_PLUGINS_PATH }}\inject_printf.dll" `
+            --passes="inject-func-call" `
+            tests/test.ll `
+            -disable-output
+          opt `
+            --load-pass-plugin="${{ env.EX_PLUGINS_PATH }}\static_call_counter.dll" `
+            --passes="static-cc-printer" `
+            tests/test.ll `
+            -disable-output
+          opt `
+            --load-pass-plugin="${{ env.EX_PLUGINS_PATH }}\string_obf.dll" `
+            --passes="string-obfuscator-pass" `
+            tests/test.ll `
+            -disable-output
+
   windows-tests-lld:
     name: "LLVM/LLD ${{ matrix.llvm-version[0] }} Windows"
     runs-on: windows-latest

From ab2872a37e024ba80dd092c10ca95f249eec4526 Mon Sep 17 00:00:00 2001
From: James Smith <jamesmth@proton.me>
Date: Sat, 9 Aug 2025 17:13:57 +0200
Subject: [PATCH 17/23] refactor(lint): fix clippy lints

---
 llvm-plugin/build.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/llvm-plugin/build.rs b/llvm-plugin/build.rs
index 6ca43b5..7e53d52 100644
--- a/llvm-plugin/build.rs
+++ b/llvm-plugin/build.rs
@@ -2,7 +2,7 @@ fn main() {
     println!("cargo::rustc-check-cfg=cfg(LLVM_NOT_FOUND)");
 
     let (major, minor) = *llvm_sys::LLVM_VERSION_FROM_FEATURES;
-    println!("cargo:rustc-env=LLVM_VERSION_MAJOR={}{}", major, minor);
+    println!("cargo:rustc-env=LLVM_VERSION_MAJOR={major}{minor}");
 
     println!("cargo:rerun-if-env-changed={}", &*llvm_sys::ENV_LLVM_PREFIX);
     if llvm_sys::LLVM_CONFIG_PATH.is_none() {
@@ -82,7 +82,7 @@ mod llvm_sys {
         /// A single path to search for LLVM in (containing bin/llvm-config)
         pub static ref ENV_LLVM_PREFIX: String = {
             let (major, minor) = *LLVM_VERSION_FROM_FEATURES;
-            format!("LLVM_SYS_{}{}_PREFIX", major, minor)
+            format!("LLVM_SYS_{major}{minor}_PREFIX")
         };
     }
 
@@ -113,7 +113,7 @@ mod llvm_sys {
                     // searching.
                 }
                 // Some other error, probably a weird failure. Give up.
-                Err(e) => panic!("Failed to search PATH for llvm-config: {}", e),
+                Err(e) => panic!("Failed to search PATH for llvm-config: {e}"),
             }
         }
 
@@ -183,8 +183,7 @@ mod llvm_sys {
             Some(c) => c,
             None => {
                 panic!(
-                    "Could not determine LLVM version from llvm-config. Version string: {}",
-                    version_str
+                    "Could not determine LLVM version from llvm-config. Version string: {version_str}"
                 );
             }
         };

From 9a3fb44720672359509f061c0b9030b0805fe9b8 Mon Sep 17 00:00:00 2001
From: James Smith <jamesmth@proton.me>
Date: Sun, 22 Jun 2025 17:25:30 +0200
Subject: [PATCH 18/23] feat: add llvm 19 support

---
 .github/workflows/lint.yml           | 6 +++---
 .github/workflows/linux.yml          | 2 ++
 .github/workflows/macos.yml          | 1 +
 .github/workflows/release.yml        | 6 +++---
 .github/workflows/windows.yml        | 2 ++
 README.md                            | 4 ++--
 examples/inject_printf.rs            | 2 ++
 examples/strings.rs                  | 8 ++++++++
 llvm-plugin/Cargo.toml               | 5 +++--
 llvm-plugin/build.rs                 | 2 ++
 llvm-plugin/src/ffi.rs               | 8 ++++++++
 llvm-plugin/src/pass_builder.rs      | 6 ++++++
 llvm-plugin/src/pass_manager.rs      | 2 ++
 tests/plugins/plugin1-lld/Cargo.toml | 1 +
 tests/plugins/plugin1/Cargo.toml     | 1 +
 tests/plugins/plugin2/Cargo.toml     | 1 +
 tests/plugins/plugin3/Cargo.toml     | 1 +
 tests/plugins/plugin4/Cargo.toml     | 1 +
 tests/plugins/plugin5/Cargo.toml     | 1 +
 tests/plugins/plugin6/Cargo.toml     | 1 +
 tests/plugins/plugin6/src/lib.rs     | 4 ++++
 tests/plugins/plugin7/Cargo.toml     | 1 +
 tests/plugins/plugin7/src/lib.rs     | 2 ++
 23 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index e0895bd..188d3fc 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -28,9 +28,9 @@ jobs:
     runs-on: ubuntu-latest
     env:
       LLVM_INSTALL_PATH: ~/llvm
-      LLVM_VERSION: "18"
-      LLVM_VERSION_IN_FEATURE: "18-1"
-      LLVM_LIB_NAME: "libLLVM.so.18.1"
+      LLVM_VERSION: "19"
+      LLVM_VERSION_IN_FEATURE: "19-1"
+      LLVM_LIB_NAME: "libLLVM.so.19.1"
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index e4580c7..0f8b398 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -25,6 +25,7 @@ jobs:
           - ["16", "16-0", "v16.0.2-rust-1.71/llvm-lld-16.0.2-rust-1.71-linux-x86_64.tar.gz", "libLLVM-16.so"]
           - ["17", "17-0", "v17.0.6-rust-1.75/llvm-lld-17.0.6-rust-1.75-linux-x86_64.tar.gz", "libLLVM-17.so"]
           - ["18", "18-1", "v18.1.2-rust-1.78/llvm-lld-18.1.2-rust-1.78-linux-x86_64.tar.gz", "libLLVM.so.18.1"]
+          - ["19", "19-1", "v19.1.5-rust-1.84/llvm-lld-19.1.5-rust-1.84-linux-x86_64.tar.gz", "libLLVM.so.19.1"]
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -149,6 +150,7 @@ jobs:
           - ["16", "16-0", "1.71", "v16.0.2-rust-1.71/llvm-lld-16.0.2-rust-1.71-linux-x86_64.tar.gz", "libLLVM-16.so"]
           - ["17", "17-0", "1.75", "v17.0.6-rust-1.75/llvm-lld-17.0.6-rust-1.75-linux-x86_64.tar.gz", "libLLVM-17.so"]
           - ["18", "18-1", "1.78", "v18.1.2-rust-1.78/llvm-lld-18.1.2-rust-1.78-linux-x86_64.tar.gz", "libLLVM.so.18.1"]
+          - ["19", "19-1", "1.84", "v19.1.5-rust-1.84/llvm-lld-19.1.5-rust-1.84-linux-x86_64.tar.gz", "libLLVM.so.19.1"]
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 7a54e68..5df409c 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -24,6 +24,7 @@ jobs:
           - ["16", "16-0", "v16.0.2-rust-1.71/llvm-lld-16.0.2-rust-1.71-macos-x86_64.tar.gz", "macos-13"]
           - ["17", "17-0", "v17.0.6-rust-1.75/llvm-lld-17.0.6-rust-1.75-macos-x86_64.tar.gz", "macos-13"]
           - ["18", "18-1", "v18.1.2-rust-1.78/llvm-lld-18.1.2-rust-1.78-macos-arm64.tar.gz", "macos-latest"]
+          - ["19", "19-1", "v19.1.5-rust-1.84/llvm-lld-19.1.5-rust-1.84-macos-arm64.tar.gz", "macos-latest"]
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 612647b..2942aff 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -36,9 +36,9 @@ jobs:
     runs-on: ubuntu-latest
     env:
       LLVM_INSTALL_PATH: ~/llvm
-      LLVM_VERSION: "18"
-      LLVM_VERSION_IN_FEATURE: "18-1"
-      LLVM_LIB_NAME: "libLLVM.so.18.1"
+      LLVM_VERSION: "19"
+      LLVM_VERSION_IN_FEATURE: "19-1"
+      LLVM_LIB_NAME: "libLLVM.so.19.1"
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v4
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 7e6f837..8a9a303 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -24,6 +24,7 @@ jobs:
           - ["16", "16-0", "v16.0.2-rust-1.71/llvm-lld-16.0.2-rust-1.71-windows-x86_64.7z"]
           - ["17", "17-0", "v17.0.6-rust-1.75/llvm-lld-17.0.6-rust-1.75-windows-x86_64.7z"]
           - ["18", "18-1", "v18.1.2-rust-1.78/llvm-lld-18.1.2-rust-1.78-windows-x86_64.7z"]
+          - ["19", "19-1", "v19.1.5-rust-1.84/llvm-lld-19.1.5-rust-1.84-windows-x86_64.7z"]
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -147,6 +148,7 @@ jobs:
           - ["16", "16-0", "1.71", "v16.0.2-rust-1.71/llvm-lld-16.0.2-rust-1.71-windows-x86_64.7z"]
           - ["17", "17-0", "1.75", "v17.0.6-rust-1.75/llvm-lld-17.0.6-rust-1.75-windows-x86_64.7z"]
           - ["18", "18-1", "1.78", "v18.1.2-rust-1.78/llvm-lld-18.1.2-rust-1.78-windows-x86_64.7z"]
+          - ["19", "19-1", "1.84", "v19.1.5-rust-1.84/llvm-lld-19.1.5-rust-1.84-windows-x86_64.7z"]
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
diff --git a/README.md b/README.md
index 725a64c..059b941 100644
--- a/README.md
+++ b/README.md
@@ -27,10 +27,10 @@ When importing this crate in your `Cargo.toml`, you will need to specify the LLV
 
 ```toml
 [dependencies]
-llvm-plugin = { version = "0.6", features = ["llvm18-1"] }
+llvm-plugin = { git = "https://github.com/jamesmth/llvm-plugin-rs", features = ["llvm19-1"] }
 ```
 
-Supported versions: LLVM 10-18 mapping to a cargo feature flag `llvmX-Y` where `X` and `Y` are the LLVM major and minor versions.
+Supported versions: LLVM 10-19 mapping to a cargo feature flag `llvmX-Y` where `X` and `Y` are the LLVM major and minor versions.
 
 ## Getting Started
 
diff --git a/examples/inject_printf.rs b/examples/inject_printf.rs
index 99167d4..72d222c 100644
--- a/examples/inject_printf.rs
+++ b/examples/inject_printf.rs
@@ -13,6 +13,7 @@ use llvm_plugin::{
     feature = "llvm16-0",
     feature = "llvm17-0",
     feature = "llvm18-1",
+    feature = "llvm19-1",
 )))]
 macro_rules! ptr_type {
     ($cx:ident, $ty:ident) => {
@@ -24,6 +25,7 @@ macro_rules! ptr_type {
     feature = "llvm16-0",
     feature = "llvm17-0",
     feature = "llvm18-1",
+    feature = "llvm19-1",
 ))]
 macro_rules! ptr_type {
     ($cx:ident, $ty:ident) => {
diff --git a/examples/strings.rs b/examples/strings.rs
index 345895e..273ee66 100644
--- a/examples/strings.rs
+++ b/examples/strings.rs
@@ -15,6 +15,7 @@ use llvm_plugin::{
     feature = "llvm16-0",
     feature = "llvm17-0",
     feature = "llvm18-1",
+    feature = "llvm19-1",
 )))]
 macro_rules! ptr_type {
     ($cx:ident, $ty:ident) => {
@@ -26,6 +27,7 @@ macro_rules! ptr_type {
     feature = "llvm16-0",
     feature = "llvm17-0",
     feature = "llvm18-1",
+    feature = "llvm19-1",
 ))]
 macro_rules! ptr_type {
     ($cx:ident, $ty:ident) => {
@@ -189,6 +191,7 @@ fn create_decode_fn<'a>(module: &mut Module<'a>) -> FunctionValue<'a> {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     )))]
     let var10 = unsafe {
         builder.build_gep(
@@ -203,6 +206,7 @@ fn create_decode_fn<'a>(module: &mut Module<'a>) -> FunctionValue<'a> {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     ))]
     let var10 = unsafe {
         builder.build_gep(
@@ -218,6 +222,7 @@ fn create_decode_fn<'a>(module: &mut Module<'a>) -> FunctionValue<'a> {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     )))]
     let var11 = builder
         .build_load(phi1.as_basic_value().into_pointer_value(), "")
@@ -227,6 +232,7 @@ fn create_decode_fn<'a>(module: &mut Module<'a>) -> FunctionValue<'a> {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     ))]
     let var11 = builder
         .build_load(cx.i8_type(), phi1.as_basic_value().into_pointer_value(), "")
@@ -285,6 +291,7 @@ fn create_decode_stub<'a>(
                     feature = "llvm16-0",
                     feature = "llvm17-0",
                     feature = "llvm18-1",
+                    feature = "llvm19-1",
                 )))]
                 let s = builder
                     .build_struct_gep(gs.as_pointer_value(), id, "")
@@ -294,6 +301,7 @@ fn create_decode_stub<'a>(
                     feature = "llvm16-0",
                     feature = "llvm17-0",
                     feature = "llvm18-1",
+                    feature = "llvm19-1",
                 ))]
                 let s = {
                     let i8_ty_ptr = ptr_type!(cx, i8_type);
diff --git a/llvm-plugin/Cargo.toml b/llvm-plugin/Cargo.toml
index ac49a8f..08339ea 100644
--- a/llvm-plugin/Cargo.toml
+++ b/llvm-plugin/Cargo.toml
@@ -32,7 +32,8 @@ llvm14-0 = ["inkwell/llvm14-0-no-llvm-linking"]
 llvm15-0 = ["inkwell/llvm15-0-no-llvm-linking"]
 llvm16-0 = ["inkwell/llvm16-0-no-llvm-linking"]
 llvm17-0 = ["inkwell/llvm17-0-no-llvm-linking"]
-llvm18-1 = ["inkwell/llvm18-0-no-llvm-linking"]
+llvm18-1 = ["inkwell/llvm18-1-no-llvm-linking"]
+llvm19-1 = ["inkwell/llvm19-1-no-llvm-linking"]
 
 target-x86 = ["inkwell/target-x86"]
 target-arm = ["inkwell/target-arm"]
@@ -53,7 +54,7 @@ target-riscv = ["inkwell/target-riscv"]
 target-all = ["inkwell/target-all"]
 
 [dependencies]
-inkwell = "0.5"
+inkwell = { git = "https://github.com/TheDan64/inkwell", rev = "50c16a6" }
 llvm-plugin-macros = { path = "../llvm-plugin-macros", version = "0.2", optional = true }
 
 [build-dependencies]
diff --git a/llvm-plugin/build.rs b/llvm-plugin/build.rs
index 7e53d52..8b11b97 100644
--- a/llvm-plugin/build.rs
+++ b/llvm-plugin/build.rs
@@ -216,6 +216,8 @@ mod llvm_sys {
             (17, 0)
         } else if cfg!(feature = "llvm18-1") {
             (18, 1)
+        } else if cfg!(feature = "llvm19-1") {
+            (19, 1)
         } else {
             panic!("Missing llvm* feature")
         }
diff --git a/llvm-plugin/src/ffi.rs b/llvm-plugin/src/ffi.rs
index 59d1f05..b0b93b4 100644
--- a/llvm-plugin/src/ffi.rs
+++ b/llvm-plugin/src/ffi.rs
@@ -9,6 +9,7 @@ extern "C" {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     ))]
     pub(crate) fn passBuilderAddFullLinkTimeOptimizationLastEPCallback(
         builder: *mut c_void,
@@ -22,6 +23,7 @@ extern "C" {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     ))]
     pub(crate) fn passBuilderAddFullLinkTimeOptimizationEarlyEPCallback(
         builder: *mut c_void,
@@ -35,6 +37,7 @@ extern "C" {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     ))]
     pub(crate) fn passBuilderAddOptimizerEarlyEPCallback(
         builder: *mut c_void,
@@ -52,6 +55,7 @@ extern "C" {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     ))]
     pub(crate) fn passBuilderAddOptimizerLastEPCallback(
         builder: *mut c_void,
@@ -68,6 +72,7 @@ extern "C" {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     ))]
     pub(crate) fn passBuilderAddPipelineEarlySimplificationEPCallback(
         builder: *mut c_void,
@@ -84,6 +89,7 @@ extern "C" {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     ))]
     pub(crate) fn passBuilderAddPipelineStartEPCallback(
         builder: *mut c_void,
@@ -156,6 +162,7 @@ extern "C" {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     ))]
     pub(crate) fn modulePassManagerIsEmpty(manager: *mut c_void) -> bool;
 
@@ -174,6 +181,7 @@ extern "C" {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     ))]
     pub(crate) fn functionPassManagerIsEmpty(manager: *mut c_void) -> bool;
 
diff --git a/llvm-plugin/src/pass_builder.rs b/llvm-plugin/src/pass_builder.rs
index 86059ac..214a003 100644
--- a/llvm-plugin/src/pass_builder.rs
+++ b/llvm-plugin/src/pass_builder.rs
@@ -324,6 +324,7 @@ impl PassBuilder {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     ))]
     pub fn add_pipeline_start_ep_callback<T>(&mut self, cb: T)
     where
@@ -375,6 +376,7 @@ impl PassBuilder {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     ))]
     pub fn add_pipeline_early_simplification_ep_callback<T>(&mut self, cb: T)
     where
@@ -427,6 +429,7 @@ impl PassBuilder {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     ))]
     pub fn add_optimizer_last_ep_callback<T>(&mut self, cb: T)
     where
@@ -475,6 +478,7 @@ impl PassBuilder {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     ))]
     pub fn add_full_lto_early_ep_callback<T>(&mut self, cb: T)
     where
@@ -523,6 +527,7 @@ impl PassBuilder {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     ))]
     pub fn add_full_lto_last_ep_callback<T>(&mut self, cb: T)
     where
@@ -571,6 +576,7 @@ impl PassBuilder {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     ))]
     pub fn add_optimizer_early_ep_callback<T>(&mut self, cb: T)
     where
diff --git a/llvm-plugin/src/pass_manager.rs b/llvm-plugin/src/pass_manager.rs
index c3e6251..143fed8 100644
--- a/llvm-plugin/src/pass_manager.rs
+++ b/llvm-plugin/src/pass_manager.rs
@@ -72,6 +72,7 @@ impl ModulePassManager {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     ))]
     pub fn is_empty(&self) -> bool {
         unsafe { super::modulePassManagerIsEmpty(self.inner) }
@@ -143,6 +144,7 @@ impl FunctionPassManager {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     ))]
     pub fn is_empty(&self) -> bool {
         unsafe { super::functionPassManagerIsEmpty(self.inner) }
diff --git a/tests/plugins/plugin1-lld/Cargo.toml b/tests/plugins/plugin1-lld/Cargo.toml
index 1b4c90a..739f73a 100644
--- a/tests/plugins/plugin1-lld/Cargo.toml
+++ b/tests/plugins/plugin1-lld/Cargo.toml
@@ -18,6 +18,7 @@ llvm15-0 = ["llvm-plugin/llvm15-0"]
 llvm16-0 = ["llvm-plugin/llvm16-0"]
 llvm17-0 = ["llvm-plugin/llvm17-0"]
 llvm18-1 = ["llvm-plugin/llvm18-1"]
+llvm19-1 = ["llvm-plugin/llvm19-1"]
 
 target-x86 = ["llvm-plugin/target-x86"]
 target-arm = ["llvm-plugin/target-arm"]
diff --git a/tests/plugins/plugin1/Cargo.toml b/tests/plugins/plugin1/Cargo.toml
index aa50e4d..64a7a0a 100644
--- a/tests/plugins/plugin1/Cargo.toml
+++ b/tests/plugins/plugin1/Cargo.toml
@@ -19,6 +19,7 @@ llvm15-0 = ["llvm-plugin/llvm15-0"]
 llvm16-0 = ["llvm-plugin/llvm16-0"]
 llvm17-0 = ["llvm-plugin/llvm17-0"]
 llvm18-1 = ["llvm-plugin/llvm18-1"]
+llvm19-1 = ["llvm-plugin/llvm19-1"]
 
 target-x86 = ["llvm-plugin/target-x86"]
 target-arm = ["llvm-plugin/target-arm"]
diff --git a/tests/plugins/plugin2/Cargo.toml b/tests/plugins/plugin2/Cargo.toml
index 11a2a9a..93bb3c5 100644
--- a/tests/plugins/plugin2/Cargo.toml
+++ b/tests/plugins/plugin2/Cargo.toml
@@ -19,6 +19,7 @@ llvm15-0 = ["llvm-plugin/llvm15-0"]
 llvm16-0 = ["llvm-plugin/llvm16-0"]
 llvm17-0 = ["llvm-plugin/llvm17-0"]
 llvm18-1 = ["llvm-plugin/llvm18-1"]
+llvm19-1 = ["llvm-plugin/llvm19-1"]
 
 target-x86 = ["llvm-plugin/target-x86"]
 target-arm = ["llvm-plugin/target-arm"]
diff --git a/tests/plugins/plugin3/Cargo.toml b/tests/plugins/plugin3/Cargo.toml
index 246c5f6..49b39bc 100644
--- a/tests/plugins/plugin3/Cargo.toml
+++ b/tests/plugins/plugin3/Cargo.toml
@@ -19,6 +19,7 @@ llvm15-0 = ["llvm-plugin/llvm15-0"]
 llvm16-0 = ["llvm-plugin/llvm16-0"]
 llvm17-0 = ["llvm-plugin/llvm17-0"]
 llvm18-1 = ["llvm-plugin/llvm18-1"]
+llvm19-1 = ["llvm-plugin/llvm19-1"]
 
 target-x86 = ["llvm-plugin/target-x86"]
 target-arm = ["llvm-plugin/target-arm"]
diff --git a/tests/plugins/plugin4/Cargo.toml b/tests/plugins/plugin4/Cargo.toml
index a024b40..e0fa32d 100644
--- a/tests/plugins/plugin4/Cargo.toml
+++ b/tests/plugins/plugin4/Cargo.toml
@@ -19,6 +19,7 @@ llvm15-0 = ["llvm-plugin/llvm15-0"]
 llvm16-0 = ["llvm-plugin/llvm16-0"]
 llvm17-0 = ["llvm-plugin/llvm17-0"]
 llvm18-1 = ["llvm-plugin/llvm18-1"]
+llvm19-1 = ["llvm-plugin/llvm19-1"]
 
 target-x86 = ["llvm-plugin/target-x86"]
 target-arm = ["llvm-plugin/target-arm"]
diff --git a/tests/plugins/plugin5/Cargo.toml b/tests/plugins/plugin5/Cargo.toml
index a10c583..9934f60 100644
--- a/tests/plugins/plugin5/Cargo.toml
+++ b/tests/plugins/plugin5/Cargo.toml
@@ -19,6 +19,7 @@ llvm15-0 = ["llvm-plugin/llvm15-0"]
 llvm16-0 = ["llvm-plugin/llvm16-0"]
 llvm17-0 = ["llvm-plugin/llvm17-0"]
 llvm18-1 = ["llvm-plugin/llvm18-1"]
+llvm19-1 = ["llvm-plugin/llvm19-1"]
 
 target-x86 = ["llvm-plugin/target-x86"]
 target-arm = ["llvm-plugin/target-arm"]
diff --git a/tests/plugins/plugin6/Cargo.toml b/tests/plugins/plugin6/Cargo.toml
index 3a34fc4..1701a66 100644
--- a/tests/plugins/plugin6/Cargo.toml
+++ b/tests/plugins/plugin6/Cargo.toml
@@ -19,6 +19,7 @@ llvm15-0 = ["llvm-plugin/llvm15-0"]
 llvm16-0 = ["llvm-plugin/llvm16-0"]
 llvm17-0 = ["llvm-plugin/llvm17-0"]
 llvm18-1 = ["llvm-plugin/llvm18-1"]
+llvm19-1 = ["llvm-plugin/llvm19-1"]
 
 target-x86 = ["llvm-plugin/target-x86"]
 target-arm = ["llvm-plugin/target-arm"]
diff --git a/tests/plugins/plugin6/src/lib.rs b/tests/plugins/plugin6/src/lib.rs
index c1b54e6..666a948 100644
--- a/tests/plugins/plugin6/src/lib.rs
+++ b/tests/plugins/plugin6/src/lib.rs
@@ -30,6 +30,7 @@ fn plugin_registrar(builder: &mut PassBuilder) {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     ))]
     builder.add_pipeline_start_ep_callback(|manager, opt| {
         assert!(matches!(opt, OptimizationLevel::O3));
@@ -44,6 +45,7 @@ fn plugin_registrar(builder: &mut PassBuilder) {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     ))]
     builder.add_pipeline_early_simplification_ep_callback(|manager, opt| {
         assert!(matches!(opt, OptimizationLevel::O3));
@@ -59,6 +61,7 @@ fn plugin_registrar(builder: &mut PassBuilder) {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     ))]
     builder.add_optimizer_last_ep_callback(|manager, opt| {
         assert!(matches!(opt, OptimizationLevel::O3));
@@ -70,6 +73,7 @@ fn plugin_registrar(builder: &mut PassBuilder) {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     ))]
     builder.add_optimizer_early_ep_callback(|manager, opt| {
         assert!(matches!(opt, OptimizationLevel::O3));
diff --git a/tests/plugins/plugin7/Cargo.toml b/tests/plugins/plugin7/Cargo.toml
index f9b5ab1..c3b2545 100644
--- a/tests/plugins/plugin7/Cargo.toml
+++ b/tests/plugins/plugin7/Cargo.toml
@@ -19,6 +19,7 @@ llvm15-0 = ["llvm-plugin/llvm15-0"]
 llvm16-0 = ["llvm-plugin/llvm16-0"]
 llvm17-0 = ["llvm-plugin/llvm17-0"]
 llvm18-1 = ["llvm-plugin/llvm18-1"]
+llvm19-1 = ["llvm-plugin/llvm19-1"]
 
 target-x86 = ["llvm-plugin/target-x86"]
 target-arm = ["llvm-plugin/target-arm"]
diff --git a/tests/plugins/plugin7/src/lib.rs b/tests/plugins/plugin7/src/lib.rs
index 9baa749..71f911b 100644
--- a/tests/plugins/plugin7/src/lib.rs
+++ b/tests/plugins/plugin7/src/lib.rs
@@ -8,6 +8,7 @@ fn plugin_registrar(builder: &mut PassBuilder) {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     ))]
     builder.add_full_lto_early_ep_callback(|manager, opt| {
         assert!(matches!(opt, llvm_plugin::OptimizationLevel::O3));
@@ -19,6 +20,7 @@ fn plugin_registrar(builder: &mut PassBuilder) {
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
+        feature = "llvm19-1",
     ))]
     builder.add_full_lto_last_ep_callback(|manager, opt| {
         assert!(matches!(opt, llvm_plugin::OptimizationLevel::O3));

From 8cfe464ab96a3cdaf732d733c4d1c5f7da1bb8c4 Mon Sep 17 00:00:00 2001
From: James Smith <jamesmth@proton.me>
Date: Mon, 23 Jun 2025 16:29:44 +0200
Subject: [PATCH 19/23] refactor(lint): fix `clang-tidy` lints

---
 llvm-plugin/cpp/.clang-tidy | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/llvm-plugin/cpp/.clang-tidy b/llvm-plugin/cpp/.clang-tidy
index 33a45c9..51dc04f 100644
--- a/llvm-plugin/cpp/.clang-tidy
+++ b/llvm-plugin/cpp/.clang-tidy
@@ -1,5 +1,5 @@
 # https://github.com/llvm/llvm-project/blob/main/.clang-tidy
-Checks: '-*,clang-diagnostic-*,llvm-*,misc-*,-misc-unused-parameters,-misc-non-private-member-variables-in-classes,-misc-no-recursion,readability-identifier-naming'
+Checks: '-*,clang-diagnostic-*,llvm-*,misc-*,-misc-const-correctness,-misc-unused-parameters,-misc-non-private-member-variables-in-classes,-misc-no-recursion,-misc-use-anonymous-namespace,readability-identifier-naming,-misc-include-cleaner'
 CheckOptions:
   - key:             readability-identifier-naming.ClassCase
     value:           CamelCase
@@ -7,6 +7,10 @@ CheckOptions:
     value:           CamelCase
   - key:             readability-identifier-naming.FunctionCase
     value:           camelBack
+  # Exclude from scanning as this is an exported symbol used for fuzzing
+  # throughout the code base.
+  - key:             readability-identifier-naming.FunctionIgnoredRegexp
+    value:           "LLVMFuzzerTestOneInput"
   - key:             readability-identifier-naming.MemberCase
     value:           CamelCase
   - key:             readability-identifier-naming.ParameterCase

From db7e714ab69aa5b1527257572c0947bdef034c14 Mon Sep 17 00:00:00 2001
From: James Smith <jamesmth@proton.me>
Date: Mon, 23 Jun 2025 15:46:49 +0200
Subject: [PATCH 20/23] feat: remove llvm 10 support

---
 .github/workflows/linux.yml      |  1 -
 README.md                        |  2 +-
 examples/README.md               | 10 +++++-----
 llvm-plugin/Cargo.toml           |  3 +--
 llvm-plugin/build.rs             |  4 +---
 llvm-plugin/cpp/ffi.cc           | 20 --------------------
 llvm-plugin/src/ffi.rs           | 11 -----------
 llvm-plugin/src/lib.rs           |  4 ----
 llvm-plugin/src/pass_builder.rs  | 11 -----------
 tests/plugins/plugin1/Cargo.toml |  1 -
 tests/plugins/plugin2/Cargo.toml |  1 -
 tests/plugins/plugin3/Cargo.toml |  1 -
 tests/plugins/plugin4/Cargo.toml |  1 -
 tests/plugins/plugin5/Cargo.toml |  1 -
 tests/plugins/plugin6/Cargo.toml |  1 -
 tests/plugins/plugin6/src/lib.rs | 11 -----------
 tests/plugins/plugin7/Cargo.toml |  1 -
 17 files changed, 8 insertions(+), 76 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 0f8b398..04330de 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -16,7 +16,6 @@ jobs:
     strategy:
       matrix:
         llvm-version:
-          - ["10", "10-0", "v10.0.1-rust-1.46/llvm-10.0.1-rust-1.46-linux-x86_64.tar.gz", "libLLVM-10.so"]
           - ["11", "11-0", "v11.0.1-rust-1.51/llvm-lld-11.0.1-rust-1.51-linux-x86_64.tar.gz", "libLLVM-11.so"]
           - ["12", "12-0", "v12.0.1-rust-1.55/llvm-lld-12.0.1-rust-1.55-linux-x86_64.tar.gz", "libLLVM-12.so"]
           - ["13", "13-0", "v13.0.0-rust-1.59/llvm-lld-13.0.0-rust-1.59-linux-x86_64.tar.gz", "libLLVM-13.so"]
diff --git a/README.md b/README.md
index 059b941..385f7ec 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ When importing this crate in your `Cargo.toml`, you will need to specify the LLV
 llvm-plugin = { git = "https://github.com/jamesmth/llvm-plugin-rs", features = ["llvm19-1"] }
 ```
 
-Supported versions: LLVM 10-19 mapping to a cargo feature flag `llvmX-Y` where `X` and `Y` are the LLVM major and minor versions.
+Supported versions: LLVM 11-19 mapping to a cargo feature flag `llvmX-Y` where `X` and `Y` are the LLVM major and minor versions.
 
 ## Getting Started
 
diff --git a/examples/README.md b/examples/README.md
index b801c80..b62eb54 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -9,7 +9,7 @@ achieved with simple LLVM passes.
     <summary><em>Execute the example</em></summary>
 
     ```shell
-    $ cargo b --example hello-world --features llvm10-0
+    $ cargo b --example hello-world --features llvm19-1
     $ opt --load-pass-plugin=target/debug/examples/libhello_world.so --passes=hello-world in.ll -S -o out.ll
     ```
 
@@ -21,7 +21,7 @@ achieved with simple LLVM passes.
     <summary><em>Execute the example</em></summary>
 
     ```shell
-    $ cargo b --example opcode-counter --features llvm10-0
+    $ cargo b --example opcode-counter --features llvm19-1
     $ opt --load-pass-plugin=target/debug/examples/libopcode_counter.so --passes=opcode-counter-printer in.ll -S -o out.ll
     ```
 
@@ -33,7 +33,7 @@ achieved with simple LLVM passes.
     <summary><em>Execute the example</em></summary>
 
     ```shell
-    $ cargo b --example inject-printf --features llvm10-0
+    $ cargo b --example inject-printf --features llvm19-1
     $ opt --load-pass-plugin=target/debug/examples/libinject_printf.so --passes=inject-func-call in.ll -S -o out.ll
     ```
 
@@ -45,7 +45,7 @@ achieved with simple LLVM passes.
     <summary><em>Execute the example</em></summary>
 
     ```shell
-    $ cargo b --example static-call-counter --features llvm10-0
+    $ cargo b --example static-call-counter --features llvm19-1
     $ opt --load-pass-plugin=target/debug/examples/libstatic_call_counter.so --passes=static-cc-printer in.ll -S -o out.ll
     ```
 
@@ -57,7 +57,7 @@ achieved with simple LLVM passes.
     <summary><em>Execute the example</em></summary>
 
     ```shell
-    $ cargo b --example string-obf --features llvm10-0
+    $ cargo b --example string-obf --features llvm19-1
     $ opt --load-pass-plugin=target/debug/examples/libstring_obf.so --passes=string-obfuscator-pass in.ll -S -o out.ll
     ```
 
diff --git a/llvm-plugin/Cargo.toml b/llvm-plugin/Cargo.toml
index 08339ea..e1858a3 100644
--- a/llvm-plugin/Cargo.toml
+++ b/llvm-plugin/Cargo.toml
@@ -12,7 +12,7 @@ readme = "README.md"
 repository = "https://github.com/jamesmth/llvm-plugin-rs"
 
 [package.metadata.docs.rs]
-features = ["llvm15-0"]            # any version >10 will do
+features = ["llvm15-0"]
 rustdoc-args = ["--cfg", "docsrs"]
 
 [features]
@@ -24,7 +24,6 @@ macros = ["llvm-plugin-macros"]
 win-link-opt = []
 win-link-lld = []
 
-llvm10-0 = ["inkwell/llvm10-0-no-llvm-linking"]
 llvm11-0 = ["inkwell/llvm11-0-no-llvm-linking"]
 llvm12-0 = ["inkwell/llvm12-0-no-llvm-linking"]
 llvm13-0 = ["inkwell/llvm13-0-no-llvm-linking"]
diff --git a/llvm-plugin/build.rs b/llvm-plugin/build.rs
index 8b11b97..229740e 100644
--- a/llvm-plugin/build.rs
+++ b/llvm-plugin/build.rs
@@ -198,9 +198,7 @@ mod llvm_sys {
     }
 
     fn llvm_version_from_features() -> (u32, u32) {
-        if cfg!(feature = "llvm10-0") {
-            (10, 0)
-        } else if cfg!(feature = "llvm11-0") {
+        if cfg!(feature = "llvm11-0") {
             (11, 0)
         } else if cfg!(feature = "llvm12-0") {
             (12, 0)
diff --git a/llvm-plugin/cpp/ffi.cc b/llvm-plugin/cpp/ffi.cc
index 39b3e6f..0fdc2a2 100644
--- a/llvm-plugin/cpp/ffi.cc
+++ b/llvm-plugin/cpp/ffi.cc
@@ -25,23 +25,6 @@ enum class OptimizationLevel { kO0, kO1, kO2, kO3, kOs, kOz };
 
 namespace {
 auto getFFIOptimizationLevel(LlvmOptLevel Opt) -> OptimizationLevel {
-#if defined(LLVM_VERSION_MAJOR) && (LLVM_VERSION_MAJOR == 10)
-  if (Opt == LlvmOptLevel::O0) {
-    return OptimizationLevel::kO0;
-  }
-  if (Opt == LlvmOptLevel::O1) {
-    return OptimizationLevel::kO1;
-  }
-  if (Opt == LlvmOptLevel::O2) {
-    return OptimizationLevel::kO2;
-  }
-  if (Opt == LlvmOptLevel::O3) {
-    return OptimizationLevel::kO3;
-  }
-  if (Opt == LlvmOptLevel::Os) {
-    return OptimizationLevel::kOs;
-  }
-#else
   // Starting from LLVM-11, llvm::OptimizationLevel::Ox is no longer
   // an enum but a global static. Using these global statics on Windows
   // would not compile, because an LLVM plugin links to opt.exe. The
@@ -64,7 +47,6 @@ auto getFFIOptimizationLevel(LlvmOptLevel Opt) -> OptimizationLevel {
   if (Opt.getSpeedupLevel() == 2 && Opt.getSizeLevel() == 2) {
     return OptimizationLevel::kOz;
   }
-#endif
   return OptimizationLevel::kOz;
 }
 } // namespace
@@ -127,7 +109,6 @@ auto passBuilderAddFullLinkTimeOptimizationEarlyEPCallback(
 }
 #endif
 
-#if defined(LLVM_VERSION_MAJOR) && (LLVM_VERSION_MAJOR >= 11)
 auto passBuilderAddOptimizerLastEPCallback(
     llvm::PassBuilder &Builder, const void *DataPtr,
     void (*Deleter)(const void *),
@@ -142,7 +123,6 @@ auto passBuilderAddOptimizerLastEPCallback(
         Callback(Data.get(), PassManager, OptFFI);
       });
 }
-#endif
 
 #if defined(LLVM_VERSION_MAJOR) && (LLVM_VERSION_MAJOR >= 15)
 auto passBuilderAddOptimizerEarlyEPCallback(
diff --git a/llvm-plugin/src/ffi.rs b/llvm-plugin/src/ffi.rs
index b0b93b4..435e87e 100644
--- a/llvm-plugin/src/ffi.rs
+++ b/llvm-plugin/src/ffi.rs
@@ -46,17 +46,6 @@ extern "C" {
         cb_sys: extern "C" fn(*const c_void, *mut c_void, crate::OptimizationLevel),
     );
 
-    #[cfg(any(
-        feature = "llvm11-0",
-        feature = "llvm12-0",
-        feature = "llvm13-0",
-        feature = "llvm14-0",
-        feature = "llvm15-0",
-        feature = "llvm16-0",
-        feature = "llvm17-0",
-        feature = "llvm18-1",
-        feature = "llvm19-1",
-    ))]
     pub(crate) fn passBuilderAddOptimizerLastEPCallback(
         builder: *mut c_void,
         cb: *const c_void,
diff --git a/llvm-plugin/src/lib.rs b/llvm-plugin/src/lib.rs
index 1fcc7ca..23bac64 100644
--- a/llvm-plugin/src/lib.rs
+++ b/llvm-plugin/src/lib.rs
@@ -308,10 +308,6 @@ pub struct PassPluginLibraryInfo {
 #[cfg(feature = "macros")]
 pub use llvm_plugin_macros::*;
 
-// See https://github.com/jamesmth/llvm-plugin-rs/issues/3
-#[cfg(all(target_os = "windows", feature = "llvm10-0"))]
-compile_error!("LLVM 10 not supported on Windows");
-
 #[cfg(all(
     target_os = "windows",
     any(
diff --git a/llvm-plugin/src/pass_builder.rs b/llvm-plugin/src/pass_builder.rs
index 214a003..af5c103 100644
--- a/llvm-plugin/src/pass_builder.rs
+++ b/llvm-plugin/src/pass_builder.rs
@@ -420,17 +420,6 @@ impl PassBuilder {
     ///
     /// This extension point allows adding passes that run after everything
     /// else.
-    #[cfg(any(
-        feature = "llvm11-0",
-        feature = "llvm12-0",
-        feature = "llvm13-0",
-        feature = "llvm14-0",
-        feature = "llvm15-0",
-        feature = "llvm16-0",
-        feature = "llvm17-0",
-        feature = "llvm18-1",
-        feature = "llvm19-1",
-    ))]
     pub fn add_optimizer_last_ep_callback<T>(&mut self, cb: T)
     where
         T: Fn(&mut ModulePassManager, OptimizationLevel) + 'static,
diff --git a/tests/plugins/plugin1/Cargo.toml b/tests/plugins/plugin1/Cargo.toml
index 64a7a0a..cb66ef1 100644
--- a/tests/plugins/plugin1/Cargo.toml
+++ b/tests/plugins/plugin1/Cargo.toml
@@ -10,7 +10,6 @@ crate-type = ["cdylib"]
 default = ["target-all"]
 win-link-opt = ["llvm-plugin/win-link-opt"]
 
-llvm10-0 = ["llvm-plugin/llvm10-0"]
 llvm11-0 = ["llvm-plugin/llvm11-0"]
 llvm12-0 = ["llvm-plugin/llvm12-0"]
 llvm13-0 = ["llvm-plugin/llvm13-0"]
diff --git a/tests/plugins/plugin2/Cargo.toml b/tests/plugins/plugin2/Cargo.toml
index 93bb3c5..0ae954a 100644
--- a/tests/plugins/plugin2/Cargo.toml
+++ b/tests/plugins/plugin2/Cargo.toml
@@ -10,7 +10,6 @@ crate-type = ["cdylib"]
 default = ["target-all"]
 win-link-opt = ["llvm-plugin/win-link-opt"]
 
-llvm10-0 = ["llvm-plugin/llvm10-0"]
 llvm11-0 = ["llvm-plugin/llvm11-0"]
 llvm12-0 = ["llvm-plugin/llvm12-0"]
 llvm13-0 = ["llvm-plugin/llvm13-0"]
diff --git a/tests/plugins/plugin3/Cargo.toml b/tests/plugins/plugin3/Cargo.toml
index 49b39bc..98d5158 100644
--- a/tests/plugins/plugin3/Cargo.toml
+++ b/tests/plugins/plugin3/Cargo.toml
@@ -10,7 +10,6 @@ crate-type = ["cdylib"]
 default = ["target-all"]
 win-link-opt = ["llvm-plugin/win-link-opt"]
 
-llvm10-0 = ["llvm-plugin/llvm10-0"]
 llvm11-0 = ["llvm-plugin/llvm11-0"]
 llvm12-0 = ["llvm-plugin/llvm12-0"]
 llvm13-0 = ["llvm-plugin/llvm13-0"]
diff --git a/tests/plugins/plugin4/Cargo.toml b/tests/plugins/plugin4/Cargo.toml
index e0fa32d..3a92048 100644
--- a/tests/plugins/plugin4/Cargo.toml
+++ b/tests/plugins/plugin4/Cargo.toml
@@ -10,7 +10,6 @@ crate-type = ["cdylib"]
 default = ["target-all"]
 win-link-opt = ["llvm-plugin/win-link-opt"]
 
-llvm10-0 = ["llvm-plugin/llvm10-0"]
 llvm11-0 = ["llvm-plugin/llvm11-0"]
 llvm12-0 = ["llvm-plugin/llvm12-0"]
 llvm13-0 = ["llvm-plugin/llvm13-0"]
diff --git a/tests/plugins/plugin5/Cargo.toml b/tests/plugins/plugin5/Cargo.toml
index 9934f60..479c288 100644
--- a/tests/plugins/plugin5/Cargo.toml
+++ b/tests/plugins/plugin5/Cargo.toml
@@ -10,7 +10,6 @@ crate-type = ["cdylib"]
 default = ["target-all"]
 win-link-opt = ["llvm-plugin/win-link-opt"]
 
-llvm10-0 = ["llvm-plugin/llvm10-0"]
 llvm11-0 = ["llvm-plugin/llvm11-0"]
 llvm12-0 = ["llvm-plugin/llvm12-0"]
 llvm13-0 = ["llvm-plugin/llvm13-0"]
diff --git a/tests/plugins/plugin6/Cargo.toml b/tests/plugins/plugin6/Cargo.toml
index 1701a66..f086430 100644
--- a/tests/plugins/plugin6/Cargo.toml
+++ b/tests/plugins/plugin6/Cargo.toml
@@ -10,7 +10,6 @@ crate-type = ["cdylib"]
 default = ["target-all"]
 win-link-opt = ["llvm-plugin/win-link-opt"]
 
-llvm10-0 = ["llvm-plugin/llvm10-0"]
 llvm11-0 = ["llvm-plugin/llvm11-0"]
 llvm12-0 = ["llvm-plugin/llvm12-0"]
 llvm13-0 = ["llvm-plugin/llvm13-0"]
diff --git a/tests/plugins/plugin6/src/lib.rs b/tests/plugins/plugin6/src/lib.rs
index 666a948..cd6a3b0 100644
--- a/tests/plugins/plugin6/src/lib.rs
+++ b/tests/plugins/plugin6/src/lib.rs
@@ -52,17 +52,6 @@ fn plugin_registrar(builder: &mut PassBuilder) {
         manager.add_pass(PipelineEarlySimpPass);
     });
 
-    #[cfg(any(
-        feature = "llvm11-0",
-        feature = "llvm12-0",
-        feature = "llvm13-0",
-        feature = "llvm14-0",
-        feature = "llvm15-0",
-        feature = "llvm16-0",
-        feature = "llvm17-0",
-        feature = "llvm18-1",
-        feature = "llvm19-1",
-    ))]
     builder.add_optimizer_last_ep_callback(|manager, opt| {
         assert!(matches!(opt, OptimizationLevel::O3));
         manager.add_pass(OptimizerLastPass);
diff --git a/tests/plugins/plugin7/Cargo.toml b/tests/plugins/plugin7/Cargo.toml
index c3b2545..764be2f 100644
--- a/tests/plugins/plugin7/Cargo.toml
+++ b/tests/plugins/plugin7/Cargo.toml
@@ -10,7 +10,6 @@ crate-type = ["cdylib"]
 default = ["target-all"]
 win-link-opt = ["llvm-plugin/win-link-opt"]
 
-llvm10-0 = ["llvm-plugin/llvm10-0"]
 llvm11-0 = ["llvm-plugin/llvm11-0"]
 llvm12-0 = ["llvm-plugin/llvm12-0"]
 llvm13-0 = ["llvm-plugin/llvm13-0"]

From 23a495da660eec6256fc44c65d8924bf41ee4b92 Mon Sep 17 00:00:00 2001
From: James Smith <jamesmth@proton.me>
Date: Sat, 28 Jun 2025 17:50:16 +0200
Subject: [PATCH 21/23] feat: add llvm 20 support

---
 .github/workflows/linux.yml          |  2 ++
 .github/workflows/macos.yml          |  1 +
 .github/workflows/windows.yml        |  2 ++
 README.md                            |  4 ++--
 examples/README.md                   | 10 +++++-----
 examples/inject_printf.rs            |  2 ++
 examples/strings.rs                  |  8 ++++++++
 llvm-plugin/Cargo.toml               |  1 +
 llvm-plugin/build.rs                 |  2 ++
 llvm-plugin/cpp/ffi.cc               | 15 +++++++++++++++
 llvm-plugin/src/ffi.rs               |  7 +++++++
 llvm-plugin/src/pass_builder.rs      |  5 +++++
 llvm-plugin/src/pass_manager.rs      |  2 ++
 tests/plugins/plugin1-lld/Cargo.toml |  1 +
 tests/plugins/plugin1/Cargo.toml     |  1 +
 tests/plugins/plugin2/Cargo.toml     |  1 +
 tests/plugins/plugin3/Cargo.toml     |  1 +
 tests/plugins/plugin4/Cargo.toml     |  1 +
 tests/plugins/plugin5/Cargo.toml     |  1 +
 tests/plugins/plugin6/Cargo.toml     |  1 +
 tests/plugins/plugin6/src/lib.rs     |  3 +++
 tests/plugins/plugin7/Cargo.toml     |  3 ++-
 tests/plugins/plugin7/src/lib.rs     |  2 ++
 23 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 04330de..337ebc4 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -25,6 +25,7 @@ jobs:
           - ["17", "17-0", "v17.0.6-rust-1.75/llvm-lld-17.0.6-rust-1.75-linux-x86_64.tar.gz", "libLLVM-17.so"]
           - ["18", "18-1", "v18.1.2-rust-1.78/llvm-lld-18.1.2-rust-1.78-linux-x86_64.tar.gz", "libLLVM.so.18.1"]
           - ["19", "19-1", "v19.1.5-rust-1.84/llvm-lld-19.1.5-rust-1.84-linux-x86_64.tar.gz", "libLLVM.so.19.1"]
+          - ["20", "20-1", "v20.1.1-rust-1.87/llvm-lld-20.1.1-rust-1.87-linux-x86_64.tar.gz", "libLLVM.so.20.1"]
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -150,6 +151,7 @@ jobs:
           - ["17", "17-0", "1.75", "v17.0.6-rust-1.75/llvm-lld-17.0.6-rust-1.75-linux-x86_64.tar.gz", "libLLVM-17.so"]
           - ["18", "18-1", "1.78", "v18.1.2-rust-1.78/llvm-lld-18.1.2-rust-1.78-linux-x86_64.tar.gz", "libLLVM.so.18.1"]
           - ["19", "19-1", "1.84", "v19.1.5-rust-1.84/llvm-lld-19.1.5-rust-1.84-linux-x86_64.tar.gz", "libLLVM.so.19.1"]
+          - ["20", "20-1", "1.87", "v20.1.1-rust-1.87/llvm-lld-20.1.1-rust-1.87-linux-x86_64.tar.gz", "libLLVM.so.20.1"]
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 5df409c..170dff1 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -25,6 +25,7 @@ jobs:
           - ["17", "17-0", "v17.0.6-rust-1.75/llvm-lld-17.0.6-rust-1.75-macos-x86_64.tar.gz", "macos-13"]
           - ["18", "18-1", "v18.1.2-rust-1.78/llvm-lld-18.1.2-rust-1.78-macos-arm64.tar.gz", "macos-latest"]
           - ["19", "19-1", "v19.1.5-rust-1.84/llvm-lld-19.1.5-rust-1.84-macos-arm64.tar.gz", "macos-latest"]
+          - ["20", "20-1", "v20.1.1-rust-1.87/llvm-lld-20.1.1-rust-1.87-macos-arm64.tar.gz", "macos-latest"]
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 8a9a303..51f57c9 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -25,6 +25,7 @@ jobs:
           - ["17", "17-0", "v17.0.6-rust-1.75/llvm-lld-17.0.6-rust-1.75-windows-x86_64.7z"]
           - ["18", "18-1", "v18.1.2-rust-1.78/llvm-lld-18.1.2-rust-1.78-windows-x86_64.7z"]
           - ["19", "19-1", "v19.1.5-rust-1.84/llvm-lld-19.1.5-rust-1.84-windows-x86_64.7z"]
+          - ["20", "20-1", "v20.1.1-rust-1.87/llvm-lld-20.1.1-rust-1.87-windows-x86_64.7z"]
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -149,6 +150,7 @@ jobs:
           - ["17", "17-0", "1.75", "v17.0.6-rust-1.75/llvm-lld-17.0.6-rust-1.75-windows-x86_64.7z"]
           - ["18", "18-1", "1.78", "v18.1.2-rust-1.78/llvm-lld-18.1.2-rust-1.78-windows-x86_64.7z"]
           - ["19", "19-1", "1.84", "v19.1.5-rust-1.84/llvm-lld-19.1.5-rust-1.84-windows-x86_64.7z"]
+          - ["20", "20-1", "1.87", "v20.1.1-rust-1.87/llvm-lld-20.1.1-rust-1.87-windows-x86_64.7z"]
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
diff --git a/README.md b/README.md
index 385f7ec..8bdebcc 100644
--- a/README.md
+++ b/README.md
@@ -27,10 +27,10 @@ When importing this crate in your `Cargo.toml`, you will need to specify the LLV
 
 ```toml
 [dependencies]
-llvm-plugin = { git = "https://github.com/jamesmth/llvm-plugin-rs", features = ["llvm19-1"] }
+llvm-plugin = { git = "https://github.com/jamesmth/llvm-plugin-rs", features = ["llvm20-1"] }
 ```
 
-Supported versions: LLVM 11-19 mapping to a cargo feature flag `llvmX-Y` where `X` and `Y` are the LLVM major and minor versions.
+Supported versions: LLVM 11-20 mapping to a cargo feature flag `llvmX-Y` where `X` and `Y` are the LLVM major and minor versions.
 
 ## Getting Started
 
diff --git a/examples/README.md b/examples/README.md
index b62eb54..7a9cf5d 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -9,7 +9,7 @@ achieved with simple LLVM passes.
     <summary><em>Execute the example</em></summary>
 
     ```shell
-    $ cargo b --example hello-world --features llvm19-1
+    $ cargo b --example hello-world --features llvm20-1
     $ opt --load-pass-plugin=target/debug/examples/libhello_world.so --passes=hello-world in.ll -S -o out.ll
     ```
 
@@ -21,7 +21,7 @@ achieved with simple LLVM passes.
     <summary><em>Execute the example</em></summary>
 
     ```shell
-    $ cargo b --example opcode-counter --features llvm19-1
+    $ cargo b --example opcode-counter --features llvm20-1
     $ opt --load-pass-plugin=target/debug/examples/libopcode_counter.so --passes=opcode-counter-printer in.ll -S -o out.ll
     ```
 
@@ -33,7 +33,7 @@ achieved with simple LLVM passes.
     <summary><em>Execute the example</em></summary>
 
     ```shell
-    $ cargo b --example inject-printf --features llvm19-1
+    $ cargo b --example inject-printf --features llvm20-1
     $ opt --load-pass-plugin=target/debug/examples/libinject_printf.so --passes=inject-func-call in.ll -S -o out.ll
     ```
 
@@ -45,7 +45,7 @@ achieved with simple LLVM passes.
     <summary><em>Execute the example</em></summary>
 
     ```shell
-    $ cargo b --example static-call-counter --features llvm19-1
+    $ cargo b --example static-call-counter --features llvm20-1
     $ opt --load-pass-plugin=target/debug/examples/libstatic_call_counter.so --passes=static-cc-printer in.ll -S -o out.ll
     ```
 
@@ -57,7 +57,7 @@ achieved with simple LLVM passes.
     <summary><em>Execute the example</em></summary>
 
     ```shell
-    $ cargo b --example string-obf --features llvm19-1
+    $ cargo b --example string-obf --features llvm20-1
     $ opt --load-pass-plugin=target/debug/examples/libstring_obf.so --passes=string-obfuscator-pass in.ll -S -o out.ll
     ```
 
diff --git a/examples/inject_printf.rs b/examples/inject_printf.rs
index 72d222c..0e21af0 100644
--- a/examples/inject_printf.rs
+++ b/examples/inject_printf.rs
@@ -14,6 +14,7 @@ use llvm_plugin::{
     feature = "llvm17-0",
     feature = "llvm18-1",
     feature = "llvm19-1",
+    feature = "llvm20-1",
 )))]
 macro_rules! ptr_type {
     ($cx:ident, $ty:ident) => {
@@ -26,6 +27,7 @@ macro_rules! ptr_type {
     feature = "llvm17-0",
     feature = "llvm18-1",
     feature = "llvm19-1",
+    feature = "llvm20-1",
 ))]
 macro_rules! ptr_type {
     ($cx:ident, $ty:ident) => {
diff --git a/examples/strings.rs b/examples/strings.rs
index 273ee66..c1f2362 100644
--- a/examples/strings.rs
+++ b/examples/strings.rs
@@ -16,6 +16,7 @@ use llvm_plugin::{
     feature = "llvm17-0",
     feature = "llvm18-1",
     feature = "llvm19-1",
+    feature = "llvm20-1",
 )))]
 macro_rules! ptr_type {
     ($cx:ident, $ty:ident) => {
@@ -28,6 +29,7 @@ macro_rules! ptr_type {
     feature = "llvm17-0",
     feature = "llvm18-1",
     feature = "llvm19-1",
+    feature = "llvm20-1",
 ))]
 macro_rules! ptr_type {
     ($cx:ident, $ty:ident) => {
@@ -192,6 +194,7 @@ fn create_decode_fn<'a>(module: &mut Module<'a>) -> FunctionValue<'a> {
         feature = "llvm17-0",
         feature = "llvm18-1",
         feature = "llvm19-1",
+        feature = "llvm20-1",
     )))]
     let var10 = unsafe {
         builder.build_gep(
@@ -207,6 +210,7 @@ fn create_decode_fn<'a>(module: &mut Module<'a>) -> FunctionValue<'a> {
         feature = "llvm17-0",
         feature = "llvm18-1",
         feature = "llvm19-1",
+        feature = "llvm20-1",
     ))]
     let var10 = unsafe {
         builder.build_gep(
@@ -223,6 +227,7 @@ fn create_decode_fn<'a>(module: &mut Module<'a>) -> FunctionValue<'a> {
         feature = "llvm17-0",
         feature = "llvm18-1",
         feature = "llvm19-1",
+        feature = "llvm20-1",
     )))]
     let var11 = builder
         .build_load(phi1.as_basic_value().into_pointer_value(), "")
@@ -233,6 +238,7 @@ fn create_decode_fn<'a>(module: &mut Module<'a>) -> FunctionValue<'a> {
         feature = "llvm17-0",
         feature = "llvm18-1",
         feature = "llvm19-1",
+        feature = "llvm20-1",
     ))]
     let var11 = builder
         .build_load(cx.i8_type(), phi1.as_basic_value().into_pointer_value(), "")
@@ -292,6 +298,7 @@ fn create_decode_stub<'a>(
                     feature = "llvm17-0",
                     feature = "llvm18-1",
                     feature = "llvm19-1",
+                    feature = "llvm20-1",
                 )))]
                 let s = builder
                     .build_struct_gep(gs.as_pointer_value(), id, "")
@@ -302,6 +309,7 @@ fn create_decode_stub<'a>(
                     feature = "llvm17-0",
                     feature = "llvm18-1",
                     feature = "llvm19-1",
+                    feature = "llvm20-1",
                 ))]
                 let s = {
                     let i8_ty_ptr = ptr_type!(cx, i8_type);
diff --git a/llvm-plugin/Cargo.toml b/llvm-plugin/Cargo.toml
index e1858a3..47911b8 100644
--- a/llvm-plugin/Cargo.toml
+++ b/llvm-plugin/Cargo.toml
@@ -33,6 +33,7 @@ llvm16-0 = ["inkwell/llvm16-0-no-llvm-linking"]
 llvm17-0 = ["inkwell/llvm17-0-no-llvm-linking"]
 llvm18-1 = ["inkwell/llvm18-1-no-llvm-linking"]
 llvm19-1 = ["inkwell/llvm19-1-no-llvm-linking"]
+llvm20-1 = ["inkwell/llvm20-1-no-llvm-linking"]
 
 target-x86 = ["inkwell/target-x86"]
 target-arm = ["inkwell/target-arm"]
diff --git a/llvm-plugin/build.rs b/llvm-plugin/build.rs
index 229740e..b319f71 100644
--- a/llvm-plugin/build.rs
+++ b/llvm-plugin/build.rs
@@ -216,6 +216,8 @@ mod llvm_sys {
             (18, 1)
         } else if cfg!(feature = "llvm19-1") {
             (19, 1)
+        } else if cfg!(feature = "llvm20-1") {
+            (20, 1)
         } else {
             panic!("Missing llvm* feature")
         }
diff --git a/llvm-plugin/cpp/ffi.cc b/llvm-plugin/cpp/ffi.cc
index 0fdc2a2..a52aae1 100644
--- a/llvm-plugin/cpp/ffi.cc
+++ b/llvm-plugin/cpp/ffi.cc
@@ -118,7 +118,12 @@ auto passBuilderAddOptimizerLastEPCallback(
 
   Builder.registerOptimizerLastEPCallback(
       [Data = std::move(Data), Callback](llvm::ModulePassManager &PassManager,
+#if (LLVM_VERSION_MAJOR >= 20)
+                                         LlvmOptLevel Opt,
+                                         llvm::ThinOrFullLTOPhase) {
+#else
                                          LlvmOptLevel Opt) {
+#endif
         const auto OptFFI = getFFIOptimizationLevel(Opt);
         Callback(Data.get(), PassManager, OptFFI);
       });
@@ -134,7 +139,12 @@ auto passBuilderAddOptimizerEarlyEPCallback(
 
   Builder.registerOptimizerEarlyEPCallback(
       [Data = std::move(Data), Callback](llvm::ModulePassManager &PassManager,
+#if (LLVM_VERSION_MAJOR >= 20)
+                                         LlvmOptLevel Opt,
+                                         llvm::ThinOrFullLTOPhase) {
+#else
                                          LlvmOptLevel Opt) {
+#endif
         const auto OptFFI = getFFIOptimizationLevel(Opt);
         Callback(Data.get(), PassManager, OptFFI);
       });
@@ -151,7 +161,12 @@ auto passBuilderAddPipelineEarlySimplificationEPCallback(
 
   Builder.registerPipelineEarlySimplificationEPCallback(
       [Data = std::move(Data), Callback](llvm::ModulePassManager &PassManager,
+#if (LLVM_VERSION_MAJOR >= 20)
+                                         LlvmOptLevel Opt,
+                                         llvm::ThinOrFullLTOPhase) {
+#else
                                          LlvmOptLevel Opt) {
+#endif
         const auto OptFFI = getFFIOptimizationLevel(Opt);
         Callback(Data.get(), PassManager, OptFFI);
       });
diff --git a/llvm-plugin/src/ffi.rs b/llvm-plugin/src/ffi.rs
index 435e87e..501d45a 100644
--- a/llvm-plugin/src/ffi.rs
+++ b/llvm-plugin/src/ffi.rs
@@ -10,6 +10,7 @@ extern "C" {
         feature = "llvm17-0",
         feature = "llvm18-1",
         feature = "llvm19-1",
+        feature = "llvm20-1",
     ))]
     pub(crate) fn passBuilderAddFullLinkTimeOptimizationLastEPCallback(
         builder: *mut c_void,
@@ -24,6 +25,7 @@ extern "C" {
         feature = "llvm17-0",
         feature = "llvm18-1",
         feature = "llvm19-1",
+        feature = "llvm20-1",
     ))]
     pub(crate) fn passBuilderAddFullLinkTimeOptimizationEarlyEPCallback(
         builder: *mut c_void,
@@ -38,6 +40,7 @@ extern "C" {
         feature = "llvm17-0",
         feature = "llvm18-1",
         feature = "llvm19-1",
+        feature = "llvm20-1",
     ))]
     pub(crate) fn passBuilderAddOptimizerEarlyEPCallback(
         builder: *mut c_void,
@@ -62,6 +65,7 @@ extern "C" {
         feature = "llvm17-0",
         feature = "llvm18-1",
         feature = "llvm19-1",
+        feature = "llvm20-1",
     ))]
     pub(crate) fn passBuilderAddPipelineEarlySimplificationEPCallback(
         builder: *mut c_void,
@@ -79,6 +83,7 @@ extern "C" {
         feature = "llvm17-0",
         feature = "llvm18-1",
         feature = "llvm19-1",
+        feature = "llvm20-1",
     ))]
     pub(crate) fn passBuilderAddPipelineStartEPCallback(
         builder: *mut c_void,
@@ -152,6 +157,7 @@ extern "C" {
         feature = "llvm17-0",
         feature = "llvm18-1",
         feature = "llvm19-1",
+        feature = "llvm20-1",
     ))]
     pub(crate) fn modulePassManagerIsEmpty(manager: *mut c_void) -> bool;
 
@@ -171,6 +177,7 @@ extern "C" {
         feature = "llvm17-0",
         feature = "llvm18-1",
         feature = "llvm19-1",
+        feature = "llvm20-1",
     ))]
     pub(crate) fn functionPassManagerIsEmpty(manager: *mut c_void) -> bool;
 
diff --git a/llvm-plugin/src/pass_builder.rs b/llvm-plugin/src/pass_builder.rs
index af5c103..7bd863d 100644
--- a/llvm-plugin/src/pass_builder.rs
+++ b/llvm-plugin/src/pass_builder.rs
@@ -325,6 +325,7 @@ impl PassBuilder {
         feature = "llvm17-0",
         feature = "llvm18-1",
         feature = "llvm19-1",
+        feature = "llvm20-1",
     ))]
     pub fn add_pipeline_start_ep_callback<T>(&mut self, cb: T)
     where
@@ -377,6 +378,7 @@ impl PassBuilder {
         feature = "llvm17-0",
         feature = "llvm18-1",
         feature = "llvm19-1",
+        feature = "llvm20-1",
     ))]
     pub fn add_pipeline_early_simplification_ep_callback<T>(&mut self, cb: T)
     where
@@ -468,6 +470,7 @@ impl PassBuilder {
         feature = "llvm17-0",
         feature = "llvm18-1",
         feature = "llvm19-1",
+        feature = "llvm20-1",
     ))]
     pub fn add_full_lto_early_ep_callback<T>(&mut self, cb: T)
     where
@@ -517,6 +520,7 @@ impl PassBuilder {
         feature = "llvm17-0",
         feature = "llvm18-1",
         feature = "llvm19-1",
+        feature = "llvm20-1",
     ))]
     pub fn add_full_lto_last_ep_callback<T>(&mut self, cb: T)
     where
@@ -566,6 +570,7 @@ impl PassBuilder {
         feature = "llvm17-0",
         feature = "llvm18-1",
         feature = "llvm19-1",
+        feature = "llvm20-1",
     ))]
     pub fn add_optimizer_early_ep_callback<T>(&mut self, cb: T)
     where
diff --git a/llvm-plugin/src/pass_manager.rs b/llvm-plugin/src/pass_manager.rs
index 143fed8..317c9b2 100644
--- a/llvm-plugin/src/pass_manager.rs
+++ b/llvm-plugin/src/pass_manager.rs
@@ -73,6 +73,7 @@ impl ModulePassManager {
         feature = "llvm17-0",
         feature = "llvm18-1",
         feature = "llvm19-1",
+        feature = "llvm20-1",
     ))]
     pub fn is_empty(&self) -> bool {
         unsafe { super::modulePassManagerIsEmpty(self.inner) }
@@ -145,6 +146,7 @@ impl FunctionPassManager {
         feature = "llvm17-0",
         feature = "llvm18-1",
         feature = "llvm19-1",
+        feature = "llvm20-1",
     ))]
     pub fn is_empty(&self) -> bool {
         unsafe { super::functionPassManagerIsEmpty(self.inner) }
diff --git a/tests/plugins/plugin1-lld/Cargo.toml b/tests/plugins/plugin1-lld/Cargo.toml
index 739f73a..e29fcf7 100644
--- a/tests/plugins/plugin1-lld/Cargo.toml
+++ b/tests/plugins/plugin1-lld/Cargo.toml
@@ -19,6 +19,7 @@ llvm16-0 = ["llvm-plugin/llvm16-0"]
 llvm17-0 = ["llvm-plugin/llvm17-0"]
 llvm18-1 = ["llvm-plugin/llvm18-1"]
 llvm19-1 = ["llvm-plugin/llvm19-1"]
+llvm20-1 = ["llvm-plugin/llvm20-1"]
 
 target-x86 = ["llvm-plugin/target-x86"]
 target-arm = ["llvm-plugin/target-arm"]
diff --git a/tests/plugins/plugin1/Cargo.toml b/tests/plugins/plugin1/Cargo.toml
index cb66ef1..377c6eb 100644
--- a/tests/plugins/plugin1/Cargo.toml
+++ b/tests/plugins/plugin1/Cargo.toml
@@ -19,6 +19,7 @@ llvm16-0 = ["llvm-plugin/llvm16-0"]
 llvm17-0 = ["llvm-plugin/llvm17-0"]
 llvm18-1 = ["llvm-plugin/llvm18-1"]
 llvm19-1 = ["llvm-plugin/llvm19-1"]
+llvm20-1 = ["llvm-plugin/llvm20-1"]
 
 target-x86 = ["llvm-plugin/target-x86"]
 target-arm = ["llvm-plugin/target-arm"]
diff --git a/tests/plugins/plugin2/Cargo.toml b/tests/plugins/plugin2/Cargo.toml
index 0ae954a..dc9ae68 100644
--- a/tests/plugins/plugin2/Cargo.toml
+++ b/tests/plugins/plugin2/Cargo.toml
@@ -19,6 +19,7 @@ llvm16-0 = ["llvm-plugin/llvm16-0"]
 llvm17-0 = ["llvm-plugin/llvm17-0"]
 llvm18-1 = ["llvm-plugin/llvm18-1"]
 llvm19-1 = ["llvm-plugin/llvm19-1"]
+llvm20-1 = ["llvm-plugin/llvm20-1"]
 
 target-x86 = ["llvm-plugin/target-x86"]
 target-arm = ["llvm-plugin/target-arm"]
diff --git a/tests/plugins/plugin3/Cargo.toml b/tests/plugins/plugin3/Cargo.toml
index 98d5158..54ddfde 100644
--- a/tests/plugins/plugin3/Cargo.toml
+++ b/tests/plugins/plugin3/Cargo.toml
@@ -19,6 +19,7 @@ llvm16-0 = ["llvm-plugin/llvm16-0"]
 llvm17-0 = ["llvm-plugin/llvm17-0"]
 llvm18-1 = ["llvm-plugin/llvm18-1"]
 llvm19-1 = ["llvm-plugin/llvm19-1"]
+llvm20-1 = ["llvm-plugin/llvm20-1"]
 
 target-x86 = ["llvm-plugin/target-x86"]
 target-arm = ["llvm-plugin/target-arm"]
diff --git a/tests/plugins/plugin4/Cargo.toml b/tests/plugins/plugin4/Cargo.toml
index 3a92048..ab7dfa1 100644
--- a/tests/plugins/plugin4/Cargo.toml
+++ b/tests/plugins/plugin4/Cargo.toml
@@ -19,6 +19,7 @@ llvm16-0 = ["llvm-plugin/llvm16-0"]
 llvm17-0 = ["llvm-plugin/llvm17-0"]
 llvm18-1 = ["llvm-plugin/llvm18-1"]
 llvm19-1 = ["llvm-plugin/llvm19-1"]
+llvm20-1 = ["llvm-plugin/llvm20-1"]
 
 target-x86 = ["llvm-plugin/target-x86"]
 target-arm = ["llvm-plugin/target-arm"]
diff --git a/tests/plugins/plugin5/Cargo.toml b/tests/plugins/plugin5/Cargo.toml
index 479c288..3059bdb 100644
--- a/tests/plugins/plugin5/Cargo.toml
+++ b/tests/plugins/plugin5/Cargo.toml
@@ -19,6 +19,7 @@ llvm16-0 = ["llvm-plugin/llvm16-0"]
 llvm17-0 = ["llvm-plugin/llvm17-0"]
 llvm18-1 = ["llvm-plugin/llvm18-1"]
 llvm19-1 = ["llvm-plugin/llvm19-1"]
+llvm20-1 = ["llvm-plugin/llvm20-1"]
 
 target-x86 = ["llvm-plugin/target-x86"]
 target-arm = ["llvm-plugin/target-arm"]
diff --git a/tests/plugins/plugin6/Cargo.toml b/tests/plugins/plugin6/Cargo.toml
index f086430..76594ca 100644
--- a/tests/plugins/plugin6/Cargo.toml
+++ b/tests/plugins/plugin6/Cargo.toml
@@ -19,6 +19,7 @@ llvm16-0 = ["llvm-plugin/llvm16-0"]
 llvm17-0 = ["llvm-plugin/llvm17-0"]
 llvm18-1 = ["llvm-plugin/llvm18-1"]
 llvm19-1 = ["llvm-plugin/llvm19-1"]
+llvm20-1 = ["llvm-plugin/llvm20-1"]
 
 target-x86 = ["llvm-plugin/target-x86"]
 target-arm = ["llvm-plugin/target-arm"]
diff --git a/tests/plugins/plugin6/src/lib.rs b/tests/plugins/plugin6/src/lib.rs
index cd6a3b0..ec4d129 100644
--- a/tests/plugins/plugin6/src/lib.rs
+++ b/tests/plugins/plugin6/src/lib.rs
@@ -31,6 +31,7 @@ fn plugin_registrar(builder: &mut PassBuilder) {
         feature = "llvm17-0",
         feature = "llvm18-1",
         feature = "llvm19-1",
+        feature = "llvm20-1",
     ))]
     builder.add_pipeline_start_ep_callback(|manager, opt| {
         assert!(matches!(opt, OptimizationLevel::O3));
@@ -46,6 +47,7 @@ fn plugin_registrar(builder: &mut PassBuilder) {
         feature = "llvm17-0",
         feature = "llvm18-1",
         feature = "llvm19-1",
+        feature = "llvm20-1",
     ))]
     builder.add_pipeline_early_simplification_ep_callback(|manager, opt| {
         assert!(matches!(opt, OptimizationLevel::O3));
@@ -63,6 +65,7 @@ fn plugin_registrar(builder: &mut PassBuilder) {
         feature = "llvm17-0",
         feature = "llvm18-1",
         feature = "llvm19-1",
+        feature = "llvm20-1",
     ))]
     builder.add_optimizer_early_ep_callback(|manager, opt| {
         assert!(matches!(opt, OptimizationLevel::O3));
diff --git a/tests/plugins/plugin7/Cargo.toml b/tests/plugins/plugin7/Cargo.toml
index 764be2f..f77b30f 100644
--- a/tests/plugins/plugin7/Cargo.toml
+++ b/tests/plugins/plugin7/Cargo.toml
@@ -19,6 +19,7 @@ llvm16-0 = ["llvm-plugin/llvm16-0"]
 llvm17-0 = ["llvm-plugin/llvm17-0"]
 llvm18-1 = ["llvm-plugin/llvm18-1"]
 llvm19-1 = ["llvm-plugin/llvm19-1"]
+llvm20-1 = ["llvm-plugin/llvm20-1"]
 
 target-x86 = ["llvm-plugin/target-x86"]
 target-arm = ["llvm-plugin/target-arm"]
@@ -40,5 +41,5 @@ target-all = ["llvm-plugin/target-all"]
 
 [dependencies]
 llvm-plugin = { path = "../../../llvm-plugin", default-features = false, features = [
-    "macros",
+  "macros",
 ] }
diff --git a/tests/plugins/plugin7/src/lib.rs b/tests/plugins/plugin7/src/lib.rs
index 71f911b..581fb7c 100644
--- a/tests/plugins/plugin7/src/lib.rs
+++ b/tests/plugins/plugin7/src/lib.rs
@@ -9,6 +9,7 @@ fn plugin_registrar(builder: &mut PassBuilder) {
         feature = "llvm17-0",
         feature = "llvm18-1",
         feature = "llvm19-1",
+        feature = "llvm20-1",
     ))]
     builder.add_full_lto_early_ep_callback(|manager, opt| {
         assert!(matches!(opt, llvm_plugin::OptimizationLevel::O3));
@@ -21,6 +22,7 @@ fn plugin_registrar(builder: &mut PassBuilder) {
         feature = "llvm17-0",
         feature = "llvm18-1",
         feature = "llvm19-1",
+        feature = "llvm20-1",
     ))]
     builder.add_full_lto_last_ep_callback(|manager, opt| {
         assert!(matches!(opt, llvm_plugin::OptimizationLevel::O3));

From 30dd9dcfb083f4bc3f65afbeefa59319ab3b473d Mon Sep 17 00:00:00 2001
From: Ylarod <me@ylarod.cn>
Date: Sat, 9 Aug 2025 21:56:06 +0800
Subject: [PATCH 22/23] fix: update api to support `ThinOrFullLTOPhase` (#31)

---
 .gitignore                       |   1 +
 llvm-plugin/cpp/ffi.cc           | 106 ++++++++++++---
 llvm-plugin/src/ffi.rs           |  48 ++++++-
 llvm-plugin/src/pass_builder.rs  | 218 +++++++++++++++++++++++--------
 llvm-plugin/src/pass_manager.rs  |   2 +
 tests/plugins/plugin6/src/lib.rs |  41 ++++--
 6 files changed, 330 insertions(+), 86 deletions(-)

diff --git a/.gitignore b/.gitignore
index 179ffa4..6f66cce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 **/target
 /.cache
 **/Cargo.lock
+/.idea
diff --git a/llvm-plugin/cpp/ffi.cc b/llvm-plugin/cpp/ffi.cc
index a52aae1..05db1af 100644
--- a/llvm-plugin/cpp/ffi.cc
+++ b/llvm-plugin/cpp/ffi.cc
@@ -23,6 +23,21 @@ using LlvmOptLevel = llvm::PassBuilder::OptimizationLevel;
 
 enum class OptimizationLevel { kO0, kO1, kO2, kO3, kOs, kOz };
 
+#if defined(LLVM_VERSION_MAJOR) &&                                             \
+    (LLVM_VERSION_MAJOR > 20 ||                                                \
+     (LLVM_VERSION_MAJOR == 20 && defined(LLVM_VERSION_MINOR) &&               \
+      LLVM_VERSION_MINOR >= 1))
+#define LLVM_HAS_THIN_OR_FULL_LTO_PHASE
+#endif
+
+enum class ThinOrFullLTOPhaseFFI {
+  kNone,
+  kThinLTOPreLink,
+  kThinLTOPostLink,
+  kFullLTOPreLink,
+  kFullLTOPostLink,
+};
+
 namespace {
 auto getFFIOptimizationLevel(LlvmOptLevel Opt) -> OptimizationLevel {
   // Starting from LLVM-11, llvm::OptimizationLevel::Ox is no longer
@@ -49,6 +64,25 @@ auto getFFIOptimizationLevel(LlvmOptLevel Opt) -> OptimizationLevel {
   }
   return OptimizationLevel::kOz;
 }
+
+#ifdef LLVM_HAS_THIN_OR_FULL_LTO_PHASE
+inline auto getFFIThinOrFullLTOPhase(llvm::ThinOrFullLTOPhase Phase)
+    -> ThinOrFullLTOPhaseFFI {
+  switch (Phase) {
+  case llvm::ThinOrFullLTOPhase::None:
+    return ThinOrFullLTOPhaseFFI::kNone;
+  case llvm::ThinOrFullLTOPhase::ThinLTOPreLink:
+    return ThinOrFullLTOPhaseFFI::kThinLTOPreLink;
+  case llvm::ThinOrFullLTOPhase::ThinLTOPostLink:
+    return ThinOrFullLTOPhaseFFI::kThinLTOPostLink;
+  case llvm::ThinOrFullLTOPhase::FullLTOPreLink:
+    return ThinOrFullLTOPhaseFFI::kFullLTOPreLink;
+  case llvm::ThinOrFullLTOPhase::FullLTOPostLink:
+    return ThinOrFullLTOPhaseFFI::kFullLTOPostLink;
+  }
+  return ThinOrFullLTOPhaseFFI::kNone;
+}
+#endif
 } // namespace
 
 extern "C" {
@@ -109,6 +143,7 @@ auto passBuilderAddFullLinkTimeOptimizationEarlyEPCallback(
 }
 #endif
 
+#ifndef LLVM_HAS_THIN_OR_FULL_LTO_PHASE
 auto passBuilderAddOptimizerLastEPCallback(
     llvm::PassBuilder &Builder, const void *DataPtr,
     void (*Deleter)(const void *),
@@ -118,18 +153,32 @@ auto passBuilderAddOptimizerLastEPCallback(
 
   Builder.registerOptimizerLastEPCallback(
       [Data = std::move(Data), Callback](llvm::ModulePassManager &PassManager,
-#if (LLVM_VERSION_MAJOR >= 20)
-                                         LlvmOptLevel Opt,
-                                         llvm::ThinOrFullLTOPhase) {
-#else
                                          LlvmOptLevel Opt) {
-#endif
         const auto OptFFI = getFFIOptimizationLevel(Opt);
         Callback(Data.get(), PassManager, OptFFI);
       });
 }
+#else
+auto passBuilderAddOptimizerLastEPCallback(
+    llvm::PassBuilder &Builder, const void *DataPtr,
+    void (*Deleter)(const void *),
+    void (*Callback)(const void *, llvm::ModulePassManager &, OptimizationLevel,
+                     ThinOrFullLTOPhaseFFI)) -> void {
+  const auto Data = std::shared_ptr<const void>(DataPtr, Deleter);
+
+  Builder.registerOptimizerLastEPCallback(
+      [Data = std::move(Data), Callback](llvm::ModulePassManager &PassManager,
+                                         LlvmOptLevel Opt,
+                                         llvm::ThinOrFullLTOPhase Phase) {
+        const auto OptFFI = getFFIOptimizationLevel(Opt);
+        const auto PhaseFFI = getFFIThinOrFullLTOPhase(Phase);
+        Callback(Data.get(), PassManager, OptFFI, PhaseFFI);
+      });
+}
+#endif
 
 #if defined(LLVM_VERSION_MAJOR) && (LLVM_VERSION_MAJOR >= 15)
+#ifndef LLVM_HAS_THIN_OR_FULL_LTO_PHASE
 auto passBuilderAddOptimizerEarlyEPCallback(
     llvm::PassBuilder &Builder, const void *DataPtr,
     void (*Deleter)(const void *),
@@ -139,19 +188,33 @@ auto passBuilderAddOptimizerEarlyEPCallback(
 
   Builder.registerOptimizerEarlyEPCallback(
       [Data = std::move(Data), Callback](llvm::ModulePassManager &PassManager,
-#if (LLVM_VERSION_MAJOR >= 20)
-                                         LlvmOptLevel Opt,
-                                         llvm::ThinOrFullLTOPhase) {
-#else
                                          LlvmOptLevel Opt) {
-#endif
         const auto OptFFI = getFFIOptimizationLevel(Opt);
         Callback(Data.get(), PassManager, OptFFI);
       });
 }
+#else
+auto passBuilderAddOptimizerEarlyEPCallback(
+    llvm::PassBuilder &Builder, const void *DataPtr,
+    void (*Deleter)(const void *),
+    void (*Callback)(const void *, llvm::ModulePassManager &, OptimizationLevel,
+                     ThinOrFullLTOPhaseFFI)) -> void {
+  const auto Data = std::shared_ptr<const void>(DataPtr, Deleter);
+
+  Builder.registerOptimizerEarlyEPCallback(
+      [Data = std::move(Data), Callback](llvm::ModulePassManager &PassManager,
+                                         LlvmOptLevel Opt,
+                                         llvm::ThinOrFullLTOPhase Phase) {
+        const auto OptFFI = getFFIOptimizationLevel(Opt);
+        const auto PhaseFFI = getFFIThinOrFullLTOPhase(Phase);
+        Callback(Data.get(), PassManager, OptFFI, PhaseFFI);
+      });
+}
+#endif
 #endif
 
 #if defined(LLVM_VERSION_MAJOR) && (LLVM_VERSION_MAJOR >= 12)
+#ifndef LLVM_HAS_THIN_OR_FULL_LTO_PHASE
 auto passBuilderAddPipelineEarlySimplificationEPCallback(
     llvm::PassBuilder &Builder, const void *DataPtr,
     void (*Deleter)(const void *),
@@ -161,16 +224,29 @@ auto passBuilderAddPipelineEarlySimplificationEPCallback(
 
   Builder.registerPipelineEarlySimplificationEPCallback(
       [Data = std::move(Data), Callback](llvm::ModulePassManager &PassManager,
-#if (LLVM_VERSION_MAJOR >= 20)
-                                         LlvmOptLevel Opt,
-                                         llvm::ThinOrFullLTOPhase) {
-#else
                                          LlvmOptLevel Opt) {
-#endif
         const auto OptFFI = getFFIOptimizationLevel(Opt);
         Callback(Data.get(), PassManager, OptFFI);
       });
 }
+#else
+auto passBuilderAddPipelineEarlySimplificationEPCallback(
+    llvm::PassBuilder &Builder, const void *DataPtr,
+    void (*Deleter)(const void *),
+    void (*Callback)(const void *, llvm::ModulePassManager &, OptimizationLevel,
+                     ThinOrFullLTOPhaseFFI)) -> void {
+  const auto Data = std::shared_ptr<const void>(DataPtr, Deleter);
+
+  Builder.registerPipelineEarlySimplificationEPCallback(
+      [Data = std::move(Data), Callback](llvm::ModulePassManager &PassManager,
+                                         LlvmOptLevel Opt,
+                                         llvm::ThinOrFullLTOPhase Phase) {
+        const auto OptFFI = getFFIOptimizationLevel(Opt);
+        const auto PhaseFFI = getFFIThinOrFullLTOPhase(Phase);
+        Callback(Data.get(), PassManager, OptFFI, PhaseFFI);
+      });
+}
+#endif
 #endif
 
 #if defined(LLVM_VERSION_MAJOR) && (LLVM_VERSION_MAJOR >= 12)
diff --git a/llvm-plugin/src/ffi.rs b/llvm-plugin/src/ffi.rs
index 501d45a..e03b8ba 100644
--- a/llvm-plugin/src/ffi.rs
+++ b/llvm-plugin/src/ffi.rs
@@ -46,14 +46,46 @@ extern "C" {
         builder: *mut c_void,
         cb: *const c_void,
         cb_deleter: extern "C" fn(*const c_void),
-        cb_sys: extern "C" fn(*const c_void, *mut c_void, crate::OptimizationLevel),
+        #[cfg(not(feature = "llvm20-1"))] cb_sys: extern "C" fn(
+            *const c_void,
+            *mut c_void,
+            crate::OptimizationLevel,
+        ),
+        #[cfg(feature = "llvm20-1")] cb_sys: extern "C" fn(
+            *const c_void,
+            *mut c_void,
+            crate::OptimizationLevel,
+            crate::ThinOrFullLTOPhase,
+        ),
     );
 
+    #[cfg(any(
+        feature = "llvm11-0",
+        feature = "llvm12-0",
+        feature = "llvm13-0",
+        feature = "llvm14-0",
+        feature = "llvm15-0",
+        feature = "llvm16-0",
+        feature = "llvm17-0",
+        feature = "llvm18-1",
+        feature = "llvm19-1",
+        feature = "llvm20-1",
+    ))]
     pub(crate) fn passBuilderAddOptimizerLastEPCallback(
         builder: *mut c_void,
         cb: *const c_void,
         cb_deleter: extern "C" fn(*const c_void),
-        cb_sys: extern "C" fn(*const c_void, *mut c_void, crate::OptimizationLevel),
+        #[cfg(not(feature = "llvm20-1"))] cb_sys: extern "C" fn(
+            *const c_void,
+            *mut c_void,
+            crate::OptimizationLevel,
+        ),
+        #[cfg(feature = "llvm20-1")] cb_sys: extern "C" fn(
+            *const c_void,
+            *mut c_void,
+            crate::OptimizationLevel,
+            crate::ThinOrFullLTOPhase,
+        ),
     );
 
     #[cfg(any(
@@ -71,7 +103,17 @@ extern "C" {
         builder: *mut c_void,
         cb: *const c_void,
         cb_deleter: extern "C" fn(*const c_void),
-        cb_sys: extern "C" fn(*const c_void, *mut c_void, crate::OptimizationLevel),
+        #[cfg(not(feature = "llvm20-1"))] cb_sys: extern "C" fn(
+            *const c_void,
+            *mut c_void,
+            crate::OptimizationLevel,
+        ),
+        #[cfg(feature = "llvm20-1")] cb_sys: extern "C" fn(
+            *const c_void,
+            *mut c_void,
+            crate::OptimizationLevel,
+            crate::ThinOrFullLTOPhase,
+        ),
     );
 
     #[cfg(any(
diff --git a/llvm-plugin/src/pass_builder.rs b/llvm-plugin/src/pass_builder.rs
index 7bd863d..47af608 100644
--- a/llvm-plugin/src/pass_builder.rs
+++ b/llvm-plugin/src/pass_builder.rs
@@ -27,10 +27,6 @@ impl PassBuilder {
     {
         let cb = Box::new(cb);
 
-        extern "C" fn callback_deleter<T>(cb: *const c_void) {
-            drop(unsafe { Box::<T>::from_raw(cb as *mut _) })
-        }
-
         extern "C" fn callback_entrypoint<T>(
             cb: *const c_void,
             name_ptr: *const u8,
@@ -71,10 +67,6 @@ impl PassBuilder {
     {
         let cb = Box::new(cb);
 
-        extern "C" fn callback_deleter<T>(cb: *const c_void) {
-            drop(unsafe { Box::<T>::from_raw(cb as *mut _) })
-        }
-
         extern "C" fn callback_entrypoint<T>(
             cb: *const c_void,
             name_ptr: *const u8,
@@ -115,10 +107,6 @@ impl PassBuilder {
     {
         let cb = Box::new(cb);
 
-        extern "C" fn callback_deleter<T>(cb: *const c_void) {
-            drop(unsafe { Box::<T>::from_raw(cb as *mut _) })
-        }
-
         extern "C" fn callback_entrypoint<T>(cb: *const c_void, manager: *mut c_void)
         where
             T: Fn(&mut ModuleAnalysisManager) + 'static,
@@ -151,10 +139,6 @@ impl PassBuilder {
     {
         let cb = Box::new(cb);
 
-        extern "C" fn callback_deleter<T>(cb: *const c_void) {
-            drop(unsafe { Box::<T>::from_raw(cb as *mut _) })
-        }
-
         extern "C" fn callback_entrypoint<T>(cb: *const c_void, manager: *mut c_void)
         where
             T: Fn(&mut FunctionAnalysisManager) + 'static,
@@ -193,10 +177,6 @@ impl PassBuilder {
     {
         let cb = Box::new(cb);
 
-        extern "C" fn callback_deleter<T>(cb: *const c_void) {
-            drop(unsafe { Box::<T>::from_raw(cb as *mut _) })
-        }
-
         extern "C" fn callback_entrypoint<T>(
             cb: *const c_void,
             manager: *mut c_void,
@@ -236,10 +216,6 @@ impl PassBuilder {
     {
         let cb = Box::new(cb);
 
-        extern "C" fn callback_deleter<T>(cb: *const c_void) {
-            drop(unsafe { Box::<T>::from_raw(cb as *mut _) })
-        }
-
         extern "C" fn callback_entrypoint<T>(
             cb: *const c_void,
             manager: *mut c_void,
@@ -279,10 +255,6 @@ impl PassBuilder {
     {
         let cb = Box::new(cb);
 
-        extern "C" fn callback_deleter<T>(cb: *const c_void) {
-            drop(unsafe { Box::<T>::from_raw(cb as *mut _) })
-        }
-
         extern "C" fn callback_entrypoint<T>(
             cb: *const c_void,
             manager: *mut c_void,
@@ -317,6 +289,7 @@ impl PassBuilder {
     /// of the pipeline. This does not apply to 'backend' compiles (LTO and
     /// ThinLTO link-time pipelines).
     #[cfg(any(
+        doc,
         feature = "llvm12-0",
         feature = "llvm13-0",
         feature = "llvm14-0",
@@ -333,10 +306,6 @@ impl PassBuilder {
     {
         let cb = Box::new(cb);
 
-        extern "C" fn callback_deleter<T>(cb: *const c_void) {
-            drop(unsafe { Box::<T>::from_raw(cb as *mut _) })
-        }
-
         extern "C" fn callback_entrypoint<T>(
             cb: *const c_void,
             manager: *mut c_void,
@@ -370,6 +339,7 @@ impl PassBuilder {
     /// This extension point allows adding optimization right after passes
     /// that do basic simplification of the input IR.
     #[cfg(any(
+        doc,
         feature = "llvm12-0",
         feature = "llvm13-0",
         feature = "llvm14-0",
@@ -378,7 +348,6 @@ impl PassBuilder {
         feature = "llvm17-0",
         feature = "llvm18-1",
         feature = "llvm19-1",
-        feature = "llvm20-1",
     ))]
     pub fn add_pipeline_early_simplification_ep_callback<T>(&mut self, cb: T)
     where
@@ -386,10 +355,6 @@ impl PassBuilder {
     {
         let cb = Box::new(cb);
 
-        extern "C" fn callback_deleter<T>(cb: *const c_void) {
-            drop(unsafe { Box::<T>::from_raw(cb as *mut _) })
-        }
-
         extern "C" fn callback_entrypoint<T>(
             cb: *const c_void,
             manager: *mut c_void,
@@ -415,6 +380,46 @@ impl PassBuilder {
         }
     }
 
+    /// Register a new callback to be triggered at the pipeline
+    /// early simplification extension point.
+    ///
+    /// # From the LLVM documentation
+    ///
+    /// This extension point allows adding optimization right after passes
+    /// that do basic simplification of the input IR.
+    #[cfg(any(doc, feature = "llvm20-1"))]
+    pub fn add_pipeline_early_simplification_ep_callback<T>(&mut self, cb: T)
+    where
+        T: Fn(&mut ModulePassManager, OptimizationLevel, ThinOrFullLTOPhase) + 'static,
+    {
+        let cb = Box::new(cb);
+
+        extern "C" fn callback_entrypoint<T>(
+            cb: *const c_void,
+            manager: *mut c_void,
+            opt: OptimizationLevel,
+            phase: ThinOrFullLTOPhase,
+        ) where
+            T: Fn(&mut ModulePassManager, OptimizationLevel, ThinOrFullLTOPhase) + 'static,
+        {
+            let cb = unsafe { Box::<T>::from_raw(cb as *mut _) };
+            let mut manager = unsafe { ModulePassManager::from_raw(manager) };
+
+            cb(&mut manager, opt, phase);
+
+            let _ = Box::into_raw(cb);
+        }
+
+        unsafe {
+            super::passBuilderAddPipelineEarlySimplificationEPCallback(
+                self.inner,
+                Box::into_raw(cb).cast(),
+                callback_deleter::<T>,
+                callback_entrypoint::<T>,
+            )
+        }
+    }
+
     /// Register a new callback to be triggered at the optimizer
     /// last extension point.
     ///
@@ -422,16 +427,24 @@ impl PassBuilder {
     ///
     /// This extension point allows adding passes that run after everything
     /// else.
+    #[cfg(any(
+        doc,
+        feature = "llvm11-0",
+        feature = "llvm12-0",
+        feature = "llvm13-0",
+        feature = "llvm14-0",
+        feature = "llvm15-0",
+        feature = "llvm16-0",
+        feature = "llvm17-0",
+        feature = "llvm18-1",
+        feature = "llvm19-1",
+    ))]
     pub fn add_optimizer_last_ep_callback<T>(&mut self, cb: T)
     where
         T: Fn(&mut ModulePassManager, OptimizationLevel) + 'static,
     {
         let cb = Box::new(cb);
 
-        extern "C" fn callback_deleter<T>(cb: *const c_void) {
-            drop(unsafe { Box::<T>::from_raw(cb as *mut _) })
-        }
-
         extern "C" fn callback_entrypoint<T>(
             cb: *const c_void,
             manager: *mut c_void,
@@ -457,6 +470,46 @@ impl PassBuilder {
         }
     }
 
+    /// Register a new callback to be triggered at the optimizer
+    /// last extension point.
+    ///
+    /// # From the LLVM documentation
+    ///
+    /// This extension point allows adding passes that run after everything
+    /// else.
+    #[cfg(any(doc, feature = "llvm20-1"))]
+    pub fn add_optimizer_last_ep_callback<T>(&mut self, cb: T)
+    where
+        T: Fn(&mut ModulePassManager, OptimizationLevel, ThinOrFullLTOPhase) + 'static,
+    {
+        let cb = Box::new(cb);
+
+        extern "C" fn callback_entrypoint<T>(
+            cb: *const c_void,
+            manager: *mut c_void,
+            opt: OptimizationLevel,
+            phase: ThinOrFullLTOPhase,
+        ) where
+            T: Fn(&mut ModulePassManager, OptimizationLevel, ThinOrFullLTOPhase) + 'static,
+        {
+            let cb = unsafe { Box::<T>::from_raw(cb as *mut _) };
+            let mut manager = unsafe { ModulePassManager::from_raw(manager) };
+
+            cb(&mut manager, opt, phase);
+
+            let _ = Box::into_raw(cb);
+        }
+
+        unsafe {
+            super::passBuilderAddOptimizerLastEPCallback(
+                self.inner,
+                Box::into_raw(cb).cast(),
+                callback_deleter::<T>,
+                callback_entrypoint::<T>,
+            )
+        }
+    }
+
     /// Register a new callback to be triggered at the full LTO
     /// early extension point.
     ///
@@ -465,6 +518,7 @@ impl PassBuilder {
     /// This extension point allow adding passes that run at Link Time,
     /// before Full Link Time Optimization.
     #[cfg(any(
+        doc,
         feature = "llvm15-0",
         feature = "llvm16-0",
         feature = "llvm17-0",
@@ -478,10 +532,6 @@ impl PassBuilder {
     {
         let cb = Box::new(cb);
 
-        extern "C" fn callback_deleter<T>(cb: *const c_void) {
-            drop(unsafe { Box::<T>::from_raw(cb as *mut _) })
-        }
-
         extern "C" fn callback_entrypoint<T>(
             cb: *const c_void,
             manager: *mut c_void,
@@ -515,6 +565,7 @@ impl PassBuilder {
     /// This extensions point allow adding passes that run at Link Time,
     /// after Full Link Time Optimization.
     #[cfg(any(
+        doc,
         feature = "llvm15-0",
         feature = "llvm16-0",
         feature = "llvm17-0",
@@ -528,10 +579,6 @@ impl PassBuilder {
     {
         let cb = Box::new(cb);
 
-        extern "C" fn callback_deleter<T>(cb: *const c_void) {
-            drop(unsafe { Box::<T>::from_raw(cb as *mut _) })
-        }
-
         extern "C" fn callback_entrypoint<T>(
             cb: *const c_void,
             manager: *mut c_void,
@@ -565,12 +612,12 @@ impl PassBuilder {
     /// This extension point allows adding passes just before the main
     /// module-level optimization passes.
     #[cfg(any(
+        doc,
         feature = "llvm15-0",
         feature = "llvm16-0",
         feature = "llvm17-0",
         feature = "llvm18-1",
         feature = "llvm19-1",
-        feature = "llvm20-1",
     ))]
     pub fn add_optimizer_early_ep_callback<T>(&mut self, cb: T)
     where
@@ -578,10 +625,6 @@ impl PassBuilder {
     {
         let cb = Box::new(cb);
 
-        extern "C" fn callback_deleter<T>(cb: *const c_void) {
-            drop(unsafe { Box::<T>::from_raw(cb as *mut _) })
-        }
-
         extern "C" fn callback_entrypoint<T>(
             cb: *const c_void,
             manager: *mut c_void,
@@ -606,6 +649,50 @@ impl PassBuilder {
             )
         }
     }
+
+    /// Register a new callback to be triggered at the optimizer
+    /// early extension point.
+    ///
+    /// # From the LLVM documentation
+    ///
+    /// This extension point allows adding passes just before the main
+    /// module-level optimization passes.
+    #[cfg(any(doc, feature = "llvm20-1"))]
+    pub fn add_optimizer_early_ep_callback<T>(&mut self, cb: T)
+    where
+        T: Fn(&mut ModulePassManager, OptimizationLevel, ThinOrFullLTOPhase) + 'static,
+    {
+        let cb = Box::new(cb);
+
+        extern "C" fn callback_entrypoint<T>(
+            cb: *const c_void,
+            manager: *mut c_void,
+            opt: OptimizationLevel,
+            phase: ThinOrFullLTOPhase,
+        ) where
+            T: Fn(&mut ModulePassManager, OptimizationLevel, ThinOrFullLTOPhase) + 'static,
+        {
+            let cb = unsafe { Box::<T>::from_raw(cb as *mut _) };
+            let mut manager = unsafe { ModulePassManager::from_raw(manager) };
+
+            cb(&mut manager, opt, phase);
+
+            let _ = Box::into_raw(cb);
+        }
+
+        unsafe {
+            super::passBuilderAddOptimizerEarlyEPCallback(
+                self.inner,
+                Box::into_raw(cb).cast(),
+                callback_deleter::<T>,
+                callback_entrypoint::<T>,
+            )
+        }
+    }
+}
+
+extern "C" fn callback_deleter<T>(cb: *const c_void) {
+    drop(unsafe { Box::<T>::from_raw(cb as *mut _) })
 }
 
 /// Enum describing whether a pipeline parsing callback
@@ -644,6 +731,27 @@ pub enum OptimizationLevel {
     /// triggering significant incremental execution time slowdowns.
     Os,
 
-    /// This level  will optimize for code size at any and all costs.
+    /// This level will optimize for code size at any and all costs.
     Oz,
 }
+
+/// Enum for the LLVM-provided full LTO or ThinLTO optimization phases.
+#[cfg(any(doc, feature = "llvm20-1"))]
+#[repr(C)]
+#[derive(Clone, Copy, Debug)]
+pub enum ThinOrFullLTOPhase {
+    /// No LTO/ThinLTO behavior needed.
+    None,
+
+    /// ThinLTO prelink (summary) phase.
+    ThinLTOPreLink,
+
+    /// ThinLTO postlink (backend compile) phase.
+    ThinLTOPostLink,
+
+    /// Full LTO prelink phase.
+    FullLTOPreLink,
+
+    /// Full LTO postlink (backend compile) phase.
+    FullLTOPostLink,
+}
diff --git a/llvm-plugin/src/pass_manager.rs b/llvm-plugin/src/pass_manager.rs
index 317c9b2..0b943f9 100644
--- a/llvm-plugin/src/pass_manager.rs
+++ b/llvm-plugin/src/pass_manager.rs
@@ -65,6 +65,7 @@ impl ModulePassManager {
 
     /// Returns if the pass manager contains any passes.
     #[cfg(any(
+        doc,
         feature = "llvm12-0",
         feature = "llvm13-0",
         feature = "llvm14-0",
@@ -138,6 +139,7 @@ impl FunctionPassManager {
 
     /// Returns if the pass manager contains any passes.
     #[cfg(any(
+        doc,
         feature = "llvm12-0",
         feature = "llvm13-0",
         feature = "llvm14-0",
diff --git a/tests/plugins/plugin6/src/lib.rs b/tests/plugins/plugin6/src/lib.rs
index ec4d129..70cb9a1 100644
--- a/tests/plugins/plugin6/src/lib.rs
+++ b/tests/plugins/plugin6/src/lib.rs
@@ -5,6 +5,9 @@ use llvm_plugin::{
     OptimizationLevel, PassBuilder, PreservedAnalyses,
 };
 
+#[cfg(feature = "llvm20-1")]
+use llvm_plugin::ThinOrFullLTOPhase;
+
 #[llvm_plugin::plugin(name = "llvm_plugin", version = "0.1")]
 fn plugin_registrar(builder: &mut PassBuilder) {
     builder.add_peephole_ep_callback(|manager, opt| {
@@ -49,15 +52,23 @@ fn plugin_registrar(builder: &mut PassBuilder) {
         feature = "llvm19-1",
         feature = "llvm20-1",
     ))]
-    builder.add_pipeline_early_simplification_ep_callback(|manager, opt| {
-        assert!(matches!(opt, OptimizationLevel::O3));
-        manager.add_pass(PipelineEarlySimpPass);
-    });
-
-    builder.add_optimizer_last_ep_callback(|manager, opt| {
-        assert!(matches!(opt, OptimizationLevel::O3));
-        manager.add_pass(OptimizerLastPass);
-    });
+    builder.add_pipeline_early_simplification_ep_callback(
+        |manager, opt, #[cfg(feature = "llvm20-1")] thin_or_full| {
+            assert!(matches!(opt, OptimizationLevel::O3));
+            #[cfg(feature = "llvm20-1")]
+            assert!(matches!(thin_or_full, ThinOrFullLTOPhase::None));
+            manager.add_pass(PipelineEarlySimpPass);
+        },
+    );
+
+    builder.add_optimizer_last_ep_callback(
+        |manager, opt, #[cfg(feature = "llvm20-1")] thin_or_full| {
+            assert!(matches!(opt, OptimizationLevel::O3));
+            #[cfg(feature = "llvm20-1")]
+            assert!(matches!(thin_or_full, ThinOrFullLTOPhase::None));
+            manager.add_pass(OptimizerLastPass);
+        },
+    );
 
     #[cfg(any(
         feature = "llvm15-0",
@@ -67,10 +78,14 @@ fn plugin_registrar(builder: &mut PassBuilder) {
         feature = "llvm19-1",
         feature = "llvm20-1",
     ))]
-    builder.add_optimizer_early_ep_callback(|manager, opt| {
-        assert!(matches!(opt, OptimizationLevel::O3));
-        manager.add_pass(OptimizerEarlyPass);
-    });
+    builder.add_optimizer_early_ep_callback(
+        |manager, opt, #[cfg(feature = "llvm20-1")] thin_or_full| {
+            assert!(matches!(opt, OptimizationLevel::O3));
+            #[cfg(feature = "llvm20-1")]
+            assert!(matches!(thin_or_full, ThinOrFullLTOPhase::None));
+            manager.add_pass(OptimizerEarlyPass);
+        },
+    );
 }
 
 static mut PEEPHOLE_PASS_CALLED: u32 = 0;

From 0a0dcc0cb10220ca45141fb952a13b6e9956a897 Mon Sep 17 00:00:00 2001
From: James Smith <jamesmth@proton.me>
Date: Sun, 17 Aug 2025 11:33:21 +0200
Subject: [PATCH 23/23] fix: craft dummy `ThinOrFatLTOPhase` on llvm 20.0

---
 llvm-plugin/cpp/ffi.cc | 93 ++++++++++++++++++++++--------------------
 1 file changed, 48 insertions(+), 45 deletions(-)

diff --git a/llvm-plugin/cpp/ffi.cc b/llvm-plugin/cpp/ffi.cc
index 05db1af..3aeb85a 100644
--- a/llvm-plugin/cpp/ffi.cc
+++ b/llvm-plugin/cpp/ffi.cc
@@ -143,110 +143,113 @@ auto passBuilderAddFullLinkTimeOptimizationEarlyEPCallback(
 }
 #endif
 
-#ifndef LLVM_HAS_THIN_OR_FULL_LTO_PHASE
 auto passBuilderAddOptimizerLastEPCallback(
     llvm::PassBuilder &Builder, const void *DataPtr,
     void (*Deleter)(const void *),
     void (*Callback)(const void *, llvm::ModulePassManager &,
+#if defined(LLVM_VERSION_MAJOR) && (LLVM_VERSION_MAJOR >= 20)
+                     OptimizationLevel, ThinOrFullLTOPhaseFFI)) -> void {
+#else
                      OptimizationLevel)) -> void {
+#endif
   const auto Data = std::shared_ptr<const void>(DataPtr, Deleter);
 
+#ifdef LLVM_HAS_THIN_OR_FULL_LTO_PHASE
   Builder.registerOptimizerLastEPCallback(
       [Data = std::move(Data), Callback](llvm::ModulePassManager &PassManager,
-                                         LlvmOptLevel Opt) {
+                                         LlvmOptLevel Opt,
+                                         llvm::ThinOrFullLTOPhase Phase) {
         const auto OptFFI = getFFIOptimizationLevel(Opt);
-        Callback(Data.get(), PassManager, OptFFI);
+        const auto PhaseFFI = getFFIThinOrFullLTOPhase(Phase);
+        Callback(Data.get(), PassManager, OptFFI, PhaseFFI);
       });
-}
 #else
-auto passBuilderAddOptimizerLastEPCallback(
-    llvm::PassBuilder &Builder, const void *DataPtr,
-    void (*Deleter)(const void *),
-    void (*Callback)(const void *, llvm::ModulePassManager &, OptimizationLevel,
-                     ThinOrFullLTOPhaseFFI)) -> void {
-  const auto Data = std::shared_ptr<const void>(DataPtr, Deleter);
-
   Builder.registerOptimizerLastEPCallback(
       [Data = std::move(Data), Callback](llvm::ModulePassManager &PassManager,
-                                         LlvmOptLevel Opt,
-                                         llvm::ThinOrFullLTOPhase Phase) {
+                                         LlvmOptLevel Opt) {
         const auto OptFFI = getFFIOptimizationLevel(Opt);
-        const auto PhaseFFI = getFFIThinOrFullLTOPhase(Phase);
+#if defined(LLVM_VERSION_MAJOR) && (LLVM_VERSION_MAJOR >= 20)
+        const auto PhaseFFI = ThinOrFullLTOPhaseFFI::kNone;
         Callback(Data.get(), PassManager, OptFFI, PhaseFFI);
+#else
+        Callback(Data.get(), PassManager, OptFFI);
+#endif
       });
-}
 #endif
+}
 
 #if defined(LLVM_VERSION_MAJOR) && (LLVM_VERSION_MAJOR >= 15)
-#ifndef LLVM_HAS_THIN_OR_FULL_LTO_PHASE
 auto passBuilderAddOptimizerEarlyEPCallback(
     llvm::PassBuilder &Builder, const void *DataPtr,
     void (*Deleter)(const void *),
     void (*Callback)(const void *, llvm::ModulePassManager &,
+#if defined(LLVM_VERSION_MAJOR) && (LLVM_VERSION_MAJOR >= 20)
+                     OptimizationLevel, ThinOrFullLTOPhaseFFI)) -> void {
+#else
                      OptimizationLevel)) -> void {
+#endif
   const auto Data = std::shared_ptr<const void>(DataPtr, Deleter);
 
+#ifdef LLVM_HAS_THIN_OR_FULL_LTO_PHASE
   Builder.registerOptimizerEarlyEPCallback(
       [Data = std::move(Data), Callback](llvm::ModulePassManager &PassManager,
-                                         LlvmOptLevel Opt) {
+                                         LlvmOptLevel Opt,
+                                         llvm::ThinOrFullLTOPhase Phase) {
         const auto OptFFI = getFFIOptimizationLevel(Opt);
-        Callback(Data.get(), PassManager, OptFFI);
+        const auto PhaseFFI = getFFIThinOrFullLTOPhase(Phase);
+        Callback(Data.get(), PassManager, OptFFI, PhaseFFI);
       });
-}
 #else
-auto passBuilderAddOptimizerEarlyEPCallback(
-    llvm::PassBuilder &Builder, const void *DataPtr,
-    void (*Deleter)(const void *),
-    void (*Callback)(const void *, llvm::ModulePassManager &, OptimizationLevel,
-                     ThinOrFullLTOPhaseFFI)) -> void {
-  const auto Data = std::shared_ptr<const void>(DataPtr, Deleter);
-
   Builder.registerOptimizerEarlyEPCallback(
       [Data = std::move(Data), Callback](llvm::ModulePassManager &PassManager,
-                                         LlvmOptLevel Opt,
-                                         llvm::ThinOrFullLTOPhase Phase) {
+                                         LlvmOptLevel Opt) {
         const auto OptFFI = getFFIOptimizationLevel(Opt);
-        const auto PhaseFFI = getFFIThinOrFullLTOPhase(Phase);
+#if defined(LLVM_VERSION_MAJOR) && (LLVM_VERSION_MAJOR >= 20)
+        const auto PhaseFFI = ThinOrFullLTOPhaseFFI::kNone;
         Callback(Data.get(), PassManager, OptFFI, PhaseFFI);
+#else
+        Callback(Data.get(), PassManager, OptFFI);
+#endif
       });
-}
 #endif
+}
 #endif
 
 #if defined(LLVM_VERSION_MAJOR) && (LLVM_VERSION_MAJOR >= 12)
-#ifndef LLVM_HAS_THIN_OR_FULL_LTO_PHASE
 auto passBuilderAddPipelineEarlySimplificationEPCallback(
     llvm::PassBuilder &Builder, const void *DataPtr,
     void (*Deleter)(const void *),
     void (*Callback)(const void *, llvm::ModulePassManager &,
+#if defined(LLVM_VERSION_MAJOR) && (LLVM_VERSION_MAJOR >= 20)
+                     OptimizationLevel, ThinOrFullLTOPhaseFFI)) -> void {
+#else
                      OptimizationLevel)) -> void {
+#endif
   const auto Data = std::shared_ptr<const void>(DataPtr, Deleter);
 
+#ifdef LLVM_HAS_THIN_OR_FULL_LTO_PHASE
   Builder.registerPipelineEarlySimplificationEPCallback(
       [Data = std::move(Data), Callback](llvm::ModulePassManager &PassManager,
-                                         LlvmOptLevel Opt) {
+                                         LlvmOptLevel Opt,
+                                         llvm::ThinOrFullLTOPhase Phase) {
         const auto OptFFI = getFFIOptimizationLevel(Opt);
-        Callback(Data.get(), PassManager, OptFFI);
+        const auto PhaseFFI = getFFIThinOrFullLTOPhase(Phase);
+        Callback(Data.get(), PassManager, OptFFI, PhaseFFI);
       });
-}
 #else
-auto passBuilderAddPipelineEarlySimplificationEPCallback(
-    llvm::PassBuilder &Builder, const void *DataPtr,
-    void (*Deleter)(const void *),
-    void (*Callback)(const void *, llvm::ModulePassManager &, OptimizationLevel,
-                     ThinOrFullLTOPhaseFFI)) -> void {
-  const auto Data = std::shared_ptr<const void>(DataPtr, Deleter);
-
   Builder.registerPipelineEarlySimplificationEPCallback(
       [Data = std::move(Data), Callback](llvm::ModulePassManager &PassManager,
-                                         LlvmOptLevel Opt,
-                                         llvm::ThinOrFullLTOPhase Phase) {
+                                         LlvmOptLevel Opt) {
         const auto OptFFI = getFFIOptimizationLevel(Opt);
-        const auto PhaseFFI = getFFIThinOrFullLTOPhase(Phase);
+#if defined(LLVM_VERSION_MAJOR) && (LLVM_VERSION_MAJOR >= 20)
+        const auto PhaseFFI = ThinOrFullLTOPhaseFFI::kNone;
         Callback(Data.get(), PassManager, OptFFI, PhaseFFI);
+#else
+        Callback(Data.get(), PassManager, OptFFI);
+#endif
       });
-}
 #endif
+}
 #endif
 
 #if defined(LLVM_VERSION_MAJOR) && (LLVM_VERSION_MAJOR >= 12)