Module: Mesa
Branch: staging/23.3
Commit: 4ea8f20b19ad968ddbf91fe4b4e58003b63cd8b9
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=4ea8f20b19ad968ddbf91fe4b4e58003b63cd8b9
Author: Dave Airlie <airl...@redhat.com>
Date: Wed Jan 3 16:31:23 2024 +1000
intel/compiler: fix release build unused variable.
This is only used in an assert.
Fixes: 158ac265dfd0 ("intel/fs: Make helpers for saving/restoring instruction
order")
Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26863>
(cherry picked from commit 37366fef682fbadcfd5d4376008ed0fc5542c8f1)
---
.pick_status.json | 2 +-
src/intel/compiler/brw_fs.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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) {
