From 2ff56cc9b4dd3566277d2201774f80fef9aefdde Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 5 Mar 2013 11:29:27 +0000
Subject: [PATCH] proc.c: revert r39224

* proc.c (mnew): revert r39224.  [ruby-core:53038] [Bug #7988]


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

diff --git a/ChangeLog b/ChangeLog
index 0de1d664ed..d8e33b7aed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Mar  5 20:29:25 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (mnew): revert r39224.  [ruby-core:53038] [Bug #7988]
+
 Tue Mar  5 20:23:54 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* include/ruby/intern.h (rb_check_arity): make a static inline
diff --git a/proc.c b/proc.c
index ad53982b16..c86cb1c3ac 100644
--- a/proc.c
+++ b/proc.c
@@ -949,7 +949,6 @@ mnew(VALUE klass, VALUE obj, ID id, VALUE mclass, int scope)
     rb_method_flag_t flag = NOEX_UNDEF;
 
   again:
-    if (klass) klass = RCLASS_ORIGIN(klass);
     me = rb_method_entry_without_refinements(klass, id, &defined_class);
     if (UNDEFINED_METHOD_ENTRY_P(me)) {
 	ID rmiss = rb_intern("respond_to_missing?");
diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb
index 7de4479a2b..ef4943c345 100644
--- a/test/ruby/test_method.rb
+++ b/test/ruby/test_method.rb
@@ -550,6 +550,7 @@ class TestMethod < Test::Unit::TestCase
 
   def test_prepended
     bug7836 = '[ruby-core:52160] [Bug #7836]'
+    bug7988 = '[ruby-core:53038] [Bug #7988]'
     m = Module.new {
       def foo
       end
@@ -559,7 +560,7 @@ class TestMethod < Test::Unit::TestCase
       end
       prepend m
     }
-    assert_equal(c, c.instance_method(:foo).owner, bug7836)
+    assert_raise(NameError, bug7988) {Module.new{prepend m}.instance_method(:bar)}
   end
 
   def test_gced_bmethod