diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-04-11 16:21:15 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-04-11 16:21:15 +0200 |
| commit | 53e71e47b9f27f3ffab3ce403a3611bca5320944 (patch) | |
| tree | a4fd5ea8478e0da28e16215c8070246cf104e6da | |
| parent | f0c95cb70539d24a066dbb22df5a5f5a01d94188 (diff) | |
| parent | ad05d3898eae472532620ce9623c9d39c23ef16a (diff) | |
| download | php-git-53e71e47b9f27f3ffab3ce403a3611bca5320944.tar.gz | |
Merge branch 'PHP-5.6'
| -rw-r--r-- | Zend/zend_vm_execute.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index a30bf9f6e6..cb39be0e87 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -4309,9 +4309,6 @@ static int ZEND_FASTCALL ZEND_DECLARE_CONST_SPEC_CONST_CONST_HANDLER(ZEND_OPCOD zval *tmp_ptr = &tmp; ZVAL_COPY_VALUE(&tmp, val); - if (Z_TYPE_P(val) == IS_CONSTANT_ARRAY) { - zval_copy_ctor(&tmp); - } INIT_PZVAL(&tmp); zval_update_constant(&tmp_ptr, NULL TSRMLS_CC); c.value = *tmp_ptr; |