Skip to content

Commit 64e27cb

Browse files
tmiaskotmiasko
committed
compiletest: load supported sanitizers from target spec
1 parent bc7bb3c commit 64e27cb

File tree

3 files changed

+31
-101
lines changed

3 files changed

+31
-101
lines changed

‎src/tools/compiletest/src/common.rs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,22 @@ impl PanicStrategy {
141141
}
142142
}
143143

144+
#[derive(Clone, Debug, PartialEq, serde::Deserialize)]
145+
#[serde(rename_all = "kebab-case")]
146+
pub enum Sanitizer {
147+
Address,
148+
Cfi,
149+
Kcfi,
150+
KernelAddress,
151+
Leak,
152+
Memory,
153+
Memtag,
154+
Safestack,
155+
ShadowCallStack,
156+
Thread,
157+
Hwaddress,
158+
}
159+
144160
/// Configuration for compiletest
145161
#[derive(Debug, Default, Clone)]
146162
pub struct Config {
@@ -560,6 +576,8 @@ pub struct TargetCfg {
560576
pub(crate) panic: PanicStrategy,
561577
#[serde(default)]
562578
pub(crate) dynamic_linking: bool,
579+
#[serde(rename = "supported-sanitizers", default)]
580+
pub(crate) sanitizers: Vec<Sanitizer>,
563581
}
564582

565583
impl TargetCfg {

‎src/tools/compiletest/src/header/needs.rs‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::common::{Config, Debugger};
1+
use crate::common::{Config, Debugger, Sanitizer};
22
use crate::header::IgnoreDecision;
33
use crate::util;
44

@@ -220,19 +220,20 @@ impl CachedNeedsConditions {
220220
path.iter().any(|dir| dir.join("x86_64-w64-mingw32-dlltool").is_file());
221221

222222
let target = &&*config.target;
223+
let sanitizers = &config.target_cfg().sanitizers;
223224
Self {
224225
sanitizer_support: std::env::var_os("RUSTC_SANITIZER_SUPPORT").is_some(),
225-
sanitizer_address: util::ASAN_SUPPORTED_TARGETS.contains(target),
226-
sanitizer_cfi: util::CFI_SUPPORTED_TARGETS.contains(target),
227-
sanitizer_kcfi: util::KCFI_SUPPORTED_TARGETS.contains(target),
228-
sanitizer_kasan: util::KASAN_SUPPORTED_TARGETS.contains(target),
229-
sanitizer_leak: util::LSAN_SUPPORTED_TARGETS.contains(target),
230-
sanitizer_memory: util::MSAN_SUPPORTED_TARGETS.contains(target),
231-
sanitizer_thread: util::TSAN_SUPPORTED_TARGETS.contains(target),
232-
sanitizer_hwaddress: util::HWASAN_SUPPORTED_TARGETS.contains(target),
233-
sanitizer_memtag: util::MEMTAG_SUPPORTED_TARGETS.contains(target),
234-
sanitizer_shadow_call_stack: util::SHADOWCALLSTACK_SUPPORTED_TARGETS.contains(target),
235-
sanitizer_safestack: util::SAFESTACK_SUPPORTED_TARGETS.contains(target),
226+
sanitizer_address: sanitizers.contains(&Sanitizer::Address),
227+
sanitizer_cfi: sanitizers.contains(&Sanitizer::Cfi),
228+
sanitizer_kcfi: sanitizers.contains(&Sanitizer::Kcfi),
229+
sanitizer_kasan: sanitizers.contains(&Sanitizer::KernelAddress),
230+
sanitizer_leak: sanitizers.contains(&Sanitizer::Leak),
231+
sanitizer_memory: sanitizers.contains(&Sanitizer::Memory),
232+
sanitizer_thread: sanitizers.contains(&Sanitizer::Thread),
233+
sanitizer_hwaddress: sanitizers.contains(&Sanitizer::Hwaddress),
234+
sanitizer_memtag: sanitizers.contains(&Sanitizer::Memtag),
235+
sanitizer_shadow_call_stack: sanitizers.contains(&Sanitizer::ShadowCallStack),
236+
sanitizer_safestack: sanitizers.contains(&Sanitizer::Safestack),
236237
profiler_support: std::env::var_os("RUSTC_PROFILER_SUPPORT").is_some(),
237238
xray: util::XRAY_SUPPORTED_TARGETS.contains(target),
238239

‎src/tools/compiletest/src/util.rs‎

Lines changed: 0 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -9,93 +9,6 @@ use tracing::*;
99
#[cfg(test)]
1010
mod tests;
1111

12-
pub const ASAN_SUPPORTED_TARGETS: &[&str] = &[
13-
"aarch64-apple-darwin",
14-
"aarch64-apple-ios",
15-
"aarch64-apple-ios-sim",
16-
"aarch64-apple-ios-macabi",
17-
"aarch64-unknown-fuchsia",
18-
"aarch64-linux-android",
19-
"aarch64-unknown-linux-gnu",
20-
"arm-linux-androideabi",
21-
"armv7-linux-androideabi",
22-
"i686-linux-android",
23-
"i686-unknown-linux-gnu",
24-
"x86_64-apple-darwin",
25-
"x86_64-apple-ios",
26-
"x86_64-apple-ios-macabi",
27-
"x86_64-unknown-fuchsia",
28-
"x86_64-linux-android",
29-
"x86_64-unknown-freebsd",
30-
"x86_64-unknown-linux-gnu",
31-
"s390x-unknown-linux-gnu",
32-
];
33-
34-
// FIXME(rcvalle): More targets are likely supported.
35-
pub const CFI_SUPPORTED_TARGETS: &[&str] = &[
36-
"aarch64-apple-darwin",
37-
"aarch64-unknown-fuchsia",
38-
"aarch64-linux-android",
39-
"aarch64-unknown-freebsd",
40-
"aarch64-unknown-linux-gnu",
41-
"x86_64-apple-darwin",
42-
"x86_64-unknown-fuchsia",
43-
"x86_64-pc-solaris",
44-
"x86_64-unknown-freebsd",
45-
"x86_64-unknown-illumos",
46-
"x86_64-unknown-linux-gnu",
47-
"x86_64-unknown-linux-musl",
48-
"x86_64-unknown-netbsd",
49-
];
50-
51-
pub const KCFI_SUPPORTED_TARGETS: &[&str] = &["aarch64-linux-none", "x86_64-linux-none"];
52-
53-
pub const KASAN_SUPPORTED_TARGETS: &[&str] = &[
54-
"aarch64-unknown-none",
55-
"riscv64gc-unknown-none-elf",
56-
"riscv64imac-unknown-none-elf",
57-
"x86_64-unknown-none",
58-
];
59-
60-
pub const LSAN_SUPPORTED_TARGETS: &[&str] = &[
61-
// FIXME: currently broken, see #88132
62-
// "aarch64-apple-darwin",
63-
"aarch64-unknown-linux-gnu",
64-
"x86_64-apple-darwin",
65-
"x86_64-apple-ios-macabi",
66-
"x86_64-unknown-linux-gnu",
67-
"s390x-unknown-linux-gnu",
68-
];
69-
70-
pub const MSAN_SUPPORTED_TARGETS: &[&str] = &[
71-
"aarch64-unknown-linux-gnu",
72-
"x86_64-unknown-freebsd",
73-
"x86_64-unknown-linux-gnu",
74-
"s390x-unknown-linux-gnu",
75-
];
76-
77-
pub const TSAN_SUPPORTED_TARGETS: &[&str] = &[
78-
"aarch64-apple-darwin",
79-
"aarch64-apple-ios",
80-
"aarch64-apple-ios-sim",
81-
"aarch64-apple-ios-macabi",
82-
"aarch64-unknown-linux-gnu",
83-
"x86_64-apple-darwin",
84-
"x86_64-apple-ios",
85-
"x86_64-apple-ios-macabi",
86-
"x86_64-unknown-freebsd",
87-
"x86_64-unknown-linux-gnu",
88-
"s390x-unknown-linux-gnu",
89-
];
90-
91-
pub const HWASAN_SUPPORTED_TARGETS: &[&str] =
92-
&["aarch64-linux-android", "aarch64-unknown-linux-gnu"];
93-
94-
pub const MEMTAG_SUPPORTED_TARGETS: &[&str] =
95-
&["aarch64-linux-android", "aarch64-unknown-linux-gnu"];
96-
97-
pub const SHADOWCALLSTACK_SUPPORTED_TARGETS: &[&str] = &["aarch64-linux-android"];
98-
9912
pub const XRAY_SUPPORTED_TARGETS: &[&str] = &[
10013
"aarch64-linux-android",
10114
"aarch64-unknown-linux-gnu",
@@ -109,8 +22,6 @@ pub const XRAY_SUPPORTED_TARGETS: &[&str] = &[
10922
"x86_64-unknown-openbsd",
11023
];
11124

112-
pub const SAFESTACK_SUPPORTED_TARGETS: &[&str] = &["x86_64-unknown-linux-gnu"];
113-
11425
pub fn make_new_path(path: &str) -> String {
11526
assert!(cfg!(windows));
11627
// Windows just uses PATH as the library search path, so we have to

0 commit comments

Comments
 (0)