Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1

This commit is contained in:
Bob Weinand 2016-07-27 18:18:47 +02:00
commit dfb3e270c2

View File

@ -1144,6 +1144,7 @@ ZEND_API int zend_gc_collect_cycles(void)
if (EG(objects_store).object_buckets && if (EG(objects_store).object_buckets &&
IS_OBJ_VALID(EG(objects_store).object_buckets[obj->handle])) { IS_OBJ_VALID(EG(objects_store).object_buckets[obj->handle])) {
EG(objects_store).object_buckets[obj->handle] = SET_OBJ_INVALID(obj);
GC_TYPE(obj) = IS_NULL; GC_TYPE(obj) = IS_NULL;
if (!(GC_FLAGS(obj) & IS_OBJ_FREE_CALLED)) { if (!(GC_FLAGS(obj) & IS_OBJ_FREE_CALLED)) {
GC_FLAGS(obj) |= IS_OBJ_FREE_CALLED; GC_FLAGS(obj) |= IS_OBJ_FREE_CALLED;