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

Fix ICE #64964 #64989

Merged
merged 2 commits into from
Oct 2, 2019
Merged

Fix ICE #64964 #64989

merged 2 commits into from
Oct 2, 2019
+37 −9

Conversation

sinkuu
Copy link
Contributor

@sinkuu sinkuu commented Oct 2, 2019

Fixes #64964, which is an ICE with awaiting in a method + incr-comp.

@rust-highfive
Copy link
Collaborator

r? @varkor

(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 Oct 2, 2019
davidtwco
davidtwco approved these changes Oct 2, 2019
View reviewed changes
Copy link
Member

@davidtwco davidtwco left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM, thanks for the quick fix!

src/librustc_typeck/check/generator_interior.rs Outdated Show resolved Hide resolved
@varkor varkor assigned davidtwco and unassigned varkor Oct 2, 2019
@davidtwco
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Oct 2, 2019

📌 Commit f0fddb1 has been approved by davidtwco

@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 Oct 2, 2019
@Centril Centril 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 Oct 2, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 2, 2019
@Centril
Rollup merge of rust-lang#64989 - sinkuu:fix_ice_64964, r=davidtwco
028ffd1 
Fix ICE rust-lang#64964

Fixes rust-lang#64964, which is an ICE with `await`ing in a method + incr-comp.
@Centril Centril mentioned this pull request Oct 2, 2019
Merged
bors added a commit that referenced this pull request Oct 2, 2019
@bors
Auto merge of #65009 - Centril:rollup-06g05xj, r=Centril
2daa404 
Rollup of 13 pull requests

Successful merges:

 - #64581 (Fix unreachable_code warnings for try{} block ok-wrapped expressions)
 - #64850 (Remove inlines from DepNode code)
 - #64914 (regression test for 64453 borrow check error.)
 - #64922 (Use PlaceBuilder to avoid a lot of slice -> vec -> slice convertions)
 - #64948 (Improve sidebar styling to make its integration easier)
 - #64961 (Make comment about dummy type a bit more clear)
 - #64967 (Don't mark borrows of zero-sized arrays as indirectly mutable)
 - #64973 (Fix typo while setting `compile-flags` in test)
 - #64980 (Enable support for `IndirectlyMutableLocals` in `rustc_peek` )
 - #64989 (Fix ICE #64964)
 - #64991 ([const-prop] Correctly handle locals that can't be propagated)
 - #64995 (Remove rustdoc warning)
 - #64997 (rustc book: nitpick SLP vectorization)

Failed merges:

r? @ghost
@bors bors merged commit f0fddb1 into rust-lang:master Oct 2, 2019
@sinkuu sinkuu deleted the fix_ice_64964 branch October 2, 2019 22:45
@nikomatsakis nikomatsakis mentioned this pull request Oct 3, 2019
Merged
@nikomatsakis
Copy link
Contributor

I was going to beta-nominate this, since I beta-nominated #64895, but I see @Centril already has. Which leads me to wonder if I am mistaken and #64895 made the beta cut-off. =)

@Centril
Copy link
Contributor

Centril commented Oct 3, 2019

I think I just forgot to beta-nominate the other PR :) It didn't make the cut-off.

@pnkfelix
Copy link
Member

pnkfelix commented Oct 3, 2019

discussed at compiler team meeting. This should be landed in concern with PR #64895's backport.

@pnkfelix pnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Oct 3, 2019
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Oct 22, 2019
Merged
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 23, 2019
bors added a commit that referenced this pull request Oct 24, 2019
@bors
Auto merge of #65708 - Mark-Simulacrum:beta-backports, r=pietroalbini
def6df2 
[beta] backport rollup

This includes a bunch of PRs:
 *  Fix redundant semicolon lint interaction with proc macro attributes #64387
 *  Upgrade async/await to "used" keywords. #64875
 *  syntax: fix dropping of attribute on first param of non-method assocated fn #64894
 *  async/await: improve not-send errors #64895
 *  Silence unreachable code lint from await desugaring #64930
 *  Always mark rust and rust-call abi's as unwind #65020
 *  Account for macro invocation in `let mut $pat` diagnostic. #65123
 *  Ensure that associated `async fn`s have unique fresh param names #65142
 *  Add troubleshooting section to PGO chapter in rustc book. #65402
 *  Upgrade GCC to 8.3.0, glibc to 1.17.0 and crosstool-ng to 1.24.0 for dist-armv7-linux #65302
 *  Optimize `try_expand_impl_trait_type` #65293
 *  use precalculated dominators in explain_borrow #65172
 *  Fix ICE #64964 #64989
bors added a commit that referenced this pull request Oct 26, 2019
@bors
Auto merge of #65708 - Mark-Simulacrum:beta-backports, r=pietroalbini
23f8f65 
[beta] backport rollup

This includes a bunch of PRs:
 *  Fix redundant semicolon lint interaction with proc macro attributes #64387
 *  Upgrade async/await to "used" keywords. #64875
 *  syntax: fix dropping of attribute on first param of non-method assocated fn #64894
 *  async/await: improve not-send errors #64895
 *  Silence unreachable code lint from await desugaring #64930
 *  Always mark rust and rust-call abi's as unwind #65020
 *  Account for macro invocation in `let mut $pat` diagnostic. #65123
 *  Ensure that associated `async fn`s have unique fresh param names #65142
 *  Add troubleshooting section to PGO chapter in rustc book. #65402
 *  Upgrade GCC to 8.3.0, glibc to 1.17.0 and crosstool-ng to 1.24.0 for dist-armv7-linux #65302
 *  Optimize `try_expand_impl_trait_type` #65293
 *  use precalculated dominators in explain_borrow #65172
 *  Fix ICE #64964 #64989
 *  [beta] Revert "Auto merge of #62948 - matklad:failable-file-loading, r=petro… #65273
 *  save-analysis: Don't ICE when resolving qualified type paths in struct members #65353
 *  save-analysis: Nest tables when processing impl block definitions #65511
 *  Avoid ICE when checking `Destination` of `break` inside a closure #65518
 *  Avoid ICE when adjusting bad self ty #65755
 *  workaround msys2 bug #65762
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
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.

ICE while compiling hyper (StableHasher: unexpected region '_#0r)
9 participants
@sinkuu @rust-highfive @davidtwco @bors @nikomatsakis @Centril @pnkfelix @varkor @Mark-Simulacrum