-
Notifications
You must be signed in to change notification settings - Fork 13k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Delegation: fix ICE on duplicated associative items #122564
Merged
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
rustbot
added
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
T-compiler
Relevant to the compiler team, which will review and decide on the PR/issue.
labels
Mar 15, 2024
compiler-errors
requested changes
Mar 15, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you please explain in the PR description why this fixes what it does? All that I can tell is that this PR changes some state tracking in the LoweringContext
, which is confusing enough as it is.
@rustbot author |
rustbot
added
S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
and removed
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 15, 2024
@rustbot ready |
rustbot
added
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
and removed
S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
labels
Mar 16, 2024
Bryanskiy
force-pushed
the
delegation-fixes
branch
from
March 16, 2024 18:03
8409bbc
to
b2ed9d0
Compare
compiler-errors
approved these changes
Mar 16, 2024
@bors r+ |
bors
added
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 16, 2024
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 17, 2024
Rollup of 9 pull requests Successful merges: - rust-lang#117918 (Add `wasm_c_abi` `future-incompat` lint) - rust-lang#121545 (fix attribute validation on associated items in traits) - rust-lang#121720 (Split refining_impl_trait lint into _reachable, _internal variants) - rust-lang#122270 (fix `long-linker-command-lines` failure caused by `rust.rpath=false`) - rust-lang#122564 (Delegation: fix ICE on duplicated associative items) - rust-lang#122577 (Remove obsolete parameter `speculative` from `instantiate_poly_trait_ref`) - rust-lang#122601 (Optimize `ptr::replace`) - rust-lang#122604 (Mention jieyouxu for changes to compiletest, run-make tests and the run-make-support library) - rust-lang#122605 (rustc-metadata: Store crate name in self-profile of metadata_register_crate) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 17, 2024
Rollup merge of rust-lang#122564 - Bryanskiy:delegation-fixes, r=compiler-errors Delegation: fix ICE on duplicated associative items Currently, functions delegation is only supported for delegation items with early resolved paths e.g. free functions and trait methods. During name resolution, information about function signatures is collected, including the number of parameters and whether there are self arguments. This information is then used when lowering from a delegation item into a regular function(`rustc_ast_lowering/src/delegation.rs`). The signature is usually inherited from path resolution id(`path_id`). However, in the case of trait impls `path_id` and `item_id` may be different: ```rust trait Trait { fn foo(&self) -> u32 { 0 } } struct S; mod to_reuse { use crate::S; pub fn foo(_: &S) -> u32 { 0 } } impl Trait for S { reuse to_reuse::foo { self } //~^ The signature should be inherited from item id instead of resolution id } ``` Let's now consider an example from [issue](rust-lang#119920). Due to duplicated associative elements partial resolution for one of them will not be recorded: /~https://github.com/rust-lang/rust/blob/9023f908cfbe7a475f369717a61cb8eb865cfd25/compiler/rustc_resolve/src/late.rs#L3153-L3162 Which leads to an incorrect `is_in_trait_impl` /~https://github.com/rust-lang/rust/blob/9023f908cfbe7a475f369717a61cb8eb865cfd25/compiler/rustc_ast_lowering/src/item.rs#L981-L986 Which leads to an incorrect id for signature inheritance /~https://github.com/rust-lang/rust/blob/9023f908cfbe7a475f369717a61cb8eb865cfd25/compiler/rustc_ast_lowering/src/delegation.rs#L99-L105 Which lead to an ICE from original issue. This patch fixes wrong `is_in_trait_impl` calculation. fixes rust-lang#119920
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
F-fn_delegation
`#![feature(fn_delegation)]`
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
T-compiler
Relevant to the compiler team, which will review and decide on the PR/issue.
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.
Currently, functions delegation is only supported for delegation items with early resolved paths e.g. free functions and trait methods. During name resolution, information about function signatures is collected, including the number of parameters and whether there are self arguments. This information is then used when lowering from a delegation item into a regular function(
rustc_ast_lowering/src/delegation.rs
). The signature is usually inherited from path resolution id(path_id
). However, in the case of trait implspath_id
anditem_id
may be different:Let's now consider an example from issue. Due to duplicated associative elements partial resolution for one of them will not be recorded:
rust/compiler/rustc_resolve/src/late.rs
Lines 3153 to 3162 in 9023f90
Which leads to an incorrect
is_in_trait_impl
rust/compiler/rustc_ast_lowering/src/item.rs
Lines 981 to 986 in 9023f90
Which leads to an incorrect id for signature inheritance
rust/compiler/rustc_ast_lowering/src/delegation.rs
Lines 99 to 105 in 9023f90
Which lead to an ICE from original issue.
This patch fixes wrong
is_in_trait_impl
calculation.fixes #119920