Skip to content

Correctly break out of recovery loop - #62607

Merged
bors merged 2 commits into
rust-lang:masterfrom
estebank:this-mem-is-out-of-control
Jul 13, 2019
Merged

Correctly break out of recovery loop#62607
bors merged 2 commits into
rust-lang:masterfrom
estebank:this-mem-is-out-of-control

Conversation

@estebank

@estebankestebank commented Jul 12, 2019

Copy link
Copy Markdown
Contributor

Fix#61858.

@estebankestebank 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. labels Jul 12, 2019
@rust-highfive

rust-highfive commented Jul 12, 2019

Copy link
Copy Markdown
Contributor

r? @petrochenkov

(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 Jul 12, 2019
@petrochenkov

petrochenkov commented Jul 12, 2019

Copy link
Copy Markdown
Contributor

r=me with the snippet from #61858 added to tests.

@petrochenkovpetrochenkov 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 Jul 12, 2019
@estebankestebank added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 12, 2019
@estebank

estebank commented Jul 12, 2019

Copy link
Copy Markdown
ContributorAuthor

@bors r=petrochenkov rollup

@bors

bors commented Jul 12, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 8c5f690 has been approved by petrochenkov

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 12, 2019
Centril added a commit to Centril/rust that referenced this pull request Jul 12, 2019
@Centril
Rollup merge ofrust-lang#62607- estebank:this-mem-is-out-of-control…
a7f1649
…, r=petrochenkov
Correctly break out of recovery loop
Fixrust-lang#61858.
@CentrilCentril mentioned this pull request Jul 12, 2019
Merged
bors added a commit that referenced this pull request Jul 12, 2019
@bors
Auto merge of#62635- Centril:rollup-potvfnk, r=Centril
e13fe7f
Rollup of 12 pull requests
Successful merges:
- #61535 (Coherence test when a generic type param has a default value from an associated type)
- #62274 (rustc_mir: follow FalseUnwind's real_target edge in qualify_consts.)
- #62431 (Add messages to `Option`'s and `Result`'s `must_use` annotation for `is_*`)
- #62453 (in which we suggest anonymizing single-use lifetimes in paths )
- #62568 (Replace unsafe_destructor_blind_to_params with may_dangle)
- #62578 (Add test for #49919)
- #62595 (Document that the crate keyword refers to the project root)
- #62599 (move mem::uninitialized deprecation back by 1 release, to 1.39)
- #62605 (Emit dropped unemitted errors to aid in ICE debugging)
- #62607 (Correctly break out of recovery loop)
- #62608 (`async unsafe fn` tests)
- #62623 (downgrade indirect_structural_match lint to allow)
Failed merges:
r? @ghost
This was referenced Jul 13, 2019
Closed
Merged
@bors
bors merged commit 8c5f690 into rust-lang:masterJul 13, 2019
@nagisanagisa added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jul 18, 2019
@nagisa

nagisa commented Jul 18, 2019

Copy link
Copy Markdown
Member

Decided to not backport to stable as the fix is for a stable-to-stable regression and the issue being fixed is not too impactful.

@nagisanagisa removed the stable-nominated Nominated for backporting to the compiler in the stable channel. label Jul 18, 2019
@emilyalbiniemilyalbini mentioned this pull request Jul 22, 2019
Merged
@emilyalbiniemilyalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 22, 2019
bors added a commit that referenced this pull request Jul 22, 2019
@bors
Auto merge of#62866- pietroalbini:beta-rollup, r=pietroalbini
97789c4
[beta] Rollup backports
Cherry picked:
* rustc_target: avoid negative register counts in the SysV x86_64 ABI. #62380
* Fix ICEs when `Self` is used in type aliases #62417
* Raise the default recursion limit to 128 #62450
* Handle errors during error recovery gracefully #62604
* Correctly break out of recovery loop #62607
* Cancel unemitted diagnostics during error recovery #62666
* ci: pin awscli dependencies #62856
* Ensure that checkout is with \n line endings #62564
Rolled up:
* [beta] Backport #62615#62793
* [beta] Fix#62660#62792
r? @ghost
bors added a commit that referenced this pull request Jul 22, 2019
@bors
Auto merge of#62866- pietroalbini:beta-rollup, r=Centril
61d1607
[beta] Rollup backports
Cherry picked:
* rustc_target: avoid negative register counts in the SysV x86_64 ABI. #62380
* Fix ICEs when `Self` is used in type aliases #62417
* Raise the default recursion limit to 128 #62450
* Handle errors during error recovery gracefully #62604
* Correctly break out of recovery loop #62607
* Cancel unemitted diagnostics during error recovery #62666
* ci: pin awscli dependencies #62856
* Ensure that checkout is with \n line endings #62564
Rolled up:
* [beta] Backport #62615#62793
* [beta] Fix#62660#62792
r? @ghost
@estebank
estebank deleted the this-mem-is-out-of-control branch November 9, 2023 05:19
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@petrochenkovpetrochenkov

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.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.

rustc runs out of memory when compiling an if statement with no block, enclosed in parentheses

6 participants

@estebank@rust-highfive@petrochenkov@bors@nagisa@emilyalbini