Merge branch 'PHP-8.0' into PHP-8.1

dstogov · dstogov · commit 01dc872b2621 · 2021-12-21T00:03:09.000+03:00
* PHP-8.0:
  Fixed compilation warning
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
@@ -4428,6 +4428,7 @@ static int zend_jit_math_long_long(dasm_State    **Dst,
 				tmp_reg = ZREG_R1;
 			}
 			|	LONG_MATH opcode, result_reg, op2_addr, tmp_reg
+			(void)tmp_reg;
 		}
 	}
 	if (may_overflow) {
@@ -5192,6 +5193,7 @@ static int zend_jit_long_math_helper(dasm_State    **Dst,
 				}
 				|	GET_ZVAL_LVAL result_reg, op1_addr
 				|	LONG_MATH ZEND_BW_AND, result_reg, tmp_addr, tmp_reg
+				(void)tmp_reg;
 			} else {
 				if (Z_MODE(res_addr) == IS_MEM_ZVAL && Z_REG(res_addr) == ZREG_RAX) {
 					|	mov aword T1, r0 // save
@@ -5290,6 +5292,7 @@ static int zend_jit_long_math_helper(dasm_State    **Dst,
 		}
 		|	GET_ZVAL_LVAL result_reg, op1_addr
 		|	LONG_MATH opcode, result_reg, op2_addr, tmp_reg
+		(void)tmp_reg;
 	}
 
 	if (Z_MODE(res_addr) != IS_REG || Z_REG(res_addr) != result_reg) {

Original file line number	Diff line number	Diff line change
`@@ -4428,6 +4428,7 @@ static int zend_jit_math_long_long(dasm_State **Dst,`
`4428`	`4428`	`tmp_reg = ZREG_R1;`
`4429`	`4429`	`}`
`4430`	`4430`	`\| LONG_MATH opcode, result_reg, op2_addr, tmp_reg`
	`4431`	`+ (void)tmp_reg;`
`4431`	`4432`	`}`
`4432`	`4433`	`}`
`4433`	`4434`	`if (may_overflow) {`
`@@ -5192,6 +5193,7 @@ static int zend_jit_long_math_helper(dasm_State **Dst,`
`5192`	`5193`	`}`
`5193`	`5194`	`\| GET_ZVAL_LVAL result_reg, op1_addr`
`5194`	`5195`	`\| LONG_MATH ZEND_BW_AND, result_reg, tmp_addr, tmp_reg`
	`5196`	`+ (void)tmp_reg;`
`5195`	`5197`	`} else {`
`5196`	`5198`	`if (Z_MODE(res_addr) == IS_MEM_ZVAL && Z_REG(res_addr) == ZREG_RAX) {`
`5197`	`5199`	`\| mov aword T1, r0 // save`
`@@ -5290,6 +5292,7 @@ static int zend_jit_long_math_helper(dasm_State **Dst,`
`5290`	`5292`	`}`
`5291`	`5293`	`\| GET_ZVAL_LVAL result_reg, op1_addr`
`5292`	`5294`	`\| LONG_MATH opcode, result_reg, op2_addr, tmp_reg`
	`5295`	`+ (void)tmp_reg;`
`5293`	`5296`	`}`
`5294`	`5297`
`5295`	`5298`	`if (Z_MODE(res_addr) != IS_REG \|\| Z_REG(res_addr) != result_reg) {`