From c7770f90bdcac04dad43ab38bef9c415433597cb Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 3 Apr 2018 06:57:43 +0000
Subject: Fix Kernel#singleton_method with Module#Prepend

* proc.c (rb_obj_singleton_method): search the method entry from
  the origin class, for fix prepended modules.  [Bug #14658]

From: Vasiliy Ermolovich <younash@gmail.com>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63067 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 proc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'proc.c')

diff --git a/proc.c b/proc.c
index 7134f68234..551a135e02 100644
--- a/proc.c
+++ b/proc.c
@@ -1771,11 +1771,11 @@ VALUE
 rb_obj_singleton_method(VALUE obj, VALUE vid)
 {
     const rb_method_entry_t *me;
-    VALUE klass;
+    VALUE klass = RCLASS_ORIGIN(rb_singleton_class_get(obj));
     ID id = rb_check_id(&vid);
 
     if (!id) {
-	if (!NIL_P(klass = rb_singleton_class_get(obj)) &&
+	if (!NIL_P(klass) &&
 	    respond_to_missing_p(klass, obj, vid, FALSE)) {
 	    id = rb_intern_str(vid);
 	    return mnew_missing(klass, obj, id, rb_cMethod);
@@ -1784,7 +1784,7 @@ rb_obj_singleton_method(VALUE obj, VALUE vid)
 	rb_name_err_raise("undefined singleton method `%1$s' for `%2$s'",
 			  obj, vid);
     }
-    if (NIL_P(klass = rb_singleton_class_get(obj)) ||
+    if (NIL_P(klass) ||
 	UNDEFINED_METHOD_ENTRY_P(me = rb_method_entry_at(klass, id)) ||
 	UNDEFINED_REFINED_METHOD_P(me->def)) {
 	vid = ID2SYM(id);
-- 
cgit v1.2.3