diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-11-28 22:59:57 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-11-28 22:59:57 +0300 |
| commit | 3e9bb03a62393d7bad1a0261b7a312c2ced8aac0 (patch) | |
| tree | 9a35aa0f8ac2f155683ae8c87c985079c0f04806 /Zend/zend_execute_API.c | |
| parent | 42407692b65e6752c43d7d1fbf4decd7ce3822ce (diff) | |
| download | php-git-3e9bb03a62393d7bad1a0261b7a312c2ced8aac0.tar.gz | |
Removed IS_TYPE_IMMUTABLE (it's the same as COPYABLE & !REFCOUED)
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index cb2e936df0..c01a807e55 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -573,7 +573,7 @@ ZEND_API int zval_update_constant_ex(zval *p, zend_class_entry *scope) /* {{{ */ zend_throw_error(NULL, "Cannot declare self-referencing constant '%s'", Z_STRVAL_P(p)); return FAILURE; } - inline_change = (Z_TYPE_FLAGS_P(p) & IS_TYPE_IMMUTABLE) == 0; + inline_change = (Z_TYPE_FLAGS_P(p) & IS_TYPE_REFCOUNTED) != 0; SEPARATE_ZVAL_NOREF(p); MARK_CONSTANT_VISITED(p); if (Z_CONST_FLAGS_P(p) & IS_CONSTANT_CLASS) { @@ -638,7 +638,7 @@ ZEND_API int zval_update_constant_ex(zval *p, zend_class_entry *scope) /* {{{ */ } else if (Z_TYPE_P(p) == IS_CONSTANT_AST) { zval tmp; - inline_change = (Z_TYPE_FLAGS_P(p) & IS_TYPE_IMMUTABLE) == 0; + inline_change = (Z_TYPE_FLAGS_P(p) & IS_TYPE_REFCOUNTED) != 0; if (UNEXPECTED(zend_ast_evaluate(&tmp, Z_ASTVAL_P(p), scope) != SUCCESS)) { return FAILURE; } |