diff options
author | Takashi Kokubun <takashikkbn@gmail.com> | 2022-11-10 14:12:38 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-10 17:12:38 -0500 |
commit | 2b8191bdad7545b71f270d2b25a34cd2b3afa02f (patch) | |
tree | 76117dbcae3361e74b3ae6ce01a3a488e6fb127c /vm_trace.c | |
parent | d9056328514041c22f73809921118fa7a1478092 (diff) |
YJIT: Invalidate JIT code only for ISEQ_TRACE_EVENTS (#6695)
Notes
Notes:
Merged-By: maximecb <maximecb@ruby-lang.org>
Diffstat (limited to 'vm_trace.c')
-rw-r--r-- | vm_trace.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/vm_trace.c b/vm_trace.c index 93a8c1a4ed..caed71e96f 100644 --- a/vm_trace.c +++ b/vm_trace.c @@ -87,8 +87,9 @@ update_global_event_hook(rb_event_flag_t prev_events, rb_event_flag_t new_events { rb_event_flag_t new_iseq_events = new_events & ISEQ_TRACE_EVENTS; rb_event_flag_t enabled_iseq_events = ruby_vm_event_enabled_global_flags & ISEQ_TRACE_EVENTS; + bool trace_iseq_p = new_iseq_events & ~enabled_iseq_events; - if (new_iseq_events & ~enabled_iseq_events) { + if (trace_iseq_p) { // :class events are triggered only in ISEQ_TYPE_CLASS, but mjit_target_iseq_p ignores such iseqs. // Thus we don't need to cancel JIT-ed code for :class events. if (new_iseq_events != RUBY_EVENT_CLASS) { @@ -111,10 +112,11 @@ update_global_event_hook(rb_event_flag_t prev_events, rb_event_flag_t new_events ruby_vm_event_enabled_global_flags |= new_events; rb_objspace_set_event_hook(new_events); - if (new_events & RUBY_EVENT_TRACEPOINT_ALL) { - // Invalidate all code if listening for any TracePoint event. + if (trace_iseq_p) { + // Invalidate all code when ISEQs are modified to use trace_* insns above. // Internal events fire inside C routines so don't need special handling. - // Do this last so other ractors see updated vm events when they wake up. + // Do this after event flags updates so other ractors see updated vm events + // when they wake up. rb_yjit_tracing_invalidate_all(); } } |