com php-src: Remove useless condition: Zend/zend_execute.c
| From: | Xinchen Hui | Date: | Fri, 03 Oct 2014 10:35:05 +0000 |
| Subject: | com php-src: Remove useless condition: Zend/zend_execute.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82066@lists.php.net to get a copy of this message | ||
Commit: 54bad8bf57ff18659da78d75ba5f33c98b6441cf
Author: Xinchen Hui <laruence@php.net> Fri, 3 Oct 2014 18:35:05 +0800
Parents: f248b17e07d6746ed1057611cae5f2d11918fb4e
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=54bad8bf57ff18659da78d75ba5f33c98b6441cf
Log:
Remove useless condition
Changed paths:
M Zend/zend_execute.c
Diff:
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index c44456d..517cbf5 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -1217,14 +1217,13 @@ static zend_always_inline void zend_fetch_dimension_address_read(zval
*result, z
} else {
retval = Z_OBJ_HT_P(container)->read_dimension(container, dim, type, result TSRMLS_CC);
- if (result) {
- if (retval) {
- if (result != retval) {
- ZVAL_COPY(result, retval);
- }
- } else {
- ZVAL_NULL(result);
+ ZEND_ASSERT(result != NULL);
+ if (retval) {
+ if (result != retval) {
+ ZVAL_COPY(result, retval);
}
+ } else {
+ ZVAL_NULL(result);
}
}
} else {