diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-24 16:01:49 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-24 16:01:49 +0000 |
commit | 6ab0f648baf9c9f5373837314b4eb3dde7803647 (patch) | |
tree | fc0fabd3f92be06119b148a57c234b23905bb1db /class.c | |
parent | b7880f1f7ec05ce05abd06f14092a1711c69ad12 (diff) |
merge revision(s) 39601 and 39602(partially): [Backport #7983]
* class.c (rb_prepend_module): check redefinition of built-in optimized
methods. [ruby-dev:47124] [Bug #7983]
* vm.c (rb_vm_check_redefinition_by_prepend): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39912 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'class.c')
-rw-r--r-- | class.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -790,6 +790,7 @@ move_refined_method(st_data_t key, st_data_t value, st_data_t data) void rb_prepend_module(VALUE klass, VALUE module) { + void rb_vm_check_redefinition_by_prepend(VALUE klass); VALUE origin; int changed = 0; @@ -816,7 +817,10 @@ rb_prepend_module(VALUE klass, VALUE module) changed = include_modules_at(klass, klass, module); if (changed < 0) rb_raise(rb_eArgError, "cyclic prepend detected"); - if (changed) rb_clear_cache(); + if (changed) { + rb_clear_cache(); + rb_vm_check_redefinition_by_prepend(klass); + } } /* |