kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

vm_insnhelper.c: never cache setinstancevariable twice

Browse source 
same as r65213

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65215 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
k0kubun 2018-10-20 07:54:34 +00:00
parent a4c4560f32
commit 9f43a64c86
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
vm_insnhelper.c
View file

@ -976,10 +976,7 @@ vm_getivar(VALUE obj, ID id, IC ic, struct rb_call_cache *cc, int is_attr)
if (index < ROBJECT_NUMIV(obj)) { if (index < ROBJECT_NUMIV(obj)) {
val = ROBJECT_IVPTR(obj)[index]; val = ROBJECT_IVPTR(obj)[index];
} }
if (is_attr) { /* call_info */ if (!is_attr) { /* getinstancevariable */
cc->aux.index = (int)index + 1;
}
else { /* getinstancevariable */
if (ic->ic_serial == RUBY_VM_CLASS_SERIAL_UNSET) { if (ic->ic_serial == RUBY_VM_CLASS_SERIAL_UNSET) {
/* set ic_serial only for the first time */ /* set ic_serial only for the first time */
ic->ic_value.index = index; ic->ic_value.index = index;
@ -991,6 +988,9 @@ vm_getivar(VALUE obj, ID id, IC ic, struct rb_call_cache *cc, int is_attr)
ic->ic_serial = RUBY_VM_CLASS_SERIAL_INVALID; ic->ic_serial = RUBY_VM_CLASS_SERIAL_INVALID;
} }
} }
else { /* call_info */
cc->aux.index = (int)index + 1;
}
} }
} }
} }
@ -1039,10 +1039,18 @@ vm_setivar(VALUE obj, ID id, VALUE val, IC ic, struct rb_call_cache *cc, int is_
struct st_table *iv_index_tbl = ROBJECT_IV_INDEX_TBL(obj); struct st_table *iv_index_tbl = ROBJECT_IV_INDEX_TBL(obj);
if (iv_index_tbl && st_lookup(iv_index_tbl, (st_data_t)id, &index)) { if (iv_index_tbl && st_lookup(iv_index_tbl, (st_data_t)id, &index)) {
if (!is_attr) { if (!is_attr) { /* setinstancevariable */
if (ic->ic_serial == RUBY_VM_CLASS_SERIAL_UNSET) {
/* set ic_serial only for the first time */
ic->ic_value.index = index; ic->ic_value.index = index;
ic->ic_serial = RCLASS_SERIAL(klass); ic->ic_serial = RCLASS_SERIAL(klass);
} }
else if (ic->ic_serial != RUBY_VM_CLASS_SERIAL_INVALID) {
/* never use cache for another class, to avoid race condition with MJIT worker
and to reduce the number of JIT cancellations by code generated for IC hit. */
ic->ic_serial = RUBY_VM_CLASS_SERIAL_INVALID;
}
}
else if (index >= INT_MAX) { else if (index >= INT_MAX) {
rb_raise(rb_eArgError, "too many instance variables"); rb_raise(rb_eArgError, "too many instance variables");
} }