From 6ab0f648baf9c9f5373837314b4eb3dde7803647 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sun, 24 Mar 2013 16:01:49 +0000 Subject: 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 --- ChangeLog | 7 +++++++ class.c | 6 +++++- test/ruby/test_module.rb | 14 ++++++++++++++ version.h | 2 +- vm.c | 46 ++++++++++++++++++++++++++++++++++++---------- 5 files changed, 63 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index b25209239e..e1106733fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Mar 25 01:00:03 2013 Nobuyoshi Nakada + + * 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. + Mon Mar 25 00:51:57 2013 Nobuyoshi Nakada * Makefile.in (miniruby, ruby): move MAINLIBC because linker arguments diff --git a/class.c b/class.c index c1903f9076..b8e47df8f2 100644 --- a/class.c +++ b/class.c @@ -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); + } } /* diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index 6b9ac4416b..5450c8ff3a 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -1475,6 +1475,20 @@ class TestModule < Test::Unit::TestCase end end + def test_prepend_optmethod + bug7983 = '[ruby-dev:47124] [Bug #7983]' + assert_separately [], %{ + module M + def /(other) + to_f / other + end + end + Fixnum.send(:prepend, M) + assert_equal(0.5, 1 / 2, "#{bug7983}") + } + assert_equal(0, 1 / 2) + end + def test_class_variables m = Module.new m.class_variable_set(:@@foo, 1) diff --git a/version.h b/version.h index 0169b56b2f..ce91fe942c 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-03-25" -#define RUBY_PATCHLEVEL 89 +#define RUBY_PATCHLEVEL 90 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 3 diff --git a/vm.c b/vm.c index 49cc24e2b9..82d4de6e3d 100644 --- a/vm.c +++ b/vm.c @@ -972,28 +972,54 @@ rb_iter_break_value(VALUE val) static st_table *vm_opt_method_table = 0; +static int +vm_redefinition_check_flag(VALUE klass) +{ + if (klass == rb_cFixnum) return FIXNUM_REDEFINED_OP_FLAG; + if (klass == rb_cFloat) return FLOAT_REDEFINED_OP_FLAG; + if (klass == rb_cString) return STRING_REDEFINED_OP_FLAG; + if (klass == rb_cArray) return ARRAY_REDEFINED_OP_FLAG; + if (klass == rb_cHash) return HASH_REDEFINED_OP_FLAG; + if (klass == rb_cBignum) return BIGNUM_REDEFINED_OP_FLAG; + if (klass == rb_cSymbol) return SYMBOL_REDEFINED_OP_FLAG; + if (klass == rb_cTime) return TIME_REDEFINED_OP_FLAG; + return 0; +} + static void rb_vm_check_redefinition_opt_method(const rb_method_entry_t *me, VALUE klass) { st_data_t bop; if (!me->def || me->def->type == VM_METHOD_TYPE_CFUNC) { if (st_lookup(vm_opt_method_table, (st_data_t)me, &bop)) { - int flag = 0; - - if (klass == rb_cFixnum) flag = FIXNUM_REDEFINED_OP_FLAG; - else if (klass == rb_cFloat) flag = FLOAT_REDEFINED_OP_FLAG; - else if (klass == rb_cString) flag = STRING_REDEFINED_OP_FLAG; - else if (klass == rb_cArray) flag = ARRAY_REDEFINED_OP_FLAG; - else if (klass == rb_cHash) flag = HASH_REDEFINED_OP_FLAG; - else if (klass == rb_cBignum) flag = BIGNUM_REDEFINED_OP_FLAG; - else if (klass == rb_cSymbol) flag = SYMBOL_REDEFINED_OP_FLAG; - else if (klass == rb_cTime) flag = TIME_REDEFINED_OP_FLAG; + int flag = vm_redefinition_check_flag(klass); ruby_vm_redefined_flag[bop] |= flag; } } } +static int +check_redefined_method(st_data_t key, st_data_t value, st_data_t data) +{ + ID mid = (ID)key; + rb_method_entry_t *me = (rb_method_entry_t *)value; + VALUE klass = (VALUE)data; + rb_method_entry_t *newme = rb_method_entry(klass, mid, NULL); + + if (newme != me) + rb_vm_check_redefinition_opt_method(me, me->klass); + return ST_CONTINUE; +} + +void +rb_vm_check_redefinition_by_prepend(VALUE klass) +{ + if (!vm_redefinition_check_flag(klass)) return; + st_foreach(RCLASS_M_TBL(RCLASS_ORIGIN(klass)), check_redefined_method, + (st_data_t)klass); +} + static void add_opt_method(VALUE klass, ID mid, VALUE bop) { -- cgit v1.2.3