From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 30 Jun 2020 16:26:29 +0000 (+0200)
Subject: Remove generator iterator member
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89b2483edd0be53ef13cbd9e80cd15198f31f2c3;p=php

Remove generator iterator member

This is probably a leftover from the PHP 5 implementation, where
the iterator was embedded directly in the generator.
---

diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index 19a5e0665f..b8730d2820 100644
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -1023,8 +1023,6 @@ ZEND_METHOD(Generator, getReturn)
 
 static void zend_generator_iterator_dtor(zend_object_iterator *iterator) /* {{{ */
 {
-	zend_generator *generator = (zend_generator*)Z_OBJ(iterator->data);
-	generator->iterator = NULL;
 	zval_ptr_dtor(&iterator->data);
 }
 /* }}} */
@@ -1114,8 +1112,7 @@ zend_object_iterator *zend_generator_get_iterator(zend_class_entry *ce, zval *ob
 		return NULL;
 	}
 
-	iterator = generator->iterator = emalloc(sizeof(zend_object_iterator));
-
+	iterator = emalloc(sizeof(zend_object_iterator));
 	zend_iterator_init(iterator);
 
 	iterator->funcs = &zend_generator_iterator_functions;
diff --git a/Zend/zend_generators.h b/Zend/zend_generators.h
index 3a3d567508..036b47732b 100644
--- a/Zend/zend_generators.h
+++ b/Zend/zend_generators.h
@@ -55,8 +55,6 @@ struct _zend_generator_node {
 struct _zend_generator {
 	zend_object std;
 
-	zend_object_iterator *iterator;
-
 	/* The suspended execution context. */
 	zend_execute_data *execute_data;