Don't JIT after fatal errors

dstogov · dstogov · commit 77a497d56af1 · 2023-11-02T14:14:12.000+03:00
diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c
@@ -5113,7 +5113,7 @@ ZEND_EXT_API void zend_jit_activate(void)
 
 ZEND_EXT_API void zend_jit_deactivate(void)
 {
-	if (zend_jit_profile_counter) {
+	if (zend_jit_profile_counter && !CG(unclean_shutdown)) {
 		zend_class_entry *ce;
 
 		zend_shared_alloc_lock();
@@ -5131,9 +5131,9 @@ ZEND_EXT_API void zend_jit_deactivate(void)
 		zend_jit_protect();
 		SHM_PROTECT();
 		zend_shared_alloc_unlock();
-
-		zend_jit_profile_counter = 0;
 	}
+
+	zend_jit_profile_counter = 0;
 }
 
 static void zend_jit_restart_preloaded_op_array(zend_op_array *op_array)

Original file line number	Diff line number	Diff line change
`@@ -5113,7 +5113,7 @@ ZEND_EXT_API void zend_jit_activate(void)`
`5113`	`5113`
`5114`	`5114`	`ZEND_EXT_API void zend_jit_deactivate(void)`
`5115`	`5115`	`{`
`5116`		`- if (zend_jit_profile_counter) {`
	`5116`	`+ if (zend_jit_profile_counter && !CG(unclean_shutdown)) {`
`5117`	`5117`	`zend_class_entry *ce;`
`5118`	`5118`
`5119`	`5119`	`zend_shared_alloc_lock();`
`@@ -5131,9 +5131,9 @@ ZEND_EXT_API void zend_jit_deactivate(void)`
`5131`	`5131`	`zend_jit_protect();`
`5132`	`5132`	`SHM_PROTECT();`
`5133`	`5133`	`zend_shared_alloc_unlock();`
`5134`		`-`
`5135`		`- zend_jit_profile_counter = 0;`
`5136`	`5134`	`}`
	`5135`	`+`
	`5136`	`+ zend_jit_profile_counter = 0;`
`5137`	`5137`	`}`
`5138`	`5138`
`5139`	`5139`	`static void zend_jit_restart_preloaded_op_array(zend_op_array *op_array)`