diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/ruby/test_optimization.rb | 23 | ||||
| -rw-r--r-- | vm.c | 1 |
3 files changed, 29 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Tue Nov 23 18:54:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * vm.c (rb_thread_mark): should mark self in conrol + frames. [ruby-core:33289] + Tue Nov 23 07:57:31 2010 Tadayoshi Funaba <tadf@dotrb.org> * lib/date/delta/parser.{ry,rb}: fixed a bug of token scanner. diff --git a/test/ruby/test_optimization.rb b/test/ruby/test_optimization.rb index 8e8311e6ef..ed604e7bc3 100644 --- a/test/ruby/test_optimization.rb +++ b/test/ruby/test_optimization.rb @@ -137,4 +137,27 @@ class TestRubyOptimization < Test::Unit::TestCase assert_equal true, MyObj.new == nil end + def test_tailcall + bug4082 = '[ruby-core:33289]' + + option = { + tailcall_optimization: true, + trace_instruction: false, + } + iseq = RubyVM::InstructionSequence.new(<<-EOF, "Bug#4082", bug4082, nil, option).eval + class #{self.class}::Tailcall + def fact_helper(n, res) + if n == 1 + res + else + fact_helper(n - 1, n * res) + end + end + def fact(n) + fact_helper(n, 1) + end + end + EOF + assert_equal(9131, Tailcall.new.fact(3000).to_s.size, bug4082) + end end @@ -1644,6 +1644,7 @@ rb_thread_mark(void *ptr) while (cfp != limit_cfp) { rb_iseq_t *iseq = cfp->iseq; rb_gc_mark(cfp->proc); + rb_gc_mark(cfp->self); if (iseq) { rb_gc_mark(RUBY_VM_NORMAL_ISEQ_P(iseq) ? iseq->self : (VALUE)iseq); } |