Always use longs for pointer offsets

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/CtypesNodes.java

@@ -433,11 +433,7 @@ static void getBuffer(Node inliningTarget, CDataObject self, Object view, @Suppr
             writePointerNode.write(view, CFields.Py_buffer__format, formatPtr);
             writeIntNode.write(view, CFields.Py_buffer__ndim, dict.ndim);
             Object shapePtr = allocateNode.alloc(dict.shape.length * Long.BYTES);
-            long[] shapeArray = new long[dict.shape.length];
-            for (int i = 0; i < dict.shape.length; i++) {
-                shapeArray[i] = dict.shape[i];
-            }
-            writeLongNode.writeLongArray(shapePtr, shapeArray);
+            writeLongNode.writeIntArray(shapePtr, dict.shape);
             writePointerNode.write(view, CFields.Py_buffer__shape, shapePtr);
             writeLongNode.write(view, CFields.Py_buffer__itemsize, itemDict.size);
             writePointerNode.write(view, CFields.Py_buffer__strides, nativeNull);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/structs/CStructAccess.java

@@ -296,15 +296,15 @@ public final byte[] readByteArray(Object pointer, int elements) {
             return readByteArray(pointer, elements, 0);
         }
 
-        public final byte[] readByteArray(Object pointer, int elements, int sourceOffset) {
+        public final byte[] readByteArray(Object pointer, int elements, long sourceOffset) {
             byte[] result = new byte[elements];
             for (int i = 0; i < result.length; i++) {
                 result[i] = (byte) execute(pointer, (i + sourceOffset) * Byte.BYTES);
             }
             return result;
         }
 
-        public final void readByteArray(Object pointer, byte[] target, int length, int sourceOffset, int targetOffset) {
+        public final void readByteArray(Object pointer, byte[] target, int length, long sourceOffset, int targetOffset) {
             for (int i = 0; i < length; i++) {
                 target[i + targetOffset] = (byte) execute(pointer, (i + sourceOffset) * Byte.BYTES);
             }
@@ -1054,7 +1054,7 @@ public final void writeArray(Object pointer, int[] values) {
             writeArray(pointer, values, values.length, 0, 0);
         }
 
-        public final void writeArray(Object pointer, int[] values, int length, int sourceOffset, int targetOffset) {
+        public final void writeArray(Object pointer, int[] values, int length, int sourceOffset, long targetOffset) {
             for (int i = 0; i < length; i++) {
                 execute(pointer, (i + targetOffset) * Integer.BYTES, values[i + sourceOffset]);
             }
@@ -1112,7 +1112,7 @@ public final void writeLongArray(Object pointer, long[] values) {
             writeLongArray(pointer, values, values.length, 0, 0);
         }
 
-        public final void writeLongArray(Object pointer, long[] values, int length, int sourceOffset, int targetOffset) {
+        public final void writeLongArray(Object pointer, long[] values, int length, int sourceOffset, long targetOffset) {
             for (int i = 0; i < length; i++) {
                 execute(pointer, (i + targetOffset) * Long.BYTES, values[i + sourceOffset]);
             }
@@ -1122,9 +1122,9 @@ public final void writeIntArray(Object pointer, int[] values) {
             writeIntArray(pointer, values, values.length, 0, 0);
         }
 
-        public final void writeIntArray(Object pointer, int[] values, int length, int sourceOffset, int targetOffset) {
+        public final void writeIntArray(Object pointer, int[] values, int length, int sourceOffset, long targetOffset) {
             for (int i = 0; i < length; i++) {
-                execute(pointer, (long) (i + targetOffset) * Long.BYTES, values[i + sourceOffset]);
+                execute(pointer, (i + targetOffset) * Long.BYTES, values[i + sourceOffset]);
             }
         }
 
@@ -1192,7 +1192,7 @@ public final void writeArrayElement(Object pointer, long element, Object value)
             execute(pointer, element * POINTER_SIZE, value);
         }
 
-        public final void writePointerArray(Object pointer, long[] values, int length, int sourceOffset, int targetOffset) {
+        public final void writePointerArray(Object pointer, long[] values, int length, int sourceOffset, long targetOffset) {
             for (int i = 0; i < length; i++) {
                 execute(pointer, (i + targetOffset) * POINTER_SIZE, values[i + sourceOffset]);
             }
@@ -1250,7 +1250,7 @@ public final boolean accepts(ArgDescriptor desc) {
             return desc.isPyObject();
         }
 
-        public final void writeArray(Object pointer, Object[] values, int length, int sourceOffset, int targetOffset) {
+        public final void writeArray(Object pointer, Object[] values, int length, int sourceOffset, long targetOffset) {
             if (length > values.length) {
                 throw CompilerDirectives.shouldNotReachHere();
             }