Use fewer delayed bugs. #121071
Merged
Use fewer delayed bugs. #121071
+88
−90
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
rustbot
added
A-query-system
|
Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt Some changes occurred in cc @BoxyUwU Some changes might have occurred in exhaustiveness checking cc @Nadrieril |
RalfJung
reviewed
Feb 14, 2024
| ExprKind::Err => { | ||
| hir::ExprKind::Err(self.dcx().span_delayed_bug(e.span, "lowered ExprKind::Err")) | ||
| } | ||
| ExprKind::Err => hir::ExprKind::Err(self.dcx().has_errors().unwrap()), |
There was a problem hiding this comment.
This seems like what should actually happen is adding a ErrorGuaranteed tag to ast::ExprKind::Err? Might be worth a FIXME somewhere.
There was a problem hiding this comment.
I've done it for ast::TyKind::Err in #121072. ast::ExprKind::Err is harder, due to more unusual cases involving recovery in the parser, so I haven't finished that one yet.
There was a problem hiding this comment.
#120586 impls that, I just need to finish reviewing it 😣
oli-obk
reviewed
Feb 14, 2024
| @@ -803,13 +803,11 @@ impl<'cx, 'tcx> LexicalResolver<'cx, 'tcx> { | |||
|
|
|||
| // Errors in earlier passes can yield error variables without | |||
| // resolution errors here; delay ICE in favor of those errors. | |||
There was a problem hiding this comment.
Suggested change
| // resolution errors here; delay ICE in favor of those errors. | |
| // resolution errors here; ICE no errors have been emitted yet. |
oli-obk
reviewed
Feb 14, 2024
| @@ -138,7 +134,10 @@ impl<'tcx> TypeVisitor<TyCtxt<'tcx>> for Search<'tcx> { | |||
| bug!("unexpected type during structural-match checking: {:?}", ty); | |||
| } | |||
| ty::Error(_) => { | |||
| self.tcx.dcx().span_delayed_bug(self.span, "ty::Error in structural-match check"); | |||
| assert!( | |||
There was a problem hiding this comment.
This seems kinda redundant...
There was a problem hiding this comment.
True! I will remove the assertion.
nnethercote
force-pushed
the
fewer-delayed-bugs
branch
from
004d3f3
to
82abcdf
Compare
For some cases where it's clear that an error has already occurred, e.g.: - there's a comment stating exactly that, or - things like HIR lowering, where we are lowering an error kind The commit also tweaks some comments around delayed bug sites.
nnethercote
force-pushed
the
fewer-delayed-bugs
branch
from
82abcdf
to
05849e8
Compare
|
I addressed the comments. |
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 14, 2024
Rollup of 13 pull requests Successful merges: - rust-lang#116387 (Additional doc links and explanation of `Wake`.) - rust-lang#118738 (Netbsd10 update) - rust-lang#118890 (Clarify the lifetimes of allocations returned by the `Allocator` trait) - rust-lang#120498 (Uplift `TypeVisitableExt` into `rustc_type_ir`) - rust-lang#120530 (Be less confident when `dyn` suggestion is not checked for object safety) - rust-lang#120915 (Fix suggestion span for `?Sized` when param type has default) - rust-lang#121015 (Optimize `delayed_bug` handling.) - rust-lang#121024 (implement `Default` for `AsciiChar`) - rust-lang#121039 (Correctly compute adjustment casts in GVN) - rust-lang#121045 (Fix two UI tests with incorrect directive / invalid revision) - rust-lang#121049 (Do not point at `#[allow(_)]` as the reason for compat lint triggering) - rust-lang#121071 (Use fewer delayed bugs.) - rust-lang#121073 (Fix typos in `OneLock` doc) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 14, 2024
Rollup merge of rust-lang#121071 - nnethercote:fewer-delayed-bugs, r=oli-obk Use fewer delayed bugs. For some cases where it's clear that an error has already occurred, e.g.: - there's a comment stating exactly that, or - things like HIR lowering, where we are lowering an error kind The commit also tweaks some comments around delayed bug sites. r? `@oli-obk`
nnethercote
added a commit
to nnethercote/rust
that referenced
this pull request
Feb 14, 2024
These were changed to `has_errors` assertions in rust-lang#121071 because that seemed reasonable, but evidently not. Fixes rust-lang#121103. Fixes rust-lang#121108.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Feb 15, 2024
…li-obk Reinstate some delayed bugs. These were changed to `has_errors` assertions in rust-lang#121071 because that seemed reasonable, but evidently not. Fixes rust-lang#121103. Fixes rust-lang#121108.
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 15, 2024
Rollup merge of rust-lang#121116 - nnethercote:fix-121103-121108, r=oli-obk Reinstate some delayed bugs. These were changed to `has_errors` assertions in rust-lang#121071 because that seemed reasonable, but evidently not. Fixes rust-lang#121103. Fixes rust-lang#121108.
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.
For some cases where it's clear that an error has already occurred, e.g.:
The commit also tweaks some comments around delayed bug sites.
r? @oli-obk