Skip to content

Gracefully handle AnonConst in diagnostic_hir_wf_check()#122370

Merged
bors merged 1 commit intorust-lang:masterfrom
gurry:122199-ice-unexpected-node
Mar 22, 2024
Merged

Gracefully handle AnonConst in diagnostic_hir_wf_check()#122370
bors merged 1 commit intorust-lang:masterfrom
gurry:122199-ice-unexpected-node

Conversation

@gurry
Copy link
Contributor

@gurry gurry commented Mar 12, 2024

Instead of running the WF check on the AnonConst itself we run it on the ty of the generic param of which the AnonConst is the default value.

Fixes #122199

@rustbot
Copy link
Collaborator

rustbot commented Mar 12, 2024

r? @davidtwco

rustbot has assigned @davidtwco.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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 Mar 12, 2024
@gurry gurry force-pushed the 122199-ice-unexpected-node branch from b3c7f11 to d0e4a3b Compare March 12, 2024 08:56
@davidtwco
Copy link
Member

davidtwco commented Mar 18, 2024

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 18, 2024

📌 Commit d0e4a3b has been approved by davidtwco

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 Mar 18, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 18, 2024
@matthiaskrgr
Rollup merge of rust-lang#122370 - gurry:122199-ice-unexpected-node, …
6e1b2b1 
…r=davidtwco

Gracefully handle `AnonConst` in `diagnostic_hir_wf_check()`

Instead of running the WF check on the `AnonConst` itself we run it on the `ty` of the generic param of which the `AnonConst` is the default value.

Fixes rust-lang#122199
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 18, 2024
Closed
@matthiaskrgr
Copy link
Member

matthiaskrgr commented Mar 18, 2024

I think this needs a rebase

workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Mar 18, 2024
@workingjubilee
Rollup merge of rust-lang#122370 - gurry:122199-ice-unexpected-node, …
325763c 
…r=davidtwco

Gracefully handle `AnonConst` in `diagnostic_hir_wf_check()`

Instead of running the WF check on the `AnonConst` itself we run it on the `ty` of the generic param of which the `AnonConst` is the default value.

Fixes rust-lang#122199
@workingjubilee workingjubilee mentioned this pull request Mar 18, 2024
Closed
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@workingjubilee
Copy link
Member

workingjubilee commented Mar 18, 2024

@bors r-

@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 Mar 18, 2024
@workingjubilee
Copy link
Member

workingjubilee commented Mar 18, 2024 •
edited
Loading

PR is incompatible with #122513

It looks like you can "just" replace the code with hir_node_by_def_id (with the associated deoptionalizing refactor).

@gurry
Gracefully handle AnonConst in diagnostic_hir_wf_check()
3c70d60 
when it is the default value of a generic param
@gurry gurry force-pushed the 122199-ice-unexpected-node branch from d0e4a3b to 3c70d60 Compare March 19, 2024 03:53
@gurry
Copy link
Contributor Author

gurry commented Mar 19, 2024

Rebase done.

@rustbot label -S-waiting-on-author +S-waiting-on-review

@rustbot 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 19, 2024
@workingjubilee
Copy link
Member

workingjubilee commented Mar 19, 2024

This looks exactly the same so,

@bors r=davidtwco

@bors
Copy link
Collaborator

bors commented Mar 19, 2024

📌 Commit 3c70d60 has been approved by davidtwco

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 19, 2024
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 19, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 20, 2024
@bors
Auto merge of rust-lang#122370 - gurry:122199-ice-unexpected-node, r=…
67fb0d6 
…davidtwco

Gracefully handle `AnonConst` in `diagnostic_hir_wf_check()`

Instead of running the WF check on the `AnonConst` itself we run it on the `ty` of the generic param of which the `AnonConst` is the default value.

Fixes rust-lang#122199
@bors
Copy link
Collaborator

bors commented Mar 20, 2024

⌛ Testing commit 3c70d60 with merge 67fb0d6...

@bors
Copy link
Collaborator

bors commented Mar 20, 2024

💥 Test timed out

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 20, 2024
@rust-log-analyzer
Copy link
Collaborator

rust-log-analyzer commented Mar 20, 2024

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@workingjubilee
Copy link
Member

workingjubilee commented Mar 22, 2024

@bors retry

@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 Mar 22, 2024
@workingjubilee
Copy link
Member

workingjubilee commented Mar 22, 2024

Assuming that was spurious based on only one job hanging.

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 22, 2024
@matthiaskrgr
Rollup merge of rust-lang#122370 - gurry:122199-ice-unexpected-node, …
665c7a2 
…r=davidtwco

Gracefully handle `AnonConst` in `diagnostic_hir_wf_check()`

Instead of running the WF check on the `AnonConst` itself we run it on the `ty` of the generic param of which the `AnonConst` is the default value.

Fixes rust-lang#122199
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 22, 2024
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 22, 2024
@matthiaskrgr
Rollup merge of rust-lang#122370 - gurry:122199-ice-unexpected-node, …
35bc881 
…r=davidtwco

Gracefully handle `AnonConst` in `diagnostic_hir_wf_check()`

Instead of running the WF check on the `AnonConst` itself we run it on the `ty` of the generic param of which the `AnonConst` is the default value.

Fixes rust-lang#122199
This was referenced Mar 22, 2024
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 22, 2024
@bors
Auto merge of rust-lang#122869 - matthiaskrgr:rollup-0navj4l, r=matth…
1447f9d 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#121619 (Experimental feature postfix match)
 - rust-lang#122370 (Gracefully handle `AnonConst` in `diagnostic_hir_wf_check()`)
 - rust-lang#122537 (interpret/allocation: fix aliasing issue in interpreter and refactor getters a bit)
 - rust-lang#122542 (coverage: Clean up marker statements that aren't needed later)
 - rust-lang#122800 (Add `NonNull::<[T]>::is_empty`.)
 - rust-lang#122820 (Stop using `<DefId as Ord>` in various diagnostic situations)
 - rust-lang#122847 (Suggest `RUST_MIN_STACK` workaround on overflow)
 - rust-lang#122855 (Fix Itanium mangling usizes)
 - rust-lang#122863 (add more ice tests )

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f5ac009 into rust-lang:master Mar 22, 2024
@rustbot rustbot added this to the 1.79.0 milestone Mar 22, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 22, 2024
@rust-timer
Unrolled build for rust-lang#122370
32696e5 
Rollup merge of rust-lang#122370 - gurry:122199-ice-unexpected-node, r=davidtwco

Gracefully handle `AnonConst` in `diagnostic_hir_wf_check()`

Instead of running the WF check on the `AnonConst` itself we run it on the `ty` of the generic param of which the `AnonConst` is the default value.

Fixes rust-lang#122199
@gurry gurry mentioned this pull request Mar 23, 2024
Merged
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Mar 23, 2024
@workingjubilee
Rollup merge of rust-lang#122927 - gurry:122199-ice-unexpected-node-2…
048ba2a 
…, r=workingjubilee

Change an ICE regression test to use the original reproducer

The ICE was fixed in PR rust-lang#122370, but the test used a different reproducer than the one originally reported. This PR changes it to the original one, giving us more confidence that the fix works.

Fixes rust-lang#122199
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 23, 2024
@matthiaskrgr
Rollup merge of rust-lang#122927 - gurry:122199-ice-unexpected-node-2…
8cd7551 
…, r=workingjubilee

Change an ICE regression test to use the original reproducer

The ICE was fixed in PR rust-lang#122370, but the test used a different reproducer than the one originally reported. This PR changes it to the original one, giving us more confidence that the fix works.

Fixes rust-lang#122199
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 23, 2024
@matthiaskrgr
Rollup merge of rust-lang#122927 - gurry:122199-ice-unexpected-node-2…
aaf5f3b 
…, r=workingjubilee

Change an ICE regression test to use the original reproducer

The ICE was fixed in PR rust-lang#122370, but the test used a different reproducer than the one originally reported. This PR changes it to the original one, giving us more confidence that the fix works.

Fixes rust-lang#122199
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 23, 2024
@rust-timer
Unrolled build for rust-lang#122927
9c9abb6 
Rollup merge of rust-lang#122927 - gurry:122199-ice-unexpected-node-2, r=workingjubilee

Change an ICE regression test to use the original reproducer

The ICE was fixed in PR rust-lang#122370, but the test used a different reproducer than the one originally reported. This PR changes it to the original one, giving us more confidence that the fix works.

Fixes rust-lang#122199
RenjiSann pushed a commit to RenjiSann/rust that referenced this pull request Mar 25, 2024
@matthiaskrgr @RenjiSann
Rollup merge of rust-lang#122927 - gurry:122199-ice-unexpected-node-2…
6b694ee 
…, r=workingjubilee

Change an ICE regression test to use the original reproducer

The ICE was fixed in PR rust-lang#122370, but the test used a different reproducer than the one originally reported. This PR changes it to the original one, giving us more confidence that the fix works.

Fixes rust-lang#122199
flip1995 pushed a commit to flip1995/rust that referenced this pull request Apr 4, 2024
@bors
Auto merge of rust-lang#122869 - matthiaskrgr:rollup-0navj4l, r=matth…
879899c 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#121619 (Experimental feature postfix match)
 - rust-lang#122370 (Gracefully handle `AnonConst` in `diagnostic_hir_wf_check()`)
 - rust-lang#122537 (interpret/allocation: fix aliasing issue in interpreter and refactor getters a bit)
 - rust-lang#122542 (coverage: Clean up marker statements that aren't needed later)
 - rust-lang#122800 (Add `NonNull::<[T]>::is_empty`.)
 - rust-lang#122820 (Stop using `<DefId as Ord>` in various diagnostic situations)
 - rust-lang#122847 (Suggest `RUST_MIN_STACK` workaround on overflow)
 - rust-lang#122855 (Fix Itanium mangling usizes)
 - rust-lang#122863 (add more ice tests )

r? `@ghost`
`@rustbot` modify labels: rollup
@gurry gurry deleted the 122199-ice-unexpected-node branch April 30, 2024 10:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@davidtwco davidtwco davidtwco approved these changes

Assignees

@davidtwco davidtwco

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.79.0

Development

Successfully merging this pull request may close these issues.

ice: Unexpected node AnonConst(AnonConst ..

7 participants

@gurry @rustbot @davidtwco @bors @matthiaskrgr @rust-log-analyzer @workingjubilee