Skip to content

Fix leak when early returning out of box syntax - #62331

Merged
bors merged 1 commit into
rust-lang:masterfrom
wesleywiser:fix_early_return_leak
Jul 14, 2019
Merged

Fix leak when early returning out of box syntax#62331
bors merged 1 commit into
rust-lang:masterfrom
wesleywiser:fix_early_return_leak

Conversation

@wesleywiser

@wesleywiserwesleywiser commented Jul 3, 2019

Copy link
Copy Markdown
Member

@rust-highfiverust-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
Comment threadsrc/test/mir-opt/issue-62289.rs Outdated
Comment threadsrc/test/mir-opt/issue-62289.rs Outdated
@wesleywiser
wesleywiserforce-pushed the fix_early_return_leak branch from 676c44f to a04c65cCompareJuly 4, 2019 14:23
@wesleywiser

wesleywiser commented Jul 4, 2019

Copy link
Copy Markdown
MemberAuthor

@matthewjasper Fixed!

@matthewjasper

matthewjasper commented Jul 4, 2019

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Jul 4, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit a04c65c has been approved by matthewjasper

@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 Jul 4, 2019
Centril added a commit to Centril/rust that referenced this pull request Jul 5, 2019
@Centril
Rollup merge ofrust-lang#62331- wesleywiser:fix_early_return_leak, …
a2f696d
…r=matthewjasper
Fix leak when early returning out of `box` syntax
Fixesrust-lang#62289
r? @matthewjasper
@CentrilCentril mentioned this pull request Jul 5, 2019
Closed
@Centril

Centril commented Jul 5, 2019

Copy link
Copy Markdown
Contributor

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

@borsbors 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
wesleywiserforce-pushed the fix_early_return_leak branch from a04c65c to ee59e32CompareJuly 9, 2019 11:30
@wesleywiser

wesleywiser commented Jul 9, 2019

Copy link
Copy Markdown
MemberAuthor

Rebased; all tests pass locally.

@bors r=matthewjasper

@bors

bors commented Jul 9, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit ee59e3230d0e82da28ef0de455a4a8d27dcbc66f has been approved by matthewjasper

@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 9, 2019
@matthewjasper

matthewjasper commented Jul 9, 2019

Copy link
Copy Markdown
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.

@borsbors 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

wesleywiser commented Jul 9, 2019

Copy link
Copy Markdown
MemberAuthor

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
wesleywiserforce-pushed the fix_early_return_leak branch from ee59e32 to 94dea76CompareJuly 10, 2019 00:28
@wesleywiser

wesleywiser commented Jul 10, 2019

Copy link
Copy Markdown
MemberAuthor

Added // ignore wasm32-bare

@matthewjasper

matthewjasper commented Jul 10, 2019

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jul 10, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 94dea76a6d26f9d9d3ffc7706f5e55826d7366a8 has been approved by matthewjasper

@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 10, 2019
@bors

bors commented Jul 11, 2019

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Jul 11, 2019

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-azure

@borsbors 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
matthewjasper
matthewjasper reviewed Jul 11, 2019
View reviewed changes
Comment threadsrc/test/mir-opt/issue-62289.rs Outdated
@wesleywiser
wesleywiserforce-pushed the fix_early_return_leak branch from 94dea76 to aabaf12CompareJuly 12, 2019 00:12
@wesleywiser

wesleywiser commented Jul 14, 2019

Copy link
Copy Markdown
MemberAuthor

@bors r=matthewjasper

@bors

bors commented Jul 14, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit aabaf12 has been approved by matthewjasper

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

bors commented Jul 14, 2019

Copy link
Copy Markdown
Collaborator

⌛ 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

bors commented Jul 14, 2019

Copy link
Copy Markdown
Collaborator

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

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

Reviewers

@matthewjaspermatthewjaspermatthewjasper left review comments

Assignees

@matthewjaspermatthewjasper

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: 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