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 leak when early returning out of box syntax #62331

Merged
merged 1 commit into from
Jul 14, 2019
Merged

Fix leak when early returning out of box syntax #62331

merged 1 commit into from
Jul 14, 2019

Conversation

wesleywiser
Copy link
Member

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 3, 2019
matthewjasper
matthewjasper reviewed Jul 3, 2019
View reviewed changes
src/test/mir-opt/issue-62289.rs Outdated Show resolved Hide resolved
src/test/mir-opt/issue-62289.rs Outdated Show resolved Hide resolved
@wesleywiser wesleywiser force-pushed the fix_early_return_leak branch from 676c44f to a04c65c Compare July 4, 2019 14:23
@wesleywiser
Copy link
Member Author

@matthewjasper Fixed!

@matthewjasper
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jul 4, 2019

📌 Commit a04c65c has been approved by matthewjasper

@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 Jul 4, 2019
Centril added a commit to Centril/rust that referenced this pull request Jul 5, 2019
@Centril
Rollup merge of rust-lang#62331 - wesleywiser:fix_early_return_leak, …
a2f696d 
…r=matthewjasper

Fix leak when early returning out of `box` syntax

Fixes rust-lang#62289

r? @matthewjasper
@Centril Centril mentioned this pull request Jul 5, 2019
Closed
@Centril
Copy link
Contributor

Centril commented Jul 5, 2019

Failed in #62399, @bors r- rollup=never

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 5, 2019
@wesleywiser wesleywiser force-pushed the fix_early_return_leak branch from a04c65c to ee59e32 Compare July 9, 2019 11:30
@wesleywiser
Copy link
Member Author

Rebased; all tests pass locally.

@bors r=matthewjasper

@bors
Copy link
Contributor

bors commented Jul 9, 2019

📌 Commit ee59e3230d0e82da28ef0de455a4a8d27dcbc66f has been approved by matthewjasper

@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 Jul 9, 2019
@matthewjasper
Copy link
Contributor

@bors r- failure was legit due to wasm using panic=abort.
You'll need to either add // ignore wasm32-bare or use an earlier pass such as SimplifyCfg-qualify-consts.after.

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 9, 2019
@wesleywiser
Copy link
Member Author

Gotcha. I guess I don't have a wasm environment setup locally? Are there docs anywhere I can read on setting that up? I don't see anything in the rustc guide.

@wesleywiser wesleywiser force-pushed the fix_early_return_leak branch from ee59e32 to 94dea76 Compare July 10, 2019 00:28
@wesleywiser
Copy link
Member Author

Added // ignore wasm32-bare

@matthewjasper
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jul 10, 2019

📌 Commit 94dea76a6d26f9d9d3ffc7706f5e55826d7366a8 has been approved by matthewjasper

@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 Jul 10, 2019
@bors
Copy link
Contributor

bors commented Jul 11, 2019

⌛ Testing commit 94dea76a6d26f9d9d3ffc7706f5e55826d7366a8 with merge 92c80c6be70b87babc655ab131fc20199cb3311d...

@bors
Copy link
Contributor

bors commented Jul 11, 2019

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 11, 2019
@wesleywiser wesleywiser force-pushed the fix_early_return_leak branch from 94dea76 to aabaf12 Compare July 12, 2019 00:12
@wesleywiser
Copy link
Member Author

@bors r=matthewjasper

@bors
Copy link
Contributor

bors commented Jul 14, 2019

📌 Commit aabaf12 has been approved by matthewjasper

@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 Jul 14, 2019
@bors
Copy link
Contributor

bors commented Jul 14, 2019

⌛ Testing commit aabaf12 with merge 03a68d6...

bors added a commit that referenced this pull request Jul 14, 2019
@bors
Auto merge of #62331 - wesleywiser:fix_early_return_leak, r=matthewja…
03a68d6 
…sper

Fix leak when early returning out of `box` syntax

Fixes #62289

r? @matthewjasper
@bors
Copy link
Contributor

bors commented Jul 14, 2019

☀️ Test successful - checks-azure, checks-travis, status-appveyor
Approved by: matthewjasper
Pushing 03a68d6 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 14, 2019
@bors bors merged commit aabaf12 into rust-lang:master Jul 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewjasper matthewjasper matthewjasper left review comments

Assignees

@matthewjasper matthewjasper

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Leak when returning out of box syntax
5 participants
@wesleywiser @matthewjasper @bors @Centril @rust-highfive