1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
  Don't JIT after fatal errors
This commit is contained in:
Dmitry Stogov
2023-11-02 14:14:48 +03:00

View File

@@ -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)