From 86906d6a7bbb9c4b69c1ddbd6a3a9bc1efcf091e Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 4 Apr 2015 10:38:00 +0200 Subject: [PATCH] Fix typo --- Zend/zend_vm_def.h | 2 +- Zend/zend_vm_execute.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 91d541ab4c..28b82fe904 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -3888,7 +3888,7 @@ ZEND_VM_HANDLER(161, ZEND_GENERATOR_RETURN, CONST|TMP|VAR|CV, ANY) } } else if (OP1_TYPE == IS_CV) { ZVAL_DEREF(retval); - ZVAL_COPY_VALUE(&generator->retval, retval); + ZVAL_COPY(&generator->retval, retval); } else /* if (OP1_TYPE == IS_VAR) */ { if (UNEXPECTED(Z_ISREF_P(retval))) { zend_refcounted *ref = Z_COUNTED_P(retval); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index a03d07ae1c..2f21218283 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -2931,7 +2931,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_GENERATOR_RETURN_SPEC_CONST_HA } } else if (IS_CONST == IS_CV) { ZVAL_DEREF(retval); - ZVAL_COPY_VALUE(&generator->retval, retval); + ZVAL_COPY(&generator->retval, retval); } else /* if (IS_CONST == IS_VAR) */ { if (UNEXPECTED(Z_ISREF_P(retval))) { zend_refcounted *ref = Z_COUNTED_P(retval); @@ -10750,7 +10750,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_GENERATOR_RETURN_SPEC_TMP_HAND } } else if (IS_TMP_VAR == IS_CV) { ZVAL_DEREF(retval); - ZVAL_COPY_VALUE(&generator->retval, retval); + ZVAL_COPY(&generator->retval, retval); } else /* if (IS_TMP_VAR == IS_VAR) */ { if (UNEXPECTED(Z_ISREF_P(retval))) { zend_refcounted *ref = Z_COUNTED_P(retval); @@ -13783,7 +13783,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_GENERATOR_RETURN_SPEC_VAR_HAND } } else if (IS_VAR == IS_CV) { ZVAL_DEREF(retval); - ZVAL_COPY_VALUE(&generator->retval, retval); + ZVAL_COPY(&generator->retval, retval); } else /* if (IS_VAR == IS_VAR) */ { if (UNEXPECTED(Z_ISREF_P(retval))) { zend_refcounted *ref = Z_COUNTED_P(retval); @@ -27355,7 +27355,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_GENERATOR_RETURN_SPEC_CV_HANDL } } else if (IS_CV == IS_CV) { ZVAL_DEREF(retval); - ZVAL_COPY_VALUE(&generator->retval, retval); + ZVAL_COPY(&generator->retval, retval); } else /* if (IS_CV == IS_VAR) */ { if (UNEXPECTED(Z_ISREF_P(retval))) { zend_refcounted *ref = Z_COUNTED_P(retval); -- 2.40.0