Skip to content

Commit 5b80161

Browse files
committed
Remove useless UNEXPECTED around RETURN_VALUE_USED in specialized RETVAL handler
This can lead to funny code like UNEXPECTED(1) which is non-sensical.
1 parent b825756 commit 5b80161

File tree

2 files changed

+39
-39
lines changed

2 files changed

+39
-39
lines changed

Zend/zend_vm_def.h

Lines changed: 7 additions & 7 deletions
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 (UNEXPECTED(RETURN_VALUE_USED(opline))) {
1519+
if (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 (UNEXPECTED(RETURN_VALUE_USED(opline))) {
1571+
if (RETURN_VALUE_USED(opline)) {
15721572
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), var_ptr);
15731573
}
15741574
ZEND_VM_NEXT_OPCODE();
@@ -2693,7 +2693,7 @@ ZEND_VM_HANDLER(22, ZEND_ASSIGN, VAR|CV, CONST|TMP|VAR|CV, SPEC(RETVAL))
26932693
variable_ptr = GET_OP1_ZVAL_PTR_PTR_UNDEF(BP_VAR_W);
26942694

26952695
value = zend_assign_to_variable(variable_ptr, value, OP2_TYPE, EX_USES_STRICT_TYPES());
2696-
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
2696+
if (RETURN_VALUE_USED(opline)) {
26972697
ZVAL_COPY(EX_VAR(opline->result.var), value);
26982698
}
26992699
FREE_OP1();
@@ -9611,7 +9611,7 @@ ZEND_VM_HOT_TYPE_SPEC_HANDLER(ZEND_PRE_INC, (res_info == MAY_BE_LONG && op1_info
96119611

96129612
var_ptr = GET_OP1_ZVAL_PTR_PTR_UNDEF(BP_VAR_RW);
96139613
Z_LVAL_P(var_ptr)++;
9614-
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
9614+
if (RETURN_VALUE_USED(opline)) {
96159615
ZVAL_LONG(EX_VAR(opline->result.var), Z_LVAL_P(var_ptr));
96169616
}
96179617
ZEND_VM_NEXT_OPCODE();
@@ -9624,7 +9624,7 @@ ZEND_VM_HOT_TYPE_SPEC_HANDLER(ZEND_PRE_INC, (op1_info == MAY_BE_LONG), ZEND_PRE_
96249624

96259625
var_ptr = GET_OP1_ZVAL_PTR_PTR_UNDEF(BP_VAR_RW);
96269626
fast_long_increment_function(var_ptr);
9627-
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
9627+
if (RETURN_VALUE_USED(opline)) {
96289628
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), var_ptr);
96299629
}
96309630
ZEND_VM_NEXT_OPCODE();
@@ -9637,7 +9637,7 @@ ZEND_VM_HOT_TYPE_SPEC_HANDLER(ZEND_PRE_DEC, (res_info == MAY_BE_LONG && op1_info
96379637

96389638
var_ptr = GET_OP1_ZVAL_PTR_PTR_UNDEF(BP_VAR_RW);
96399639
Z_LVAL_P(var_ptr)--;
9640-
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
9640+
if (RETURN_VALUE_USED(opline)) {
96419641
ZVAL_LONG(EX_VAR(opline->result.var), Z_LVAL_P(var_ptr));
96429642
}
96439643
ZEND_VM_NEXT_OPCODE();
@@ -9650,7 +9650,7 @@ ZEND_VM_HOT_TYPE_SPEC_HANDLER(ZEND_PRE_DEC, (op1_info == MAY_BE_LONG), ZEND_PRE_
96509650

96519651
var_ptr = GET_OP1_ZVAL_PTR_PTR_UNDEF(BP_VAR_RW);
96529652
fast_long_decrement_function(var_ptr);
9653-
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
9653+
if (RETURN_VALUE_USED(opline)) {
96549654
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), var_ptr);
96559655
}
96569656
ZEND_VM_NEXT_OPCODE();

Zend/zend_vm_execute.h

Lines changed: 32 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)