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

From e2c1d69331a037b7c26508d69d6e1ed0f6e70961 Mon Sep 17 00:00:00 2001
From: Maxime Chevalier-Boisvert <maximechevalierb@g...>
Date: Fri, 7 May 2021 14:08:16 -0400
Subject: Implement opt_eq by calling interpreter function (#28)

---
 vm_insnhelper.c |  6 ++++++
 yjit_codegen.c  | 33 ++++++++++++++++++++++++++++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 772fa76ffd..ad228624a4 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -2033,6 +2033,12 @@ opt_equality_specialized(VALUE recv, VALUE obj) https://github.com/ruby/ruby/blob/trunk/vm_insnhelper.c#L2033
     return RBOOL(recv == obj);
 }
 
+VALUE
+rb_opt_equality_specialized(VALUE recv, VALUE obj)
+{
+    return opt_equality_specialized(recv, obj);
+}
+
 static VALUE
 opt_equality(const rb_iseq_t *cd_owner, VALUE recv, VALUE obj, CALL_DATA cd)
 {
diff --git a/yjit_codegen.c b/yjit_codegen.c
index 9d652a891a..12a9ff3553 100644
--- a/yjit_codegen.c
+++ b/yjit_codegen.c
@@ -1163,7 +1163,7 @@ gen_fixnum_cmp(jitstate_t* jit, ctx_t* ctx, cmov_fn cmov_op) https://github.com/ruby/ruby/blob/trunk/yjit_codegen.c#L1163
     // Check that both operands are fixnums
     guard_two_fixnums(ctx, side_exit);
 
-    // Get the operands and destination from the stack
+    // Get the operands from the stack
     x86opnd_t arg1 = ctx_stack_pop(ctx, 1);
     x86opnd_t arg0 = ctx_stack_pop(ctx, 1);
 
@@ -1205,6 +1205,36 @@ gen_opt_gt(jitstate_t* jit, ctx_t* ctx) https://github.com/ruby/ruby/blob/trunk/yjit_codegen.c#L1205
     return gen_fixnum_cmp(jit, ctx, cmovg);
 }
 
+VALUE rb_opt_equality_specialized(VALUE recv, VALUE obj);
+
+static codegen_status_t
+gen_opt_eq(jitstate_t* jit, ctx_t* ctx)
+{
+    uint8_t* side_exit = yjit_side_exit(jit, ctx);
+
+    // Get the operands from the stack
+    x86opnd_t arg1 = ctx_stack_pop(ctx, 1);
+    x86opnd_t arg0 = ctx_stack_pop(ctx, 1);
+
+    // Call rb_opt_equality_specialized(VALUE recv, VALUE obj)
+    // We know this method won't allocate or perform calls
+    yjit_save_regs(cb);
+    mov(cb, C_ARG_REGS[0], arg0);
+    mov(cb, C_ARG_REGS[1], arg1);
+    call_ptr(cb, REG0, (void *)rb_opt_equality_specialized);
+    yjit_load_regs(cb);
+
+    // If val == Qundef, bail to do a method call
+    cmp(cb, RAX, imm_opnd(Qundef));
+    je_ptr(cb, side_exit);
+
+    // Push the return value onto the stack
+    x86opnd_t stack_ret = ctx_stack_push(ctx, TYPE_IMM);
+    mov(cb, stack_ret, RAX);
+
+    return YJIT_KEEP_COMPILING;
+}
+
 static codegen_status_t gen_opt_send_without_block(jitstate_t *jit, ctx_t *ctx);
 
 static codegen_status_t
@@ -2453,6 +2483,7 @@ yjit_init_codegen(void) https://github.com/ruby/ruby/blob/trunk/yjit_codegen.c#L2483
     yjit_reg_op(BIN(opt_le), gen_opt_le);
     yjit_reg_op(BIN(opt_ge), gen_opt_ge);
     yjit_reg_op(BIN(opt_gt), gen_opt_gt);
+    yjit_reg_op(BIN(opt_eq), gen_opt_eq);
     yjit_reg_op(BIN(opt_aref), gen_opt_aref);
     yjit_reg_op(BIN(opt_and), gen_opt_and);
     yjit_reg_op(BIN(opt_or), gen_opt_or);
-- 
cgit v1.2.1


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