com php-src: Don't make useless CSE: Zend/zend_object_handl ers.c

Commit: 6b203aa26243a46775483a1318427b081095c126 Author: Dmitry Stogov <dmitry@zend.com> Fri, 17 Oct 2014 15:00:54 +0400 Parents: 35dc0a2e302b0a5f79ca7597ffda12a7a23fa4ed Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6b203aa26243a46775483a1318427b081095c126 Log: Don't make useless CSE Changed paths: M Zend/zend_object_handlers.c Diff: diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 6679cb1..d143b00 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -468,9 +468,7 @@ zval *zend_std_read_property(zval *object, zval *member, int type, void **cache_ zval tmp_member; zval *retval; zend_property_info *property_info; - int silent; - silent = (type == BP_VAR_IS); zobj = Z_OBJ_P(object); ZVAL_UNDEF(&tmp_member); @@ -485,7 +483,7 @@ zval *zend_std_read_property(zval *object, zval *member, int type, void **cache_ #endif /* make zend_get_property_info silent if we have getter - we may want to use it */ - property_info = zend_get_property_info_quick(zobj->ce, Z_STR_P(member), silent || (zobj->ce->__get != NULL), cache_slot TSRMLS_CC); + property_info = zend_get_property_info_quick(zobj->ce, Z_STR_P(member), (type == BP_VAR_IS) || (zobj->ce->__get != NULL), cache_slot TSRMLS_CC); if (EXPECTED(property_info != NULL)) { if (EXPECTED((property_info->flags & ZEND_ACC_STATIC) == 0) && @@ -533,13 +531,13 @@ zval *zend_std_read_property(zval *object, zval *member, int type, void **cache_ zend_error(E_ERROR, "Cannot access property started with '\\0'"); } } - if (!silent) { + if (type != BP_VAR_IS) { zend_error(E_NOTICE,"Undefined property: %s::$%s", zobj->ce->name->val, Z_STRVAL_P(member)); } retval = &EG(uninitialized_zval); } } else { - if (!silent) { + if ((type != BP_VAR_IS)) { zend_error(E_NOTICE,"Undefined property: %s::$%s", zobj->ce->name->val, Z_STRVAL_P(member)); } retval = &EG(uninitialized_zval);