Skip to content

/rust

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.

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

Improve cleaning of the bottom of the backtrace #41815

Merged
merged 1 commit into from May 10, 2017

Conversation

Reviewers

@alexcrichton alexcrichton

Assignees

@alexcrichton alexcrichton

Labels
S-waiting-on-review T-libs
Projects
None yet
Milestone
No milestone
6 participants
@Yamakaky @rust-highfive @alexcrichton @bors @brson @carols10cents
@Yamakaky
Copy link
Contributor

Yamakaky commented May 7, 2017 •
edited

Following #40264. It only cleans the bottom of the trace (after the main). It handles correctly the normal main, tests, benchmarks and threads.

I kept skipped_before since it will be used later for the cleaning of the top.

@rust-highfive rust-highfive assigned brson May 7, 2017

@rust-highfive

This comment has been minimized.

Sign in to view
Copy link
Collaborator

rust-highfive commented May 7, 2017

r? @brson

(rust_highfive has picked a reviewer for you, use r? to override)
@Yamakaky

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

Yamakaky commented May 7, 2017

r? @alexcrichton

@rust-highfive rust-highfive assigned alexcrichton and unassigned brson May 7, 2017

@carols10cents carols10cents added the S-waiting-on-review label May 8, 2017

@alexcrichton

alexcrichton reviewed May 8, 2017
View changes

Copy link
Member

alexcrichton left a comment

Looks good! Could a test be added for this as well?
src/libstd/sys_common/backtrace.rs Outdated
@@ -122,7 +158,7 @@ pub fn log_enabled() -> Option<PrintFormat> {
}

let val = match env::var_os("RUST_BACKTRACE") {
Some(x) => if &x == "0" {
Some(x) => if &x == "0" || &x == "" {

This comment has been minimized.

Sign in to view
Copy link
@alexcrichton

alexcrichton May 8, 2017

Member

Perhaps we could hold off on changing the interpretation of RUST_BACKTRACE for now? I'm wary to add more and more cases for positive/negative intepretation.

This comment has been minimized.

Sign in to view
Copy link
@Yamakaky

Yamakaky May 9, 2017

Author Contributor

OK
src/libstd/sys_common/backtrace.rs
let _ = resolve_symname(*frame, |symname| {
if let Some(mangled_symbol_name) = symname {
// Use grep to find the concerned functions
if mangled_symbol_name.contains("__rust_begin_short_backtrace") {

This comment has been minimized.

Sign in to view
Copy link
@alexcrichton

alexcrichton May 8, 2017

Member

This should have a deterministic symbol name, right? Would it be possible to use == here?

This comment has been minimized.

Sign in to view
Copy link
@Yamakaky

Yamakaky May 9, 2017

Author Contributor

Well, we switched to a polymorphic function so we can't really do that https://github.com/Yamakaky/rust/blob/e995a17b5a7d31641b85fcf414a52c5330fff186/src/libstd/sys_common/backtrace.rs#L133

This comment has been minimized.

Sign in to view
Copy link
@alexcrichton

alexcrichton May 9, 2017

Member

Ah yes right, that's a good point.
@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member

alexcrichton commented May 9, 2017

Ok looks good to me! Want to squash and I'll r+?
@Yamakaky

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

Yamakaky commented May 9, 2017

Yeay !
@Yamakaky
Don't show the std frames before user code on unwinding. 
When `RUST_BACKTRACE=1`, remove all frames after
`__rust_maybe_catch_panic`. Tested on `main`, threads, tests and
benches. Cleaning of the top of the stacktrace is let to a future PR.

Fixes #40201

See #41815
Verified
This commit was signed with a verified signature.
@Yamakaky Yamakaky Yamakaky
GPG key ID: 1F5120C66C0B64F7 Learn about signing commits
Loading status checks…
ca8b754

@Yamakaky Yamakaky force-pushed the Yamakaky:improve-backtrace-bottom branch from 7b41ca0 to ca8b754 May 9, 2017

@Yamakaky

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

Yamakaky commented May 9, 2017

(not really proud of the commit's title ^^)
@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member

alexcrichton commented May 9, 2017

@bors: r+
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented May 9, 2017

📌 Commit ca8b754 has been approved by alexcrichton

@alexcrichton alexcrichton added the T-libs label May 9, 2017

@Yamakaky Yamakaky referenced this pull request May 9, 2017

Closed

[minor] replace libtest/lib.rs:FnBox by std::boxed::FnBox #41810

frewsxcv added a commit to frewsxcv/rust that referenced this pull request May 10, 2017

@frewsxcv
Rollup merge of rust-lang#41815 - Yamakaky:improve-backtrace-bottom, … 
…r=alexcrichton

Improve cleaning of the bottom of the backtrace

Following rust-lang#40264. It only cleans the bottom of the trace (after the main). It handles correctly the normal main, tests, benchmarks and threads.

I kept `skipped_before` since it will be used later for the cleaning of the top.
90d9468

@frewsxcv frewsxcv referenced this pull request May 10, 2017

Closed

Rollup of 11 pull requests #41869

bors added a commit that referenced this pull request May 10, 2017

@bors
Auto merge of #41869 - frewsxcv:rollup, r=frewsxcv 
Rollup of 11 pull requests

- Successful merges: #41531, #41536, #41659, #41684, #41764, #41815, #41843, #41861, #41862, #41863, #41864
- Failed merges:
Loading status checks…
0035c39

frewsxcv added a commit to frewsxcv/rust that referenced this pull request May 10, 2017

@frewsxcv
Rollup merge of rust-lang#41815 - Yamakaky:improve-backtrace-bottom, … 
…r=alexcrichton

Improve cleaning of the bottom of the backtrace

Following rust-lang#40264. It only cleans the bottom of the trace (after the main). It handles correctly the normal main, tests, benchmarks and threads.

I kept `skipped_before` since it will be used later for the cleaning of the top.
8078fdb

@frewsxcv frewsxcv referenced this pull request May 10, 2017

Closed

Rollup of 9 pull requests #41872

bors added a commit that referenced this pull request May 10, 2017

@bors
Auto merge of #41872 - frewsxcv:rollup, r=frewsxcv 
Rollup of 9 pull requests

- Successful merges: #41531, #41536, #41764, #41809, #41815, #41861, #41862, #41863, #41864
- Failed merges:
Loading status checks…
97ab5eb
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented May 10, 2017

⌛️ Testing commit ca8b754 with merge 25a1617...

bors added a commit that referenced this pull request May 10, 2017

@bors
Auto merge of #41815 - Yamakaky:improve-backtrace-bottom, r=alexcrichton 
Improve cleaning of the bottom of the backtrace

Following #40264. It only cleans the bottom of the trace (after the main). It handles correctly the normal main, tests, benchmarks and threads.

I kept `skipped_before` since it will be used later for the cleaning of the top.
Loading status checks…
25a1617
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented May 10, 2017

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

@bors bors merged commit ca8b754 into rust-lang:master May 10, 2017
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details

@Yamakaky Yamakaky deleted the Yamakaky:improve-backtrace-bottom branch May 10, 2017

@SimonSapin SimonSapin referenced this pull request Jan 14, 2018

Open

Short backtrace have regressed #47429

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.