diff --git a/.pick_status.json b/.pick_status.json
index 9c776d86b5a..550bd56adde 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -294,7 +294,7 @@
         "description": "r600/sfn: fix class Shader object last_alu_with_indirect_reg memory leak",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "ddb167e81a18c09bd3a4c519e8728e2842d827f1",
         "notes": null
diff --git a/src/gallium/drivers/r600/sfn/sfn_shader.h b/src/gallium/drivers/r600/sfn/sfn_shader.h
index ed9fa4f6a9b..c14eee2ab6a 100644
--- a/src/gallium/drivers/r600/sfn/sfn_shader.h
+++ b/src/gallium/drivers/r600/sfn/sfn_shader.h
@@ -395,7 +395,12 @@ class Shader : public Allocate {
       Instr *last_kill_instr{nullptr};
       Instr *last_lds_access{nullptr};
       Instr *last_group_barrier{nullptr};
-      std::unordered_map<int, Instr * > last_alu_with_indirect_reg;
+      std::unordered_map<int,
+                         Instr *,
+                         std::hash<int>,
+                         std::equal_to<int>,
+                         Allocator<std::pair<const int, Instr *>>>
+         last_alu_with_indirect_reg;
       bool prepare_mem_barrier{false};
    };