From 50e65dac794511fb392fd9103f50c553d69a56d2 Mon Sep 17 00:00:00 2001 From: Natalie Vock Date: Mon, 20 Oct 2025 15:07:05 +0200 Subject: [PATCH] nir/lower_shader_calls: Repair SSA after wrap_instrs Wrapping jump instructions that are located inside ifs can break SSA invariants because the else block no longer dominates the merge block. Repair the SSA to make the validator happy again. Cc: mesa-stable Part-of: --- src/compiler/nir/nir_lower_shader_calls.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/compiler/nir/nir_lower_shader_calls.c b/src/compiler/nir/nir_lower_shader_calls.c index 913f34629d8..2374b3bb022 100644 --- a/src/compiler/nir/nir_lower_shader_calls.c +++ b/src/compiler/nir/nir_lower_shader_calls.c @@ -1228,8 +1228,16 @@ wrap_instr(nir_builder *b, nir_instr *instr, void *data) static bool wrap_instrs(nir_shader *shader, wrap_instr_callback callback) { - return nir_shader_instructions_pass(shader, wrap_instr, - nir_metadata_none, callback); + bool progress = nir_shader_instructions_pass(shader, wrap_instr, + nir_metadata_none, callback); + /* Wrapping jump instructions that are located inside ifs can break SSA + * invariants because the else block no longer dominates the merge block. + * Repair the SSA to make the validator happy again. + */ + if (progress) + nir_repair_ssa(shader); + + return progress; } static bool