From a025983dd9cfcba8a452205efbc5c0be8ff3da74 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 23 Nov 2016 12:23:55 -0800 Subject: [PATCH] vc4: Make qir_for_each_inst_inorder() safe against removal. The dead code elimination wants it to be safe, and I actually got segfaults due to it being unsafe with the new coalescing pass. --- src/gallium/drivers/vc4/vc4_qir.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/vc4/vc4_qir.h b/src/gallium/drivers/vc4/vc4_qir.h index a8f90cf..28d3344 100644 --- a/src/gallium/drivers/vc4/vc4_qir.h +++ b/src/gallium/drivers/vc4/vc4_qir.h @@ -887,6 +887,6 @@ qir_BRANCH(struct vc4_compile *c, uint8_t cond) #define qir_for_each_inst_inorder(inst, c) \ qir_for_each_block(_block, c) \ - qir_for_each_inst(inst, _block) + qir_for_each_inst_safe(inst, _block) #endif /* VC4_QIR_H */ -- 2.7.4