Add RUBY_VM_CHECK_INTS_BLOCKING before EC_POP_TAG in every case.

ioquatix · ioquatix · commit 20f5912c11ed · 2025-05-25T10:38:44.000+09:00
diff --git a/test/fiber/test_io_close.rb b/test/fiber/test_io_close.rb
@@ -3,17 +3,10 @@
 require_relative 'scheduler'
 
 class TestFiberIOClose < Test::Unit::TestCase
-  def with_socket_pair
+  def with_socket_pair(&block)
     omit unless defined?(UNIXSocket)
 
-    UNIXSocket.pair do |i, o|
-      if RUBY_PLATFORM =~ /mswin|mingw/
-        i.nonblock = true
-        o.nonblock = true
-      end
-
-      yield i, o
-    end
+    UNIXSocket.pair(&block)
   end
 
   def test_io_close_across_fibers
diff --git a/thread.c b/thread.c
@@ -1947,8 +1947,6 @@ rb_thread_io_blocking_call(struct rb_io* io, rb_blocking_function_t *func, void
         EC_JUMP_TAG(ec, state);
     }
 
-    RUBY_VM_CHECK_INTS_BLOCKING(ec);
-
     // If the error was a timeout, we raise a specific exception for that:
     if (saved_errno == ETIMEDOUT) {
         rb_raise(rb_eIOTimeoutError, "Blocking operation timed out!");
@@ -4448,6 +4446,8 @@ do_select(VALUE p)
         RUBY_VM_CHECK_INTS_BLOCKING(set->th->ec); /* may raise */
     } while (wait_retryable(&result, lerrno, to, endtime) && do_select_update());
 
+    RUBY_VM_CHECK_INTS_BLOCKING(set->th->ec);
+
     if (result < 0) {
         errno = lerrno;
     }
@@ -4568,7 +4568,10 @@ thread_io_wait(struct rb_io *io, int fd, int events, struct timeval *timeout)
 
                 RUBY_VM_CHECK_INTS_BLOCKING(ec);
             } while (wait_retryable(&result, lerrno, to, end));
+
+            RUBY_VM_CHECK_INTS_BLOCKING(ec);
         }
+
         EC_POP_TAG();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1947,8 +1947,6 @@ rb_thread_io_blocking_call(struct rb_io* io, rb_blocking_function_t *func, void`
`1947`	`1947`	`EC_JUMP_TAG(ec, state);`
`1948`	`1948`	`}`
`1949`	`1949`
`1950`		`- RUBY_VM_CHECK_INTS_BLOCKING(ec);`
`1951`		`-`
`1952`	`1950`	`// If the error was a timeout, we raise a specific exception for that:`
`1953`	`1951`	`if (saved_errno == ETIMEDOUT) {`
`1954`	`1952`	`rb_raise(rb_eIOTimeoutError, "Blocking operation timed out!");`
`@@ -4448,6 +4446,8 @@ do_select(VALUE p)`
`4448`	`4446`	`RUBY_VM_CHECK_INTS_BLOCKING(set->th->ec); /* may raise */`
`4449`	`4447`	`} while (wait_retryable(&result, lerrno, to, endtime) && do_select_update());`
`4450`	`4448`
	`4449`	`+ RUBY_VM_CHECK_INTS_BLOCKING(set->th->ec);`
	`4450`	`+`
`4451`	`4451`	`if (result < 0) {`
`4452`	`4452`	`errno = lerrno;`
`4453`	`4453`	`}`
`@@ -4568,7 +4568,10 @@ thread_io_wait(struct rb_io io, int fd, int events, struct timeval timeout)`
`4568`	`4568`
`4569`	`4569`	`RUBY_VM_CHECK_INTS_BLOCKING(ec);`
`4570`	`4570`	`} while (wait_retryable(&result, lerrno, to, end));`
	`4571`	`+`
	`4572`	`+ RUBY_VM_CHECK_INTS_BLOCKING(ec);`
`4571`	`4573`	`}`
	`4574`	`+`
`4572`	`4575`	`EC_POP_TAG();`
`4573`	`4576`	`}`
`4574`	`4577`