com php-src: Drop dead code: Zend/zend_compile.c

Commit: 4571271de1e69698424884c57d2ca475b55120d5 Author: Nikita Popov <nikic@php.net> Tue, 23 Sep 2014 19:32:02 +0200 Parents: 06103d65b1a17d5072fa50b2e3797fae39da48a6 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4571271de1e69698424884c57d2ca475b55120d5 Log: Drop dead code Changed paths: M Zend/zend_compile.c Diff: diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 7c38a28..95db9a7 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -321,18 +321,10 @@ int zend_add_literal(zend_op_array *op_array, zval *zv TSRMLS_DC) /* {{{ */ static int zend_add_func_name_literal(zend_op_array *op_array, zval *zv TSRMLS_DC) /* {{{ */ { - int ret; zend_string *lc_name; zval c; - if (op_array->last_literal > 0 && - &op_array->literals[op_array->last_literal - 1] == zv && - Z_CACHE_SLOT(op_array->literals[op_array->last_literal - 1]) == -1) { - /* we already have function name as last literal (do nothing) */ - ret = op_array->last_literal - 1; - } else { - ret = zend_add_literal(op_array, zv TSRMLS_CC); - } + int ret = zend_add_literal(op_array, zv TSRMLS_CC); lc_name = zend_string_alloc(Z_STRLEN_P(zv), 0); zend_str_tolower_copy(lc_name->val, Z_STRVAL_P(zv), Z_STRLEN_P(zv)); @@ -345,20 +337,12 @@ static int zend_add_func_name_literal(zend_op_array *op_array, zval *zv TSRMLS_D static int zend_add_ns_func_name_literal(zend_op_array *op_array, zval *zv TSRMLS_DC) /* {{{ */ { - int ret; zend_string *lc_name; const char *ns_separator; int lc_len; zval c; - if (op_array->last_literal > 0 && - &op_array->literals[op_array->last_literal - 1] == zv && - Z_CACHE_SLOT(op_array->literals[op_array->last_literal - 1]) == -1) { - /* we already have function name as last literal (do nothing) */ - ret = op_array->last_literal - 1; - } else { - ret = zend_add_literal(op_array, zv TSRMLS_CC); - } + int ret = zend_add_literal(op_array, zv TSRMLS_CC); lc_name = zend_string_alloc(Z_STRLEN_P(zv), 0); zend_str_tolower_copy(lc_name->val, Z_STRVAL_P(zv), Z_STRLEN_P(zv)); @@ -380,7 +364,8 @@ static int zend_add_ns_func_name_literal(zend_op_array *op_array, zval *zv TSRML } /* }}} */ -static int zend_add_class_name_literal(zend_op_array *op_array, zend_string *name TSRMLS_DC) /* {{{ */ { +static int zend_add_class_name_literal(zend_op_array *op_array, zend_string *name TSRMLS_DC) /* {{{ */ +{ int ret; zend_string *lc_name; @@ -404,30 +389,16 @@ static int zend_add_class_name_literal(zend_op_array *op_array, zend_string *nam static int zend_add_const_name_literal(zend_op_array *op_array, zval *zv, int unqualified TSRMLS_DC) /* {{{ */ { - int ret; char *name; zend_string *tmp_name; const char *ns_separator; int name_len, ns_len; zval c; - if (op_array->last_literal > 0 && - &op_array->literals[op_array->last_literal - 1] == zv && - Z_CACHE_SLOT(op_array->literals[op_array->last_literal - 1]) == -1) { - /* we already have function name as last literal (do nothing) */ - ret = op_array->last_literal - 1; - } else { - ret = zend_add_literal(op_array, zv TSRMLS_CC); - } + int ret = zend_add_literal(op_array, zv TSRMLS_CC); - /* skip leading '\\' */ - if (Z_STRVAL_P(zv)[0] == '\\') { - name_len = Z_STRLEN_P(zv) - 1; - name = Z_STRVAL_P(zv) + 1; - } else { - name_len = Z_STRLEN_P(zv); - name = Z_STRVAL_P(zv); - } + name_len = Z_STRLEN_P(zv); + name = Z_STRVAL_P(zv); ns_separator = zend_memrchr(name, '\\', name_len); if (ns_separator) { ns_len = ns_separator - name;