libgccjit: Don't abort on fatal errors

Author: antoyo

gcc/diagnostic-core.h

@@ -144,8 +144,7 @@ extern void error_at (rich_location *, const char *, ...)
 extern void error_meta (rich_location *, const diagnostic_metadata &,
 			const char *, ...)
   ATTRIBUTE_GCC_DIAG(3,4);
-extern void fatal_error (location_t, const char *, ...) ATTRIBUTE_GCC_DIAG(2,3)
-     ATTRIBUTE_NORETURN;
+extern void fatal_error (location_t, const char *, ...) ATTRIBUTE_GCC_DIAG(2,3);
 /* Pass one of the OPT_W* from options.h as the second parameter.  */
 extern bool pedwarn (location_t,
 		     diagnostic_option_id,

gcc/diagnostic-global-context.cc

@@ -502,7 +502,8 @@ fatal_error (location_t loc, const char *gmsgid, ...)
   global_dc->diagnostic_impl (&richloc, nullptr, -1, gmsgid, &ap, DK_FATAL);
   va_end (ap);
 
-  gcc_unreachable ();
+  if (!global_dc->dont_abort_on_fatal_error ())
+    gcc_unreachable ();
 }
 
 /* An internal consistency check has failed.  We make no attempt to

gcc/diagnostic.cc

@@ -996,8 +996,12 @@ diagnostic_context::action_after_output (diagnostic_t diag_kind)
       if (m_abort_on_error)
 	real_abort ();
       fnotice (stderr, "compilation terminated.\n");
-      finish ();
-      exit (FATAL_EXIT_CODE);
+      if (!m_dont_abort_on_fatal_error)
+      {
+        finish ();
+        exit (FATAL_EXIT_CODE);
+      }
+      break;
 
     default:
       gcc_unreachable ();

gcc/diagnostic.h

@@ -830,6 +830,18 @@ class diagnostic_context
     m_abort_on_error = val;
   }
 
+  void
+  set_dont_abort_on_fatal_error (bool val)
+  {
+    m_dont_abort_on_fatal_error = val;
+  }
+
+  bool
+  dont_abort_on_fatal_error () const
+  {
+    return m_dont_abort_on_fatal_error;
+  }
+
 private:
   void error_recursion () ATTRIBUTE_NORETURN;
 
@@ -889,6 +901,9 @@ class diagnostic_context
   /* True if we should raise a SIGABRT on errors.  */
   bool m_abort_on_error;
 
+  /* True if we should not abort on fatal errors. Mainly used for libgccjit.  */
+  bool m_dont_abort_on_fatal_error = false;
+
 public:
   /* True if we should show the column number on diagnostics.  */
   bool m_show_column;

gcc/jit/dummy-frontend.cc

@@ -1020,6 +1020,7 @@ class jit_diagnostic_listener : public diagnostic_text_output_format
   : diagnostic_text_output_format (dc),
     m_playback_ctxt (playback_ctxt)
   {
+    dc.set_dont_abort_on_fatal_error (true);
   }
 
   void dump (FILE *out, int indent) const final override