Auto merge of rust-lang#2217 - RalfJung:rustup, r=RalfJung

rustup

Author: bors

rust-version

@@ -1 +1 @@
-e45d9973b2665897a768312e971b82cc62633103
+09d52bc5d4260bac8b9a2ea8ac7a07c5c72906f1

src/machine.rs

@@ -678,8 +678,8 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'mir, 'tcx> {
     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)]