45 files changed, 15 insertions, 1 deletions
diff --git a/src/test/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADFLAGS.stderr b/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADFLAGS.stderr
index d0e8d4719..d0e8d4719 100644
--- a/src/test/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADFLAGS.stderr
+++ b/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADFLAGS.stderr
diff --git a/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADTARGET.stderr b/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADTARGET.stderr
new file mode 100644
index 000000000..52a591902
--- /dev/null
+++ b/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADTARGET.stderr
@@ -0,0 +1,4 @@
+error: `-Zbranch-protection` is only supported on aarch64
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/invalid-compile-flags/branch-protection-missing-pac-ret.rs b/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.rs
index 4bc4919bc..1d7ec5cba 100644
--- a/src/test/ui/invalid-compile-flags/branch-protection-missing-pac-ret.rs
+++ b/tests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.rs
@@ -3,7 +3,7 @@
 // [BADFLAGS] check-fail
 // [BADFLAGS] needs-llvm-components: aarch64
 // [BADTARGET] compile-flags: --target=x86_64-unknown-linux-gnu -Zbranch-protection=bti
-// [BADTARGET] build-fail
+// [BADTARGET] check-fail
 // [BADTARGET] needs-llvm-components: x86
 
 #![crate_type = "lib"]
diff --git a/src/test/ui/invalid-compile-flags/codegen-option-without-group.rs b/tests/ui/invalid-compile-flags/codegen-option-without-group.rs
index 7bbf47a38..7bbf47a38 100644
--- a/src/test/ui/invalid-compile-flags/codegen-option-without-group.rs
+++ b/tests/ui/invalid-compile-flags/codegen-option-without-group.rs
diff --git a/src/test/ui/invalid-compile-flags/codegen-option-without-group.stderr b/tests/ui/invalid-compile-flags/codegen-option-without-group.stderr
index c5a0c29ca..c5a0c29ca 100644
--- a/src/test/ui/invalid-compile-flags/codegen-option-without-group.stderr
+++ b/tests/ui/invalid-compile-flags/codegen-option-without-group.stderr
diff --git a/src/test/ui/invalid-compile-flags/debug-option-without-group.rs b/tests/ui/invalid-compile-flags/debug-option-without-group.rs
index 86e40c178..86e40c178 100644
--- a/src/test/ui/invalid-compile-flags/debug-option-without-group.rs
+++ b/tests/ui/invalid-compile-flags/debug-option-without-group.rs
diff --git a/src/test/ui/invalid-compile-flags/debug-option-without-group.stderr b/tests/ui/invalid-compile-flags/debug-option-without-group.stderr
index 0e57e31ad..0e57e31ad 100644
--- a/src/test/ui/invalid-compile-flags/debug-option-without-group.stderr
+++ b/tests/ui/invalid-compile-flags/debug-option-without-group.stderr
diff --git a/src/test/ui/invalid-module-declaration/auxiliary/foo/bar.rs b/tests/ui/invalid-module-declaration/auxiliary/foo/bar.rs
index bcfd7dc0a..bcfd7dc0a 100644
--- a/src/test/ui/invalid-module-declaration/auxiliary/foo/bar.rs
+++ b/tests/ui/invalid-module-declaration/auxiliary/foo/bar.rs
diff --git a/src/test/ui/invalid-module-declaration/auxiliary/foo/mod.rs b/tests/ui/invalid-module-declaration/auxiliary/foo/mod.rs
index 46f285ca4..46f285ca4 100644
--- a/src/test/ui/invalid-module-declaration/auxiliary/foo/mod.rs
+++ b/tests/ui/invalid-module-declaration/auxiliary/foo/mod.rs
diff --git a/src/test/ui/invalid-module-declaration/invalid-module-declaration.rs b/tests/ui/invalid-module-declaration/invalid-module-declaration.rs
index 254d810d7..254d810d7 100644
--- a/src/test/ui/invalid-module-declaration/invalid-module-declaration.rs
+++ b/tests/ui/invalid-module-declaration/invalid-module-declaration.rs
diff --git a/src/test/ui/invalid-module-declaration/invalid-module-declaration.stderr b/tests/ui/invalid-module-declaration/invalid-module-declaration.stderr
index 7bc8efd7e..7bc8efd7e 100644
--- a/src/test/ui/invalid-module-declaration/invalid-module-declaration.stderr
+++ b/tests/ui/invalid-module-declaration/invalid-module-declaration.stderr
diff --git a/src/test/ui/invalid-self-argument/bare-fn-start.rs b/tests/ui/invalid-self-argument/bare-fn-start.rs
index 7c580bc5a..7c580bc5a 100644
--- a/src/test/ui/invalid-self-argument/bare-fn-start.rs
+++ b/tests/ui/invalid-self-argument/bare-fn-start.rs
diff --git a/src/test/ui/invalid-self-argument/bare-fn-start.stderr b/tests/ui/invalid-self-argument/bare-fn-start.stderr
index 37753e61f..37753e61f 100644
--- a/src/test/ui/invalid-self-argument/bare-fn-start.stderr
+++ b/tests/ui/invalid-self-argument/bare-fn-start.stderr
diff --git a/src/test/ui/invalid-self-argument/bare-fn.rs b/tests/ui/invalid-self-argument/bare-fn.rs
index 342bdc31a..342bdc31a 100644
--- a/src/test/ui/invalid-self-argument/bare-fn.rs
+++ b/tests/ui/invalid-self-argument/bare-fn.rs
diff --git a/src/test/ui/invalid-self-argument/bare-fn.stderr b/tests/ui/invalid-self-argument/bare-fn.stderr
index ff2217b5e..ff2217b5e 100644
--- a/src/test/ui/invalid-self-argument/bare-fn.stderr
+++ b/tests/ui/invalid-self-argument/bare-fn.stderr
diff --git a/src/test/ui/invalid-self-argument/trait-fn.rs b/tests/ui/invalid-self-argument/trait-fn.rs
index 5ccea5895..5ccea5895 100644
--- a/src/test/ui/invalid-self-argument/trait-fn.rs
+++ b/tests/ui/invalid-self-argument/trait-fn.rs
diff --git a/src/test/ui/invalid-self-argument/trait-fn.stderr b/tests/ui/invalid-self-argument/trait-fn.stderr
index b9887af96..b9887af96 100644
--- a/src/test/ui/invalid-self-argument/trait-fn.stderr
+++ b/tests/ui/invalid-self-argument/trait-fn.stderr
diff --git a/src/test/ui/invalid/invalid-crate-type-macro.rs b/tests/ui/invalid/invalid-crate-type-macro.rs
index 9ba5e79ba..9ba5e79ba 100644
--- a/src/test/ui/invalid/invalid-crate-type-macro.rs
+++ b/tests/ui/invalid/invalid-crate-type-macro.rs
diff --git a/src/test/ui/invalid/invalid-crate-type-macro.stderr b/tests/ui/invalid/invalid-crate-type-macro.stderr
index c196d4278..c196d4278 100644
--- a/src/test/ui/invalid/invalid-crate-type-macro.stderr
+++ b/tests/ui/invalid/invalid-crate-type-macro.stderr
diff --git a/src/test/ui/invalid/invalid-crate-type.rs b/tests/ui/invalid/invalid-crate-type.rs
index 6c44c3b4f..6c44c3b4f 100644
--- a/src/test/ui/invalid/invalid-crate-type.rs
+++ b/tests/ui/invalid/invalid-crate-type.rs
diff --git a/src/test/ui/invalid/invalid-crate-type.stderr b/tests/ui/invalid/invalid-crate-type.stderr
index 59d5d7bc9..59d5d7bc9 100644
--- a/src/test/ui/invalid/invalid-crate-type.stderr
+++ b/tests/ui/invalid/invalid-crate-type.stderr
diff --git a/src/test/ui/invalid/invalid-debugger-visualizer-option.rs b/tests/ui/invalid/invalid-debugger-visualizer-option.rs
index 5645a30cc..5645a30cc 100644
--- a/src/test/ui/invalid/invalid-debugger-visualizer-option.rs
+++ b/tests/ui/invalid/invalid-debugger-visualizer-option.rs
diff --git a/src/test/ui/invalid/invalid-debugger-visualizer-option.stderr b/tests/ui/invalid/invalid-debugger-visualizer-option.stderr
index afb8d16ee..afb8d16ee 100644
--- a/src/test/ui/invalid/invalid-debugger-visualizer-option.stderr
+++ b/tests/ui/invalid/invalid-debugger-visualizer-option.stderr
diff --git a/src/test/ui/invalid/invalid-debugger-visualizer-target.rs b/tests/ui/invalid/invalid-debugger-visualizer-target.rs
index f0aba6a75..f0aba6a75 100644
--- a/src/test/ui/invalid/invalid-debugger-visualizer-target.rs
+++ b/tests/ui/invalid/invalid-debugger-visualizer-target.rs
diff --git a/src/test/ui/invalid/invalid-debugger-visualizer-target.stderr b/tests/ui/invalid/invalid-debugger-visualizer-target.stderr
index 3555bbb16..3555bbb16 100644
--- a/src/test/ui/invalid/invalid-debugger-visualizer-target.stderr
+++ b/tests/ui/invalid/invalid-debugger-visualizer-target.stderr
diff --git a/src/test/ui/invalid/invalid-inline.rs b/tests/ui/invalid/invalid-inline.rs
index 2501b1e23..2501b1e23 100644
--- a/src/test/ui/invalid/invalid-inline.rs
+++ b/tests/ui/invalid/invalid-inline.rs
diff --git a/src/test/ui/invalid/invalid-inline.stderr b/tests/ui/invalid/invalid-inline.stderr
index 7edbf936b..7edbf936b 100644
--- a/src/test/ui/invalid/invalid-inline.stderr
+++ b/tests/ui/invalid/invalid-inline.stderr
diff --git a/src/test/ui/invalid/invalid-llvm-passes.rs b/tests/ui/invalid/invalid-llvm-passes.rs
index ee28f5eb6..ee28f5eb6 100644
--- a/src/test/ui/invalid/invalid-llvm-passes.rs
+++ b/tests/ui/invalid/invalid-llvm-passes.rs
diff --git a/src/test/ui/invalid/invalid-llvm-passes.stderr b/tests/ui/invalid/invalid-llvm-passes.stderr
index ae1f85e41..ae1f85e41 100644
--- a/src/test/ui/invalid/invalid-llvm-passes.stderr
+++ b/tests/ui/invalid/invalid-llvm-passes.stderr
diff --git a/src/test/ui/invalid/invalid-macro-matcher.rs b/tests/ui/invalid/invalid-macro-matcher.rs
index ff79d4e1a..ff79d4e1a 100644
--- a/src/test/ui/invalid/invalid-macro-matcher.rs
+++ b/tests/ui/invalid/invalid-macro-matcher.rs
diff --git a/src/test/ui/invalid/invalid-macro-matcher.stderr b/tests/ui/invalid/invalid-macro-matcher.stderr
index dbe025b73..dbe025b73 100644
--- a/src/test/ui/invalid/invalid-macro-matcher.stderr
+++ b/tests/ui/invalid/invalid-macro-matcher.stderr
diff --git a/src/test/ui/invalid/invalid-no-sanitize.rs b/tests/ui/invalid/invalid-no-sanitize.rs
index b52e3cc83..b52e3cc83 100644
--- a/src/test/ui/invalid/invalid-no-sanitize.rs
+++ b/tests/ui/invalid/invalid-no-sanitize.rs
diff --git a/tests/ui/invalid/invalid-no-sanitize.stderr b/tests/ui/invalid/invalid-no-sanitize.stderr
new file mode 100644
index 000000000..460003495
--- /dev/null
+++ b/tests/ui/invalid/invalid-no-sanitize.stderr
@@ -0,0 +1,10 @@
+error: invalid argument for `no_sanitize`
+  --> $DIR/invalid-no-sanitize.rs:3:15
+   |
+LL | #[no_sanitize(brontosaurus)]
+   |               ^^^^^^^^^^^^
+   |
+   = note: expected one of: `address`, `cfi`, `hwaddress`, `kcfi`, `memory`, `memtag`, `shadow-call-stack`, or `thread`
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/invalid/invalid-path-in-const.rs b/tests/ui/invalid/invalid-path-in-const.rs
index 51eb86072..51eb86072 100644
--- a/src/test/ui/invalid/invalid-path-in-const.rs
+++ b/tests/ui/invalid/invalid-path-in-const.rs
diff --git a/src/test/ui/invalid/invalid-path-in-const.stderr b/tests/ui/invalid/invalid-path-in-const.stderr
index a14ab7d85..a14ab7d85 100644
--- a/src/test/ui/invalid/invalid-path-in-const.stderr
+++ b/tests/ui/invalid/invalid-path-in-const.stderr
diff --git a/src/test/ui/invalid/invalid-plugin-attr.rs b/tests/ui/invalid/invalid-plugin-attr.rs
index 3080af245..3080af245 100644
--- a/src/test/ui/invalid/invalid-plugin-attr.rs
+++ b/tests/ui/invalid/invalid-plugin-attr.rs
diff --git a/src/test/ui/invalid/invalid-plugin-attr.stderr b/tests/ui/invalid/invalid-plugin-attr.stderr
index d3882d33f..d3882d33f 100644
--- a/src/test/ui/invalid/invalid-plugin-attr.stderr
+++ b/tests/ui/invalid/invalid-plugin-attr.stderr
diff --git a/src/test/ui/invalid/invalid-rustc_legacy_const_generics-arguments.rs b/tests/ui/invalid/invalid-rustc_legacy_const_generics-arguments.rs
index 6eabd9b10..6eabd9b10 100644
--- a/src/test/ui/invalid/invalid-rustc_legacy_const_generics-arguments.rs
+++ b/tests/ui/invalid/invalid-rustc_legacy_const_generics-arguments.rs
diff --git a/src/test/ui/invalid/invalid-rustc_legacy_const_generics-arguments.stderr b/tests/ui/invalid/invalid-rustc_legacy_const_generics-arguments.stderr
index 1ced1433f..1ced1433f 100644
--- a/src/test/ui/invalid/invalid-rustc_legacy_const_generics-arguments.stderr
+++ b/tests/ui/invalid/invalid-rustc_legacy_const_generics-arguments.stderr
diff --git a/src/test/ui/invalid/invalid_rustc_layout_scalar_valid_range.rs b/tests/ui/invalid/invalid_rustc_layout_scalar_valid_range.rs
index 06cf8c0f0..06cf8c0f0 100644
--- a/src/test/ui/invalid/invalid_rustc_layout_scalar_valid_range.rs
+++ b/tests/ui/invalid/invalid_rustc_layout_scalar_valid_range.rs
diff --git a/src/test/ui/invalid/invalid_rustc_layout_scalar_valid_range.stderr b/tests/ui/invalid/invalid_rustc_layout_scalar_valid_range.stderr
index 7879e7358..7879e7358 100644
--- a/src/test/ui/invalid/invalid_rustc_layout_scalar_valid_range.stderr
+++ b/tests/ui/invalid/invalid_rustc_layout_scalar_valid_range.stderr
diff --git a/src/test/ui/invalid_crate_type_syntax.rs b/tests/ui/invalid_crate_type_syntax.rs
index 621587af3..621587af3 100644
--- a/src/test/ui/invalid_crate_type_syntax.rs
+++ b/tests/ui/invalid_crate_type_syntax.rs
diff --git a/src/test/ui/invalid_crate_type_syntax.stderr b/tests/ui/invalid_crate_type_syntax.stderr
index 4072a2fa1..4072a2fa1 100644
--- a/src/test/ui/invalid_crate_type_syntax.stderr
+++ b/tests/ui/invalid_crate_type_syntax.stderr
diff --git a/src/test/ui/invalid_dispatch_from_dyn_impls.rs b/tests/ui/invalid_dispatch_from_dyn_impls.rs
index b7bc766fb..b7bc766fb 100644
--- a/src/test/ui/invalid_dispatch_from_dyn_impls.rs
+++ b/tests/ui/invalid_dispatch_from_dyn_impls.rs
diff --git a/src/test/ui/invalid_dispatch_from_dyn_impls.stderr b/tests/ui/invalid_dispatch_from_dyn_impls.stderr
index b5b32d2f0..b5b32d2f0 100644
--- a/src/test/ui/invalid_dispatch_from_dyn_impls.stderr
+++ b/tests/ui/invalid_dispatch_from_dyn_impls.stderr