Skip to content

Commit e7dadbc

Browse files
authored
Zend: use normal if condition in zend_vm_def.h rather than a preprocessor condition (#24706)
Effectively reverting 0294485
1 parent 28b6435 commit e7dadbc

2 files changed

Lines changed: 11 additions & 44 deletions

File tree

‎Zend/zend_vm_def.h‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4474,9 +4474,7 @@ ZEND_VM_COLD_CONST_HANDLER(124, ZEND_VERIFY_RETURN_TYPE, CONST|TMP|VAR|UNUSED|CV
44744474
SAVE_OPLINE();
44754475
zend_verify_missing_return_type(EX(func));
44764476
HANDLE_EXCEPTION();
4477-
} else {
4478-
/* prevents "undefined variable opline" errors */
4479-
#if !ZEND_VM_SPEC || (OP1_TYPE != IS_UNUSED)
4477+
} else if (!ZEND_VM_SPEC || (OP1_TYPE != IS_UNUSED)) {
44804478
USE_OPLINE
44814479
zval *retval_ref, *retval_ptr;
44824480
zend_arg_info *ret_info = EX(func)->common.arg_info - 1;
@@ -4534,7 +4532,6 @@ ZEND_VM_COLD_CONST_HANDLER(124, ZEND_VERIFY_RETURN_TYPE, CONST|TMP|VAR|UNUSED|CV
45344532
HANDLE_EXCEPTION();
45354533
}
45364534
ZEND_VM_NEXT_OPCODE();
4537-
#endif
45384535
}
45394536
}
45404537

‎Zend/zend_vm_execute.h‎

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

0 commit comments

Comments
 (0)