From 8dc89b34c16373e67e2dad5ed6c1aea5aa48bf82 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 23 Oct 2014 10:13:29 +0000 Subject: [PATCH] vm_method.c: no redefinition warnings for undefined methods * 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/trunk@48111 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/ruby/test_object.rb | 6 ++++++ vm_method.c | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b0891ca115..b0af89a968 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Oct 23 19:13:26 2014 Nobuyoshi Nakada + + * 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 17:19:04 2014 Kouhei Sutou * lib/rexml/source.rb (REXML::IOSource#encoding_updated): Fix a diff --git a/test/ruby/test_object.rb b/test/ruby/test_object.rb index 2af8f04d5b..c3e355162f 100644 --- a/test/ruby/test_object.rb +++ b/test/ruby/test_object.rb @@ -318,6 +318,12 @@ class TestObject < Test::Unit::TestCase $VERBOSE = false def (Object.new).__send__; end INPUT + + bug10421 = '[ruby-dev:48691] [Bug #10421]' + assert_in_out_err([], <<-INPUT, [], [], bug10421) + $VERBOSE = false + def (BasicObject.new).object_id; end + INPUT end def test_remove_method diff --git a/vm_method.c b/vm_method.c index ffcf5be339..c8113e5b8e 100644 --- a/vm_method.c +++ b/vm_method.c @@ -379,7 +379,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 && rb_method_boundp(klass, mid, 0)) { rb_warn("redefining `%s' may cause serious problems", rb_id2name(mid)); } }