diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-12 17:16:27 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-12 17:16:27 +0000 |
| commit | 541896130fd47ee3a1142124eea4593d2890b8f0 (patch) | |
| tree | 6e48666a2acb43710ace626d15aedff2c2e19746 /vm_insnhelper.c | |
| parent | 1ee3e9600c906dc9ba37c51108cf91a71de82c98 (diff) | |
| download | ruby-541896130fd47ee3a1142124eea4593d2890b8f0.tar.gz ruby-541896130fd47ee3a1142124eea4593d2890b8f0.tar.xz ruby-541896130fd47ee3a1142124eea4593d2890b8f0.zip | |
* vm_core.h: change members of iseq_inline_cache_entry.
make cache value members to one union member "ic_value".
* insns.def: ditto.
* vm_insnhelper.c: ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24881 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index b00b2464d..3020756d6 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1196,7 +1196,7 @@ vm_getivar(VALUE obj, ID id, IC ic) VALUE klass = RBASIC(obj)->klass; if (ic->ic_class == klass) { - long index = ic->ic_index; + long index = ic->ic_value.index; long len = ROBJECT_NUMIV(obj); VALUE *ptr = ROBJECT_IVPTR(obj); @@ -1216,7 +1216,7 @@ vm_getivar(VALUE obj, ID id, IC ic) val = ptr[index]; } ic->ic_class = klass; - ic->ic_index = index; + ic->ic_value.index = index; } } } @@ -1250,7 +1250,7 @@ vm_setivar(VALUE obj, ID id, VALUE val, IC ic) st_data_t index; if (ic->ic_class == klass) { - long index = ic->ic_index; + long index = ic->ic_value.index; long len = ROBJECT_NUMIV(obj); VALUE *ptr = ROBJECT_IVPTR(obj); @@ -1264,7 +1264,7 @@ vm_setivar(VALUE obj, ID id, VALUE val, IC ic) if (iv_index_tbl && st_lookup(iv_index_tbl, (st_data_t)id, &index)) { ic->ic_class = klass; - ic->ic_index = index; + ic->ic_value.index = index; } /* fall through */ } @@ -1282,12 +1282,12 @@ vm_method_search(VALUE id, VALUE klass, IC ic) #if OPT_INLINE_METHOD_CACHE if (LIKELY(klass == ic->ic_class) && LIKELY(GET_VM_STATE_VERSION() == ic->ic_vmstat)) { - me = ic->ic_method; + me = ic->ic_value.method; } else { me = rb_method_entry(klass, id); ic->ic_class = klass; - ic->ic_method = me; + ic->ic_value.method = me; ic->ic_vmstat = GET_VM_STATE_VERSION(); } #else |