If the ENDIF instruction was the only instruction in its block, we'd leave the successors of the merged if+jump block in a bad state.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83080 --- .../drivers/dri/i965/brw_fs_peephole_predicated_break.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs_peephole_predicated_break.cpp b/src/mesa/drivers/dri/i965/brw_fs_peephole_predicated_break.cpp index ab197ee..eb99681 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_peephole_predicated_break.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_peephole_predicated_break.cpp @@ -87,13 +87,18 @@ fs_visitor::opt_peephole_predicated_break() } if_inst->remove(if_block); + + bblock_t *later_block = endif_block; + if (endif_block->start_ip == endif_block->end_ip) { + later_block = (bblock_t *)endif_block->link.next; + } endif_inst->remove(endif_block); - if_block->children.make_empty(); - endif_block->parents.make_empty(); + earlier_block->children.make_empty(); + later_block->parents.make_empty(); - if_block->add_successor(cfg->mem_ctx, jump_block); - jump_block->add_successor(cfg->mem_ctx, endif_block); + earlier_block->add_successor(cfg->mem_ctx, jump_block); + jump_block->add_successor(cfg->mem_ctx, later_block); if (earlier_block->can_combine_with(jump_block)) { earlier_block->combine_with(jump_block); -- 1.8.5.5 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
