php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-04 14:42:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.1' into PHP-8.2

Browse Source 
* PHP-8.1:
  Force exit to VM
This commit is contained in:
Dmitry Stogov
2022-09-29 15:28:23 +03:00
parent 57a01e3a4a aa179bf3dd
commit efcffc9d5f
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ext/opcache/jit/zend_jit_x86.dasc
View File

@@ -3636,11 +3636,13 @@ static int zend_jit_trace_handler(dasm_State **Dst, const zend_op_array *op_arra
opline->opcode == ZEND_GENERATOR_CREATE) {
if (zend_jit_vm_kind == ZEND_VM_KIND_HYBRID) {
#if 0
/* this check should be handled by the following OPLINE guard or jmp [IP] */
| cmp IP, zend_jit_halt_op
| je ->trace_halt
#endif
if (trace->op != ZEND_JIT_TRACE_END ||
(trace->stop != ZEND_JIT_TRACE_STOP_RETURN &&
trace->stop != ZEND_JIT_TRACE_STOP_INTERPRETER)) {
/* this check may be handled by the following OPLINE guard or jmp [IP] */
| cmp IP, zend_jit_halt_op
| je ->trace_halt
}
} else if (GCC_GLOBAL_REGS) {
| test IP, IP
| je ->trace_halt