From 92af72d1927e972e889c32bfd4b0bb1465b8b209 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Wed, 29 May 2024 08:04:24 +0200 Subject: [PATCH] fn_arg_sanity_check: fix panic message also update csky comment in abi/compatibility test --- compiler/rustc_ty_utils/src/abi.rs | 3 ++- tests/ui/abi/compatibility.rs | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/compiler/rustc_ty_utils/src/abi.rs b/compiler/rustc_ty_utils/src/abi.rs index 6f513f24948a5..c5ea85c90dc5d 100644 --- a/compiler/rustc_ty_utils/src/abi.rs +++ b/compiler/rustc_ty_utils/src/abi.rs @@ -520,7 +520,8 @@ fn fn_abi_sanity_check<'tcx>( assert!( matches!(&*cx.tcx.sess.target.arch, "wasm32" | "wasm64") || matches!(spec_abi, SpecAbi::PtxKernel | SpecAbi::Unadjusted), - r#"`PassMode::Direct` for aggregates only allowed for "unadjusted" and "ptx-kernel" functions and on wasm\nProblematic type: {:#?}"#, + "`PassMode::Direct` for aggregates only allowed for \"unadjusted\" and \"ptx-kernel\" functions and on wasm\n\ + Problematic type: {:#?}", arg.layout, ); } diff --git a/tests/ui/abi/compatibility.rs b/tests/ui/abi/compatibility.rs index 373d1cce1d73d..784c6d488eaf6 100644 --- a/tests/ui/abi/compatibility.rs +++ b/tests/ui/abi/compatibility.rs @@ -59,6 +59,7 @@ [nvptx64] needs-llvm-components: nvptx */ // FIXME: disabled since it fails on CI saying the csky component is missing +// see https://github.com/rust-lang/rust/issues/125697 /* revisions: csky [csky] compile-flags: --target csky-unknown-linux-gnuabiv2 [csky] needs-llvm-components: csky