diff options
| author | Nikita Popov <nikic@php.net> | 2015-04-20 17:39:32 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-04-20 18:18:52 +0200 |
| commit | 0381c1b79e9491e68c9ca85a21e0a5bd68f3840f (patch) | |
| tree | 33aedc77c200495a02b7c1be387b8dcceeb68e7a /Zend/zend.c | |
| parent | b99174136c19df728ced6e9ab24b890e82b4cb0e (diff) | |
| download | php-git-0381c1b79e9491e68c9ca85a21e0a5bd68f3840f.tar.gz | |
Fixed bug #69388
Renamed compiler_context to oparray_context. Introduced per-file
file_context. Moved import tables into the file_context.
context_stack no longer exists, instead keeping backups of contexts
on C stack. Same for file contexts.
TODO: Move more things out of CG into file_context. There should be
a number of other things that we should not try to reuse in nested
compilations.
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index cf87b2620c..f262f8b5d7 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1047,7 +1047,6 @@ static void zend_error_va_list(int type, const char *format, va_list args) zend_class_entry *saved_class_entry; zend_stack loop_var_stack; zend_stack delayed_oplines_stack; - zend_stack context_stack; zend_array *symbol_table; if (type & E_EXCEPTION) { @@ -1234,7 +1233,6 @@ static void zend_error_va_list(int type, const char *format, va_list args) CG(active_class_entry) = NULL; SAVE_STACK(loop_var_stack); SAVE_STACK(delayed_oplines_stack); - SAVE_STACK(context_stack); CG(in_compilation) = 0; } @@ -1254,7 +1252,6 @@ static void zend_error_va_list(int type, const char *format, va_list args) CG(active_class_entry) = saved_class_entry; RESTORE_STACK(loop_var_stack); RESTORE_STACK(delayed_oplines_stack); - RESTORE_STACK(context_stack); CG(in_compilation) = 1; } |