]> granicus.if.org Git - php/commitdiff
Removed deprecated check
authorDmitry Stogov <dmitry@zend.com>
Thu, 28 Mar 2013 23:18:04 +0000 (03:18 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 28 Mar 2013 23:18:04 +0000 (03:18 +0400)
Zend/zend_execute.c

index a7674ca8ab4a246f113bf2f5895859dde80f6753..b2d06238fab53f49574721b4504cbbf6d98e668a 100644 (file)
@@ -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;