When turning a conditional branch into an unconditional one,

remember to remove one parent..

Let's make sure that the flow information always matches the
instruction.

1 files changed, 5 insertions, 1 deletions

diff --git a/flow.c b/flow.c
index 45efa3b..ca2d63a 100644
--- a/flow.c
+++ b/flow.c
@@ -671,8 +671,12 @@ static int rewrite_parent_branch(struct basic_block *bb, struct basic_block *old
 	case OP_BR:
 		rewrite_branch(bb, &insn->bb_true, old, new);
 		rewrite_branch(bb, &insn->bb_false, old, new);
-		if (insn->bb_true == insn->bb_false)
+
+		/* Conditional branch to same target? */
+		if (insn->bb_true == insn->bb_false) {
+			remove_bb_from_list(&new->parents, bb, 1);
 			insn->bb_false = NULL;
+		}
 		return 1;
 	case OP_SWITCH: {
 		struct multijmp *jmp;