Skip to content

Commit 89b2483

Browse files
committed
Remove generator iterator member
This is probably a leftover from the PHP 5 implementation, where the iterator was embedded directly in the generator.
1 parent e2a407c commit 89b2483

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

Zend/zend_generators.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,8 +1023,6 @@ ZEND_METHOD(Generator, getReturn)
10231023

10241024
static void zend_generator_iterator_dtor(zend_object_iterator *iterator) /* {{{ */
10251025
{
1026-
zend_generator *generator = (zend_generator*)Z_OBJ(iterator->data);
1027-
generator->iterator = NULL;
10281026
zval_ptr_dtor(&iterator->data);
10291027
}
10301028
/* }}} */
@@ -1114,8 +1112,7 @@ zend_object_iterator *zend_generator_get_iterator(zend_class_entry *ce, zval *ob
11141112
return NULL;
11151113
}
11161114

1117-
iterator = generator->iterator = emalloc(sizeof(zend_object_iterator));
1118-
1115+
iterator = emalloc(sizeof(zend_object_iterator));
11191116
zend_iterator_init(iterator);
11201117

11211118
iterator->funcs = &zend_generator_iterator_functions;

Zend/zend_generators.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ struct _zend_generator_node {
5555
struct _zend_generator {
5656
zend_object std;
5757

58-
zend_object_iterator *iterator;
59-
6058
/* The suspended execution context. */
6159
zend_execute_data *execute_data;
6260

0 commit comments

Comments
 (0)