archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Optimize instanceof_function

Browse source 
Split out the simple equality check into an inline function --
this is one of the common cases.

Replace instanceof_function_ex with zend_class_implements_interface.
There are a few more places where it may be used.
This commit is contained in:
Nikita Popov 2019-10-25 10:45:42 +02:00
parent bd7b1afd6e
commit c858d17f06
9 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Zend/zend_API.c
View file

@ -4282,7 +4282,7 @@ ZEND_API zend_bool zend_is_iterable(zval *iterable) /* {{{ */
case IS_ARRAY: case IS_ARRAY:
return 1; return 1;
case IS_OBJECT: case IS_OBJECT:
return instanceof_function(Z_OBJCE_P(iterable), zend_ce_traversable); return zend_class_implements_interface(Z_OBJCE_P(iterable), zend_ce_traversable);
default: default:
return 0; return 0;
} }
@ -4299,7 +4299,7 @@ ZEND_API zend_bool zend_is_countable(zval *countable) /* {{{ */
return 1; return 1;
} }
return instanceof_function(Z_OBJCE_P(countable), zend_ce_countable); return zend_class_implements_interface(Z_OBJCE_P(countable), zend_ce_countable);
default: default:
return 0; return 0;
} }

2
Zend/zend_interfaces.c
View file

@ -512,7 +512,7 @@ static int zend_implement_serializable(zend_class_entry *interface, zend_class_e
{ {
if (class_type->parent if (class_type->parent
&& (class_type->parent->serialize || class_type->parent->unserialize) && (class_type->parent->serialize || class_type->parent->unserialize)
&& !instanceof_function_ex(class_type->parent, zend_ce_serializable, 1)) { && !zend_class_implements_interface(class_type->parent, zend_ce_serializable)) {
return FAILURE; return FAILURE;
} }
if (!class_type->serialize) { if (!class_type->serialize) {

8
Zend/zend_object_handlers.c
View file

@ -898,7 +898,7 @@ ZEND_API zval *zend_std_read_dimension(zend_object *object, zval *offset, int ty
zend_class_entry *ce = object->ce; zend_class_entry *ce = object->ce;
zval tmp_offset; zval tmp_offset;
if (EXPECTED(instanceof_function_ex(ce, zend_ce_arrayaccess, 1) != 0)) { if (EXPECTED(zend_class_implements_interface(ce, zend_ce_arrayaccess) != 0)) {
if (offset == NULL) { if (offset == NULL) {
/* [] construct */ /* [] construct */
ZVAL_NULL(&tmp_offset); ZVAL_NULL(&tmp_offset);
@ -947,7 +947,7 @@ ZEND_API void zend_std_write_dimension(zend_object *object, zval *offset, zval *
zend_class_entry *ce = object->ce; zend_class_entry *ce = object->ce;
zval tmp_offset; zval tmp_offset;
if (EXPECTED(instanceof_function_ex(ce, zend_ce_arrayaccess, 1) != 0)) { if (EXPECTED(zend_class_implements_interface(ce, zend_ce_arrayaccess) != 0)) {
if (!offset) { if (!offset) {
ZVAL_NULL(&tmp_offset); ZVAL_NULL(&tmp_offset);
} else { } else {
@ -969,7 +969,7 @@ ZEND_API int zend_std_has_dimension(zend_object *object, zval *offset, int check
zval retval, tmp_offset; zval retval, tmp_offset;
int result; int result;
if (EXPECTED(instanceof_function_ex(ce, zend_ce_arrayaccess, 1) != 0)) { if (EXPECTED(zend_class_implements_interface(ce, zend_ce_arrayaccess) != 0)) {
ZVAL_COPY_DEREF(&tmp_offset, offset); ZVAL_COPY_DEREF(&tmp_offset, offset);
GC_ADDREF(object); GC_ADDREF(object);
zend_call_method_with_1_params(object, ce, NULL, "offsetexists", &retval, &tmp_offset); zend_call_method_with_1_params(object, ce, NULL, "offsetexists", &retval, &tmp_offset);
@ -1112,7 +1112,7 @@ ZEND_API void zend_std_unset_dimension(zend_object *object, zval *offset) /* {{{
zend_class_entry *ce = object->ce; zend_class_entry *ce = object->ce;
zval tmp_offset; zval tmp_offset;
if (instanceof_function_ex(ce, zend_ce_arrayaccess, 1)) { if (zend_class_implements_interface(ce, zend_ce_arrayaccess)) {
ZVAL_COPY_DEREF(&tmp_offset, offset); ZVAL_COPY_DEREF(&tmp_offset, offset);
GC_ADDREF(object); GC_ADDREF(object);
zend_call_method_with_1_params(object, ce, NULL, "offsetunset", NULL, &tmp_offset); zend_call_method_with_1_params(object, ce, NULL, "offsetunset", NULL, &tmp_offset);

64
Zend/zend_operators.c
View file

@ -2175,53 +2175,49 @@ ZEND_API int ZEND_FASTCALL is_smaller_or_equal_function(zval *result, zval *op1,
} }
/* }}} */ /* }}} */
static zend_always_inline zend_bool instanceof_class(const zend_class_entry *instance_ce, const zend_class_entry *ce) /* {{{ */ ZEND_API zend_bool ZEND_FASTCALL zend_class_implements_interface(const zend_class_entry *class_ce, const zend_class_entry *interface_ce) /* {{{ */
{
do {
if (instance_ce == ce) {
return 1;
}
instance_ce = instance_ce->parent;
} while (instance_ce);
return 0;
}
/* }}} */
static zend_bool ZEND_FASTCALL instanceof_interface(const zend_class_entry *instance_ce, const zend_class_entry *ce) /* {{{ */
{ {
uint32_t i; uint32_t i;
ZEND_ASSERT(!(class_ce->ce_flags & ZEND_ACC_INTERFACE));
ZEND_ASSERT(interface_ce->ce_flags & ZEND_ACC_INTERFACE);
if (instance_ce->num_interfaces) { if (class_ce->num_interfaces) {
ZEND_ASSERT(instance_ce->ce_flags & ZEND_ACC_RESOLVED_INTERFACES); ZEND_ASSERT(class_ce->ce_flags & ZEND_ACC_RESOLVED_INTERFACES);
for (i = 0; i < instance_ce->num_interfaces; i++) { for (i = 0; i < class_ce->num_interfaces; i++) {
if (instance_ce->interfaces[i] == ce) { if (class_ce->interfaces[i] == interface_ce) {
return 1; return 1;
} }
} }
} }
return instance_ce == ce; return 0;
} }
/* }}} */ /* }}} */
// TODO: It would make more sense to expose instanceof_class + instanceof_interface instead ZEND_API zend_bool ZEND_FASTCALL instanceof_function_slow(const zend_class_entry *instance_ce, const zend_class_entry *ce) /* {{{ */
ZEND_API zend_bool ZEND_FASTCALL instanceof_function_ex(const zend_class_entry *instance_ce, const zend_class_entry *ce, zend_bool is_interface) /* {{{ */
{
if (is_interface) {
ZEND_ASSERT(ce->ce_flags & ZEND_ACC_INTERFACE);
return instanceof_interface(instance_ce, ce);
} else {
ZEND_ASSERT(!(ce->ce_flags & ZEND_ACC_INTERFACE));
return instanceof_class(instance_ce, ce);
}
}
/* }}} */
ZEND_API zend_bool ZEND_FASTCALL instanceof_function(const zend_class_entry *instance_ce, const zend_class_entry *ce) /* {{{ */
{ {
ZEND_ASSERT(instance_ce != ce && "Should have been checked already");
if (ce->ce_flags & ZEND_ACC_INTERFACE) { if (ce->ce_flags & ZEND_ACC_INTERFACE) {
return instanceof_interface(instance_ce, ce); uint32_t i;
if (instance_ce->num_interfaces) {
ZEND_ASSERT(instance_ce->ce_flags & ZEND_ACC_RESOLVED_INTERFACES);
for (i = 0; i < instance_ce->num_interfaces; i++) {
if (instance_ce->interfaces[i] == ce) {
return 1;
}
}
}
return 0;
} else { } else {
return instanceof_class(instance_ce, ce); while (1) {
instance_ce = instance_ce->parent;
if (instance_ce == ce) {
return 1;
}
if (instance_ce == NULL) {
return 0;
}
}
} }
} }
/* }}} */ /* }}} */

9
Zend/zend_operators.h
View file

@ -63,8 +63,13 @@ ZEND_API int ZEND_FASTCALL is_not_equal_function(zval *result, zval *op1, zval *
ZEND_API int ZEND_FASTCALL is_smaller_function(zval *result, zval *op1, zval *op2); ZEND_API int ZEND_FASTCALL is_smaller_function(zval *result, zval *op1, zval *op2);
ZEND_API int ZEND_FASTCALL is_smaller_or_equal_function(zval *result, zval *op1, zval *op2); ZEND_API int ZEND_FASTCALL is_smaller_or_equal_function(zval *result, zval *op1, zval *op2);
ZEND_API zend_bool ZEND_FASTCALL instanceof_function_ex(const zend_class_entry *instance_ce, const zend_class_entry *ce, zend_bool is_interface); ZEND_API zend_bool ZEND_FASTCALL zend_class_implements_interface(const zend_class_entry *class_ce, const zend_class_entry *interface_ce);
ZEND_API zend_bool ZEND_FASTCALL instanceof_function(const zend_class_entry *instance_ce, const zend_class_entry *ce); ZEND_API zend_bool ZEND_FASTCALL instanceof_function_slow(const zend_class_entry *instance_ce, const zend_class_entry *ce);
static zend_always_inline zend_bool instanceof_function(
const zend_class_entry *instance_ce, const zend_class_entry *ce) {
return instance_ce == ce || instanceof_function_slow(instance_ce, ce);
}
/** /**
* Checks whether the string "str" with length "length" is numeric. The value * Checks whether the string "str" with length "length" is numeric. The value

2
Zend/zend_vm_def.h
View file

@ -8424,7 +8424,7 @@ ZEND_VM_COLD_CONST_HANDLER(190, ZEND_COUNT, CONST|TMPVAR|CV, UNUSED)
} }
/* if not and the object implements Countable we call its count() method */ /* if not and the object implements Countable we call its count() method */
if (instanceof_function(zobj->ce, zend_ce_countable)) { if (zend_class_implements_interface(zobj->ce, zend_ce_countable)) {
zval retval; zval retval;
zend_call_method_with_0_params(zobj, NULL, NULL, "count", &retval); zend_call_method_with_0_params(zobj, NULL, NULL, "count", &retval);

6
Zend/zend_vm_execute.h
View file

@ -9254,7 +9254,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_COUNT_SPEC_CONST_
} }
/* if not and the object implements Countable we call its count() method */ /* if not and the object implements Countable we call its count() method */
if (instanceof_function(zobj->ce, zend_ce_countable)) { if (zend_class_implements_interface(zobj->ce, zend_ce_countable)) {
zval retval; zval retval;
zend_call_method_with_0_params(zobj, NULL, NULL, "count", &retval); zend_call_method_with_0_params(zobj, NULL, NULL, "count", &retval);
@ -16319,7 +16319,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_COUNT_SPEC_TMPVAR_UNUSED_HANDL
} }
/* if not and the object implements Countable we call its count() method */ /* if not and the object implements Countable we call its count() method */
if (instanceof_function(zobj->ce, zend_ce_countable)) { if (zend_class_implements_interface(zobj->ce, zend_ce_countable)) {
zval retval; zval retval;
zend_call_method_with_0_params(zobj, NULL, NULL, "count", &retval); zend_call_method_with_0_params(zobj, NULL, NULL, "count", &retval);
@ -45446,7 +45446,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_COUNT_SPEC_CV_UNUSED_HANDLER(Z
} }
/* if not and the object implements Countable we call its count() method */ /* if not and the object implements Countable we call its count() method */
if (instanceof_function(zobj->ce, zend_ce_countable)) { if (zend_class_implements_interface(zobj->ce, zend_ce_countable)) {
zval retval; zval retval;
zend_call_method_with_0_params(zobj, NULL, NULL, "count", &retval); zend_call_method_with_0_params(zobj, NULL, NULL, "count", &retval);

3
ext/intl/dateformat/dateformat_helpers.cpp
View file

@ -69,8 +69,7 @@ int datefmt_process_calendar_arg(zval* calendar_zv,
cal_int_type = Z_LVAL_P(calendar_zv); cal_int_type = Z_LVAL_P(calendar_zv);
} else if (Z_TYPE_P(calendar_zv) == IS_OBJECT && } else if (Z_TYPE_P(calendar_zv) == IS_OBJECT &&
instanceof_function_ex(Z_OBJCE_P(calendar_zv), instanceof_function(Z_OBJCE_P(calendar_zv), Calendar_ce_ptr)) {
Calendar_ce_ptr, 0)) {
cal = calendar_fetch_native_calendar(calendar_zv); cal = calendar_fetch_native_calendar(calendar_zv);
if (cal == NULL) { if (cal == NULL) {

4
ext/opcache/zend_persist.c
View file

@ -923,10 +923,10 @@ static void zend_update_parent_ce(zend_class_entry *ce)
if (ce->iterator_funcs_ptr) { if (ce->iterator_funcs_ptr) {
memset(ce->iterator_funcs_ptr, 0, sizeof(zend_class_iterator_funcs)); memset(ce->iterator_funcs_ptr, 0, sizeof(zend_class_iterator_funcs));
if (instanceof_function_ex(ce, zend_ce_aggregate, 1)) { if (zend_class_implements_interface(ce, zend_ce_aggregate)) {
ce->iterator_funcs_ptr->zf_new_iterator = zend_hash_str_find_ptr(&ce->function_table, "getiterator", sizeof("getiterator") - 1); ce->iterator_funcs_ptr->zf_new_iterator = zend_hash_str_find_ptr(&ce->function_table, "getiterator", sizeof("getiterator") - 1);
} }
if (instanceof_function_ex(ce, zend_ce_iterator, 1)) { if (zend_class_implements_interface(ce, zend_ce_iterator)) {
ce->iterator_funcs_ptr->zf_rewind = zend_hash_str_find_ptr(&ce->function_table, "rewind", sizeof("rewind") - 1); ce->iterator_funcs_ptr->zf_rewind = zend_hash_str_find_ptr(&ce->function_table, "rewind", sizeof("rewind") - 1);
ce->iterator_funcs_ptr->zf_valid = zend_hash_str_find_ptr(&ce->function_table, "valid", sizeof("valid") - 1); ce->iterator_funcs_ptr->zf_valid = zend_hash_str_find_ptr(&ce->function_table, "valid", sizeof("valid") - 1);
ce->iterator_funcs_ptr->zf_key = zend_hash_str_find_ptr(&ce->function_table, "key", sizeof("key") - 1); ce->iterator_funcs_ptr->zf_key = zend_hash_str_find_ptr(&ce->function_table, "key", sizeof("key") - 1);