diff options
| author | Maxime Chevalier-Boisvert <maxime.chevalierboisvert@shopify.com> | 2022-08-11 13:26:30 -0400 |
|---|---|---|
| committer | Takashi Kokubun <takashikkbn@gmail.com> | 2022-08-29 08:47:10 -0700 |
| commit | c022a605401ccbc591640720a28c616cbaa19931 (patch) | |
| tree | 9e3cc1445a1aa7ae408674fd28134af6df92acbe | |
| parent | cb15886e612e17685e606f8b4f04301026f18b46 (diff) | |
Fix bugs in gen_opt_getinlinecache
| -rw-r--r-- | yjit/src/codegen.rs | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/yjit/src/codegen.rs b/yjit/src/codegen.rs index def3d38cbf..08806f84bf 100644 --- a/yjit/src/codegen.rs +++ b/yjit/src/codegen.rs @@ -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. |