Skip to content

Commit baadb12

Browse files
committed
fixup! Leverage RETVAL opcode specialization
1 parent 7a5a475 commit baadb12

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Zend/zend_vm_def.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4156,7 +4156,7 @@ ZEND_VM_HOT_HANDLER(131, ZEND_DO_FCALL_BY_NAME, ANY, ANY, SPEC(RETVAL,OBSERVER))
41564156
SAVE_OPLINE();
41574157
EX(call) = call->prev_execute_data;
41584158

4159-
const uint32_t no_discard = (!RETURN_VALUE_USED(opline)) * ZEND_ACC_NODISCARD;
4159+
const uint32_t no_discard = RETURN_VALUE_USED(opline) ? 0 : ZEND_ACC_NODISCARD;
41604160

41614161
if (UNEXPECTED((fbc->common.fn_flags & (ZEND_ACC_DEPRECATED|no_discard)) != 0)) {
41624162
if ((fbc->common.fn_flags & ZEND_ACC_DEPRECATED) != 0) {
@@ -4267,7 +4267,7 @@ ZEND_VM_HOT_HANDLER(60, ZEND_DO_FCALL, ANY, ANY, SPEC(RETVAL,OBSERVER))
42674267
SAVE_OPLINE();
42684268
EX(call) = call->prev_execute_data;
42694269

4270-
const uint32_t no_discard = (!RETURN_VALUE_USED(opline)) * ZEND_ACC_NODISCARD;
4270+
const uint32_t no_discard = RETURN_VALUE_USED(opline) ? 0 : ZEND_ACC_NODISCARD;
42714271

42724272
if (UNEXPECTED((fbc->common.fn_flags & (ZEND_ACC_DEPRECATED|no_discard)) != 0)) {
42734273
if ((fbc->common.fn_flags & ZEND_ACC_DEPRECATED) != 0) {

0 commit comments

Comments
 (0)