Add fiber flag to exceptions

Author: trowski

Zend/tests/fibers/failing-fiber.phpt

@@ -20,5 +20,5 @@ string(4) "test"
 Fatal error: Uncaught Exception: test in %sfailing-fiber.php:%d
 Stack trace:
 #0 [internal function]: {closure}()
-#1 {main}
+#1 {fiber}
   thrown in %sfailing-fiber.php on line %d

Zend/tests/fibers/fiber-throw-in-destruct.phpt

@@ -23,5 +23,5 @@ int(1)
 Fatal error: Uncaught Exception: test in %sfiber-throw-in-destruct.php:%d
 Stack trace:
 #0 [internal function]: class@anonymous::{closure}()
-#1 {main}
+#1 {fiber}
   thrown in %sfiber-throw-in-destruct.php on line %d

Zend/tests/fibers/resume-running-fiber.phpt

@@ -16,5 +16,5 @@ Fatal error: Uncaught FiberError: Cannot resume a fiber that is not suspended in
 Stack trace:
 #0 %sresume-running-fiber.php(%d): Fiber->resume()
 #1 [internal function]: {closure}()
-#2 {main}
+#2 {fiber}
   thrown in %sresume-running-fiber.php on line %d

Zend/tests/fibers/start-arguments.phpt

@@ -24,5 +24,5 @@ int(1)
 Fatal error: Uncaught TypeError: {closure}(): Argument #1 ($x) must be of type int, string given in %sstart-arguments.php:%d
 Stack trace:
 #0 [internal function]: {closure}('test')
-#1 {main}
+#1 {fiber}
   thrown in %sstart-arguments.php on line %d

Zend/tests/fibers/suspend-in-force-close-fiber-after-shutdown.phpt

@@ -23,5 +23,5 @@ Fatal error: Uncaught FiberError: Cannot suspend in a force closed fiber in %ssu
 Stack trace:
 #0 %ssuspend-in-force-close-fiber-after-shutdown.php(%d): Fiber::suspend()
 #1 [internal function]: {closure}()
-#2 {main}
+#2 {fiber}
   thrown in %ssuspend-in-force-close-fiber-after-shutdown.php on line %d

Zend/tests/fibers/suspend-in-force-close-fiber.phpt

@@ -21,5 +21,5 @@ Fatal error: Uncaught FiberError: Cannot suspend in a force closed fiber in %ssu
 Stack trace:
 #0 %ssuspend-in-force-close-fiber.php(%d): Fiber::suspend()
 #1 [internal function]: {closure}()
-#2 {main}
+#2 {fiber}
   thrown in %ssuspend-in-force-close-fiber.php on line %d

Zend/zend_exceptions.c

@@ -267,6 +267,9 @@ static zend_object *zend_default_exception_new_ex(zend_class_entry *class_type,
 	}
 	zend_update_property_ex(base_ce, object, ZSTR_KNOWN(ZEND_STR_TRACE), &trace);
 
+	ZVAL_BOOL(&tmp, EG(current_fiber));
+	zend_update_property_ex(base_ce, object, ZSTR_KNOWN(ZEND_STR_FIBER), &tmp);
+
 	return object;
 }
 /* }}} */
@@ -340,6 +343,7 @@ ZEND_METHOD(Exception, __wakeup)
 	CHECK_EXC_TYPE(ZEND_STR_CODE,     IS_LONG);
 	CHECK_EXC_TYPE(ZEND_STR_FILE,     IS_STRING);
 	CHECK_EXC_TYPE(ZEND_STR_LINE,     IS_LONG);
+	CHECK_EXC_TYPE(ZEND_STR_FIBER,    _IS_BOOL);
 	/* The type of $trace and $previous is enforced through typed properties. */
 }
 /* }}} */
@@ -606,7 +610,7 @@ static void _build_trace_string(smart_str *str, HashTable *ht, uint32_t num) /*
 /* {{{ Obtain the backtrace for the exception as a string (instead of an array) */
 ZEND_METHOD(Exception, getTraceAsString)
 {
-	zval *trace, *frame, rv;
+	zval *trace, *frame, *fiber, rv;
 	zend_ulong index;
 	zval *object;
 	zend_class_entry *base_ce;
@@ -634,9 +638,11 @@ ZEND_METHOD(Exception, getTraceAsString)
 		_build_trace_string(&str, Z_ARRVAL_P(frame), num++);
 	} ZEND_HASH_FOREACH_END();
 
+	fiber = zend_read_property_ex(base_ce, Z_OBJ_P(object), ZSTR_KNOWN(ZEND_STR_FIBER), 1, &rv);
+
 	smart_str_appendc(&str, '#');
 	smart_str_append_long(&str, num);
-	smart_str_appends(&str, " {main}");
+	smart_str_appends(&str, Z_TYPE_P(fiber) == IS_TRUE ? " {fiber}" : " {main}");
 	smart_str_0(&str);
 
 	RETURN_NEW_STR(str.s);

Zend/zend_exceptions.stub.php

@@ -34,6 +34,7 @@ class Exception implements Throwable
     protected $line = null;
     private array $trace = [];
     private ?Throwable $previous = null;
+    private bool $fiber = false;
 
     final private function __clone(): void {}
 
@@ -91,6 +92,7 @@ class Error implements Throwable
     protected $line = null;
     private array $trace = [];
     private ?Throwable $previous = null;
+    private bool $fiber = false;
 
     /** @implementation-alias Exception::__clone */
     final private function __clone(): void {}

Zend/zend_exceptions_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: f322ba2ed3e636b6e99400edfbff98102b7e3d06 */
+ * Stub hash: 419a4fbca0e2c95b8a2f71597fab4625a15aa0b4 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Throwable_getMessage, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
@@ -248,6 +248,12 @@ static zend_class_entry *register_class_Exception(zend_class_entry *class_entry_
 	zend_declare_typed_property(class_entry, property_previous_name, &property_previous_default_value, ZEND_ACC_PRIVATE, NULL, (zend_type) ZEND_TYPE_INIT_CLASS(property_previous_class_Throwable, 0, MAY_BE_NULL));
 	zend_string_release(property_previous_name);
 
+	zval property_fiber_default_value;
+	ZVAL_BOOL(&property_fiber_default_value, 0);
+	zend_string *property_fiber_name = zend_string_init("fiber", sizeof("fiber") - 1, 1);
+	zend_declare_typed_property(class_entry, property_fiber_name, &property_fiber_default_value, ZEND_ACC_PRIVATE, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_BOOL));
+	zend_string_release(property_fiber_name);
+
 	return class_entry;
 }
 
@@ -312,6 +318,12 @@ static zend_class_entry *register_class_Error(zend_class_entry *class_entry_Thro
 	zend_declare_typed_property(class_entry, property_previous_name, &property_previous_default_value, ZEND_ACC_PRIVATE, NULL, (zend_type) ZEND_TYPE_INIT_CLASS(property_previous_class_Throwable, 0, MAY_BE_NULL));
 	zend_string_release(property_previous_name);
 
+	zval property_fiber_default_value;
+	ZVAL_BOOL(&property_fiber_default_value, 0);
+	zend_string *property_fiber_name = zend_string_init("fiber", sizeof("fiber") - 1, 1);
+	zend_declare_typed_property(class_entry, property_fiber_name, &property_fiber_default_value, ZEND_ACC_PRIVATE, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_BOOL));
+	zend_string_release(property_fiber_name);
+
 	return class_entry;
 }
 

Zend/zend_string.h

@@ -555,6 +555,7 @@ EMPTY_SWITCH_DEFAULT_CASE()
 	_(ZEND_STR_WAKEUP,                 "__wakeup") \
 	_(ZEND_STR_CASES,                  "cases") \
 	_(ZEND_STR_FROM,                   "from") \
+	_(ZEND_STR_FIBER,                  "fiber") \
 	_(ZEND_STR_TRYFROM,                "tryFrom") \
 	_(ZEND_STR_TRYFROM_LOWERCASE,      "tryfrom") \
 	_(ZEND_STR_AUTOGLOBAL_SERVER,      "_SERVER") \