From 5961c8026c4bde34113a482e515a055954a29992 Mon Sep 17 00:00:00 2001
From: Seiei Higa <hanachin@gmail.com>
Date: Thu, 15 Jan 2015 20:19:39 +0900
Subject: [PATCH] proc.c: Kernel#singleton_method should not use refinements

* proc.c (rb_obj_singleton_method): Kernel#singleton_method should
  not use refinements.  [ruby-core:67603] [Bug #10744]
---
 proc.c                       |  4 ++--
 test/ruby/test_refinement.rb | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/proc.c b/proc.c
index 805f7b9..0f56d0d 100644
--- a/proc.c
+++ b/proc.c
@@ -1528,7 +1528,8 @@ rb_obj_singleton_method(VALUE obj, VALUE vid)
 			  QUOTE(vid), obj);
     }
     if (NIL_P(klass = rb_singleton_class_get(obj)) ||
-	!(me = rb_method_entry_at(klass, id))) {
+	UNDEFINED_METHOD_ENTRY_P(me = rb_method_entry_at(klass, id)) ||
+        UNDEFINED_REFINED_METHOD_P(me->def)) {
 	rb_name_error(id, "undefined singleton method `%"PRIsVALUE"' for `%"PRIsVALUE"'",
 		      QUOTE_ID(id), obj);
     }
@@ -2831,4 +2832,3 @@ Init_Binding(void)
     rb_define_method(rb_cBinding, "receiver", bind_receiver, 0);
     rb_define_global_function("binding", rb_f_binding, 0);
 }
-
diff --git a/test/ruby/test_refinement.rb b/test/ruby/test_refinement.rb
index 884d031..596c679 100644
--- a/test/ruby/test_refinement.rb
+++ b/test/ruby/test_refinement.rb
@@ -1217,6 +1217,24 @@ class C
     end;
   end
 
+  def test_singleton_method_should_not_use_refinements
+    assert_separately([], <<-"end;")
+    bug10744 = '[ruby-core:67603] [Bug #10744]'
+
+    class C
+    end
+
+    module RefinementBug
+      refine C.singleton_class do
+        def foo
+        end
+      end
+    end
+
+    assert_raise(NameError, bug10744) { C.singleton_method(:foo) }
+    end;
+  end
+
   private
 
   def eval_using(mod, s)
-- 
2.2.1