]> granicus.if.org Git - php/commitdiff
Better condition
authorDmitry Stogov <dmitry@zend.com>
Wed, 20 May 2020 20:05:48 +0000 (23:05 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 20 May 2020 20:05:48 +0000 (23:05 +0300)
ext/opcache/jit/zend_jit_x86.dasc

index c98c4438744d419ec4ce7a54c010b52a28b25c25..a665ee7eefb9cd36ff0ce6c030f80b6185d76156 100644 (file)
@@ -8338,8 +8338,7 @@ static int zend_jit_do_fcall(dasm_State **Dst, const zend_op *opline, const zend
                                if (func) {
                                        if (func->op_array.fn_flags & ZEND_ACC_IMMUTABLE) {
                                                |       MEM_OP2_2_ZTS add, r2, aword, compiler_globals, map_ptr_base, r1
-                                       } else if (JIT_G(opt_level) < ZEND_JIT_LEVEL_OPT_SCRIPT
-                                        && JIT_G(trigger) == ZEND_JIT_ON_SCRIPT_LOAD) {
+                                       } else if (!zend_accel_in_shm(func->op_array.opcodes)) {
                                                /* the called op_array may be not persisted yet */
                                                |       test r2, 1
                                                |       jz >1