From 1dc34d6dbafafbef973f82ccdad4c8c97e4a409f Mon Sep 17 00:00:00 2001
From: Georg Lehmann <dadschoorse@gmail.com>
Date: Thu, 18 Jun 2026 20:03:00 +0200
Subject: [PATCH] aco/assembler: don't reorder branch insertion block index
 twice
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I hate everything about this code.

Fixes: a3d9712e8e0 ("aco/assembler: chain branches in emit order")
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/42324>
---
 src/amd/compiler/aco_assembler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amd/compiler/aco_assembler.cpp b/src/amd/compiler/aco_assembler.cpp
index d3f8e48a432..10ca87685bf 100644
--- a/src/amd/compiler/aco_assembler.cpp
+++ b/src/amd/compiler/aco_assembler.cpp
@@ -1640,7 +1640,7 @@ chain_branches(asm_context& ctx, std::vector<uint32_t>& out, branch_info& branch
          bld.reset(&next_block.instructions, it);
       } else {
          /* Insert the additional branches at the end of the previous non-empty block. */
-         bld.reset(&ctx.program->blocks[ctx.block_emit_order[insertion_block_idx]].instructions);
+         bld.reset(&ctx.program->blocks[insertion_block_idx].instructions);
          skip_branch_target = next_block.index;
       }