[GR-28924] Introduce raiseUncached methods

PullRequest: graalpython/1602

Author: msimacek

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

@@ -2862,42 +2862,42 @@ static void setCurrentException(Frame frame, PException e,
     @GenerateUncached
     public abstract static class PRaiseNativeNode extends Node {
 
-        public final int raiseInt(Frame frame, int errorValue, Object errType, String format, Object... arguments) {
+        public final int raiseInt(Frame frame, int errorValue, PythonBuiltinClassType errType, String format, Object... arguments) {
             return executeInt(frame, errorValue, errType, format, arguments);
         }
 
-        public final Object raise(Frame frame, Object errorValue, Object errType, String format, Object... arguments) {
+        public final Object raise(Frame frame, Object errorValue, PythonBuiltinClassType errType, String format, Object... arguments) {
             return execute(frame, errorValue, errType, format, arguments);
         }
 
-        public final int raiseIntWithoutFrame(int errorValue, Object errType, String format, Object... arguments) {
+        public final int raiseIntWithoutFrame(int errorValue, PythonBuiltinClassType errType, String format, Object... arguments) {
             return executeInt(null, errorValue, errType, format, arguments);
         }
 
-        public abstract Object execute(Frame frame, Object errorValue, Object errType, String format, Object[] arguments);
+        public abstract Object execute(Frame frame, Object errorValue, PythonBuiltinClassType errType, String format, Object[] arguments);
 
-        public abstract int executeInt(Frame frame, int errorValue, Object errType, String format, Object[] arguments);
+        public abstract int executeInt(Frame frame, int errorValue, PythonBuiltinClassType errType, String format, Object[] arguments);
 
         @Specialization
-        static int doInt(Frame frame, int errorValue, Object errType, String format, Object[] arguments,
+        static int doInt(Frame frame, int errorValue, PythonBuiltinClassType errType, String format, Object[] arguments,
                         @Shared("raiseNode") @Cached PRaiseNode raiseNode,
                         @Shared("transformExceptionToNativeNode") @Cached TransformExceptionToNativeNode transformExceptionToNativeNode) {
             raiseNative(frame, errType, format, arguments, raiseNode, transformExceptionToNativeNode);
             return errorValue;
         }
 
         @Specialization
-        static Object doObject(Frame frame, Object errorValue, Object errType, String format, Object[] arguments,
+        static Object doObject(Frame frame, Object errorValue, PythonBuiltinClassType errType, String format, Object[] arguments,
                         @Shared("raiseNode") @Cached PRaiseNode raiseNode,
                         @Shared("transformExceptionToNativeNode") @Cached TransformExceptionToNativeNode transformExceptionToNativeNode) {
             raiseNative(frame, errType, format, arguments, raiseNode, transformExceptionToNativeNode);
             return errorValue;
         }
 
-        public static void raiseNative(Frame frame, Object errType, String format, Object[] arguments, PRaiseNode raiseNode,
+        public static void raiseNative(Frame frame, PythonBuiltinClassType errType, String format, Object[] arguments, PRaiseNode raiseNode,
                         TransformExceptionToNativeNode transformExceptionToNativeNode) {
             try {
-                throw raiseNode.execute(errType, PNone.NO_VALUE, format, arguments);
+                throw raiseNode.raise(errType, format, arguments);
             } catch (PException p) {
                 transformExceptionToNativeNode.execute(frame, p);
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContextFunctions.java

@@ -135,7 +135,6 @@
 import com.oracle.graal.python.runtime.sequence.PSequence;
 import com.oracle.graal.python.runtime.sequence.storage.ObjectSequenceStorage;
 import com.oracle.graal.python.util.OverflowException;
-import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
@@ -755,7 +754,7 @@ Object execute(Object[] arguments,
 
             // Unfortunately, the HPyRaiseNode is not suitable because it expects a String message.
             try {
-                throw raiseNode.execute(errType, PNone.NO_VALUE, errorMessage, PythonUtils.EMPTY_OBJECT_ARRAY);
+                throw raiseNode.raise(errType, errorMessage);
             } catch (PException p) {
                 transformExceptionToNativeNode.execute(context, p);
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyNodes.java

@@ -236,7 +236,8 @@ static int doInt(Frame frame, GraalHPyContext nativeContext, int errorValue, Obj
                         @Shared("raiseNode") @Cached PRaiseNode raiseNode,
                         @Shared("transformExceptionToNativeNode") @Cached HPyTransformExceptionToNativeNode transformExceptionToNativeNode) {
             try {
-                throw raiseNode.execute(errType, PNone.NO_VALUE, format, arguments);
+                // TODO Should properly construct the exception using its constructor
+                throw raiseNode.execute(raiseNode, errType, PNone.NO_VALUE, format, arguments);
             } catch (PException p) {
                 transformExceptionToNativeNode.execute(frame, nativeContext, p);
             }
@@ -248,7 +249,8 @@ static Object doObject(Frame frame, GraalHPyContext nativeContext, Object errorV
                         @Shared("raiseNode") @Cached PRaiseNode raiseNode,
                         @Shared("transformExceptionToNativeNode") @Cached HPyTransformExceptionToNativeNode transformExceptionToNativeNode) {
             try {
-                throw raiseNode.execute(errType, PNone.NO_VALUE, format, arguments);
+                // TODO Should properly construct the exception using its constructor
+                throw raiseNode.execute(raiseNode, errType, PNone.NO_VALUE, format, arguments);
             } catch (PException p) {
                 transformExceptionToNativeNode.execute(frame, nativeContext, p);
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PNodeWithRaise.java

@@ -66,7 +66,7 @@ public PException raise(PythonBuiltinClassType type, String string) {
         return getRaiseNode().raise(type, string);
     }
 
-    public PException raise(Object exceptionType) {
+    public PException raise(PythonBuiltinClassType exceptionType) {
         return getRaiseNode().raise(exceptionType);
     }