summaryrefslogtreecommitdiff
path: root/cont.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-17 07:06:50 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-17 07:06:50 +0000
commit147107ce36eb1231fb79af066ab172d5003d3a1a (patch)
treef8d45d8ea908b88943daea139b9dc479e51c7f03 /cont.c
parent97c77bacfb24994cc0f5c33731a88f59ad0b6e79 (diff)
merge revision(s) 57968,57969,57970: [Backport #13313]
thread.c: thread_do_start * thread.c (thread_do_start): extract from a macro in thread_start_func_2 for debugger. thread.c: Thread.start with Symbol * thread.c (thread_do_start): fix segfault at start with Symbol. proc created by Symbol#to_proc does not have environment unless using refinements. [ruby-core:80147] [Bug #13313] Fiber also has same issue. [Bug #13313] * thread.c (rb_vm_proc_local_ep): added. * cont.c (rb_fiber_start): use rb_vm_proc_local_ep(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@58003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'cont.c')
-rw-r--r--cont.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cont.c b/cont.c
index 6760cb3504..ab4f2bc830 100644
--- a/cont.c
+++ b/cont.c
@@ -1277,7 +1277,7 @@ rb_fiber_start(void)
argv = (argc = cont->argc) > 1 ? RARRAY_CONST_PTR(args) : &args;
cont->value = Qnil;
th->errinfo = Qnil;
- th->root_lep = rb_vm_ep_local_ep(vm_block_ep(&proc->block));
+ th->root_lep = rb_vm_proc_local_ep(cont->saved_thread.first_proc);
th->root_svar = Qfalse;
fib->status = RUNNING;