review

Author: nia-e

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

@@ -120,6 +120,17 @@ impl<Prov: Provenance> ProvenanceMap<Prov> {
         }
     }
 
+    /// 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 = Prov> {
+        let ptr_provs = self.range_ptrs_get(range, cx).iter().map(|(_, p)| *p);
+        let byte_provs = self.range_bytes_get(range).iter().map(|(_, (p, _))| *p);
+        ptr_provs.chain(byte_provs)
+    }
+
     /// Attempt to merge per-byte provenance back into ptr chunks, if the right fragments
     /// sit next to each other. Return `false` is that is not possible due to partial pointers.
     pub fn merge_bytes(&mut self, cx: &impl HasDataLayout) -> bool {
@@ -148,17 +159,6 @@ 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

@@ -243,7 +243,7 @@ trait EvalContextExtPriv<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 match evt {
                     AccessEvent::Read(_) => {
                         // If a provenance was read by the foreign code, expose it.
-                        for (_, prov) in alloc.provenance().get_range(this, overlap.into()) {
+                        for prov in alloc.provenance().get_range(this, overlap.into()) {
                             this.expose_provenance(prov)?;
                         }
                     }