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.

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

Do not ICE when encountering yield inside async block #69175

Merged
merged 1 commit into from Feb 18, 2020
Merged

Do not ICE when encountering yield inside async block #69175

merged 1 commit into from Feb 18, 2020

Conversation

estebank
Copy link
Contributor

Fix #67158.

@rust-highfive
Copy link
Collaborator

r? @petrochenkov

(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 Feb 15, 2020
@estebank estebank added beta-nominated Nominated for backporting to the compiler in the beta channel. stable-nominated Nominated for backporting to the compiler in the stable channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 15, 2020
@rust-highfive

This comment has been minimized.

Sign in to view
@petrochenkov
Copy link
Contributor

r=me with tidy fixed

@petrochenkov petrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Feb 15, 2020
@petrochenkov
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 17, 2020

📌 Commit e5b2c66 has been approved by petrochenkov

@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 Feb 17, 2020
Centril added a commit to Centril/rust that referenced this pull request Feb 17, 2020
@Centril
Rollup merge of rust-lang#69175 - estebank:shall-not-ice, r=petrochenkov
323f5bb 
Do not ICE when encountering `yield` inside `async` block

Fix rust-lang#67158.
@Centril Centril mentioned this pull request Feb 17, 2020
Closed
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Feb 17, 2020
@Dylan-DPC
Rollup merge of rust-lang#69175 - estebank:shall-not-ice, r=petrochenkov
5ba1dd7 
Do not ICE when encountering `yield` inside `async` block

Fix rust-lang#67158.
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Feb 17, 2020
Closed
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Feb 18, 2020
@JohnTitor
Rollup merge of rust-lang#69175 - estebank:shall-not-ice, r=petrochenkov
cdaeb23 
Do not ICE when encountering `yield` inside `async` block

Fix rust-lang#67158.
@JohnTitor JohnTitor mentioned this pull request Feb 18, 2020
Closed
bors added a commit that referenced this pull request Feb 18, 2020
@bors
Auto merge of #69253 - JohnTitor:rollup-4asn252, r=JohnTitor
ef1765e 
Rollup of 8 pull requests

Successful merges:

 - #67272 (recursion_limit parsing handles overflows)
 - #68597 (Simplify `Skip::nth` and `Skip::last` implementations)
 - #68767 (macOS: avoid calling pthread_self() twice)
 - #69175 (Do not ICE when encountering `yield` inside `async` block)
 - #69223 (Ignore GDB versions with broken str printing.)
 - #69244 (configure: set LLVM flags with a value)
 - #69249 (Stabilize {f32, f64}::{LOG2_10, LOG10_2})
 - #69252 (Clean out unused directories for extra disk space)

Failed merges:

r? @ghost
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Feb 18, 2020
@JohnTitor
Rollup merge of rust-lang#69175 - estebank:shall-not-ice, r=petrochenkov
35e7c78 
Do not ICE when encountering `yield` inside `async` block

Fix rust-lang#67158.
@JohnTitor JohnTitor mentioned this pull request Feb 18, 2020
Merged
bors added a commit that referenced this pull request Feb 18, 2020
@bors
Auto merge of #69258 - JohnTitor:rollup-n2hljai, r=JohnTitor
6317721 
Rollup of 8 pull requests

Successful merges:

 - #67272 (recursion_limit parsing handles overflows)
 - #68597 (Simplify `Skip::nth` and `Skip::last` implementations)
 - #68767 (macOS: avoid calling pthread_self() twice)
 - #69175 (Do not ICE when encountering `yield` inside `async` block)
 - #69223 (Ignore GDB versions with broken str printing.)
 - #69244 (configure: set LLVM flags with a value)
 - #69249 (Stabilize {f32, f64}::{LOG2_10, LOG10_2})
 - #69252 (Clean out unused directories for extra disk space)

Failed merges:

r? @ghost
@bors bors merged commit e5b2c66 into rust-lang:master Feb 18, 2020
@pnkfelix
Copy link
Member

pnkfelix commented Feb 20, 2020 •
edited

discussed in T-compiler meeting. accepted for beta backport.

@pnkfelix pnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Feb 20, 2020
@pnkfelix
Copy link
Member

discussed at T-compiler meeting. accepted for stable backport

@pnkfelix pnkfelix added the stable-accepted Accepted for backporting to the compiler in the stable channel. label Feb 20, 2020
@Mark-Simulacrum Mark-Simulacrum removed the stable-nominated Nominated for backporting to the compiler in the stable channel. label Feb 21, 2020
This was referenced Feb 21, 2020
Merged
Merged
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 21, 2020
bors added a commit that referenced this pull request Feb 22, 2020
@bors
Auto merge of #69359 - Mark-Simulacrum:stable-next, r=<try>
9ab2cd6 
[stable] 1.41.1 release

This backports the following PRs:
 * Revert "Remove `checked_add` in `Layout::repeat`" #69241
 * Do not ICE when encountering `yield` inside `async` block #69175
 * Correct ICE caused by macros generating invalid spans. #68611
 * Changelog: Demonstrate final build-override syntax #68603
 * Resolve long compile times when evaluating always valid constants #67667
 * Fix MIR typeck soundness holes #69145

This also includes a commit which rustfmt's files which the latter commits touched (and perhaps a bit more) to make rebasing the PRs go more smoothly (thankfully, this should be the last time we need to do so).

I have removed stable-nominated tags from PRs successfully backported.
bors added a commit that referenced this pull request Feb 24, 2020
@bors
Auto merge of #69359 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum
ded0270 
[stable] 1.41.1 release

This backports the following PRs:
 * Revert "Remove `checked_add` in `Layout::repeat`" #69241
 * Do not ICE when encountering `yield` inside `async` block #69175
 * Correct ICE caused by macros generating invalid spans. #68611
 * Changelog: Demonstrate final build-override syntax #68603
 * Resolve long compile times when evaluating always valid constants #67667
 * Fix MIR typeck soundness holes #69145

This also includes a commit which rustfmt's files which the latter commits touched (and perhaps a bit more) to make rebasing the PRs go more smoothly (thankfully, this should be the last time we need to do so).

I have removed stable-nominated tags from PRs successfully backported.
bors added a commit that referenced this pull request Feb 24, 2020
@bors
Auto merge of #69360 - Mark-Simulacrum:beta-next, r=Mark-Simulacrum
13e0fbc 
[beta] beta backports

This backports the following PRs:

* Revert "Remove `checked_add` in `Layout::repeat`" #69241
* Do not ICE when encountering `yield` inside `async` block #69175
* Fix MIR typeck soundness holes #69145
* Fix extra subslice lowering #69128
* Correct ICE caused by macros generating invalid spans. #68611
* Make conflicting_repr_hints a deny-by-default c-future-compat lint #68586
@estebank estebank deleted the shall-not-ice branch November 9, 2023 05:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Centril Centril Centril left review comments

Assignees

@petrochenkov petrochenkov

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. stable-accepted Accepted for backporting to the compiler in the stable channel. 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.

ICE on beta and nightly as result of use of yield in combination with macro call in async block
7 participants
@estebank @rust-highfive @petrochenkov @bors @pnkfelix @Centril @Mark-Simulacrum