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

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

Browse Source 
rustup
This commit is contained in:
bors 2022-03-07 14:40:07 +00:00
commit dd42a47f0a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rust-version
View File

@ -1 +1 @@
c274e4969f058b1c644243181ece9f829efa7594
8876ca3dd46b99fe7e6ad937f11493d37996231e

2
src/thread.rs
View File

@ -574,7 +574,7 @@ fn get_or_create_thread_local_alloc(
let allocation = tcx.eval_static_initializer(def_id)?;
// Create a fresh allocation with this content.
let new_alloc =
this.memory.allocate_with(allocation.clone(), MiriMemoryKind::Tls.into());
this.memory.allocate_with(allocation.inner().clone(), MiriMemoryKind::Tls.into());
this.machine.threads.set_thread_local_alloc(def_id, new_alloc);
Ok(new_alloc)
}