Skip to content

Commit 9e94bcf

Browse files
SammyKdstogov
authored andcommitted
Remove specialization of SPEC(OBSERVER) handlers
1 parent a9cbdaf commit 9e94bcf

File tree

4 files changed

+255
-1353
lines changed

4 files changed

+255
-1353
lines changed

Zend/zend_vm_def.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3988,6 +3988,9 @@ ZEND_VM_HOT_HANDLER(131, ZEND_DO_FCALL_BY_NAME, ANY, ANY, SPEC(RETVAL,OBSERVER))
39883988
} else {
39893989
zval retval;
39903990
ZEND_ASSERT(fbc->type == ZEND_INTERNAL_FUNCTION);
3991+
if (IS_OBSERVER) {
3992+
ret = NULL;
3993+
}
39913994

39923995
if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_DEPRECATED) != 0)) {
39933996
zend_deprecated_function(fbc);
@@ -4087,6 +4090,9 @@ ZEND_VM_HOT_HANDLER(60, ZEND_DO_FCALL, ANY, ANY, SPEC(RETVAL,OBSERVER))
40874090
} else {
40884091
zval retval;
40894092
ZEND_ASSERT(fbc->type == ZEND_INTERNAL_FUNCTION);
4093+
if (IS_OBSERVER) {
4094+
ret = NULL;
4095+
}
40904096

40914097
if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_DEPRECATED) != 0)) {
40924098
zend_deprecated_function(fbc);

0 commit comments

Comments
 (0)