1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* vm_insnhelper.c: Revert r49500 (6ae6a8c7bc)

Creates a regression in test_drb. Above my rubyfu. [#10828]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49502 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
marcandre 2015-02-04 19:45:16 +00:00
parent 18eef0b9be
commit 1fd6ab5bab
2 changed files with 10 additions and 11 deletions

View file

@ -265,7 +265,7 @@ class TestSymbol < Test::Unit::TestCase
assert_no_immortal_symbol_created do
10.times { |i| x.send "send should not leak #{i} - str mm" }
end
end
end if false
def test_symbol_send_leak_symbol_custom_method_missing
x = Object.new
@ -273,7 +273,7 @@ class TestSymbol < Test::Unit::TestCase
assert_no_immortal_symbol_created do
10.times { |i| x.send "send should not leak #{i} - sym mm".to_sym }
end
end
end if false
def test_symbol_send_leak_string_no_optimization
assert_no_immortal_symbol_created do

View file

@ -1531,17 +1531,16 @@ 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));
rb_exc_raise(exc);
}
ci->mid = idMethodMissing;
th->method_missing_reason = ci->aux.missing_reason = NOEX_VCALL;
} else {
ci->mid = rb_to_id(sym);
}
/* shift arguments */
if (i > 0) {
MEMMOVE(&TOPN(i), &TOPN(i-1), VALUE, i);
}
ci->me = rb_method_entry_without_refinements(CLASS_OF(ci->recv), ci->mid, &ci->defined_class);
ci->argc -= 1;
DEC_SP(1);
}
ci->me = rb_method_entry_without_refinements(CLASS_OF(ci->recv), ci->mid, &ci->defined_class);
ci->flag = VM_CALL_FCALL | VM_CALL_OPT_SEND;