diff options
| author | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-03 08:47:32 +0000 |
|---|---|---|
| committer | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-03 08:47:32 +0000 |
| commit | 9f13884b9565005b83e2d2375ddef1a048936e76 (patch) | |
| tree | 30bbb9a008342d710ec3cde4743e4ace8627954c /vm_insnhelper.c | |
| parent | 092d419f487f59b668fdb3f3200a96b621fd1caa (diff) | |
| download | ruby-9f13884b9565005b83e2d2375ddef1a048936e76.tar.gz | |
_mjit_compile_send.erb: retry inlining attr_reader
This reverts r63249 (revert r63212) and fixes a bug in it. The test to
prevent the bug is added as well.
vm_insnhelper.c: add `index` argument to vm_getivar. The argument is
created so that MJIT can pass the value of `cc->aux.index` on compilation
time. The cache invalidation in _mjit_compile_send_guard.erb is only
working for the cache value on compilation time.
Note: As `index` is always passed as constant and it's force-inlined,
the performance of `vm_getivar` won't be degraded in VM.
_mjit_compile_send_guard.erb: New. Used to invalidate inlined values of cc.
common.mk: update dependencies for _mjit_compile_send_guard.erb
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63333 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 0f365db3f5..57e5499e4e 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -927,24 +927,29 @@ vm_search_const_defined_class(const VALUE cbase, ID id) #define USE_IC_FOR_IVAR 1 #endif -ALWAYS_INLINE(static VALUE vm_getivar(VALUE, ID, IC, struct rb_call_cache *, int)); +/* `index` argument is used in MJIT to inline index value of call cache */ +ALWAYS_INLINE(static VALUE vm_getivar(VALUE, ID, IC, struct rb_call_cache *, st_index_t, int)); static inline VALUE -vm_getivar(VALUE obj, ID id, IC ic, struct rb_call_cache *cc, int is_attr) +vm_getivar(VALUE obj, ID id, IC ic, struct rb_call_cache *cc, st_index_t index, int is_attr) { #if USE_IC_FOR_IVAR if (LIKELY(RB_TYPE_P(obj, T_OBJECT))) { VALUE val = Qundef; - if (LIKELY(is_attr ? + if (LIKELY(index > 0 || is_attr ? RB_DEBUG_COUNTER_INC_UNLESS(ivar_get_ic_miss_unset, cc->aux.index > 0) : RB_DEBUG_COUNTER_INC_UNLESS(ivar_get_ic_miss_serial, ic->ic_serial == RCLASS_SERIAL(RBASIC(obj)->klass)))) { - st_index_t index = !is_attr ? ic->ic_value.index : (cc->aux.index - 1); + if (index == 0) { + index = !is_attr ? ic->ic_value.index : (cc->aux.index - 1); + } + else { + index--; /* MJIT passes `cc->aux.index` as `index`. This will be `cc->aux.index - 1` */ + } if (LIKELY(index < ROBJECT_NUMIV(obj))) { val = ROBJECT_IVPTR(obj)[index]; } } else { - st_data_t index; struct st_table *iv_index_tbl = ROBJECT_IV_INDEX_TBL(obj); if (iv_index_tbl) { @@ -1032,7 +1037,7 @@ vm_setivar(VALUE obj, ID id, VALUE val, IC ic, struct rb_call_cache *cc, int is_ static inline VALUE vm_getinstancevariable(VALUE obj, ID id, IC ic) { - return vm_getivar(obj, id, ic, 0, 0); + return vm_getivar(obj, id, ic, NULL, 0, FALSE); } static inline void @@ -1944,7 +1949,7 @@ static VALUE vm_call_ivar(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct rb_calling_info *calling, const struct rb_call_info *ci, struct rb_call_cache *cc) { cfp->sp -= 1; - return vm_getivar(calling->recv, cc->me->def->body.attr.id, NULL, cc, 1); + return vm_getivar(calling->recv, cc->me->def->body.attr.id, NULL, cc, 0, TRUE); } static VALUE |