mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #1882 - RalfJung:rustup, r=RalfJung

Browse Source 
rustup
This commit is contained in:
bors 2021-08-30 14:37:11 +00:00
commit 09cadcbb62
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rust-version
View File

@ -1 +1 @@
c4be230b4a30eb74e3a3908455731ebc2f731d3d 6cfa773583bb5123e630668f5bfe466716225546

4
src/shims/intrinsics.rs
View File

@ -518,7 +518,7 @@ fn call_intrinsic(
))) )))
} }
if intrinsic_name == "assert_zero_valid" 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!( throw_machine_stop!(TerminationInfo::Abort(format!(
"aborted execution: attempted to zero-initialize type `{}`, which is invalid", "aborted execution: attempted to zero-initialize type `{}`, which is invalid",
@ -526,7 +526,7 @@ fn call_intrinsic(
))) )))
} }
if intrinsic_name == "assert_uninit_valid" 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!( throw_machine_stop!(TerminationInfo::Abort(format!(
"aborted execution: attempted to leave type `{}` uninitialized, which is invalid", "aborted execution: attempted to leave type `{}` uninitialized, which is invalid",