* vm_insnhelper.h: remove magical code "lfp[0] & 0x02".

  Current VM doesn't use this bit.
* vm_core.h (RUBY_VM_GET_BLOCK_PTR): added.
* eval.c (rb_block_given_p): use RUBY_VM_GET_BLOCK_PTR().
* vm_eval.c (rb_f_block_given_p): ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35908 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 3 deletions

diff --git a/vm_eval.c b/vm_eval.c
index c1b79f5061..8ea149c459 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -1660,9 +1660,7 @@ rb_f_block_given_p(void)
     rb_control_frame_t *cfp = th->cfp;
     cfp = vm_get_ruby_level_caller_cfp(th, RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp));
 
-    if (cfp != 0 &&
-	(cfp->lfp[0] & 0x02) == 0 &&
-	GC_GUARDED_PTR_REF(cfp->lfp[0])) {
+    if (cfp != 0 && RUBY_VM_GET_BLOCK_PTR(cfp)) {
 	return Qtrue;
     }
     else {