From e7fc353f044f9280222ca41b029b1368d2bf2fe3 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Mon, 4 Jan 2021 18:08:25 +0900 Subject: enable constant cache on ractors constant cache `IC` is accessed by non-atomic manner and there are thread-safety issues, so Ruby 3.0 disables to use const cache on non-main ractors. This patch enables it by introducing `imemo_constcache` and allocates it by every re-fill of const cache like `imemo_callcache`. [Bug #17510] Now `IC` only has one entry `IC::entry` and it points to `iseq_inline_constant_cache_entry`, managed by T_IMEMO object. `IC` is atomic data structure so `rb_mjit_before_vm_ic_update()` and `rb_mjit_after_vm_ic_update()` is not needed. --- vm_core.h | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'vm_core.h') diff --git a/vm_core.h b/vm_core.h index f6b81b57c6..cfce3af59d 100644 --- a/vm_core.h +++ b/vm_core.h @@ -218,10 +218,18 @@ struct rb_control_frame_struct; /* iseq data type */ typedef struct rb_compile_option_struct rb_compile_option_t; -struct iseq_inline_cache_entry { - rb_serial_t ic_serial; - const rb_cref_t *ic_cref; - VALUE value; +// imemo_constcache +struct iseq_inline_constant_cache_entry { + VALUE flags; + + VALUE value; // v0 + const rb_cref_t *ic_cref; // v1 + rb_serial_t ic_serial; // v2 + // v3 +}; + +struct iseq_inline_constant_cache { + struct iseq_inline_constant_cache_entry *entry; }; struct iseq_inline_iv_cache_entry { @@ -233,7 +241,7 @@ union iseq_inline_storage_entry { struct rb_thread_struct *running_thread; VALUE value; } once; - struct iseq_inline_cache_entry cache; + struct iseq_inline_constant_cache ic_cache; struct iseq_inline_iv_cache_entry iv_cache; }; @@ -1126,7 +1134,7 @@ enum vm_svar_index { }; /* inline cache */ -typedef struct iseq_inline_cache_entry *IC; +typedef struct iseq_inline_constant_cache *IC; typedef struct iseq_inline_iv_cache_entry *IVC; typedef union iseq_inline_storage_entry *ISE; typedef const struct rb_callinfo *CALL_INFO; -- cgit v1.2.3