about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2024-05-29 08:04:24 +0200
committerRalf Jung <post@ralfj.de>2024-05-29 08:16:47 +0200
commit92af72d1927e972e889c32bfd4b0bb1465b8b209 (patch)
tree582a6c522ea5fd73ebe8c0fb08a7f97c8eec7306
parentda159eb331b27df528185c616b394bb0e1d2a4bd (diff)
downloadrust-92af72d1927e972e889c32bfd4b0bb1465b8b209.tar.gz
rust-92af72d1927e972e889c32bfd4b0bb1465b8b209.zip
fn_arg_sanity_check: fix panic message
also update csky comment in abi/compatibility test
-rw-r--r--compiler/rustc_ty_utils/src/abi.rs3
-rw-r--r--tests/ui/abi/compatibility.rs1
2 files changed, 3 insertions, 1 deletions
diff --git a/compiler/rustc_ty_utils/src/abi.rs b/compiler/rustc_ty_utils/src/abi.rs
index 6f513f24948..c5ea85c90dc 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 373d1cce1d7..784c6d488ea 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