1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

YJIT: Pass panic message to rb_bug()

Browse Source 
So that the Rust panic message is forwarded to the RUBY_CRASH_REPORT
system, instead of only the static "YJIT panicked" message done so
previously. This helps with triaging crashes since it's easier than
trying to parse stderr output.

Sample:

    <internal:yjit_hook>:2: [BUG] YJIT: panicked at src/codegen.rs:1197:5:
    explicit panic
    ...
This commit is contained in:
Alan Wu 2024-11-07 11:46:35 -05:00
parent fbe35bcc82
commit d1969474e9
Notes: git 2024-11-08 15:07:06 +00:00 
Merged: https://github.com/ruby/ruby/pull/12027
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
yjit/src/yjit.rs
View File

@ -7,7 +7,7 @@ use crate::stats::YjitExitLocations;
use crate::stats::incr_counter; use crate::stats::incr_counter;
use crate::stats::with_compile_time; use crate::stats::with_compile_time;
use std::os::raw; use std::os::raw::{c_char, c_int};
use crate::log::Log; use crate::log::Log;
/// Is YJIT on? The interpreter uses this variable to decide whether to trigger /// Is YJIT on? The interpreter uses this variable to decide whether to trigger
@ -19,7 +19,7 @@ pub static mut rb_yjit_enabled_p: bool = false;
/// Parse one command-line option. /// Parse one command-line option.
/// This is called from ruby.c /// This is called from ruby.c
#[no_mangle] #[no_mangle]
pub extern "C" fn rb_yjit_parse_option(str_ptr: *const raw::c_char) -> bool { pub extern "C" fn rb_yjit_parse_option(str_ptr: *const c_char) -> bool {
return parse_option(str_ptr).is_some(); return parse_option(str_ptr).is_some();
} }
@ -102,7 +102,10 @@ fn rb_bug_panic_hook() {
env::set_var("RUST_BACKTRACE", "1"); env::set_var("RUST_BACKTRACE", "1");
previous_hook(panic_info); previous_hook(panic_info);
unsafe { rb_bug(b"YJIT panicked\0".as_ref().as_ptr() as *const raw::c_char); } // Abort with rb_bug(). It has a length limit on the message.
let panic_message = &format!("{}", panic_info)[..];
let len = std::cmp::min(0x100, panic_message.len()) as c_int;
unsafe { rb_bug(b"YJIT: %*s\0".as_ref().as_ptr() as *const c_char, len, panic_message.as_ptr()); }
})); }));
} }