1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix spec failure

Browse Source 
See also https://travis-ci.org/ruby/ruby/jobs/586452224
This commit is contained in:
卜部昌平 2019-09-19 10:37:30 +09:00
parent d74fa8e55c
commit fcfe36b733
Notes: git 2019-09-19 15:18:37 +09:00 
Merged: https://github.com/ruby/ruby/pull/2468
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vm_insnhelper.c
View File

@ -1380,7 +1380,7 @@ __attribute__((__artificial__))
#endif #endif
#endif #endif
static inline vm_call_handler static inline vm_call_handler
calccall(const struct rb_call_cache *cc, const rb_callable_method_entry_t *me) calccall(const struct rb_call_info *ci, const struct rb_call_cache *cc, const rb_callable_method_entry_t *me)
{ {
if (UNLIKELY(!me)) { if (UNLIKELY(!me)) {
return vm_call_general; /* vm_call_method_nome() situation */ return vm_call_general; /* vm_call_method_nome() situation */
@ -1391,6 +1391,14 @@ calccall(const struct rb_call_cache *cc, const rb_callable_method_entry_t *me)
else if (UNLIKELY(cc->def != me->def)) { else if (UNLIKELY(cc->def != me->def)) {
return vm_call_general; /* cc->me was refined elsewhere */ return vm_call_general; /* cc->me was refined elsewhere */
} }
/* "Calling a formerly-public method, which is now privatised, with an
* explicit receiver" is the only situation we have to check here. A
* formerly-private method now publicised is an absolutely safe thing.
* Calling a private method without specifying a receiver is also safe. */
else if ((METHOD_ENTRY_VISI(cc->me) != METHOD_VISI_PUBLIC) &&
!(ci->flag & VM_CALL_FCALL)) {
return vm_call_general;
}
else { else {
return cc->call; return cc->call;
} }
@ -1406,7 +1414,7 @@ rb_vm_search_method_slowpath(const struct rb_call_info *ci, struct rb_call_cache
RCLASS_SERIAL(klass), RCLASS_SERIAL(klass),
me, me,
me ? me->def : NULL, me ? me->def : NULL,
calccall(cc, me), calccall(ci, cc, me),
}; };
VM_ASSERT(callable_method_entry_p(cc->me)); VM_ASSERT(callable_method_entry_p(cc->me));
} }