Skip to content

Commit bb7dca3

Browse files
committed
Merge branch 'PHP-8.2'
* PHP-8.2: Revert "Remove useless UNEXPECTED around RETURN_VALUE_USED in specialized RETVAL handler"
2 parents 0493187 + 81f3fcd commit bb7dca3

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

Zend/zend_vm_def.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -1519,7 +1519,7 @@ ZEND_VM_HOT_HANDLER(34, ZEND_PRE_INC, VAR|CV, ANY, SPEC(RETVAL))
15191519

15201520
if (EXPECTED(Z_TYPE_P(var_ptr) == IS_LONG)) {
15211521
fast_long_increment_function(var_ptr);
1522-
if (RETURN_VALUE_USED(opline)) {
1522+
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
15231523
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), var_ptr);
15241524
}
15251525
ZEND_VM_NEXT_OPCODE();
@@ -1571,7 +1571,7 @@ ZEND_VM_HOT_HANDLER(35, ZEND_PRE_DEC, VAR|CV, ANY, SPEC(RETVAL))
15711571

15721572
if (EXPECTED(Z_TYPE_P(var_ptr) == IS_LONG)) {
15731573
fast_long_decrement_function(var_ptr);
1574-
if (RETURN_VALUE_USED(opline)) {
1574+
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
15751575
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), var_ptr);
15761576
}
15771577
ZEND_VM_NEXT_OPCODE();
@@ -9696,7 +9696,7 @@ ZEND_VM_HOT_TYPE_SPEC_HANDLER(ZEND_PRE_INC, (res_info == MAY_BE_LONG && op1_info
96969696

96979697
var_ptr = GET_OP1_ZVAL_PTR_PTR_UNDEF(BP_VAR_RW);
96989698
Z_LVAL_P(var_ptr)++;
9699-
if (RETURN_VALUE_USED(opline)) {
9699+
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
97009700
ZVAL_LONG(EX_VAR(opline->result.var), Z_LVAL_P(var_ptr));
97019701
}
97029702
ZEND_VM_NEXT_OPCODE();
@@ -9709,7 +9709,7 @@ ZEND_VM_HOT_TYPE_SPEC_HANDLER(ZEND_PRE_INC, (op1_info == MAY_BE_LONG), ZEND_PRE_
97099709

97109710
var_ptr = GET_OP1_ZVAL_PTR_PTR_UNDEF(BP_VAR_RW);
97119711
fast_long_increment_function(var_ptr);
9712-
if (RETURN_VALUE_USED(opline)) {
9712+
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
97139713
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), var_ptr);
97149714
}
97159715
ZEND_VM_NEXT_OPCODE();
@@ -9722,7 +9722,7 @@ ZEND_VM_HOT_TYPE_SPEC_HANDLER(ZEND_PRE_DEC, (res_info == MAY_BE_LONG && op1_info
97229722

97239723
var_ptr = GET_OP1_ZVAL_PTR_PTR_UNDEF(BP_VAR_RW);
97249724
Z_LVAL_P(var_ptr)--;
9725-
if (RETURN_VALUE_USED(opline)) {
9725+
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
97269726
ZVAL_LONG(EX_VAR(opline->result.var), Z_LVAL_P(var_ptr));
97279727
}
97289728
ZEND_VM_NEXT_OPCODE();
@@ -9735,7 +9735,7 @@ ZEND_VM_HOT_TYPE_SPEC_HANDLER(ZEND_PRE_DEC, (op1_info == MAY_BE_LONG), ZEND_PRE_
97359735

97369736
var_ptr = GET_OP1_ZVAL_PTR_PTR_UNDEF(BP_VAR_RW);
97379737
fast_long_decrement_function(var_ptr);
9738-
if (RETURN_VALUE_USED(opline)) {
9738+
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
97399739
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), var_ptr);
97409740
}
97419741
ZEND_VM_NEXT_OPCODE();

Zend/zend_vm_execute.h

+16-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)