From: Nikita Popov <nikic@php.net>
Date: Sat, 19 Jul 2014 11:23:25 +0000 (+0200)
Subject: Dead code
X-Git-Tag: POST_AST_MERGE^2~120
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1aaaedc1ebd1126758989ada88b9f3c3ed79f643;p=php

Dead code
---

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index f5734563a0..50fa914c90 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 1361b5288c..7ff620dcef 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);