archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 09:04:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

ZJIT: Mark the code region executable on partial failures (#13937)

Browse source
This commit is contained in:
Takashi Kokubun 2025-07-17 11:39:03 -07:00 • committed by GitHub
parent 815eb58fce
commit ff77473acb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
zjit/src/codegen.rs
View file

@ -96,8 +96,22 @@ pub extern "C" fn rb_zjit_iseq_gen_entry_point(iseq: IseqPtr, _ec: EcPtr) -> *co
code_ptr code_ptr
} }
/// Compile an entry point for a given ISEQ /// See [gen_iseq_entry_point_body]. This wrapper is to make sure cb.mark_all_executable()
/// is called even if gen_iseq_entry_point_body() partially fails and returns a null pointer.
fn gen_iseq_entry_point(iseq: IseqPtr) -> *const u8 { fn gen_iseq_entry_point(iseq: IseqPtr) -> *const u8 {
let cb = ZJITState::get_code_block();
let code_ptr = gen_iseq_entry_point_body(cb, iseq);
// Always mark the code region executable if asm.compile() has been used.
// We need to do this even if code_ptr is null because, even if gen_entry()
// or gen_iseq() fails, gen_function() has used asm.compile().
cb.mark_all_executable();
code_ptr
}
/// Compile an entry point for a given ISEQ
fn gen_iseq_entry_point_body(cb: &mut CodeBlock, iseq: IseqPtr) -> *const u8 {
// Compile ISEQ into High-level IR // Compile ISEQ into High-level IR
let function = match compile_iseq(iseq) { let function = match compile_iseq(iseq) {
Some(function) => function, Some(function) => function,
@ -105,7 +119,6 @@ fn gen_iseq_entry_point(iseq: IseqPtr) -> *const u8 {
}; };
// Compile the High-level IR // Compile the High-level IR
let cb = ZJITState::get_code_block();
let (start_ptr, mut branch_iseqs) = match gen_function(cb, iseq, &function) { let (start_ptr, mut branch_iseqs) = match gen_function(cb, iseq, &function) {
Some((start_ptr, gc_offsets, jit)) => { Some((start_ptr, gc_offsets, jit)) => {
// Remember the block address to reuse it later // Remember the block address to reuse it later
@ -137,9 +150,6 @@ fn gen_iseq_entry_point(iseq: IseqPtr) -> *const u8 {
} }
} }
// Always mark the code region executable if asm.compile() has been used
cb.mark_all_executable();
// Return a JIT code address or a null pointer // Return a JIT code address or a null pointer
start_ptr.map(|start_ptr| start_ptr.raw_ptr(cb)).unwrap_or(std::ptr::null()) start_ptr.map(|start_ptr| start_ptr.raw_ptr(cb)).unwrap_or(std::ptr::null())
} }