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

* compile.c (iseq_compile): clear local table if node == 0.

Browse Source 
a patch from Yusuke ENDOH <mame AT tsg.ne.jp>
* vm.c: clear VM stack.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14632 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2007-12-24 20:27:10 +00:00
parent c94a89a739
commit 95ca3f72a8
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Tue Dec 25 05:24:12 2007 Koichi Sasada <ko1@atdot.net>
* compile.c (iseq_compile): clear local table if node == 0.
a patch from Yusuke ENDOH <mame AT tsg.ne.jp>
* vm.c: clear VM stack.
Tue Dec 25 04:23:32 2007 Tanaka Akira <akr@fsij.org> Tue Dec 25 04:23:32 2007 Tanaka Akira <akr@fsij.org>
* parse.y (rb_id2str): fill klass of returned string as rb_cString. * parse.y (rb_id2str): fill klass of returned string as rb_cString.

1
compile.c
View File

@ -145,6 +145,7 @@ iseq_compile(VALUE self, NODE *node)
if (node == 0) { if (node == 0) {
COMPILE(ret, "nil", node); COMPILE(ret, "nil", node);
iseq_set_local_table(iseq, 0);
} }
else if (nd_type(node) == NODE_SCOPE) { else if (nd_type(node) == NODE_SCOPE) {
/* iseq type of top, method, class, block */ /* iseq type of top, method, class, block */

13
vm.c
View File

@ -1664,10 +1664,15 @@ th_init2(rb_thread_t *th)
th->stack = thread_recycle_stack(th->stack_size); th->stack = thread_recycle_stack(th->stack_size);
th->cfp = (void *)(th->stack + th->stack_size); th->cfp = (void *)(th->stack + th->stack_size);
th->cfp--;
vm_push_frame(th, 0, FRAME_MAGIC_TOP, Qnil, 0, 0,
th->stack, 0, 0);
vm_push_frame(th, 0, FRAME_MAGIC_TOP, Qnil, 0, 0,
th->cfp->sp, 0, 0);
#if 0
th->cfp->pc = 0; th->cfp->pc = 0;
th->cfp->sp = th->stack + 1; th->cfp->sp = th->stack;
th->cfp->bp = 0; th->cfp->bp = 0;
th->cfp->lfp = th->stack; th->cfp->lfp = th->stack;
*th->cfp->lfp = 0; *th->cfp->lfp = 0;
@ -1677,6 +1682,7 @@ th_init2(rb_thread_t *th)
th->cfp->iseq = 0; th->cfp->iseq = 0;
th->cfp->proc = 0; th->cfp->proc = 0;
th->cfp->block_iseq = 0; th->cfp->block_iseq = 0;
#endif
th->status = THREAD_RUNNABLE; th->status = THREAD_RUNNABLE;
th->errinfo = Qnil; th->errinfo = Qnil;
@ -1847,6 +1853,8 @@ Init_BareVM(void)
rb_thread_t *th = ALLOC(rb_thread_t); rb_thread_t *th = ALLOC(rb_thread_t);
MEMZERO(th, rb_thread_t, 1); MEMZERO(th, rb_thread_t, 1);
rb_thread_set_current_raw(th);
vm_init2(vm); vm_init2(vm);
ruby_current_vm = vm; ruby_current_vm = vm;
@ -1859,7 +1867,6 @@ Init_BareVM(void)
th->machine_stack_maxsize /= 2; th->machine_stack_maxsize /= 2;
th->machine_register_stack_maxsize = th->machine_stack_maxsize; th->machine_register_stack_maxsize = th->machine_stack_maxsize;
#endif #endif
rb_thread_set_current_raw(th);
} }
/* top self */ /* top self */