Skip to content

Avoid ICE on return outside of fn with literal array - #64649

Merged
bors merged 2 commits into
rust-lang:masterfrom
estebank:returnator
Oct 2, 2019
Merged

Avoid ICE on return outside of fn with literal array#64649
bors merged 2 commits into
rust-lang:masterfrom
estebank:returnator

Conversation

@estebank

@estebankestebank commented Sep 21, 2019

Copy link
Copy Markdown
Contributor

Do not ICE when encountering enum E { A = return [0][0] }.

Fix#64638.

@rust-highfive

rust-highfive commented Sep 21, 2019

Copy link
Copy Markdown
Contributor

r? @zackmdavis

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 21, 2019
@estebankestebank added beta-nominated Nominated for backporting to the compiler in the beta channel. regression-from-stable-to-stable Performance or correctness regression from one stable version to another. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 21, 2019
@estebank

estebank commented Sep 21, 2019

Copy link
Copy Markdown
ContributorAuthor

The beta nomination is low priority, as the ICE has been present in stable for several releases, but it'd be nice if we can get such a small patch out the door sooner rather than later.

Centril
Centril reviewed Sep 21, 2019
View reviewed changes
Comment threadsrc/librustc_typeck/check/writeback.rs Outdated
Comment threadsrc/librustc_typeck/check/writeback.rs Outdated
Comment threadsrc/librustc_typeck/check/writeback.rs Outdated
@Mark-Simulacrum

Mark-Simulacrum commented Sep 21, 2019

Copy link
Copy Markdown
Member

Un-nominating for beta. We do not have the time to deal with possible failures of this patch -- if this hasn't yet landed on master (or even been approved for that), it's not going to land in time for beta backport.

@rustbot modify labels: -beta-nominated

@rustbotrustbot removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 21, 2019
@bors

bors commented Sep 26, 2019

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #64513) made this pull request unmergeable. Please resolve the merge conflicts.

@pnkfelixpnkfelix mentioned this pull request Sep 26, 2019
Closed
@Centril

Centril commented Sep 29, 2019

Copy link
Copy Markdown
Contributor

r? @varkor

@estebank
Avoid ICE on return outside of fn with literal array
2ae87ff
Do not ICE when encountering `enum E { A = return [0][0] }`.
@estebank
review comments
0e6fb8e
@varkor

varkor commented Oct 1, 2019

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Oct 1, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 0e6fb8e has been approved by varkor

@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 Oct 1, 2019
tmandry added a commit to tmandry/rust that referenced this pull request Oct 2, 2019
@tmandry
Rollup merge ofrust-lang#64649- estebank:returnator, r=varkor
c11cb25
Avoid ICE on return outside of fn with literal array
Do not ICE when encountering `enum E { A = return [0][0] }`.
Fixrust-lang#64638.
@tmandrytmandry mentioned this pull request Oct 2, 2019
Merged
bors added a commit that referenced this pull request Oct 2, 2019
@bors
Auto merge of#64981- tmandry:rollup-slfkhay, r=tmandry
f2023ac
Rollup of 11 pull requests
Successful merges:
- #64649 (Avoid ICE on return outside of fn with literal array)
- #64722 (Make all alt builders produce parallel-enabled compilers)
- #64801 (Avoid `chain()` in `find_constraint_paths_between_regions()`.)
- #64805 (Still more `ObligationForest` improvements.)
- #64840 (SelfProfiler API refactoring and part one of event review)
- #64885 (use try_fold instead of try_for_each to reduce compile time)
- #64942 (Fix clippy warnings)
- #64952 (Update cargo.)
- #64974 (Fix zebra-striping in generic dataflow visualization)
- #64978 (Fully clear `HandlerInner` in `Handler::reset_err_count`)
- #64979 (Update books)
Failed merges:
- #64959 (syntax: improve parameter without type suggestions)
r? @ghost
@bors
bors merged commit 0e6fb8e into rust-lang:masterOct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@CentrilCentrilCentril left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@varkorvarkor

Labels

regression-from-stable-to-stablePerformance or correctness regression from one stable version to another.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant 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 with return outside of function body

8 participants

@estebank@rust-highfive@Mark-Simulacrum@bors@Centril@varkor@zackmdavis@rustbot