diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2015-06-11 23:58:34 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2015-06-11 23:58:34 +0200 |
| commit | 9692e74b04eacf7a46f65df8db3eef34e695dba9 (patch) | |
| tree | 3f9fbbb318fd90987e5f5b3f1e59683113cc3c4a /Zend/zend_vm_execute.h | |
| parent | 163f51a4cfc50f872dc5df42a4b3c12ae921764a (diff) | |
| parent | 5d3cf577aad15b119c137a873f468c0614f2eb2e (diff) | |
| download | php-git-9692e74b04eacf7a46f65df8db3eef34e695dba9.tar.gz | |
Merge branch 'master' of https://git.php.net/push/php-src
Diffstat (limited to 'Zend/zend_vm_execute.h')
| -rw-r--r-- | Zend/zend_vm_execute.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index a0bb1012b2..1ab12b7779 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -3730,8 +3730,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CAST_SPEC_CONST_HANDLER(ZEND_O } } } else { - ZVAL_COPY_VALUE(result, expr); - zval_opt_copy_ctor(result); + ZVAL_COPY(result, expr); convert_to_object(result); } } @@ -12350,8 +12349,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CAST_SPEC_TMP_HANDLER(ZEND_OPC } } } else { - ZVAL_COPY_VALUE(result, expr); - zval_opt_copy_ctor(result); + ZVAL_COPY(result, expr); convert_to_object(result); } } @@ -15827,8 +15825,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CAST_SPEC_VAR_HANDLER(ZEND_OPC } } } else { - ZVAL_COPY_VALUE(result, expr); - zval_opt_copy_ctor(result); + ZVAL_COPY(result, expr); convert_to_object(result); } } @@ -29481,8 +29478,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CAST_SPEC_CV_HANDLER(ZEND_OPCO } } } else { - ZVAL_COPY_VALUE(result, expr); - zval_opt_copy_ctor(result); + ZVAL_COPY(result, expr); convert_to_object(result); } } |