- Cleanup the code

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 020d894127049dcca721c62d821f0acb5fa83e58..6fa140cc16afd2ec618c9b0359d1bd761b3d2d15 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2127,22 +2127,19 @@ send_by_ref:
                                        zval *array_ptr;
                                        HashTable *fe_ht;
                                        
-                                       if ((opline->op1.op_type == IS_CONST) || (opline->op1.op_type == IS_TMP_VAR)) {
-                                               array_ptr = get_zval_ptr(&opline->op1, Ts, &EG(free_op1), BP_VAR_R);
-                                               if (EG(free_op1)) { /* IS_TMP_VAR */
-                                                       zval *tmp;
-
-                                                       ALLOC_ZVAL(tmp);
-                                                       *tmp = *array_ptr;
-                                                       INIT_PZVAL(tmp);
-                                                       array_ptr = tmp;
-                                               } else { /* IS_CONST */
-                                                       array_ptr->refcount++;
-                                               }
-                                       } else {
-                                               array_ptr = get_zval_ptr(&opline->op1, Ts, &EG(free_op1), BP_VAR_R);
+                                       array_ptr = get_zval_ptr(&opline->op1, Ts, &EG(free_op1), BP_VAR_R);
+
+                                       if (EG(free_op1)) { /* IS_TMP_VAR */
+                                               zval *tmp;
+
+                                               ALLOC_ZVAL(tmp);
+                                               *tmp = *array_ptr;
+                                               INIT_PZVAL(tmp);
+                                               array_ptr = tmp;
+                                       } else { /* IS_CONST */
                                                array_ptr->refcount++;
                                        }
+
                                        PZVAL_LOCK(array_ptr);
                                        Ts[opline->result.u.var].var.ptr = array_ptr;
                                        Ts[opline->result.u.var].var.ptr_ptr = &Ts[opline->result.u.var].var.ptr;