Set execute_data on previous fiber in zend_fiber_switch_to

Author: trowski

Zend/zend_fibers.c

@@ -388,10 +388,6 @@ ZEND_API void zend_fiber_switch_context(zend_fiber_transfer *transfer)
 
 	zend_observer_fiber_switch_notify(from, to);
 
-	if (from->kind == zend_ce_fiber) {
-		zend_fiber_from_context(from)->execute_data = EG(current_execute_data);
-	}
-
 	zend_fiber_capture_vm_state(&state);
 
 	to->status = ZEND_FIBER_STATUS_RUNNING;
@@ -530,7 +526,7 @@ static zend_always_inline void zend_fiber_delegate_transfer_result(
 }
 
 static zend_always_inline zend_fiber_transfer zend_fiber_switch_to(
-	zend_fiber_context *context, zval *value, bool exception
+	zend_fiber *from, zend_fiber_context *context, zval *value, bool exception
 ) {
 	zend_fiber_transfer transfer = {
 		.context = context,
@@ -543,6 +539,11 @@ static zend_always_inline zend_fiber_transfer zend_fiber_switch_to(
 		ZVAL_NULL(&transfer.value);
 	}
 
+	if (from) {
+		from->execute_data = EG(current_execute_data);
+		from->stack_bottom->prev_execute_data = NULL;
+	}
+
 	zend_fiber_switch_context(&transfer);
 
 	/* Forward bailout into current fiber. */
@@ -561,7 +562,7 @@ static zend_always_inline zend_fiber_transfer zend_fiber_resume(zend_fiber *fibe
 	fiber->caller = EG(current_fiber_context);
 	EG(active_fiber) = fiber;
 
-	zend_fiber_transfer transfer = zend_fiber_switch_to(fiber->previous, value, exception);
+	zend_fiber_transfer transfer = zend_fiber_switch_to(previous, fiber->previous, value, exception);
 
 	EG(active_fiber) = previous;
 
@@ -576,7 +577,7 @@ static zend_always_inline zend_fiber_transfer zend_fiber_suspend(zend_fiber *fib
 	fiber->previous = EG(current_fiber_context);
 	fiber->caller = NULL;
 
-	return zend_fiber_switch_to(caller, value, false);
+	return zend_fiber_switch_to(fiber, caller, value, false);
 }
 
 static zend_object *zend_fiber_object_create(zend_class_entry *ce)
@@ -745,9 +746,6 @@ ZEND_METHOD(Fiber, suspend)
 
 	ZEND_ASSERT(fiber->context.status == ZEND_FIBER_STATUS_RUNNING || fiber->context.status == ZEND_FIBER_STATUS_SUSPENDED);
 
-	fiber->execute_data = EG(current_execute_data);
-	fiber->stack_bottom->prev_execute_data = NULL;
-
 	zend_fiber_transfer transfer = zend_fiber_suspend(fiber, value);
 
 	zend_fiber_delegate_transfer_result(&transfer, INTERNAL_FUNCTION_PARAM_PASSTHRU);