interpret/allocation: get_range on ProvenanceMap by nia-e · Pull Request #145540 · rust-lang/rust

nia-e · 2025-08-17T19:59:25Z

Helper method to grab all provenances in a given address range for an allocation, making some logic in Miri nicer.

rustbot · 2025-08-17T19:59:29Z

rustbot has assigned @matthewjasper.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2025-08-17T19:59:31Z

The Miri subtree was changed

cc @rust-lang/miri

Some changes occurred to the CTFE / Miri interpreter

cc @rust-lang/miri, @RalfJung, @oli-obk, @lcnr

RalfJung · 2025-08-19T06:08:07Z

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

+        cx: &impl HasDataLayout,
+        range: AllocRange,
+    ) -> impl Iterator<Item = (Size, Prov)> {
+        let ptr_provs = self.range_ptrs_get(range, cx).to_owned();


Why are you calling to_owned here?

Fair, .iter().copied() would have been better I think but either way it's unnecessary if this doesn't return the offset per your other suggestion

RalfJung · 2025-08-19T06:11:21Z

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

+        &self,
+        cx: &impl HasDataLayout,
+        range: AllocRange,
+    ) -> impl Iterator<Item = (Size, Prov)> {


There's no point in including the offset since one cannot even know whether that's a 1-byte provenance or a whole-ptr provenance. So either drop the Size, or add an Option<u8> carrying that information.

RalfJung · 2025-08-19T06:11:32Z

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

    }

+    /// Gets the provenances of all bytes (including from pointers) in a range.
+    pub fn get_range(


Please move this up so it is next to get_byte.

RalfJung · 2025-08-21T09:20:26Z

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

+        cx: &impl HasDataLayout,
+        range: AllocRange,
+    ) -> impl Iterator<Item = Prov> {
+        let ptr_provs = self.range_ptrs_get(range, cx).iter().map(|(_, p)| *p);


This is the wrong range. You have to use adjusted_range_ptrs.

Doesn't adjusted_range_ptrs only give us the offsets and not provenances? range_ptrs_get uses that internally anyways

Ah, d'oh, right...

I shouldn't review when I am too tired.^^

bors · 2025-08-21T14:40:59Z

☔ The latest upstream changes (presumably #145647) made this pull request unmergeable. Please resolve the merge conflicts.

rustbot · 2025-08-21T18:15:26Z

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

RalfJung · 2025-08-21T18:59:52Z

Please squash then we can land this.

nia-e · 2025-08-22T20:29:18Z

Great! Since you think it's fine,

r? RalfJung

RalfJung · 2025-08-23T07:46:44Z

@bors r+ rollup

bors · 2025-08-23T07:46:46Z

📌 Commit 7046ce8 has been approved by RalfJung

It is now in the queue for this repository.

interpret/allocation: get_range on ProvenanceMap Helper method to grab all provenances in a given address range for an allocation, making some logic in Miri nicer.

Rollup of 7 pull requests Successful merges: - #144452 (std/sys/fd: Relax `READ_LIMIT` on Darwin) - #145307 (Fix `LazyLock` poison panic message) - #145515 (Optimize `char::encode_utf8`) - #145540 (interpret/allocation: get_range on ProvenanceMap) - #145774 (Remove default opts from config) - #145780 (Do not warn about missing change ID in tarball builds) - #145781 (Remove profile section from Clippy) r? `@ghost` `@rustbot` modify labels: rollup

interpret/allocation: get_range on ProvenanceMap Helper method to grab all provenances in a given address range for an allocation, making some logic in Miri nicer.

Rollup of 14 pull requests Successful merges: - #143898 (opt-dist: rebuild rustc when doing static LLVM builds) - #144452 (std/sys/fd: Relax `READ_LIMIT` on Darwin) - #145234 (match exhaustiveness diagnostics: show a trailing comma on singleton tuple consructors in witness patterns (and clean up a little)) - #145515 (Optimize `char::encode_utf8`) - #145540 (interpret/allocation: get_range on ProvenanceMap) - #145670 (port `sanitize` attribute to the new parsing infrastructure) - #145713 (next-solver: fix `feature(const_trait_impl)` bootstrap) - #145729 (Remove two duplicated crates) - #145744 (miri: also detect aliasing of in-place argument and return place) - #145774 (Remove default opts from config) - #145781 (Remove profile section from Clippy) - #145782 (rustdoc: make attributes render consistently) - #145787 (citool: cleanup `mismatched_lifetime_syntaxes` warnings) - #145791 (Fix ICE when validating transmuting ZST to inhabited enum) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #145540 - nia-e:prov-map-range, r=RalfJung interpret/allocation: get_range on ProvenanceMap Helper method to grab all provenances in a given address range for an allocation, making some logic in Miri nicer.

jhpratt · 2025-08-24T02:51:06Z

still in queue

@bors r-

Rollup of 14 pull requests Successful merges: - rust-lang/rust#143898 (opt-dist: rebuild rustc when doing static LLVM builds) - rust-lang/rust#144452 (std/sys/fd: Relax `READ_LIMIT` on Darwin) - rust-lang/rust#145234 (match exhaustiveness diagnostics: show a trailing comma on singleton tuple consructors in witness patterns (and clean up a little)) - rust-lang/rust#145515 (Optimize `char::encode_utf8`) - rust-lang/rust#145540 (interpret/allocation: get_range on ProvenanceMap) - rust-lang/rust#145670 (port `sanitize` attribute to the new parsing infrastructure) - rust-lang/rust#145713 (next-solver: fix `feature(const_trait_impl)` bootstrap) - rust-lang/rust#145729 (Remove two duplicated crates) - rust-lang/rust#145744 (miri: also detect aliasing of in-place argument and return place) - rust-lang/rust#145774 (Remove default opts from config) - rust-lang/rust#145781 (Remove profile section from Clippy) - rust-lang/rust#145782 (rustdoc: make attributes render consistently) - rust-lang/rust#145787 (citool: cleanup `mismatched_lifetime_syntaxes` warnings) - rust-lang/rust#145791 (Fix ICE when validating transmuting ZST to inhabited enum) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned matthewjasper Aug 17, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Aug 17, 2025

RalfJung reviewed Aug 19, 2025

View reviewed changes

RalfJung reviewed Aug 21, 2025

View reviewed changes

nia-e force-pushed the prov-map-range branch from 4672568 to 9b2c4a4 Compare August 21, 2025 18:15

interpret/allocation: get_range on ProvenanceMap

7046ce8

nia-e force-pushed the prov-map-range branch from 9b2c4a4 to 7046ce8 Compare August 22, 2025 19:50

rustbot assigned RalfJung and unassigned matthewjasper Aug 22, 2025

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 23, 2025

samueltardieu mentioned this pull request Aug 23, 2025

Rollup of 7 pull requests #145785

Closed

samueltardieu mentioned this pull request Aug 23, 2025

Rollup of 13 pull requests #145795

Closed

samueltardieu mentioned this pull request Aug 23, 2025

Rollup of 14 pull requests #145796

Merged

bors merged commit 95f8b91 into rust-lang:master Aug 24, 2025
10 checks passed

rustbot added this to the 1.91.0 milestone Aug 24, 2025

Zalathar mentioned this pull request Aug 24, 2025

Rollup of 14 pull requests #145803

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 24, 2025

Uh oh!

Conversation

nia-e commented Aug 17, 2025

Uh oh!

rustbot commented Aug 17, 2025

Uh oh!

rustbot commented Aug 17, 2025

Uh oh!

RalfJung Aug 19, 2025

Choose a reason for hiding this comment

Uh oh!

nia-e Aug 20, 2025

Choose a reason for hiding this comment

Uh oh!

RalfJung Aug 19, 2025

Choose a reason for hiding this comment

Uh oh!

RalfJung Aug 19, 2025

Choose a reason for hiding this comment

Uh oh!

RalfJung Aug 21, 2025

Choose a reason for hiding this comment

Uh oh!

nia-e Aug 21, 2025

Choose a reason for hiding this comment

Uh oh!

RalfJung Aug 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bors commented Aug 21, 2025

Uh oh!

rustbot commented Aug 21, 2025

Uh oh!

RalfJung commented Aug 21, 2025

Uh oh!

nia-e commented Aug 22, 2025

Uh oh!

RalfJung commented Aug 23, 2025

Uh oh!

bors commented Aug 23, 2025

Uh oh!

Uh oh!

jhpratt commented Aug 24, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

RalfJung Aug 21, 2025 •

edited

Loading