delay bug when adjusting `NeverToAny` twice during diagnostic code by PrestonFrom · Pull Request #96379 · rust-lang/rust

PrestonFrom · 2022-04-25T04:50:17Z

Addresses Issue 96335 (#96335) by using delay_span_bug instead of an assert and returning an error type from check_expr_meets_expectation_or_error.

Fixes#96335

rust-highfive · 2022-04-25T04:50:20Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @compiler-errors (or someone else) soon.

Please see the contribution instructions for more information.

compiler-errors · 2022-04-25T05:17:18Z

It would be nice to return the adjusted type from here instead of ty_error, so it doesn't meddle with the function call argument diagnostic code in check_argument_types:
Suggested change
ifself.typeck_results.borrow().adjustments().contains_key(expr.hir_id){
self.tcx().sess.delay_span_bug(
expr.span,
"expression with never type wound up being adjusted",
);
returnself.tcx().ty_error();
}
ifletSome(adjustments) = self.typeck_results.borrow().adjustments().get(expr.hir_id){
self.tcx().sess.delay_span_bug(
expr.span,
"expression with never type wound up being adjusted",
);
iflet[Adjustment{kind:Adjust::NeverToAny, target }] = &adjustments[..]{
return target;
}else{
returnself.tcx().ty_error();
}
}

That's a great idea! Thank you!

compiler-errors · 2022-04-25T05:19:00Z

Can you squash the commit history to get rid of the merge commit and the work-in-progress code that you committed? ^{Usually I just git pull --rebase to avoid merge commits when updating local branches, but I digress..}

Also, for posterity, it would be nice to give this PR a name like "delay bug when adjusting NeverToAny twice during diagnostic code". Or whatever you think is a better descriptive title.

PrestonFrom · 2022-04-25T05:55:44Z

Thank you for the quick review!!

Can you squash the commit history to get rid of the merge commit and the work-in-progress code that you committed? Usually I just git pull --rebase to avoid merge commits when updating local branches, but I digress..

I will certainly be using rebase from now on! I created a bit of a mess squashing, but I think it's correct now.

Also, for posterity, it would be nice to give this PR a name like "delay bug when adjusting NeverToAny twice during diagnostic code". Or whatever you think is a better descriptive title.

I like that suggestion!

compiler-errors · 2022-04-25T06:07:00Z

Thanks for the contribution. Fixing ICEs is totally rad.

@bors r+

bors · 2022-04-25T06:07:02Z

📌 Commit 5165295 has been approved by compiler-errors

…-errors delay bug when adjusting `NeverToAny` twice during diagnostic code Addresses Issue 96335 (rust-lang#96335) by using `delay_span_bug` instead of an assert and returning an error type from `check_expr_meets_expectation_or_error`. Fixesrust-lang#96335

Rollup of 6 pull requests Successful merges: - rust-lang#90312 (Fix some confusing wording and improve slice-search-related docs) - rust-lang#96149 (Remove unused macro rules) - rust-lang#96279 (rustdoc: Remove .woff font files) - rust-lang#96355 (Better handle too many `#` recovery in raw str) - rust-lang#96379 (delay bug when adjusting `NeverToAny` twice during diagnostic code) - rust-lang#96384 (do not consider two extern types to be similar) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rust-highfive assigned compiler-errors Apr 25, 2022

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Apr 25, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 25, 2022

PrestonFrom mentioned this pull request Apr 25, 2022
thread 'rustc' panicked at 'expression with never type wound up being adjusted' #96335
Closed

compiler-errors reviewed Apr 25, 2022
View reviewed changes

PrestonFrom force-pushed the issue_96335 branch from 7440327 to a0c8790Compare April 25, 2022 05:42

Delay bug when adjusting NeverToAny twice during diagnostic
5165295

PrestonFrom force-pushed the issue_96335 branch from a0c8790 to 5165295Compare April 25, 2022 05:53

compiler-errors changed the title ~~Issue 96335~~delay bug when adjusting NeverToAny twice during diagnostic codeApr 25, 2022

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 Apr 25, 2022

GuillaumeGomez mentioned this pull request Apr 25, 2022
Rollup of 7 pull requests #96387
Closed

GuillaumeGomez mentioned this pull request Apr 25, 2022
Rollup of 6 pull requests #96388
Closed

GuillaumeGomez mentioned this pull request Apr 25, 2022
Rollup of 5 pull requests #96389
Closed

compiler-errors mentioned this pull request Apr 25, 2022
Rollup of 6 pull requests #96398
Closed

Dylan-DPC mentioned this pull request Apr 25, 2022
Rollup of 6 pull requests #96414
Merged

bors merged commit 8038a9e into rust-lang:masterApr 26, 2022

rustbot added this to the 1.62.0 milestone Apr 26, 2022

Navigation Menu

Uh oh!

Uh oh!

delay bug when adjusting `NeverToAny` twice during diagnostic code - #96379

delay bug when adjusting `NeverToAny` twice during diagnostic code#96379
bors merged 1 commit into
rust-lang:masterfrom
PrestonFrom:issue_96335

PrestonFrom commented Apr 25, 2022•
edited by compiler-errors
Loading

Uh oh!

rust-highfive commented Apr 25, 2022

Uh oh!

compiler-errorsApr 25, 2022•
edited
Loading

Uh oh!

PrestonFromApr 25, 2022

Uh oh!

compiler-errors commented Apr 25, 2022•
edited
Loading

Uh oh!

PrestonFrom commented Apr 25, 2022

Uh oh!

compiler-errors commented Apr 25, 2022

Uh oh!

bors commented Apr 25, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

-ifself.typeck_results.borrow().adjustments().contains_key(expr.hir_id){
-self.tcx().sess.delay_span_bug(
- expr.span,
-"expression with never type wound up being adjusted",
-);
-returnself.tcx().ty_error();
-}
+ifletSome(adjustments) = self.typeck_results.borrow().adjustments().get(expr.hir_id){
+self.tcx().sess.delay_span_bug(
+ expr.span,
+"expression with never type wound up being adjusted",
+);
+iflet[Adjustment{kind:Adjust::NeverToAny, target }] = &adjustments[..]{
+return target;
+}else{
+returnself.tcx().ty_error();
+}
+}

Uh oh!

Uh oh!

Conversation

PrestonFrom commented Apr 25, 2022• edited by compiler-errors Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented Apr 25, 2022

Uh oh!

compiler-errorsApr 25, 2022• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

PrestonFromApr 25, 2022

Choose a reason for hiding this comment

Uh oh!

compiler-errors commented Apr 25, 2022• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PrestonFrom commented Apr 25, 2022

Uh oh!

compiler-errors commented Apr 25, 2022

Uh oh!

bors commented Apr 25, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

PrestonFrom commented Apr 25, 2022•
edited by compiler-errors
Loading

compiler-errorsApr 25, 2022•
edited
Loading

compiler-errors commented Apr 25, 2022•
edited
Loading