From bd3d0f3495f6375901df9ca899accf8bc7a45345 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Wed, 30 Jul 2025 22:03:13 +0200 Subject: [PATCH] vkd3d-shader/ir: Use vsir_program_append() in vsir_program_ensure_ret(). I think this is slightly nicer. It also happens to avoid a -Warray-bounds warning on some versions of gcc that suggests the "ins" pointer returned by vsir_program_iterator_next() may be NULL. --- libs/vkd3d-shader/ir.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 4c324fef7..76eb62cfd 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1752,14 +1752,11 @@ static enum vkd3d_result vsir_program_ensure_ret(struct vsir_program *program, struct vkd3d_shader_instruction *ins; ins = vsir_program_iterator_tail(&it); - if (ins && ins->opcode == VSIR_OP_RET) return VKD3D_OK; - if (!vsir_program_iterator_insert_after(&it, 1)) + if (!(ins = vsir_program_append(program))) return VKD3D_ERROR_OUT_OF_MEMORY; - - ins = vsir_program_iterator_next(&it); vsir_instruction_init(ins, &no_loc, VSIR_OP_RET); return VKD3D_OK;