com php-src: Remove duplicate checks: Zend/zend_execute.c
| From: | Bob Weinand | Date: | Fri, 27 May 2016 10:10:51 +0000 |
| Subject: | com php-src: Remove duplicate checks: Zend/zend_execute.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-95505@lists.php.net to get a copy of this message | ||
Commit: 037da58946e8ea19a95c711f33fa9d7d4e79c75a
Author: Dmitry Stogov <dmitry@zend.com> Fri, 27 May 2016 13:10:51 +0300
Parents: 5811e86f02026be862e758f02772dd2870f0a6d5
Branches: typed_ref_properties
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=037da58946e8ea19a95c711f33fa9d7d4e79c75a
Log:
Remove duplicate checks
Changed paths:
M Zend/zend_execute.c
Diff:
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 136b905..6fa5e7b 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -1537,11 +1537,7 @@ static zend_never_inline void zend_pre_incdec_overloaded_property(zval
*object,
ZVAL_COPY_VALUE(z, value);
}
- if (EXPECTED(cache_slot)) {
- prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2);
- } else {
- prop_info = zend_object_fetch_property_type_info(Z_OBJCE(obj), Z_STR_P(property), NULL);
- }
+ prop_info = zend_object_fetch_property_type_info(Z_OBJCE(obj), Z_STR_P(property), NULL);
if (UNEXPECTED(prop_info)) {
/* special case for typed properties */
@@ -1608,11 +1604,7 @@ static zend_never_inline void zend_assign_op_overloaded_property(zval
*object, z
ZVAL_COPY_VALUE(z, value);
}
- if (EXPECTED(cache_slot)) {
- prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2);
- } else {
- prop_info = zend_object_fetch_property_type_info(Z_OBJCE(obj), Z_STR_P(property), NULL);
- }
+ prop_info = zend_object_fetch_property_type_info(Z_OBJCE(obj), Z_STR_P(property), NULL);
if (UNEXPECTED(prop_info)) {
/* special case for typed properties */