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(+)

1 files changed, 11 insertions, 0 deletions

diff --git a/test/ruby/test_enum.rb b/test/ruby/test_enum.rb
index f6375a4ffc..b0c43b9a7f 100644
--- a/test/ruby/test_enum.rb
+++ b/test/ruby/test_enum.rb
@@ -461,6 +461,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