Move PException.chainException to a node

msimacek · msimacek · commit 3f2a6ac92eaa · 2023-06-26T16:01:34.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/BufferedIOMixinBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/BufferedIOMixinBuiltins.java
@@ -92,6 +92,7 @@
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.str.StringUtils.SimpleTruffleStringFormatNode;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes;
+import com.oracle.graal.python.lib.PyErrChainExceptions;
 import com.oracle.graal.python.lib.PyObjectCallMethodObjArgs;
 import com.oracle.graal.python.lib.PyObjectGetAttr;
 import com.oracle.graal.python.lib.PyObjectLookupAttr;
@@ -152,7 +153,8 @@ static Object doit(VirtualFrame frame, PBuffered self,
                         @Cached PyObjectCallMethodObjArgs callMethodClose,
                         @Cached PyObjectCallMethodObjArgs callMethodDeallocWarn,
                         @Cached EnterBufferedNode lock,
-                        @Cached InlinedConditionProfile profile) {
+                        @Cached InlinedConditionProfile profile,
+                        @Cached PyErrChainExceptions chainExceptions) {
             try {
                 lock.enter(inliningTarget, self);
                 if (profile.profile(inliningTarget, isClosedNode.execute(frame, inliningTarget, self))) {
@@ -173,7 +175,7 @@ static Object doit(VirtualFrame frame, PBuffered self,
                 try {
                     close(frame, inliningTarget, self, lock, callMethodClose);
                 } catch (PException ee) {
-                    throw ee.chainException(e);
+                    throw chainExceptions.execute(inliningTarget, ee, e);
                 }
                 throw e;
             }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/BufferedRWPairBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/BufferedRWPairBuiltins.java
@@ -80,6 +80,7 @@
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.lib.PyErrChainExceptions;
 import com.oracle.graal.python.lib.PyObjectCallMethodObjArgs;
 import com.oracle.graal.python.lib.PyObjectGetAttr;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
@@ -287,7 +288,8 @@ Object close(VirtualFrame frame, PRWPair self,
                         @Cached PyObjectCallMethodObjArgs callMethodReader,
                         @Cached PyObjectCallMethodObjArgs callMethodWriter,
                         @Cached InlinedConditionProfile gotException,
-                        @Cached InlinedBranchProfile hasException) {
+                        @Cached InlinedBranchProfile hasException,
+                        @Cached PyErrChainExceptions chainExceptions) {
             PException writeEx = null;
             if (self.getWriter() != null) {
                 try {
@@ -316,12 +318,12 @@ Object close(VirtualFrame frame, PRWPair self,
             }
 
             hasException.enter(inliningTarget);
-            return chainedError(writeEx, readEx, inliningTarget, gotException);
+            return chainedError(writeEx, readEx, inliningTarget, gotException, chainExceptions);
         }
 
-        static Object chainedError(PException first, PException second, Node inliningTarget, InlinedConditionProfile gotFirst) {
+        static Object chainedError(PException first, PException second, Node inliningTarget, InlinedConditionProfile gotFirst, PyErrChainExceptions chainExceptions) {
             if (gotFirst.profile(inliningTarget, first != null)) {
-                throw second.chainException(first);
+                throw chainExceptions.execute(inliningTarget, second, first);
             } else {
                 throw second;
             }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/FileIOBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/FileIOBuiltins.java
@@ -128,6 +128,7 @@
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
 import com.oracle.graal.python.builtins.objects.exception.OSErrorEnum;
 import com.oracle.graal.python.builtins.objects.str.StringUtils.SimpleTruffleStringFormatNode;
+import com.oracle.graal.python.lib.PyErrChainExceptions;
 import com.oracle.graal.python.lib.PyIndexCheckNode;
 import com.oracle.graal.python.lib.PyNumberAsSizeNode;
 import com.oracle.graal.python.lib.PyObjectCallMethodObjArgs;
@@ -904,16 +905,18 @@ Object simple(VirtualFrame frame, PFileIO self,
         }
 
         @Specialization(guards = {"self.isCloseFD()", "!self.isFinalizing()"})
-        Object common(VirtualFrame frame, PFileIO self,
+        static Object common(VirtualFrame frame, PFileIO self,
+                        @Bind("this") Node inliningTarget,
                         @Shared("c") @Cached PosixModuleBuiltins.CloseNode posixClose,
-                        @Exclusive @Shared("l") @Cached PyObjectCallMethodObjArgs callSuperClose) {
+                        @Shared("l") @Cached PyObjectCallMethodObjArgs callSuperClose,
+                        @Shared @Cached PyErrChainExceptions chainExceptions) {
             try {
-                callSuperClose.execute(frame, getContext().lookupType(PRawIOBase), T_CLOSE, self);
+                callSuperClose.execute(frame, PythonContext.get(inliningTarget).lookupType(PRawIOBase), T_CLOSE, self);
             } catch (PException e) {
                 try {
                     internalClose(frame, self, posixClose);
                 } catch (PException ee) {
-                    throw ee.chainException(e);
+                    throw chainExceptions.execute(inliningTarget, ee, e);
                 }
                 throw e;
             }
@@ -922,26 +925,29 @@ Object common(VirtualFrame frame, PFileIO self,
         }
 
         @Specialization(guards = {"self.isCloseFD()", "self.isFinalizing()"})
-        Object slow(VirtualFrame frame, PFileIO self,
+        static Object slow(VirtualFrame frame, PFileIO self,
+                        @Bind("this") Node inliningTarget,
                         @Shared("c") @Cached PosixModuleBuiltins.CloseNode posixClose,
                         @Cached WarningsModuleBuiltins.WarnNode warnNode,
-                        @Shared("l") @Cached PyObjectCallMethodObjArgs callSuperClose) {
+                        @Shared("l") @Cached PyObjectCallMethodObjArgs callSuperClose,
+                        @Shared @Cached PyErrChainExceptions chainExceptions) {
             PException rawIOException = null;
+            PythonContext context = PythonContext.get(inliningTarget);
             try {
-                callSuperClose.execute(frame, getContext().lookupType(PRawIOBase), T_CLOSE, self);
+                callSuperClose.execute(frame, context.lookupType(PRawIOBase), T_CLOSE, self);
             } catch (PException e) {
                 rawIOException = e;
             }
             try {
-                deallocWarn(frame, self, warnNode, getLanguage(), getContext());
+                deallocWarn(frame, self, warnNode, PythonLanguage.get(inliningTarget), context);
             } catch (PException e) {
                 // ignore
             }
             try {
                 internalClose(frame, self, posixClose);
             } catch (PException ee) {
                 if (rawIOException != null) {
-                    throw ee.chainException(rawIOException);
+                    throw chainExceptions.execute(inliningTarget, ee, rawIOException);
                 } else {
                     throw ee;
                 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/IOBaseBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/IOBaseBuiltins.java
@@ -97,6 +97,7 @@
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.lib.GetNextNode;
+import com.oracle.graal.python.lib.PyErrChainExceptions;
 import com.oracle.graal.python.lib.PyObjectCallMethodObjArgs;
 import com.oracle.graal.python.lib.PyObjectGetAttr;
 import com.oracle.graal.python.lib.PyObjectGetIter;
@@ -287,12 +288,13 @@ boolean doCheckWritable(VirtualFrame frame, PythonObject self,
     @GenerateNodeFactory
     abstract static class CloseNode extends PythonUnaryBuiltinNode {
         @Specialization
-        PNone close(VirtualFrame frame, PythonObject self,
+        static PNone close(VirtualFrame frame, PythonObject self,
                         @Bind("this") Node inliningTarget,
                         @Cached PyObjectCallMethodObjArgs callMethod,
                         @Cached PyObjectLookupAttr lookup,
                         @Cached("create(T___IOBASE_CLOSED)") SetAttributeNode setAttributeNode,
-                        @Cached InlinedBranchProfile errorProfile) {
+                        @Cached InlinedBranchProfile errorProfile,
+                        @Cached PyErrChainExceptions chainExceptions) {
             if (!isClosed(self, frame, lookup)) {
                 try {
                     callMethod.execute(frame, self, T_FLUSH);
@@ -301,7 +303,7 @@ PNone close(VirtualFrame frame, PythonObject self,
                     try {
                         setAttributeNode.execute(frame, self, true);
                     } catch (PException e1) {
-                        throw e1.chainException(e);
+                        throw chainExceptions.execute(inliningTarget, e1, e);
                     }
                     throw e;
                 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/TextIOWrapperBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/TextIOWrapperBuiltins.java
@@ -139,6 +139,7 @@
 import com.oracle.graal.python.builtins.objects.str.StringNodes.StringReplaceNode;
 import com.oracle.graal.python.builtins.objects.str.StringUtils.SimpleTruffleStringFormatNode;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
+import com.oracle.graal.python.lib.PyErrChainExceptions;
 import com.oracle.graal.python.lib.PyLongAsLongNode;
 import com.oracle.graal.python.lib.PyNumberAsSizeNode;
 import com.oracle.graal.python.lib.PyNumberIndexNode;
@@ -540,11 +541,13 @@ static Object flush(VirtualFrame frame, PTextIO self,
     abstract static class CloseNode extends AttachedCheckPythonUnaryBuiltinNode {
         @Specialization(guards = "checkAttached(self)")
         static Object close(VirtualFrame frame, PTextIO self,
+                        @Bind("this") Node inliningTarget,
                         @Cached ClosedNode closedNode,
                         @Cached PyObjectCallMethodObjArgs callMethodFlush,
                         @Cached PyObjectCallMethodObjArgs callMethodDeallocWarn,
                         @Cached PyObjectCallMethodObjArgs callMethodClose,
-                        @Cached PyObjectIsTrueNode isTrueNode) {
+                        @Cached PyObjectIsTrueNode isTrueNode,
+                        @Cached PyErrChainExceptions chainExceptions) {
             Object res = closedNode.execute(frame, self);
             if (isTrueNode.execute(frame, res)) {
                 return PNone.NONE;
@@ -560,7 +563,7 @@ static Object close(VirtualFrame frame, PTextIO self,
                         callMethodClose.execute(frame, self.getBuffer(), T_CLOSE);
                         throw e;
                     } catch (PException ee) {
-                        throw ee.chainException(e);
+                        throw chainExceptions.execute(inliningTarget, ee, e);
                     }
                 }
                 return callMethodClose.execute(frame, self.getBuffer(), T_CLOSE);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyErrChainExceptions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyErrChainExceptions.java
@@ -0,0 +1,33 @@
+package com.oracle.graal.python.lib;
+
+import com.oracle.graal.python.builtins.objects.exception.ExceptionNodes;
+import com.oracle.graal.python.runtime.exception.PException;
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.GenerateCached;
+import com.oracle.truffle.api.dsl.GenerateInline;
+import com.oracle.truffle.api.dsl.GenerateUncached;
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.nodes.Node;
+
+/**
+ * Equivalent of CPython's {_PyErr_ChainExceptions}. Performs a simple exception chaining without
+ * checking for cycles (not suitable to implement try-except).
+ */
+@GenerateUncached
+@GenerateInline
+@GenerateCached(false)
+public abstract class PyErrChainExceptions extends Node {
+    public final PException execute(Node inliningTarget, PException current, PException context) {
+        context.ensureReified();
+        execute(inliningTarget, current.getUnreifiedException(), context.getEscapedException());
+        return current;
+    }
+
+    abstract void execute(Node inliningTarget, Object current, Object context);
+
+    @Specialization
+    static void chain(Node inliningTarget, Object current, Object context,
+                    @Cached ExceptionNodes.SetContextNode setContextNode) {
+        setContextNode.execute(inliningTarget, current, context);
+    }
+}
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/exception/PException.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/exception/PException.java
@@ -371,17 +371,6 @@ public PException getExceptionForReraise(boolean rootNodeVisible) {
         return pe;
     }
 
-    /**
-     * Equivalent of CPython's {_PyErr_ChainExceptions}. Performs a simple exception chaining
-     * without checking for cycles (not suitable to implement try-except).
-     */
-    public PException chainException(PException e) {
-        PBaseException chainedException = e.getEscapedException();
-        chainedException.setTraceback(e.getTraceback());
-        getUnreifiedException().setContext(chainedException);
-        return this;
-    }
-
     @TruffleBoundary
     public void printStack() {
         // a convenience methods for debugging
