Mesa (staging/21.3): ir3: Fix copy-paste mistakes in ir3_block_remove_physical_predecessor()
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Feb 2 21:21:48 UTC 2022
Module: Mesa
Branch: staging/21.3
Commit: 83a6109906b6e641e5069c06d67c1ddc70b9115a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=83a6109906b6e641e5069c06d67c1ddc70b9115a
Author: Connor Abbott <cwabbott0 at gmail.com>
Date: Mon Dec 6 19:10:28 2021 +0100
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 593426b3ebb..aa4d186e738 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -490,7 +490,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--;
More information about the mesa-commit
mailing list