From 5be8602e4df2954bd036ffb5be207f2bdcd5e30d Mon Sep 17 00:00:00 2001
From: Connor Abbott <cwabbott0@gmail.com>
Date: Mon, 6 Dec 2021 19:10:28 +0100
Subject: [PATCH] ir3: Fix copy-paste mistakes in
 ir3_block_remove_physical_predecessor()

Fixes: 2768a35e416 ("ir3: Add pass to remove unreachable blocks")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14412>
(cherry picked from commit 53e54898e040da33d665ff73d6b92c6860157865)
---
 .pick_status.json       | 2 +-
 src/freedreno/ir3/ir3.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index f15c21f7e70..744c546236a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2290,7 +2290,7 @@
         "description": "ir3: Fix copy-paste mistakes in ir3_block_remove_physical_predecessor()",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "2768a35e416ed8914989474d320de3227a5ecd84"
     },
diff --git a/src/freedreno/ir3/ir3.c b/src/freedreno/ir3/ir3.c
index 83236811390..4008bdb9b33 100644
--- a/src/freedreno/ir3/ir3.c
+++ b/src/freedreno/ir3/ir3.c
@@ -402,9 +402,9 @@ ir3_block_remove_physical_predecessor(struct ir3_block *block, struct ir3_block
 {
    for (unsigned i = 0; i < block->physical_predecessors_count; i++) {
       if (block->physical_predecessors[i] == pred) {
-         if (i < block->predecessors_count - 1) {
+         if (i < block->physical_predecessors_count - 1) {
             block->physical_predecessors[i] =
-               block->physical_predecessors[block->predecessors_count - 1];
+               block->physical_predecessors[block->physical_predecessors_count - 1];
          }
 
          block->physical_predecessors_count--;