Use PrepareExceptionNode in PyErr_Restore

Author: msimacek

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

@@ -108,7 +108,6 @@
 import com.oracle.graal.python.nodes.attributes.WriteAttributeToObjectNode;
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
-import com.oracle.graal.python.nodes.exception.ValidExceptionNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.nodes.object.IsNode;
 import com.oracle.graal.python.nodes.util.ExceptionStateNodes.GetCaughtExceptionNode;
@@ -118,7 +117,6 @@
 import com.oracle.graal.python.runtime.exception.ExceptionUtils;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
@@ -133,47 +131,31 @@ public final class PythonCextErrBuiltins {
 
     @CApiBuiltin(ret = Void, args = {PyObject, PyObject, PyObject}, call = Direct)
     abstract static class PyErr_Restore extends CApiTernaryBuiltinNode {
-        @Specialization
+
+        @Specialization(guards = {"isNoValue(typ)", "isNoValue(val)"})
         @SuppressWarnings("unused")
-        Object run(PNone typ, PNone val, PNone tb) {
+        Object restore(PNone typ, PNone val, Object tb) {
             getContext().setCurrentException(getLanguage(), null);
-            return PNone.NONE;
-        }
-
-        @Specialization
-        Object run(@SuppressWarnings("unused") Object typ, PBaseException val, @SuppressWarnings("unused") PNone tb) {
-            PythonContext context = getContext();
-            PythonLanguage language = getLanguage();
-            context.setCurrentException(language, PException.fromExceptionInfo(val, (LazyTraceback) null, PythonOptions.isPExceptionWithJavaStacktrace(language)));
-            return PNone.NONE;
+            return PNone.NO_VALUE;
         }
 
-        @Specialization
-        Object run(@SuppressWarnings("unused") Object typ, PBaseException val, PTraceback tb) {
+        @Fallback
+        Object restore(Object typ, Object val, Object tb,
+                        @Cached PrepareExceptionNode prepareExceptionNode) {
             PythonContext context = getContext();
             PythonLanguage language = getLanguage();
-            context.setCurrentException(language, PException.fromExceptionInfo(val, tb, PythonOptions.isPExceptionWithJavaStacktrace(language)));
-            return PNone.NONE;
-        }
-
-        @Specialization(guards = "!isPBaseException(value)")
-        Object createAndSet(Object type, Object value, @SuppressWarnings("unused") PNone tb,
-                        @Cached ValidExceptionNode isExcNode,
-                        @Cached CallNode callConstructor) {
-            if (isExcNode.execute(null, type)) {
-                PBaseException ex = (PBaseException) callConstructor.execute(type, value);
-                PythonLanguage language = PythonLanguage.get(this);
-                PythonContext.get(this).setCurrentException(language,
-                                PException.fromExceptionInfo(ex, (LazyTraceback) null, PythonOptions.isPExceptionWithJavaStacktrace(language)));
-                return PNone.NONE;
-            } else {
-                // CPython just saves all three values, only ensuring that tb is either NULL or a
-                // PyTraceBack. Throwing here would be incorrect, since it's valid to set
-                // "unnormalized" exception values and use PyErr_NormalizeException later. And even
-                // that just keeps going when the type is not an exception. Not sure what the use
-                // cases are for that, so for now we ignore it.
-                throw CompilerDirectives.shouldNotReachHere("unnormalized exceptions cannot be stored");
+            PBaseException exception;
+            try {
+                exception = prepareExceptionNode.execute(null, typ, val);
+            } catch (PException e) {
+                context.setCurrentException(language, e);
+                return PNone.NO_VALUE;
             }
+            if (tb instanceof PTraceback pTraceback) {
+                exception.setTraceback(pTraceback);
+            }
+            context.setCurrentException(language, PException.fromExceptionInfo(exception, (LazyTraceback) null, PythonOptions.isPExceptionWithJavaStacktrace(language)));
+            return PNone.NO_VALUE;
         }
     }