Do not deopt when raising FatalError

Author: fangerer

graalpython/com.oracle.graal.python.cext/src/pylifecycle.c

@@ -42,9 +42,9 @@
 
 UPCALL_ID(PyTruffle_FatalError);
 void _Py_NO_RETURN Py_FatalError(const char *msg) {
-	UPCALL_CEXT_VOID(_jls_PyTruffle_FatalError, Py_NoValue, polyglot_from_string(msg, SRC_CS), -1);
-	/* should never be reached; avoids compiler warning */
-	exit(1);
+	UPCALL_CEXT_VOID(_jls_PyTruffle_FatalError, polyglot_from_string(msg, SRC_CS), -1);
+	/* If the above upcall returns, then we just fall through to the 'abort' call. */
+	abort();
 }
 
 PyOS_sighandler_t PyOS_setsig(int sig, PyOS_sighandler_t handler) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PythonCextBuiltins.java

@@ -3013,17 +3013,20 @@ Object doIt(Object clazz, String name, PTuple mroTuple,
         }
     }
 
-    @Builtin(name = "PyTruffle_FatalError", minNumOfPositionalArgs = 3)
+    @Builtin(name = "PyTruffle_FatalError", parameterNames = {"prefix", "msg", "status"})
     @GenerateNodeFactory
     @TypeSystemReference(PythonTypes.class)
     public abstract static class PyTruffle_FatalError extends PythonBuiltinNode {
 
         @Specialization
+        @TruffleBoundary
         Object doStrings(String prefix, String msg, int status) {
-            throw CExtCommonNodes.fatalError(this, getContext(), prefix, msg, status);
+            CExtCommonNodes.fatalError(this, PythonLanguage.getContext(), prefix, msg, status);
+            return PNone.NONE;
         }
 
         @Specialization
+        @TruffleBoundary
         Object doGeneric(Object prefixObj, Object msgObj, int status) {
             String prefix = prefixObj == PNone.NO_VALUE ? null : (String) prefixObj;
             String msg = msgObj == PNone.NO_VALUE ? null : (String) msgObj;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/CExtCommonNodes.java

@@ -116,11 +116,10 @@
 import com.oracle.truffle.api.profiles.BranchProfile;
 
 public abstract class CExtCommonNodes {
-
     private static final int SIGABRT_EXIT_CODE = 134;
 
     @TruffleBoundary
-    public static PythonExitException fatalError(Node location, PythonContext context, String prefix, String msg, int status) {
+    public static void fatalError(Node location, PythonContext context, String prefix, String msg, int status) {
         PrintWriter stderr = new PrintWriter(context.getStandardErr());
         stderr.print("Fatal Python error: ");
         if (prefix != null) {
@@ -137,7 +136,8 @@ public static PythonExitException fatalError(Node location, PythonContext contex
 
         if (status < 0) {
             // In CPython, this will use 'abort()' which sets a special exit code.
-            throw new PythonExitException(location, SIGABRT_EXIT_CODE);
+            System.exit(SIGABRT_EXIT_CODE);
+            throw CompilerDirectives.shouldNotReachHere();
         }
         throw new PythonExitException(location, status);
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContextFunctions.java

@@ -890,7 +890,8 @@ Object execute(Object[] arguments,
                     // ignore
                 }
             }
-            throw CExtCommonNodes.fatalError(asContextNode, context.getContext(), null, errorMessage, -1);
+            CExtCommonNodes.fatalError(asContextNode, context.getContext(), null, errorMessage, -1);
+            throw CompilerDirectives.shouldNotReachHere();
         }
     }