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

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

Browse Source 
rustup

`@bors` r+
This commit is contained in:
bors 2021-05-17 22:27:31 +00:00
commit 25a43c7783
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 @@
3396a383bb1d1fdad8ceeb74f16cf08e0bd62a1b
3e99439f4dacc8ba0d2ca48d221694362d587927

4
src/machine.rs
View File

@ -478,14 +478,14 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'mir, 'tcx> {
let alloc = alloc.into_owned();
let (stacks, base_tag) = if let Some(stacked_borrows) = &memory_extra.stacked_borrows {
let (stacks, base_tag) =
Stacks::new_allocation(id, alloc.size, Rc::clone(stacked_borrows), kind);
Stacks::new_allocation(id, alloc.size(), Rc::clone(stacked_borrows), kind);
(Some(stacks), base_tag)
} else {
// No stacks, no tag.
(None, Tag::Untagged)
};
let race_alloc = if let Some(data_race) = &memory_extra.data_race {
Some(data_race::AllocExtra::new_allocation(&data_race, alloc.size, kind))
Some(data_race::AllocExtra::new_allocation(&data_race, alloc.size(), kind))
} else {
None
};