Skip to content

Commit f127bcb

Browse files
define rb_current_ec_set in all cases
1 parent 551be82 commit f127bcb

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

gc.c

-8
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,7 @@ rb_gc_worker_thread_set_vm_context(struct rb_gc_vm_context *context)
200200
GC_ASSERT(rb_current_execution_context(false) == NULL);
201201

202202
#ifdef RB_THREAD_LOCAL_SPECIFIER
203-
# ifdef __APPLE__
204203
rb_current_ec_set(context->ec);
205-
# else
206-
ruby_current_ec = context->ec;
207-
# endif
208204
#else
209205
native_tls_set(ruby_current_ec_key, context->ec);
210206
#endif
@@ -218,11 +214,7 @@ rb_gc_worker_thread_unset_vm_context(struct rb_gc_vm_context *context)
218214
GC_ASSERT(rb_current_execution_context(true) == context->ec);
219215

220216
#ifdef RB_THREAD_LOCAL_SPECIFIER
221-
# ifdef __APPLE__
222217
rb_current_ec_set(NULL);
223-
# else
224-
ruby_current_ec = NULL;
225-
# endif
226218
#else
227219
native_tls_set(ruby_current_ec_key, NULL);
228220
#endif

ractor_core.h

+3-6
Original file line numberDiff line numberDiff line change
@@ -306,18 +306,15 @@ rb_ractor_thread_switch(rb_ractor_t *cr, rb_thread_t *th)
306306
}
307307

308308
#define rb_ractor_set_current_ec(cr, ec) rb_ractor_set_current_ec_(cr, ec, __FILE__, __LINE__)
309+
#ifdef RB_THREAD_LOCAL_SPECIFIER
310+
void rb_current_ec_set(rb_execution_context_t *ec);
311+
#endif
309312

310313
static inline void
311314
rb_ractor_set_current_ec_(rb_ractor_t *cr, rb_execution_context_t *ec, const char *file, int line)
312315
{
313316
#ifdef RB_THREAD_LOCAL_SPECIFIER
314-
315-
# ifdef __APPLE__
316317
rb_current_ec_set(ec);
317-
# else
318-
ruby_current_ec = ec;
319-
# endif
320-
321318
#else
322319
native_tls_set(ruby_current_ec_key, ec);
323320
#endif

0 commit comments

Comments
 (0)