Make memoryview exports a long

Author: msimacek

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

@@ -144,8 +144,9 @@
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
 import com.oracle.graal.python.nodes.truffle.PythonTypes;
-import com.oracle.graal.python.nodes.util.CastToJavaIntExactNode;
+import com.oracle.graal.python.nodes.util.CannotCastException;
 import com.oracle.graal.python.nodes.util.CastToJavaIntLossyNode;
+import com.oracle.graal.python.nodes.util.CastToJavaLongExactNode;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.exception.PException;
@@ -842,7 +843,7 @@ static int doMemoryViewFlags(PMemoryView object, @SuppressWarnings("unused") Pyt
         }
 
         @Specialization(guards = "eq(MEMORYVIEW_EXPORTS, key)")
-        static int doMemoryViewExports(PMemoryView object, @SuppressWarnings("unused") PythonNativeWrapper nativeWrapper, @SuppressWarnings("unused") String key) {
+        static long doMemoryViewExports(PMemoryView object, @SuppressWarnings("unused") PythonNativeWrapper nativeWrapper, @SuppressWarnings("unused") String key) {
             return object.getExports().get();
         }
 
@@ -1233,8 +1234,12 @@ static Object doTpDictoffset(PythonManagedClass object, @SuppressWarnings("unuse
 
         @Specialization(guards = "eq(MEMORYVIEW_EXPORTS, key)")
         static Object doMemoryViewExports(PMemoryView object, @SuppressWarnings("unused") PythonNativeWrapper nativeWrapper, @SuppressWarnings("unused") String key, Object value,
-                        @Cached CastToJavaIntExactNode cast) {
-            object.getExports().set(cast.execute(value));
+                        @Cached CastToJavaLongExactNode cast) {
+            try {
+                object.getExports().set(cast.execute(value));
+            } catch (CannotCastException | PException e) {
+                throw CompilerDirectives.shouldNotReachHere("Failed to set memoryview exports: invalid type");
+            }
             return value;
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/memoryview/MemoryViewBuiltins.java

@@ -797,7 +797,7 @@ private static boolean checkShouldReleaseBuffer(PMemoryView self) {
         }
 
         private void checkExports(PMemoryView self) {
-            int exports = self.getExports().get();
+            long exports = self.getExports().get();
             if (exports > 0) {
                 throw raise(BufferError, ErrorMessages.MEMORYVIEW_HAS_D_EXPORTED_BUFFERS, exports);
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/memoryview/PMemoryView.java

@@ -42,7 +42,7 @@
 
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.ValueError;
 
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
 
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
 import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
@@ -81,7 +81,7 @@ public final class PMemoryView extends PythonBuiltinObject {
     private final int[] suboffsets;
 
     // Count of exports via native buffer interface
-    private final AtomicInteger exports = new AtomicInteger();
+    private final AtomicLong exports = new AtomicLong();
     // Phantom ref to this object that will decref/release the managed buffer if any
     private BufferReference reference;
     private int flags;
@@ -256,7 +256,7 @@ public int getFlags() {
         return flags;
     }
 
-    public AtomicInteger getExports() {
+    public AtomicLong getExports() {
         return exports;
     }