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_method.c (rb_method_entry_make, check_override_opt_method):

Browse source 
should check whether a newly created method override a optimize
  method in case the method is defined in a prepended module of a
  built-in class.
  [ruby-core:72226] [Bug #11836]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53179 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shugo 2015-12-18 02:32:17 +00:00
parent 68bac3cca4
commit f211abcb9c
3 changed files with 48 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Fri Dec 18 11:24:48 2015 Shugo Maeda <shugo@ruby-lang.org>
* vm_method.c (rb_method_entry_make, check_override_opt_method):
should check whether a newly created method override a optimize
method in case the method is defined in a prepended module of a
built-in class.
[ruby-core:72226] [Bug #11836]
Fri Dec 11 06:39:30 2015 KOSAKI Motohiro <kosaki.motohiro@gmail.com> Fri Dec 11 06:39:30 2015 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* vm.c (vm_exec): call RUBY_DTRACE_CMETHOD_RETURN_HOOK instead of * vm.c (vm_exec): call RUBY_DTRACE_CMETHOD_RETURN_HOOK instead of

18
test/ruby/test_module.rb
View file

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

22
vm_method.c
View file

@ -25,6 +25,7 @@
#define GLOBAL_METHOD_CACHE(c,m) (rb_bug("global method cache disabled improperly"), NULL) #define GLOBAL_METHOD_CACHE(c,m) (rb_bug("global method cache disabled improperly"), NULL)
#endif #endif
static int vm_redefinition_check_flag(VALUE klass);
static void rb_vm_check_redefinition_opt_method(const rb_method_entry_t *me, VALUE klass); static void rb_vm_check_redefinition_opt_method(const rb_method_entry_t *me, VALUE klass);
#define object_id idObject_id #define object_id idObject_id
@ -468,6 +469,22 @@ rb_add_refined_method_entry(VALUE refined_class, ID mid)
} }
} }
static void
check_override_opt_method(VALUE klass, VALUE arg)
{
ID mid = (ID)arg;
const rb_method_entry_t *me, *newme;
if (vm_redefinition_check_flag(klass)) {
me = lookup_method_table(RCLASS_ORIGIN(klass), mid);
if (me) {
newme = rb_method_entry(klass, mid);
if (newme != me) rb_vm_check_redefinition_opt_method(me, me->owner);
}
}
rb_class_foreach_subclass(klass, check_override_opt_method, (VALUE)mid);
}
/* /*
* klass->method_table[mid] = method_entry(defined_class, visi, def) * klass->method_table[mid] = method_entry(defined_class, visi, def)
* *
@ -579,6 +596,11 @@ rb_method_entry_make(VALUE klass, ID mid, VALUE defined_class, rb_method_visibil
VM_ASSERT(me->def != NULL); VM_ASSERT(me->def != NULL);
/* check optimized method override by a prepended module */
if (RB_TYPE_P(klass, T_MODULE)) {
check_override_opt_method(klass, (VALUE)mid);
}
return me; return me;
} }