https://git.ruby-lang.org/ruby.git/commit/?id=c022a60540

From c022a605401ccbc591640720a28c616cbaa19931 Mon Sep 17 00:00:00 2001
From: Maxime Chevalier-Boisvert <maxime.chevalierboisvert@s...>
Date: Thu, 11 Aug 2022 13:26:30 -0400
Subject: Fix bugs in gen_opt_getinlinecache

---
 yjit/src/codegen.rs | 19 +++++++++++--------
 1 file 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( https://github.com/ruby/ruby/blob/trunk/yjit/src/codegen.rs#L5497
     // 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( https://github.com/ruby/ruby/blob/trunk/yjit/src/codegen.rs#L5513
         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( https://github.com/ruby/ruby/blob/trunk/yjit/src/codegen.rs#L5558
     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.
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/