diff options
| author | Xinchen Hui <laruence@gmail.com> | 2020-05-13 18:22:29 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2020-05-13 18:22:29 +0800 |
| commit | 3d4e23aa928ae1451da360d64b849a0720412f7e (patch) | |
| tree | b51bda189211a5e5c9aa170bb7dbda23244b75a6 | |
| parent | f150b020c08ff077e7dcdf1660b2913ad104c4de (diff) | |
| download | php-git-3d4e23aa928ae1451da360d64b849a0720412f7e.tar.gz | |
Fixed crash if jit.trigger is counter based with preload scripts
| -rw-r--r-- | ext/opcache/zend_persist.c | 4 |
1 files changed, 3 insertions, 1 deletions
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(); |