coverage: Replace impossible coverage::Error with assertions#117421
Merged
bors merged 2 commits intorust-lang:masterfrom Oct 31, 2023
Merged
coverage: Replace impossible coverage::Error with assertions#117421bors merged 2 commits intorust-lang:masterfrom
coverage::Error with assertions#117421bors merged 2 commits intorust-lang:masterfrom
Conversation
Collaborator
|
(rustbot has picked a reviewer for you, use r? to override) |
Collaborator
|
Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt |
Zalathar
commented
Oct 31, 2023
Comment on lines
-171
to
-173
| .unwrap_or_else(|e| { | ||
| bug!("Error processing: {:?}: {:?}", self.mir_body.source.def_id(), e.message) | ||
| }); |
Member
Author
There was a problem hiding this comment.
This is where all the errors would have been converted into panics.
Zalathar
commented
Oct 31, 2023
Comment on lines
-656
to
-658
| coverage_counters | ||
| .make_bcb_counters(&mut basic_coverage_blocks, bcb_has_coverage_spans) | ||
| .expect("should be Ok"); |
Member
Author
There was a problem hiding this comment.
Since this code is changing anyway, I've taken the opportunity to also get rid of some unnecessary &mut references to the BCB graph that were left over from #114354.
This comment has been minimized.
This comment has been minimized.
Swatinem
approved these changes
Oct 31, 2023
Contributor
|
@bors r=oli-obk,Swatinem |
Collaborator
These checks should be cheap, so there's little reason for them to be debug-only.
Historically, these errors existed so that the coverage debug code could dump additional information before reporting a compiler bug. That debug code was removed by rust-lang#115962, so we can now simplify these methods by making them panic when they detect a bug.
75a1109 to
6d956a2
Compare
Contributor
|
@bors r=oli-obk,Swatinem |
Collaborator
Member
Author
|
Ah whoops, I hadn't noticed that this had been approved while I was making a small tweak to a variable name (diff). |
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Oct 31, 2023
coverage: Replace impossible `coverage::Error` with assertions Historically, these errors existed so that the coverage debug code could dump additional information before reporting a compiler bug. That debug code was removed by rust-lang#115962, so we can now simplify these methods by making them panic immediately when they detect a bug.
This was referenced Oct 31, 2023
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 31, 2023
…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#116267 (Some codegen cleanups around SIMD checks) - rust-lang#116712 (When encountering unclosed delimiters during lexing, check for diff markers) - rust-lang#117416 (Also consider TAIT to be uncomputable if the MIR body is tainted) - rust-lang#117421 (coverage: Replace impossible `coverage::Error` with assertions) - rust-lang#117438 (Do not ICE on constant evaluation failure in GVN.) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 31, 2023
Rollup merge of rust-lang#117421 - Zalathar:error, r=oli-obk,Swatinem coverage: Replace impossible `coverage::Error` with assertions Historically, these errors existed so that the coverage debug code could dump additional information before reporting a compiler bug. That debug code was removed by rust-lang#115962, so we can now simplify these methods by making them panic immediately when they detect a bug.
bors-ferrocene bot
added a commit
to ferrocene/ferrocene
that referenced
this pull request
Nov 1, 2023
78: Automated pull from upstream `master` r=tshepang a=github-actions[bot] This PR pulls the following changes from the upstream repository: * rust-lang/rust#113970 * rust-lang/rust#117459 * rust-lang/rust#117451 * rust-lang/rust#117439 * rust-lang/rust#117417 * rust-lang/rust#117388 * rust-lang/rust#113241 * rust-lang/rust#117462 * rust-lang/rust#117450 * rust-lang/rust#117407 * rust-lang/rust#117444 * rust-lang/rust#117438 * rust-lang/rust#117421 * rust-lang/rust#117416 * rust-lang/rust#116712 * rust-lang/rust#116267 * rust-lang/rust#117377 * rust-lang/rust#117419 Co-authored-by: Alexis (Poliorcetics) Bourget <ab_github@poliorcetiq.eu> Co-authored-by: Esteban Küber <esteban@kuber.com.ar> Co-authored-by: David Tolnay <dtolnay@gmail.com> Co-authored-by: Celina G. Val <celinval@amazon.com> Co-authored-by: Michael Goulet <michael@errs.io> Co-authored-by: bors <bors@rust-lang.org> Co-authored-by: Camille GILLOT <gillot.camille@gmail.com> Co-authored-by: lcnr <rust@lcnr.de> Co-authored-by: Zalathar <Zalathar@users.noreply.github.com> Co-authored-by: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
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
7 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.
Historically, these errors existed so that the coverage debug code could dump additional information before reporting a compiler bug. That debug code was removed by #115962, so we can now simplify these methods by making them panic immediately when they detect a bug.