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

* vm.c (rb_vm_check_redefinition_opt_method): should check the real

Browse source 
class instead of the origin iclass.
  [ruby-core:72188] [Bug #11826]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53173 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shugo 2015-12-17 22:43:35 +00:00
parent ea4b4d3a76
commit 0c659e26cb
3 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Fri Dec 18 07:39:01 2015 Shugo Maeda <shugo@ruby-lang.org>
* vm.c (rb_vm_check_redefinition_opt_method): should check the real
class instead of the origin iclass.
[ruby-core:72188] [Bug #11826]
Thu Dec 17 22:13:10 2015 Shugo Maeda <shugo@ruby-lang.org>
* vm_args.c (vm_caller_setup_arg_block): remove code for ifunc

16
test/ruby/test_module.rb
View file

@ -1695,6 +1695,22 @@ class TestModule < Test::Unit::TestCase
assert_equal(0, 1 / 2)
end
def test_redefine_optmethod_after_prepend
bug11826 = '[ruby-core:72188] [Bug #11826]'
assert_separately [], %{
module M
end
class Fixnum
prepend M
def /(other)
quo(other)
end
end
assert_equal(1 / 2r, 1 / 2, "#{bug11826}")
}, ignore_stderr: true
assert_equal(0, 1 / 2)
end
def test_prepend_visibility
bug8005 = '[ruby-core:53106] [Bug #8005]'
c = Class.new do

3
vm.c
View file

@ -1400,6 +1400,9 @@ static void
rb_vm_check_redefinition_opt_method(const rb_method_entry_t *me, VALUE klass)
{
st_data_t bop;
if (RB_TYPE_P(klass, T_ICLASS) && FL_TEST(klass, RICLASS_IS_ORIGIN)) {
klass = RBASIC_CLASS(klass);
}
if (me->def->type == VM_METHOD_TYPE_CFUNC) {
if (st_lookup(vm_opt_method_table, (st_data_t)me, &bop)) {
int flag = vm_redefinition_check_flag(klass);