user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Annotate signed type in int_divrem_guard

Browse source 
The way the macro expands, it may sometimes infer
"this is a uint, but doesn't impl Neg???"
Also, I made the "wrong path for intrinsics" error.
These fixes allow integration into libcore.
This commit is contained in:
Jubilee Young 2022-01-20 15:48:46 -08:00 • committed by Jubilee
parent a4f5f01b8a
commit 56566d816d
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/core_simd/src/ops.rs
View file

@ -33,7 +33,7 @@ where
macro_rules! unsafe_base {
($lhs:ident, $rhs:ident, {$simd_call:ident}, $($_:tt)*) => {
unsafe { $crate::intrinsics::$simd_call($lhs, $rhs) }
unsafe { $crate::simd::intrinsics::$simd_call($lhs, $rhs) }
};
}
@ -49,7 +49,10 @@ macro_rules! unsafe_base {
macro_rules! wrap_bitshift {
($lhs:ident, $rhs:ident, {$simd_call:ident}, $int:ident) => {
unsafe {
$crate::intrinsics::$simd_call($lhs, $rhs.bitand(Simd::splat(<$int>::BITS as $int - 1)))
$crate::simd::intrinsics::$simd_call(
$lhs,
$rhs.bitand(Simd::splat(<$int>::BITS as $int - 1)),
)
}
};
}
@ -70,11 +73,13 @@ macro_rules! int_divrem_guard {
if $rhs.lanes_eq(Simd::splat(0)).any() {
panic!($zero);
} else if <$int>::MIN != 0
&& ($lhs.lanes_eq(Simd::splat(<$int>::MIN)) & $rhs.lanes_eq(Simd::splat(-1 as _))).any()
&& ($lhs.lanes_eq(Simd::splat(<$int>::MIN))
// type inference can break here, so cut an SInt to size
& $rhs.lanes_eq(Simd::splat(-1i64 as _))).any()
{
panic!($overflow);
} else {
unsafe { $crate::intrinsics::$simd_call($lhs, $rhs) }
unsafe { $crate::simd::intrinsics::$simd_call($lhs, $rhs) }
}
};
}