Taint body on invalid call ABI

Author: compiler-errors

compiler/rustc_hir_typeck/src/callee.rs

@@ -156,7 +156,16 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
     pub(crate) fn check_call_abi(&self, abi: ExternAbi, span: Span) {
         let canon_abi = match AbiMap::from_target(&self.sess().target).canonize_abi(abi, false) {
             AbiMapping::Direct(canon_abi) | AbiMapping::Deprecated(canon_abi) => canon_abi,
-            AbiMapping::Invalid => return,
+            AbiMapping::Invalid => {
+                // This should be reported elsewhere, but we want to taint this body
+                // so that we don't try to evaluate calls to ABIs that are invalid.
+                let guar = self.dcx().span_delayed_bug(
+                    span,
+                    format!("invalid abi for platform should have reported an error: {abi}"),
+                );
+                self.set_tainted_by_errors(guar);
+                return;
+            }
         };
 
         let valid = match canon_abi {

tests/ui/abi/invalid-call-abi.rs

@@ -0,0 +1,14 @@
+// Fix for #142969.
+
+#![feature(abi_c_cmse_nonsecure_call)]
+
+const extern "C-cmse-nonsecure-call" fn foo() {
+    //~^ ERROR "C-cmse-nonsecure-call" is not a supported ABI for the current target
+    //~| ERROR the `"C-cmse-nonsecure-call"` ABI is only allowed on function pointers
+    panic!()
+}
+
+const _: () = foo();
+
+
+fn main() {}

tests/ui/abi/invalid-call-abi.stderr

@@ -0,0 +1,16 @@
+error[E0570]: "C-cmse-nonsecure-call" is not a supported ABI for the current target
+  --> $DIR/invalid-call-abi.rs:5:14
+   |
+LL | const extern "C-cmse-nonsecure-call" fn foo() {
+   |              ^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0781]: the `"C-cmse-nonsecure-call"` ABI is only allowed on function pointers
+  --> $DIR/invalid-call-abi.rs:5:1
+   |
+LL | const extern "C-cmse-nonsecure-call" fn foo() {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0570, E0781.
+For more information about an error, try `rustc --explain E0570`.