ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 23:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve lb_end_procedure_body logic

Browse Source
This commit is contained in:
gingerBill
2021-03-01 15:14:21 +00:00
parent 868117cddd
commit b428e9ee14
1 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/llvm_backend.cpp
+35 -11
View File
@@ -2549,22 +2549,46 @@ void lb_end_procedure_body(lbProcedure *p) {
LLVMBuildBr(p->builder, p->entry_block->block); LLVMBuildBr(p->builder, p->entry_block->block);
LLVMPositionBuilderAtEnd(p->builder, p->curr_block->block); LLVMPositionBuilderAtEnd(p->builder, p->curr_block->block);
// Make sure there is a "ret void" at the end of a procedure with no return type
if (p->type->Proc.result_count == 0) { if (p->type->Proc.result_count == 0) {
LLVMValueRef instr = LLVMGetLastInstruction(p->curr_block->block); LLVMValueRef instr = LLVMGetLastInstruction(p->curr_block->block);
if (!lb_is_instr_terminating(instr)) { if (!lb_is_instr_terminating(instr)) {
lb_emit_defer_stmts(p, lbDeferExit_Return, nullptr); lb_emit_defer_stmts(p, lbDeferExit_Return, nullptr);
LLVMBuildRetVoid(p->builder); LLVMBuildRetVoid(p->builder);
} }
} else { }
if (p->curr_block->preds.count == 0) {
LLVMValueRef instr = LLVMGetLastInstruction(p->curr_block->block); LLVMBasicBlockRef block = nullptr;
if (instr == nullptr) { LLVMBasicBlockRef first_block = LLVMGetFirstBasicBlock(p->value);
// NOTE(bill): Remove dead trailing block
LLVMDeleteBasicBlock(p->curr_block->block); // 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;
}
// Make sure every block terminates, and if not, make it unreachable
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;
LLVMPositionBuilderAtEnd(p->builder, block);
LLVMBuildUnreachable(p->builder);
LLVMPositionBuilderAtEnd(p->builder, prev_block);
} }
} }
p->curr_block = nullptr; p->curr_block = nullptr;
p->module->state_flags = 0; p->module->state_flags = 0;
} }
@@ -12907,7 +12931,7 @@ void lb_generate_code(lbGenerator *gen) {
TIME_SECTION("LLVM Function Pass"); TIME_SECTION("LLVM Function Pass");
{ if (false) {
for_array(i, m->procedures_to_generate) { for_array(i, m->procedures_to_generate) {
lbProcedure *p = m->procedures_to_generate[i]; lbProcedure *p = m->procedures_to_generate[i];
if (p->body != nullptr) { // Build Procedure if (p->body != nullptr) { // Build Procedure