Fix function attributes in exception.c

Author: Albin Ahlbäck

src/generic_files/exception.c

@@ -14,13 +14,6 @@
 #include <stdarg.h>
 #include "flint.h"
 
-#undef FLINT_NORETURN
-#if defined(__GNUC__)
-# define FLINT_NORETURN __attribute__((noreturn))
-#else
-# define FLINT_NORETURN
-#endif
-
 FLINT_NORETURN static void __flint_throw(flint_err_t, const char *, va_list);
 
 #if FLINT_REENTRANT && !FLINT_USES_TLS && FLINT_USES_PTHREAD
@@ -41,10 +34,10 @@ void __flint_set_throw_init(void)
 }
 #endif
 
-FLINT_NORETURN void (* abort_func)(void) = abort;
-FLINT_NORETURN void (* throw_func)(flint_err_t, const char *, va_list) = __flint_throw;
+void (* abort_func)(void) = abort;
+void (* throw_func)(flint_err_t, const char *, va_list) = __flint_throw;
 
-void flint_set_abort(void (* func)(void) FLINT_NORETURN)
+void flint_set_abort(void (* func)(void))
 {
 #if FLINT_REENTRANT && !FLINT_USES_TLS && FLINT_USES_PTHREAD
     pthread_once(&abort_func_init, __flint_set_abort_init);
@@ -56,7 +49,7 @@ void flint_set_abort(void (* func)(void) FLINT_NORETURN)
 #endif
 }
 
-void flint_set_throw(void (* func)(flint_err_t, const char *, va_list) FLINT_NORETURN)
+void flint_set_throw(void (* func)(flint_err_t, const char *, va_list))
 {
 #if FLINT_REENTRANT && !FLINT_USES_TLS && FLINT_USES_PTHREAD
     pthread_once(&throw_func_init, __flint_set_throw_init);
@@ -116,11 +109,13 @@ FLINT_NORETURN void flint_abort(void)
     fflush(stdout);
     fflush(stderr);
     (*abort_func)();
+    FLINT_UNREACHABLE;
 }
 
 FLINT_NORETURN void flint_throw(flint_err_t exc, const char * msg, ...)
 {
     va_list ap;
     va_start(ap, msg);
     (*throw_func)(exc, msg, ap);
+    FLINT_UNREACHABLE;
 }