Skip to content

miri: use allocator_shim_contents codegen helper#147718

Merged
bors merged 1 commit intorust-lang:masterfrom
RalfJung:miri-allocator_shim_contents
Oct 16, 2025
Merged

miri: use allocator_shim_contents codegen helper#147718
bors merged 1 commit intorust-lang:masterfrom
RalfJung:miri-allocator_shim_contents

Conversation

@RalfJung
Copy link
Member

@RalfJung RalfJung commented Oct 15, 2025

r? @bjorn3

Follow-up to #147526, also using that new infrastructure in Miri.

@rustbot
Copy link
Collaborator

rustbot commented Oct 15, 2025

Some changes occurred in compiler/rustc_codegen_ssa

cc @WaffleLapkin

The Miri subtree was changed

cc @rust-lang/miri

@rustbot rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. 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 Oct 15, 2025
RalfJung
RalfJung commented Oct 15, 2025
View reviewed changes
bjorn3
bjorn3 reviewed Oct 15, 2025
View reviewed changes
@RalfJung RalfJung force-pushed the miri-allocator_shim_contents branch 2 times, most recently from 2b976d2 to 227da2d Compare October 15, 2025 09:05
@bjorn3
Copy link
Member

bjorn3 commented Oct 15, 2025

@bors r+

@bors
Copy link
Collaborator

bors commented Oct 15, 2025

📌 Commit 227da2d has been approved by bjorn3

It is now in the queue for this repository.

@bors 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 Oct 15, 2025
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 15, 2025
@matthiaskrgr
Rollup merge of rust-lang#147718 - RalfJung:miri-allocator_shim_conte…
7289d92 
…nts, r=bjorn3

miri: use allocator_shim_contents codegen helper

r? `@bjorn3`

Follow-up to rust-lang#147526, also using that new infrastructure in Miri.
@matthiaskrgr matthiaskrgr mentioned this pull request Oct 15, 2025
Closed
bors added a commit that referenced this pull request Oct 15, 2025
@bors
Auto merge of #147720 - matthiaskrgr:rollup-rpq38qg, r=matthiaskrgr
27f78a0 
Rollup of 5 pull requests

Successful merges:

 - #143191 (Stabilize `rwlock_downgrade` library feature)
 - #147000 (std: Add Motor OS std library port)
 - #147670 (some `ErrorGuaranteed` cleanups)
 - #147716 (Fix some comments)
 - #147718 (miri: use allocator_shim_contents codegen helper)

r? `@ghost`
`@rustbot` modify labels: rollup
@bjorn3 bjorn3 mentioned this pull request Oct 15, 2025
Merged
bors added a commit that referenced this pull request Oct 15, 2025
@bors
Auto merge of #147720 - matthiaskrgr:rollup-rpq38qg, r=matthiaskrgr
5994683 
Rollup of 5 pull requests

Successful merges:

 - #143191 (Stabilize `rwlock_downgrade` library feature)
 - #147000 (std: Add Motor OS std library port)
 - #147670 (some `ErrorGuaranteed` cleanups)
 - #147716 (Fix some comments)
 - #147718 (miri: use allocator_shim_contents codegen helper)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr
Copy link
Member

matthiaskrgr commented Oct 15, 2025

@bors r-
#147720 (comment)

@bors 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 Oct 15, 2025
@RalfJung RalfJung force-pushed the miri-allocator_shim_contents branch from 227da2d to 804af99 Compare October 15, 2025 19:23
@rustbot
Copy link
Collaborator

rustbot commented Oct 15, 2025

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
Copy link
Member Author

RalfJung commented Oct 15, 2025

@bors r=bjorn3

@bors
Copy link
Collaborator

bors commented Oct 15, 2025

📌 Commit 804af99 has been approved by bjorn3

It is now in the queue for this repository.

@bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 15, 2025
@matthiaskrgr matthiaskrgr mentioned this pull request Oct 15, 2025
Merged
bors added a commit that referenced this pull request Oct 15, 2025
@bors
Auto merge of #147745 - matthiaskrgr:rollup-b4kftk9, r=matthiaskrgr
402ce0e 
Rollup of 11 pull requests

Successful merges:

 - #143191 (Stabilize `rwlock_downgrade` library feature)
 - #147444 (Allow printing a fully-qualified path in `def_path_str`)
 - #147527 (Update t-compiler beta nomination Zulip msg)
 - #147670 (some `ErrorGuaranteed` cleanups)
 - #147676 (Return spans out of `is_doc_comment` to reduce reliance on `.span()` on attributes)
 - #147708 (const `mem::drop`)
 - #147710 (Fix ICE when using contracts on async functions)
 - #147716 (Fix some comments)
 - #147718 (miri: use allocator_shim_contents codegen helper)
 - #147729 (ignore boring locals when explaining why a borrow contains a point due to drop of a live local under polonius)
 - #147742 (Revert unintentional whitespace changes to rustfmt-excluded file)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 212826d into rust-lang:master Oct 16, 2025
11 checks passed
@rustbot rustbot added this to the 1.92.0 milestone Oct 16, 2025
rust-timer added a commit that referenced this pull request Oct 16, 2025
@rust-timer
Unrolled build for #147718
fac2745 
Rollup merge of #147718 - RalfJung:miri-allocator_shim_contents, r=bjorn3

miri: use allocator_shim_contents codegen helper

r? `@bjorn3`

Follow-up to #147526, also using that new infrastructure in Miri.
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Oct 16, 2025
@bors
Auto merge of #147745 - matthiaskrgr:rollup-b4kftk9, r=matthiaskrgr
33df85e 
Rollup of 11 pull requests

Successful merges:

 - rust-lang/rust#143191 (Stabilize `rwlock_downgrade` library feature)
 - rust-lang/rust#147444 (Allow printing a fully-qualified path in `def_path_str`)
 - rust-lang/rust#147527 (Update t-compiler beta nomination Zulip msg)
 - rust-lang/rust#147670 (some `ErrorGuaranteed` cleanups)
 - rust-lang/rust#147676 (Return spans out of `is_doc_comment` to reduce reliance on `.span()` on attributes)
 - rust-lang/rust#147708 (const `mem::drop`)
 - rust-lang/rust#147710 (Fix ICE when using contracts on async functions)
 - rust-lang/rust#147716 (Fix some comments)
 - rust-lang/rust#147718 (miri: use allocator_shim_contents codegen helper)
 - rust-lang/rust#147729 (ignore boring locals when explaining why a borrow contains a point due to drop of a live local under polonius)
 - rust-lang/rust#147742 (Revert unintentional whitespace changes to rustfmt-excluded file)

r? `@ghost`
`@rustbot` modify labels: rollup
@RalfJung RalfJung deleted the miri-allocator_shim_contents branch October 17, 2025 14:07
flip1995 pushed a commit to flip1995/rust-clippy that referenced this pull request Oct 18, 2025
@bors
Auto merge of #147745 - matthiaskrgr:rollup-b4kftk9, r=matthiaskrgr
f706461 
Rollup of 11 pull requests

Successful merges:

 - rust-lang/rust#143191 (Stabilize `rwlock_downgrade` library feature)
 - rust-lang/rust#147444 (Allow printing a fully-qualified path in `def_path_str`)
 - rust-lang/rust#147527 (Update t-compiler beta nomination Zulip msg)
 - rust-lang/rust#147670 (some `ErrorGuaranteed` cleanups)
 - rust-lang/rust#147676 (Return spans out of `is_doc_comment` to reduce reliance on `.span()` on attributes)
 - rust-lang/rust#147708 (const `mem::drop`)
 - rust-lang/rust#147710 (Fix ICE when using contracts on async functions)
 - rust-lang/rust#147716 (Fix some comments)
 - rust-lang/rust#147718 (miri: use allocator_shim_contents codegen helper)
 - rust-lang/rust#147729 (ignore boring locals when explaining why a borrow contains a point due to drop of a live local under polonius)
 - rust-lang/rust#147742 (Revert unintentional whitespace changes to rustfmt-excluded file)

r? `@ghost`
`@rustbot` modify labels: rollup
@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Oct 21, 2025

@rust-timer build fac2745

@rust-timer

This comment has been minimized.

Sign in to view
@rust-timer
Copy link
Collaborator

rust-timer commented Oct 21, 2025

Finished benchmarking commit (fac2745): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking 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
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -0.2% [-0.3%, -0.2%] 2
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 1.0%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)		 4.5% [4.5%, 4.5%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -2.5% [-2.5%, -2.5%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 1.0% [-2.5%, 4.5%] 2

Cycles

Results (primary 0.1%, secondary -2.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)		 2.4% [2.4%, 2.4%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -2.3% [-2.3%, -2.3%] 1
Improvements ✅
(secondary)		 -2.1% [-2.1%, -2.1%] 1
All ❌✅ (primary) 0.1% [-2.3%, 2.4%] 2

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 476.546s -> 475.034s (-0.32%)
Artifact size: 388.06 MiB -> 388.00 MiB (-0.02%)

github-actions bot pushed a commit to model-checking/verify-rust-std that referenced this pull request Nov 30, 2025
@bors
Auto merge of rust-lang#147745 - matthiaskrgr:rollup-b4kftk9, r=matth…
d68e6ed 
…iaskrgr

Rollup of 11 pull requests

Successful merges:

 - rust-lang#143191 (Stabilize `rwlock_downgrade` library feature)
 - rust-lang#147444 (Allow printing a fully-qualified path in `def_path_str`)
 - rust-lang#147527 (Update t-compiler beta nomination Zulip msg)
 - rust-lang#147670 (some `ErrorGuaranteed` cleanups)
 - rust-lang#147676 (Return spans out of `is_doc_comment` to reduce reliance on `.span()` on attributes)
 - rust-lang#147708 (const `mem::drop`)
 - rust-lang#147710 (Fix ICE when using contracts on async functions)
 - rust-lang#147716 (Fix some comments)
 - rust-lang#147718 (miri: use allocator_shim_contents codegen helper)
 - rust-lang#147729 (ignore boring locals when explaining why a borrow contains a point due to drop of a live local under polonius)
 - rust-lang#147742 (Revert unintentional whitespace changes to rustfmt-excluded file)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bjorn3 bjorn3 bjorn3 left review comments

Assignees

@bjorn3 bjorn3

Labels

A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.92.0

Development

Successfully merging this pull request may close these issues.

7 participants

@RalfJung @rustbot @bjorn3 @bors @matthiaskrgr @Mark-Simulacrum @rust-timer