kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) ae5458f228: [Backport #18475]

Browse source 
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(+)
This commit is contained in:
nagachika 2022-03-13 11:37:03 +09:00
parent e18e6af604
commit 42b1e87ba7
3 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
test/ruby/test_enum.rb
View file

@ -421,6 +421,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

3
thread.c
View file

@ -835,6 +835,9 @@ 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) {
if (th->invoke_type == thread_invoke_type_ractor_proc) {
rb_ractor_atexit(th->ec, Qnil);

4
version.h
View file

@ -12,11 +12,11 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 4
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 189
#define RUBY_PATCHLEVEL 190
#define RUBY_RELEASE_YEAR 2022
#define RUBY_RELEASE_MONTH 3
#define RUBY_RELEASE_DAY 12
#define RUBY_RELEASE_DAY 13
#include "ruby/version.h"