Unbox and unwrap the contents of StatementKind::Coverage
#122937
Merged
+44
−68
Conversation
This file contains 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
The payload of coverage statements was historically a structure with several fields, so it was boxed to avoid bloating `StatementKind`. Now that the payload is a single relatively-small enum, we can replace `Box<Coverage>` with just `CoverageKind`. This patch also adds a size assertion for `StatementKind`, to avoid accidentally bloating it in the future.
|
rustbot has assigned @matthewjasper. Use |
rustbot
added
S-waiting-on-review
|
Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt This PR changes MIR cc @oli-obk, @RalfJung, @JakobDegen, @davidtwco, @celinval, @vakaras Some changes occurred in compiler/rustc_codegen_gcc |
rustbot
added
the
A-code-coverage
|
Changes to (Maybe I should give |
Zalathar
commented
Mar 23, 2024
Comment on lines
-190
to
-192
| // Ignore `ConstEvalCounter`s | ||
| | StatementKind::ConstEvalCounter | ||
| // Ignore `Nop`s |
There was a problem hiding this comment.
I noticed that these comments were preventing rustfmt from formatting this match, presumably due to rust-lang/rustfmt#4119.
Since these particular comments are low-value anyway, I worked around the issue by just deleting them.
Swatinem
approved these changes
Mar 23, 2024
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 24, 2024
Unbox and unwrap the contents of `StatementKind::Coverage` The payload of coverage statements was historically a structure with several fields, so it was boxed to avoid bloating `StatementKind`. Now that the payload is a single relatively-small enum, we can replace `Box<Coverage>` with just `CoverageKind`. This patch also adds a size assertion for `StatementKind`, to avoid accidentally bloating it in the future. `@rustbot` label +A-code-coverage
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 24, 2024
…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#122737 (conditionally ignore fatal diagnostic in the SilentEmitter) - rust-lang#122757 (Fixed the `private-dependency` bug) - rust-lang#122886 (add test for rust-lang#90192) - rust-lang#122937 (Unbox and unwrap the contents of `StatementKind::Coverage`) - rust-lang#122949 (Add a regression test for rust-lang#117310) - rust-lang#122962 (Track run-make-support lib in common inputs stamp) - rust-lang#122977 (Rename `Arguments::as_const_str` to `as_statically_known_str`) - rust-lang#122983 (Fix build failure on ARM/AArch64/PowerPC/RISC-V FreeBSD/NetBSD) - rust-lang#122984 (panic-in-panic-hook: formatting a message that's just a string is risk-free) - rust-lang#122992 (std::thread: refine available_parallelism for solaris/illumos.) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 24, 2024
…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#122737 (conditionally ignore fatal diagnostic in the SilentEmitter) - rust-lang#122757 (Fixed the `private-dependency` bug) - rust-lang#122886 (add test for rust-lang#90192) - rust-lang#122937 (Unbox and unwrap the contents of `StatementKind::Coverage`) - rust-lang#122949 (Add a regression test for rust-lang#117310) - rust-lang#122962 (Track run-make-support lib in common inputs stamp) - rust-lang#122977 (Rename `Arguments::as_const_str` to `as_statically_known_str`) - rust-lang#122983 (Fix build failure on ARM/AArch64/PowerPC/RISC-V FreeBSD/NetBSD) - rust-lang#122984 (panic-in-panic-hook: formatting a message that's just a string is risk-free) - rust-lang#122992 (std::thread: refine available_parallelism for solaris/illumos.) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 24, 2024
Rollup merge of rust-lang#122937 - Zalathar:unbox, r=oli-obk Unbox and unwrap the contents of `StatementKind::Coverage` The payload of coverage statements was historically a structure with several fields, so it was boxed to avoid bloating `StatementKind`. Now that the payload is a single relatively-small enum, we can replace `Box<Coverage>` with just `CoverageKind`. This patch also adds a size assertion for `StatementKind`, to avoid accidentally bloating it in the future. ``@rustbot`` label +A-code-coverage
Zalathar
added a commit
to Zalathar/rust
that referenced
this pull request
Apr 16, 2024
A redundant size assertion for `StatementKind` was added in rust-lang#122937, because the existing assertion was in a different module. This patch cleans that up, and also moves the `TerminatorKind` assertion into the same module where it belongs, to avoid the same thing happening again.
Zalathar
added a commit
to Zalathar/rust
that referenced
this pull request
Apr 16, 2024
A redundant size assertion for `StatementKind` was added in rust-lang#122937, because the existing assertion was in a different file. This patch cleans that up, and also moves the `TerminatorKind` assertion into the same module where it belongs, to avoid the same thing happening again.
Zalathar
added a commit
to Zalathar/rust
that referenced
this pull request
Apr 16, 2024
A redundant size assertion for `StatementKind` was added in rust-lang#122937, because the existing assertion was in a different file. This patch cleans that up, and also moves the `TerminatorKind` assertion into the same file where it belongs, to avoid the same thing happening again.
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Apr 16, 2024
Move size assertions for `mir::syntax` types into the same file A redundant size assertion for `StatementKind` was added in rust-lang#122937, because the existing assertion was in a different file. This PR cleans that up, and also moves the `TerminatorKind` assertion into the same file where it belongs, to avoid the same thing happening again. r? `@nnethercote`
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 16, 2024
Rollup merge of rust-lang#124006 - Zalathar:static-assert, r=nnethercote Move size assertions for `mir::syntax` types into the same file A redundant size assertion for `StatementKind` was added in rust-lang#122937, because the existing assertion was in a different file. This PR cleans that up, and also moves the `TerminatorKind` assertion into the same file where it belongs, to avoid the same thing happening again. r? `@nnethercote`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The payload of coverage statements was historically a structure with several fields, so it was boxed to avoid bloating
StatementKind.Now that the payload is a single relatively-small enum, we can replace
Box<Coverage>with justCoverageKind.This patch also adds a size assertion for
StatementKind, to avoid accidentally bloating it in the future.@rustbot label +A-code-coverage