diff options
| -rw-r--r-- | compile.c | 12 | ||||
| -rw-r--r-- | insns.def | 4 | ||||
| -rw-r--r-- | test/ruby/test_jit.rb | 2 |
3 files changed, 9 insertions, 9 deletions
@@ -6829,9 +6829,9 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in LABEL *lend = NEW_LABEL(line); int ic_index = body->is_size++; - ADD_INSN2(ret, line, getinlinecache, lend, INT2FIX(ic_index)); + ADD_INSN2(ret, line, opt_getinlinecache, lend, INT2FIX(ic_index)); ADD_INSN1(ret, line, getconstant, ID2SYM(node->nd_vid)); - ADD_INSN1(ret, line, setinlinecache, INT2FIX(ic_index)); + ADD_INSN1(ret, line, opt_setinlinecache, INT2FIX(ic_index)); ADD_LABEL(ret, lend); } else { @@ -7187,7 +7187,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in CHECK(compile_const_prefix(iseq, node, pref, body)); if (LIST_INSN_SIZE_ZERO(pref)) { if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) { - ADD_INSN2(ret, line, getinlinecache, lend, INT2FIX(ic_index)); + ADD_INSN2(ret, line, opt_getinlinecache, lend, INT2FIX(ic_index)); } else { ADD_INSN(ret, line, putnil); @@ -7196,7 +7196,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in ADD_SEQ(ret, body); if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) { - ADD_INSN1(ret, line, setinlinecache, INT2FIX(ic_index)); + ADD_INSN1(ret, line, opt_setinlinecache, INT2FIX(ic_index)); ADD_LABEL(ret, lend); } } @@ -7224,7 +7224,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in /* add cache insn */ if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) { - ADD_INSN2(ret, line, getinlinecache, lend, INT2FIX(ic_index)); + ADD_INSN2(ret, line, opt_getinlinecache, lend, INT2FIX(ic_index)); ADD_INSN(ret, line, pop); } @@ -7232,7 +7232,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in ADD_INSN1(ret, line, getconstant, ID2SYM(node->nd_mid)); if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) { - ADD_INSN1(ret, line, setinlinecache, INT2FIX(ic_index)); + ADD_INSN1(ret, line, opt_setinlinecache, INT2FIX(ic_index)); ADD_LABEL(ret, lend); } @@ -985,7 +985,7 @@ branchnil /* push inline-cached value and go to dst if it is valid */ DEFINE_INSN -getinlinecache +opt_getinlinecache (OFFSET dst, IC ic) () (VALUE val) @@ -1001,7 +1001,7 @@ getinlinecache /* set inline cache */ DEFINE_INSN -setinlinecache +opt_setinlinecache (IC ic) (VALUE val) (VALUE val) diff --git a/test/ruby/test_jit.rb b/test/ruby/test_jit.rb index 5c31b504c4..dbc8732e4c 100644 --- a/test/ruby/test_jit.rb +++ b/test/ruby/test_jit.rb @@ -444,7 +444,7 @@ class TestJIT < Test::Unit::TestCase end def test_compile_insn_inlinecache - assert_compile_once('Struct', result_inspect: 'Struct', insns: %i[getinlinecache setinlinecache]) + assert_compile_once('Struct', result_inspect: 'Struct', insns: %i[opt_getinlinecache opt_setinlinecache]) end def test_compile_insn_once |