From 2a1bec9fbb54a1fe4a6e817bff3b39fdb1457055 Mon Sep 17 00:00:00 2001
From: gingerBill <bill@gingerbill.org>
Date: Tue, 2 Mar 2021 00:43:25 +0000
Subject: [PATCH] Clean up `lb_end_procedure_body` logic

---
 src/llvm_abi.cpp     |  2 +-
 src/llvm_backend.cpp | 25 +++----------------------
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/src/llvm_abi.cpp b/src/llvm_abi.cpp
index f7891735d..217e00a2e 100644
--- a/src/llvm_abi.cpp
+++ b/src/llvm_abi.cpp
@@ -403,7 +403,7 @@ namespace lbAbi386 {
 		    	// TODO(bill): LLVM is probably bugged here and doesn't correctly generate the right code
 		    	// So even though it is "technically" wrong, no cast might be the best option
 		    	LLVMTypeRef cast_type = nullptr;
-		    	if (!is_return) {
+		    	if (true || !is_return) {
 				cast_type = LLVMVectorType(LLVMInt64TypeInContext(c), 2);
 			}
 			return lb_arg_type_direct(type, cast_type, nullptr, nullptr);
diff --git a/src/llvm_backend.cpp b/src/llvm_backend.cpp
index 123a38cac..a3786266b 100644
--- a/src/llvm_backend.cpp
+++ b/src/llvm_backend.cpp
@@ -2575,37 +2575,18 @@ void lb_end_procedure_body(lbProcedure *p) {
 		}
 	}
 
-	LLVMBasicBlockRef block = nullptr;
 	LLVMBasicBlockRef first_block = LLVMGetFirstBasicBlock(p->value);
-
-	// Remove dead blocks with no code
-	for (block = first_block;
-	     block != nullptr;
-	     /**/) {
-		LLVMBasicBlockRef next_block = LLVMGetNextBasicBlock(block);
-		LLVMValueRef instr = LLVMGetLastInstruction(block);
-		if (instr == nullptr) {
-			LLVMDeleteBasicBlock(block);
-		}
-		block = next_block;
-	}
-
+	LLVMBasicBlockRef block = nullptr;
 
 	// Make sure every block terminates, and if not, make it unreachable
-	for (block = first_block;
-	     block != nullptr;
-	     block = LLVMGetNextBasicBlock(block)) {
+	for (block = first_block; block != nullptr; block = LLVMGetNextBasicBlock(block)) {
 		LLVMValueRef instr = LLVMGetLastInstruction(block);
-		if (!lb_is_instr_terminating(instr)) {
-			// NOTE(bill): This is a sanity check
-			LLVMBasicBlockRef prev_block = block;
+		if (instr == nullptr) {
 			LLVMPositionBuilderAtEnd(p->builder, block);
 			LLVMBuildUnreachable(p->builder);
-			LLVMPositionBuilderAtEnd(p->builder, prev_block);
 		}
 	}
 
-
 	p->curr_block = nullptr;
 	p->module->state_flags = 0;
 }