Check that cb / ocb exist before marking executable

tenderlove · maximecb · kddnewton · tenderlove · commit efae92013d26 · 2021-12-01T11:24:56.000-08:00
If YJIT isn't enabled, or hasn't finished booting, cb / ocb could be
null.  This commit just checks to make sure they're available before
marking as executable

Co-Authored-By: Maxime Chevalier-Boisvert &lt;maxime.chevalierboisvert@shopify.com&gt;
Co-Authored-By: Kevin Newton &lt;kddnewton@gmail.com&gt;
diff --git a/yjit_iface.c b/yjit_iface.c
@@ -962,8 +962,15 @@ rb_yjit_iseq_update_references(const struct rb_iseq_constant_body *body)
             //block->code_page = rb_gc_location(block->code_page);
         }
     }
-    cb_mark_all_executable(cb);
-    cb_mark_all_executable(ocb);
+
+    /* If YJIT isn't initialized, then cb or ocb could be NULL. */
+    if (cb) {
+        cb_mark_all_executable(cb);
+    }
+
+    if (ocb) {
+        cb_mark_all_executable(ocb);
+    }
 }
 
 // Free the yjit resources associated with an iseq

Original file line number	Diff line number	Diff line change
`@@ -962,8 +962,15 @@ rb_yjit_iseq_update_references(const struct rb_iseq_constant_body *body)`
`962`	`962`	`//block->code_page = rb_gc_location(block->code_page);`
`963`	`963`	`}`
`964`	`964`	`}`
`965`		`- cb_mark_all_executable(cb);`
`966`		`- cb_mark_all_executable(ocb);`
	`965`	`+`
	`966`	`+ /* If YJIT isn't initialized, then cb or ocb could be NULL. */`
	`967`	`+ if (cb) {`
	`968`	`+ cb_mark_all_executable(cb);`
	`969`	`+ }`
	`970`	`+`
	`971`	`+ if (ocb) {`
	`972`	`+ cb_mark_all_executable(ocb);`
	`973`	`+ }`
`967`	`974`	`}`
`968`	`975`
`969`	`976`	`// Free the yjit resources associated with an iseq`