Move logic of _PyTruffleErr_Occurred into helper node

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextErrBuiltins.java

@@ -83,6 +83,7 @@
 import com.oracle.graal.python.builtins.modules.cext.PythonCextFileBuiltins.PyFile_WriteObject;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ClearCurrentExceptionNode;
+import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PyErrOccurredNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.TransformExceptionToNativeNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.PThreadState;
 import com.oracle.graal.python.builtins.objects.cext.common.NativePointer;
@@ -93,7 +94,6 @@
 import com.oracle.graal.python.builtins.objects.exception.PBaseException;
 import com.oracle.graal.python.builtins.objects.exception.PrepareExceptionNode;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
-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.LazyTraceback;
 import com.oracle.graal.python.builtins.objects.traceback.MaterializeLazyTracebackNode;
@@ -102,7 +102,6 @@
 import com.oracle.graal.python.builtins.objects.tuple.TupleBuiltins;
 import com.oracle.graal.python.builtins.objects.tuple.TupleBuiltins.GetItemNode;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.IsTypeNode;
-import com.oracle.graal.python.lib.PyErrExceptionMatchesNode;
 import com.oracle.graal.python.lib.PyObjectCallMethodObjArgs;
 import com.oracle.graal.python.lib.PyObjectGetAttr;
 import com.oracle.graal.python.lib.PyObjectLookupAttr;
@@ -224,14 +223,10 @@ Object run(
     abstract static class _PyTruffleErr_Occurred extends CApiUnaryBuiltinNode {
         @Specialization
         Object run(PThreadState state,
-                        @Bind("this") Node inliningTarget,
-                        @Cached GetClassNode getClassNode) {
-            PException currentException = state.getThreadState().getCurrentException();
-            if (currentException != null) {
-                // getClassNode acts as a branch profile
-                return getClassNode.execute(inliningTarget, currentException.getUnreifiedException());
-            }
-            return getNativeNull();
+                   @Bind("this") Node inliningTarget,
+                   @Cached PyErrOccurredNode pyErrOccurredNode) {
+            Object excType = pyErrOccurredNode.execute(inliningTarget, state.getThreadState());
+            return excType != null ? excType : getNativeNull();
         }
     }
 
@@ -425,7 +420,6 @@ abstract static class PyErr_PrintEx extends CApiUnaryBuiltinNode {
         @TruffleBoundary
         @Specialization
         static Object raise(int set_sys_last_vars,
-                        @Cached _PyTruffleErr_Occurred errOccuredNode,
                         @Cached TupleBuiltins.GetItemNode getItemNode,
                         @Cached IsInstanceNode isInstanceNode,
                         @Cached ExcInfoNode excInfoNode,
@@ -437,7 +431,7 @@ static Object raise(int set_sys_last_vars,
             PythonContext context = PythonContext.get(null);
             NativePointer nativeNull = context.getNativeNull();
 
-            Object err = errOccuredNode.execute(context.getThreadState(PythonLanguage.get(null)));
+            Object err = PyErrOccurredNode.executeUncached(context.getThreadState(PythonLanguage.get(null)));
             PythonModule sys = context.getSysModule();
             if (err != nativeNull && IsBuiltinObjectProfile.profileObjectUncached(err, PythonBuiltinClassType.SystemExit)) {
                 handleSystemExit(excInfoNode, getItemNode, isInstanceNode, restoreNode, (SysModuleBuiltins) sys.getBuiltins(), writeFileNode, exitNode);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CExtNodes.java

@@ -87,6 +87,7 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.AsCharPointerNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.CreateFunctionNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.FromCharPointerNodeGen;
+import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.PyErrOccurredNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.ResolvePointerNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.capi.ExternalFunctionNodes.DefaultCheckFunctionResultNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.ExternalFunctionNodes.PExternalFunctionWrapper;
@@ -1068,7 +1069,7 @@ public final PException getCurrentExceptionForReraise(Node inliningTarget, Pytho
         }
 
         @Specialization
-        static void doGeneric(Node inliningTarget, PythonThreadState threadState,
+        static void doGeneric(PythonThreadState threadState,
                         @Cached(inline = false) CStructAccess.WritePointerNode writePointerNode) {
             threadState.clearCurrentException();
             PThreadState nativeWrapper = threadState.getNativeWrapper();
@@ -1079,6 +1080,29 @@ static void doGeneric(Node inliningTarget, PythonThreadState threadState,
         }
     }
 
+    @GenerateInline
+    @GenerateCached(false)
+    @GenerateUncached
+    public abstract static class PyErrOccurredNode extends Node {
+
+        public static Object executeUncached(PythonThreadState threadState) {
+            return PyErrOccurredNodeGen.getUncached().execute(null, threadState);
+        }
+
+        public abstract Object execute(Node inliningTarget, PythonThreadState threadState);
+
+        @Specialization
+        static Object doGeneric(Node inliningTarget, PythonThreadState threadState,
+                        @Cached GetClassNode getClassNode) {
+            PException currentException = threadState.getCurrentException();
+            if (currentException != null) {
+                // getClassNode acts as a branch profile
+                return getClassNode.execute(inliningTarget, currentException.getUnreifiedException());
+            }
+            return null;
+        }
+    }
+
     @GenerateUncached
     @GenerateCached
     @GenerateInline(false)