From 14b8d979db4bfde66b8c5cac00a4cbabb285b816 Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason@jlekstrand.net>
Date: Sat, 18 Apr 2020 17:22:01 -0500
Subject: [PATCH] intel/fs: Rename block to scan_block in can_coalesce_vars

Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4627>
---
 src/intel/compiler/brw_fs_register_coalesce.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/intel/compiler/brw_fs_register_coalesce.cpp b/src/intel/compiler/brw_fs_register_coalesce.cpp
index 44ad3e624c3..e1964863519 100644
--- a/src/intel/compiler/brw_fs_register_coalesce.cpp
+++ b/src/intel/compiler/brw_fs_register_coalesce.cpp
@@ -120,13 +120,13 @@ can_coalesce_vars(const fs_live_variables &live,
    int start_ip = MAX2(dst_start, src_start);
    int end_ip = MIN2(dst_end, src_end);
 
-   foreach_block(block, cfg) {
-      if (block->end_ip < start_ip)
+   foreach_block(scan_block, cfg) {
+      if (scan_block->end_ip < start_ip)
          continue;
 
-      int scan_ip = block->start_ip - 1;
+      int scan_ip = scan_block->start_ip - 1;
 
-      foreach_inst_in_block(fs_inst, scan_inst, block) {
+      foreach_inst_in_block(fs_inst, scan_inst, scan_block) {
          scan_ip++;
 
          /* Ignore anything before the intersection of the live ranges */
-- 
2.30.2