diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-27 04:28:03 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-27 04:28:03 +0000 |
commit | 2c31816f1abd48cadda2e91262e0b30913fe1694 (patch) | |
tree | 89510593ffe15d2d822e2c5da12fdcd0673270d1 | |
parent | 4a5d839ceb4f08aff4843abc6b369b12a97e02e7 (diff) |
merge revision(s) 48111,48118,48120: [Backport #10421]
* vm_method.c (rb_method_entry_make): warn redefinition only for
already defined methods, but not for undefined methods.
[ruby-dev:48691] [Bug #10421]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@48149 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | test/ruby/test_object.rb | 9 | ||||
-rw-r--r-- | version.h | 6 | ||||
-rw-r--r-- | vm_method.c | 3 |
4 files changed, 20 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Mon Oct 27 13:26:46 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * vm_method.c (rb_method_entry_make): warn redefinition only for + already defined methods, but not for undefined methods. + [ruby-dev:48691] [Bug #10421] + Thu Oct 23 18:56:55 2014 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> * ext/openssl/lib/openssl/ssl.rb (DEFAULT_PARAMS): override diff --git a/test/ruby/test_object.rb b/test/ruby/test_object.rb index 11fa1acc02..a9d2dc7ed2 100644 --- a/test/ruby/test_object.rb +++ b/test/ruby/test_object.rb @@ -285,6 +285,15 @@ class TestObject < Test::Unit::TestCase $VERBOSE = false def (Object.new).__send__; end INPUT + + bug10421 = '[ruby-dev:48691] [Bug #10421]' + assert_in_out_err([], <<-INPUT, ["1"], [], bug10421) + $VERBOSE = false + class C < BasicObject + def object_id; 1; end + end + puts C.new.object_id + INPUT end def test_remove_method @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2014-10-23" -#define RUBY_PATCHLEVEL 592 +#define RUBY_RELEASE_DATE "2014-10-27" +#define RUBY_PATCHLEVEL 593 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 10 -#define RUBY_RELEASE_DAY 23 +#define RUBY_RELEASE_DAY 27 #include "ruby/version.h" diff --git a/vm_method.c b/vm_method.c index 8af656cd1e..0258f36d99 100644 --- a/vm_method.c +++ b/vm_method.c @@ -172,6 +172,7 @@ rb_free_method_entry(rb_method_entry_t *me) xfree(me); } +static inline rb_method_entry_t *search_method(VALUE klass, ID id, VALUE *defined_class_ptr); static int rb_method_definition_eq(const rb_method_definition_t *d1, const rb_method_definition_t *d2); static inline rb_method_entry_t * @@ -332,7 +333,7 @@ rb_method_entry_make(VALUE klass, ID mid, rb_method_type_t type, } /* check mid */ if (mid == object_id || mid == id__send__) { - if (type == VM_METHOD_TYPE_ISEQ) { + if (type == VM_METHOD_TYPE_ISEQ && search_method(klass, mid, 0)) { rb_warn("redefining `%s' may cause serious problems", rb_id2name(mid)); } } |