diff --git a/.pick_status.json b/.pick_status.json
index efe159f8a4a..dd1270ea4df 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -274,7 +274,7 @@
         "description": "aco: use size_t for monotonic_buffer_resource",
         "nominated": true,
         "nomination_type": 4,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/amd/compiler/aco_util.h b/src/amd/compiler/aco_util.h
index 910feb0ca9c..d0197a7d702 100644
--- a/src/amd/compiler/aco_util.h
+++ b/src/amd/compiler/aco_util.h
@@ -274,7 +274,7 @@ public:
       }
 
       /* create new larger buffer */
-      uint32_t total_size = buffer->data_size + sizeof(Buffer);
+      size_t total_size = buffer->data_size + sizeof(Buffer);
       do {
          total_size *= 2;
       } while (total_size - sizeof(Buffer) < size);
@@ -302,8 +302,8 @@ public:
 private:
    struct Buffer {
       Buffer* next;
-      uint32_t current_idx;
-      uint32_t data_size;
+      size_t current_idx;
+      size_t data_size;
       uint8_t data[];
    };
 
@@ -333,7 +333,7 @@ public:
    /* Memory Allocation */
    T* allocate(size_t size)
    {
-      uint32_t bytes = sizeof(T) * size;
+      size_t bytes = sizeof(T) * size;
       return (T*)memory_resource.get().allocate(bytes, alignof(T));
    }