-
Couldn't load subscription status.
- Fork 13.9k
Delegation: fix ICE on duplicated associative items #122564
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
Conversation
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 ready |
8409bbc to
b2ed9d0
Compare
|
@bors r+ |
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
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
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_idanditem_idmay 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_implrust/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_implcalculation.fixes #119920