Fixed JIT failure after overflow detection (bench.php failure in 32-bit

dstogov · dstogov · commit 941b55fe6397 · 2021-05-17T18:21:43.000+03:00
build with -d opcache.jit=1254 -d opcache.jit_hot_loop=1 -d
opcache.jit_hot_func=1 -d opcache.jit_hot_return=1 -d
opcache.jit_hot_side_exit=1)
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
@@ -4233,7 +4233,7 @@ static int zend_jit_math_long_long(dasm_State    **Dst,
 		} else {
 			result_reg = Z_REG(res_addr);
 		}
-	} else if (Z_MODE(op1_addr) == IS_REG && Z_LAST_USE(op1_addr)) {
+	} else if (Z_MODE(op1_addr) == IS_REG && Z_LAST_USE(op1_addr) && !may_overflow) {
 		result_reg = Z_REG(op1_addr);
 	} else if (Z_REG(res_addr) != ZREG_R0) {
 		result_reg = ZREG_R0;

Original file line number	Diff line number	Diff line change
`@@ -4233,7 +4233,7 @@ static int zend_jit_math_long_long(dasm_State **Dst,`
`4233`	`4233`	`} else {`
`4234`	`4234`	`result_reg = Z_REG(res_addr);`
`4235`	`4235`	`}`
`4236`		`- } else if (Z_MODE(op1_addr) == IS_REG && Z_LAST_USE(op1_addr)) {`
	`4236`	`+ } else if (Z_MODE(op1_addr) == IS_REG && Z_LAST_USE(op1_addr) && !may_overflow) {`
`4237`	`4237`	`result_reg = Z_REG(op1_addr);`
`4238`	`4238`	`} else if (Z_REG(res_addr) != ZREG_R0) {`
`4239`	`4239`	`result_reg = ZREG_R0;`