From: Dmitry Stogov Date: Thu, 28 Mar 2013 23:18:04 +0000 (+0400) Subject: Removed deprecated check X-Git-Tag: php-5.5.0beta3~8^2~49^2~2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa791a4d72415c53233adc1a6c8e3eeb42d083ef;p=php Removed deprecated check --- diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index a7674ca8ab..b2d06238fa 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -898,13 +898,10 @@ static inline zval* zend_assign_to_variable(zval **variable_ptr_ptr, zval *value } else if (EXPECTED(!PZVAL_IS_REF(value))) { Z_ADDREF_P(value); *variable_ptr_ptr = value; - if (EXPECTED(variable_ptr != &EG(uninitialized_zval))) { - GC_REMOVE_ZVAL_FROM_BUFFER(variable_ptr); - zval_dtor(variable_ptr); - efree(variable_ptr); - } else { - Z_DELREF_P(variable_ptr); - } + ZEND_ASSERT(variable_ptr != &EG(uninitialized_zval)); + GC_REMOVE_ZVAL_FROM_BUFFER(variable_ptr); + zval_dtor(variable_ptr); + efree(variable_ptr); return value; } else { goto copy_value;