diff options
| author |  Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
| 2023-04-25 22:12:05 -0700 |
|---|---|---|
| committer | Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
| 2023-04-25 22:12:05 -0700 |
| commit | 2795f0ba3355b2e82f322fef1efa16a95803da94 (patch) | |
| tree | b8de5d032b4b3b3df3b4f49d649ae7e61849155e | |
| parent | f42663ce9acaaecf758349acae0c77aa6cac4e38 (diff) | |
| download | bun-jarred/possibly-2732.tar.gz bun-jarred/possibly-2732.tar.zst bun-jarred/possibly-2732.zip | |
Possible fix for #2732jarred/possibly-2732
| -rw-r--r-- | src/memory_allocator.zig | 4 | ||||
| -rw-r--r-- | src/mimalloc_arena.zig | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/memory_allocator.zig b/src/memory_allocator.zig index fb5fd06f2..3acbebc05 100644 --- a/src/memory_allocator.zig +++ b/src/memory_allocator.zig @@ -56,7 +56,9 @@ const CAllocator = struct { const malloc_size = c.malloc_size; pub const supports_posix_memalign = true; - fn alignedAlloc(len: usize, alignment: usize) ?[*]u8 { + fn alignedAlloc(len: usize, log2_align: usize) ?[*]u8 { + const alignment = @as(usize, 1) << @intCast(Allocator.Log2Align, log2_align); + if (comptime FeatureFlags.log_allocations) std.debug.print("Malloc: {d}\n", .{len}); var ptr: ?*anyopaque = if (mimalloc.canUseAlignedAlloc(len, alignment)) diff --git a/src/mimalloc_arena.zig b/src/mimalloc_arena.zig index 1dcf6d5b1..793a0062a 100644 --- a/src/mimalloc_arena.zig +++ b/src/mimalloc_arena.zig @@ -201,7 +201,8 @@ pub const Arena = struct { } pub const supports_posix_memalign = true; - fn alignedAlloc(heap: *mimalloc.Heap, len: usize, alignment: usize) ?[*]u8 { + fn alignedAlloc(heap: *mimalloc.Heap, len: usize, log2_align: usize) ?[*]u8 { + const alignment = @as(usize, 1) << @intCast(Allocator.Log2Align, log2_align); if (comptime FeatureFlags.log_allocations) std.debug.print("Malloc: {d}\n", .{len}); var ptr: ?*anyopaque = if (mimalloc.canUseAlignedAlloc(len, alignment)) |