From 5256bca931a809d8518c55b2d98e8169a128b37e Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 11 Aug 2003 08:35:54 +0000
Subject: [PATCH] * eval.c (rb_call_super): do not use rb_block_given_p() for  
 check. [ruby-talk:78656]

* eval.c (BEGIN_CALLARGS): push ITER_NOT only when ITER_PRE.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4365 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 7 +++++++
 eval.c    | 8 +++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 33280ba990..ea42e0ea2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Aug 11 17:33:07 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call_super): do not use rb_block_given_p() for
+	  check. [ruby-talk:78656]
+
+	* eval.c (BEGIN_CALLARGS): push ITER_NOT only when ITER_PRE.
+
 Sun Aug 10 10:43:05 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/lib/openssl/buffering.rb: increase BLOCK_SIZE
diff --git a/eval.c b/eval.c
index 46a1b7ad8a..6ed377fe6d 100644
--- a/eval.c
+++ b/eval.c
@@ -1961,10 +1961,12 @@ copy_node_scope(node, rval)
 
 #define BEGIN_CALLARGS do {\
     struct BLOCK *tmp_block = ruby_block;\
-    if (ruby_iter->iter == ITER_PRE) {\
+    int tmp_iter = ruby_iter->iter;\
+    if (tmp_iter == ITER_PRE) {\
 	ruby_block = ruby_block->outer;\
+        tmp_iter = ITER_NOT;\
     }\
-    PUSH_ITER(ITER_NOT)
+    PUSH_ITER(tmp_iter)
 
 #define END_CALLARGS \
     ruby_block = tmp_block;\
@@ -5239,7 +5241,7 @@ rb_call_super(argc, argv)
 	klass = k;
     }
 
-    PUSH_ITER(ruby_iter->iter || rb_block_given_p() ? ITER_PRE : ITER_NOT);
+    PUSH_ITER(ruby_iter->iter ? ITER_PRE : ITER_NOT);
     result = rb_call(RCLASS(klass)->super, self, ruby_frame->orig_func, argc, argv, 3);
     POP_ITER();