Fix corner case in traceback frame handling for stack overflow

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/GeneratorTryExceptNode.java

@@ -89,7 +89,9 @@ public void executeVoid(VirtualFrame frame) {
             getBody().executeVoid(frame);
         } catch (PException exception) {
             gen.setActive(frame, exceptFlag, true);
-            catchExceptionInGeneratorFirstTime(frame, exception);
+            if (!catchExceptionInGeneratorFirstTime(frame, exception)) {
+                throw exception;
+            }
             reset(frame);
             return;
         } catch (ControlFlowException e) {
@@ -98,7 +100,9 @@ public void executeVoid(VirtualFrame frame) {
             PException pe = wrapJavaExceptionIfApplicable(e);
             if (pe != null) {
                 gen.setActive(frame, exceptFlag, true);
-                catchExceptionInGeneratorFirstTime(frame, pe);
+                if (!catchExceptionInGeneratorFirstTime(frame, pe)) {
+                    throw pe.getExceptionForReraise();
+                }
                 reset(frame);
                 return;
             } else {
@@ -112,7 +116,7 @@ public void executeVoid(VirtualFrame frame) {
     }
 
     @ExplodeLoop
-    private void catchExceptionInGeneratorFirstTime(VirtualFrame frame, PException exception) {
+    private boolean catchExceptionInGeneratorFirstTime(VirtualFrame frame, PException exception) {
         boolean wasHandled = false;
         ExceptNode[] exceptNodes = getExceptNodes();
         // we haven't found the matching node, yet, start searching
@@ -132,10 +136,7 @@ private void catchExceptionInGeneratorFirstTime(VirtualFrame frame, PException e
                 }
             }
         }
-        if (!wasHandled) {
-            // we tried and haven't found a matching except node
-            throw exception;
-        }
+        return wasHandled;
     }
 
     @ExplodeLoop
@@ -173,7 +174,7 @@ private void runExceptionHandler(VirtualFrame frame, PException exception, Excep
                 throw e;
             }
             tryChainExceptionFromHandler(handlerException, exception);
-            throw handlerException;
+            throw handlerException.getExceptionForReraise();
         } finally {
             restoreExceptionState(frame, savedExceptionState);
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/GeneratorTryFinallyNode.java

@@ -112,7 +112,7 @@ public void executeVoid(VirtualFrame frame) {
             if (activeException != null) {
                 tryChainExceptionFromHandler(handlerException, activeException);
             }
-            throw handlerException;
+            throw handlerException.getExceptionForReraise();
         } finally {
             if (activeException != null) {
                 restoreExceptionState(frame, savedExceptionState);

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

@@ -70,7 +70,6 @@ public abstract class ExceptionHandlingStatementNode extends StatementNode {
     @Child private PythonObjectFactory ofactory;
     @CompilationFinal private LoopConditionProfile contextChainHandledProfile;
     @CompilationFinal private LoopConditionProfile contextChainContextProfile;
-    @CompilationFinal private Boolean shouldCatchAllExceptions;
     @CompilationFinal private ContextReference<PythonContext> contextRef;
     @CompilationFinal private LanguageReference<PythonLanguage> languageRef;
 
@@ -199,8 +198,7 @@ public static PException wrapJavaException(Throwable e, Node node, PBaseExceptio
         pe.setHideLocation(true);
         // Re-attach truffle stacktrace
         moveTruffleStackTrace(e, pe);
-        // Create a new traceback chain, because the current one has been finalized by Truffle
-        return pe.getExceptionForReraise();
+        return pe;
     }
 
     protected final PException wrapJavaExceptionIfApplicable(Throwable e) {

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

@@ -106,7 +106,7 @@ public void executeVoid(VirtualFrame frame) {
                 if (handled) {
                     return;
                 } else {
-                    throw pe;
+                    throw pe.getExceptionForReraise();
                 }
             }
             throw e;
@@ -144,7 +144,7 @@ private boolean catchException(VirtualFrame frame, TruffleException exception) {
                 throw e;
             }
             tryChainExceptionFromHandler(handlerException, exception);
-            throw handlerException;
+            throw handlerException.getExceptionForReraise();
         }
         return false;
     }

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

@@ -84,7 +84,7 @@ private void handleException(VirtualFrame frame, PException handledException) {
                 throw e;
             }
             tryChainExceptionFromHandler(handlerException, handledException);
-            throw handlerException;
+            throw handlerException.getExceptionForReraise();
         } finally {
             restoreExceptionState(frame, exceptionState);
         }

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

@@ -190,7 +190,7 @@ protected void handleException(VirtualFrame frame, Object withObject, Object exi
                 throw e;
             }
             tryChainExceptionFromHandler(handlerException, pException);
-            throw handlerException;
+            throw handlerException.getExceptionForReraise();
         } finally {
             restoreExceptionState(frame, savedExceptionState);
         }