com php-src: Dead code: Zend/zend_compile.c Zend/zend_c ompile.h

From: Date: Sat, 19 Jul 2014 11:23:25 +0000
Subject: com php-src: Dead code: Zend/zend_compile.c Zend/zend_c ompile.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-80966@lists.php.net to get a copy of this message
Commit: 1aaaedc1ebd1126758989ada88b9f3c3ed79f643 Author: Nikita Popov <nikic@php.net> Sat, 19 Jul 2014 13:23:25 +0200 Parents: 6513e959d6dc3fa58d1f9746bbd710d57e3184a4 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1aaaedc1ebd1126758989ada88b9f3c3ed79f643 Log: Dead code Changed paths: M Zend/zend_compile.c M Zend/zend_compile.h Diff: diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index f573456..50fa914 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -920,27 +920,6 @@ static void ptr_dtor(zval *zv) /* {{{ */ } /* }}} */ -void zend_do_label(znode *label TSRMLS_DC) /* {{{ */ -{ - zend_label dest; - - if (!CG(context).labels) { - ALLOC_HASHTABLE(CG(context).labels); - zend_hash_init(CG(context).labels, 8, NULL, ptr_dtor, 0); - } - - dest.brk_cont = CG(context).current_brk_cont; - dest.opline_num = get_next_op_number(CG(active_op_array)); - - if (zend_hash_add_mem(CG(context).labels, Z_STR(label->u.constant), &dest, sizeof(zend_label)) == NULL) { - zend_error_noreturn(E_COMPILE_ERROR, "Label '%s' already defined", Z_STRVAL(label->u.constant)); - } - - /* Done with label now */ - zval_dtor(&label->u.constant); -} -/* }}} */ - void zend_resolve_goto_label(zend_op_array *op_array, zend_op *opline, int pass2 TSRMLS_DC) /* {{{ */ { zend_label *dest; @@ -1001,18 +980,6 @@ void zend_resolve_goto_label(zend_op_array *op_array, zend_op *opline, int pass2 } /* }}} */ -void zend_do_goto(znode *label TSRMLS_DC) /* {{{ */ -{ - zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); - - opline->opcode = ZEND_GOTO; - opline->extended_value = CG(context).current_brk_cont; - SET_UNUSED(opline->op1); - SET_NODE(opline->op2, label); - zend_resolve_goto_label(CG(active_op_array), opline, 0 TSRMLS_CC); -} -/* }}} */ - void zend_release_labels(int temporary TSRMLS_DC) /* {{{ */ { if (CG(context).labels) { diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 1361b52..7ff620d 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -541,8 +541,6 @@ void zend_do_use_const(znode *name, znode *new_name, int is_global TSRMLS_DC); void zend_do_end_compilation(TSRMLS_D); void zend_do_constant_expression(znode *result, zend_ast *ast TSRMLS_DC); -void zend_do_label(znode *label TSRMLS_DC); -void zend_do_goto(znode *label TSRMLS_DC); void zend_resolve_goto_label(zend_op_array *op_array, zend_op *opline, int pass2 TSRMLS_DC); void zend_release_labels(int temporary TSRMLS_DC);

« previous php.cvs (#80966) next »