irgen: Fix IR generation of if-else statements.

mewmew · Jun 15, 2016 · 724220e · 724220e
1 parent 181d595
commit 724220e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/irgen/lower.go b/irgen/lower.go
@@ -234,15 +234,17 @@ func (m *Module) ifStmt(f *Function, stmt *ast.IfStmt) {
 	f.curBlock = trueBranch
 
 	m.stmt(f, stmt.Body)
-	trueBranch.emitJmp(falseBranch)
+	end := falseBranch
 	f.curBlock = falseBranch
 
 	if stmt.Else != nil {
 		m.stmt(f, stmt.Else)
-		end := f.NewBasicBlock("")
+		end = f.NewBasicBlock("")
 		falseBranch.emitJmp(end)
 		f.curBlock = end
 	}
+
+	trueBranch.emitJmp(end)
 }
 
 // returnStmt lowers the given return statement to LLVM IR, emitting code to f.