Skip to content

Commit 81f3fcd

Browse files
committed
Revert "Remove useless UNEXPECTED around RETURN_VALUE_USED in specialized RETVAL handler"
This reverts commit 5b80161.
1 parent efb9181 commit 81f3fcd

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
@@ -1516,7 +1516,7 @@ ZEND_VM_HOT_HANDLER(34, ZEND_PRE_INC, VAR|CV, ANY, SPEC(RETVAL))
15161516

15171517
if (EXPECTED(Z_TYPE_P(var_ptr) == IS_LONG)) {
15181518
fast_long_increment_function(var_ptr);
1519-
if (RETURN_VALUE_USED(opline)) {
1519+
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
15201520
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), var_ptr);
15211521
}
15221522
ZEND_VM_NEXT_OPCODE();
@@ -1568,7 +1568,7 @@ ZEND_VM_HOT_HANDLER(35, ZEND_PRE_DEC, VAR|CV, ANY, SPEC(RETVAL))
15681568

15691569
if (EXPECTED(Z_TYPE_P(var_ptr) == IS_LONG)) {
15701570
fast_long_decrement_function(var_ptr);
1571-
if (RETURN_VALUE_USED(opline)) {
1571+
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
15721572
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), var_ptr);
15731573
}
15741574
ZEND_VM_NEXT_OPCODE();
@@ -9634,7 +9634,7 @@ ZEND_VM_HOT_TYPE_SPEC_HANDLER(ZEND_PRE_INC, (res_info == MAY_BE_LONG && op1_info
96349634

96359635
var_ptr = GET_OP1_ZVAL_PTR_PTR_UNDEF(BP_VAR_RW);
96369636
Z_LVAL_P(var_ptr)++;
9637-
if (RETURN_VALUE_USED(opline)) {
9637+
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
96389638
ZVAL_LONG(EX_VAR(opline->result.var), Z_LVAL_P(var_ptr));
96399639
}
96409640
ZEND_VM_NEXT_OPCODE();
@@ -9647,7 +9647,7 @@ ZEND_VM_HOT_TYPE_SPEC_HANDLER(ZEND_PRE_INC, (op1_info == MAY_BE_LONG), ZEND_PRE_
96479647

96489648
var_ptr = GET_OP1_ZVAL_PTR_PTR_UNDEF(BP_VAR_RW);
96499649
fast_long_increment_function(var_ptr);
9650-
if (RETURN_VALUE_USED(opline)) {
9650+
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
96519651
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), var_ptr);
96529652
}
96539653
ZEND_VM_NEXT_OPCODE();
@@ -9660,7 +9660,7 @@ ZEND_VM_HOT_TYPE_SPEC_HANDLER(ZEND_PRE_DEC, (res_info == MAY_BE_LONG && op1_info
96609660

96619661
var_ptr = GET_OP1_ZVAL_PTR_PTR_UNDEF(BP_VAR_RW);
96629662
Z_LVAL_P(var_ptr)--;
9663-
if (RETURN_VALUE_USED(opline)) {
9663+
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
96649664
ZVAL_LONG(EX_VAR(opline->result.var), Z_LVAL_P(var_ptr));
96659665
}
96669666
ZEND_VM_NEXT_OPCODE();
@@ -9673,7 +9673,7 @@ ZEND_VM_HOT_TYPE_SPEC_HANDLER(ZEND_PRE_DEC, (op1_info == MAY_BE_LONG), ZEND_PRE_
96739673

96749674
var_ptr = GET_OP1_ZVAL_PTR_PTR_UNDEF(BP_VAR_RW);
96759675
fast_long_decrement_function(var_ptr);
9676-
if (RETURN_VALUE_USED(opline)) {
9676+
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
96779677
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), var_ptr);
96789678
}
96799679
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)