Skip to content

Implement class hierarchy method caching #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
haileys merged 6 commits into from
Oct 23, 2013
Merged

Implement class hierarchy method caching #4

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
756d555
* class.c, compile.c, eval.c, gc.h, insns.def, internal.h, method.h,
Sep 25, 2013
0864cb9
* vm_insnhelper.c (vm_search_method): no need to check klass == ci->k…
Sep 4, 2013
866edf4
* vm_insnhelper.c (vm_search_method): no need to check klass == ci->k…
Sep 25, 2013
d4aeb9f
* class.c (class_alloc): remove mc_tbl
Sep 25, 2013
7136ab4
* gc.c (free_method_cache_entry_i): unused function
Sep 25, 2013
822a288
merge conflict fail
Sep 25, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
* vm_insnhelper.c (vm_search_method): no need to check klass == ci->k… 
lass

  in method cache guard - class sequence number has the same uniqueness
  guarantees

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42836 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
Charlie Somerville committed Oct 23, 2013
commit 866edf4506c714d5f865d1529f74cf92cf050202
10 changes: 4 additions & 6 deletions vm_insnhelper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ vm_getivar(VALUE obj, ID id, IC ic, rb_call_info_t *ci, int is_attr)
VALUE val = Qundef;
VALUE klass = RBASIC(obj)->klass;

if (LIKELY((!is_attr && (ic->ic_class == klass && ic->ic_vmstat == GET_VM_STATE_VERSION())) ||
if (LIKELY((!is_attr && ic->ic_seq == RCLASS_EXT(klass)->seq) ||
(is_attr && ci->aux.index > 0))) {
long index = !is_attr ? ic->ic_value.index : ci->aux.index - 1;
long len = ROBJECT_NUMIV(obj);
Expand All @@ -526,9 +526,8 @@ vm_getivar(VALUE obj, ID id, IC ic, rb_call_info_t *ci, int is_attr)
val = ptr[index];
}
if (!is_attr) {
ic->ic_class = klass;
ic->ic_value.index = index;
ic->ic_vmstat = GET_VM_STATE_VERSION();
ic->ic_seq = RCLASS_EXT(klass)->seq;
}
else { /* call_info */
ci->aux.index = index + 1;
Expand Down Expand Up @@ -564,7 +563,7 @@ vm_setivar(VALUE obj, ID id, VALUE val, IC ic, rb_call_info_t *ci, int is_attr)
st_data_t index;

if (LIKELY(
(!is_attr && ic->ic_class == klass && ic->ic_vmstat == GET_VM_STATE_VERSION()) ||
(!is_attr && ic->ic_seq == RCLASS_EXT(klass)->seq) ||
(is_attr && ci->aux.index > 0))) {
long index = !is_attr ? ic->ic_value.index : ci->aux.index-1;
long len = ROBJECT_NUMIV(obj);
Expand All @@ -580,9 +579,8 @@ vm_setivar(VALUE obj, ID id, VALUE val, IC ic, rb_call_info_t *ci, int is_attr)

if (iv_index_tbl && st_lookup(iv_index_tbl, (st_data_t)id, &index)) {
if (!is_attr) {
ic->ic_class = klass;
ic->ic_value.index = index;
ic->ic_vmstat = GET_VM_STATE_VERSION();
ic->ic_seq = RCLASS_EXT(klass)->seq;
}
else {
ci->aux.index = index + 1;
Expand Down