Skip to content

Commit

Permalink
Auto merge of #45866 - JohnColanduoni:issue-45731, r=alexcrichton
Browse files Browse the repository at this point in the history
Disable `mmap`  in `libbacktrace` on Apple platforms

Fixes #45731

libbacktrace uses mmap if available to map ranges of the files containing debug information. On macOS `mmap` will succeed even if the mapped range does not exist, and a SIGBUS (with an unusual EXC_BAD_ACCESS code 10) will occur when the program attempts to page in the memory. To combat this we force `libbacktrace` to be built with the simple `read` based fallback on Apple platforms.
  • Loading branch information
bors committed Nov 8, 2017
2 parents 4bb96f6 + 8581b59 commit 6e29774
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/libbacktrace/configure
Original file line number Diff line number Diff line change
Expand Up @@ -12323,6 +12323,12 @@ fi
fi
fi
case "${host_os}" in
darwin*)
have_mmap=no ;;
esac
if test "$have_mmap" = "no"; then
VIEW_FILE=read.lo
ALLOC_FILE=alloc.lo
Expand Down
6 changes: 6 additions & 0 deletions src/libbacktrace/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,12 @@ else
AC_CHECK_FUNC(mmap, [have_mmap=yes], [have_mmap=no])
fi
fi

case "${host_os}" in
darwin*)
have_mmap=no ;;
esac

if test "$have_mmap" = "no"; then
VIEW_FILE=read.lo
ALLOC_FILE=alloc.lo
Expand Down
34 changes: 34 additions & 0 deletions src/test/run-pass/issue-45731.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// compile-flags:--test -g

use std::{env, panic, fs};

#[cfg(target_os = "macos")]
#[test]
fn simple_test() {
// Find our dSYM and replace the DWARF binary with an empty file
let mut dsym_path = env::current_exe().unwrap();
let executable_name = dsym_path.file_name().unwrap().to_str().unwrap().to_string();
assert!(dsym_path.pop()); // Pop executable
dsym_path.push(format!("{}.dSYM/Contents/Resources/DWARF/{0}", executable_name));
{
let file = fs::OpenOptions::new().read(false).write(true).truncate(true).create(false)
.open(&dsym_path).unwrap();
}

env::set_var("RUST_BACKTRACE", "1");

// We don't need to die of panic, just trigger a backtrace
let _ = panic::catch_unwind(|| {
assert!(false);
});
}

0 comments on commit 6e29774

Please sign in to comment.