]> granicus.if.org Git - php/commitdiff
Load ptoper IP value
authorDmitry Stogov <dmitry@zend.com>
Wed, 29 Jul 2020 14:37:01 +0000 (17:37 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 29 Jul 2020 14:37:01 +0000 (17:37 +0300)
ext/opcache/jit/zend_jit_x86.dasc

index d18c3ca2eca7af8fc4f2087997151b3d4ff39fef..19e56ef6b6214740eb842517e3ee46275b794662 100644 (file)
@@ -9097,6 +9097,10 @@ static int zend_jit_do_fcall(dasm_State **Dst, const zend_op *opline, const zend
 
                if ((!trace || !func) && opline->opcode != ZEND_DO_ICALL) {
                        |       LOAD_IP_ADDR (opline + 1)
+               } else if (trace
+                && trace->op == ZEND_JIT_TRACE_END
+                && trace->stop == ZEND_JIT_TRACE_STOP_INTERPRETER) {
+                       |       LOAD_IP_ADDR (opline + 1)
                }
        }