diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-27 08:06:50 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-27 08:06:50 +0000 |
commit | d604893f2065b3797218aa0607b3c21a13c82160 (patch) | |
tree | 85c1d04b9aa6c4af63a3d56248a8a2615950f817 | |
parent | 169ec127e0197bad550e9b2902f4c715d0c0b7a6 (diff) |
merge revision(s) 49221: [Backport #10731]
* vm_method.c (rb_alias): raise a NameError when creating alias to
a refined method if the original method of the refined method is
not defined. [ruby-core:67523] [Bug #10731]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49425 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | test/ruby/test_refinement.rb | 25 | ||||
-rw-r--r-- | version.h | 2 | ||||
-rw-r--r-- | vm_method.c | 4 |
4 files changed, 35 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Tue Jan 27 17:05:43 2015 Seiei Higa <hanachin@gmail.com> + + * vm_method.c (rb_alias): raise a NameError when creating alias to + a refined method if the original method of the refined method is + not defined. [ruby-core:67523] [Bug #10731] + Tue Jan 27 16:49:07 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/readline/readline.c (readline_s_refresh_line): initialize diff --git a/test/ruby/test_refinement.rb b/test/ruby/test_refinement.rb index a98d3332bf..d4a8645db5 100644 --- a/test/ruby/test_refinement.rb +++ b/test/ruby/test_refinement.rb @@ -1016,6 +1016,31 @@ class TestRefinement < Test::Unit::TestCase end; end + def test_alias_refined_method + assert_separately(['-W0'], <<-"end;") + bug10731 = '[ruby-core:67523] [Bug #10731]' + + class C + end + + module RefinementBug + refine C do + def foo + end + + def bar + end + end + end + + assert_raise(NameError, bug10731) do + class C + alias foo bar + end + end + end; + end + private def eval_using(mod, s) @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2015-01-27" -#define RUBY_PATCHLEVEL 620 +#define RUBY_PATCHLEVEL 621 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 1 diff --git a/vm_method.c b/vm_method.c index 47223e2c22..c7f2d0826c 100644 --- a/vm_method.c +++ b/vm_method.c @@ -1221,7 +1221,9 @@ rb_alias(VALUE klass, ID name, ID def) again: orig_me = search_method(klass, def, &defined_class); - if (UNDEFINED_METHOD_ENTRY_P(orig_me)) { + if (UNDEFINED_METHOD_ENTRY_P(orig_me) || + (orig_me->def->type == VM_METHOD_TYPE_REFINED && + UNDEFINED_METHOD_ENTRY_P(orig_me->def->body.orig_me))) { if ((!RB_TYPE_P(klass, T_MODULE)) || (orig_me = search_method(rb_cObject, def, 0), UNDEFINED_METHOD_ENTRY_P(orig_me))) { |