YJIT: Stop checking rb_zjit_enabled_p on YJIT callbacks (ruby#16648)

Author: k0kubun

cont.c

@@ -1480,7 +1480,7 @@ rb_yjit_cancel_jit_return(void *leave_exit, void *leave_exception)
 
         const rb_control_frame_t *cfp = cont->ec->cfp;
         while (!RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW_P(cont->ec, cfp)) {
-            if (CFP_JIT_RETURN(cfp) && cfp->jit_return != leave_exception) {
+            if (cfp->jit_return && cfp->jit_return != leave_exception) {
                 ((rb_control_frame_t *)cfp)->jit_return = leave_exit;
             }
             cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);

vm.c

@@ -2852,7 +2852,7 @@ zjit_materialize_frames(rb_control_frame_t *cfp)
     if (!rb_zjit_enabled_p) return;
 
     while (true) {
-        if (CFP_JIT_RETURN(cfp)) {
+        if (CFP_ZJIT_FRAME(cfp)) {
             const zjit_jit_frame_t *jit_frame = (const zjit_jit_frame_t *)cfp->jit_return;
             cfp->pc = jit_frame->pc;
             cfp->_iseq = (rb_iseq_t *)jit_frame->iseq;
@@ -3671,7 +3671,7 @@ rb_execution_context_update(rb_execution_context_t *ec)
         while (cfp != limit_cfp) {
             const VALUE *ep = cfp->ep;
             cfp->self = rb_gc_location(cfp->self);
-            if (CFP_JIT_RETURN(cfp)) {
+            if (CFP_ZJIT_FRAME(cfp)) {
                 rb_zjit_jit_frame_update_references((zjit_jit_frame_t *)cfp->jit_return);
                 // block_code must always be relocated. For ISEQ frames, the JIT caller
                 // may have written it (gen_block_handler_specval) for passing blocks.

yjit.c

@@ -480,7 +480,7 @@ rb_yjit_set_exception_return(rb_control_frame_t *cfp, void *leave_exit, void *le
         // If it's a FINISH frame, just normally exit with a non-Qundef value.
         cfp->jit_return = leave_exit;
     }
-    else if (CFP_JIT_RETURN(cfp)) {
+    else if (cfp->jit_return) {
         while (!VM_FRAME_FINISHED_P(cfp)) {
             if (cfp->jit_return == leave_exit) {
                 // Unlike jit_exec(), leave_exit is not safe on a non-FINISH frame on

zjit.h

@@ -75,7 +75,7 @@ enum zjit_poison_values {
 // YJIT also uses jit_return (as a return address), so this must only return
 // non-NULL when ZJIT is enabled and has set jit_return to a JITFrame pointer.
 static inline void *
-CFP_JIT_RETURN(const rb_control_frame_t *cfp)
+CFP_ZJIT_FRAME(const rb_control_frame_t *cfp)
 {
     if (!rb_zjit_enabled_p) return NULL;
 #if USE_ZJIT
@@ -87,7 +87,7 @@ CFP_JIT_RETURN(const rb_control_frame_t *cfp)
 static inline const VALUE*
 CFP_PC(const rb_control_frame_t *cfp)
 {
-    if (CFP_JIT_RETURN(cfp)) {
+    if (CFP_ZJIT_FRAME(cfp)) {
         return ((const zjit_jit_frame_t *)cfp->jit_return)->pc;
     }
     return cfp->pc;
@@ -96,7 +96,7 @@ CFP_PC(const rb_control_frame_t *cfp)
 static inline const rb_iseq_t*
 CFP_ISEQ(const rb_control_frame_t *cfp)
 {
-    if (CFP_JIT_RETURN(cfp)) {
+    if (CFP_ZJIT_FRAME(cfp)) {
         return ((const zjit_jit_frame_t *)cfp->jit_return)->iseq;
     }
     return cfp->_iseq;