archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.0'

Browse source 
* PHP-8.0:
  Fixed bug #80786
This commit is contained in:
Nikita Popov 2021-02-23 10:22:20 +01:00
commit 8be711be47
2 changed files with 36 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
ext/opcache/jit/zend_jit_x86.dasc
View file

@ -4428,7 +4428,14 @@ static int zend_jit_math_double_long(dasm_State **Dst,
zend_jit_addr res_addr,
uint32_t res_use_info)
{
zend_reg result_reg, tmp_reg;
zend_reg result_reg, tmp_reg_gp;
if (Z_MODE(res_addr) == IS_MEM_ZVAL && Z_REG(res_addr) == ZREG_R0) {
/* ASSIGN_DIM_OP */
tmp_reg_gp = ZREG_R1;
} else {
tmp_reg_gp = ZREG_R0;
}
if (zend_is_commutative(opcode)
&& (Z_MODE(res_addr) != IS_REG || Z_MODE(op1_addr) != IS_REG || Z_REG(res_addr) != Z_REG(op1_addr))) {
@ -4437,13 +4444,7 @@ static int zend_jit_math_double_long(dasm_State **Dst,
} else {
result_reg = ZREG_XMM0;
}
if (Z_MODE(res_addr) == IS_MEM_ZVAL && Z_REG(res_addr) == ZREG_R0) {
/* ASSIGN_DIM_OP */
tmp_reg = ZREG_R1;
} else {
tmp_reg = ZREG_R0;
}
| SSE_GET_ZVAL_LVAL result_reg, op2_addr, tmp_reg
| SSE_GET_ZVAL_LVAL result_reg, op2_addr, tmp_reg_gp
if (Z_MODE(res_addr) == IS_MEM_ZVAL && Z_REG(res_addr) == ZREG_R0) {
/* ASSIGN_DIM_OP */
if (CAN_USE_AVX()) {
@ -4485,7 +4486,7 @@ static int zend_jit_math_double_long(dasm_State **Dst,
&& Z_LVAL_P(Z_ZV(op2_addr)) == 0) {
/* +/- 0 */
} else {
| SSE_GET_ZVAL_LVAL tmp_reg, op2_addr, ZREG_R0
| SSE_GET_ZVAL_LVAL tmp_reg, op2_addr, tmp_reg_gp
| AVX_MATH_REG opcode, result_reg, op1_reg, tmp_reg
}
} else {
@ -4495,7 +4496,7 @@ static int zend_jit_math_double_long(dasm_State **Dst,
&& Z_LVAL_P(Z_ZV(op2_addr)) == 0) {
/* +/- 0 */
} else {
| SSE_GET_ZVAL_LVAL tmp_reg, op2_addr, ZREG_R0
| SSE_GET_ZVAL_LVAL tmp_reg, op2_addr, tmp_reg_gp
| SSE_MATH_REG opcode, result_reg, tmp_reg
}
}

25
ext/opcache/tests/jit/bug80786.phpt Normal file
View file

@ -0,0 +1,25 @@
--TEST--
Bug #80786: PHP crash using JIT
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.jit_buffer_size=1M
opcache.jit=function
--FILE--
<?php
$a = new Test();
$a->TestFunc();
var_dump($a->value);
class Test{
public $value = 11.3;
public function TestFunc() {
$this->value -= 10;
}
}
?>
--EXPECT--
float(1.3000000000000007)