panfrost/midgard: Use _safe iterator
authorTomeu Vizoso <tomeu.vizoso@collabora.com>
Thu, 11 Jul 2019 10:18:58 +0000 (12:18 +0200)
committerTomeu Vizoso <tomeu.vizoso@collabora.com>
Thu, 11 Jul 2019 13:06:51 +0000 (15:06 +0200)
Fixes this assertion:

../mesa/src/panfrost/midgard/midgard_schedule.c:507:schedule_block: Assertion `ins == __next && "use _safe iterator"' failed.
Trace/breakpoint trap

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
src/panfrost/midgard/midgard_schedule.c

index 7a3841e..3e78020 100644 (file)
@@ -504,7 +504,7 @@ schedule_block(compiler_context *ctx, midgard_block *block)
 
         block->quadword_count = 0;
 
-        mir_foreach_instr_in_block(block, ins) {
+        mir_foreach_instr_in_block_safe(block, ins) {
                 int skip;
                 midgard_bundle bundle = schedule_bundle(ctx, block, ins, &skip);
                 util_dynarray_append(&block->bundles, midgard_bundle, bundle);