Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
  Fix GH-15497: Opcache with file_cache and JIT enabled crashes (#15635)
This commit is contained in:
Dmitry Stogov 2024-08-29 16:46:56 +03:00
commit 17e313ee62
No known key found for this signature in database

View file

@ -692,7 +692,10 @@ static void zend_persist_op_array(zval *zv)
}
}
#ifdef HAVE_JIT
if (JIT_G(on) && JIT_G(opt_level) <= ZEND_JIT_LEVEL_OPT_FUNCS) {
if (JIT_G(on)
&& JIT_G(opt_level) <= ZEND_JIT_LEVEL_OPT_FUNCS
&& (!ZCG(current_persistent_script)
|| !ZCG(current_persistent_script)->corrupted)) {
zend_jit_op_array(op_array, ZCG(current_persistent_script) ? &ZCG(current_persistent_script)->script : NULL);
}
#endif