Make sure that rethrown RecursionError collects lazy frames

Author: msimacek

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

@@ -40,6 +40,7 @@
  */
 package com.oracle.graal.python.nodes.control;
 
+import static com.oracle.graal.python.builtins.PythonBuiltinClassType.RecursionError;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__STR__;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.SystemExit;
 
@@ -141,7 +142,7 @@ public Object execute(VirtualFrame frame) {
                 }
                 return null;
             } catch (StackOverflowError e) {
-                PException pe = ExceptionHandlingStatementNode.createRecursionError(e, factory(), this);
+                PException pe = ExceptionHandlingStatementNode.wrapJavaException(e, this, factory().createBaseException(RecursionError, "maximum recursion depth exceeded", new Object[]{}));
                 PBaseException pythonException = pe.getExceptionObject();
                 printExc(frame, pythonException);
                 if (getContext().getOption(PythonOptions.WithJavaStacktrace)) {

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

@@ -41,6 +41,7 @@
 package com.oracle.graal.python.nodes.statement;
 
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.RecursionError;
+import static com.oracle.graal.python.runtime.exception.PythonErrorType.SystemError;
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.exception.PBaseException;
@@ -49,7 +50,6 @@
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.exception.PException;
-import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
@@ -187,41 +187,31 @@ protected boolean shouldCatchAllExceptions() {
         return shouldCatchAllExceptions;
     }
 
-    private PException wrapJavaException(Throwable e) {
-        PException pe = PException.fromObject(getBaseException(e), this);
+    public static PException wrapJavaException(Throwable e, Node node, PBaseException pythonException) {
+        PException pe = PException.fromObject(pythonException, node);
         pe.setHideLocation(true);
         // Re-attach truffle stacktrace
         moveTruffleStackTrace(e, pe);
-        return pe;
+        // Create a new traceback chain, because the current one has been finalized by Truffle
+        return pe.getExceptionForReraise();
     }
 
+    @TruffleBoundary
     protected PException wrapJavaExceptionIfApplicable(Throwable e) {
         if (e instanceof StackOverflowError) {
-            return createRecursionError(e, factory(), this);
+            return wrapJavaException(e, this, factory().createBaseException(RecursionError, "maximum recursion depth exceeded", new Object[]{}));
         }
         if (shouldCatchAllExceptions() && (e instanceof Exception || e instanceof AssertionError)) {
-            return wrapJavaException(e);
+            return wrapJavaException(e, this, factory().createBaseException(SystemError, "%m", new Object[]{e}));
         }
         return null;
     }
 
-    public static PException createRecursionError(Throwable e, PythonObjectFactory factory, Node location) {
-        PException pe = PException.fromObject(factory.createBaseException(RecursionError, "maximum recursion depth exceeded", new Object[]{}), location);
-        pe.setHideLocation(true);
-        moveTruffleStackTrace(e, pe);
-        return pe;
-    }
-
     @TruffleBoundary
     private static void moveTruffleStackTrace(Throwable e, PException pe) {
         pe.initCause(e.getCause());
         // Host exceptions have their stacktrace already filled in, call this to set
         // the cutoff point to the catch site
         pe.getTruffleStackTrace();
     }
-
-    @TruffleBoundary
-    private PBaseException getBaseException(Throwable e) {
-        return factory().createBaseException(PythonErrorType.SystemError, "%m", new Object[]{e});
-    }
 }