From e3460f15faa3dd017f2498b2ca232c9840ff1962 Mon Sep 17 00:00:00 2001 From: Natalie Vock Date: Mon, 8 Sep 2025 16:58:46 +0200 Subject: [PATCH] aco/opt: Work around GCC compiler issue No functional change. Random code churn that, apparently, makes a GCC miscompile disappear. Part-of: --- src/amd/compiler/aco_optimizer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/amd/compiler/aco_optimizer.cpp b/src/amd/compiler/aco_optimizer.cpp index 6bc4065694c..4ac8821464d 100644 --- a/src/amd/compiler/aco_optimizer.cpp +++ b/src/amd/compiler/aco_optimizer.cpp @@ -3445,14 +3445,14 @@ combine_vop3p(opt_ctx& ctx, aco_ptr& instr) continue; } - Operand op[3] = {op_instr->operands[0], op_instr->operands[1], instr->operands[1 - i]}; - if (ctx.uses[instr->operands[i].tempId()] >= uses || !check_vop3_operands(ctx, 3, op)) - continue; - /* no clamp allowed between mul and add */ if (op_instr->valu().clamp) continue; + Operand op[3] = {op_instr->operands[0], op_instr->operands[1], instr->operands[1 - i]}; + if (ctx.uses[instr->operands[i].tempId()] >= uses || !check_vop3_operands(ctx, 3, op)) + continue; + mul_instr = op_instr; add_op_idx = 1 - i; uses = ctx.uses[instr->operands[i].tempId()];