-
Notifications
You must be signed in to change notification settings - Fork 14k
const-eval: fix and re-enable pointer fragment support #148259
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
|
9058e28 to
4cce5fe
Compare
As I commented a moment ago on an unrelated matter in #145954 (comment):
In that light, we would FCP the restabilization here. It should be an easy call for us given the earlier decision. |
|
This seems right to me. I propose we restabilize this. @rfcbot fcp merge |
|
Team member @traviscross has proposed to merge this. The next step is review by the rest of the tagged team members: No concerns currently listed. Once a majority of reviewers approve (and at most 2 approvals are outstanding), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up! cc @rust-lang/lang-advisors: FCP proposed for lang, please feel free to register concerns. |
compiler/rustc_middle/src/mir/interpret/allocation/provenance_map.rs
Outdated
Show resolved
Hide resolved
4e023d0 to
739d035
Compare
| fn get_alloc_id(self) -> Option<AllocId>; | ||
|
|
||
| /// Defines the 'join' of provenance: what happens when doing a pointer load and different bytes have different provenance. | ||
| fn join(left: Self, right: Self) -> Option<Self>; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm getting rid of the join function because the code that used it anyway had to special-case wildcards, and then it became easier to just have the entire wildcard logic there rather than having some of it inside join.
739d035 to
32b18d6
Compare
|
Do we need tests for #147959? |
Good point, I added that. |
32b18d6 to
bfad332
Compare
This comment has been minimized.
This comment has been minimized.
|
Finished benchmarking commit (2b58ae9): comparison URL. Overall result: ❌ regressions - no action neededBenchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf. @bors rollup=never Instruction countOur most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.
Max RSS (memory usage)Results (primary 0.6%)A less reliable metric. May be of interest, but not used to determine the overall result above.
CyclesResults (secondary -3.4%)A less reliable metric. May be of interest, but not used to determine the overall result above.
Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 474.157s -> 476.71s (0.54%) |
5d5d229 to
324e47b
Compare
|
This PR was rebased onto a different main 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. |
|
The final comment period, with a disposition to merge, as per the review above, is now complete. As the automated representative of the governance process, I would like to thank the author for their work and everyone else who contributed. This will be merged soon. |
|
@bors r=oli-obk |
|
☀️ Test successful - checks-actions |
What is this?This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.Comparing 67c4cf3 (parent) -> e1a2ec6 (this PR) Test differencesShow 104 test diffsStage 1
Stage 2
Additionally, 98 doctest diffs were found. These are ignored, as they are noisy. Job group index
Test dashboardRun cargo run --manifest-path src/ci/citool/Cargo.toml -- \
test-dashboard e1a2ec605124d9f9b0095435faef70bd4bd3f128 --output-dir test-dashboardAnd then open Job duration changes
How to interpret the job duration changes?Job durations can vary a lot, based on the actual runner instance |
|
Finished benchmarking commit (e1a2ec6): comparison URL. Overall result: ✅ improvements - no action needed@rustbot label: -perf-regression Instruction countOur most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.
Max RSS (memory usage)This benchmark run did not return any relevant results for this metric. CyclesThis benchmark run did not return any relevant results for this metric. Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 473.917s -> 473.313s (-0.13%) |
The pointer fragment support from #144081 got disabled due to #146291. This brings it back. To fix the issue, the per-byte provenance fragment tracking tracks both the provenance and raw address of the full pointer, so we can ensure that only fragments that are truly part of the same pointer are being merged.
r? @oli-obk
Cc @theemathas
Fixes rust-lang/const-eval#72 again.
Also fixes #147959.
@traviscross I assume this won't need another t-lang FCP since it already got FCP'd in #144081?