From 1b934f3e8cb3c01dfcc8a5a8b23ebae8a41c2b4b Mon Sep 17 00:00:00 2001 From: David Koloski Date: Wed, 15 May 2024 15:40:52 +0000 Subject: [PATCH] Sort mutually-exclusive pairs, update fixed tests --- compiler/rustc_target/src/spec/mod.rs | 46 +++++++++---------- ...i-is-incompatible-with-kcfi.aarch64.stderr | 6 +-- ...fi-is-incompatible-with-kcfi.x86_64.stderr | 6 +-- 3 files changed, 25 insertions(+), 33 deletions(-) diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs index 256fc9983efa..73c7e9d4aa43 100644 --- a/compiler/rustc_target/src/spec/mod.rs +++ b/compiler/rustc_target/src/spec/mod.rs @@ -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 diff --git a/tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.aarch64.stderr b/tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.aarch64.stderr index 1006c3bc17ef..7f596a19104e 100644 --- a/tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.aarch64.stderr +++ b/tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.aarch64.stderr @@ -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 diff --git a/tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.x86_64.stderr b/tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.x86_64.stderr index 1006c3bc17ef..7f596a19104e 100644 --- a/tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.x86_64.stderr +++ b/tests/ui/sanitizer/cfi-is-incompatible-with-kcfi.x86_64.stderr @@ -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