usa	2015-01-27 17:06:50 +0900 (Tue, 27 Jan 2015)

  New Revision: 49425

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

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

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/test/ruby/test_refinement.rb
    branches/ruby_2_0_0/version.h
    branches/ruby_2_0_0/vm_method.c
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 49424)
+++ ruby_2_0_0/ChangeLog	(revision 49425)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Tue Jan 27 17:05:43 2015  Seiei Higa  <hanachin@g...>
+
+	* 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@r...>
 
 	* ext/readline/readline.c (readline_s_refresh_line): initialize
Index: ruby_2_0_0/vm_method.c
===================================================================
--- ruby_2_0_0/vm_method.c	(revision 49424)
+++ ruby_2_0_0/vm_method.c	(revision 49425)
@@ -1221,7 +1221,9 @@ rb_alias(VALUE klass, ID name, ID def) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/vm_method.c#L1221
   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))) {
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 49424)
+++ ruby_2_0_0/version.h	(revision 49425)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #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
Index: ruby_2_0_0/test/ruby/test_refinement.rb
===================================================================
--- ruby_2_0_0/test/ruby/test_refinement.rb	(revision 49424)
+++ ruby_2_0_0/test/ruby/test_refinement.rb	(revision 49425)
@@ -1016,6 +1016,31 @@ class TestRefinement < Test::Unit::TestC https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/test_refinement.rb#L1016
     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)

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49221


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