com php-src: Remove dead code: Zend/zend_compile.c Zend/z end_compile.h

From: Date: Sat, 26 Jul 2014 16:51:28 +0000
Subject: com php-src: Remove dead code: Zend/zend_compile.c Zend/z end_compile.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-80929@lists.php.net to get a copy of this message
Commit: 9344a95ac9d982c1cbeb65a8c22ecd500f0b4243 Author: Nikita Popov <nikic@php.net> Sat, 26 Jul 2014 18:51:28 +0200 Parents: 60d96d51170cb86396d6292edf7ed693697d8827 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9344a95ac9d982c1cbeb65a8c22ecd500f0b4243 Log: Remove 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 31a3590..91990a4 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3404,22 +3404,6 @@ void zend_make_immutable_array_r(zval *zv TSRMLS_DC) /* {{{ */ void zend_compile_const_expr(zend_ast **ast_ptr TSRMLS_DC); -void zend_do_constant_expression(znode *result, zend_ast *ast TSRMLS_DC) /* {{{ */ -{ - zend_eval_const_expr(&ast TSRMLS_CC); - zend_compile_const_expr(&ast TSRMLS_CC); - if (ast->kind == ZEND_AST_ZVAL) { - ZVAL_COPY_VALUE(&result->u.constant, zend_ast_get_zval(ast)); - if (Z_TYPE(result->u.constant) == IS_ARRAY) { - zend_make_immutable_array_r(&result->u.constant TSRMLS_CC); - } - efree(ast); - } else { - ZVAL_NEW_AST(&result->u.constant, ast); - } -} -/* }}} */ - // TODO.AST Sort out the whole constant folding issue static void _tmp_compile_const_expr(zval *result, zend_ast *ast TSRMLS_DC) { zend_ast *orig_ast = ast; diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 52d01ab..790b915 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -506,7 +506,6 @@ void zend_do_build_namespace_name(znode *result, znode *prefix, znode *name TSRM void zend_do_end_namespace(TSRMLS_D); void zend_verify_namespace(TSRMLS_D); void zend_do_end_compilation(TSRMLS_D); -void zend_do_constant_expression(znode *result, zend_ast *ast 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 (#80929) next »