com php-src: Remove declare_stack: Zend/zend.c Zend/z end_compile.c Zend/zend_globals.h

From: Date: Tue, 22 Jul 2014 14:18:13 +0000
Subject: com php-src: Remove declare_stack: Zend/zend.c Zend/z end_compile.c Zend/zend_globals.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-80956@lists.php.net to get a copy of this message
Commit: 43b2973ee75b7256dfce0dd18b725951aac6baf4 Author: Nikita Popov <nikic@php.net> Tue, 22 Jul 2014 16:18:13 +0200 Parents: a7fc995fa2c4fb2af8ebe176b42524a95c9c46df Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=43b2973ee75b7256dfce0dd18b725951aac6baf4 Log: Remove declare_stack Changed paths: M Zend/zend.c M Zend/zend_compile.c M Zend/zend_globals.h Diff: diff --git a/Zend/zend.c b/Zend/zend.c index aec5b33..2b79445 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1036,7 +1036,6 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ zend_stack function_call_stack; zend_stack switch_cond_stack; zend_stack foreach_copy_stack; - zend_stack declare_stack; zend_stack list_stack; zend_stack context_stack; TSRMLS_FETCH(); @@ -1191,7 +1190,6 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ SAVE_STACK(function_call_stack); SAVE_STACK(switch_cond_stack); SAVE_STACK(foreach_copy_stack); - SAVE_STACK(declare_stack); SAVE_STACK(list_stack); SAVE_STACK(context_stack); CG(in_compilation) = 0; @@ -1216,7 +1214,6 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ RESTORE_STACK(function_call_stack); RESTORE_STACK(switch_cond_stack); RESTORE_STACK(foreach_copy_stack); - RESTORE_STACK(declare_stack); RESTORE_STACK(list_stack); RESTORE_STACK(context_stack); CG(in_compilation) = 1; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index dd9b49b..d2306c4 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -187,7 +187,6 @@ void zend_init_compiler_data_structures(TSRMLS_D) /* {{{ */ zend_stack_init(&CG(function_call_stack), sizeof(zend_function_call_entry)); zend_stack_init(&CG(switch_cond_stack), sizeof(zend_switch_entry)); zend_stack_init(&CG(foreach_copy_stack), sizeof(zend_op)); - zend_stack_init(&CG(declare_stack), sizeof(zend_declarables)); CG(active_class_entry) = NULL; zend_llist_init(&CG(list_llist), sizeof(list_llist_element), NULL, 0); zend_llist_init(&CG(dimension_llist), sizeof(int), NULL, 0); @@ -234,7 +233,6 @@ void shutdown_compiler(TSRMLS_D) /* {{{ */ zend_stack_destroy(&CG(function_call_stack)); zend_stack_destroy(&CG(switch_cond_stack)); zend_stack_destroy(&CG(foreach_copy_stack)); - zend_stack_destroy(&CG(declare_stack)); zend_stack_destroy(&CG(list_stack)); zend_hash_destroy(&CG(filenames_table)); zend_hash_destroy(&CG(const_filenames)); @@ -5159,10 +5157,9 @@ void zend_compile_try(zend_ast *ast TSRMLS_DC) { void zend_compile_declare(zend_ast *ast TSRMLS_DC) { zend_ast *declares_ast = ast->child[0]; zend_ast *stmt_ast = ast->child[1]; + zend_declarables orig_declarables = CG(declarables); zend_uint i; - zend_stack_push(&CG(declare_stack), &CG(declarables)); - for (i = 0; i < declares_ast->children; ++i) { zend_ast *declare_ast = declares_ast->child[i]; zend_ast *name_ast = declare_ast->child[0]; @@ -5235,11 +5232,9 @@ void zend_compile_declare(zend_ast *ast TSRMLS_DC) { } if (stmt_ast) { - zend_declarables *declarables = zend_stack_top(&CG(declare_stack)); - zend_compile_stmt(stmt_ast TSRMLS_CC); - CG(declarables) = *declarables; + CG(declarables) = orig_declarables; } } diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h index ee68a7b..9b01638 100644 --- a/Zend/zend_globals.h +++ b/Zend/zend_globals.h @@ -74,7 +74,6 @@ struct _zend_compiler_globals { zend_stack switch_cond_stack; zend_stack foreach_copy_stack; zend_stack object_stack; /* TODO: remove */ - zend_stack declare_stack; zend_class_entry *active_class_entry;

« previous php.cvs (#80956) next »