From 7c982059ea464cbdb951eab239afdffb2d0553ca Mon Sep 17 00:00:00 2001 From: ko1 Date: Thu, 25 Dec 2008 03:51:35 +0000 Subject: * proc.c (proc_new): should use proc_dup() if block has Proc. * vm.c (vm_make_proc_from_block): should use rb_cProc for block. * vm.c (vm_make_proc): add an assertion. * bootstraptest/test_proc.rb: add a test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20980 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- proc.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'proc.c') diff --git a/proc.c b/proc.c index 08aac7e366..507ee6167c 100644 --- a/proc.c +++ b/proc.c @@ -353,7 +353,6 @@ proc_new(VALUE klass, int is_lambda) !RUBY_VM_CLASS_SPECIAL_P(cfp->lfp[0])) { block = GC_GUARDED_PTR_REF(cfp->lfp[0]); - cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp); } else { cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp); @@ -363,15 +362,6 @@ proc_new(VALUE klass, int is_lambda) block = GC_GUARDED_PTR_REF(cfp->lfp[0]); - if (block->proc) { - return block->proc; - } - - /* TODO: check more (cfp limit, called via cfunc, etc) */ - while (cfp->dfp != block->dfp) { - cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp); - } - if (is_lambda) { rb_warn("tried to create Proc object without a block"); } @@ -383,8 +373,16 @@ proc_new(VALUE klass, int is_lambda) } procval = block->proc; - if (procval && RBASIC(procval)->klass == klass) { - return procval; + + if (procval) { + if (RBASIC(procval)->klass == klass) { + return procval; + } + else { + VALUE newprocval = proc_dup(procval); + RBASIC(newprocval)->klass = klass; + return newprocval; + } } procval = vm_make_proc(th, block, klass); -- cgit v1.2.3