From: Dmitry Stogov Date: Mon, 21 Apr 2014 19:32:36 +0000 (+0400) Subject: Reverted chunk committed by mistake X-Git-Tag: POST_PHPNG_MERGE~412^2~81^2~5 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9610977d10e09d84b566d673f8b812d52ef19c57;p=php Reverted chunk committed by mistake --- diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index c8c98a1ba0..ed39f60eda 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2992,7 +2992,6 @@ ZEND_VM_HELPER(zend_send_by_var_helper, VAR|CV, ANY) varptr = GET_OP1_ZVAL_PTR(BP_VAR_R); top = zend_vm_stack_top_inc(TSRMLS_C); - ZVAL_COPY_VALUE(top, varptr); if (Z_ISREF_P(varptr)) { ZVAL_DUP(top, Z_REFVAL_P(varptr)); FREE_OP1(); @@ -3000,6 +2999,7 @@ ZEND_VM_HELPER(zend_send_by_var_helper, VAR|CV, ANY) if (OP1_TYPE == IS_CV) { if (Z_REFCOUNTED_P(varptr)) Z_ADDREF_P(varptr); } + ZVAL_COPY_VALUE(top, varptr); } CHECK_EXCEPTION();