diff --git a/.pick_status.json b/.pick_status.json
index acacae06e5c..901f8ec535d 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -553,7 +553,7 @@
         "description": "aco/spill: use spills_entry instead of spills_exit to kill linear VGPRs",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/amd/compiler/aco_spill.cpp b/src/amd/compiler/aco_spill.cpp
index 205a687b7e4..821ef85806c 100644
--- a/src/amd/compiler/aco_spill.cpp
+++ b/src/amd/compiler/aco_spill.cpp
@@ -1563,7 +1563,7 @@ assign_spill_slots(spill_ctx& ctx, unsigned spills_to_vgpr)
                continue;
 
             bool can_destroy = true;
-            for (std::pair<Temp, uint32_t> pair : ctx.spills_exit[block.linear_preds[0]]) {
+            for (std::pair<Temp, uint32_t> pair : ctx.spills_entry[block.index]) {
 
                if (ctx.interferences[pair.second].first.type() == RegType::sgpr &&
                    slots[pair.second] / ctx.wave_size == i) {