repr(transparent) check: do not compute check_unsuited more than once#148281
Merged
bors merged 1 commit intorust-lang:mainfrom Nov 19, 2025
Merged
repr(transparent) check: do not compute check_unsuited more than once#148281bors merged 1 commit intorust-lang:mainfrom
bors merged 1 commit intorust-lang:mainfrom
Conversation
rustbot
added
S-waiting-on-review
Collaborator
|
r? @spastorino rustbot has assigned @spastorino. Use |
RalfJung
commented
Oct 30, 2025
| @@ -1532,60 +1520,7 @@ pub(super) fn check_transparent<'tcx>(tcx: TyCtxt<'tcx>, adt: ty::AdtDef<'tcx>) | |||
| // We are currently checking the type this field came from, so it must be local | |||
| let span = tcx.hir_span_if_local(field.did).unwrap(); | |||
| let trivial = layout.is_ok_and(|layout| layout.is_1zst()); | |||
Member
Author
There was a problem hiding this comment.
There is still some code here we are running twice, in particular the layout_of query. The alternative would be to simply collect the results into a Vec, which will cost us an allocation but then avoids running the iterator twice.
hkBst
approved these changes
Oct 30, 2025
Member
Author
|
@rustbot reroll |
nnethercote
reviewed
Nov 18, 2025
| } | ||
|
|
||
| FieldInfo { span, trivial, unsuited: check_unsuited(tcx, typing_env, ty).break_value() } | ||
| return FieldInfo { span, trivial, ty }; |
Contributor
There was a problem hiding this comment.
Suggested change
| return FieldInfo { span, trivial, ty }; | |
| FieldInfo { span, trivial, ty } |
Contributor
|
r=me with the nit fixed. |
nnethercote
added
S-waiting-on-author
RalfJung
force-pushed
the
repr-transparent-check
branch
from
928cde5 to
c23182e
Compare
Collaborator
|
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. |
spastorino
approved these changes
Nov 18, 2025
Member
Author
|
@bors r=nnethercote rollup |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Nov 18, 2025
Rollup of 5 pull requests Successful merges: - #147887 (Improve the documentation of atomic::fence) - #148281 (repr(transparent) check: do not compute check_unsuited more than once) - #148484 (Fix suggestion for the `cfg!` macro) - #149057 (`rust-analyzer` subtree update) - #149061 (debug-assert FixedSizeEncoding invariant) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
that referenced
this pull request
Nov 18, 2025
Rollup of 5 pull requests Successful merges: - #147887 (Improve the documentation of atomic::fence) - #148281 (repr(transparent) check: do not compute check_unsuited more than once) - #148484 (Fix suggestion for the `cfg!` macro) - #149057 (`rust-analyzer` subtree update) - #149061 (debug-assert FixedSizeEncoding invariant) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Nov 19, 2025
Rollup merge of #148281 - RalfJung:repr-transparent-check, r=nnethercote repr(transparent) check: do not compute check_unsuited more than once `field_infos` is an iterator that we execute multiple times. However, we usually ignore the `unsuited` field -- we only need it in the last iteration. So move the computation of that field to that iteration to avoid computing it multiple times. Computing `unsuited` involves a recursive traversal over the types of all non-trivial fields, so there can be non-trivial amounts of work here. (I benchmarked this in #148243 and saw no changes, probably because we don't have a benchmark with many repr(transparent) types. But still, computing this each time just seemed silly.)
lnicola
pushed a commit
to lnicola/rust-analyzer
that referenced
this pull request
Nov 19, 2025
Rollup of 5 pull requests Successful merges: - rust-lang/rust#147887 (Improve the documentation of atomic::fence) - rust-lang/rust#148281 (repr(transparent) check: do not compute check_unsuited more than once) - rust-lang/rust#148484 (Fix suggestion for the `cfg!` macro) - rust-lang/rust#149057 (`rust-analyzer` subtree update) - rust-lang/rust#149061 (debug-assert FixedSizeEncoding invariant) r? `@ghost` `@rustbot` modify labels: rollup
github-actions bot
pushed a commit
to model-checking/verify-rust-std
that referenced
this pull request
Nov 30, 2025
…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#147887 (Improve the documentation of atomic::fence) - rust-lang#148281 (repr(transparent) check: do not compute check_unsuited more than once) - rust-lang#148484 (Fix suggestion for the `cfg!` macro) - rust-lang#149057 (`rust-analyzer` subtree update) - rust-lang#149061 (debug-assert FixedSizeEncoding invariant) r? `@ghost` `@rustbot` modify labels: rollup
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
field_infosis an iterator that we execute multiple times. However, we usually ignore theunsuitedfield -- we only need it in the last iteration. So move the computation of that field to that iteration to avoid computing it multiple times. Computingunsuitedinvolves a recursive traversal over the types of all non-trivial fields, so there can be non-trivial amounts of work here.(I benchmarked this in #148243 and saw no changes, probably because we don't have a benchmark with many repr(transparent) types. But still, computing this each time just seemed silly.)