diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | cont.c | 2 | ||||
| -rw-r--r-- | test/ruby/test_fiber.rb | 24 |
3 files changed, 31 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Wed Jan 30 13:17:53 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * cont.c (cont_restore_thread): svar should be separate per fibers. + [ruby-core:51331] [Bug #7678] + Wed Jan 30 07:15:04 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca> * re.c (reg_operand): Simplify and reuse error handling [Bug #7539] @@ -512,6 +512,8 @@ cont_restore_thread(rb_context_t *cont) th->protect_tag = sth->protect_tag; th->errinfo = sth->errinfo; th->first_proc = sth->first_proc; + th->root_lep = sth->root_lep; + th->root_svar = sth->root_svar; } #if FIBER_USE_NATIVE diff --git a/test/ruby/test_fiber.rb b/test/ruby/test_fiber.rb index dcf1fca50a..38050386c4 100644 --- a/test/ruby/test_fiber.rb +++ b/test/ruby/test_fiber.rb @@ -317,5 +317,29 @@ class TestFiber < Test::Unit::TestCase size_large = invoke_rec script, vm_stack_size, 1024 * 1024 * 10 assert_operator(size_default, :<=, size_large) end + + def test_separate_lastmatch + bug7678 = '[ruby-core:51331]' + /a/ =~ "a" + m1 = $~ + m2 = nil + Fiber.new do + /b/ =~ "b" + m2 = $~ + end.resume + assert_equal("b", m2[0]) + assert_equal(m1, $~, bug7678) + end + + def test_separate_lastline + bug7678 = '[ruby-core:51331]' + $_ = s1 = "outer" + s2 = nil + Fiber.new do + s2 = "inner" + end.resume + assert_equal("inner", s2) + assert_equal(s1, $_, bug7678) + end end |