diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2018-10-01 22:54:20 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2018-10-01 22:55:59 -0700 |
| commit | 74c1e44746a7d9c810f095177af88b7dbaafd3e3 (patch) | |
| tree | c132fa6494b98a8374eaca66722eb8267999a9f5 /src/rust/Cargo.lock | |
| parent | 6ebb2c46d5eae7bae8d827fdc68d3ed58b16e95a (diff) | |
| download | tor-74c1e44746a7d9c810f095177af88b7dbaafd3e3.tar.gz tor-74c1e44746a7d9c810f095177af88b7dbaafd3e3.zip | |
Fix segfaults related to sanitizers+jemalloc
It looks to be the case that Rust's standard allocator, jemalloc, is
incompatible with sanitizers. The incompatibility, for whatever reason,
seems to cause segfaults at runtime when jemalloc is linked with
sanitizers.
Without actually trying to figure out what's going on here this commit
instead takes the hammer of "let's remove jemalloc when testing". The
`tor_allocate` crate now by default switches to the system allocator
(eventually this will want to be the tor allocator). Most crates then
link to `tor_allocate` ot pick this up, but the `smartlist` crate had to
manually switch to the system allocator in testing and the `external`
crate had to be sure to link to `tor_allocate`.
The final gotcha here is that this patch also switches to
unconditionally passing `--target` to Cargo. For weird and arcane
reasons passing `--target` with the host target of the compiler (which
Cargo otherwise uses as the default) is different than not passing
`--target` at all. This ensure that our custom `RUSTFLAGS` with
sanitizer options doesn't make its way into build scripts, just the
final testing artifacts.
Diffstat (limited to 'src/rust/Cargo.lock')
| -rw-r--r-- | src/rust/Cargo.lock | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock index 1d2a7359aa..7d6a6635c5 100644 --- a/src/rust/Cargo.lock +++ b/src/rust/Cargo.lock @@ -26,6 +26,7 @@ version = "0.0.1" dependencies = [ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", "smartlist 0.0.1", + "tor_allocate 0.0.1", ] [[package]] |