diff options
| author | bors <bors@rust-lang.org> | 2024-04-23 18:23:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-23 18:23:46 +0000 |
| commit | 40dcd796d094b911b8b7b55a0519fb8e3d21680f (patch) | |
| tree | 014f4957b4460b79e16fa0d34b62afcadb619b87 /compiler/rustc_codegen_gcc | |
| parent | c2f2db79ca3024f68d22b45aa22b570775c2c4ad (diff) | |
| parent | a760954ca9823797660b07ed830dcf1eb8887e30 (diff) | |
| download | rust-40dcd796d094b911b8b7b55a0519fb8e3d21680f.tar.gz rust-40dcd796d094b911b8b7b55a0519fb8e3d21680f.zip | |
Auto merge of #124302 - matthiaskrgr:rollup-2aya8n8, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - #124003 (Dellvmize some intrinsics (use `u32` instead of `Self` in some integer intrinsics)) - #124169 (Don't fatal when calling `expect_one_of` when recovering arg in `parse_seq`) - #124286 (Subtree sync for rustc_codegen_cranelift) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_gcc')
| -rw-r--r-- | compiler/rustc_codegen_gcc/example/example.rs | 7 | ||||
| -rw-r--r-- | compiler/rustc_codegen_gcc/example/mini_core.rs | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/compiler/rustc_codegen_gcc/example/example.rs b/compiler/rustc_codegen_gcc/example/example.rs index 5878e8548d9..7c21b73b630 100644 --- a/compiler/rustc_codegen_gcc/example/example.rs +++ b/compiler/rustc_codegen_gcc/example/example.rs @@ -153,9 +153,10 @@ fn array_as_slice(arr: &[u8; 3]) -> &[u8] { arr } -unsafe fn use_ctlz_nonzero(a: u16) -> u16 { - intrinsics::ctlz_nonzero(a) -} +// FIXME: fix the intrinsic implementation to work with the new ->u32 signature +// unsafe fn use_ctlz_nonzero(a: u16) -> u32 { +// intrinsics::ctlz_nonzero(a) +// } fn ptr_as_usize(ptr: *const u8) -> usize { ptr as usize diff --git a/compiler/rustc_codegen_gcc/example/mini_core.rs b/compiler/rustc_codegen_gcc/example/mini_core.rs index 4665009e191..8ffa66a4894 100644 --- a/compiler/rustc_codegen_gcc/example/mini_core.rs +++ b/compiler/rustc_codegen_gcc/example/mini_core.rs @@ -593,7 +593,7 @@ pub mod intrinsics { pub fn min_align_of_val<T: ?Sized>(val: *const T) -> usize; pub fn copy<T>(src: *const T, dst: *mut T, count: usize); pub fn transmute<T, U>(e: T) -> U; - pub fn ctlz_nonzero<T>(x: T) -> T; + pub fn ctlz_nonzero<T>(x: T) -> u32; #[rustc_safe_intrinsic] pub fn needs_drop<T: ?Sized>() -> bool; #[rustc_safe_intrinsic] |