From 2ca46bfc9d7ee33e940e5fa885ec59a6e0b22298 Mon Sep 17 00:00:00 2001 From: naruse Date: Sat, 17 Jan 2015 07:36:38 +0000 Subject: merge revision(s) 49182,49183: [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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49297 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/ruby/test_refinement.rb | 14 ++++++++++++++ version.h | 2 +- vm_method.c | 4 +++- 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index dfd53f6645..b6db2ed116 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Jan 17 16:35:59 2015 Seiei Higa + + * vm_method.c (rb_export_method): bail out if the original method + is undefined when the method is refined. + [ruby-core:67387] [Bug #10706] + Sat Jan 17 16:16:14 2015 Nobuyoshi Nakada * dir.c (glob_helper): match in case-folding only if the directory diff --git a/test/ruby/test_refinement.rb b/test/ruby/test_refinement.rb index 11077b6e4d..8553c42e18 100644 --- a/test/ruby/test_refinement.rb +++ b/test/ruby/test_refinement.rb @@ -1165,6 +1165,20 @@ class TestRefinement < Test::Unit::TestCase 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) diff --git a/version.h b/version.h index f853235037..f74f0ad712 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.0" #define RUBY_RELEASE_DATE "2015-01-17" -#define RUBY_PATCHLEVEL 19 +#define RUBY_PATCHLEVEL 20 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 1 diff --git a/vm_method.c b/vm_method.c index 8af2198dbd..97ae64f55d 100644 --- a/vm_method.c +++ b/vm_method.c @@ -825,7 +825,9 @@ rb_export_method(VALUE klass, ID name, rb_method_flag_t noex) 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); } -- cgit v1.2.3