From 35e9b5348d91eff13d2bdc487003f46a19586d42 Mon Sep 17 00:00:00 2001 From: Alan Wu Date: Fri, 24 Mar 2023 12:36:06 -0400 Subject: [PATCH] YJIT: Constify EC to avoid an `as` pointer cast (#7591) --- yjit.c | 2 +- yjit/src/codegen.rs | 2 +- yjit/src/cruby_bindings.inc.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/yjit.c b/yjit.c index d0d8ae463a137b..97ad722270cf5a 100644 --- a/yjit.c +++ b/yjit.c @@ -335,7 +335,7 @@ rb_yjit_reserve_addr_space(uint32_t mem_size) // Is anyone listening for :c_call and :c_return event currently? bool -rb_c_method_tracing_currently_enabled(rb_execution_context_t *ec) +rb_c_method_tracing_currently_enabled(const rb_execution_context_t *ec) { rb_event_flag_t tracing_events; if (rb_multi_ractor_p()) { diff --git a/yjit/src/codegen.rs b/yjit/src/codegen.rs index 513cf9d308fc7d..403e55c185022a 100644 --- a/yjit/src/codegen.rs +++ b/yjit/src/codegen.rs @@ -4712,7 +4712,7 @@ fn lookup_cfunc_codegen(def: *const rb_method_definition_t) -> Option bool { // Defer to C implementation in yjit.c unsafe { - rb_c_method_tracing_currently_enabled(jit.ec as *mut rb_execution_context_struct) + rb_c_method_tracing_currently_enabled(jit.ec) } } diff --git a/yjit/src/cruby_bindings.inc.rs b/yjit/src/cruby_bindings.inc.rs index 2b98b73dba8d47..c970b5d244f020 100644 --- a/yjit/src/cruby_bindings.inc.rs +++ b/yjit/src/cruby_bindings.inc.rs @@ -1210,7 +1210,7 @@ extern "C" { ) -> VALUE; pub fn rb_yjit_get_page_size() -> u32; pub fn rb_yjit_reserve_addr_space(mem_size: u32) -> *mut u8; - pub fn rb_c_method_tracing_currently_enabled(ec: *mut rb_execution_context_t) -> bool; + pub fn rb_c_method_tracing_currently_enabled(ec: *const rb_execution_context_t) -> bool; pub fn rb_full_cfunc_return(ec: *mut rb_execution_context_t, return_value: VALUE); pub fn rb_iseq_encoded_size(iseq: *const rb_iseq_t) -> ::std::os::raw::c_uint; pub fn rb_iseq_get_yjit_payload(iseq: *const rb_iseq_t) -> *mut ::std::os::raw::c_void;