handle dumb conditional jumps in isel

I also removed the code to handle jumps with a
constant argument since those should be eliminated
by the folding pass.

1 files changed, 2 insertions, 4 deletions

diff --git a/isel.c b/isel.c
index f20efb0..80a3e6c 100644
--- a/isel.c
+++ b/isel.c
@@ -360,11 +360,9 @@ seljmp(Blk *b, Fn *fn)
 	assert(b->jmp.type == JJnz);
 	r = b->jmp.arg;
 	b->jmp.arg = R;
-	assert(!req(r, R));
-	if (rtype(r) == RCon) {
+	assert(!req(r, R) && rtype(r) != RCon);
+	if (b->s1 == b->s2) {
 		b->jmp.type = JJmp;
-		if (req(r, CON_Z))
-			b->s1 = b->s2;
 		b->s2 = 0;
 		return;
 	}