diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-30 12:21:37 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-30 12:21:37 +0000 |
| commit | 75b1146985c30a4981c55e2d3e5458c686c63fe6 (patch) | |
| tree | 30ab25a4089fb3dfa884f19a367d9998cac3b3d9 /test | |
| parent | 2459af86034b59136670cbfa14f369638232d55a (diff) | |
merge revision(s) 58334,58346,58349: [Backport #13425] [Backport #13432]
thread.c: disable VM events when stack overflow
* thread.c (ruby_thread_stack_overflow): disable VM events when
stack overflow occurred; it causes another stack overflow again
in making backtrace object, and crashes.
[ruby-core:80662] [Bug #13425]
increase timeout seconds.
* test/ruby/test_trace.rb (test_trace_stackoverflow): on some platforms
this test fails because of timeout.
disable rewind hooks.
* vm.c (hook_before_rewind): skip rewind hooks if err is SystemStackError
because rewind hooks can cause stack overflow again and again.
* thread.c (ruby_thread_stack_overflow): do not disable all hooks.
Additionally, clearing ruby_vm_event_flags is not suitable way
to disable hooks.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59232 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/test_trace.rb | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/test/ruby/test_trace.rb b/test/ruby/test_trace.rb index 77be94e9be..d7a683b083 100644 --- a/test/ruby/test_trace.rb +++ b/test/ruby/test_trace.rb @@ -59,4 +59,19 @@ class TestTrace < Test::Unit::TestCase a.any? {true} }.value, bug2722) end + + def test_trace_stackoverflow + assert_normal_exit("#{<<-"begin;"}\n#{<<~"end;"}", timeout: 60) + begin; + require 'tracer' + class HogeError < StandardError + def to_s + message.upcase # disable tailcall optimization + end + end + Tracer.stdout = open(IO::NULL, "w") + Tracer.on + HogeError.new.to_s + end; + end end |