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

Clean up return logic for split multiple return ABI experiment

Browse Source
This commit is contained in:
gingerBill
2022-11-23 16:42:26 +00:00
parent 7ab591667a
commit 708a1b0cd3
1 changed files with 57 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/llvm_backend_stmt.cpp
+57 -37
View File
@@ -1582,20 +1582,7 @@ void lb_build_return_stmt_internal(lbProcedure *p, lbValue res) {
bool split_returns = ft->multiple_return_original_type != nullptr; bool split_returns = ft->multiple_return_original_type != nullptr;
if (split_returns) { if (split_returns) {
GB_ASSERT(res.value != nullptr); GB_ASSERT(res.value == nullptr || !is_type_tuple(res.type));
Type *res_type = res.type;
GB_ASSERT(is_type_tuple(res_type));
isize res_count = res_type->Tuple.variables.count;
isize param_offset = return_by_pointer ? 1 : 0;
param_offset += ft->original_arg_count;
for (isize i = 0; i < res_count-1; i++) {
lbValue ret_ptr = {};
ret_ptr.value = LLVMGetParam(p->value, cast(unsigned)(param_offset + i));
ret_ptr.type = alloc_type_pointer(res_type->Tuple.variables[i]->type);
lb_emit_store(p, ret_ptr, lb_emit_struct_ev(p, res, cast(i32)i));
}
res = lb_emit_struct_ev(p, res, cast(i32)(res_count-1));
} }
if (return_by_pointer) { if (return_by_pointer) {
@@ -1712,35 +1699,68 @@ void lb_build_return_stmt(lbProcedure *p, Slice<Ast *> const &return_results) {
} }
} }
Type *ret_type = p->type->Proc.results; bool split_returns = ft->multiple_return_original_type != nullptr;
if (split_returns) {
auto result_values = slice_make<lbValue>(temporary_allocator(), results.count);
auto result_eps = slice_make<lbValue>(temporary_allocator(), results.count-1);
for_array(i, results) {
result_values[i] = lb_emit_conv(p, results[i], tuple->variables[i]->type);
}
isize param_offset = return_by_pointer ? 1 : 0;
param_offset += ft->original_arg_count;
for_array(i, result_eps) {
lbValue result_ep = {};
result_ep.value = LLVMGetParam(p->value, cast(unsigned)(param_offset+i));
result_ep.type = tuple->variables[i]->type;
result_eps[i] = result_ep;
}
for_array(i, result_eps) {
lb_emit_store(p, result_eps[i], result_values[i]);
}
if (return_by_pointer) {
GB_ASSERT(result_values.count-1 == result_eps.count);
lb_addr_store(p, p->return_ptr, result_values[result_values.count-1]);
lb_emit_defer_stmts(p, lbDeferExit_Return, nullptr);
LLVMBuildRetVoid(p->builder);
return;
} else {
return lb_build_return_stmt_internal(p, result_values[result_values.count-1]);
}
// NOTE(bill): Doesn't need to be zero because it will be initialized in the loops
if (return_by_pointer) {
res = p->return_ptr.addr;
} else { } else {
res = lb_add_local_generated(p, ret_type, false).addr; Type *ret_type = p->type->Proc.results;
}
auto result_values = slice_make<lbValue>(temporary_allocator(), results.count); // NOTE(bill): Doesn't need to be zero because it will be initialized in the loops
auto result_eps = slice_make<lbValue>(temporary_allocator(), results.count); if (return_by_pointer) {
res = p->return_ptr.addr;
} else {
res = lb_add_local_generated(p, ret_type, false).addr;
}
for_array(i, results) { auto result_values = slice_make<lbValue>(temporary_allocator(), results.count);
result_values[i] = lb_emit_conv(p, results[i], tuple->variables[i]->type); auto result_eps = slice_make<lbValue>(temporary_allocator(), results.count);
}
for_array(i, results) {
result_eps[i] = lb_emit_struct_ep(p, res, cast(i32)i);
}
for_array(i, result_values) {
lb_emit_store(p, result_eps[i], result_values[i]);
}
if (return_by_pointer) { for_array(i, results) {
lb_emit_defer_stmts(p, lbDeferExit_Return, nullptr); result_values[i] = lb_emit_conv(p, results[i], tuple->variables[i]->type);
LLVMBuildRetVoid(p->builder); }
return; for_array(i, results) {
} result_eps[i] = lb_emit_struct_ep(p, res, cast(i32)i);
}
for_array(i, result_eps) {
lb_emit_store(p, result_eps[i], result_values[i]);
}
res = lb_emit_load(p, res); if (return_by_pointer) {
lb_emit_defer_stmts(p, lbDeferExit_Return, nullptr);
LLVMBuildRetVoid(p->builder);
return;
}
res = lb_emit_load(p, res);
}
} }
lb_build_return_stmt_internal(p, res); lb_build_return_stmt_internal(p, res);
} }