Correctly create traceback from Truffle stack trace at the top level.

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/PBaseException.java

@@ -202,6 +202,7 @@ public void reifyException(PFrame pyFrame, PythonObjectFactory factory) {
      * </p>
      */
     public void reifyException(PFrame.Reference curFrameInfo) {
+        assert curFrameInfo != PFrame.Reference.EMPTY;
         traceback = null;
         curFrameInfo.markAsEscaped();
         this.frameInfo = curFrameInfo;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/traceback/TracebackBuiltins.java

@@ -43,6 +43,7 @@
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.runtime.exception.PException;
+import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleStackTrace;
 import com.oracle.truffle.api.TruffleStackTraceElement;
@@ -88,18 +89,17 @@ Object get(PTraceback self,
                         @Cached("createBinaryProfile()") ConditionProfile profile) {
             PTraceback tb = self.getNext();
             if (profile.profile(tb == null)) {
-                tb = createTracebackChain(self, materializeNode);
+                self.setNext(createTracebackChain(self.getException(), materializeNode, factory()));
+                tb = self.getNext();
             }
             assert tb != null;
             // do never expose 'NO_TRACEBACK'; it's just a marker to avoid re-evaluation
             return tb == PTraceback.NO_TRACEBACK ? PNone.NONE : tb;
         }
 
         @TruffleBoundary
-        private PTraceback createTracebackChain(PTraceback self, MaterializeFrameNode materializeNode) {
-            PTraceback tb;
+        public static PTraceback createTracebackChain(PException exception, MaterializeFrameNode materializeNode, PythonObjectFactory factory) {
             // recover the traceback from Truffle stack trace
-            PException exception = self.getException();
             PTraceback prev = PTraceback.NO_TRACEBACK;
             PTraceback cur = null;
             for (TruffleStackTraceElement element : TruffleStackTrace.getStackTrace(exception)) {
@@ -112,15 +112,13 @@ private PTraceback createTracebackChain(PTraceback self, MaterializeFrameNode ma
                     if (location != null && !location.getRootNode().isInternal()) {
                         // create the PFrame and refresh frame values
                         PFrame escapedFrame = materializeNode.execute(null, location, false, true, frame);
-                        cur = factory().createTraceback(escapedFrame, exception);
+                        cur = factory.createTraceback(escapedFrame, exception);
                         cur.setNext(prev);
                         prev = cur;
                     }
                 }
             }
-            self.setNext(cur == null ? PTraceback.NO_TRACEBACK : cur);
-            tb = self.getNext();
-            return tb;
+            return cur == null ? PTraceback.NO_TRACEBACK : cur;
         }
     }
 

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

@@ -57,6 +57,7 @@
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.traceback.PTraceback;
+import com.oracle.graal.python.builtins.objects.traceback.TracebackBuiltins.GetTracebackNextNode;
 import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
 import com.oracle.graal.python.nodes.BuiltinNames;
 import com.oracle.graal.python.nodes.argument.CreateArgumentsNode;
@@ -91,8 +92,8 @@ public class TopLevelExceptionHandler extends RootNode {
     @Child private CreateArgumentsNode createArgs = CreateArgumentsNode.create();
     @Child private LookupAndCallUnaryNode callStrNode = LookupAndCallUnaryNode.create(__STR__);
     @Child private CallNode callNode = CallNode.create();
-    @Child private PythonObjectFactory factory;
     @Child private MaterializeFrameNode materializeFrameNode = MaterializeFrameNodeGen.create();
+    @Child private PythonObjectFactory factory;
     @Child private GetTracebackNode getTracebackNode;
 
     public TopLevelExceptionHandler(PythonLanguage language, RootNode child) {
@@ -121,7 +122,11 @@ public Object execute(VirtualFrame frame) {
             try {
                 return run(frame);
             } catch (PException e) {
-                e.getExceptionObject().reifyException(materializeFrameNode.execute(frame, true), factory());
+                assert !PArguments.isPythonFrame(frame);
+                // we cannot reify at this point because we have no Python frame; so create the full
+                // traceback chain
+                PTraceback tbHead = GetTracebackNextNode.createTracebackChain(e, materializeFrameNode, factory());
+                e.getExceptionObject().setTraceback(tbHead);
                 printExc(frame, e);
                 if (PythonOptions.getOption(context.get(), PythonOptions.WithJavaStacktrace)) {
                     printStackTrace(e);