From e849e65d890c0e738a5aa10e178f9a04992d47b3 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Sun, 21 Aug 2016 17:40:10 +0800 Subject: [PATCH] This is unecessary for 7.1 (IS_ERROR is an internal type) --- Zend/zend_execute.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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); -- 2.50.1