From 834d2bbe4d63afd855b2e31946b5cbe9b99e9c47 Mon Sep 17 00:00:00 2001
From: shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 26 May 2015 13:16:18 +0000
Subject: [PATCH] * vm_method.c (rb_alias): should resolve refined methods.  
 [ruby-core:69360] [Bug #11182]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50642 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                    |  5 +++++
 test/ruby/test_refinement.rb | 26 ++++++++++++++++++++++++++
 vm_method.c                  |  3 +++
 3 files changed, 34 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 5c09f89bb2..72650894c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 26 22:10:43 2015  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_method.c (rb_alias): should resolve refined methods.
+	  [ruby-core:69360] [Bug #11182]
+
 Tue May 26 21:35:13 2015  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* include/ruby/defines.h (RUBY_ATTR_ALLOC_SIZE): fix condition.
diff --git a/test/ruby/test_refinement.rb b/test/ruby/test_refinement.rb
index fa8de1b85e..80f44ab706 100644
--- a/test/ruby/test_refinement.rb
+++ b/test/ruby/test_refinement.rb
@@ -1455,6 +1455,32 @@ class TestRefinement < Test::Unit::TestCase
     }
   end
 
+  def test_alias_refined_method2
+    bug11182 = '[ruby-core:69360]'
+    assert_in_out_err([], <<-INPUT, ["C"], [], bug11182)
+      class C
+        def foo
+          puts "C"
+        end
+      end
+
+      module M
+        refine C do
+          def foo
+            puts "Refiend C"
+          end
+        end
+      end
+
+      class D < C
+        alias bar foo
+      end
+
+      using M
+      D.new.bar
+    INPUT
+  end
+
   private
 
   def eval_using(mod, s)
diff --git a/vm_method.c b/vm_method.c
index 1acd7226a2..e3d6b41a31 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -1303,6 +1303,9 @@ rb_alias(VALUE klass, ID name, ID def)
 
   again:
     orig_me = search_method(klass, def, &defined_class);
+    if (orig_me && orig_me->def->type == VM_METHOD_TYPE_REFINED) {
+	orig_me = rb_resolve_refined_method(Qnil, orig_me, &defined_class);
+    }
 
     if (UNDEFINED_METHOD_ENTRY_P(orig_me) ||
 	UNDEFINED_REFINED_METHOD_P(orig_me->def)) {