Wrap OOM into Python MemoryError in PBytecodeRootNode and in TopLevelExceptionHandler

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeRootNode.java

@@ -40,7 +40,6 @@
  */
 package com.oracle.graal.python.nodes.bytecode;
 
-import static com.oracle.graal.python.builtins.PythonBuiltinClassType.RecursionError;
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.SystemError;
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.ValueError;
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.ZeroDivisionError;
@@ -4645,12 +4644,7 @@ protected PException wrapJavaExceptionIfApplicable(Throwable e) {
         if (PythonLanguage.get(this).getEngineOption(PythonOptions.CatchAllExceptions) && (e instanceof Exception || e instanceof AssertionError)) {
             return ExceptionUtils.wrapJavaException(e, this, factory.createBaseException(SystemError, ErrorMessages.M, new Object[]{e}));
         }
-        if (e instanceof StackOverflowError) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            PythonContext.get(this).reacquireGilAfterStackOverflow();
-            return ExceptionUtils.wrapJavaException(e, this, factory.createBaseException(RecursionError, ErrorMessages.MAXIMUM_RECURSION_DEPTH_EXCEEDED, new Object[]{}));
-        }
-        return null;
+        return ExceptionUtils.wrapJavaExceptionIfApplicable(this, e, factory);
     }
 
     @ExplodeLoop

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/exception/TopLevelExceptionHandler.java

@@ -40,7 +40,6 @@
  */
 package com.oracle.graal.python.nodes.exception;
 
-import static com.oracle.graal.python.builtins.PythonBuiltinClassType.RecursionError;
 import static com.oracle.graal.python.builtins.modules.io.IONodes.T_WRITE;
 import static com.oracle.graal.python.nodes.BuiltinNames.T_SYS;
 import static com.oracle.graal.python.runtime.exception.ExceptionUtils.printToStdErr;
@@ -58,7 +57,6 @@
 import com.oracle.graal.python.lib.PyObjectCallMethodObjArgs;
 import com.oracle.graal.python.lib.PyObjectStrAsObjectNode;
 import com.oracle.graal.python.nodes.BuiltinNames;
-import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.bytecode.PBytecodeRootNode;
 import com.oracle.graal.python.nodes.object.BuiltinClassProfiles.IsBuiltinClassProfile;
 import com.oracle.graal.python.nodes.object.GetClassNode;
@@ -73,6 +71,7 @@
 import com.oracle.graal.python.runtime.exception.ExceptionUtils;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.exception.PythonExitException;
+import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -151,13 +150,6 @@ public Object execute(VirtualFrame frame) {
                         return handleChildContextExit(managedException);
                     }
                     throw handlePythonException(e);
-                } catch (StackOverflowError e) {
-                    CompilerDirectives.transferToInterpreter();
-                    PythonContext context = getContext();
-                    context.reacquireGilAfterStackOverflow();
-                    PBaseException newException = context.factory().createBaseException(RecursionError, ErrorMessages.MAXIMUM_RECURSION_DEPTH_EXCEEDED, new Object[]{});
-                    PException pe = ExceptionUtils.wrapJavaException(e, this, newException);
-                    throw handlePythonException(pe);
                 } catch (ThreadDeath e) {
                     // do not handle, result of TruffleContext.closeCancelled()
                     throw e;
@@ -218,6 +210,10 @@ private static boolean isSystemExit(PBaseException pythonException) {
 
     @TruffleBoundary
     private void handleJavaException(Throwable e) {
+        PException pe = ExceptionUtils.wrapJavaExceptionIfApplicable(this, e, PythonObjectFactory.getUncached());
+        if (pe != null) {
+            throw handlePythonException(pe);
+        }
         try {
             boolean exitException = InteropLibrary.getUncached().isException(e) && InteropLibrary.getUncached().getExceptionType(e) == ExceptionType.EXIT;
             if (!exitException) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/exception/ExceptionUtils.java

@@ -40,6 +40,8 @@
  */
 package com.oracle.graal.python.runtime.exception;
 
+import static com.oracle.graal.python.builtins.PythonBuiltinClassType.MemoryError;
+import static com.oracle.graal.python.builtins.PythonBuiltinClassType.RecursionError;
 import static com.oracle.graal.python.nodes.BuiltinNames.T_SYS;
 
 import java.io.IOException;
@@ -54,15 +56,18 @@
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.traceback.LazyTraceback;
 import com.oracle.graal.python.nodes.BuiltinNames;
+import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.bytecode.FrameInfo;
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.exception.TopLevelExceptionHandler;
 import com.oracle.graal.python.nodes.function.BuiltinFunctionRootNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.runtime.PythonContext;
+import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.HostCompilerDirectives.InliningCutoff;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleStackTrace;
@@ -263,4 +268,18 @@ public static void printJavaStackTrace(PException e) {
     public static PException wrapJavaException(Throwable e, Node node, PBaseException pythonException) {
         return PException.fromObject(pythonException, node, e);
     }
+
+    @InliningCutoff
+    public static PException wrapJavaExceptionIfApplicable(Node location, Throwable e, PythonObjectFactory factory) {
+        if (e instanceof StackOverflowError) {
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            PythonContext.get(null).reacquireGilAfterStackOverflow();
+            return ExceptionUtils.wrapJavaException(e, location, factory.createBaseException(RecursionError, ErrorMessages.MAXIMUM_RECURSION_DEPTH_EXCEEDED, new Object[]{}));
+        }
+        if (e instanceof OutOfMemoryError) {
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            return ExceptionUtils.wrapJavaException(e, location, factory.createBaseException(MemoryError));
+        }
+        return null;
+    }
 }