squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Rollup merge of #86685 - RalfJung:alloc-mut, r=oli-obk

Browse source 
double-check mutability inside Allocation

r? `@oli-obk`
This commit is contained in:
Yuki Okushi 2021-07-06 02:33:14 +09:00 committed by GitHub
parent add24d2f4f 719dafc48b
commit 1ca32050b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_middle/src/mir/interpret/allocation.rs
View file

@ -361,6 +361,8 @@ impl<Tag: Copy, Extra> Allocation<Tag, Extra> {
range: AllocRange,
val: ScalarMaybeUninit<Tag>,
) -> AllocResult {
assert!(self.mutability == Mutability::Mut);
let val = match val {
ScalarMaybeUninit::Scalar(scalar) => scalar,
ScalarMaybeUninit::Uninit => {
@ -484,6 +486,7 @@ impl<Tag: Copy, Extra> Allocation<Tag, Extra> {
if range.size.bytes() == 0 {
return;
}
assert!(self.mutability == Mutability::Mut);
self.init_mask.set_range(range.start, range.end(), is_init);
}
}