Fixed possible failure when repair after overflow detection

dstogov · dstogov · commit f70ac416c311 · 2021-05-18T15:32:36.000+03:00
diff --git a/ext/opcache/jit/zend_jit_arm64.dasc b/ext/opcache/jit/zend_jit_arm64.dasc
@@ -3858,7 +3858,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_REG0) {
 		result_reg = ZREG_REG0;

Original file line number	Diff line number	Diff line change
`@@ -3858,7 +3858,7 @@ static int zend_jit_math_long_long(dasm_State **Dst,`
`3858`	`3858`	`} else {`
`3859`	`3859`	`result_reg = Z_REG(res_addr);`
`3860`	`3860`	`}`
`3861`		`- } else if (Z_MODE(op1_addr) == IS_REG && Z_LAST_USE(op1_addr)) {`
	`3861`	`+ } else if (Z_MODE(op1_addr) == IS_REG && Z_LAST_USE(op1_addr) && !may_overflow) {`
`3862`	`3862`	`result_reg = Z_REG(op1_addr);`
`3863`	`3863`	`} else if (Z_REG(res_addr) != ZREG_REG0) {`
`3864`	`3864`	`result_reg = ZREG_REG0;`