diff options
| author | bors <bors@rust-lang.org> | 2024-10-10 20:25:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-10 20:25:54 +0000 |
| commit | 52fd9983996d9fcfb719749838336be66dee68f9 (patch) | |
| tree | 5287ac282e7dad8800887cdf918e26dbf6b84ebf /src/tools/compiletest | |
| parent | d0141af514abb03ee7bcf36d5419dcf5f2ce9812 (diff) | |
| parent | 8ddd3279c18d7ced79d623ec08ef6b4c125e4cc8 (diff) | |
Auto merge of #131511 - matthiaskrgr:rollup-56qr0e5, r=matthiaskrgr
Rollup of 9 pull requests
Successful merges:
- #130308 (codegen_ssa: consolidate tied target checks)
- #130538 (Stabilize const `{slice,array}::from_mut`)
- #130741 (rustc_target: Add sme-b16b16 as an explicit aarch64 target feature)
- #131033 (Precise capturing in traits)
- #131442 (Match std `RUSTFLAGS` for host and target for `mir-opt` test suite to fix double std build/rebuilds)
- #131470 (add test infra to explicitely test rustc with autodiff/enzyme disabled)
- #131475 (Compiler & its UI tests: Rename remaining occurrences of "object safe" to "dyn compatible" )
- #131493 (Avoid redundant sysroot additions to `PATH` when linking)
- #131509 (Update .mailmap)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/tools/compiletest')
| -rw-r--r-- | src/tools/compiletest/src/command-list.rs | 1 | ||||
| -rw-r--r-- | src/tools/compiletest/src/header/cfg.rs | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/tools/compiletest/src/command-list.rs b/src/tools/compiletest/src/command-list.rs index 88e1bb56fe9..4d57907f26f 100644 --- a/src/tools/compiletest/src/command-list.rs +++ b/src/tools/compiletest/src/command-list.rs @@ -49,6 +49,7 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[ "ignore-eabi", "ignore-emscripten", "ignore-endian-big", + "ignore-enzyme", "ignore-freebsd", "ignore-fuchsia", "ignore-gdb", diff --git a/src/tools/compiletest/src/header/cfg.rs b/src/tools/compiletest/src/header/cfg.rs index 6e351aa27b9..b9314f0abbb 100644 --- a/src/tools/compiletest/src/header/cfg.rs +++ b/src/tools/compiletest/src/header/cfg.rs @@ -166,6 +166,12 @@ pub(super) fn parse_cfg_name_directive<'a>( message: "when the target vendor is Apple" } + condition! { + name: "enzyme", + condition: config.has_enzyme, + message: "when rustc is built with LLVM Enzyme" + } + // Technically the locally built compiler uses the "dev" channel rather than the "nightly" // channel, even though most people don't know or won't care about it. To avoid confusion, we // treat the "dev" channel as the "nightly" channel when processing the directive. |
