From: Xinchen Hui Date: Wed, 13 May 2020 10:22:29 +0000 (+0800) Subject: Fixed crash if jit.trigger is counter based with preload scripts X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d4e23aa928ae1451da360d64b849a0720412f7e;p=php Fixed crash if jit.trigger is counter based with preload scripts --- diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c index 6a158e73f9..4b019eb3b3 100644 --- a/ext/opcache/zend_persist.c +++ b/ext/opcache/zend_persist.c @@ -1144,7 +1144,9 @@ zend_persistent_script *zend_accel_script_persist(zend_persistent_script *script #ifdef HAVE_JIT if (ZCG(jit_enabled) && for_shm) { - if (ZEND_JIT_LEVEL(ZCG(accel_directives).jit) >= ZEND_JIT_LEVEL_OPT_SCRIPT) { + if (ZEND_JIT_LEVEL(ZCG(accel_directives).jit) >= ZEND_JIT_LEVEL_OPT_SCRIPT && + (ZEND_JIT_TRIGGER(ZCG(accel_directives).jit) == ZEND_JIT_ON_SCRIPT_LOAD || + ZEND_JIT_TRIGGER(ZCG(accel_directives).jit) == ZEND_JIT_ON_DOC_COMMENT)) { zend_jit_script(&script->script); } zend_jit_protect();