interpret/allocation: get_range on ProvenanceMap

Author: nia-e

compiler/rustc_middle/src/mir/interpret/allocation/provenance_map.rs

@@ -148,6 +148,17 @@ impl<Prov: Provenance> ProvenanceMap<Prov> {
         true
     }
 
+    /// Gets the provenances of all bytes (including from pointers) in a range.
+    pub fn get_range(
+        &self,
+        cx: &impl HasDataLayout,
+        range: AllocRange,
+    ) -> impl Iterator<Item = (Size, Prov)> {
+        let ptr_provs = self.range_ptrs_get(range, cx).to_owned();
+        let byte_provs = self.range_bytes_get(range).into_iter().map(|&(s, (p, _))| (s, p));
+        ptr_provs.into_iter().chain(byte_provs)
+    }
+
     /// Check if there is ptr-sized provenance at the given index.
     /// Does not mean anything for bytewise provenance! But can be useful as an optimization.
     pub fn get_ptr(&self, offset: Size) -> Option<Prov> {

src/tools/miri/src/shims/native_lib/mod.rs

@@ -242,13 +242,9 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
 
                 match evt {
                     AccessEvent::Read(_) => {
-                        // FIXME: ProvenanceMap should have something like get_range().
-                        let p_map = alloc.provenance();
-                        for idx in overlap {
-                            // If a provenance was read by the foreign code, expose it.
-                            if let Some((prov, _idx)) = p_map.get_byte(Size::from_bytes(idx), this) {
-                                this.expose_provenance(prov)?;
-                            }
+                        // If a provenance was read by the foreign code, expose it.
+                        for (_, prov) in alloc.provenance().get_range(this, overlap.into()) {
+                            this.expose_provenance(prov)?;
                         }
                     }
                     AccessEvent::Write(_, certain) => {