diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | vm_eval.c | 24 |
2 files changed, 18 insertions, 11 deletions
@@ -1,3 +1,8 @@ +Sun Dec 20 23:18:23 2009 Yusuke Endoh <mame@tsg.ne.jp> + + * vm_eval.c (rb_iterate): remove SEGV (use the original patch). + [ruby-dev:39874] + Sun Dec 20 21:26:05 2009 Yusuke Endoh <mame@tsg.ne.jp> * vm_eval.c (rb_iterate): pass current block when the argument bl_proc @@ -820,24 +820,26 @@ rb_iterate(VALUE (* it_proc) (VALUE), VALUE data1, { int state; volatile VALUE retval = Qnil; + NODE *node = NEW_IFUNC(bl_proc, data2); rb_thread_t *th = GET_THREAD(); rb_control_frame_t *volatile cfp = th->cfp; - rb_block_t *blockptr; - if (bl_proc) { - blockptr = RUBY_VM_GET_BLOCK_PTR_IN_CFP(th->cfp); - blockptr->iseq = (void *)NEW_IFUNC(bl_proc, data2); - blockptr->proc = 0; - } - else { - blockptr = GC_GUARDED_PTR_REF(th->cfp->lfp[0]); - } - *(rb_block_t *volatile *)&blockptr = blockptr; TH_PUSH_TAG(th); state = TH_EXEC_TAG(); if (state == 0) { iter_retry: - th->passed_block = *(rb_block_t *volatile *)&blockptr; + { + rb_block_t *blockptr; + if (bl_proc) { + blockptr = RUBY_VM_GET_BLOCK_PTR_IN_CFP(th->cfp); + blockptr->iseq = (void *)NEW_IFUNC(bl_proc, data2); + blockptr->proc = 0; + } + else { + blockptr = GC_GUARDED_PTR_REF(th->cfp->lfp[0]); + } + th->passed_block = blockptr; + } retval = (*it_proc) (data1); } else { |