com php-src: Avoid type check for dynamic properties: Zend/zend_object_handlers.c
| From: | Bob Weinand | Date: | Tue, 24 May 2016 14:58:54 +0000 |
| Subject: | com php-src: Avoid type check for dynamic properties: Zend/zend_object_handlers.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-95535@lists.php.net to get a copy of this message | ||
Commit: d46584fef96b151da3f741bface759ee4098a6d4
Author: Dmitry Stogov <dmitry@zend.com> Tue, 24 May 2016 17:58:54 +0300
Parents: 59b8a8543d2791b128c5213d990e5379049e6c03
Branches: typed_ref_properties
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d46584fef96b151da3f741bface759ee4098a6d4
Log:
Avoid type check for dynamic properties
Changed paths:
M Zend/zend_object_handlers.c
Diff:
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 77b68d0..3d71e34 100644
--- a/Zend/zend_object_handlers..c
+++ b/Zend/zend_object_handlers.c
@@ -747,20 +747,10 @@ ZEND_API void zend_std_write_property(zval *object, zval *member, zval *value,
v
if (EXPECTED(property_offset != ZEND_DYNAMIC_PROPERTY_OFFSET)) {
variable_ptr = OBJ_PROP(zobj, property_offset);
if (Z_TYPE_P(variable_ptr) != IS_UNDEF) {
- goto found;
- }
- } else if (EXPECTED(zobj->properties != NULL)) {
- if (UNEXPECTED(GC_REFCOUNT(zobj->properties) > 1)) {
- if (EXPECTED(!(GC_FLAGS(zobj->properties) & IS_ARRAY_IMMUTABLE))) {
- GC_REFCOUNT(zobj->properties)--;
- }
- zobj->properties = zend_array_dup(zobj->properties);
- }
- if ((variable_ptr = zend_hash_find(zobj->properties, Z_STR_P(member))) != NULL) {
- zend_property_info *prop_info;
+ zend_property_info *prop_info = zend_object_fetch_property_type_info_ex(object,
Z_STR_P(member), cache_slot);;
zval val;
-found:
- if (UNEXPECTED(prop_info = zend_object_fetch_property_type_info_ex(object, Z_STR_P(member),
cache_slot))) {
+
+ if (UNEXPECTED(prop_info)) {
if (!Z_REFCOUNTED_P(value) || Z_IMMUTABLE_P(value) || Z_REFCOUNT_P(value) > 1) {
ZVAL_COPY_VALUE(&val, value);
value = &val;
@@ -770,9 +760,20 @@ found:
goto exit;
}
}
+found:
zend_assign_to_variable(variable_ptr, value, IS_CV);
goto exit;
}
+ } else if (EXPECTED(zobj->properties != NULL)) {
+ if (UNEXPECTED(GC_REFCOUNT(zobj->properties) > 1)) {
+ if (EXPECTED(!(GC_FLAGS(zobj->properties) & IS_ARRAY_IMMUTABLE))) {
+ GC_REFCOUNT(zobj->properties)--;
+ }
+ zobj->properties = zend_array_dup(zobj->properties);
+ }
+ if ((variable_ptr = zend_hash_find(zobj->properties, Z_STR_P(member))) != NULL) {
+ goto found;
+ }
}
} else if (UNEXPECTED(EG(exception))) {
goto exit;