Fix "Terminator found in the middle of a basic block!"

Author: emillaine

src/backend/irgen-decl.cpp

@@ -59,10 +59,7 @@ void IRGenerator::emitFunctionBody(const FunctionDecl& decl, Function& function)
         }
     }
 
-    for (auto& stmt : *decl.body) {
-        emitStmt(*stmt);
-    }
-
+    emitStmts(*decl.body);
     endScope();
 
     if (insertBlock->body.empty() || !llvm::isa<ReturnInst>(insertBlock->body.back())) {

src/backend/irgen-stmt.cpp

@@ -17,12 +17,7 @@ void IRGenerator::emitReturnStmt(const ReturnStmt& stmt) {
 
 void IRGenerator::emitBlock(llvm::ArrayRef<Stmt*> stmts, BasicBlock* continuation) {
     beginScope();
-
-    for (const auto& stmt : stmts) {
-        emitStmt(*stmt);
-        if (stmt->isReturnStmt() || stmt->isBreakStmt() || stmt->isContinueStmt()) break;
-    }
-
+    emitStmts(stmts);
     endScope();
 
     if (insertBlock->body.empty() || !insertBlock->body.back()->isTerminator()) {
@@ -148,11 +143,7 @@ void IRGenerator::emitContinueStmt(const ContinueStmt&) {
 
 void IRGenerator::emitCompoundStmt(const CompoundStmt& compoundStmt) {
     beginScope();
-
-    for (auto& stmt : compoundStmt.body) {
-        emitStmt(*stmt);
-    }
-
+    emitStmts(compoundStmt.body);
     endScope();
 }
 
@@ -196,3 +187,10 @@ void IRGenerator::emitStmt(const Stmt& stmt) {
         break;
     }
 }
+
+void IRGenerator::emitStmts(llvm::ArrayRef<Stmt*> stmts) {
+    for (Stmt* stmt : stmts) {
+        emitStmt(*stmt);
+        if (stmt->isReturnStmt() || stmt->isBreakStmt() || stmt->isContinueStmt()) break;
+    }
+}

src/backend/irgen.h

@@ -98,6 +98,7 @@ struct IRGenerator {
     Value* emitAssignmentLHS(const Expr& lhs);
     void emitCompoundStmt(const CompoundStmt& stmt);
     void emitStmt(const Stmt& stmt);
+    void emitStmts(llvm::ArrayRef<Stmt*> stmts);
     void emitDecl(const Decl& decl);
     void emitFunctionDecl(const FunctionDecl& decl);
     Value* emitVarDecl(const VarDecl& decl);

src/backend/llvm.cpp

@@ -141,7 +141,8 @@ void LLVMGenerator::codegenFunctionBody(const Function* function, llvm::Function
         }
 
         for (auto* inst : block->body) {
-            getValue(inst);
+            auto llvmValue = codegenInst(inst);
+            generatedValues.emplace(inst, llvmValue);
         }
     }