diff --git a/.pick_status.json b/.pick_status.json
index eb12e5ec938..bf94bcbc9cf 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -354,7 +354,7 @@
         "description": "intel/compiler: fix release build unused variable.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "158ac265dfd0647830e8bca3e7fecc92e7fa421b",
         "notes": null
diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp
index 696b5db8d9d..aa01a2241ce 100644
--- a/src/intel/compiler/brw_fs.cpp
+++ b/src/intel/compiler/brw_fs.cpp
@@ -6834,7 +6834,7 @@ save_instruction_order(const struct cfg_t *cfg)
 static void
 restore_instruction_order(struct cfg_t *cfg, fs_inst **inst_arr)
 {
-   int num_insts = cfg->last_block()->end_ip + 1;
+   ASSERTED int num_insts = cfg->last_block()->end_ip + 1;
 
    int ip = 0;
    foreach_block (block, cfg) {