Skip to content

Commit e41598c

Browse files
committed
ext/spl: Use new F ZPP modifier
1 parent 52de095 commit e41598c

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

ext/spl/spl_iterators.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,15 +1436,9 @@ static spl_dual_it_object* spl_dual_it_construct(INTERNAL_FUNCTION_PARAMETERS, z
14361436
case DIT_CallbackFilterIterator:
14371437
case DIT_RecursiveCallbackFilterIterator: {
14381438
zend_fcall_info fci;
1439-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Of", &zobject, ce_inner, &fci, &intern->u.callback_filter) == FAILURE) {
1439+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "OF", &zobject, ce_inner, &fci, &intern->u.callback_filter) == FAILURE) {
14401440
return NULL;
14411441
}
1442-
if (!ZEND_FCC_INITIALIZED(intern->u.callback_filter)) {
1443-
/* Call trampoline has been cleared by zpp. Refetch it, because we want to deal
1444-
* with it outselves. It is important that it is not refetched on every call,
1445-
* because calls may occur from different scopes. */
1446-
zend_is_callable_ex(&fci.function_name, NULL, IS_CALLABLE_SUPPRESS_DEPRECATIONS, NULL, &intern->u.callback_filter, NULL);
1447-
}
14481442
zend_fcc_addref(&intern->u.callback_filter);
14491443
break;
14501444
}

0 commit comments

Comments
 (0)