Merge branch 'PHP-8.2' into PHP-8.3

dstogov · dstogov · commit 83bbea7c5b08 · 2023-11-02T14:15:05.000+03:00
* PHP-8.2:
  Don't JIT after fatal errors
diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c
@@ -5104,7 +5104,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();
@@ -5122,9 +5122,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
`@@ -5104,7 +5104,7 @@ ZEND_EXT_API void zend_jit_activate(void)`
`5104`	`5104`
`5105`	`5105`	`ZEND_EXT_API void zend_jit_deactivate(void)`
`5106`	`5106`	`{`
`5107`		`- if (zend_jit_profile_counter) {`
	`5107`	`+ if (zend_jit_profile_counter && !CG(unclean_shutdown)) {`
`5108`	`5108`	`zend_class_entry *ce;`
`5109`	`5109`
`5110`	`5110`	`zend_shared_alloc_lock();`
`@@ -5122,9 +5122,9 @@ ZEND_EXT_API void zend_jit_deactivate(void)`
`5122`	`5122`	`zend_jit_protect();`
`5123`	`5123`	`SHM_PROTECT();`
`5124`	`5124`	`zend_shared_alloc_unlock();`
`5125`		`-`
`5126`		`- zend_jit_profile_counter = 0;`
`5127`	`5125`	`}`
	`5126`	`+`
	`5127`	`+ zend_jit_profile_counter = 0;`
`5128`	`5128`	`}`
`5129`	`5129`
`5130`	`5130`	`static void zend_jit_restart_preloaded_op_array(zend_op_array *op_array)`