async: shutdown iterator dispose gives up on remaining destructors

The dispose of a destructor-pass iterator coroutine raised E_CORE_ERROR
and then tried to re-run the pass - dead code, since a mid-request
E_CORE_ERROR bails out and never returns. A scheduler may legitimately
cancel the iterator (deadlock policy), so dying was wrong, and re-running
destructors from dispose is unsafe (may be inside a bailout, user code
forbidden). Follow the zend_catch policy instead: warn, reset the cursor,
mark the remaining objects destructed.

Author: EdmondDantes

Zend/zend_execute_API.c

@@ -247,9 +247,11 @@ static void shutdown_destructors_coroutine_dtor(zend_coroutine_t *coroutine)
 	if (EG(shutdown_context).coroutine == coroutine) {
 		EG(shutdown_context).coroutine = NULL;
 		EG(shutdown_context).pass = ZEND_SHUTDOWN_PASS_NONE;
-		zend_error(E_CORE_ERROR, "Shutdown destructors coroutine was not finished properly");
+		zend_error(E_WARNING, "Shutdown destructors coroutine was not finished properly");
+		/* Dispose may run inside a bailout: no user code from here. Give up on
+		 * the remaining destructors the way the zend_catch below does. */
 		EG(symbol_table).pDestructor = zend_unclean_zval_ptr_dtor;
-		shutdown_destructors();
+		zend_objects_store_mark_destructed(&EG(objects_store));
 	}
 }
 

Zend/zend_objects_API.c

@@ -71,15 +71,16 @@ static void zend_objects_store_call_destructors_async_iterator_entry(void)
 }
 
 /* Reset the shutdown cursor if the iterator coroutine is torn down mid-pass
- * (cancelled/errored) instead of finishing normally — otherwise is_started
- * stays true and every later call believes a pass is still in flight. */
+ * (cancelled/errored) instead of finishing normally — otherwise the pass
+ * stays marked in flight forever. Dispose may run inside a bailout: no user
+ * code from here, the remaining destructors are given up. */
 static void zend_objects_store_call_destructors_async_coroutine_dtor(zend_coroutine_t *coroutine)
 {
 	if (EG(shutdown_context).coroutine == coroutine) {
 		EG(shutdown_context).coroutine = NULL;
 		EG(shutdown_context).pass = ZEND_SHUTDOWN_PASS_NONE;
-		zend_error(E_CORE_ERROR, "Object store destructors coroutine was not finished properly");
-		shutdown_destructors();
+		zend_error(E_WARNING, "Object store destructors coroutine was not finished properly");
+		zend_objects_store_mark_destructed(&EG(objects_store));
 	}
 }