From 594a70a28901efa14c8119242c5692027dbd8eb9 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Mon, 7 Mar 2022 09:39:32 -0500 Subject: [PATCH] rustup --- rust-version | 2 +- src/thread.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rust-version b/rust-version index 0742c61789..109a8080b0 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -c274e4969f058b1c644243181ece9f829efa7594 +8876ca3dd46b99fe7e6ad937f11493d37996231e diff --git a/src/thread.rs b/src/thread.rs index a5deceb6e7..b2f2a8098d 100644 --- a/src/thread.rs +++ b/src/thread.rs @@ -574,7 +574,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx 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) }