diff --git a/.pick_status.json b/.pick_status.json
index 12fa0e17c02..3655fea0513 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -684,7 +684,7 @@
         "description": "aco: help clang 20 do some additions and subtractions",
         "nominated": true,
         "nomination_type": 4,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/amd/compiler/aco_assembler.cpp b/src/amd/compiler/aco_assembler.cpp
index 9ef25e3edd4..4b93121f8cb 100644
--- a/src/amd/compiler/aco_assembler.cpp
+++ b/src/amd/compiler/aco_assembler.cpp
@@ -832,8 +832,8 @@ emit_mimg_instruction_gfx12(asm_context& ctx, std::vector<uint32_t>& out, const
    uint8_t vaddr[5] = {0, 0, 0, 0, 0};
    for (unsigned i = 3; i < instr->operands.size(); i++)
       vaddr[i - 3] = reg(ctx, instr->operands[i], 8);
-   unsigned num_vaddr = instr->operands.size() - 3;
-   for (unsigned i = 0; i < MIN2(instr->operands.back().size() - 1, 5 - num_vaddr); i++)
+   int num_vaddr = instr->operands.size() - 3;
+   for (int i = 0; i < (int)MIN2(instr->operands.back().size() - 1, ARRAY_SIZE(vaddr) - num_vaddr); i++)
       vaddr[num_vaddr + i] = reg(ctx, instr->operands.back(), 8) + i + 1;
 
    encoding = 0;