SysModuleBuiltins.ExceptHookNode: use cached version of the GetTracebackFrameNode

Author: cosminbasca

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SysModuleBuiltins.java

@@ -839,7 +839,8 @@ abstract static class ExceptHookNode extends PythonBuiltinNode {
         static final String VALUE_UNKNOWN = "<unknown>";
         static final String NL = "\n";
 
-        @Child private TracebackBuiltins.MaterializeTruffleStacktraceNode truffleStacktraceNode;
+        @Child private TracebackBuiltins.GetTracebackFrameNode getTbNode;
+        @Child private TracebackBuiltins.MaterializeTruffleStacktraceNode materializeStacktraceNode;
 
         @CompilerDirectives.ValueType
         static final class SyntaxErrData {
@@ -859,14 +860,22 @@ static final class SyntaxErrData {
         }
 
         private PTraceback getNextTb(PTraceback traceback) {
-            if (truffleStacktraceNode == null) {
+            if (materializeStacktraceNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                truffleStacktraceNode = insert(TracebackBuiltinsFactory.MaterializeTruffleStacktraceNodeGen.create());
+                materializeStacktraceNode = insert(TracebackBuiltinsFactory.MaterializeTruffleStacktraceNodeGen.create());
             }
-            truffleStacktraceNode.execute(traceback);
+            materializeStacktraceNode.execute(traceback);
             return traceback.getNext();
         }
 
+        private PFrame getFrameTb(VirtualFrame frame, PTraceback tb) {
+            if (getTbNode == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                getTbNode = insert(TracebackBuiltins.GetTracebackFrameNode.create());
+            }
+            return getTbNode.execute(frame, tb);
+        }
+
         private static void write(VirtualFrame frame, Object file, String data) {
             PyObjectCallMethodObjArgs.getUncached().execute(frame, file, WRITE, data);
         }
@@ -875,12 +884,8 @@ private static void flush(VirtualFrame frame, Object file) {
             PyObjectCallMethodObjArgs.getUncached().execute(frame, file, FLUSH);
         }
 
-        private static PFrame getFrame(VirtualFrame frame, PTraceback tb) {
-            return TracebackBuiltins.GetTracebackFrameNode.getUncached().execute(frame, tb);
-        }
-
         private PCode getCode(VirtualFrame frame, PTraceback tb) {
-            return factory().createCode(getFrame(frame, tb).getTarget());
+            return factory().createCode(getFrameTb(frame, tb).getTarget());
         }
 
         private static Object str(VirtualFrame frame, Object value) {

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

@@ -192,10 +192,6 @@ public static GetTracebackFrameNode create() {
             return TracebackBuiltinsFactory.GetTracebackFrameNodeFactory.create(null);
         }
 
-        public static GetTracebackFrameNode getUncached() {
-            return TracebackBuiltinsFactory.GetTracebackFrameNodeFactory.getInstance().getUncachedInstance();
-        }
-
         @Specialization(guards = "hasPFrame(tb)")
         PFrame getExisting(PTraceback tb) {
             return tb.getFrame();