feat: remove llvm 10 support

Author: jamesmth

.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"]

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
 

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
     ```
 

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"]

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)

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(

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,

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(

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,

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"]