com php-src: Remove object_stack (mostly): Zend/zen d.c Zend/zend_compile.c Zend/zend_globals.h
| From: | Nikita Popov | Date: | Sat, 31 May 2014 13:59:54 +0000 |
| Subject: | com php-src: Remove object_stack (mostly): Zend/zen d.c Zend/zend_compile.c Zend/zend_globals.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81072@lists.php.net to get a copy of this message | ||
Commit: fcf42d817df81c887056ebcab8c6d16f4e987316
Author: Nikita Popov <nikic@php.net> Sat, 31 May 2014 15:59:54 +0200
Parents: c29d3b6e3e7738573f269f62dc119651a27995a5
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fcf42d817df81c887056ebcab8c6d16f4e987316
Log:
Remove object_stack (mostly)
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 841fc38...aec5b33 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 object_stack;
zend_stack declare_stack;
zend_stack list_stack;
zend_stack context_stack;
@@ -1192,7 +1191,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(object_stack);
SAVE_STACK(declare_stack);
SAVE_STACK(list_stack);
SAVE_STACK(context_stack);
@@ -1218,7 +1216,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(object_stack);
RESTORE_STACK(declare_stack);
RESTORE_STACK(list_stack);
RESTORE_STACK(context_stack);
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index a0610b6..e8182a6 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -194,7 +194,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(object_stack), sizeof(znode));
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);
@@ -242,7 +241,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(object_stack));
zend_stack_destroy(&CG(declare_stack));
zend_stack_destroy(&CG(list_stack));
zend_hash_destroy(&CG(filenames_table));
@@ -5556,22 +5554,6 @@ void zend_do_halt_compiler_register(TSRMLS_D) /* {{{ */
}
/* }}} */
-void zend_do_push_object(const znode *object TSRMLS_DC) /* {{{ */
-{
- zend_stack_push(&CG(object_stack), object);
-}
-/* }}} */
-
-void zend_do_pop_object(znode *object TSRMLS_DC) /* {{{ */
-{
- if (object) {
- znode *tmp = zend_stack_top(&CG(object_stack));
- *object = *tmp;
- }
- zend_stack_del_top(&CG(object_stack));
-}
-/* }}} */
-
void zend_do_begin_new_object(znode *new_token, znode *class_type TSRMLS_DC) /* {{{ */
{
zend_op *opline;
diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
index 2a29e33..ee68a7b 100644
--- a/Zend/zend_globals.h
+++ b/Zend/zend_globals.h
@@ -73,7 +73,7 @@ struct _zend_compiler_globals {
zend_stack bp_stack;
zend_stack switch_cond_stack;
zend_stack foreach_copy_stack;
- zend_stack object_stack;
+ zend_stack object_stack; /* TODO: remove */
zend_stack declare_stack;
zend_class_entry *active_class_entry;