diff options
| author | Nikita Popov <nikic@php.net> | 2014-08-25 21:59:30 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-08-25 22:04:33 +0200 |
| commit | 899a1ed59a2f7133367dc39f95b143c019822520 (patch) | |
| tree | a8fc518673cf0c94ad363d04bc3474eb3f3bfa66 /Zend/zend.c | |
| parent | af59e92b24c8f624672720d47ef65bd8457728b9 (diff) | |
| parent | 6db293d5e043d35c281a6b11cb68460f5d7188a9 (diff) | |
| download | php-git-POST_AST_MERGE.tar.gz | |
Merge branch 'ast'POST_AST_MERGE
Conflicts:
Zend/zend_compile.c
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 413c799a37..2d4232ee98 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1021,13 +1021,9 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ zval orig_user_error_handler; zend_bool in_compilation; zend_class_entry *saved_class_entry; - zend_stack bp_stack; - 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 delayed_oplines_stack; zend_stack context_stack; zend_array *symbol_table; TSRMLS_FETCH(); @@ -1190,13 +1186,9 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ if (in_compilation) { saved_class_entry = CG(active_class_entry); CG(active_class_entry) = NULL; - SAVE_STACK(bp_stack); - 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(delayed_oplines_stack); SAVE_STACK(context_stack); CG(in_compilation) = 0; } @@ -1216,13 +1208,9 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ if (in_compilation) { CG(active_class_entry) = saved_class_entry; - RESTORE_STACK(bp_stack); - 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(delayed_oplines_stack); RESTORE_STACK(context_stack); CG(in_compilation) = 1; } |