Ticket #40590: patch-revert-409a6db3.diff

glib/gmessages.h

@@ -125 +125 @@
 GLIB_AVAILABLE_IN_ALL
 void g_return_if_fail_warning (const char *log_domain,
                                const char *pretty_function,
-                               const char *expression) G_ANALYZER_NORETURN;
+                               const char *expression);
 GLIB_AVAILABLE_IN_ALL
 void g_warn_message           (const char     *domain,
                                const char     *file,
                                int             line,
                                const char     *func,
-                               const char     *warnexpr) G_ANALYZER_NORETURN;
+                               const char     *warnexpr);
 GLIB_DEPRECATED
 void g_assert_warning         (const char *log_domain,
                                const char *file,
@@ -143 +143 @@
 #ifndef G_LOG_DOMAIN
 #define G_LOG_DOMAIN    ((gchar*) 0)
 #endif  /* G_LOG_DOMAIN */
-
-#if defined(G_HAVE_ISO_VARARGS) && !G_ANALYZER_ANALYZING
+#ifdef G_HAVE_ISO_VARARGS
 /* for(;;) ; so that GCC knows that control doesn't go past g_error().
  * Put space before ending semicolon to avoid C++ build warnings.
  */
@@ -167 +166 @@
 #define g_debug(...)    g_log (G_LOG_DOMAIN,         \
                                G_LOG_LEVEL_DEBUG,    \
                                __VA_ARGS__)
-#elif defined(G_HAVE_GNUC_VARARGS)  && !G_ANALYZER_ANALYZING
+#elif defined(G_HAVE_GNUC_VARARGS)
 #define g_error(format...)    G_STMT_START {                 \
                                 g_log (G_LOG_DOMAIN,         \
                                        G_LOG_LEVEL_ERROR,    \
@@ -190 +189 @@
 #else   /* no varargs macros */
 static void
 g_error (const gchar *format,
-         ...) G_ANALYZER_NORETURN
+         ...)
 {
   va_list args;
   va_start (args, format);
@@ -210 +209 @@
 }
 static void
 g_critical (const gchar *format,
-            ...) G_ANALYZER_NORETURN
+            ...)
 {
   va_list args;
   va_start (args, format);