review: factor out .expose_provenance().try_into().unwrap()

Author: Strophox

src/tools/miri/src/alloc_addresses/mod.rs

@@ -176,19 +176,21 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 let base_addr = if ecx.machine.native_lib.is_some() {
                     match kind {
                         AllocKind::LiveData => {
-                            if ecx.tcx.try_get_global_alloc(alloc_id).is_some() {
+                            let ptr = if ecx.tcx.try_get_global_alloc(alloc_id).is_some() {
                                 // For new global allocations, we always pre-allocate the memory to be able use the machine address directly.
                                 let prepared_bytes = MiriAllocBytes::zeroed(size, align)
                                     .unwrap_or_else(|| {
                                         panic!("Miri ran out of memory: cannot create allocation of {size:?} bytes")
                                     });
-                                let addr = prepared_bytes.as_ptr().addr().try_into().unwrap();
-                                // Store prepared allocation space to be picked up for use later.
-                                global_state.prepared_alloc_bytes.try_insert(alloc_id, prepared_bytes).unwrap();
-                                addr
+                                let ptr = prepared_bytes.as_ptr();
+                                    // Store prepared allocation space to be picked up for use later.
+                                    global_state.prepared_alloc_bytes.try_insert(alloc_id, prepared_bytes).unwrap();
+                                ptr
                             } else {
-                                ecx.get_alloc_bytes_unchecked_raw(alloc_id)?.addr().try_into().unwrap()
-                            }
+                                ecx.get_alloc_bytes_unchecked_raw(alloc_id)?
+                            };
+                            // Ensure this pointer's provenance is exposed, so that it can be used by FFI code.
+                            ptr.expose_provenance().try_into().unwrap()
                         }
                         AllocKind::Function | AllocKind::VTable => {
                             // Allocate some dummy memory to get a unique address for this function/vtable.

src/tools/miri/src/lib.rs

@@ -13,6 +13,7 @@
 #![feature(trait_upcasting)]
 #![feature(strict_overflow_ops)]
 #![feature(strict_provenance)]
+#![feature(exposed_provenance)]
 // Configure clippy and other lints
 #![allow(
     clippy::collapsible_else_if,