shithub: mc

Info  •  Files  •  Log  •  Branches

Fix confusingness with byte sizes/element counts.

	This was probably buggy.

--- a/lib/std/alloc.myr

+++ b/lib/std/alloc.myr

@@ -122,7 +122,7 @@

 /* Grows a slice */

 generic slgrow = {sl : @a[:]#, len

-	var cap

+	var cap, nel

 	var new

 	var n

@@ -131,18 +131,18 @@

 	if (sl# : byte#) != Zsliceptr

 		cap = slcap((sl# : byte#))

 	;;

-	if cap >= allocsz(len*sizeof(@a))

+	if cap >= allocsz(len*sizeof(@a)) + align(sizeof(slheader), Align)

 		sl# = (sl# : @a#)[:len]

 		-> sl#

 	;;

 	/* grow in factors of 1.5 */

-	cap = max(Align, cap)

-	while cap < len

-		cap += (cap >> 1)

+	nel = sl#.len

+	while nel < len

+		nel = nel * 2 + 2

 	;;

-	new = slalloc(cap)

+	new = slalloc(nel)

 	n = min(len, sl#.len)

 	memblit((new : byte#), (sl# : byte#), n * sizeof(@a))

 	if sl#.len > 0