diff options
| author | bors <bors@rust-lang.org> | 2025-09-17 21:26:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-09-17 21:26:50 +0000 |
| commit | 93117677d857bb7c3f12c9dc500d77839f8fb13d (patch) | |
| tree | f80ef0fd55b3b9606f0171d46ba290a626a22e75 /compiler/rustc_codegen_llvm/src/llvm/enzyme_ffi.rs | |
| parent | 4645a7988177c286f61609cc667ecae4c571a2e8 (diff) | |
| parent | c6ed4c04425d7f242a472eb06058f5abe45dac81 (diff) | |
| download | rust-93117677d857bb7c3f12c9dc500d77839f8fb13d.tar.gz rust-93117677d857bb7c3f12c9dc500d77839f8fb13d.zip | |
Auto merge of #146685 - jdonszelmann:rollup-kwuih4z, r=jdonszelmann
Rollup of 7 pull requests Successful merges: - rust-lang/rust#146458 (Add parallel-frontend-threads to bootstrap.toml and enable multi-threaded parallel compilation) - rust-lang/rust#146485 (Remove unsized arg handling in `ArgAbiBuilderMethods::store_fn_arg` implementations) - rust-lang/rust#146536 (clean up several trait related UI tests) - rust-lang/rust#146598 (Make llvm_enzyme a regular cargo feature) - rust-lang/rust#146647 (Move `#[rustc_coherence_is_core]` to the `crate_level` file) - rust-lang/rust#146654 (Do not use `git -C dir`) - rust-lang/rust#146681 (Add space after brace in `Box<[T]>::new_uninit_slice` example) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/llvm/enzyme_ffi.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/llvm/enzyme_ffi.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/rustc_codegen_llvm/src/llvm/enzyme_ffi.rs b/compiler/rustc_codegen_llvm/src/llvm/enzyme_ffi.rs index 56d756e52cc..695435eb6da 100644 --- a/compiler/rustc_codegen_llvm/src/llvm/enzyme_ffi.rs +++ b/compiler/rustc_codegen_llvm/src/llvm/enzyme_ffi.rs @@ -59,10 +59,10 @@ pub(crate) enum LLVMRustVerifierFailureAction { LLVMReturnStatusAction = 2, } -#[cfg(llvm_enzyme)] +#[cfg(feature = "llvm_enzyme")] pub(crate) use self::Enzyme_AD::*; -#[cfg(llvm_enzyme)] +#[cfg(feature = "llvm_enzyme")] pub(crate) mod Enzyme_AD { use std::ffi::{CString, c_char}; @@ -134,10 +134,10 @@ pub(crate) mod Enzyme_AD { } } -#[cfg(not(llvm_enzyme))] +#[cfg(not(feature = "llvm_enzyme"))] pub(crate) use self::Fallback_AD::*; -#[cfg(not(llvm_enzyme))] +#[cfg(not(feature = "llvm_enzyme"))] pub(crate) mod Fallback_AD { #![allow(unused_variables)] |