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

vm_insnhelper.c: fix missing reason

Browse Source 
* vm_insnhelper.c (ci_missing_reason): return the reason of method
  missing in call info.
* vm_insnhelper.c (vm_call_opt_send): re-apply r49500 with the
  proper missing reason.  [Bug #10828]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49505 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-02-05 03:31:07 +00:00
parent 0e414175fd
commit 73645c1c51
3 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Thu Feb 5 12:31:05 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_insnhelper.c (ci_missing_reason): return the reason of method
missing in call info.
* vm_insnhelper.c (vm_call_opt_send): re-apply r49500 with the
proper missing reason. [Bug #10828]
Thu Feb 5 10:31:46 2015 Shugo Maeda <shugo@ruby-lang.org> Thu Feb 5 10:31:46 2015 Shugo Maeda <shugo@ruby-lang.org>
* class.c (rb_obj_singleton_methods): should use RTEST() to convert * class.c (rb_obj_singleton_methods): should use RTEST() to convert

4
test/-ext-/symbol/test_inadvertent_creation.rb
View File

@ -383,7 +383,7 @@ module Test_Symbol
assert_no_immortal_symbol_created("send should not leak - str mm") do |name| assert_no_immortal_symbol_created("send should not leak - str mm") do |name|
assert_nothing_raised(NoMethodError) {x.send(name)} assert_nothing_raised(NoMethodError) {x.send(name)}
end end
end if false end
def test_send_leak_symbol_custom_method_missing def test_send_leak_symbol_custom_method_missing
x = Object.new x = Object.new
@ -391,7 +391,7 @@ module Test_Symbol
assert_no_immortal_symbol_created("send should not leak - sym mm") do |name| assert_no_immortal_symbol_created("send should not leak - sym mm") do |name|
assert_nothing_raised(NoMethodError) {x.send(name.to_sym)} assert_nothing_raised(NoMethodError) {x.send(name.to_sym)}
end end
end if false end
def test_send_leak_string_no_optimization def test_send_leak_string_no_optimization
assert_no_immortal_symbol_created("send should not leak - str slow") do |name| assert_no_immortal_symbol_created("send should not leak - str slow") do |name|

37
vm_insnhelper.c
View File

@ -1497,6 +1497,19 @@ vm_call_bmethod(rb_thread_t *th, rb_control_frame_t *cfp, rb_call_info_t *ci)
return vm_call_bmethod_body(th, ci, argv); return vm_call_bmethod_body(th, ci, argv);
} }
static int
ci_missing_reason(const rb_call_info_t *ci)
{
int stat = 0;
if (ci->flag & VM_CALL_VCALL) {
stat |= NOEX_VCALL;
}
if (ci->flag & VM_CALL_SUPER) {
stat |= NOEX_SUPER;
}
return stat;
}
static static
#ifdef _MSC_VER #ifdef _MSC_VER
__forceinline __forceinline
@ -1531,16 +1544,18 @@ vm_call_opt_send(rb_thread_t *th, rb_control_frame_t *reg_cfp, rb_call_info_t *c
VALUE exc = make_no_method_exception(rb_eNoMethodError, NULL, ci->recv, rb_long2int(ci->argc), &TOPN(i)); VALUE exc = make_no_method_exception(rb_eNoMethodError, NULL, ci->recv, rb_long2int(ci->argc), &TOPN(i));
rb_exc_raise(exc); rb_exc_raise(exc);
} }
ci->mid = rb_to_id(sym); ci->mid = idMethodMissing;
th->method_missing_reason = ci->aux.missing_reason = ci_missing_reason(ci);
} }
else {
/* shift arguments */ /* shift arguments */
if (i > 0) { if (i > 0) {
MEMMOVE(&TOPN(i), &TOPN(i-1), VALUE, i); MEMMOVE(&TOPN(i), &TOPN(i-1), VALUE, i);
}
ci->argc -= 1;
DEC_SP(1);
} }
ci->me = rb_method_entry_without_refinements(CLASS_OF(ci->recv), ci->mid, &ci->defined_class); ci->me = rb_method_entry_without_refinements(CLASS_OF(ci->recv), ci->mid, &ci->defined_class);
ci->argc -= 1;
DEC_SP(1);
ci->flag = VM_CALL_FCALL | VM_CALL_OPT_SEND; ci->flag = VM_CALL_FCALL | VM_CALL_OPT_SEND;
@ -1785,13 +1800,7 @@ vm_call_method(rb_thread_t *th, rb_control_frame_t *cfp, rb_call_info_t *ci)
} }
else { else {
/* method missing */ /* method missing */
int stat = 0; const int stat = ci_missing_reason(ci);
if (ci->flag & VM_CALL_VCALL) {
stat |= NOEX_VCALL;
}
if (ci->flag & VM_CALL_SUPER) {
stat |= NOEX_SUPER;
}
if (ci->mid == idMethodMissing) { if (ci->mid == idMethodMissing) {
rb_control_frame_t *reg_cfp = cfp; rb_control_frame_t *reg_cfp = cfp;
VALUE *argv = STACK_ADDR_FROM_TOP(ci->argc); VALUE *argv = STACK_ADDR_FROM_TOP(ci->argc);