Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
This reverts commit a239419cc0.
This commit is contained in:
Josh Matthews 2017-05-16 17:37:22 -04:00
parent f87e362059
commit 5a82e8ffdd
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ports/cef/lib.rs
View file

@ -4,6 +4,7 @@
#![allow(non_camel_case_types)] #![allow(non_camel_case_types)]
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(core_intrinsics)]
#![feature(link_args)] #![feature(link_args)]
#[macro_use] #[macro_use]

4
ports/cef/stubs.rs
View file

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

6
ports/servo/main.rs
View file

@ -15,7 +15,7 @@
//! //!
//! [glutin]: https://github.com/tomaka/glutin //! [glutin]: https://github.com/tomaka/glutin
#![feature(start)] #![feature(start, core_intrinsics)]
#[cfg(target_os = "android")] #[cfg(target_os = "android")]
extern crate android_injected_glue; extern crate android_injected_glue;
@ -58,7 +58,7 @@ pub mod platform {
fn install_crash_handler() { fn install_crash_handler() {
use backtrace::Backtrace; use backtrace::Backtrace;
use sig::ffi::Sig; use sig::ffi::Sig;
use std::process::abort; use std::intrinsics::abort;
use std::thread; use std::thread;
fn handler(_sig: i32) { fn handler(_sig: i32) {
@ -67,8 +67,10 @@ fn install_crash_handler() {
.map(|n| format!(" for thread \"{}\"", n)) .map(|n| format!(" for thread \"{}\"", n))
.unwrap_or("".to_owned()); .unwrap_or("".to_owned());
println!("Stack trace{}\n{:?}", name, Backtrace::new()); println!("Stack trace{}\n{:?}", name, Backtrace::new());
unsafe {
abort(); abort();
} }
}
signal!(Sig::SEGV, handler); // handle segfaults signal!(Sig::SEGV, handler); // handle segfaults
signal!(Sig::ILL, handler); // handle stack overflow and unsupported CPUs signal!(Sig::ILL, handler); // handle stack overflow and unsupported CPUs