com php-src: This is unecessary for 7.1 (IS_ERROR is an internal type): Zend/zend_execute.c
| From: | Xinchen Hui | Date: | Sun, 21 Aug 2016 09:40:10 +0000 |
| Subject: | com php-src: This is unecessary for 7.1 (IS_ERROR is an internal type): Zend/zend_execute.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-94023@lists.php.net to get a copy of this message | ||
Commit: e849e65d890c0e738a5aa10e178f9a04992d47b3
Author: Xinchen Hui <laruence@gmail.com> Sun, 21 Aug 2016 17:40:10 +0800
Parents: e572035ecf3ba4eb520eff4afa19bc4e53ce9c9f
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e849e65d890c0e738a5aa10e178f9a04992d47b3
Log:
This is unecessary for 7.1 (IS_ERROR is an internal type)
Changed paths:
M Zend/zend_execute.c
Diff:
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 13494ca..d2411ad 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -586,9 +586,7 @@ static inline void zend_assign_to_variable_reference(zval *variable_ptr, zval *v
static inline int make_real_object(zval *object)
{
if (UNEXPECTED(Z_TYPE_P(object) != IS_OBJECT)) {
- if (UNEXPECTED(object == &EG(error_zval))) {
- return 0;
- } else if (EXPECTED(Z_TYPE_P(object) <= IS_FALSE)) {
+ if (EXPECTED(Z_TYPE_P(object) <= IS_FALSE)) {
/* nothing to destroy */
} else if (EXPECTED((Z_TYPE_P(object) == IS_STRING && Z_STRLEN_P(object) == 0))) {
zval_ptr_dtor_nogc(object);