Use enum for error result

Author: fangerer

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

@@ -121,6 +121,7 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.FastCallWithKeywordsArgsToSulongNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.FromCharPointerNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.GetNativeNullNode;
+import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.MayRaiseErrorResult;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.MayRaiseNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ObjectUpcallNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PCallCapiFunction;
@@ -2424,18 +2425,18 @@ static Object doDirect(VirtualFrame frame, @SuppressWarnings("unused") PythonMod
     abstract static class MakeMayRaiseWrapperNode extends PythonBuiltinNode {
         private static final WeakHashMap<RootCallTarget, WeakReference<RootCallTarget>> weakCallTargetMap = new WeakHashMap<>();
 
-        private static final RootCallTarget createWrapperCt(PFunction func, Object errorResult) {
+        private static RootCallTarget createWrapperCt(PFunction func, MayRaiseErrorResult errorResult) {
             CompilerDirectives.transferToInterpreter();
-            assert errorResult instanceof Integer || errorResult instanceof Long || errorResult instanceof Double || errorResult == PNone.NONE ||
-                            InteropLibrary.getUncached().isNull(errorResult) : "invalid wrap";
             PythonLanguage lang = PythonLanguage.getCurrent();
             RootNode rootNode = new MayRaiseNode(lang, func.getSignature(), func.getCallTarget(), errorResult);
             return PythonUtils.getOrCreateCallTarget(rootNode);
         }
 
         @Specialization
         @TruffleBoundary
-        Object make(PFunction func, Object errorResult) {
+        Object make(PFunction func, Object errorResultObj) {
+            MayRaiseErrorResult errorResult = convertToEnum(errorResultObj);
+            
             RootCallTarget wrappedCt = func.getCallTarget();
             WeakReference<RootCallTarget> wrapperCtRef = weakCallTargetMap.get(wrappedCt);
             RootCallTarget wrapperCt = null;
@@ -2457,6 +2458,25 @@ Object make(PFunction func, Object errorResult) {
                             wrapperCode, func.getGlobals(), func.getDefaults(), func.getKwDefaults(),
                             func.getClosure(), func.getCodeStableAssumption(), func.getDefaultsStableAssumption());
         }
+        
+        private MayRaiseErrorResult convertToEnum(Object object) {
+            if (PGuards.isNone(object) ) {
+                return MayRaiseErrorResult.NONE;
+            } else if (object instanceof Integer) {
+                int i = (int) object;
+                if (i == -1) {
+                    return MayRaiseErrorResult.INT;
+                }
+            } else if (object instanceof Double) {
+                double i = (double) object;
+                if (i == -1.0) {
+                    return MayRaiseErrorResult.FLOAT;
+                }
+            } else if (object instanceof PythonNativeNull) {
+                return MayRaiseErrorResult.NATIVE_NULL;
+            }
+            throw raise(PythonErrorType.TypeError, "invalid error result value");
+        }
     }
 
     @Builtin(name = "to_long", minNumOfPositionalArgs = 1)

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

@@ -73,6 +73,7 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.DirectUpcallNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.FastCallArgsToSulongNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.FastCallWithKeywordsArgsToSulongNodeGen;
+import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.GetNativeNullNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.GetTypeMemberNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.IsPointerNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.ObjectUpcallNodeGen;
@@ -139,6 +140,7 @@
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.TruffleLanguage.ContextReference;
@@ -2473,18 +2475,24 @@ public static PCallCapiFunction getUncached() {
             return CExtNodesFactory.PCallCapiFunctionNodeGen.getUncached();
         }
     }
+    
+    public enum MayRaiseErrorResult {
+        NATIVE_NULL, NONE, INT, FLOAT
+    }
 
     // -----------------------------------------------------------------------------------------------------------------
     @Builtin(takesVarArgs = true)
     public static class MayRaiseNode extends PRootNode {
         @Child private CallTargetInvokeNode callTargetInvokeNode;
         @Child private TransformExceptionToNativeNode transformExceptionToNativeNode;
         @Child private CalleeContext calleeContext;
+        
+        @Child private GetNativeNullNode getNativeNullNode;
 
         private final Signature signature;
-        private final Object errorResult;
+        private final MayRaiseErrorResult errorResult;
 
-        public MayRaiseNode(PythonLanguage lang, Signature sign, RootCallTarget ct, Object errorResult) {
+        public MayRaiseNode(PythonLanguage lang, Signature sign, RootCallTarget ct, MayRaiseErrorResult errorResult) {
             super(lang);
             this.signature = sign;
             this.callTargetInvokeNode = CallTargetInvokeNode.create(ct, false, false);
@@ -2508,7 +2516,7 @@ public final Object execute(VirtualFrame frame) {
             } catch (PException e) {
                 // transformExceptionToNativeNode acts as a branch profile
                 ensureTransformExceptionToNativeNode().execute(frame, e);
-                return errorResult;
+                return getErrorResult();
             } finally {
                 calleeContext.exit(frame, this);
             }
@@ -2521,6 +2529,24 @@ private TransformExceptionToNativeNode ensureTransformExceptionToNativeNode() {
             }
             return transformExceptionToNativeNode;
         }
+        
+        private Object getErrorResult() {
+            switch(errorResult) {
+                case INT:
+                    return -1;
+                case FLOAT:
+                    return -1.0;
+                case NONE:
+                        return PNone.NONE;
+                case NATIVE_NULL:
+                    if (getNativeNullNode == null) {
+                        CompilerDirectives.transferToInterpreterAndInvalidate();
+                        getNativeNullNode = insert(GetNativeNullNodeGen.create());
+                    }
+                    return getNativeNullNode.execute();
+            }
+            throw CompilerDirectives.shouldNotReachHere();
+        }
 
         @Override
         public Signature getSignature() {