From: Xinchen Hui <laruence@gmail.com>
Date: Sun, 21 Aug 2016 09:40:10 +0000 (+0800)
Subject: This is unecessary for 7.1 (IS_ERROR is an internal type)
X-Git-Tag: php-7.1.0RC1~85
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e849e65d890c0e738a5aa10e178f9a04992d47b3;p=php

This is unecessary for 7.1 (IS_ERROR is an internal type)
---

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 13494ca403..d2411ad5c3 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);