Handle stack overflow on the top level too

Author: msimacek

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

@@ -62,13 +62,15 @@
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
+import com.oracle.graal.python.nodes.statement.ExceptionHandlingStatementNode;
 import com.oracle.graal.python.runtime.ExecutionContext.IndirectCalleeContext;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonCore;
 import com.oracle.graal.python.runtime.PythonOptions;
 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.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -89,6 +91,7 @@ public class TopLevelExceptionHandler extends RootNode {
     @Child private LookupAndCallUnaryNode callStrNode = LookupAndCallUnaryNode.create(__STR__);
     @Child private CallNode exceptionHookCallNode = CallNode.create();
     @Child private GetExceptionTracebackNode getExceptionTracebackNode;
+    @Child private PythonObjectFactory pythonObjectFactory;
 
     public TopLevelExceptionHandler(PythonLanguage language, RootNode child) {
         super(language);
@@ -112,6 +115,14 @@ private PythonContext getContext() {
         return context.get();
     }
 
+    private PythonObjectFactory factory() {
+        if (pythonObjectFactory == null) {
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            pythonObjectFactory = insert(PythonObjectFactory.create());
+        }
+        return pythonObjectFactory;
+    }
+
     @Override
     public Object execute(VirtualFrame frame) {
         if (exception != null) {
@@ -129,7 +140,15 @@ public Object execute(VirtualFrame frame) {
                     printStackTrace(e);
                 }
                 return null;
-            } catch (Exception | StackOverflowError e) {
+            } catch (StackOverflowError e) {
+                PException pe = ExceptionHandlingStatementNode.createRecursionError(e, factory(), this);
+                PBaseException pythonException = pe.getExceptionObject();
+                printExc(frame, pythonException);
+                if (getContext().getOption(PythonOptions.WithJavaStacktrace)) {
+                    printStackTrace(e);
+                }
+                return null;
+            } catch (Exception e) {
                 boolean exitException = e instanceof TruffleException && ((TruffleException) e).isExit();
                 if (!exitException) {
                     ExceptionUtils.printPythonLikeStackTrace(e);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/ExceptionHandlingStatementNode.java

@@ -57,6 +57,7 @@
 import com.oracle.truffle.api.TruffleException;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.profiles.LoopConditionProfile;
 
@@ -195,16 +196,16 @@ private PException wrapJavaException(Throwable e) {
 
     protected PException wrapJavaExceptionIfApplicable(Throwable e) {
         if (e instanceof StackOverflowError) {
-            return createRecursionError(e);
+            return createRecursionError(e, factory(), this);
         }
         if (shouldCatchAllExceptions() && (e instanceof Exception || e instanceof AssertionError)) {
             return wrapJavaException(e);
         }
         return null;
     }
 
-    private PException createRecursionError(Throwable e) {
-        PException pe = PException.fromObject(factory().createBaseException(RecursionError, "maximum recursion depth exceeded", new Object[]{}), this);
+    public static PException createRecursionError(Throwable e, PythonObjectFactory factory, Node location) {
+        PException pe = PException.fromObject(factory.createBaseException(RecursionError, "maximum recursion depth exceeded", new Object[]{}), location);
         moveTruffleStackTrace(e, pe);
         return pe;
     }