Rename FiberExit to GracefulExit

Author: trowski

Zend/zend_exceptions.c

@@ -43,11 +43,11 @@ ZEND_API zend_class_entry *zend_ce_arithmetic_error;
 ZEND_API zend_class_entry *zend_ce_division_by_zero_error;
 ZEND_API zend_class_entry *zend_ce_unhandled_match_error;
 
-/* Internal pseudo-exception that is not exposed to userland. */
+/* Internal pseudo-exception that is not exposed to userland. Throwing this exception *does not* execute finally blocks. */
 static zend_class_entry zend_ce_unwind_exit;
 
-/* Internal pseudo-exception used in destroyed fibers that is not exposed to userland. */
-static zend_class_entry zend_ce_fiber_exit;
+/* Internal pseudo-exception that is not exposed to userland. Throwing this exception *does* execute finally blocks. */
+static zend_class_entry zend_ce_graceful_exit;
 
 ZEND_API void (*zend_throw_exception_hook)(zend_object *ex);
 
@@ -97,7 +97,7 @@ void zend_exception_set_previous(zend_object *exception, zend_object *add_previo
 		return;
 	}
 
-	if (exception == add_previous || zend_is_unwind_exit(add_previous) || zend_is_fiber_exit(add_previous)) {
+	if (exception == add_previous || zend_is_unwind_exit(add_previous) || zend_is_graceful_exit(add_previous)) {
 		OBJ_RELEASE(add_previous);
 		return;
 	}
@@ -795,7 +795,7 @@ void zend_register_default_exception(void) /* {{{ */
 
 	INIT_CLASS_ENTRY(zend_ce_unwind_exit, "UnwindExit", NULL);
 
-	INIT_CLASS_ENTRY(zend_ce_fiber_exit, "FiberExit", NULL);
+	INIT_CLASS_ENTRY(zend_ce_graceful_exit, "GracefulExit", NULL);
 }
 /* }}} */
 
@@ -954,7 +954,7 @@ ZEND_API ZEND_COLD zend_result zend_exception_error(zend_object *ex, int severit
 
 		zend_string_release_ex(str, 0);
 		zend_string_release_ex(file, 0);
-	} else if (ce_exception == &zend_ce_unwind_exit) {
+	} else if (ce_exception == &zend_ce_unwind_exit || ce_exception == &zend_ce_graceful_exit) {
 		/* We successfully unwound, nothing more to do.
 		 * We still return FAILURE in this case, as further execution should still be aborted. */
 	} else {
@@ -992,10 +992,10 @@ ZEND_API ZEND_COLD void zend_throw_unwind_exit(void)
 	EG(current_execute_data)->opline = EG(exception_op);
 }
 
-ZEND_API ZEND_COLD void zend_throw_fiber_exit(void)
+ZEND_API ZEND_COLD void zend_throw_graceful_exit(void)
 {
 	ZEND_ASSERT(!EG(exception));
-	EG(exception) = zend_objects_new(&zend_ce_fiber_exit);
+	EG(exception) = zend_objects_new(&zend_ce_graceful_exit);
 	EG(opline_before_exception) = EG(current_execute_data)->opline;
 	EG(current_execute_data)->opline = EG(exception_op);
 }
@@ -1005,7 +1005,7 @@ ZEND_API bool zend_is_unwind_exit(const zend_object *ex)
 	return ex->ce == &zend_ce_unwind_exit;
 }
 
-ZEND_API bool zend_is_fiber_exit(const zend_object *ex)
+ZEND_API bool zend_is_graceful_exit(const zend_object *ex)
 {
-	return ex->ce == &zend_ce_fiber_exit;
+	return ex->ce == &zend_ce_graceful_exit;
 }

Zend/zend_exceptions.h

@@ -70,9 +70,9 @@ extern ZEND_API void (*zend_throw_exception_hook)(zend_object *ex);
 ZEND_API ZEND_COLD zend_result zend_exception_error(zend_object *exception, int severity);
 
 ZEND_API ZEND_COLD void zend_throw_unwind_exit(void);
-ZEND_API ZEND_COLD void zend_throw_fiber_exit(void);
+ZEND_API ZEND_COLD void zend_throw_graceful_exit(void);
 ZEND_API bool zend_is_unwind_exit(const zend_object *ex);
-ZEND_API bool zend_is_fiber_exit(const zend_object *ex);
+ZEND_API bool zend_is_graceful_exit(const zend_object *ex);
 
 #include "zend_globals.h"
 

Zend/zend_fibers.c

@@ -351,7 +351,7 @@ static void ZEND_STACK_ALIGNED zend_fiber_execute(zend_fiber_context *context)
 
 	if (EG(exception)) {
 		if (fiber->status == ZEND_FIBER_STATUS_SHUTDOWN) {
-			if (EXPECTED(zend_is_fiber_exit(EG(exception)))) {
+			if (EXPECTED(zend_is_graceful_exit(EG(exception)) || zend_is_unwind_exit(EG(exception)))) {
 				zend_clear_exception();
 			} else {
 				zend_exception_error(EG(exception), E_ERROR);
@@ -514,9 +514,11 @@ ZEND_METHOD(Fiber, suspend)
 	if (fiber->status == ZEND_FIBER_STATUS_SHUTDOWN) {
 		// This occurs when the fiber is GC'ed while suspended, do not add a ref.
 		if (EG(fiber_error)) {
+			// Throw UnwindExit so finally blocks are not executed on fatal error.
 			zend_throw_unwind_exit();
 		} else {
-			zend_throw_fiber_exit();
+			// Otherwise throw GracefulExit to execute finally blocks.
+			zend_throw_graceful_exit();
 		}
 		RETURN_THROWS();
 	}