Fix wrong iteration bound in EnsureCapacityNode

msimacek · steve-s · commit 85f8e5db7066 · 2023-09-04T16:20:21.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java
@@ -2768,7 +2768,7 @@ static BasicSequenceStorage doManaged(Node inliningTarget, BasicSequenceStorage
         }
 
         @Specialization
-        static NativeSequenceStorage doNativeByte(Node inliningTarget, NativeSequenceStorage s, @SuppressWarnings("unused") int cap,
+        static NativeSequenceStorage doNativeByte(Node inliningTarget, NativeSequenceStorage s, int cap,
                         @CachedLibrary(limit = "1") InteropLibrary lib,
                         @Cached(inline = false) CStructAccess.AllocateNode alloc,
                         @Cached(inline = false) CStructAccess.ReadByteNode read,
@@ -2791,7 +2791,7 @@ static NativeSequenceStorage doNativeByte(Node inliningTarget, NativeSequenceSto
                     throw raiseNode.get(inliningTarget).raise(MemoryError);
                 }
                 // TODO: turn this into a memcpy
-                for (long i = 0; i < capacity; i++) {
+                for (long i = 0; i < capacity * elementSize; i++) {
                     write.writeArrayElement(newMem, i, read.readArrayElement(mem, i));
                 }
                 free.free(mem);

Original file line number	Diff line number	Diff line change
`@@ -2768,7 +2768,7 @@ static BasicSequenceStorage doManaged(Node inliningTarget, BasicSequenceStorage`
`2768`	`2768`	`}`
`2769`	`2769`
`2770`	`2770`	`@Specialization`
`2771`		`- static NativeSequenceStorage doNativeByte(Node inliningTarget, NativeSequenceStorage s, @SuppressWarnings("unused") int cap,`
	`2771`	`+ static NativeSequenceStorage doNativeByte(Node inliningTarget, NativeSequenceStorage s, int cap,`
`2772`	`2772`	`@CachedLibrary(limit = "1") InteropLibrary lib,`
`2773`	`2773`	`@Cached(inline = false) CStructAccess.AllocateNode alloc,`
`2774`	`2774`	`@Cached(inline = false) CStructAccess.ReadByteNode read,`
`@@ -2791,7 +2791,7 @@ static NativeSequenceStorage doNativeByte(Node inliningTarget, NativeSequenceSto`
`2791`	`2791`	`throw raiseNode.get(inliningTarget).raise(MemoryError);`
`2792`	`2792`	`}`
`2793`	`2793`	`// TODO: turn this into a memcpy`
`2794`		`- for (long i = 0; i < capacity; i++) {`
	`2794`	`+ for (long i = 0; i < capacity * elementSize; i++) {`
`2795`	`2795`	`write.writeArrayElement(newMem, i, read.readArrayElement(mem, i));`
`2796`	`2796`	`}`
`2797`	`2797`	`free.free(mem);`