diff options
| author | Nikita Popov <nikic@php.net> | 2016-04-29 22:15:38 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-04-29 22:15:38 +0200 |
| commit | d048837a46ca9505fcfd13e6c5c1268e43d5eb4a (patch) | |
| tree | b04cdbf5135a39f55666a2a8a7231b7500c06eff /Zend/zend_execute_API.c | |
| parent | 5595dd5ffa3453f22c0508052417d3b2853f5015 (diff) | |
| download | php-git-d048837a46ca9505fcfd13e6c5c1268e43d5eb4a.tar.gz | |
Drop dead code from update_constant
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 2acf29c2ce..794c7f0fc9 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -608,21 +608,8 @@ ZEND_API int zval_update_constant_ex(zval *p, zend_class_entry *scope) /* {{{ */ Z_TYPE_FLAGS_P(p) = IS_TYPE_REFCOUNTED | IS_TYPE_COPYABLE; } } - if (actual[0] == '\\') { - if (inline_change) { - memmove(Z_STRVAL_P(p), Z_STRVAL_P(p)+1, Z_STRLEN_P(p)); - --Z_STRLEN_P(p); - } else { - ++actual; - } - --actual_len; - } if ((Z_CONST_FLAGS_P(p) & IS_CONSTANT_UNQUALIFIED) == 0) { - if (ZSTR_VAL(save)[0] == '\\') { - zend_throw_error(NULL, "Undefined constant '%s'", ZSTR_VAL(save) + 1); - } else { - zend_throw_error(NULL, "Undefined constant '%s'", ZSTR_VAL(save)); - } + zend_throw_error(NULL, "Undefined constant '%s'", ZSTR_VAL(save)); if (inline_change) { zend_string_release(save); } |