`rb_current_ractor_raw(b)`

`rb_current_ractor()` expects it has valid `ec` and `r`.
`rb_current_ractor_raw()` with a parameter `false` allows to return
NULL if `ec` is not available.

1 files changed, 9 insertions, 3 deletions

diff --git a/vm_core.h b/vm_core.h
index 43e95a5dbe..2d5ec6f717 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -1876,17 +1876,23 @@ rb_current_thread(void)
 }
 
 static inline rb_ractor_t *
-rb_current_ractor(void)
+rb_current_ractor_raw(bool expect)
 {
     if (ruby_single_main_ractor) {
         return ruby_single_main_ractor;
     }
     else {
-        const rb_execution_context_t *ec = GET_EC();
-        return rb_ec_ractor_ptr(ec);
+        const rb_execution_context_t *ec = rb_current_execution_context(expect);
+        return (expect || ec) ? rb_ec_ractor_ptr(ec) : NULL;
     }
 }
 
+static inline rb_ractor_t *
+rb_current_ractor(void)
+{
+    return rb_current_ractor_raw(true);
+}
+
 static inline rb_vm_t *
 rb_current_vm(void)
 {