Merge branch 'PHP-7.4'

dstogov · dstogov · commit 4d9e5ddf7c9f · 2019-08-06T11:37:08.000+03:00
* PHP-7.4:
  Don't set GC_HAS_DESTRUCTORS flag if destructors were already called
  Update NEWS for 7.4.0beta3
  Update NEWS for PHP 7.4.0beta2
diff --git a/Zend/zend_gc.c b/Zend/zend_gc.c
@@ -1151,8 +1151,9 @@ static int gc_collect_white(zend_refcounted *ref, uint32_t *flags, gc_stack *sta
 				if (!GC_INFO(ref)) {
 					gc_add_garbage(ref);
 				}
-				if (obj->handlers->dtor_obj != zend_objects_destroy_object ||
-						obj->ce->destructor != NULL) {
+				if (!(OBJ_FLAGS(obj) & IS_OBJ_DESTRUCTOR_CALLED)
+				 && (obj->handlers->dtor_obj != zend_objects_destroy_object
+				  || obj->ce->destructor != NULL)) {
 					*flags |= GC_HAS_DESTRUCTORS;
 				}
 				ht = obj->handlers->get_gc(obj, &zv, &n);

Original file line number	Diff line number	Diff line change
`@@ -1151,8 +1151,9 @@ static int gc_collect_white(zend_refcounted ref, uint32_t flags, gc_stack *sta`
`1151`	`1151`	`if (!GC_INFO(ref)) {`
`1152`	`1152`	`gc_add_garbage(ref);`
`1153`	`1153`	`}`
`1154`		`- if (obj->handlers->dtor_obj != zend_objects_destroy_object \|\|`
`1155`		`- obj->ce->destructor != NULL) {`
	`1154`	`+ if (!(OBJ_FLAGS(obj) & IS_OBJ_DESTRUCTOR_CALLED)`
	`1155`	`+ && (obj->handlers->dtor_obj != zend_objects_destroy_object`
	`1156`	`+ \|\| obj->ce->destructor != NULL)) {`
`1156`	`1157`	`*flags \|= GC_HAS_DESTRUCTORS;`
`1157`	`1158`	`}`
`1158`	`1159`	`ht = obj->handlers->get_gc(obj, &zv, &n);`