Skip to content
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.

Sign up for GitHub

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

Jump to bottom

self type param infer, avoid ICE #113651

Merged
merged 2 commits into from
Jul 17, 2023
Merged

self type param infer, avoid ICE #113651

merged 2 commits into from
Jul 17, 2023

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Jul 13, 2023

fixes #113610, which is caused by

rust/compiler/rustc_hir_analysis/src/collect/generics_of.rs

Lines 190 to 205 in 33a2c24

// Add in the self type parameter.
//
// Something of a hack: use the node id for the trait, also as
// the node id for the Self type parameter.
let opt_self = Some(ty::GenericParamDef {
index: 0,
name: kw::SelfUpper,
def_id: def_id.to_def_id(),
pure_wrt_drop: false,
kind: ty::GenericParamDefKind::Type {
has_default: false,
synthetic: false,
},
});
(opt_self, Defaults::Allowed)

@rustbot
Copy link
Collaborator

rustbot commented Jul 13, 2023

r? @compiler-errors

(rustbot has picked a reviewer for you, use r? to override)

@rustbot 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 Jul 13, 2023
@compiler-errors
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jul 13, 2023

📌 Commit cf78716 has been approved by compiler-errors

It is now in the queue for this repository.

@bors 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 Jul 13, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 13, 2023
@matthiaskrgr
Rollup merge of rust-lang#113651 - lcnr:parent-def-id, r=compiler-errors
219d2ad 
self type param infer, avoid ICE

fixes rust-lang#113610, which is caused by https://github.com/rust-lang/rust/blob/33a2c2487ac5d9927830ea4c1844335c6b9f77db/compiler/rustc_hir_analysis/src/collect/generics_of.rs#L190-L205
This was referenced Jul 13, 2023
Closed
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 13, 2023
@matthiaskrgr
Rollup merge of rust-lang#113651 - lcnr:parent-def-id, r=compiler-errors
29fdc20 
self type param infer, avoid ICE

fixes rust-lang#113610, which is caused by https://github.com/rust-lang/rust/blob/33a2c2487ac5d9927830ea4c1844335c6b9f77db/compiler/rustc_hir_analysis/src/collect/generics_of.rs#L190-L205
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 13, 2023
@matthiaskrgr
Rollup merge of rust-lang#113651 - lcnr:parent-def-id, r=compiler-errors
e4abdf6 
self type param infer, avoid ICE

fixes rust-lang#113610, which is caused by https://github.com/rust-lang/rust/blob/33a2c2487ac5d9927830ea4c1844335c6b9f77db/compiler/rustc_hir_analysis/src/collect/generics_of.rs#L190-L205
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 13, 2023
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 13, 2023
@matthiaskrgr
Rollup merge of rust-lang#113651 - lcnr:parent-def-id, r=compiler-errors
f34365d 
self type param infer, avoid ICE

fixes rust-lang#113610, which is caused by https://github.com/rust-lang/rust/blob/33a2c2487ac5d9927830ea4c1844335c6b9f77db/compiler/rustc_hir_analysis/src/collect/generics_of.rs#L190-L205
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 13, 2023
Closed
@matthiaskrgr
Copy link
Member

@bors r-
#113672 (comment)

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 13, 2023
@lcnr
Copy link
Contributor Author

lcnr commented Jul 14, 2023

removed the mention of the number of applicable implementations, I don't think that one is really helpful and causes test outputs to be change whenever we add another Default impl.

@bors
Copy link
Contributor

bors commented Jul 14, 2023

☔ The latest upstream changes (presumably #113591) made this pull request unmergeable. Please resolve the merge conflicts.

@compiler-errors
Copy link
Member

r=me

@lcnr
Copy link
Contributor Author

lcnr commented Jul 17, 2023

@bors r=compiler-errors rollup

@bors
Copy link
Contributor

bors commented Jul 17, 2023

📌 Commit e449daa has been approved by compiler-errors

It is now in the queue for this repository.

@bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 17, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 17, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 17, 2023
@bors
Auto merge of rust-lang#113782 - matthiaskrgr:rollup-mmrjvx3, r=matth…
1a8d094 
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#112741 (fix typo in `rustdoc/src/what-is-rustdoc.md`)
 - rust-lang#113535 (Add a sparc-unknown-none-elf target.)
 - rust-lang#113651 (self type param infer, avoid ICE)
 - rust-lang#113770 (Generate safe stable code for derives on empty enums)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit eca9c01 into rust-lang:master Jul 17, 2023
@rustbot rustbot added this to the 1.73.0 milestone Jul 17, 2023
@lcnr lcnr deleted the parent-def-id branch July 17, 2023 14:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compiler-errors compiler-errors compiler-errors approved these changes

Assignees

@compiler-errors compiler-errors

Labels
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.
Projects
None yet
Milestone
1.73.0
Development

Successfully merging this pull request may close these issues.

ICE DefId(2:2587 ~ core[22a2]::default) does not have a "generics_of"
5 participants
@lcnr @rustbot @compiler-errors @bors @matthiaskrgr