ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-04 14:48:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix defer after return for -llvm-api

Browse Source
This commit is contained in:
gingerBill
2020-04-06 12:17:27 +01:00
parent ae97c1111a
commit d659e679fd
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/llvm_backend.cpp
+6 -1
View File
@@ -3870,7 +3870,6 @@ void lb_build_stmt(lbProcedure *p, Ast *node) {
res = lb_emit_load(p, res); res = lb_emit_load(p, res);
} }
lb_emit_defer_stmts(p, lbDeferExit_Return, nullptr);
if (p->type->Proc.return_by_pointer) { if (p->type->Proc.return_by_pointer) {
if (res.value != nullptr) { if (res.value != nullptr) {
@@ -3878,6 +3877,9 @@ void lb_build_stmt(lbProcedure *p, Ast *node) {
} else { } else {
lb_addr_store(p, p->return_ptr, lb_const_nil(p->module, p->type->Proc.abi_compat_result_type)); lb_addr_store(p, p->return_ptr, lb_const_nil(p->module, p->type->Proc.abi_compat_result_type));
} }
lb_emit_defer_stmts(p, lbDeferExit_Return, nullptr);
LLVMBuildRetVoid(p->builder); LLVMBuildRetVoid(p->builder);
} else { } else {
GB_ASSERT_MSG(res.value != nullptr, "%.*s", LIT(p->name)); GB_ASSERT_MSG(res.value != nullptr, "%.*s", LIT(p->name));
@@ -3885,6 +3887,9 @@ void lb_build_stmt(lbProcedure *p, Ast *node) {
if (!are_types_identical(res.type, abi_rt)) { if (!are_types_identical(res.type, abi_rt)) {
res = lb_emit_transmute(p, res, abi_rt); res = lb_emit_transmute(p, res, abi_rt);
} }
lb_emit_defer_stmts(p, lbDeferExit_Return, nullptr);
LLVMBuildRet(p->builder, res.value); LLVMBuildRet(p->builder, res.value);
} }
case_end; case_end;