From 35b64447f385b1908b1de2eb7dc673f1fd3817ba Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Mon, 30 Aug 2021 10:35:34 -0400 Subject: [PATCH] rustup --- rust-version | 2 +- src/shims/intrinsics.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rust-version b/rust-version index 2cce8290c913..4dab723fbddc 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -c4be230b4a30eb74e3a3908455731ebc2f731d3d +6cfa773583bb5123e630668f5bfe466716225546 diff --git a/src/shims/intrinsics.rs b/src/shims/intrinsics.rs index 317bba859295..fd1a3f3e598b 100644 --- a/src/shims/intrinsics.rs +++ b/src/shims/intrinsics.rs @@ -518,7 +518,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx ))) } if intrinsic_name == "assert_zero_valid" - && !layout.might_permit_raw_init(this, /*zero:*/ true).unwrap() + && !layout.might_permit_raw_init(this, /*zero:*/ true) { throw_machine_stop!(TerminationInfo::Abort(format!( "aborted execution: attempted to zero-initialize type `{}`, which is invalid", @@ -526,7 +526,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx ))) } if intrinsic_name == "assert_uninit_valid" - && !layout.might_permit_raw_init(this, /*zero:*/ false).unwrap() + && !layout.might_permit_raw_init(this, /*zero:*/ false) { throw_machine_stop!(TerminationInfo::Abort(format!( "aborted execution: attempted to leave type `{}` uninitialized, which is invalid",