From 23866b1f81010277b204d6f3f5db23d020a76400 Mon Sep 17 00:00:00 2001
From: Lee Cannon <leecannon@leecannon.xyz>
Date: Wed, 3 Nov 2021 12:49:31 +0000
Subject: [PATCH] allocgate: update code to use new interface

---
 lib/std/heap/general_purpose_allocator.zig |  2 +-
 src/tracy.zig                              | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/std/heap/general_purpose_allocator.zig b/lib/std/heap/general_purpose_allocator.zig
index fa2536cfaa..be7651980c 100644
--- a/lib/std/heap/general_purpose_allocator.zig
+++ b/lib/std/heap/general_purpose_allocator.zig
@@ -1192,7 +1192,7 @@ test "bug 9995 fix, large allocs count requested size not backing size" {
     // with AtLeast, buffer likely to be larger than requested, especially when shrinking
     var gpa = GeneralPurposeAllocator(.{ .enable_memory_limit = true }){};
     const allocator = gpa.allocator();
-    
+
     var buf = try allocator.allocAdvanced(u8, 1, page_size + 1, .at_least);
     try std.testing.expect(gpa.total_requested_bytes == page_size + 1);
     buf = try allocator.reallocAtLeast(buf, 1);
diff --git a/src/tracy.zig b/src/tracy.zig
index 8abd78110f..83e31e5764 100644
--- a/src/tracy.zig
+++ b/src/tracy.zig
@@ -109,11 +109,14 @@ pub fn tracyAllocator(allocator: std.mem.Allocator) TracyAllocator(null) {
 
 pub fn TracyAllocator(comptime name: ?[:0]const u8) type {
     return struct {
-        allocator: std.mem.Allocator,
         parent_allocator: std.mem.Allocator,
 
         const Self = @This();
 
+        pub fn allocator(self: *Self) std.mem.Allocator {
+            return std.mem.Allocator.init(self, allocFn, resizeFn);
+        }
+
         pub fn init(allocator: std.mem.Allocator) Self {
             return .{
                 .parent_allocator = allocator,
@@ -124,8 +127,7 @@ pub fn TracyAllocator(comptime name: ?[:0]const u8) type {
             };
         }
 
-        fn allocFn(allocator: std.mem.Allocator, len: usize, ptr_align: u29, len_align: u29, ret_addr: usize) std.mem.Allocator.Error![]u8 {
-            const self = @fieldParentPtr(Self, "allocator", allocator);
+        fn allocFn(self: *Self, len: usize, ptr_align: u29, len_align: u29, ret_addr: usize) std.mem.Allocator.Error![]u8 {
             const result = self.parent_allocator.allocFn(self.parent_allocator, len, ptr_align, len_align, ret_addr);
             if (result) |data| {
                 if (data.len != 0) {
@@ -141,9 +143,7 @@ pub fn TracyAllocator(comptime name: ?[:0]const u8) type {
             return result;
         }
 
-        fn resizeFn(allocator: std.mem.Allocator, buf: []u8, buf_align: u29, new_len: usize, len_align: u29, ret_addr: usize) std.mem.Allocator.Error!usize {
-            const self = @fieldParentPtr(Self, "allocator", allocator);
-
+        fn resizeFn(self: *Self, buf: []u8, buf_align: u29, new_len: usize, len_align: u29, ret_addr: usize) std.mem.Allocator.Error!usize {
             if (self.parent_allocator.resizeFn(self.parent_allocator, buf, buf_align, new_len, len_align, ret_addr)) |resized_len| {
                 // this condition is to handle free being called on an empty slice that was never even allocated
                 // example case: `std.process.getSelfExeSharedLibPaths` can return `&[_][:0]u8{}`