diff options
| author | 卜部昌平 <shyouhei@ruby-lang.org> | 2019-12-17 15:49:41 +0900 |
|---|---|---|
| committer | 卜部昌平 <shyouhei@ruby-lang.org> | 2019-12-18 12:52:28 +0900 |
| commit | f054f11a38f66af17a0aed8e0d2d46731eaab27d (patch) | |
| tree | d85000f9e73f282d6e79056415e33c99eb6d86a0 /vm_insnhelper.c | |
| parent | 77e3078ede833e86a1ee0e2ce745b15e892bdbf6 (diff) | |
| download | ruby-f054f11a38f66af17a0aed8e0d2d46731eaab27d.tar.gz | |
per-method serial number
Methods and their definitions can be allocated/deallocated on-the-fly.
One pathological situation is when a method is deallocated then another
one is allocated immediately after that. Address of those old/new method
entries/definitions can be the same then, depending on underlying
malloc/free implementation.
So pointer comparison is insufficient. We have to check the contents.
To do so we introduce def->method_serial, which is an integer unique to
that specific method definition.
PS: Note that method_serial being uintptr_t rather than rb_serial_t is
intentional. This is because rb_serial_t can be bigger than a pointer
on a 32bit system (rb_serial_t is at least 64bit). In order to preserve
old packing of struct rb_call_cache, rb_serial_t is inappropriate.
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index efd297d506..e35000e758 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1443,7 +1443,7 @@ calccall(const struct rb_call_data *cd, const rb_callable_method_entry_t *me) RB_DEBUG_COUNTER_INC(mc_miss_by_distinct); return vm_call_general; /* normal cases */ } - else if (UNLIKELY(cc->def != me->def)) { + else if (UNLIKELY(cc->method_serial != me->def->method_serial)) { RB_DEBUG_COUNTER_INC(mc_miss_by_refine); return vm_call_general; /* cc->me was refined elsewhere */ } @@ -1475,7 +1475,7 @@ rb_vm_search_method_slowpath(struct rb_call_data *cd, VALUE klass) GET_GLOBAL_METHOD_STATE(), { RCLASS_SERIAL(klass) }, me, - me ? me->def : NULL, + me ? me->def->method_serial : 0, call, }; if (call != vm_call_general) { |