diff options
| author | John Hawthorn <[email protected]> | 2021-07-17 03:26:46 -0700 |
|---|---|---|
| committer | Alan Wu <[email protected]> | 2021-10-20 18:19:39 -0400 |
| commit | c210fade27c2f39f078c9b1aec71a05532fb832b (patch) | |
| tree | 3947355e6e0f5572d38261946df6c16080eb3a7b | |
| parent | 3a3f7066986b6d0a24a6f7c72d2304381269b30d (diff) | |
Implement newrange
| -rw-r--r-- | test/ruby/test_yjit.rb | 8 | ||||
| -rw-r--r-- | yjit_codegen.c | 23 |
2 files changed, 31 insertions, 0 deletions
diff --git a/test/ruby/test_yjit.rb b/test/ruby/test_yjit.rb index 50b415107d..94989dae9e 100644 --- a/test/ruby/test_yjit.rb +++ b/test/ruby/test_yjit.rb @@ -36,6 +36,14 @@ class TestYJIT < Test::Unit::TestCase assert_compiles('[1, 2, 3]', insns: %i[duparray], result: [1, 2, 3]) end + def test_compile_newrange + assert_compiles('s = 1; (s..5)', insns: %i[newrange], result: 1..5) + assert_compiles('s = 1; e = 5; (s..e)', insns: %i[newrange], result: 1..5) + assert_compiles('s = 1; (s...5)', insns: %i[newrange], result: 1...5) + assert_compiles('s = 1; (s..)', insns: %i[newrange], result: 1..) + assert_compiles('e = 5; (..e)', insns: %i[newrange], result: ..5) + end + def test_compile_opt_nil_p assert_compiles('nil.nil?', insns: %i[opt_nil_p], result: true) assert_compiles('false.nil?', insns: %i[opt_nil_p], result: false) diff --git a/yjit_codegen.c b/yjit_codegen.c index 08ac6f0ec6..0abf2376c6 100644 --- a/yjit_codegen.c +++ b/yjit_codegen.c @@ -917,6 +917,28 @@ gen_splatarray(jitstate_t* jit, ctx_t* ctx) return YJIT_KEEP_COMPILING; } +// new range initialized from top 2 values +static codegen_status_t +gen_newrange(jitstate_t* jit, ctx_t* ctx) +{ + rb_num_t flag = (rb_num_t)jit_get_arg(jit, 0); + + // rb_range_new() allocates and can raise + jit_prepare_routine_call(jit, ctx, REG0); + + // val = rb_range_new(low, high, (int)flag); + mov(cb, C_ARG_REGS[0], ctx_stack_opnd(ctx, 1)); + mov(cb, C_ARG_REGS[1], ctx_stack_opnd(ctx, 0)); + mov(cb, C_ARG_REGS[2], imm_opnd(flag)); + call_ptr(cb, REG0, (void *)rb_range_new); + + ctx_stack_pop(ctx, 2); + x86opnd_t stack_ret = ctx_stack_push(ctx, TYPE_HEAP); + mov(cb, stack_ret, RAX); + + return YJIT_KEEP_COMPILING; +} + static void guard_object_is_heap(codeblock_t *cb, x86opnd_t object_opnd, ctx_t *ctx, uint8_t *side_exit) { @@ -4014,6 +4036,7 @@ yjit_init_codegen(void) yjit_reg_op(BIN(splatarray), gen_splatarray); yjit_reg_op(BIN(expandarray), gen_expandarray); yjit_reg_op(BIN(newhash), gen_newhash); + yjit_reg_op(BIN(newrange), gen_newrange); yjit_reg_op(BIN(concatstrings), gen_concatstrings); yjit_reg_op(BIN(putnil), gen_putnil); yjit_reg_op(BIN(putobject), gen_putobject); |