Check node kind to avoid ICE in check_expr_return()
#86728
Merged
Conversation
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
|
(rust-highfive has picked a reviewer for you, use r? to override) |
LeSeulArtichaut
approved these changes
Jun 30, 2021
|
@bors r+ |
|
📌 Commit 0c26783 has been approved by |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 1, 2021
Rollup of 8 pull requests Successful merges: - rust-lang#85504 (the foundation owns rust trademarks) - rust-lang#85520 (Fix typo and improve documentation for E0632) - rust-lang#86680 (Improve error for missing -Z with debugging option) - rust-lang#86728 (Check node kind to avoid ICE in `check_expr_return()`) - rust-lang#86740 (copy rust-lld as ld in dist) - rust-lang#86746 (Fix rustdoc query type filter) - rust-lang#86750 (Test cross-crate usage of `feature(const_trait_impl)`) - rust-lang#86755 (alloc: `RawVec<T, A>::shrink` can be in `no_global_oom_handling`.) 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 PR fixes #86721. The ICE described there is apparently due to a misunderstanding:
rust/compiler/rustc_typeck/src/check/expr.rs
Lines 684 to 685 in e98897e
Intuitively, one would think that calling
expect_item()afterget_parent_item()should succeed, but as it turns out,get_parent_item()can also return foreign, trait, and impl items as well as crates, whereasexpect_item()specifically expects aNode::Item. I have therefore added an extra check to prevent this ICE.