diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-07-02 23:29:53 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-07-02 23:29:53 +0400 |
| commit | 63c057e3313918a800ad7faebdb648216ddba4c0 (patch) | |
| tree | 04ede4c58aa008868e82606b16cafc9d51757f87 /Zend/zend_generators.c | |
| parent | 4b09dd69e6bd31f4010bf48e9e07e63cb5f3c2a4 (diff) | |
| download | php-git-63c057e3313918a800ad7faebdb648216ddba4c0.tar.gz | |
Removed EG(opline_ptr) and use corresponding value from EG(current_execute_data)
Diffstat (limited to 'Zend/zend_generators.c')
| -rw-r--r-- | Zend/zend_generators.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c index a1c1257c55..4505081ee2 100644 --- a/Zend/zend_generators.c +++ b/Zend/zend_generators.c @@ -230,7 +230,6 @@ ZEND_API void zend_generator_create_zval(zend_op_array *op_array, zval *return_v { zend_generator *generator; zend_execute_data *current_execute_data; - zend_op **opline_ptr; zend_array *current_symbol_table; zend_execute_data *execute_data; zend_vm_stack current_stack = EG(argument_stack); @@ -260,16 +259,14 @@ ZEND_API void zend_generator_create_zval(zend_op_array *op_array, zval *return_v } /* Create new execution context. We have to back up and restore - * EG(current_execute_data), EG(opline_ptr) and EG(active_symbol_table) + * EG(current_execute_data) and EG(active_symbol_table) * here because the function modifies or uses them */ current_execute_data = EG(current_execute_data); - opline_ptr = EG(opline_ptr); current_symbol_table = EG(active_symbol_table); EG(active_symbol_table) = NULL; execute_data = zend_create_generator_execute_data(op_array, return_value TSRMLS_CC); EG(active_symbol_table) = current_symbol_table; EG(current_execute_data) = current_execute_data; - EG(opline_ptr) = opline_ptr; object_init_ex(return_value, zend_ce_generator); @@ -314,7 +311,6 @@ ZEND_API void zend_generator_resume(zend_generator *generator TSRMLS_DC) /* {{{ { /* Backup executor globals */ zend_execute_data *original_execute_data = EG(current_execute_data); - zend_op **original_opline_ptr = EG(opline_ptr); zend_array *original_active_symbol_table = EG(active_symbol_table); zend_object *original_This; zend_class_entry *original_scope = EG(scope); @@ -325,7 +321,6 @@ ZEND_API void zend_generator_resume(zend_generator *generator TSRMLS_DC) /* {{{ /* Set executor globals */ EG(current_execute_data) = generator->execute_data; - EG(opline_ptr) = &generator->execute_data->opline; EG(active_symbol_table) = generator->execute_data->symbol_table; Z_OBJ(EG(This)) = generator->execute_data->object; EG(scope) = generator->execute_data->scope; @@ -355,7 +350,6 @@ ZEND_API void zend_generator_resume(zend_generator *generator TSRMLS_DC) /* {{{ /* Restore executor globals */ EG(current_execute_data) = original_execute_data; - EG(opline_ptr) = original_opline_ptr; EG(active_symbol_table) = original_active_symbol_table; Z_OBJ(EG(This)) = original_This; EG(scope) = original_scope; |