Skip to content

Do not ICE in if without else in async fn #66391

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 2 commits into from
Nov 15, 2019
Merged

Do not ICE in if without else in async fn #66391

merged 2 commits into from
Nov 15, 2019

Conversation

estebank
Copy link
Contributor

Fix #66387.

@rust-highfive
Copy link
Contributor

r? @davidtwco

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 13, 2019
@estebank estebank added beta-nominated Nominated for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Nov 13, 2019
@Centril
Copy link
Contributor

Centril commented Nov 14, 2019 •
edited
Loading

r? @Centril r=me with a comment added to regression test explaining the "what went wrong" (and with @gilescope's nicely spotted typo fixed below)

@rust-highfive rust-highfive assigned Centril and unassigned davidtwco Nov 14, 2019
gilescope
gilescope reviewed Nov 14, 2019
View reviewed changes
src/librustc_typeck/check/generator_interior.rs Outdated
let ty = self.fcx.tables.borrow().expr_ty(expr);
self.record(ty, scope, Some(expr), expr.span);
//
// The type table might not have invormation for this expression
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

invormation - typo?

@Centril
Copy link
Contributor

Centril commented Nov 14, 2019

@bors r+

@bors
Copy link
Collaborator

bors commented Nov 14, 2019

📌 Commit c0a0a7d has been approved by Centril

@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 Nov 14, 2019
tmandry added a commit to tmandry/rust that referenced this pull request Nov 14, 2019
@tmandry
Rollup merge of rust-lang#66391 - estebank:if-else-async-ice, r=Centril
632a5c6 
Do not ICE in `if` without `else` in `async fn`

Fix rust-lang#66387.
@tmandry tmandry mentioned this pull request Nov 14, 2019
Closed
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Nov 15, 2019
@JohnTitor
Rollup merge of rust-lang#66391 - estebank:if-else-async-ice, r=Centril
f2a2db6 
Do not ICE in `if` without `else` in `async fn`

Fix rust-lang#66387.
@JohnTitor JohnTitor mentioned this pull request Nov 15, 2019
Closed
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Nov 15, 2019
@JohnTitor
Rollup merge of rust-lang#66391 - estebank:if-else-async-ice, r=Centril
b13272f 
Do not ICE in `if` without `else` in `async fn`

Fix rust-lang#66387.
@JohnTitor JohnTitor mentioned this pull request Nov 15, 2019
Closed
bors added a commit that referenced this pull request Nov 15, 2019
@bors
Auto merge of #66436 - JohnTitor:rollup-kphyb2i, r=JohnTitor
dac7229 
Rollup of 12 pull requests

Successful merges:

 - #65557 (rename Error::iter_chain() and remove Error::iter_sources())
 - #66013 (Avoid hashing the key twice in `get_query()`.)
 - #66306 (Remove cannot mutate statics in initializer of another static error)
 - #66338 (Update mdbook.)
 - #66388 (Do not ICE on recovery from unmet associated type bound obligation)
 - #66390 (Fix ICE when trying to suggest `Type<>` instead of `Type()`)
 - #66391 (Do not ICE in `if` without `else` in `async fn`)
 - #66394 (Fix two OOM issues related to `ConstProp`)
 - #66398 (Remove some stack frames from `.async` calls)
 - #66410 (miri: helper methods for max values of machine's usize/isize)
 - #66418 (Link to tracking issue in HIR const-check error code description)
 - #66419 (Don't warn labels beginning with `_` on unused_labels lint)

Failed merges:

r? @ghost
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Nov 15, 2019
@JohnTitor
Rollup merge of rust-lang#66391 - estebank:if-else-async-ice, r=Centril
c5b6dce 
Do not ICE in `if` without `else` in `async fn`

Fix rust-lang#66387.
@JohnTitor JohnTitor mentioned this pull request Nov 15, 2019
Merged
bors added a commit that referenced this pull request Nov 15, 2019
@bors
Auto merge of #66438 - JohnTitor:rollup-qpv3wia, r=JohnTitor
ce36ab2 
Rollup of 12 pull requests

Successful merges:

 - #65557 (rename Error::iter_chain() and remove Error::iter_sources())
 - #66013 (Avoid hashing the key twice in `get_query()`.)
 - #66306 (Remove cannot mutate statics in initializer of another static error)
 - #66338 (Update mdbook.)
 - #66388 (Do not ICE on recovery from unmet associated type bound obligation)
 - #66390 (Fix ICE when trying to suggest `Type<>` instead of `Type()`)
 - #66391 (Do not ICE in `if` without `else` in `async fn`)
 - #66398 (Remove some stack frames from `.async` calls)
 - #66410 (miri: helper methods for max values of machine's usize/isize)
 - #66418 (Link to tracking issue in HIR const-check error code description)
 - #66419 (Don't warn labels beginning with `_` on unused_labels lint)
 - #66428 (Cleanup unused function)

Failed merges:

r? @ghost
@bors bors merged commit c0a0a7d into rust-lang:master Nov 15, 2019
@jplatte
Copy link
Contributor

jplatte commented Nov 15, 2019

Isn't the error message backwards in the ui test? Shouldn't it be "expected i32", "found ()"?

@pnkfelix
Copy link
Member

beta-accepted (last week, sorry for delay!)

@pnkfelix pnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Nov 21, 2019
@pnkfelix pnkfelix mentioned this pull request Nov 29, 2019
Closed
@pnkfelix
Copy link
Member

stable-nominating on basis on my (unconfirmed) hypothesis that this PR fixes #66618.

@pnkfelix pnkfelix added the stable-nominated Nominated for backporting to the compiler in the stable channel. label Nov 29, 2019
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Dec 5, 2019
Merged
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Dec 5, 2019
@pnkfelix pnkfelix added the stable-accepted Accepted for backporting to the compiler in the stable channel. label Dec 7, 2019
bors added a commit that referenced this pull request Dec 7, 2019
@bors
Auto merge of #67063 - Mark-Simulacrum:beta-backports, r=Mark-Simulacrum
3f7f341 
[beta] backports

This pull request backports the following pull requests, which have all been beta-accepted by the
compiler team.

 * Handle non_exhaustive in borrow checking #66722
 * Do not ICE on trait aliases with missing obligations #66392
 * Do not ICE in `if` without `else` in `async fn` #66391
 * Fix ICE when trying to suggest `Type<>` instead of `Type()` #66390
 * Do not ICE on recovery from unmet associated type bound obligation #66388
 * find_deprecation: deprecation attr may be ill-formed meta. #66381
 * parser: don't use `unreachable!()` in `fn unexpected`. #66361
 * Undo an assert causing an ICE until we fix the underlying problem #66250
 * Do not ICE with a precision flag in formatting str and no format arguments #66093
 * Fix two OOM issues related to `ConstProp` #66394
bors added a commit that referenced this pull request Dec 8, 2019
@bors
Auto merge of #67063 - Mark-Simulacrum:beta-backports, r=Mark-Simulacrum
b509d9b 
[beta] backports

This pull request backports the following pull requests, which have all been beta-accepted by the
compiler team.

 * Handle non_exhaustive in borrow checking #66722
 * Do not ICE on trait aliases with missing obligations #66392
 * Do not ICE in `if` without `else` in `async fn` #66391
 * Fix ICE when trying to suggest `Type<>` instead of `Type()` #66390
 * Do not ICE on recovery from unmet associated type bound obligation #66388
 * find_deprecation: deprecation attr may be ill-formed meta. #66381
 * parser: don't use `unreachable!()` in `fn unexpected`. #66361
 * Undo an assert causing an ICE until we fix the underlying problem #66250
 * Do not ICE with a precision flag in formatting str and no format arguments #66093
 * Fix two OOM issues related to `ConstProp` #66394
@Mark-Simulacrum Mark-Simulacrum removed stable-accepted Accepted for backporting to the compiler in the stable channel. stable-nominated Nominated for backporting to the compiler in the stable channel. labels Dec 14, 2019
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@gilescope gilescope gilescope left review comments

@nikomatsakis nikomatsakis nikomatsakis approved these changes

Assignees

@Centril Centril

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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
No milestone
Development

Successfully merging this pull request may close these issues.

Compiler crash on "if" without "else" in async fn
10 participants
@estebank @rust-highfive @Centril @bors @jplatte @pnkfelix @nikomatsakis @gilescope @davidtwco @Mark-Simulacrum