Merge branch 'PHP-7.4'

nikic · nikic · commit af4ff75c9893 · 2020-06-30T17:33:51.000+02:00
* PHP-7.4:
  Remove bogus generator iterator dtor
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
@@ -266,10 +266,6 @@ static void zend_generator_free_storage(zend_object *object) /* {{{ */
 	}
 
 	zend_object_std_dtor(&generator->std);
-
-	if (generator->iterator) {
-		zend_iterator_dtor(generator->iterator);
-	}
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -266,10 +266,6 @@ static void zend_generator_free_storage(zend_object object) / {{{ */`
`266`	`266`	`}`
`267`	`267`
`268`	`268`	`zend_object_std_dtor(&generator->std);`
`269`		`-`
`270`		`- if (generator->iterator) {`
`271`		`- zend_iterator_dtor(generator->iterator);`
`272`		`- }`
`273`	`269`	`}`
`274`	`270`	`/* }}} */`
`275`	`271`