Add zend_error_zstr_at and use for fatal errors

Author: trowski

Zend/zend.c

@@ -1599,6 +1599,10 @@ ZEND_API ZEND_COLD void zend_error_zstr(int type, zend_string *message) {
 	zend_error_impl(type, filename, lineno, message);
 }
 
+ZEND_API ZEND_COLD void zend_error_zstr_at(int type, const char *filename, uint32_t lineno, zend_string *message) {
+	zend_error_impl(type, filename, lineno, message);
+}
+
 ZEND_API ZEND_COLD void zend_throw_error(zend_class_entry *exception_ce, const char *format, ...) /* {{{ */
 {
 	va_list va;

Zend/zend.h

@@ -333,6 +333,7 @@ ZEND_API ZEND_COLD void zend_error_unchecked(int type, const char *format, ...);
 ZEND_API ZEND_COLD void zend_error_at(int type, const char *filename, uint32_t lineno, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 4, 5);
 ZEND_API ZEND_COLD ZEND_NORETURN void zend_error_at_noreturn(int type, const char *filename, uint32_t lineno, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 4, 5);
 ZEND_API ZEND_COLD void zend_error_zstr(int type, zend_string *message);
+ZEND_API ZEND_COLD void zend_error_zstr_at(int type, const char *filename, uint32_t lineno, zend_string *message);
 
 ZEND_API ZEND_COLD void zend_throw_error(zend_class_entry *exception_ce, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
 ZEND_API ZEND_COLD void zend_type_error(const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 1, 2);

Zend/zend_fibers.c

@@ -315,25 +315,25 @@ static void zend_fiber_switch_to(zend_fiber *fiber) /* {{{ */
 		}
 
 		zend_fiber_error *error = EG(fiber_error);
-		zend_error_at_noreturn(error->type, error->filename, error->lineno, "%s", ZSTR_VAL(error->message));
+		zend_error_zstr_at(error->type, error->filename, error->lineno, error->message);
 	}
 }
 /* }}} */
 
 /* {{{ */
-ZEND_COLD ZEND_NORETURN void zend_error_suspend_fiber(
+ZEND_COLD void zend_error_suspend_fiber(
 		int orig_type, const char *error_filename, uint32_t error_lineno, zend_string *message)
 {
 	ZEND_ASSERT(EG(current_fiber) && "Must be within an active fiber!");
 
-	zend_fiber_error error;
+	zend_fiber_error *error = emalloc(sizeof(zend_fiber_error));
 
-	error.type = orig_type;
-	error.filename = error_filename;
-	error.lineno = error_lineno;
-	error.message = message;
+	error->type = orig_type;
+	error->filename = error_filename;
+	error->lineno = error_lineno;
+	error->message = message;
 
-	EG(fiber_error) = &error;
+	EG(fiber_error) = error;
 
 	zend_fiber_suspend(EG(current_fiber));
 

Zend/zend_fibers.h

@@ -101,7 +101,7 @@ const char *zend_fiber_backend_info(void);
 ZEND_API zend_bool zend_fiber_init_context(zend_fiber_context *context, zend_fiber_coroutine coroutine, size_t stack_size);
 ZEND_API void zend_fiber_destroy_context(zend_fiber_context *context);
 
-ZEND_COLD ZEND_NORETURN void zend_error_suspend_fiber(
+ZEND_COLD void zend_error_suspend_fiber(
 		int orig_type, const char *error_filename, uint32_t error_lineno, zend_string *message);
 
 ZEND_API void zend_fiber_switch_context(zend_fiber_context *to);