aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-17 04:31:10 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-17 04:31:10 +0000
commit7b2b8319592f556bc5a9fc31e0b60d33a41309c7 (patch)
tree1cbd62de396cc3ded860d84ae91e7f452d56d111
parentfdbb82967f54491b3b209af8f2d4aeedfb5ea214 (diff)
downloadruby-7b2b8319592f556bc5a9fc31e0b60d33a41309c7.tar.gz
test_optimization.rb: tailcall
* test/ruby/test_optimization.rb (TestRubyOptimization.tailcall): helper method to compile methods with tailcall optimization enabled. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54141 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/ruby/test_optimization.rb78
1 files changed, 41 insertions, 37 deletions
diff --git a/test/ruby/test_optimization.rb b/test/ruby/test_optimization.rb
index 8804931bca..2b414ec5b5 100644
--- a/test/ruby/test_optimization.rb
+++ b/test/ruby/test_optimization.rb
@@ -230,47 +230,54 @@ class TestRubyOptimization < Test::Unit::TestCase
assert_equal true, MyObj.new == nil
end
+ def self.tailcall(klass, src, file = nil, path = nil, line = nil)
+ unless file
+ loc, = caller_locations(1, 1)
+ file = loc.path
+ line ||= loc.lineno
+ end
+ RubyVM::InstructionSequence.new("proc {|_|_.class_eval {#{src}}}",
+ file, (path || file), line,
+ tailcall_optimization: true,
+ trace_instruction: false)
+ .eval[klass]
+ end
+
+ def tailcall(*args)
+ self.class.tailcall(singleton_class, *args)
+ end
+
def test_tailcall
bug4082 = '[ruby-core:33289]'
- option = {
- tailcall_optimization: true,
- trace_instruction: false,
- }
- 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)
+ tailcall(<<-EOF)
+ 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
EOF
- assert_equal(9131, Tailcall.new.fact(3000).to_s.size, bug4082)
+ assert_equal(9131, fact(3000).to_s.size, bug4082)
end
def test_tailcall_with_block
bug6901 = '[ruby-dev:46065]'
- option = {
- tailcall_optimization: true,
- trace_instruction: false,
- }
- RubyVM::InstructionSequence.new(<<-EOF, "Bug#6901", bug6901, nil, option).eval
- def identity(val)
- val
- end
+ tailcall(<<-EOF)
+ def identity(val)
+ val
+ end
- def delay
- -> {
- identity(yield)
- }
- end
+ def delay
+ -> {
+ identity(yield)
+ }
+ end
EOF
assert_equal(123, delay { 123 }.call, bug6901)
end
@@ -280,15 +287,12 @@ class TestRubyOptimization < Test::Unit::TestCase
end
def test_tailcall_inhibited_by_block
- assert_separately([], <<~'end;')
- def just_yield
- yield
+ tailcall(<<-EOF)
+ def yield_result
+ just_yield {:ok}
end
- iseq = RubyVM::InstructionSequence
- result = iseq.compile("just_yield {:ok}", __FILE__, __FILE__, __LINE__,
- tailcall_optimization: true).eval
- assert_equal(:ok, result)
- end;
+ EOF
+ assert_equal(:ok, yield_result)
end
class Bug10557