Skip to content
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

Revert "Replace intrinsics::abort with process::abort" #16899

Merged
merged 2 commits into from May 17, 2017
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

@@ -4,6 +4,7 @@

#![allow(non_camel_case_types)]
#![feature(box_syntax)]
#![feature(core_intrinsics)]
#![feature(link_args)]

#[macro_use]
@@ -12,7 +12,9 @@ macro_rules! stub(
#[allow(non_snake_case)]
pub extern "C" fn $name() {
println!("CEF stub function called: {}", stringify!($name));
::std::process::abort()
unsafe {
::std::intrinsics::abort()
}
}
)
);
@@ -15,7 +15,7 @@
//!
//! [glutin]: https://github.com/tomaka/glutin

#![feature(start)]
#![feature(start, core_intrinsics)]

#[cfg(target_os = "android")]
extern crate android_injected_glue;
@@ -58,7 +58,7 @@ pub mod platform {
fn install_crash_handler() {
use backtrace::Backtrace;
use sig::ffi::Sig;
use std::process::abort;
use std::intrinsics::abort;
use std::thread;

fn handler(_sig: i32) {
@@ -67,7 +67,11 @@ fn install_crash_handler() {
.map(|n| format!(" for thread \"{}\"", n))
.unwrap_or("".to_owned());
println!("Stack trace{}\n{:?}", name, Backtrace::new());
abort();
unsafe {
// N.B. Using process::abort() here causes the crash handler to be
// triggered recursively.
abort();
}
}

signal!(Sig::SEGV, handler); // handle segfaults
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.