diff options
author | NAKAMURA Usaku <usa@ruby-lang.org> | 2022-03-19 22:15:40 +0900 |
---|---|---|
committer | NAKAMURA Usaku <usa@ruby-lang.org> | 2022-03-19 22:15:40 +0900 |
commit | ea9b0fe5d30efaa7dad1be4da79c1ee58f4f963b (patch) | |
tree | c630cd0a821f604739993dc9ce708c83981695ce | |
parent | 83de7133876ec392eb4b3b69c2220d7b49685444 (diff) |
merge revision(s) ae5458f228a5477383e9c00425d85d50a3867817: [Backport #18475]
thread.c: Convert TAG_BREAK to a normal exception at thread top-level
[Bug #18475]
---
test/ruby/test_enum.rb | 11 +++++++++++
thread.c | 3 +++
2 files changed, 14 insertions(+)
-rw-r--r-- | test/ruby/test_enum.rb | 11 | ||||
-rw-r--r-- | thread.c | 4 | ||||
-rw-r--r-- | version.h | 4 |
3 files changed, 17 insertions, 2 deletions
diff --git a/test/ruby/test_enum.rb b/test/ruby/test_enum.rb index 9f6f19b669..ef732b9924 100644 --- a/test/ruby/test_enum.rb +++ b/test/ruby/test_enum.rb @@ -326,6 +326,17 @@ class TestEnumerable < Test::Unit::TestCase empty.first empty.block.call end; + + bug18475 = '[ruby-dev:107059]' + assert_in_out_err([], <<-'end;', [], /unexpected break/, bug18475) + e = Enumerator.new do |g| + Thread.new do + g << 1 + end.join + end + + e.first + end; end def test_sort @@ -741,6 +741,10 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start) } else { errinfo = th->ec->errinfo; + + VALUE exc = rb_vm_make_jump_tag_but_local_jump(state, Qundef); + if (!NIL_P(exc)) errinfo = exc; + if (state == TAG_FATAL) { /* fatal error within this thread, need to stop whole script */ } @@ -2,11 +2,11 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 211 +#define RUBY_PATCHLEVEL 212 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 5 +#define RUBY_RELEASE_DAY 19 #include "ruby/version.h" |