Implement opt_aset as interpreter handler call

maximecb · XrXr · commit 0c3842d15418 · 2021-10-20T18:19:35.000-04:00
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
@@ -5193,6 +5193,12 @@ vm_opt_aset(VALUE recv, VALUE obj, VALUE set)
     }
 }
 
+VALUE
+rb_vm_opt_aset(VALUE recv, VALUE obj, VALUE set)
+{
+    return vm_opt_aset(recv, obj, set);
+}
+
 static VALUE
 vm_opt_aref_with(VALUE recv, VALUE key)
 {
diff --git a/yjit_codegen.c b/yjit_codegen.c
@@ -1402,6 +1402,42 @@ gen_opt_aref(jitstate_t *jit, ctx_t *ctx)
     }
 }
 
+VALUE rb_vm_opt_aset(VALUE recv, VALUE obj, VALUE set);
+
+static codegen_status_t
+gen_opt_aset(jitstate_t *jit, ctx_t *ctx)
+{
+    // 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);
+
+    uint8_t* side_exit = yjit_side_exit(jit, ctx);
+
+    // Get the operands from the stack
+    x86opnd_t arg2 = ctx_stack_pop(ctx, 1);
+    x86opnd_t arg1 = ctx_stack_pop(ctx, 1);
+    x86opnd_t arg0 = ctx_stack_pop(ctx, 1);
+
+    // Call rb_vm_opt_mod(VALUE recv, VALUE obj)
+    yjit_save_regs(cb);
+    mov(cb, C_ARG_REGS[0], arg0);
+    mov(cb, C_ARG_REGS[1], arg1);
+    mov(cb, C_ARG_REGS[2], arg2);
+    call_ptr(cb, REG0, (void *)rb_vm_opt_aset);
+    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_UNKNOWN);
+    mov(cb, stack_ret, RAX);
+
+    return YJIT_KEEP_COMPILING;
+}
+
 static codegen_status_t
 gen_opt_and(jitstate_t* jit, ctx_t* ctx)
 {
@@ -2533,6 +2569,7 @@ yjit_init_codegen(void)
     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_aset), gen_opt_aset);
     yjit_reg_op(BIN(opt_and), gen_opt_and);
     yjit_reg_op(BIN(opt_or), gen_opt_or);
     yjit_reg_op(BIN(opt_minus), gen_opt_minus);

Original file line number	Diff line number	Diff line change
`@@ -5193,6 +5193,12 @@ vm_opt_aset(VALUE recv, VALUE obj, VALUE set)`
`5193`	`5193`	`}`
`5194`	`5194`	`}`
`5195`	`5195`
	`5196`	`+VALUE`
	`5197`	`+rb_vm_opt_aset(VALUE recv, VALUE obj, VALUE set)`
	`5198`	`+{`
	`5199`	`+ return vm_opt_aset(recv, obj, set);`
	`5200`	`+}`
	`5201`	`+`
`5196`	`5202`	`static VALUE`
`5197`	`5203`	`vm_opt_aref_with(VALUE recv, VALUE key)`
`5198`	`5204`	`{`