com php-src: Load ptoper IP value: ext/opcache/jit/zend_jit _x86.dasc
| From: | Dmitry Stogov | Date: | Wed, 29 Jul 2020 14:37:01 +0000 |
| Subject: | com php-src: Load ptoper IP value: ext/opcache/jit/zend_jit _x86.dasc | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-112440@lists.php.net to get a copy of this message | ||
Commit: 9e80558047eb9c34b9e8839ea2e07e8a1885bb1a
Author: Dmitry Stogov <dmitry@zend.com> Wed, 29 Jul 2020 17:37:01 +0300
Parents: 02fae1fc537cd256233a5c0f51207a68fe2bd3d8
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9e80558047eb9c34b9e8839ea2e07e8a1885bb1a
Log:
Load ptoper IP value
Changed paths:
M ext/opcache/jit/zend_jit_x86.dasc
Diff:
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
index d18c3ca2ec..19e56ef6b6 100644
--- a/ext/opcache/jit/zend_jit_x86.dasc
+++ b/ext/opcache/jit/zend_jit_x86.dasc
@@ -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)
}
}