Fix ICE in const_trait check code #102361
Merged
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
This fixes rust-lang#102156.
rustbot
added
the
T-compiler
|
r? @eholk (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
mucinoab
approved these changes
Sep 29, 2022
Rageking8
reviewed
Sep 29, 2022
Comment on lines
+5
to
+6
| //~^ ERROR | ||
| //~| ERROR |
There was a problem hiding this comment.
Maybe add the error code to make it a tad clearer, or is it mostly unnecessary for this case? Not sure on the error annotations guidelines.
There was a problem hiding this comment.
The errors are expected, but checking the error message is mostly unnecessary because we are only ensuring that it doesn't ICE.
eholk
reviewed
Sep 29, 2022
| @@ -199,7 +199,7 @@ impl<'tcx> Visitor<'tcx> for CheckConstVisitor<'tcx> { | |||
| .. | |||
| }) = item.kind | |||
| { | |||
| let def_id = trait_ref.trait_def_id().unwrap(); | |||
| let Some(def_id) = trait_ref.trait_def_id() else { return; }; | |||
There was a problem hiding this comment.
Do we want to return here or break out of the block so that intravisit::walk_item still runs?
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 1, 2022
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#102361 (Fix ICE in const_trait check code) - rust-lang#102373 (Flush delayed bugs before codegen) - rust-lang#102483 (create def ids for impl traits during ast lowering) - rust-lang#102490 (Generate synthetic region from `impl` even in closure body within an associated fn) - rust-lang#102492 (Don't lower assoc bindings just to deny them) - rust-lang#102493 (Group together more size assertions.) - rust-lang#102521 (rustdoc: add missing margin to no-docblock methods) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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.
This fixes #102156.