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

From d6412126bcafb4a123aebe4f614e45d5d1064948 Mon Sep 17 00:00:00 2001
From: Maxime Chevalier-Boisvert <maximechevalierb@g...>
Date: Mon, 10 May 2021 19:43:30 -0400
Subject: Implement setivar with a plain old function call (#34)

* Implement setivar with a plain old function call

* Remove return
---
 vm_insnhelper.c |  6 ++++++
 yjit_codegen.c  | 30 ++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 298bb2edf8..d41bfeb66c 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -1365,6 +1365,12 @@ vm_setinstancevariable(const rb_iseq_t *iseq, VALUE obj, ID id, VALUE val, IVC i https://github.com/ruby/ruby/blob/trunk/vm_insnhelper.c#L1365
     vm_setivar(obj, id, val, iseq, ic, 0, 0);
 }
 
+void
+rb_vm_setinstancevariable(const rb_iseq_t *iseq, VALUE obj, ID id, VALUE val, IVC ic)
+{
+    vm_setinstancevariable(iseq, obj, id, val, ic);
+}
+
 static VALUE
 vm_throw_continue(const rb_execution_context_t *ec, VALUE err)
 {
diff --git a/yjit_codegen.c b/yjit_codegen.c
index e7910987c0..5e5b3b2f35 100644
--- a/yjit_codegen.c
+++ b/yjit_codegen.c
@@ -859,6 +859,7 @@ enum { https://github.com/ruby/ruby/blob/trunk/yjit_codegen.c#L859
     SEND_MAX_DEPTH = 5,           // up to 5 different classes
 };
 
+/*
 // Codegen for setting an instance variable.
 // Preconditions:
 //   - receiver is in REG0
@@ -969,6 +970,7 @@ gen_set_ivar(jitstate_t *jit, ctx_t *ctx, const int max_chain_depth, VALUE compt https://github.com/ruby/ruby/blob/trunk/yjit_codegen.c#L970
     GEN_COUNTER_INC(cb, setivar_name_not_mapped);
     return YJIT_CANT_COMPILE;
 }
+*/
 
 // Codegen for getting an instance variable.
 // Preconditions:
@@ -1118,9 +1120,36 @@ gen_getinstancevariable(jitstate_t *jit, ctx_t *ctx) https://github.com/ruby/ruby/blob/trunk/yjit_codegen.c#L1120
     return gen_get_ivar(jit, ctx, GETIVAR_MAX_DEPTH, comptime_val, ivar_name, OPND_SELF, side_exit);
 }
 
+void rb_vm_setinstancevariable(const rb_iseq_t *iseq, VALUE obj, ID id, VALUE val, IVC ic);
+
 static codegen_status_t
 gen_setinstancevariable(jitstate_t* jit, ctx_t* ctx)
 {
+    ID id = (ID)jit_get_arg(jit, 0);
+    IVC ic = (IVC)jit_get_arg(jit, 1);
+
+    // Save the PC and SP because the callee may allocate
+    // Note that this modifies REG_SP, which is why we do it first
+    jit_save_pc(jit, REG0);
+    jit_save_sp(jit, ctx);
+
+    // Get the operands from the stack
+    x86opnd_t val_opnd = ctx_stack_pop(ctx, 1);
+
+    // Call rb_vm_setinstancevariable(iseq, obj, id, val, ic);
+    // Out of order because we're going to corrupt REG_SP and REG_CFP
+    yjit_save_regs(cb);
+    mov(cb, C_ARG_REGS[1], member_opnd(REG_CFP, rb_control_frame_t, self));
+    mov(cb, C_ARG_REGS[3], val_opnd);
+    mov(cb, C_ARG_REGS[2], imm_opnd(id));
+    mov(cb, C_ARG_REGS[4], const_ptr_opnd(ic));
+    jit_mov_gc_ptr(jit, cb, C_ARG_REGS[0], (VALUE)jit->iseq);
+    call_ptr(cb, REG0, (void *)rb_vm_setinstancevariable);
+    yjit_load_regs(cb);
+
+    return YJIT_KEEP_COMPILING;
+
+    /*
     // Defer compilation so we can specialize on a runtime `self`
     if (!jit_at_current_insn(jit)) {
         defer_compilation(jit->block, jit->insn_idx, ctx);
@@ -1142,6 +1171,7 @@ gen_setinstancevariable(jitstate_t* jit, ctx_t* ctx) https://github.com/ruby/ruby/blob/trunk/yjit_codegen.c#L1171
     jit_guard_known_klass(jit, ctx, comptime_val_klass, OPND_SELF, GETIVAR_MAX_DEPTH, side_exit);
 
     return gen_set_ivar(jit, ctx, GETIVAR_MAX_DEPTH, comptime_val, ivar_name, OPND_SELF, side_exit);
+    */
 }
 
 static void
-- 
cgit v1.2.1


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