wip

Author: ndossche

Zend/zend_vm_def.h

@@ -3153,7 +3153,6 @@ ZEND_VM_HOT_HANDLER(127, ZEND_FE_FREE, TMPVAR, ANY)
 		if (Z_FE_ITER_P(var) != (uint32_t)-1) {
 			zend_hash_iterator_del(Z_FE_ITER_P(var));
 		}
-		//zval_ptr_dtor_nogc(var);
 		zval_ptr_dtor(var);
 		ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 	}

Zend/zend_vm_execute.h

@@ -50,7 +50,7 @@ void zoi_with_current_dtor(zend_object_iterator *iter)
 
 	if (!Z_ISUNDEF(zoiwc->wrapping_obj)) {
 		/* we have to copy the pointer because zoiwc->wrapping_obj may be
-		* changed midway the execution of zval_ptr_dtor() */
+		 * changed midway the execution of zval_ptr_dtor() */
 		zval *zwo = &zoiwc->wrapping_obj;
 
 		/* object is still here, we can rely on it to call this again and
@@ -196,13 +196,14 @@ static HashTable *IntlIterator_get_gc(zend_object *object, zval **table, int *n)
 	if (ii->iterator) {
 		zend_get_gc_buffer *gc = zend_get_gc_buffer_create();
 		zend_get_gc_buffer_add_obj(gc, &ii->iterator->std);
+		/* current can't participate in a cycle */
 		zend_get_gc_buffer_use(gc, table, n);
 	} else {
 		*table = NULL;
 		*n = 0;
 	}
 
-	return NULL;
+	return zend_std_get_properties(object);
 }
 
 static zend_object_iterator *IntlIterator_get_iterator(