Fix some missing ones

rust-lang · Jun 21, 2024 · ef22eb1 · ef22eb1
1 parent d0a4159
commit ef22eb1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/shims/x86/avx2.rs b/src/shims/x86/avx2.rs
@@ -123,7 +123,7 @@ pub(super) trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
  let (dest, dest_len) = this.mplace_to_simd(dest)?;
 
  assert_eq!(left_len, right_len);
- assert_eq!(dest_len.checked_mul(2).unwrap(), left_len);
+ assert_eq!(dest_len.strict_mul(2), left_len);
 
  for i in 0..dest_len {
  let j1 = i.strict_mul(2);
@@ -160,7 +160,7 @@ pub(super) trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
  let (dest, dest_len) = this.mplace_to_simd(dest)?;
 
  assert_eq!(left_len, right_len);
- assert_eq!(dest_len.checked_mul(2).unwrap(), left_len);
+ assert_eq!(dest_len.strict_mul(2), left_len);
 
  for i in 0..dest_len {
  let j1 = i.strict_mul(2);
@@ -335,7 +335,7 @@ pub(super) trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
  let (dest, dest_len) = this.mplace_to_simd(dest)?;
 
  assert_eq!(left_len, right_len);
- assert_eq!(left_len, dest_len.checked_mul(8).unwrap());
+ assert_eq!(left_len, dest_len.strict_mul(8));
 
  for i in 0..dest_len {
  let dest = this.project_index(&dest, i)?;

diff --git a/src/shims/x86/mod.rs b/src/shims/x86/mod.rs
@@ -1074,7 +1074,7 @@ fn mpsadbw<'tcx>(
  let (_, _, right) = split_simd_to_128bit_chunks(this, right)?;
  let (_, dest_items_per_chunk, dest) = split_simd_to_128bit_chunks(this, dest)?;
 
- assert_eq!(op_items_per_chunk, dest_items_per_chunk.checked_mul(2).unwrap());
+ assert_eq!(op_items_per_chunk, dest_items_per_chunk.strict_mul(2));
 
  let imm = this.read_scalar(imm)?.to_uint(imm.layout.size)?;
  // Bit 2 of `imm` specifies the offset for indices of `left`.
@@ -1229,7 +1229,7 @@ fn pack_generic<'tcx>(
  let (_, _, right) = split_simd_to_128bit_chunks(this, right)?;
  let (_, dest_items_per_chunk, dest) = split_simd_to_128bit_chunks(this, dest)?;
 
- assert_eq!(dest_items_per_chunk, op_items_per_chunk.checked_mul(2).unwrap());
+ assert_eq!(dest_items_per_chunk, op_items_per_chunk.strict_mul(2));
 
  for i in 0..num_chunks {
  let left = this.project_index(&left, i)?;

diff --git a/src/shims/x86/sse2.rs b/src/shims/x86/sse2.rs
@@ -47,7 +47,7 @@ pub(super) trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
  let (dest, dest_len) = this.mplace_to_simd(dest)?;
 
  assert_eq!(left_len, right_len);
- assert_eq!(dest_len.checked_mul(2).unwrap(), left_len);
+ assert_eq!(dest_len.strict_mul(2), left_len);
 
  for i in 0..dest_len {
  let j1 = i.strict_mul(2);

diff --git a/src/shims/x86/ssse3.rs b/src/shims/x86/ssse3.rs
@@ -89,7 +89,7 @@ pub(super) trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
  let (dest, dest_len) = this.mplace_to_simd(dest)?;
 
  assert_eq!(left_len, right_len);
- assert_eq!(dest_len.checked_mul(2).unwrap(), left_len);
+ assert_eq!(dest_len.strict_mul(2), left_len);
 
  for i in 0..dest_len {
  let j1 = i.strict_mul(2);