dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sort mutually-exclusive pairs, update fixed tests

This commit is contained in:
David Koloski 2024-05-15 15:40:52 +00:00
parent d7d3bd1221
commit 1b934f3e8c
3 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
compiler/rustc_target/src/spec/mod.rs
View File

@ -1317,29 +1317,29 @@ rustc_data_structures::external_bitflags_debug! { SanitizerSet }
impl SanitizerSet {
const MUTUALLY_EXCLUSIVE: &'static [(SanitizerSet, SanitizerSet)] = &[
(SanitizerSet::MEMORY, SanitizerSet::ADDRESS),
(SanitizerSet::MEMORY, SanitizerSet::LEAK),
(SanitizerSet::THREAD, SanitizerSet::ADDRESS),
(SanitizerSet::THREAD, SanitizerSet::LEAK),
(SanitizerSet::THREAD, SanitizerSet::MEMORY),
(SanitizerSet::HWADDRESS, SanitizerSet::ADDRESS),
(SanitizerSet::HWADDRESS, SanitizerSet::MEMORY),
(SanitizerSet::HWADDRESS, SanitizerSet::THREAD),
(SanitizerSet::MEMTAG, SanitizerSet::ADDRESS),
(SanitizerSet::MEMTAG, SanitizerSet::HWADDRESS),
(SanitizerSet::KCFI, SanitizerSet::CFI),
(SanitizerSet::KERNELADDRESS, SanitizerSet::ADDRESS),
(SanitizerSet::KERNELADDRESS, SanitizerSet::LEAK),
(SanitizerSet::KERNELADDRESS, SanitizerSet::MEMORY),
(SanitizerSet::KERNELADDRESS, SanitizerSet::THREAD),
(SanitizerSet::KERNELADDRESS, SanitizerSet::HWADDRESS),
(SanitizerSet::KERNELADDRESS, SanitizerSet::MEMTAG),
(SanitizerSet::SAFESTACK, SanitizerSet::ADDRESS),
(SanitizerSet::SAFESTACK, SanitizerSet::LEAK),
(SanitizerSet::SAFESTACK, SanitizerSet::MEMORY),
(SanitizerSet::SAFESTACK, SanitizerSet::THREAD),
(SanitizerSet::SAFESTACK, SanitizerSet::HWADDRESS),
(SanitizerSet::SAFESTACK, SanitizerSet::KERNELADDRESS),
(SanitizerSet::ADDRESS, SanitizerSet::MEMORY),
(SanitizerSet::ADDRESS, SanitizerSet::THREAD),
(SanitizerSet::ADDRESS, SanitizerSet::HWADDRESS),
(SanitizerSet::ADDRESS, SanitizerSet::MEMTAG),
(SanitizerSet::ADDRESS, SanitizerSet::KERNELADDRESS),
(SanitizerSet::ADDRESS, SanitizerSet::SAFESTACK),
(SanitizerSet::LEAK, SanitizerSet::MEMORY),
(SanitizerSet::LEAK, SanitizerSet::THREAD),
(SanitizerSet::LEAK, SanitizerSet::KERNELADDRESS),
(SanitizerSet::LEAK, SanitizerSet::SAFESTACK),
(SanitizerSet::MEMORY, SanitizerSet::THREAD),
(SanitizerSet::MEMORY, SanitizerSet::HWADDRESS),
(SanitizerSet::MEMORY, SanitizerSet::KERNELADDRESS),
(SanitizerSet::MEMORY, SanitizerSet::SAFESTACK),
(SanitizerSet::THREAD, SanitizerSet::HWADDRESS),
(SanitizerSet::THREAD, SanitizerSet::KERNELADDRESS),
(SanitizerSet::THREAD, SanitizerSet::SAFESTACK),
(SanitizerSet::HWADDRESS, SanitizerSet::MEMTAG),
(SanitizerSet::HWADDRESS, SanitizerSet::KERNELADDRESS),
(SanitizerSet::HWADDRESS, SanitizerSet::SAFESTACK),
(SanitizerSet::CFI, SanitizerSet::KCFI),
(SanitizerSet::MEMTAG, SanitizerSet::KERNELADDRESS),
(SanitizerSet::KERNELADDRESS, SanitizerSet::SAFESTACK),
];
/// Return sanitizer's name

6
tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.aarch64.stderr
View File

@ -2,9 +2,5 @@ error: cfi sanitizer is not supported for this target
error: `-Zsanitizer=cfi` is incompatible with `-Zsanitizer=kcfi`
error: `-Zsanitizer=cfi` is incompatible with `-Zsanitizer=kcfi`
|
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
error: aborting due to 3 previous errors
error: aborting due to 2 previous errors

6
tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.x86_64.stderr
View File

@ -2,9 +2,5 @@ error: cfi sanitizer is not supported for this target
error: `-Zsanitizer=cfi` is incompatible with `-Zsanitizer=kcfi`
error: `-Zsanitizer=cfi` is incompatible with `-Zsanitizer=kcfi`
|
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
error: aborting due to 3 previous errors
error: aborting due to 2 previous errors