Fix: PyLong_AsUnsignedLong accepts subtypes of int

Author: fangerer

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_long.py

@@ -175,6 +175,8 @@ def compile_module(self, name):
             (0,),
             (-1,),
             (-2,),
+            (True,),
+            (False,),
             (0x7fffffff,),
             (0xffffffff,),
             # we could use larger values on 64-bit systems but how should we know?

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

@@ -1177,7 +1177,7 @@ long doPrimitiveNativeWrapperToLong(VirtualFrame frame, Object object, int mode,
             try {
                 if (resolvedPointer instanceof PrimitiveNativeWrapper) {
                     PrimitiveNativeWrapper wrapper = (PrimitiveNativeWrapper) resolvedPointer;
-                    if (requiredPInt(mode) && !wrapper.isIntLike()) {
+                    if (requiredPInt(mode) && !wrapper.isSubtypeOfInt()) {
                         throw raise(TypeError, ErrorMessages.INTEGER_REQUIRED);
                     }
                     return ensureConvertPIntToPrimitiveNode().executeLong(wrapper, signed(mode), PInt.intValueExact(targetTypeSize), exact(mode));
@@ -1198,7 +1198,7 @@ Object doGeneric(VirtualFrame frame, Object objectPtr, int mode, long targetType
             try {
                 if (resolvedPointer instanceof PrimitiveNativeWrapper) {
                     PrimitiveNativeWrapper wrapper = (PrimitiveNativeWrapper) resolvedPointer;
-                    if (requiredPInt(mode) && !wrapper.isIntLike()) {
+                    if (requiredPInt(mode) && !wrapper.isSubtypeOfInt()) {
                         throw raise(TypeError, ErrorMessages.INTEGER_REQUIRED);
                     }
                     return ensureConvertPIntToPrimitiveNode().execute(wrapper, signed(mode), PInt.intValueExact(targetTypeSize), exact(mode));

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

@@ -1715,6 +1715,10 @@ public boolean isIntLike() {
             return (state & (PRIMITIVE_STATE_BYTE | PRIMITIVE_STATE_INT | PRIMITIVE_STATE_LONG)) != 0;
         }
 
+        public boolean isSubtypeOfInt() {
+            return !isDouble();
+        }
+
         // this method exists just for readability
         public Object getMaterializedObject(PythonNativeWrapperLibrary lib) {
             return lib.getDelegate(this);