Merge branch 'PHP-8.3'

dstogov · dstogov · commit 4fce8c83bc79 · 2023-11-02T14:15:13.000+03:00
* PHP-8.3:
  Don't JIT after fatal errors
diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c
@@ -3553,7 +3553,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();
@@ -3571,9 +3571,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
`@@ -3553,7 +3553,7 @@ ZEND_EXT_API void zend_jit_activate(void)`
`3553`	`3553`
`3554`	`3554`	`ZEND_EXT_API void zend_jit_deactivate(void)`
`3555`	`3555`	`{`
`3556`		`- if (zend_jit_profile_counter) {`
	`3556`	`+ if (zend_jit_profile_counter && !CG(unclean_shutdown)) {`
`3557`	`3557`	`zend_class_entry *ce;`
`3558`	`3558`
`3559`	`3559`	`zend_shared_alloc_lock();`
`@@ -3571,9 +3571,9 @@ ZEND_EXT_API void zend_jit_deactivate(void)`
`3571`	`3571`	`zend_jit_protect();`
`3572`	`3572`	`SHM_PROTECT();`
`3573`	`3573`	`zend_shared_alloc_unlock();`
`3574`		`-`
`3575`		`- zend_jit_profile_counter = 0;`
`3576`	`3574`	`}`
	`3575`	`+`
	`3576`	`+ zend_jit_profile_counter = 0;`
`3577`	`3577`	`}`
`3578`	`3578`
`3579`	`3579`	`static void zend_jit_restart_preloaded_op_array(zend_op_array *op_array)`