[GR-23238] [GR-21120] Accept buffer-like object in int() constructor

PullRequest: graalpython/1089

Author: otethal

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_int.txt

@@ -3,11 +3,13 @@
 *graalpython.lib-python.3.test.test_int.IntTestCases.test_int_base_bad_types
 *graalpython.lib-python.3.test.test_int.IntTestCases.test_int_base_indexable
 *graalpython.lib-python.3.test.test_int.IntTestCases.test_int_base_limits
+*graalpython.lib-python.3.test.test_int.IntTestCases.test_int_memoryview
 *graalpython.lib-python.3.test.test_int.IntTestCases.test_int_subclass_with_index
 *graalpython.lib-python.3.test.test_int.IntTestCases.test_int_subclass_with_int
 *graalpython.lib-python.3.test.test_int.IntTestCases.test_intconversion
 *graalpython.lib-python.3.test.test_int.IntTestCases.test_issue31619
 *graalpython.lib-python.3.test.test_int.IntTestCases.test_keyword_args
 *graalpython.lib-python.3.test.test_int.IntTestCases.test_no_args
+*graalpython.lib-python.3.test.test_int.IntTestCases.test_non_numeric_input_types
 *graalpython.lib-python.3.test.test_int.IntTestCases.test_small_ints
 *graalpython.lib-python.3.test.test_int.IntTestCases.test_string_float

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

@@ -1140,6 +1140,7 @@ private HashingCollectionNodes.SetItemNode getSetItemNode() {
     // int(x, base=10)
     @Builtin(name = INT, minNumOfPositionalArgs = 1, parameterNames = {"cls", "x", "base"}, numOfPositionalOnlyArgs = 2, constructsClass = PythonBuiltinClassType.PInt)
     @GenerateNodeFactory
+    @ReportPolymorphism
     public abstract static class IntNode extends PythonTernaryBuiltinNode {
 
         private final ConditionProfile invalidBase = ConditionProfile.createBinaryProfile();
@@ -1528,8 +1529,9 @@ Object fail(Object cls, Object arg, Object base) {
             throw raise(TypeError, ErrorMessages.INT_CANT_CONVERT_STRING_WITH_EXPL_BASE);
         }
 
-        @Specialization(guards = {"isNoValue(base)", "!isNoValue(obj)", "!isHandledType(obj)"})
-        Object createIntGeneric(VirtualFrame frame, Object cls, Object obj, @SuppressWarnings("unused") PNone base) {
+        @Specialization(guards = {"isNoValue(base)", "!isNoValue(obj)", "!isHandledType(obj)"}, limit = "2")
+        Object createIntGeneric(VirtualFrame frame, Object cls, Object obj, @SuppressWarnings("unused") PNone base,
+                        @CachedLibrary("obj") PythonObjectLibrary lib) {
             // This method (together with callInt and callIndex) reflects the logic of PyNumber_Long
             // in CPython. We don't use PythonObjectLibrary here since the original CPython function
             // does not use any of the conversion functions (such as _PyLong_AsInt or
@@ -1545,7 +1547,17 @@ Object createIntGeneric(VirtualFrame frame, Object cls, Object obj, @SuppressWar
                 if (result == PNone.NO_VALUE) {
                     Object truncResult = callTrunc(frame, obj);
                     if (truncResult == PNone.NO_VALUE) {
-                        throw raise(TypeError, ErrorMessages.ARG_MUST_BE_STRING_OR_BYTELIKE_OR_NUMBER, "int()", obj);
+                        if (lib.isBuffer(obj)) {
+                            try {
+                                byte[] bytes = lib.getBufferBytes(obj);
+                                return stringToInt(frame, cls, toString(bytes), 10, obj);
+                            } catch (UnsupportedMessageException e) {
+                                CompilerDirectives.transferToInterpreterAndInvalidate();
+                                throw new IllegalStateException("Object claims to be a buffer but does not support getBufferBytes()");
+                            }
+                        } else {
+                            throw raise(TypeError, ErrorMessages.ARG_MUST_BE_STRING_OR_BYTELIKE_OR_NUMBER, "int()", obj);
+                        }
                     }
                     if (isIntegerType(truncResult)) {
                         result = truncResult;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/array/PArray.java

@@ -25,10 +25,16 @@
  */
 package com.oracle.graal.python.builtins.objects.array;
 
+import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
+import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.graal.python.runtime.sequence.PMutableSequence;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.library.ExportLibrary;
+import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.object.DynamicObject;
 
+@ExportLibrary(PythonObjectLibrary.class)
 public class PArray extends PMutableSequence {
 
     private SequenceStorage store;
@@ -55,4 +61,24 @@ public void setSequenceStorage(SequenceStorage store) {
     public int len() {
         return store.length();
     }
+
+    @ExportMessage
+    boolean isBuffer() {
+        return true;
+    }
+
+    @ExportMessage
+    byte[] getBufferBytes(
+                    @Cached SequenceStorageNodes.ToByteArrayNode toByteArrayNode) {
+        // TODO Implement access to the actual bytes which represent the array in memory.
+        // This implementation only works for ByteSequenceStorage.
+        return toByteArrayNode.execute(store);
+    }
+
+    @ExportMessage
+    int getBufferLength(
+                    @Cached SequenceStorageNodes.LenNode lenNode) {
+        // TODO This only works for ByteSequenceStorage since its itemsize is 1.
+        return lenNode.execute(store);
+    }
 }

mx.graalpython/native-image.properties

@@ -5,7 +5,7 @@ Requires = language:regex language:llvm
 
 JavaArgs = -Xmx4G -Dpolyglot.image-build-time.PreinitializeContexts=python
 
-Args = -H:MaxRuntimeCompileMethods=8600 \
+Args = -H:MaxRuntimeCompileMethods=8700 \
        -H:+AddAllCharsets \
        --initialize-at-build-time=com.oracle.graal.python,com.oracle.truffle.regex,org.antlr.v4,jline,org.fusesource \
        -H:SubstitutionResources=com/oracle/graal/python/aot/substitutions.json