From 657386cc91c7513eaafd327aaf26aa44d6a3da91 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Wed, 8 Jun 2022 12:10:54 -0400
Subject: [PATCH] rustup

---
 rust-version   | 2 +-
 src/machine.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rust-version b/rust-version
index 9a72ffb3225..85b2e88ac30 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-e45d9973b2665897a768312e971b82cc62633103
+09d52bc5d4260bac8b9a2ea8ac7a07c5c72906f1
diff --git a/src/machine.rs b/src/machine.rs
index 5e93045aec1..824f0e3fc87 100644
--- a/src/machine.rs
+++ b/src/machine.rs
@@ -678,8 +678,8 @@ fn tag_alloc_base_pointer(
     fn ptr_from_addr_cast(
         ecx: &MiriEvalContext<'mir, 'tcx>,
         addr: u64,
-    ) -> Pointer<Option<Self::PointerTag>> {
-        intptrcast::GlobalStateInner::ptr_from_addr_cast(ecx, addr)
+    ) -> InterpResult<'tcx, Pointer<Option<Self::PointerTag>>> {
+        Ok(intptrcast::GlobalStateInner::ptr_from_addr_cast(ecx, addr))
     }
 
     #[inline(always)]