ko1	2017-03-14 15:52:44 +0900 (Tue, 14 Mar 2017)

  New Revision: 57970

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57970

  Log:
    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().

  Modified files:
    trunk/cont.c
    trunk/test/ruby/test_fiber.rb
    trunk/thread.c
    trunk/vm_core.h
Index: vm_core.h
===================================================================
--- vm_core.h	(revision 57969)
+++ vm_core.h	(revision 57970)
@@ -1166,6 +1166,8 @@ VM_STACK_ENV_WRITE(const VALUE *ep, int https://github.com/ruby/ruby/blob/trunk/vm_core.h#L1166
 }
 
 const VALUE *rb_vm_ep_local_ep(const VALUE *ep);
+const VALUE *rb_vm_proc_local_ep(VALUE proc);
+
 VALUE rb_vm_frame_block_handler(const rb_control_frame_t *cfp);
 
 #define RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp) ((cfp)+1)
Index: test/ruby/test_fiber.rb
===================================================================
--- test/ruby/test_fiber.rb	(revision 57969)
+++ test/ruby/test_fiber.rb	(revision 57970)
@@ -344,5 +344,13 @@ class TestFiber < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_fiber.rb#L344
     assert_equal("inner", s2)
     assert_equal(s1, $_, bug7678)
   end
+
+  def test_new_symbol_proc
+    bug = '[ruby-core:80147] [Bug #13313]'
+    assert_ruby_status([], "#{<<-"begin;"}\n#{<<-'end;'}", bug)
+    begin;
+      exit("1" == Fiber.new(&:to_s).resume(1))
+    end;
+  end
 end
 
Index: thread.c
===================================================================
--- thread.c	(revision 57969)
+++ thread.c	(revision 57970)
@@ -550,16 +550,28 @@ ruby_thread_init_stack(rb_thread_t *th) https://github.com/ruby/ruby/blob/trunk/thread.c#L550
     native_thread_init_stack(th);
 }
 
+const VALUE *
+rb_vm_proc_local_ep(VALUE proc)
+{
+    const VALUE *ep = vm_proc_ep(proc);
+
+    if (ep) {
+	return rb_vm_ep_local_ep(ep);
+    }
+    else {
+	return NULL;
+    }
+}
+
 static void
 thread_do_start(rb_thread_t *th, VALUE args)
 {
     native_set_thread_name(th);
     if (!th->first_func) {
-	const VALUE *ep = vm_proc_ep(th->first_proc);
 	rb_proc_t *proc;
 	GetProcPtr(th->first_proc, proc);
 	th->errinfo = Qnil;
-	th->root_lep = ep ? rb_vm_ep_local_ep(ep) : NULL;
+	th->root_lep = rb_vm_proc_local_ep(th->first_proc);
 	th->root_svar = Qfalse;
 	EXEC_EVENT_HOOK(th, RUBY_EVENT_THREAD_BEGIN, th->self, 0, 0, 0, Qundef);
 	th->value = rb_vm_invoke_proc(th, proc,
Index: cont.c
===================================================================
--- cont.c	(revision 57969)
+++ cont.c	(revision 57970)
@@ -1275,7 +1275,7 @@ rb_fiber_start(void) https://github.com/ruby/ruby/blob/trunk/cont.c#L1275
 	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;
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/