php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2' into PHP-8.3

Browse Source 
* PHP-8.2:
  Don't JIT after fatal errors
This commit is contained in:
Dmitry Stogov
2023-11-02 14:15:05 +03:00
parent 22735b3ff5 bbf2fc99a3
commit 83bbea7c5b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/opcache/jit/zend_jit.c
View File

@@ -5104,7 +5104,7 @@ ZEND_EXT_API void zend_jit_activate(void)
ZEND_EXT_API void zend_jit_deactivate(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_class_entry *ce;
zend_shared_alloc_lock(); zend_shared_alloc_lock();
@@ -5122,9 +5122,9 @@ ZEND_EXT_API void zend_jit_deactivate(void)
zend_jit_protect(); zend_jit_protect();
SHM_PROTECT(); SHM_PROTECT();
zend_shared_alloc_unlock(); 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) static void zend_jit_restart_preloaded_op_array(zend_op_array *op_array)