@@ -497,7 +497,7 @@ ZEND_METHOD(Fiber, start)
497
497
498
498
if (fiber -> status != ZEND_FIBER_STATUS_INIT ) {
499
499
zend_throw_error (zend_ce_fiber_error , "Cannot start a fiber that has already been started" );
500
- return ;
500
+ RETURN_THROWS () ;
501
501
}
502
502
503
503
fiber -> fci .params = params ;
@@ -506,7 +506,7 @@ ZEND_METHOD(Fiber, start)
506
506
507
507
if (!zend_fiber_init_context (& fiber -> context , zend_fiber_execute , EG (fiber_stack_size ))) {
508
508
zend_throw_error (NULL , "Could not create fiber context" );
509
- return ;
509
+ RETURN_THROWS () ;
510
510
}
511
511
512
512
fiber -> status = ZEND_FIBER_STATUS_RUNNING ;
@@ -537,16 +537,12 @@ ZEND_METHOD(Fiber, suspend)
537
537
538
538
if (UNEXPECTED (!fiber )) {
539
539
zend_throw_error (zend_ce_fiber_error , "Cannot suspend outside of a fiber" );
540
- return ;
540
+ RETURN_THROWS () ;
541
541
}
542
542
543
- if (UNEXPECTED (fiber -> status != ZEND_FIBER_STATUS_RUNNING )) {
544
- if (fiber -> status == ZEND_FIBER_STATUS_SHUTDOWN ) {
545
- zend_throw_error (zend_ce_fiber_error , "Cannot suspend in a force closed fiber" );
546
- } else {
547
- zend_throw_error (zend_ce_fiber_error , "Cannot suspend in a fiber that is not running" );
548
- }
549
- return ;
543
+ if (UNEXPECTED (fiber -> status == ZEND_FIBER_STATUS_SHUTDOWN )) {
544
+ zend_throw_error (zend_ce_fiber_error , "Cannot suspend in a force closed fiber" );
545
+ RETURN_THROWS ();
550
546
}
551
547
552
548
if (value ) {
@@ -570,7 +566,7 @@ ZEND_METHOD(Fiber, suspend)
570
566
} else {
571
567
zend_throw_fiber_exit ();
572
568
}
573
- return ;
569
+ RETURN_THROWS () ;
574
570
}
575
571
576
572
fiber -> status = ZEND_FIBER_STATUS_RUNNING ;
@@ -607,7 +603,7 @@ ZEND_METHOD(Fiber, resume)
607
603
608
604
if (UNEXPECTED (fiber -> status != ZEND_FIBER_STATUS_SUSPENDED )) {
609
605
zend_throw_error (zend_ce_fiber_error , "Cannot resume a fiber that is not suspended" );
610
- return ;
606
+ RETURN_THROWS () ;
611
607
}
612
608
613
609
if (value ) {
@@ -643,7 +639,7 @@ ZEND_METHOD(Fiber, throw)
643
639
644
640
if (UNEXPECTED (fiber -> status != ZEND_FIBER_STATUS_SUSPENDED )) {
645
641
zend_throw_error (zend_ce_fiber_error , "Cannot resume a fiber that is not suspended" );
646
- return ;
642
+ RETURN_THROWS () ;
647
643
}
648
644
649
645
Z_ADDREF_P (exception );
@@ -735,7 +731,7 @@ ZEND_METHOD(Fiber, getReturn)
735
731
}
736
732
737
733
zend_throw_error (zend_ce_fiber_error , "Cannot get fiber return value: %s" , message );
738
- return ;
734
+ RETURN_THROWS () ;
739
735
}
740
736
741
737
RETURN_COPY (& fiber -> value );
0 commit comments