From fd13ad8cdc5991e9fda6d5f9610b32cf160f554c Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 14 Dec 2009 03:39:41 +0000
Subject: merge revision(s) 25975: 	* eval.c (proc_invoke): unbound block
 created by define_method 	  cannot call super.  [ruby-core:26984]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@26091 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 eval.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'eval.c')

diff --git a/eval.c b/eval.c
index ab7dbd0b4f..b52aef053b 100644
--- a/eval.c
+++ b/eval.c
@@ -8872,7 +8872,8 @@ proc_invoke(proc, args, self, klass)
     _block = *data;
     _block.block_obj = bvar;
     if (self != Qundef) _block.frame.self = self;
-    if (klass) _block.frame.last_class = klass;
+    _block.frame.last_class = klass;
+    if (!klass) _block.frame.last_func = 0;
     _block.frame.argc = RARRAY(tmp)->len;
     _block.frame.flags = ruby_frame->flags;
     if (_block.frame.argc && DMETHOD_P()) {
-- 
cgit v1.2.3