From f4ca0739ecf00e9c50aaca55e0ecc5e33dd49284 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 26 Jan 2016 06:14:59 +0000
Subject: compile.c: fix tailcall optimization

* compile.c (iseq_peephole_optimize): don't apply tailcall
  optimization to send/invokesuper instructions with blockiseq.
  This is a follow-up to the changes in r51903; blockiseq is now
  the third operand of send/invokesuper instructions.
  [ruby-core:73413] [Bug #12018]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/test_optimization.rb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'test')

diff --git a/test/ruby/test_optimization.rb b/test/ruby/test_optimization.rb
index 2115fc849d..8804931bca 100644
--- a/test/ruby/test_optimization.rb
+++ b/test/ruby/test_optimization.rb
@@ -275,6 +275,22 @@ class TestRubyOptimization < Test::Unit::TestCase
     assert_equal(123, delay { 123 }.call, bug6901)
   end
 
+  def just_yield
+    yield
+  end
+
+  def test_tailcall_inhibited_by_block
+    assert_separately([], <<~'end;')
+      def just_yield
+        yield
+      end
+      iseq = RubyVM::InstructionSequence
+      result = iseq.compile("just_yield {:ok}", __FILE__, __FILE__, __LINE__,
+                            tailcall_optimization: true).eval
+      assert_equal(:ok, result)
+    end;
+  end
+
   class Bug10557
     def [](_)
       block_given?
-- 
cgit v1.2.3