Skip to content

Do not ICE on closure typeck - #67071

Merged
bors merged 1 commit into
rust-lang:masterfrom
estebank:issue-66868
Dec 7, 2019
Merged

Do not ICE on closure typeck#67071
bors merged 1 commit into
rust-lang:masterfrom
estebank:issue-66868

Conversation

@estebank

Copy link
Copy Markdown
Contributor

Tackle #66868.

r? @davidtwco

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 5, 2019

@davidtwcodavidtwco left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM


let span = self.tcx.def_span(generator_did);
// Do not ICE on closure typeck (#66868).
if let None = self.tcx.hir().as_local_hir_id(generator_did) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I wonder if this would be fixed by these changes.

Super minor nit:

Suggested change
ifletNone = self.tcx.hir().as_local_hir_id(generator_did){
ifself.tcx.hir().as_local_hir_id(generator_did).is_none(){

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I wonder if this would be fixed by these changes.

Seems like it could.

@davidtwco

Copy link
Copy Markdown
Member

r=me when CI passes

@estebank

Copy link
Copy Markdown
ContributorAuthor

@bors r=davidtwco rollup

@bors

bors commented Dec 6, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 22c65f9 has been approved by davidtwco

@borsbors 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 Dec 6, 2019
Centril added a commit to Centril/rust that referenced this pull request Dec 6, 2019
@CentrilCentril mentioned this pull request Dec 6, 2019
bors added a commit that referenced this pull request Dec 6, 2019
Rollup of 10 pull requests
Successful merges:
- #66606 (Add feature gate for mut refs in const fn)
- #66841 (Add `{f32,f64}::approx_unchecked_to<Int>` unsafe methods)
- #67009 (Emit coercion suggestions in more places)
- #67052 (Ditch `parse_in_attr`)
- #67071 (Do not ICE on closure typeck)
- #67078 (accept union inside enum if not followed by identifier)
- #67090 (Change "either" to "any" in Layout::from_size_align's docs)
- #67092 (Fix comment typos in src/libcore/alloc.rs)
- #67094 (get rid of __ in field names)
- #67102 (Add note to src/ci/docker/README.md about multiple docker images)
Failed merges:
- #67101 (use `#[allow(unused_attributes)]` to paper over incr.comp problem)
r? @ghost
@bors
bors merged commit 22c65f9 into rust-lang:masterDec 7, 2019
@estebankestebank mentioned this pull request Dec 14, 2019
Centril added a commit to Centril/rust that referenced this pull request Dec 23, 2019
…-DPC
Add regression tests for fixed ICEs
Closesrust-lang#61747 (fixed from 1.41.0-nightly (4007d4e 2019-12-01))
Closesrust-lang#66205 (fixed from 1.41.0-nightly (4007d4e 2019-12-01))
Closesrust-lang#66270 (fixed by rust-lang#66246)
Closesrust-lang#66868 (fixed by rust-lang#67071)
Closesrust-lang#67424 (fixed by rust-lang#67160)
Also picking a minor nit up from rust-lang#67071 with 101dd7b
r? @Centril
Centril added a commit to Centril/rust that referenced this pull request Dec 23, 2019
…-DPC
Add regression tests for fixed ICEs
Closesrust-lang#61747 (fixed from 1.41.0-nightly (4007d4e 2019-12-01))
Closesrust-lang#66205 (fixed from 1.41.0-nightly (4007d4e 2019-12-01))
Closesrust-lang#66270 (fixed by rust-lang#66246)
Closesrust-lang#66868 (fixed by rust-lang#67071)
Closesrust-lang#67424 (fixed by rust-lang#67160)
Also picking a minor nit up from rust-lang#67071 with 101dd7b
r? @Centril
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Dec 24, 2019
Add regression tests for fixed ICEs
Closesrust-lang#61747 (fixed from 1.41.0-nightly (4007d4e 2019-12-01))
Closesrust-lang#66205 (fixed from 1.41.0-nightly (4007d4e 2019-12-01))
Closesrust-lang#66270 (fixed by rust-lang#66246)
Closesrust-lang#67424 (fixed by rust-lang#67160)
Also picking a minor nit up from rust-lang#67071 with 101dd7b
r? @Centril
Centril added a commit to Centril/rust that referenced this pull request Dec 24, 2019
Add regression tests for fixed ICEs
Closesrust-lang#61747 (fixed from 1.41.0-nightly (4007d4e 2019-12-01))
Closesrust-lang#66205 (fixed from 1.41.0-nightly (4007d4e 2019-12-01))
Closesrust-lang#66270 (fixed by rust-lang#66246)
Closesrust-lang#67424 (fixed by rust-lang#67160)
Also picking a minor nit up from rust-lang#67071 with 101dd7b
r? @Centril
@estebank
estebank deleted the issue-66868 branch November 9, 2023 05:17
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@estebank@davidtwco@bors@rust-highfive