bdnugget/php-src
1
0 Fork 0
mirror of https://github.com/bdnugget/php-src.git synced 2026-11-07 09:17:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimized object conversion to array without rebulding properties HashTable

Browse Source
This commit is contained in:
Dmitry Stogov committed 2021-03-01 22:37:37 +03:00
1 parent f9f8c1c79c
commit 9da66e6ad0
5 files changed
+66
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Zend/zend_object_handlers.c
+32
View File
@@ -87,6 +87,38 @@ ZEND_API void rebuild_object_properties(zend_object *zobj) /* {{{ */
}
/* }}} */
ZEND_API HashTable *zend_std_build_object_properties_array(zend_object *zobj) /* {{{ */
{
zend_property_info *prop_info;
zend_class_entry *ce = zobj->ce;
HashTable *ht;
zval* prop;
int i;
ZEND_ASSERT(!zobj->properties);
ht = zend_new_array(ce->default_properties_count);
if (ce->default_properties_count) {
zend_hash_real_init_mixed(ht);
for (i = 0; i < ce->default_properties_count; i++) {
prop_info = ce->properties_info_table[i];
if (!prop_info) {
continue;
}
prop = OBJ_PROP(zobj, prop_info->offset);
if (UNEXPECTED(Z_TYPE_P(prop) == IS_UNDEF)) {
continue;
}
Z_TRY_ADDREF_P(prop);
_zend_hash_append(ht, prop_info->name, prop);
}
}
return ht;
}
/* }}} */
ZEND_API HashTable *zend_std_get_properties(zend_object *zobj) /* {{{ */
{
if (!zobj->properties) {
Zend/zend_object_handlers.h
+2
View File
@@ -225,6 +225,8 @@ ZEND_API int zend_std_compare_objects(zval *o1, zval *o2);
ZEND_API int zend_std_get_closure(zend_object *obj, zend_class_entry **ce_ptr, zend_function **fptr_ptr, zend_object **obj_ptr, bool check_only);
ZEND_API void rebuild_object_properties(zend_object *zobj);
ZEND_API HashTable *zend_std_build_object_properties_array(zend_object *zobj);
/* Handler for objects that cannot be meaningfully compared.
* Only objects with the same identity will be considered equal. */
ZEND_API int zend_objects_not_comparable(zval *o1, zval *o2);
Zend/zend_operators.c
+7
View File
@@ -713,6 +713,13 @@ try_again:
case IS_OBJECT:
if (Z_OBJCE_P(op) == zend_ce_closure) {
convert_scalar_to_array(op);
} else if (Z_OBJ_P(op)->properties == NULL
&& Z_OBJ_HT_P(op)->get_properties_for == NULL
&& Z_OBJ_HT_P(op)->get_properties == zend_std_get_properties) {
/* Optimized version without rebulding properties HashTable */
HashTable *ht = zend_std_build_object_properties_array(Z_OBJ_P(op));
OBJ_RELEASE(Z_OBJ_P(op));
ZVAL_ARR(op, ht);
} else {
HashTable *obj_ht = zend_get_properties_for(op, ZEND_PROP_PURPOSE_ARRAY_CAST);
if (obj_ht) {
Zend/zend_vm_def.h
+5
View File
@@ -6139,6 +6139,11 @@ ZEND_VM_COLD_CONST_HANDLER(51, ZEND_CAST, CONST|TMP|VAR|CV, ANY, TYPE)
} else {
ZVAL_EMPTY_ARRAY(result);
}
} else if (Z_OBJ_P(expr)->properties == NULL
&& Z_OBJ_HT_P(expr)->get_properties_for == NULL
&& Z_OBJ_HT_P(expr)->get_properties == zend_std_get_properties) {
/* Optimized version without rebulding properties HashTable */
ZVAL_ARR(result, zend_std_build_object_properties_array(Z_OBJ_P(expr)));
} else {
HashTable *obj_ht = zend_get_properties_for(expr, ZEND_PROP_PURPOSE_ARRAY_CAST);
if (obj_ht) {
Zend/zend_vm_execute.h
+20
View File
@@ -4643,6 +4643,11 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CAST_SPEC_CONST_H
} else {
ZVAL_EMPTY_ARRAY(result);
}
} else if (Z_OBJ_P(expr)->properties == NULL
&& Z_OBJ_HT_P(expr)->get_properties_for == NULL
&& Z_OBJ_HT_P(expr)->get_properties == zend_std_get_properties) {
/* Optimized version without rebulding properties HashTable */
ZVAL_ARR(result, zend_std_build_object_properties_array(Z_OBJ_P(expr)));
} else {
HashTable *obj_ht = zend_get_properties_for(expr, ZEND_PROP_PURPOSE_ARRAY_CAST);
if (obj_ht) {
@@ -18859,6 +18864,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CAST_SPEC_TMP_HANDLER(ZEND_OPC
} else {
ZVAL_EMPTY_ARRAY(result);
}
} else if (Z_OBJ_P(expr)->properties == NULL
&& Z_OBJ_HT_P(expr)->get_properties_for == NULL
&& Z_OBJ_HT_P(expr)->get_properties == zend_std_get_properties) {
/* Optimized version without rebulding properties HashTable */
ZVAL_ARR(result, zend_std_build_object_properties_array(Z_OBJ_P(expr)));
} else {
HashTable *obj_ht = zend_get_properties_for(expr, ZEND_PROP_PURPOSE_ARRAY_CAST);
if (obj_ht) {
@@ -21469,6 +21479,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CAST_SPEC_VAR_HANDLER(ZEND_OPC
} else {
ZVAL_EMPTY_ARRAY(result);
}
} else if (Z_OBJ_P(expr)->properties == NULL
&& Z_OBJ_HT_P(expr)->get_properties_for == NULL
&& Z_OBJ_HT_P(expr)->get_properties == zend_std_get_properties) {
/* Optimized version without rebulding properties HashTable */
ZVAL_ARR(result, zend_std_build_object_properties_array(Z_OBJ_P(expr)));
} else {
HashTable *obj_ht = zend_get_properties_for(expr, ZEND_PROP_PURPOSE_ARRAY_CAST);
if (obj_ht) {
@@ -38144,6 +38159,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CAST_SPEC_CV_HANDLER(ZEND_OPCO
} else {
ZVAL_EMPTY_ARRAY(result);
}
} else if (Z_OBJ_P(expr)->properties == NULL
&& Z_OBJ_HT_P(expr)->get_properties_for == NULL
&& Z_OBJ_HT_P(expr)->get_properties == zend_std_get_properties) {
/* Optimized version without rebulding properties HashTable */
ZVAL_ARR(result, zend_std_build_object_properties_array(Z_OBJ_P(expr)));
} else {
HashTable *obj_ht = zend_get_properties_for(expr, ZEND_PROP_PURPOSE_ARRAY_CAST);
if (obj_ht) {