Don't set GC_HAS_DESTRUCTORS flag if destructors were already called

dstogov · dstogov · commit 170a3f871ff7 · 2019-08-06T11:35:53.000+03:00
diff --git a/Zend/zend_gc.c b/Zend/zend_gc.c
@@ -1158,8 +1158,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;
 				}
 				ZVAL_OBJ(&tmp, obj);

Original file line number	Diff line number	Diff line change
`@@ -1158,8 +1158,9 @@ static int gc_collect_white(zend_refcounted ref, uint32_t flags, gc_stack *sta`
`1158`	`1158`	`if (!GC_INFO(ref)) {`
`1159`	`1159`	`gc_add_garbage(ref);`
`1160`	`1160`	`}`
`1161`		`- if (obj->handlers->dtor_obj != zend_objects_destroy_object \|\|`
`1162`		`- obj->ce->destructor != NULL) {`
	`1161`	`+ if (!(OBJ_FLAGS(obj) & IS_OBJ_DESTRUCTOR_CALLED)`
	`1162`	`+ && (obj->handlers->dtor_obj != zend_objects_destroy_object`
	`1163`	`+ \|\| obj->ce->destructor != NULL)) {`
`1163`	`1164`	`*flags \|= GC_HAS_DESTRUCTORS;`
`1164`	`1165`	`}`
`1165`	`1166`	`ZVAL_OBJ(&tmp, obj);`