Skip to content

Commit 334a205

Browse files
authored
Rollup merge of #126159 - RalfJung:scalarint-size-mismatch, r=oli-obk
ScalarInt: size mismatches are a bug, do not delay the panic Cc [Zulip](https://rust-lang.zulipchat.com/#narrow/stream/146212-t-compiler.2Fconst-eval/topic/Why.20are.20ScalarInt.20to.20iN.2FuN.20methods.20fallible.3F) r? ``@oli-obk``
2 parents 71a8883 + 66138dd commit 334a205

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/intrinsics/simd.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -645,8 +645,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
645645
for i in 0..dest_len {
646646
let src_index: u64 = index[usize::try_from(i).unwrap()]
647647
.unwrap_leaf()
648-
.try_to_u32()
649-
.unwrap()
648+
.to_u32()
650649
.into();
651650
let dest = this.project_index(&dest, i)?;
652651

src/shims/unix/socket.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
5151

5252
let fds = &mut this.machine.fds;
5353
let sv0 = fds.insert_fd(FileDescriptor::new(SocketPair));
54-
let sv0 = Scalar::try_from_int(sv0, sv.layout.size).unwrap();
54+
let sv0 = Scalar::from_int(sv0, sv.layout.size);
5555
let sv1 = fds.insert_fd(FileDescriptor::new(SocketPair));
56-
let sv1 = Scalar::try_from_int(sv1, sv.layout.size).unwrap();
56+
let sv1 = Scalar::from_int(sv1, sv.layout.size);
5757

5858
this.write_scalar(sv0, &sv)?;
5959
this.write_scalar(sv1, &sv.offset(sv.layout.size, sv.layout, this)?)?;

0 commit comments

Comments
 (0)