diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/ruby/test_optimization.rb | 21 | ||||
| -rw-r--r-- | vm_insnhelper.c | 3 |
3 files changed, 29 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Wed Aug 22 11:23:35 2012 Shugo Maeda <shugo@ruby-lang.org> + + * vm_insnhelper.c (vm_setup_method): should not enable tail call + optimization for frames with VM_FRAME_FLAG_FINISH. + [ruby-dev:46065] [Bug #6901] + Wed Aug 22 11:20:47 2012 NARUSE, Yui <naruse@ruby-lang.org> * lib/rubygems/test_case.rb: run test with psych if exist. diff --git a/test/ruby/test_optimization.rb b/test/ruby/test_optimization.rb index ed604e7bc3..1b0c730996 100644 --- a/test/ruby/test_optimization.rb +++ b/test/ruby/test_optimization.rb @@ -160,4 +160,25 @@ class TestRubyOptimization < Test::Unit::TestCase EOF assert_equal(9131, Tailcall.new.fact(3000).to_s.size, bug4082) end + + def test_tailcall_with_block + bug6901 = '[ruby-dev:46065]' + + option = { + tailcall_optimization: true, + trace_instruction: false, + } + iseq = RubyVM::InstructionSequence.new(<<-EOF, "Bug#6901", bug6901, nil, option).eval + def identity(val) + val + end + + def delay + -> { + identity(yield) + } + end + EOF + assert_equal(123, delay { 123 }.call, bug6901) + end end diff --git a/vm_insnhelper.c b/vm_insnhelper.c index b774f1206f..c9c1b222a3 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -510,7 +510,8 @@ vm_setup_method(rb_thread_t *th, rb_control_frame_t *cfp, sp = rsp + iseq->arg_size; - if (LIKELY(!(flag & VM_CALL_TAILCALL_BIT))) { + if (LIKELY(!(flag & VM_CALL_TAILCALL_BIT) || + VM_FRAME_TYPE_FINISH_P(th->cfp))) { if (0) printf("local_size: %d, arg_size: %d\n", iseq->local_size, iseq->arg_size); |