Skip to content

Commit 941a3b6

Browse files
committed
Remove unnecessary uses of CHECK_SILENT
If no error is passed, it is always silent.
1 parent 9c6e206 commit 941a3b6

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Zend/zend_execute.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1011,7 +1011,7 @@ static zend_always_inline zend_bool zend_check_type_slow(
10111011

10121012
builtin_types:
10131013
type_mask = ZEND_TYPE_FULL_MASK(type);
1014-
if ((type_mask & MAY_BE_CALLABLE) && zend_is_callable(arg, IS_CALLABLE_CHECK_SILENT, NULL)) {
1014+
if ((type_mask & MAY_BE_CALLABLE) && zend_is_callable(arg, 0, NULL)) {
10151015
return 1;
10161016
}
10171017
if ((type_mask & MAY_BE_ITERABLE) && zend_is_iterable(arg)) {

ext/opcache/jit/zend_jit_helpers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1184,7 +1184,7 @@ static zend_always_inline zend_bool zend_jit_verify_type_common(zval *arg, const
11841184

11851185
builtin_types:
11861186
type_mask = ZEND_TYPE_FULL_MASK(arg_info->type);
1187-
if ((type_mask & MAY_BE_CALLABLE) && zend_is_callable(arg, IS_CALLABLE_CHECK_SILENT, NULL)) {
1187+
if ((type_mask & MAY_BE_CALLABLE) && zend_is_callable(arg, 0, NULL)) {
11881188
return 1;
11891189
}
11901190
if ((type_mask & MAY_BE_ITERABLE) && zend_is_iterable(arg)) {

main/streams/userspace.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1000,7 +1000,7 @@ static int php_userstreamop_set_option(php_stream *stream, int option, int value
10001000
case PHP_STREAM_TRUNCATE_SUPPORTED:
10011001
if (zend_is_callable_ex(&func_name,
10021002
Z_ISUNDEF(us->object)? NULL : Z_OBJ(us->object),
1003-
IS_CALLABLE_CHECK_SILENT, NULL, NULL, NULL))
1003+
0, NULL, NULL, NULL))
10041004
ret = PHP_STREAM_OPTION_RETURN_OK;
10051005
else
10061006
ret = PHP_STREAM_OPTION_RETURN_ERR;

0 commit comments

Comments
 (0)