Make -Zsanitizer-cfi-{recover,diag} require -Zsanitizer=cfi

compiler/rustc_session/src/diagnostics.rs

@@ -337,6 +337,14 @@ pub(crate) struct SanitizerCfiGeneralizePointersRequiresCfi;
 #[diag("`-Zsanitizer-cfi-normalize-integers` requires `-Zsanitizer=cfi` or `-Zsanitizer=kcfi`")]
 pub(crate) struct SanitizerCfiNormalizeIntegersRequiresCfi;
 
+#[derive(Diagnostic)]
+#[diag("`-Zsanitizer-cfi-recover` requires `-Zsanitizer=cfi`")]
+pub(crate) struct SanitizerCfiRecoverRequiresCfi;
+
+#[derive(Diagnostic)]
+#[diag("`-Zsanitizer-cfi-diag` requires `-Zsanitizer=cfi`")]
+pub(crate) struct SanitizerCfiDiagRequiresCfi;
+
 #[derive(Diagnostic)]
 #[diag("`-Zsanitizer-kcfi-arity` requires `-Zsanitizer=kcfi`")]
 pub(crate) struct SanitizerKcfiArityRequiresKcfi;

compiler/rustc_session/src/session.rs

@@ -605,6 +605,14 @@ impl Session {
         self.opts.unstable_opts.sanitizer_cfi_normalize_integers == Some(true)
     }
 
+    pub fn is_sanitizer_cfi_recover_enabled(&self) -> bool {
+        self.opts.unstable_opts.sanitizer_cfi_recover == Some(true)
+    }
+
+    pub fn is_sanitizer_cfi_diag_enabled(&self) -> bool {
+        self.opts.unstable_opts.sanitizer_cfi_diag == Some(true)
+    }
+
     pub fn is_sanitizer_kcfi_arity_enabled(&self) -> bool {
         self.opts.unstable_opts.sanitizer_kcfi_arity == Some(true)
     }
@@ -1579,6 +1587,20 @@ fn validate_commandline_args_with_session_available(sess: &Session) {
         }
     }
 
+    // LLVM CFI recovery requires CFI.
+    if sess.is_sanitizer_cfi_recover_enabled() {
+        if !sess.is_sanitizer_cfi_enabled() {
+            sess.dcx().emit_err(diagnostics::SanitizerCfiRecoverRequiresCfi);
+        }
+    }
+
+    // LLVM CFI diagnostics requires CFI.
+    if sess.is_sanitizer_cfi_diag_enabled() {
+        if !sess.is_sanitizer_cfi_enabled() {
+            sess.dcx().emit_err(diagnostics::SanitizerCfiDiagRequiresCfi);
+        }
+    }
+
     // LLVM CFI integer normalization requires CFI or KCFI.
     if sess.is_sanitizer_cfi_normalize_integers_enabled() {
         if !(sess.is_sanitizer_cfi_enabled() || sess.is_sanitizer_kcfi_enabled()) {

tests/ui/sanitizer/cfi/diag-requires-cfi.rs

@@ -0,0 +1,10 @@
+// Verifies that `-Zsanitizer-cfi-diag` requires `-Zsanitizer=cfi`.
+//
+//@ needs-sanitizer-cfi
+//@ compile-flags: -Clto -Cno-prepopulate-passes -Ctarget-feature=-crt-static -Zsanitizer-cfi-diag
+
+#![feature(no_core)]
+#![no_core]
+#![no_main]
+
+//~? ERROR `-Zsanitizer-cfi-diag` requires `-Zsanitizer=cfi`

tests/ui/sanitizer/cfi/diag-requires-cfi.stderr

@@ -0,0 +1,4 @@
+error: `-Zsanitizer-cfi-diag` requires `-Zsanitizer=cfi`
+
+error: aborting due to 1 previous error
+

tests/ui/sanitizer/cfi/recover-requires-cfi.rs

@@ -0,0 +1,10 @@
+// Verifies that `-Zsanitizer-cfi-recover` requires `-Zsanitizer=cfi`.
+//
+//@ needs-sanitizer-cfi
+//@ compile-flags: -Clto -Cno-prepopulate-passes -Ctarget-feature=-crt-static -Zsanitizer-cfi-recover
+
+#![feature(no_core)]
+#![no_core]
+#![no_main]
+
+//~? ERROR `-Zsanitizer-cfi-recover` requires `-Zsanitizer=cfi`

tests/ui/sanitizer/cfi/recover-requires-cfi.stderr

@@ -0,0 +1,4 @@
+error: `-Zsanitizer-cfi-recover` requires `-Zsanitizer=cfi`
+
+error: aborting due to 1 previous error
+