diff --git a/.pick_status.json b/.pick_status.json
index 819599de35d..944e6c1a2fe 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1484,7 +1484,7 @@
         "description": "nak/spill_values: Spill constants across edges if needed",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "7b82e26e3c289b2937df65f610d6ffc734e3bbde",
         "notes": null
diff --git a/src/nouveau/compiler/nak/spill_values.rs b/src/nouveau/compiler/nak/spill_values.rs
index 36132ecf9fe..b75470f18e3 100644
--- a/src/nouveau/compiler/nak/spill_values.rs
+++ b/src/nouveau/compiler/nak/spill_values.rs
@@ -1003,7 +1003,8 @@ fn spill_values<S: Spill>(
         }
 
         for ssa in s_in.s.iter() {
-            if p_out.w.contains(ssa) && !p_out.s.contains(ssa) {
+            if !p_out.s.contains(ssa) {
+                assert!(p_out.w.contains(ssa) || spill.is_const(ssa));
                 spills.push(*ssa);
             }
         }