wip

Author: ndossche

ext/intl/common/common_enum.cpp

@@ -47,19 +47,22 @@ static void zoi_with_current_destroy_self(zend_object_iterator *iter, zoi_with_c
 void zoi_with_current_dtor(zend_object_iterator *iter)
 {
 	zoi_with_current *zoiwc = (zoi_with_current*)iter;
-
+printf("zoiwc=%p\n", zoiwc);
 	if (!Z_ISUNDEF(zoiwc->wrapping_obj)) {
+		printf("not undef wrapper\n");
 		/* we have to copy the pointer because zoiwc->wrapping_obj may be
 		 * 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
 		 * destroy this object */
+		printf("refcount %d\n", Z_REFCOUNT_P(zwo));
 		zval_ptr_dtor(zwo);
 
 		/* We may only invalidate and destroy if this was actually the last instance.
 		 * If it was, then IntlIterator_objects_free() will have set zwo to UNDEF. */
 		if (Z_ISUNDEF_P(zwo)) {
+			printf("NOW undef wrapper\n");
 			zoi_with_current_destroy_self(iter, zoiwc);
 		}
 	} else {
@@ -178,8 +181,11 @@ static void IntlIterator_objects_free(zend_object *object)
 {
 	IntlIterator_object	*ii = php_intl_iterator_fetch_object(object);
 
+	printf("free parent\n");
+
 	if (ii->iterator) {
 		zval *wrapping_objp = &((zoi_with_current*)ii->iterator)->wrapping_obj;
+		// zval_ptr_dtor(wrapping_objp);
 		/* Signal that it was the last reference that got destroyed */
 		ZVAL_UNDEF(wrapping_objp);
 		zend_iterator_dtor(ii->iterator);
@@ -198,12 +204,14 @@ static HashTable *IntlIterator_get_gc(zend_object *object, zval **table, int *n)
 		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);
+
+		// TODO: can be optimized
+		return zend_std_get_properties(object);
 	} else {
 		*table = NULL;
 		*n = 0;
+		return zend_std_get_gc(object, table, n);
 	}
-
-	return zend_std_get_properties(object);
 }
 
 static zend_object_iterator *IntlIterator_get_iterator(