diff options
| author | Alan Wu <[email protected]> | 2021-04-29 11:47:19 -0400 |
|---|---|---|
| committer | Alan Wu <[email protected]> | 2021-10-20 18:19:34 -0400 |
| commit | 684e84df7cdfd47d2b66d717369121337a2bd32d (patch) | |
| tree | 1e9760bb148720599ca1aa99cbc0e24c665a7ecb /yjit_codegen.c | |
| parent | 62c1297e246966bd3b309d3a3ce3cd0dc78c389d (diff) | |
Use rb_ivar_get() for general case of getivar (#17)
* Use rb_ivar_get() for general case of getivar
Pretty straight forward. Buys about 1% coverage on railsbench.
* Update yjit_codegen.c
Co-authored-by: Maxime Chevalier-Boisvert <[email protected]>
Diffstat (limited to 'yjit_codegen.c')
| -rw-r--r-- | yjit_codegen.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/yjit_codegen.c b/yjit_codegen.c index ace2df622d..99e77fc82f 100644 --- a/yjit_codegen.c +++ b/yjit_codegen.c @@ -924,8 +924,27 @@ gen_get_ivar(jitstate_t *jit, ctx_t *ctx, const int max_chain_depth, VALUE compt // Eventually, we can encode whether an object is T_OBJECT or not // inside object shapes. if (rb_get_alloc_func(comptime_val_klass) != rb_class_allocate_instance) { - GEN_COUNTER_INC(cb, getivar_not_object); - return YJIT_CANT_COMPILE; + // General case. Call rb_ivar_get(). No need to reconstruct interpreter + // state since the routine never raises exceptions or allocate objects + // visibile to Ruby. + // VALUE rb_ivar_get(VALUE obj, ID id) + ADD_COMMENT(cb, "call rb_ivar_get()"); + yjit_save_regs(cb); + mov(cb, C_ARG_REGS[0], REG0); + mov(cb, C_ARG_REGS[1], imm_opnd((int64_t)ivar_name)); + call_ptr(cb, REG1, (void *)rb_ivar_get); + yjit_load_regs(cb); + + if (!reg0_opnd.is_self) { + (void)ctx_stack_pop(ctx, 1); + } + // Push the ivar on the stack + x86opnd_t out_opnd = ctx_stack_push(ctx, TYPE_UNKNOWN); + mov(cb, out_opnd, RAX); + + // Jump to next instruction. This allows guard chains to share the same successor. + jit_jump_to_next_insn(jit, ctx); + return YJIT_END_BLOCK; } RUBY_ASSERT(BUILTIN_TYPE(comptime_receiver) == T_OBJECT); // because we checked the allocator |