ruby-changes:37705
From: nagachika <ko1@a...>
Date: Sun, 1 Mar 2015 02:29:13 +0900 (JST)
Subject: [ruby-changes:37705] nagachika:r49786 (ruby_2_1): merge revision(s) r49182, r49183: [Backport #10706]
nagachika 2015-03-01 02:28:57 +0900 (Sun, 01 Mar 2015) New Revision: 49786 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49786 Log: merge revision(s) r49182,r49183: [Backport #10706] vm_method.c: fix change refined new method visibility * vm_method.c (rb_export_method): bail out if the original method is undefined when the method is refined. [ruby-core:67387] [Bug #10706] Modified directories: branches/ruby_2_1/ Modified files: branches/ruby_2_1/ChangeLog branches/ruby_2_1/test/ruby/test_refinement.rb branches/ruby_2_1/version.h branches/ruby_2_1/vm_method.c Index: ruby_2_1/ChangeLog =================================================================== --- ruby_2_1/ChangeLog (revision 49785) +++ ruby_2_1/ChangeLog (revision 49786) @@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1 +Sun Mar 1 01:17:24 2015 Seiei Higa <hanachin@g...> + + * vm_method.c (rb_export_method): bail out if the original method + is undefined when the method is refined. + [ruby-core:67387] [Bug #10706] + Sun Mar 1 01:14:59 2015 Eric Wong <e@8...> * lib/resolv.rb: consider ENETUNREACH as ResolvTimeout Index: ruby_2_1/vm_method.c =================================================================== --- ruby_2_1/vm_method.c (revision 49785) +++ ruby_2_1/vm_method.c (revision 49786) @@ -811,7 +811,9 @@ rb_export_method(VALUE klass, ID name, r https://github.com/ruby/ruby/blob/trunk/ruby_2_1/vm_method.c#L811 me = search_method(rb_cObject, name, &defined_class); } - if (UNDEFINED_METHOD_ENTRY_P(me)) { + if (UNDEFINED_METHOD_ENTRY_P(me) || + (me->def->type == VM_METHOD_TYPE_REFINED && + UNDEFINED_METHOD_ENTRY_P(me->def->body.orig_me))) { rb_print_undef(klass, name, 0); } Index: ruby_2_1/version.h =================================================================== --- ruby_2_1/version.h (revision 49785) +++ ruby_2_1/version.h (revision 49786) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1 #define RUBY_VERSION "2.1.5" #define RUBY_RELEASE_DATE "2015-03-01" -#define RUBY_PATCHLEVEL 303 +#define RUBY_PATCHLEVEL 304 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 3 Index: ruby_2_1/test/ruby/test_refinement.rb =================================================================== --- ruby_2_1/test/ruby/test_refinement.rb (revision 49785) +++ ruby_2_1/test/ruby/test_refinement.rb (revision 49786) @@ -1167,6 +1167,20 @@ class TestRefinement < Test::Unit::TestC https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/ruby/test_refinement.rb#L1167 end; end + def test_change_refined_new_method_visibility + assert_separately([], <<-"end;") + bug10706 = '[ruby-core:67387] [Bug #10706]' + module RefinementBug + refine Object do + def foo + end + end + end + + assert_raise(NameError, bug10706) {private(:foo)} + end; + end + private def eval_using(mod, s) Property changes on: ruby_2_1 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r49182-49183 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/