diff options
author | nagachika <nagachika@ruby-lang.org> | 2021-04-29 17:49:55 +0900 |
---|---|---|
committer | nagachika <nagachika@ruby-lang.org> | 2021-04-29 17:49:55 +0900 |
commit | cc4e602634e894c831a4103a5803a3de566c1856 (patch) | |
tree | 8250b3992dc55c5572b2edcafcafa0b385dfe1b6 /tool/ruby_vm/views/_mjit_compile_getinlinecache.erb | |
parent | 58240b5d0b52d9685b773e5b9e45d22ca500392a (diff) |
merge revision(s) 87c546b5fa97e6e226cce4daf417617a1143f642,7a3322a0fd660d676f1918bd7c4a37676b44e1c2:
Avoid using inconsistent coding style
Other `_mjit_compile_*.erb` files don't use goto. These files'd better
be consistent for readability.
---
tool/ruby_vm/views/_mjit_compile_getinlinecache.erb | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
Fix broken JIT of getinlinecache
e7fc353f04 reverted vm_ic_hit_p's signature change made in 53babf35ef,
which broke JIT compilation of getinlinecache.
To make sure it doesn't happen again, I separated vm_inlined_ic_hit_p to
make the intention clear.
---
test/ruby/test_jit.rb | 12 +++++++++++
.../ruby_vm/views/_mjit_compile_getinlinecache.erb | 2 +-
vm_insnhelper.c | 25 ++++++++++++++--------
3 files changed, 29 insertions(+), 10 deletions(-)
Diffstat (limited to 'tool/ruby_vm/views/_mjit_compile_getinlinecache.erb')
-rw-r--r-- | tool/ruby_vm/views/_mjit_compile_getinlinecache.erb | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/tool/ruby_vm/views/_mjit_compile_getinlinecache.erb b/tool/ruby_vm/views/_mjit_compile_getinlinecache.erb index 1b636bceb6..1acfdb7f0b 100644 --- a/tool/ruby_vm/views/_mjit_compile_getinlinecache.erb +++ b/tool/ruby_vm/views/_mjit_compile_getinlinecache.erb @@ -13,17 +13,10 @@ % # compiler: Capture IC values, locking getinlinecache struct iseq_inline_constant_cache_entry *ice = ic->entry; - if (ice == NULL) { - goto getinlinecache_cancel; - } - rb_serial_t ic_serial = ice->ic_serial; - const rb_cref_t *ic_cref = ice->ic_cref; - VALUE ic_value = ice->value; - - if (ic_serial && !status->compile_info->disable_const_cache) { + if (ice != NULL && ice->ic_serial && !status->compile_info->disable_const_cache) { % # JIT: Inline everything in IC, and cancel the slow path - fprintf(f, " if (vm_ic_hit_p((rb_serial_t)%"PRI_SERIALT_PREFIX"u, (const rb_cref_t *)0x%"PRIxVALUE", reg_cfp->ep)) {", ic_serial, (VALUE)ic_cref); - fprintf(f, " stack[%d] = 0x%"PRIxVALUE";\n", b->stack_size, ic_value); + fprintf(f, " if (vm_inlined_ic_hit_p(0x%"PRIxVALUE", 0x%"PRIxVALUE", (const rb_cref_t *)0x%"PRIxVALUE", %"PRI_SERIALT_PREFIX"u, reg_cfp->ep)) {", ice->flags, ice->value, (VALUE)ice->ic_cref, ice->ic_serial); + fprintf(f, " stack[%d] = 0x%"PRIxVALUE";\n", b->stack_size, ice->value); fprintf(f, " goto label_%d;\n", pos + insn_len(insn) + (int)dst); fprintf(f, " }"); fprintf(f, " else {"); @@ -36,4 +29,3 @@ b->stack_size += <%= insn.call_attribute('sp_inc') %>; break; } - getinlinecache_cancel:; |