Merge branch 'PHP-8.1' into PHP-8.2

dstogov · dstogov · commit bbf2fc99a30c · 2023-11-02T14:14:48.000+03:00
* PHP-8.1:
  Don't JIT after fatal errors
diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c
@@ -5096,7 +5096,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();
@@ -5114,9 +5114,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
`@@ -5096,7 +5096,7 @@ ZEND_EXT_API void zend_jit_activate(void)`
`5096`	`5096`
`5097`	`5097`	`ZEND_EXT_API void zend_jit_deactivate(void)`
`5098`	`5098`	`{`
`5099`		`- if (zend_jit_profile_counter) {`
	`5099`	`+ if (zend_jit_profile_counter && !CG(unclean_shutdown)) {`
`5100`	`5100`	`zend_class_entry *ce;`
`5101`	`5101`
`5102`	`5102`	`zend_shared_alloc_lock();`
`@@ -5114,9 +5114,9 @@ ZEND_EXT_API void zend_jit_deactivate(void)`
`5114`	`5114`	`zend_jit_protect();`
`5115`	`5115`	`SHM_PROTECT();`
`5116`	`5116`	`zend_shared_alloc_unlock();`
`5117`		`-`
`5118`		`- zend_jit_profile_counter = 0;`
`5119`	`5117`	`}`
	`5118`	`+`
	`5119`	`+ zend_jit_profile_counter = 0;`
`5120`	`5120`	`}`
`5121`	`5121`
`5122`	`5122`	`static void zend_jit_restart_preloaded_op_array(zend_op_array *op_array)`