com php-src: More dead code: Zend/zend_compile.c Zend/zen d_compile.h
| From: | Nikita Popov | Date: | Mon, 28 Jul 2014 13:43:39 +0000 |
| Subject: | com php-src: More dead code: Zend/zend_compile.c Zend/zen d_compile.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80901@lists.php.net to get a copy of this message | ||
Commit: 31a886c346d268cd448125922c7ae32000d4ee87
Author: Nikita Popov <nikic@php.net> Mon, 28 Jul 2014 15:43:39 +0200
Parents: 55f53e29a0abde732eabf8364c289fdd4e97d7df
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=31a886c346d268cd448125922c7ae32000d4ee87
Log:
More 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 50946e1..92bd8f4 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -649,16 +649,6 @@ zend_uint zend_add_member_modifier(zend_uint flags, zend_uint new_flag) {
return new_flags;
}
-void zend_do_handle_exception(TSRMLS_D) /* {{{ */
-{
- zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
-
- opline->opcode = ZEND_HANDLE_EXCEPTION;
- SET_UNUSED(opline->op1);
- SET_UNUSED(opline->op2);
-}
-/* }}} */
-
zend_string *zend_concat3(
char *str1, size_t str1_len, char *str2, size_t str2_len, char *str3, size_t str3_len
) {
@@ -4345,8 +4335,6 @@ void zend_compile_method_call(znode *result, zend_ast *ast, int type
TSRMLS_DC)
//zend_ast *method_ast = ast->child[1];
zend_ast *args_ast = ast->child[2];
- // TODO.AST __clone check - WTF is that done in here?!
-
// TODO.AST using an evil overload from AST_METHOD to AST_PROP here ...
zend_op *opline = zend_compile_prop_common(NULL, ast, BP_VAR_R TSRMLS_CC);
opline->opcode = ZEND_INIT_METHOD_CALL;
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index b4ed669..ef136a7 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -478,8 +478,6 @@ zend_uint zend_add_member_modifier(zend_uint flags, zend_uint new_flag);
/* parser-driven code generators */
void zend_do_free(znode *op1 TSRMLS_DC);
-void zend_do_handle_exception(TSRMLS_D);
-
ZEND_API int do_bind_function(const zend_op_array *op_array, zend_op *opline, HashTable
*function_table, zend_bool compile_time TSRMLS_DC);
ZEND_API zend_class_entry *do_bind_class(const zend_op_array *op_array, const zend_op *opline,
HashTable *class_table, zend_bool compile_time TSRMLS_DC);
ZEND_API zend_class_entry *do_bind_inherited_class(const zend_op_array *op_array, const zend_op
*opline, HashTable *class_table, zend_class_entry *parent_ce, zend_bool compile_time TSRMLS_DC);
@@ -501,7 +499,6 @@ void zend_do_extended_info(TSRMLS_D);
void zend_do_extended_fcall_begin(TSRMLS_D);
void zend_do_extended_fcall_end(TSRMLS_D);
-void zend_do_end_namespace(TSRMLS_D);
void zend_verify_namespace(TSRMLS_D);
void zend_do_end_compilation(TSRMLS_D);