diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2020-11-23 16:19:54 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2020-11-23 16:19:54 +0300 |
| commit | b994237619f4dacf456ed43ad31aecc58edc0ac0 (patch) | |
| tree | 755fc27beaf441c6ecdaf6dbcd8019420a30b700 | |
| parent | 7f4b8f134931e2288cbb254b62828a5575b11344 (diff) | |
| parent | 337d2af6ca50a52864034446d863331cbc61885e (diff) | |
| download | php-git-b994237619f4dacf456ed43ad31aecc58edc0ac0.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
zend_jit_trace_stack_frame.stack can't be NULL
| -rw-r--r-- | ext/opcache/jit/zend_jit_x86.dasc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc index 787294cdc7..e2ee7e6bd2 100644 --- a/ext/opcache/jit/zend_jit_x86.dasc +++ b/ext/opcache/jit/zend_jit_x86.dasc @@ -4194,7 +4194,6 @@ static int zend_jit_math_long_long(dasm_State **Dst, if (Z_MODE(res_addr) == IS_REG && (res_info & MAY_BE_LONG)) { if (may_overflow && (res_info & MAY_BE_GUARD) && JIT_G(current_frame) - && JIT_G(current_frame)->stack && zend_jit_opline_uses_reg(opline, Z_REG(res_addr))) { result_reg = ZREG_R0; } else { |