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

Fix bugs in gen_opt_getinlinecache

Browse Source
This commit is contained in:
Maxime Chevalier-Boisvert 2022-08-11 13:26:30 -04:00 committed by Takashi Kokubun
parent cb15886e61
commit c022a60540
No known key found for this signature in database
GPG Key ID: 6FFC433B12EE23DD
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
yjit/src/codegen.rs
View File

@ -5497,11 +5497,12 @@ fn gen_opt_getinlinecache(
// to invalidate this block from yjit_constant_ic_update().
jit_ensure_block_entry_exit(jit, ocb);
let inline_cache = Opnd::const_ptr(ic as *const u8);
if !unsafe { (*ice).ic_cref }.is_null() {
// Cache is keyed on a certain lexical scope. Use the interpreter's cache.
let side_exit = get_side_exit(jit, ocb, ctx);
let inline_cache = asm.load(Opnd::const_ptr(ic as *const u8));
// Call function to verify the cache. It doesn't allocate or call methods.
let ret_val = asm.ccall(
rb_vm_ic_hit_p as *const u8,
@ -5512,20 +5513,23 @@ fn gen_opt_getinlinecache(
asm.test(ret_val, ret_val);
asm.jz(counted_exit!(ocb, side_exit, opt_getinlinecache_miss).into());
let inline_cache_entry = Opnd::mem(
let inline_cache = asm.load(Opnd::const_ptr(ic as *const u8));
let ic_entry = asm.load(Opnd::mem(
64,
inline_cache,
RUBY_OFFSET_IC_ENTRY
);
let inline_cache_entry_val = Opnd::mem(
));
let ic_entry_val = asm.load(Opnd::mem(
64,
inline_cache_entry,
ic_entry,
RUBY_OFFSET_ICE_VALUE
);
));
// Push ic->entry->value
let stack_top = ctx.stack_push(Type::Unknown);
asm.mov(stack_top, inline_cache_entry_val);
asm.store(stack_top, ic_entry_val);
} else {
// Optimize for single ractor mode.
// FIXME: This leaks when st_insert raises NoMemoryError
@ -5554,7 +5558,6 @@ fn gen_opt_getinlinecache(
EndBlock
}
// Push the explicit block parameter onto the temporary stack. Part of the
// interpreter's scheme for avoiding Proc allocations when delegating
// explicit block parameters.