diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-30 23:23:32 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-30 23:23:32 +0000 |
| commit | 2e4fb84f7c78d7d9cd24d1802ef97fda6d2466d0 (patch) | |
| tree | 6546505e6adc0760ed80323b5eccac7195e5159d | |
| parent | 8ad06e2604f9563f21e0b7e107aedde82f40adf8 (diff) | |
* vm_insnhelper.c (vm_getivar): check vm state version
to invalidate inline chache (ivar index).
fixes Bug #4926.
* vm_insnhelper.c (vm_setivar): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32347 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | vm_insnhelper.c | 8 |
2 files changed, 14 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Fri Jul 1 08:21:28 2011 Koichi Sasada <ko1@atdot.net> + + * vm_insnhelper.c (vm_getivar): check vm state version + to invalidate inline chache (ivar index). + fixes Bug #4926. + + * vm_insnhelper.c (vm_setivar): ditto. + Fri Jul 1 08:03:15 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * error.c, thread_pthread.c (WRITE_CONST): suppress warnings diff --git a/vm_insnhelper.c b/vm_insnhelper.c index a02628dabb..10f76ca8d7 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1265,7 +1265,8 @@ vm_getivar(VALUE obj, ID id, IC ic) VALUE val = Qundef; VALUE klass = RBASIC(obj)->klass; - if (ic->ic_class == klass) { + if (LIKELY(ic->ic_class == klass && + ic->ic_vmstat == GET_VM_STATE_VERSION())) { long index = ic->ic_value.index; long len = ROBJECT_NUMIV(obj); VALUE *ptr = ROBJECT_IVPTR(obj); @@ -1287,6 +1288,7 @@ vm_getivar(VALUE obj, ID id, IC ic) } ic->ic_class = klass; ic->ic_value.index = index; + ic->ic_vmstat = GET_VM_STATE_VERSION(); } } } @@ -1318,7 +1320,8 @@ vm_setivar(VALUE obj, ID id, VALUE val, IC ic) VALUE klass = RBASIC(obj)->klass; st_data_t index; - if (ic->ic_class == klass) { + if (LIKELY(ic->ic_class == klass && + ic->ic_vmstat == GET_VM_STATE_VERSION())) { long index = ic->ic_value.index; long len = ROBJECT_NUMIV(obj); VALUE *ptr = ROBJECT_IVPTR(obj); @@ -1334,6 +1337,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_value.index = index; + ic->ic_vmstat = GET_VM_STATE_VERSION(); } /* fall through */ } |