Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 09:15:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1507049 - Rename GeckoCrashOOL GeckoCrash. r=froydnj

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D18514

--HG--
extra : rebase_source : 914b4be6452a4a9a70b41281c0c5b0da7ee03921
extra : source : 7f11397ea19118d872f1f793f3d70985af994876
This commit is contained in:
Chris Peterson 2019-02-03 00:02:30 -08:00
parent cedea8a566
commit c032c54b84
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
toolkit/library/rust/shared/lib.rs
View File

@ -157,7 +157,7 @@ pub extern "C" fn intentional_panic(message: *const c_char) {
extern "C" {
// We can't use MOZ_Crash directly because it may be weakly linked
// to libxul, and rust can't handle that.
fn GeckoCrashOOL(filename: *const c_char, line: c_int, reason: *const c_char) -> !;
fn GeckoCrash(filename: *const c_char, line: c_int, reason: *const c_char) -> !;
}
/// Truncate a string at the closest unicode character boundary
@ -226,12 +226,12 @@ fn panic_hook(info: &panic::PanicInfo) {
};
// Copy the message and filename to the stack in order to safely add
// a terminating nul character (since rust strings don't come with one
// and GeckoCrashOOL wants one).
// and GeckoCrash wants one).
let message = ArrayCString::<[_; 512]>::from(message);
let filename = ArrayCString::<[_; 512]>::from(filename);
unsafe {
GeckoCrashOOL(filename.as_ptr() as *const c_char, line as c_int,
message.as_ptr() as *const c_char);
GeckoCrash(filename.as_ptr() as *const c_char, line as c_int,
message.as_ptr() as *const c_char);
}
}

4
toolkit/xre/nsAppRunner.cpp
View File

@ -5194,8 +5194,8 @@ void XRE_EnableSameExecutableForContentProc() {
extern "C" void GeckoHandleOOM(size_t size) { mozalloc_handle_oom(size); }
// Similarly, this wraps MOZ_Crash
extern "C" void GeckoCrashOOL(const char* aFilename, int aLine,
const char* aReason) {
extern "C" void GeckoCrash(const char* aFilename, int aLine,
const char* aReason) {
MOZ_Crash(aFilename, aLine, aReason);
}