Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

update backtrace crate #69729

Merged
merged 2 commits into from
Mar 21, 2020
Merged

update backtrace crate #69729

merged 2 commits into from
Mar 21, 2020

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Mar 5, 2020

In particular this release includes rust-lang/backtrace-rs#297 and rust-lang/backtrace-rs#300.

@JohnTitor JohnTitor added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 5, 2020
@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Mar 5, 2020

📌 Commit 22ee27b has been approved by Mark-Simulacrum

@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 Mar 5, 2020
Centril added a commit to Centril/rust that referenced this pull request Mar 9, 2020
@Centril
Copy link
Contributor

Centril commented Mar 9, 2020

Speculatively assigning blame for #69845 (comment) to this PR, @bors r-

@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 Mar 9, 2020
@RalfJung
Copy link
Member Author

RalfJung commented Mar 9, 2020

@alexcrichton looks like a macOS-only failure in this test:

2020-03-09T07:42:04.2805000Z failures:
2020-03-09T07:42:04.2805130Z 
2020-03-09T07:42:04.2805750Z ---- [ui] ui/issues/issue-45731.rs stdout ----
2020-03-09T07:42:04.2805970Z 
2020-03-09T07:42:04.2806160Z error: test run failed!
2020-03-09T07:42:04.2806440Z status: signal: 10
2020-03-09T07:42:04.2807260Z command: "/Users/runner/runners/2.165.0/work/1/s/build/x86_64-apple-darwin/test/ui/issues/issue-45731/a"
2020-03-09T07:42:04.2807650Z stdout:
2020-03-09T07:42:04.2808250Z ------------------------------------------
2020-03-09T07:42:04.2808460Z 
2020-03-09T07:42:04.2808630Z running 1 test
2020-03-09T07:42:04.2808770Z 
2020-03-09T07:42:04.2809300Z ------------------------------------------
2020-03-09T07:42:04.2809560Z stderr:
2020-03-09T07:42:04.2810110Z ------------------------------------------
2020-03-09T07:42:04.2810310Z 
2020-03-09T07:42:04.2810840Z ------------------------------------------
2020-03-09T07:42:04.2811070Z 
2020-03-09T07:42:04.2811180Z 
2020-03-09T07:42:04.2811290Z 
2020-03-09T07:42:04.2811450Z failures:
2020-03-09T07:42:04.2811980Z     [ui] ui/issues/issue-45731.rs

This PR lands in particular rust-lang/backtrace-rs#300, which seems to do something with macOS symbol resolution. Here's the total libbacktrace diff.

"signal: 10" looks exactly like #45731 is back.

@RalfJung
Copy link
Member Author

RalfJung commented Mar 9, 2020

Hm, or maybe given that the fix back then was to disable mmap, maybe the issue is rust-lang/backtrace-rs#298. Cc @Aaron1011

@Aaron1011
Copy link
Member

Aaron1011 commented Mar 9, 2020

@RalfJung: I find it odd that the OSX tests passed for my backtrace-rs PR. There doesn't seem to be anything special about the failing test (other than the fact that it panics) as far as I can tell.

EDIT: It looks like mmap was explicitly disabled on on macOS in the past - I think we just need to add it to the build.rs in backtrace-rs.

@RalfJung
Copy link
Member Author

RalfJung commented Mar 9, 2020

Well, the test truncates some dSYM file. Maybe the backtrace crate does not do that.

And yes, that's what I said above -- mmap was disabled on macOS precisely because of "signal 10 SIGBUS", and your PR probably re-enabled the macOS mmap implementation.

@Aaron1011
Copy link
Member

@RalfJung: Ooos, I didn't see the link in your previous comment.

@RalfJung
Copy link
Member Author

@Aaron1011 so your proposal is to extend this check to also include macos targets?

if target.contains("windows") || target.contains("macos") {

@RalfJung
Copy link
Member Author

upstream PR by @Aaron1011 already landed: rust-lang/backtrace-rs#302

@RalfJung RalfJung added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 10, 2020
@RalfJung
Copy link
Member Author

@Mark-Simulacrum I bumped backtrace-sys, I think this is good to go again.

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Mar 10, 2020

📌 Commit 9552d2e has been approved by Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Mar 10, 2020

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 10, 2020
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 10, 2020
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Mar 14, 2020
@Dylan-DPC-zz
Copy link

@bors p=1

@bors
Copy link
Contributor

bors commented Mar 21, 2020

⌛ Testing commit 9552d2e with merge 38114ff...

@bors
Copy link
Contributor

bors commented Mar 21, 2020

☀️ Test successful - checks-azure
Approved by: Mark-Simulacrum
Pushing 38114ff to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 21, 2020
@bors bors merged commit 38114ff into rust-lang:master Mar 21, 2020
@RalfJung RalfJung deleted the backtrace branch March 22, 2020 09:30
# for free to join this conversation on GitHub. Already have an account? # to comment
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
Development

Successfully merging this pull request may close these issues.

7 participants