diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-10-10 10:11:05 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-10-10 10:11:05 +0300 |
| commit | ef5ea48741a1d227a10a6654c1a8cc2f02dd414f (patch) | |
| tree | b00f4e9dd2ea42355c860a0ea57a0d9f4b926091 /Zend/zend_variables.c | |
| parent | 08c0998b1ff1fa1a105eda1540a90ddb8ee4b16a (diff) | |
| download | php-git-ef5ea48741a1d227a10a6654c1a8cc2f02dd414f.tar.gz | |
Always use IS_CONSTANT_AST (IS_CONSTANT is removed).
Diffstat (limited to 'Zend/zend_variables.c')
| -rw-r--r-- | Zend/zend_variables.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index 09338013b8..d7fd5239d7 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -31,8 +31,7 @@ ZEND_API void ZEND_FASTCALL _zval_dtor_func(zend_refcounted *p ZEND_FILE_LINE_DC) { switch (GC_TYPE(p)) { - case IS_STRING: - case IS_CONSTANT: { + case IS_STRING: { zend_string *str = (zend_string*)p; CHECK_ZVAL_STRING_REL(str); zend_string_free(str); @@ -79,7 +78,6 @@ ZEND_API void _zval_internal_dtor(zval *zvalue ZEND_FILE_LINE_DC) { switch (Z_TYPE_P(zvalue)) { case IS_STRING: - case IS_CONSTANT: CHECK_ZVAL_STRING_REL(Z_STR_P(zvalue)); zend_string_release(Z_STR_P(zvalue)); break; @@ -110,7 +108,6 @@ ZEND_API void _zval_internal_dtor_for_ptr(zval *zvalue ZEND_FILE_LINE_DC) { switch (Z_TYPE_P(zvalue)) { case IS_STRING: - case IS_CONSTANT: CHECK_ZVAL_STRING_REL(Z_STR_P(zvalue)); zend_string_free(Z_STR_P(zvalue)); break; @@ -170,9 +167,6 @@ ZEND_API void ZEND_FASTCALL _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC) } else if (EXPECTED(Z_TYPE_P(zvalue) == IS_STRING)) { CHECK_ZVAL_STRING_REL(Z_STR_P(zvalue)); ZVAL_NEW_STR(zvalue, zend_string_dup(Z_STR_P(zvalue), 0)); - } else if (EXPECTED(Z_TYPE_P(zvalue) == IS_CONSTANT)) { - CHECK_ZVAL_STRING_REL(Z_STR_P(zvalue)); - Z_STR_P(zvalue) = zend_string_dup(Z_STR_P(zvalue), 0); } else if (EXPECTED(Z_TYPE_P(zvalue) == IS_CONSTANT_AST)) { ZVAL_AST(zvalue, zend_ast_copy(Z_ASTVAL_P(zvalue))); } |