Merge pull request ruby#126 from Shopify/splatarray

maximecb · web-flow · commit ded951a20f19 · 2021-07-14T16:13:33.000-04:00
Implement splatarray
diff --git a/bootstraptest/test_yjit.rb b/bootstraptest/test_yjit.rb
@@ -1386,3 +1386,12 @@ def is_inf(obj)
     is_inf(1.0/0.0)
   ]
 }
+
+assert_equal '[1, 2, 3, 4, 5]', %q{
+  def splatarray
+    [*(1..5)]
+  end
+
+  splatarray
+  splatarray
+}
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
@@ -4244,6 +4244,12 @@ vm_splat_array(VALUE flag, VALUE ary)
     }
 }
 
+VALUE
+rb_vm_splat_array(VALUE flag, VALUE ary)
+{
+    return vm_splat_array(flag, ary);
+}
+
 static VALUE
 vm_check_match(rb_execution_context_t *ec, VALUE target, VALUE pattern, rb_num_t flag)
 {
diff --git a/yjit_codegen.c b/yjit_codegen.c
@@ -689,6 +689,35 @@ gen_duparray(jitstate_t* jit, ctx_t* ctx)
     return YJIT_KEEP_COMPILING;
 }
 
+VALUE rb_vm_splat_array(VALUE flag, VALUE ary);
+
+// call to_a on the array on the stack
+static codegen_status_t
+gen_splatarray(jitstate_t* jit, ctx_t* ctx)
+{
+    VALUE flag = (VALUE) jit_get_arg(jit, 0);
+
+    // 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 ary_opnd = ctx_stack_pop(ctx, 1);
+
+    // Call rb_vm_splat_array(flag, ary)
+    yjit_save_regs(cb);
+    jit_mov_gc_ptr(jit, cb, C_ARG_REGS[0], flag);
+    mov(cb, C_ARG_REGS[1], ary_opnd);
+    call_ptr(cb, REG1, (void *) rb_vm_splat_array);
+    yjit_load_regs(cb);
+
+    x86opnd_t stack_ret = ctx_stack_push(ctx, TYPE_ARRAY);
+    mov(cb, stack_ret, RAX);
+
+    return YJIT_KEEP_COMPILING;
+}
+
 // new hash initialized from top N values
 static codegen_status_t
 gen_newhash(jitstate_t* jit, ctx_t* ctx)
@@ -3468,6 +3497,7 @@ yjit_init_codegen(void)
     yjit_reg_op(BIN(adjuststack), gen_adjuststack);
     yjit_reg_op(BIN(newarray), gen_newarray);
     yjit_reg_op(BIN(duparray), gen_duparray);
+    yjit_reg_op(BIN(splatarray), gen_splatarray);
     yjit_reg_op(BIN(newhash), gen_newhash);
     yjit_reg_op(BIN(concatstrings), gen_concatstrings);
     yjit_reg_op(BIN(putnil), gen_putnil);

Original file line number	Diff line number	Diff line change
`@@ -1386,3 +1386,12 @@ def is_inf(obj)`
`1386`	`1386`	`is_inf(1.0/0.0)`
`1387`	`1387`	`]`
`1388`	`1388`	`}`
	`1389`	`+`
	`1390`	`+assert_equal '[1, 2, 3, 4, 5]', %q{`
	`1391`	`+ def splatarray`
	`1392`	`+ [*(1..5)]`
	`1393`	`+ end`
	`1394`	`+`
	`1395`	`+ splatarray`
	`1396`	`+ splatarray`
	`1397`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -4244,6 +4244,12 @@ vm_splat_array(VALUE flag, VALUE ary)`
`4244`	`4244`	`}`
`4245`	`4245`	`}`
`4246`	`4246`
	`4247`	`+VALUE`
	`4248`	`+rb_vm_splat_array(VALUE flag, VALUE ary)`
	`4249`	`+{`
	`4250`	`+ return vm_splat_array(flag, ary);`
	`4251`	`+}`
	`4252`	`+`
`4247`	`4253`	`static VALUE`
`4248`	`4254`	`vm_check_match(rb_execution_context_t *ec, VALUE target, VALUE pattern, rb_num_t flag)`
`4249`	`4255`	`{`