summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2020-05-13 18:35:00 +0800
committerXinchen Hui <laruence@gmail.com>2020-05-13 18:35:00 +0800
commitf06f260292f77d49f0d1fd7bedc6e8f5dac51137 (patch)
tree4b128d3c7095117be1f432d947da91a2762d9d3e
parentded0b34a481afdb322858c1e291646bc4b56a2a7 (diff)
downloadphp-git-f06f260292f77d49f0d1fd7bedc6e8f5dac51137.tar.gz
Revert "Fixed crash if jit.trigger is counter based with preload scripts"
This reverts commit 3d4e23aa928ae1451da360d64b849a0720412f7e.
-rw-r--r--ext/opcache/zend_persist.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c
index 4b019eb3b3..6a158e73f9 100644
--- a/ext/opcache/zend_persist.c
+++ b/ext/opcache/zend_persist.c
@@ -1144,9 +1144,7 @@ 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 &&
- (ZEND_JIT_TRIGGER(ZCG(accel_directives).jit) == ZEND_JIT_ON_SCRIPT_LOAD ||
- ZEND_JIT_TRIGGER(ZCG(accel_directives).jit) == ZEND_JIT_ON_DOC_COMMENT)) {
+ if (ZEND_JIT_LEVEL(ZCG(accel_directives).jit) >= ZEND_JIT_LEVEL_OPT_SCRIPT) {
zend_jit_script(&script->script);
}
zend_jit_protect();