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

std: stop backtracing when the frames are full #53436

Merged
merged 1 commit into from
Aug 18, 2018
Merged

std: stop backtracing when the frames are full #53436

merged 1 commit into from
Aug 18, 2018

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Aug 16, 2018 •
edited
Loading

This is a defensive measure to mitigate the infinite unwind loop seen in #53372. That case will still repeatedly unwind __rust_try, but now it will at least stop when cx.frames is full.

r? @alexcrichton

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 16, 2018
@alexcrichton
Copy link
Member

@bors: r+

Nice find!

@bors
Copy link
Contributor

bors commented Aug 16, 2018

📌 Commit f4e8d57 has been approved by alexcrichton

@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 Aug 16, 2018
@bors
Copy link
Contributor

bors commented Aug 18, 2018

⌛ Testing commit f4e8d57 with merge 70404d2d93adebaadea3f0b05802f423d261f950...

@bors
Copy link
Contributor

bors commented Aug 18, 2018

💔 Test failed - status-appveyor

@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 Aug 18, 2018
@kennytm
Copy link
Member

kennytm commented Aug 18, 2018

@bors retry #52590

@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 Aug 18, 2018
@bors
Copy link
Contributor

bors commented Aug 18, 2018

⌛ Testing commit f4e8d57 with merge f034141...

bors added a commit that referenced this pull request Aug 18, 2018
@bors
Auto merge of #53436 - cuviper:trace_fn-stop, r=alexcrichton
f034141 
std: stop backtracing when the frames are full

This is a defensive measure to mitigate the infinite unwind loop seen in #53372.  That case will still repeatedly unwind `__rust_try`, but now it will at least stop when `cx.frames` is full.

r? @alexcrichton
@bors
Copy link
Contributor

bors commented Aug 18, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing f034141 to master...

@bors bors merged commit f4e8d57 into rust-lang:master Aug 18, 2018
@cuviper cuviper mentioned this pull request Aug 30, 2018
Closed
@cuviper cuviper deleted the trace_fn-stop branch March 27, 2019 22:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
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.
5 participants
@cuviper @alexcrichton @bors @kennytm @rust-highfive