1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* vm.c (env_mark): fix to mark block.proc.

Browse Source 
* vm.c (th_make_proc_from_block): set created proc to block->proc.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12566 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2007-06-17 17:50:56 +00:00
parent d220634bb7
commit 8adc4541ff
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Mon Jun 18 02:49:16 2007 Koichi Sasada <ko1@atdot.net>
* vm.c (env_mark): fix to mark block.proc.
* vm.c (th_make_proc_from_block): set created proc to block->proc.
Mon Jun 18 02:48:12 2007 Koichi Sasada <ko1@atdot.net> Mon Jun 18 02:48:12 2007 Koichi Sasada <ko1@atdot.net>
* vm_dump.c (vm_stack_dump_raw): hide VM stack trace. * vm_dump.c (vm_stack_dump_raw): hide VM stack trace.

14
vm.c
View File

@ -12,6 +12,7 @@
#include "ruby/ruby.h" #include "ruby/ruby.h"
#include "ruby/node.h" #include "ruby/node.h"
#include "ruby/st.h" #include "ruby/st.h"
// #define MARK_FREE_DEBUG 1
#include "gc.h" #include "gc.h"
#include "yarvcore.h" #include "yarvcore.h"
@ -211,8 +212,10 @@ env_mark(void *ptr)
GC_INFO("env->env\n"); GC_INFO("env->env\n");
rb_gc_mark_locations(env->env, env->env + env->env_size); rb_gc_mark_locations(env->env, env->env + env->env_size);
} }
GC_INFO("env->prev_envval\n"); GC_INFO("env->prev_envval\n");
MARK_UNLESS_NULL(env->prev_envval); MARK_UNLESS_NULL(env->prev_envval);
MARK_UNLESS_NULL(env->block.proc);
if (env->block.iseq) { if (env->block.iseq) {
if (BUILTIN_TYPE(env->block.iseq) == T_NODE) { if (BUILTIN_TYPE(env->block.iseq) == T_NODE) {
@ -438,12 +441,10 @@ th_make_proc_from_block(rb_thread_t *th, rb_control_frame_t *cfp,
bcfp = RUBY_VM_GET_CFP_FROM_BLOCK_PTR(block); bcfp = RUBY_VM_GET_CFP_FROM_BLOCK_PTR(block);
bdfp = bcfp->dfp; bdfp = bcfp->dfp;
procval = th_make_proc(th, bcfp, block); block->proc = procval = th_make_proc(th, bcfp, block);
return procval; return procval;
} }
struct RObject *rb;
VALUE VALUE
th_make_proc(rb_thread_t *th, th_make_proc(rb_thread_t *th,
rb_control_frame_t *cfp, rb_block_t *block) rb_control_frame_t *cfp, rb_block_t *block)
@ -455,9 +456,9 @@ th_make_proc(rb_thread_t *th,
if (!RUBY_VM_CLASS_SPECIAL_P(cfp->lfp[0])) { if (!RUBY_VM_CLASS_SPECIAL_P(cfp->lfp[0])) {
rb_proc_t *p; rb_proc_t *p;
blockprocval = blockprocval = th_make_proc_from_block(
th_make_proc_from_block(th, cfp, th, cfp, (rb_block_t *)GC_GUARDED_PTR_REF(*cfp->lfp));
(rb_block_t *)GC_GUARDED_PTR_REF(*cfp->lfp));
GetProcPtr(blockprocval, p); GetProcPtr(blockprocval, p);
*cfp->lfp = GC_GUARDED_PTR(&p->block); *cfp->lfp = GC_GUARDED_PTR(&p->block);
} }
@ -487,6 +488,7 @@ th_make_proc(rb_thread_t *th,
rb_bug("invalid ptr: block->lfp"); rb_bug("invalid ptr: block->lfp");
} }
} }
return procval; return procval;
} }