com php-src: Fix typo: Zend/zend_vm_def.h Zend/zend_v m_execute.h

From: Date: Sat, 04 Apr 2015 08:38:00 +0000
Subject: com php-src: Fix typo: Zend/zend_vm_def.h Zend/zend_v m_execute.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-86068@lists.php.net to get a copy of this message
Commit: 86906d6a7bbb9c4b69c1ddbd6a3a9bc1efcf091e Author: Nikita Popov <nikic@php.net> Sat, 4 Apr 2015 10:38:00 +0200 Parents: f920f974c4ddc64fcfd6a5177707b72c1c88fe04 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=86906d6a7bbb9c4b69c1ddbd6a3a9bc1efcf091e Log: Fix typo Changed paths: M Zend/zend_vm_def.h M Zend/zend_vm_execute.h Diff: diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 91d541a..28b82fe 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 a03d07a..2f21218 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);

« previous php.cvs (#86068) next »