diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-09 19:49:03 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-09 19:49:03 +0000 |
commit | 5528c18ded7f3f469007aa4238b12f182a888873 (patch) | |
tree | 055e1399d8621ea6b83cc3edd6f8337ec309f5d6 | |
parent | 79787c183f3552198c181a1fb33e7378eb6211b8 (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_4@59297 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | test/ruby/test_trace.rb | 15 | ||||
-rw-r--r-- | version.h | 2 | ||||
-rw-r--r-- | vm.c | 9 |
3 files changed, 22 insertions, 4 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 @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.4.2" #define RUBY_RELEASE_DATE "2017-07-10" -#define RUBY_PATCHLEVEL 137 +#define RUBY_PATCHLEVEL 138 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 7 @@ -1638,8 +1638,11 @@ frame_name(const rb_control_frame_t *cfp) #endif static void -hook_before_rewind(rb_thread_t *th, const rb_control_frame_t *cfp, int will_finish_vm_exec, struct vm_throw_data *err) +hook_before_rewind(rb_thread_t *th, const rb_control_frame_t *cfp, int will_finish_vm_exec, int state, struct vm_throw_data *err) { + if (state == TAG_RAISE && RBASIC_CLASS(err) == rb_eSysStackError) { + return; + } switch (VM_FRAME_TYPE(th->cfp)) { case VM_FRAME_MAGIC_METHOD: RUBY_DTRACE_METHOD_RETURN_HOOK(th, 0, 0); @@ -1830,7 +1833,7 @@ vm_exec(rb_thread_t *th) th->errinfo = Qnil; result = THROW_DATA_VAL(err); THROW_DATA_CATCH_FRAME_SET(err, cfp + 1); - hook_before_rewind(th, th->cfp, TRUE, err); + hook_before_rewind(th, th->cfp, TRUE, state, err); rb_vm_pop_frame(th); goto finish_vme; } @@ -1972,7 +1975,7 @@ vm_exec(rb_thread_t *th) goto vm_loop_start; } else { - hook_before_rewind(th, th->cfp, FALSE, err); + hook_before_rewind(th, th->cfp, FALSE, state, err); if (VM_FRAME_FINISHED_P(th->cfp)) { rb_vm_pop_frame(th); |