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

* thread.c (thread_start_func_2): see first_func, not first_proc,

Browse Source 
to decide which to use.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25748 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-11-13 07:22:04 +00:00
parent 9a9cc65035
commit 9ba317f157
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,4 +1,7 @@
Fri Nov 13 11:09:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Nov 13 16:22:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread.c (thread_start_func_2): see first_func, not first_proc,
to decide which to use.
* gc.c (vm_xrealloc): use the given object space. * gc.c (vm_xrealloc): use the given object space.

4
thread.c
View File

@ -420,7 +420,7 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s
TH_PUSH_TAG(th); TH_PUSH_TAG(th);
if ((state = EXEC_TAG()) == 0) { if ((state = EXEC_TAG()) == 0) {
SAVE_ROOT_JMPBUF(th, { SAVE_ROOT_JMPBUF(th, {
if (th->first_proc) { if (!th->first_func) {
GetProcPtr(th->first_proc, proc); GetProcPtr(th->first_proc, proc);
th->errinfo = Qnil; th->errinfo = Qnil;
th->local_lfp = proc->block.lfp; th->local_lfp = proc->block.lfp;
@ -429,7 +429,7 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s
(int)RARRAY_LEN(args), RARRAY_PTR(args), 0); (int)RARRAY_LEN(args), RARRAY_PTR(args), 0);
} }
else { else {
th->value = (*th->first_func)((void *)th->first_args); th->value = (*th->first_func)((void *)args);
} }
}); });
} }