std: Use backtrace-sys from crates.io #56836

alexcrichton · 2018-12-15T01:05:22Z

This commit switches the standard library to using the backtrace-sys
crate from crates.io instead of duplicating the logic here in the Rust
repositor with the backtrace-sys's crate's logic.

Eventually this will hopefully be a good step towards using the
backtrace crate directly from crates.io itself, but we're not quite
there yet! Hopefully this is a small incremental first step we can take.

rust-highfive · 2018-12-15T01:05:32Z

r? @nikomatsakis

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

Mark-Simulacrum

r=me, with or without the glob import

src/libstd/sys_common/gnu/libbacktrace.rs

petrochenkov · 2018-12-15T11:01:32Z

src/libstd/build.rs

@@ -79,67 +67,3 @@ fn main() {
        println!("cargo:rustc-link-lib=compiler_rt");
    }
 }
-
-fn build_libbacktrace(target: &str) -> Result<(), ()> {
-    let native = native_lib_boilerplate(


At least one drawback of this change is that backtrace-sys is no longer built once for all stages, but is built again for each stage.

True! Nowadays though it uses the cc crate instead of a configure script, so it's much faster. It's only 4-5 object files ish

alexcrichton · 2018-12-15T18:45:54Z

@bors: r=Mark-Simulacrum

bors · 2018-12-15T18:45:55Z

📌 Commit 77f2688671ce8b3276ad5db6ed4f63ba8e09b9c2 has been approved by Mark-Simulacrum

alexcrichton · 2018-12-15T20:06:44Z

@bors: r-

alexcrichton · 2018-12-17T19:11:25Z

@bors: r=Mark-Simulacrum

bors · 2018-12-17T19:11:26Z

📌 Commit 04c35c36e67d01d7bc737fda92f1d1c38bb4e954 has been approved by Mark-Simulacrum

nikomatsakis · 2018-12-17T20:56:16Z

r? @Mark-Simulacrum

bors · 2018-12-20T19:02:28Z

⌛ Testing commit 04c35c36e67d01d7bc737fda92f1d1c38bb4e954 with merge 71526eb9a88ebc954cfd41e216a6f270c503a9da...

bors · 2018-12-20T19:10:06Z

💔 Test failed - status-travis

bors · 2018-12-23T04:52:30Z

⌛ Testing commit d175cac7e2ab2ed0e391219ddb16fd067638fd44 with merge ea3e89bec278e1ff19938eaf00a9454dc9eb8cb2...

bors · 2018-12-23T05:44:06Z

💔 Test failed - status-travis

rust-highfive · 2018-12-23T05:44:08Z

The job wasm32-unknown of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

[00:49:14] [RUSTC-TIMING] libc test:false 0.104
[00:49:18] [RUSTC-TIMING] compiler_builtins test:false 3.385
[00:49:18]    Compiling alloc v0.0.0 (/checkout/src/liballoc)
[00:49:18]    Compiling rustc-demangle v0.1.10
[00:49:18] error[E0432]: unresolved imports `libc::c_void`, `libc::c_char`, `libc::c_int`, `libc::uintptr_t`
[00:49:18]   |
[00:49:18]   |
[00:49:18] 6 | use libc::{c_void, c_char, c_int, uintptr_t};
[00:49:18]   |            ^^^^^^  ^^^^^^  ^^^^^  ^^^^^^^^^ no `uintptr_t` in the root
[00:49:18]   |            |       |       no `c_int` in the root
[00:49:18]   |            |       no `c_char` in the root
[00:49:18]   |            no `c_void` in the root
[00:49:18] 
---
travis_time:end:1729dfa3:start=1545543838428127534,finish=1545543838436516227,duration=8388693
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:10a1fc24
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:01deeb10
travis_time:start:01deeb10
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:1ed2b2a1
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

alexcrichton · 2018-12-23T18:01:35Z

@bors: r=Mark-Simulacrum

bors · 2018-12-23T18:01:36Z

📌 Commit bfc8ed774cf4e442a9090d5d866020ff494b2b8d has been approved by Mark-Simulacrum

bors · 2018-12-24T10:04:01Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout std-backtrace-sys (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self std-backtrace-sys --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/libstd/lib.rs
Removing src/libbacktrace
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

bors · 2018-12-24T12:29:40Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout std-backtrace-sys (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self std-backtrace-sys --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/libstd/lib.rs
Removing src/libbacktrace
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

This commit switches the standard library to using the `backtrace-sys` crate from crates.io instead of duplicating the logic here in the Rust repositor with the `backtrace-sys`'s crate's logic. Eventually this will hopefully be a good step towards using the `backtrace` crate directly from crates.io itself, but we're not quite there yet! Hopefully this is a small incremental first step we can take.

alexcrichton · 2018-12-24T16:33:49Z

@bors: r=Mark-Simulacrum

bors · 2018-12-24T16:33:49Z

📌 Commit 8d50057 has been approved by Mark-Simulacrum

bors · 2018-12-24T23:28:12Z

⌛ Testing commit 8d50057 with merge ad781a0...

std: Use backtrace-sys from crates.io This commit switches the standard library to using the `backtrace-sys` crate from crates.io instead of duplicating the logic here in the Rust repositor with the `backtrace-sys`'s crate's logic. Eventually this will hopefully be a good step towards using the `backtrace` crate directly from crates.io itself, but we're not quite there yet! Hopefully this is a small incremental first step we can take.

bors · 2018-12-25T02:03:14Z

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing ad781a0 to master...

rust-highfive assigned nikomatsakis Dec 15, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 15, 2018

Mark-Simulacrum reviewed Dec 15, 2018

View reviewed changes

src/libstd/sys_common/gnu/libbacktrace.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

petrochenkov reviewed Dec 15, 2018

View reviewed changes

This comment has been minimized.

Sign in to view

alexcrichton force-pushed the std-backtrace-sys branch from a0b5ac1 to 77f2688 Compare December 15, 2018 18:45

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 Dec 15, 2018

This comment has been minimized.

Sign in to view

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 Dec 15, 2018

This comment has been minimized.

Sign in to view

alexcrichton force-pushed the std-backtrace-sys branch from 77f2688 to 04c35c3 Compare December 17, 2018 19:10

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 Dec 17, 2018

rust-highfive assigned Mark-Simulacrum and unassigned nikomatsakis Dec 17, 2018

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 Dec 20, 2018

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 23, 2018

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 Dec 23, 2018

kennytm 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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 23, 2018

alexcrichton force-pushed the std-backtrace-sys branch from d175cac to bfc8ed7 Compare December 23, 2018 18:01

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 Dec 23, 2018

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 Dec 24, 2018

alexcrichton force-pushed the std-backtrace-sys branch from bfc8ed7 to 8d50057 Compare December 24, 2018 16:33

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 Dec 24, 2018

bors merged commit 8d50057 into rust-lang:master Dec 25, 2018

bors mentioned this pull request Dec 25, 2018

Add dist builder for Armv8-M Mainline #56954

Merged

alexcrichton deleted the std-backtrace-sys branch March 12, 2019 20:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

std: Use backtrace-sys from crates.io #56836

std: Use backtrace-sys from crates.io #56836

alexcrichton commented Dec 15, 2018

rust-highfive commented Dec 15, 2018

Mark-Simulacrum left a comment

This comment has been minimized.

petrochenkov Dec 15, 2018

alexcrichton Dec 15, 2018

This comment has been minimized.

alexcrichton commented Dec 15, 2018

bors commented Dec 15, 2018

This comment has been minimized.

alexcrichton commented Dec 15, 2018

This comment has been minimized.

alexcrichton commented Dec 17, 2018

bors commented Dec 17, 2018

nikomatsakis commented Dec 17, 2018

bors commented Dec 20, 2018

bors commented Dec 20, 2018

bors commented Dec 23, 2018

bors commented Dec 23, 2018

rust-highfive commented Dec 23, 2018

alexcrichton commented Dec 23, 2018

bors commented Dec 23, 2018

bors commented Dec 24, 2018

bors commented Dec 24, 2018

alexcrichton commented Dec 24, 2018

bors commented Dec 24, 2018

bors commented Dec 24, 2018

bors commented Dec 25, 2018

std: Use backtrace-sys from crates.io #56836

std: Use backtrace-sys from crates.io #56836

Conversation

alexcrichton commented Dec 15, 2018

rust-highfive commented Dec 15, 2018

Mark-Simulacrum left a comment

Choose a reason for hiding this comment

This comment has been minimized.

petrochenkov Dec 15, 2018

Choose a reason for hiding this comment

alexcrichton Dec 15, 2018

Choose a reason for hiding this comment

This comment has been minimized.

alexcrichton commented Dec 15, 2018

bors commented Dec 15, 2018

This comment has been minimized.

alexcrichton commented Dec 15, 2018

This comment has been minimized.

alexcrichton commented Dec 17, 2018

bors commented Dec 17, 2018

nikomatsakis commented Dec 17, 2018

bors commented Dec 20, 2018

bors commented Dec 20, 2018

bors commented Dec 23, 2018

bors commented Dec 23, 2018

rust-highfive commented Dec 23, 2018

alexcrichton commented Dec 23, 2018

bors commented Dec 23, 2018

bors commented Dec 24, 2018

bors commented Dec 24, 2018

alexcrichton commented Dec 24, 2018

bors commented Dec 24, 2018

bors commented Dec 24, 2018

bors commented Dec 25, 2018