Merge branch 'PHP-8.0' into PHP-8.1

dstogov · dstogov · commit e81b6bf018b3 · 2022-10-05T21:39:37.000+03:00
* PHP-8.0:
  Fix typo
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -6440,7 +6440,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 								ssa->var_info[ssa_op->op1_def].type &= ~MAY_BE_GUARD;
 								if (ra && ra[ssa_op->op1_def]) {
 									SET_STACK_REG_EX(stack, EX_VAR_TO_NUM(opline->op1.var), ra[ssa_op->op1_def]->reg,
-										ra[ssa_op->op1_def]->reg & ZREG_STORE);
+										ra[ssa_op->op1_def]->flags & ZREG_STORE);
 								}
 							}
 							if (type == IS_LONG

Original file line number	Diff line number	Diff line change
`@@ -6440,7 +6440,7 @@ static const void zend_jit_trace(zend_jit_trace_rec trace_buffer, uint32_t par`
`6440`	`6440`	`ssa->var_info[ssa_op->op1_def].type &= ~MAY_BE_GUARD;`
`6441`	`6441`	`if (ra && ra[ssa_op->op1_def]) {`
`6442`	`6442`	`SET_STACK_REG_EX(stack, EX_VAR_TO_NUM(opline->op1.var), ra[ssa_op->op1_def]->reg,`
`6443`		`- ra[ssa_op->op1_def]->reg & ZREG_STORE);`
	`6443`	`+ ra[ssa_op->op1_def]->flags & ZREG_STORE);`
`6444`	`6444`	`}`
`6445`	`6445`	`}`
`6446`	`6446`	`if (type == IS_LONG`