com php-src: Fixed incorrect reuse of exit_point: ext/opc ache/jit/zend_jit_trace.c
| From: | Dmitry Stogov | Date: | Tue, 28 Jul 2020 20:31:58 +0000 |
| Subject: | com php-src: Fixed incorrect reuse of exit_point: ext/opc ache/jit/zend_jit_trace.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-112413@lists.php.net to get a copy of this message | ||
Commit: 99ee73e6a94c847cee7130928cc3b6acddece904
Author: Dmitry Stogov <dmitry@zend.com> Tue, 28 Jul 2020 23:31:58 +0300
Parents: 73e070a614f90c87a15799693f2bddc3d5842545
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=99ee73e6a94c847cee7130928cc3b6acddece904
Log:
Fixed incorrect reuse of exit_point
Changed paths:
M ext/opcache/jit/zend_jit_trace.c
Diff:
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
index d894b50f18..6ef493e3ed 100644
--- a/ext/opcache/jit/zend_jit_trace.c
+++ b/ext/opcache/jit/zend_jit_trace.c
@@ -174,7 +174,8 @@ static uint32_t zend_jit_trace_get_exit_point(const zend_op *from_opline, const
&& memcmp(t->stack_map + t->exit_info[i].stack_offset, stack, stack_size *
sizeof(zend_jit_trace_stack)) == 0)) {
stack_offset = t->exit_info[i].stack_offset;
if (t->exit_info[i].opline == to_opline
- && t->exit_info[i].flags == flags) {
+ && t->exit_info[i].flags == flags
+ && t->exit_info[i].stack_size == stack_size) {
return i;
}
}