diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-03-15 19:50:26 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-03-15 19:50:26 +0100 |
| commit | 6ad0a6fb047f47532ccb4513600fb6c269ad610e (patch) | |
| tree | 4f5ae363bcf5af184c42a46cc44795361edd27c9 /Zend/zend_vm_execute.h | |
| parent | 38de261563757d30c262d3d7b35c1e484576710d (diff) | |
| parent | 2bba4a0d7f6d5e5712d60bc1cf2119622d837e55 (diff) | |
| download | php-git-6ad0a6fb047f47532ccb4513600fb6c269ad610e.tar.gz | |
Merge branch 'PHP-7.1'
Diffstat (limited to 'Zend/zend_vm_execute.h')
| -rw-r--r-- | Zend/zend_vm_execute.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 3bdbaa936b..63175b0d57 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -5759,7 +5759,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_CONSTANT_SPEC_CONS } value = &c->value; if (Z_CONSTANT_P(value)) { - zval_update_constant_ex(value, ce); + zval_update_constant_ex(value, c->ce); if (UNEXPECTED(EG(exception) != NULL)) { ZVAL_UNDEF(EX_VAR(opline->result.var)); HANDLE_EXCEPTION(); @@ -19451,7 +19451,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_CONSTANT_SPEC_VAR_ } value = &c->value; if (Z_CONSTANT_P(value)) { - zval_update_constant_ex(value, ce); + zval_update_constant_ex(value, c->ce); if (UNEXPECTED(EG(exception) != NULL)) { ZVAL_UNDEF(EX_VAR(opline->result.var)); HANDLE_EXCEPTION(); @@ -28143,7 +28143,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CLASS_CONSTANT_SPEC_UNUS } value = &c->value; if (Z_CONSTANT_P(value)) { - zval_update_constant_ex(value, ce); + zval_update_constant_ex(value, c->ce); if (UNEXPECTED(EG(exception) != NULL)) { ZVAL_UNDEF(EX_VAR(opline->result.var)); HANDLE_EXCEPTION(); |