naruse	2015-01-17 16:36:38 +0900 (Sat, 17 Jan 2015)

  New Revision: 49297

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49297

  Log:
    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]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/test/ruby/test_refinement.rb
    branches/ruby_2_2/version.h
    branches/ruby_2_2/vm_method.c
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 49296)
+++ ruby_2_2/ChangeLog	(revision 49297)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Sat Jan 17 16:35:59 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]
+
 Sat Jan 17 16:16:14 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* dir.c (glob_helper): match in case-folding only if the directory
Index: ruby_2_2/vm_method.c
===================================================================
--- ruby_2_2/vm_method.c	(revision 49296)
+++ ruby_2_2/vm_method.c	(revision 49297)
@@ -825,7 +825,9 @@ rb_export_method(VALUE klass, ID name, r https://github.com/ruby/ruby/blob/trunk/ruby_2_2/vm_method.c#L825
 	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_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49296)
+++ ruby_2_2/version.h	(revision 49297)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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
Index: ruby_2_2/test/ruby/test_refinement.rb
===================================================================
--- ruby_2_2/test/ruby/test_refinement.rb	(revision 49296)
+++ ruby_2_2/test/ruby/test_refinement.rb	(revision 49297)
@@ -1165,6 +1165,20 @@ class TestRefinement < Test::Unit::TestC https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_refinement.rb#L1165
     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_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49182-49183


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/