com php-src: Improved get_object_vars(): Zend/zend _builtin_functions.c
| From: | Dmitry Stogov | Date: | Mon, 22 Dec 2014 23:49:47 +0000 |
| Subject: | com php-src: Improved get_object_vars(): Zend/zend _builtin_functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83827@lists.php.net to get a copy of this message | ||
Commit: f3506dfacb33bbb3ba58ed65ba7c225e459f8036
Author: Dmitry Stogov <dmitry@zend.com> Tue, 23 Dec 2014 02:49:47 +0300
Parents: 6a6cdecbdbe0846451eaee38f7bc55a81c651d80
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f3506dfacb33bbb3ba58ed65ba7c225e459f8036
Log:
Improved get_object_vars()
Changed paths:
M Zend/zend_builtin_functions.c
Diff:
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index ed1a1c7..3e66e92 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -1106,24 +1106,30 @@ ZEND_FUNCTION(get_object_vars)
zobj = Z_OBJ_P(obj);
- array_init_size(return_value, zend_hash_num_elements(properties));
-
- ZEND_HASH_FOREACH_STR_KEY_VAL_IND(properties, key, value) {
- if (key) {
- if (zend_check_property_access(zobj, key) == SUCCESS) {
- /* Not separating references */
- if (Z_REFCOUNTED_P(value)) Z_ADDREF_P(value);
- if (key->val[0] == 0) {
- const char *prop_name, *class_name;
- size_t prop_len;
- zend_unmangle_property_name_ex(key, &class_name, &prop_name, &prop_len);
- zend_hash_str_add_new(Z_ARRVAL_P(return_value), prop_name, prop_len, value);
- } else {
- zend_hash_add_new(Z_ARRVAL_P(return_value), key, value);
+ if (!zobj->ce->default_properties_count && properties == zobj->properties) {
+ /* fast copy */
+ ZVAL_NEW_ARR(return_value);
+ zend_array_dup(Z_ARRVAL_P(return_value), properties);
+ } else {
+ array_init_size(return_value, zend_hash_num_elements(properties));
+
+ ZEND_HASH_FOREACH_STR_KEY_VAL_IND(properties, key, value) {
+ if (key) {
+ if (zend_check_property_access(zobj, key) == SUCCESS) {
+ /* Not separating references */
+ if (Z_REFCOUNTED_P(value)) Z_ADDREF_P(value);
+ if (key->val[0] == 0) {
+ const char *prop_name, *class_name;
+ size_t prop_len;
+ zend_unmangle_property_name_ex(key, &class_name, &prop_name, &prop_len);
+ zend_hash_str_add_new(Z_ARRVAL_P(return_value), prop_name, prop_len, value);
+ } else {
+ zend_hash_add_new(Z_ARRVAL_P(return_value), key, value);
+ }
}
}
- }
- } ZEND_HASH_FOREACH_END();
+ } ZEND_HASH_FOREACH_END();
+ }
}
/* }}} */