mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-02-19 01:18:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct lbAddr_SoaVariable logic

Browse Source
This commit is contained in:
gingerBill
2024-08-18 12:37:15 +01:00
parent 0e82a46047
commit f49ebae956
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/llvm_backend_expr.cpp
View File

@@ -3140,15 +3140,6 @@ gb_internal lbValue lb_emit_comp_against_nil(lbProcedure *p, TokenKind op_kind,
return {};
}
gb_internal lbValue lb_make_soa_pointer(lbProcedure *p, Type *type, lbValue const &addr, lbValue const &index) {
lbAddr v = lb_add_local_generated(p, type, false);
lbValue ptr = lb_emit_struct_ep(p, v.addr, 0);
lbValue idx = lb_emit_struct_ep(p, v.addr, 1);
lb_emit_store(p, ptr, addr);
lb_emit_store(p, idx, lb_emit_conv(p, index, t_int));
return lb_addr_load(p, v);
}
gb_internal lbValue lb_build_unary_and(lbProcedure *p, Ast *expr) {
ast_node(ue, UnaryExpr, expr);
@@ -3759,8 +3750,7 @@ gb_internal lbValue lb_get_using_variable(lbProcedure *p, Entity *e) {
is_soa = true;
// NOTE(bill): using SOA value (probably from for-in statement)
lbAddr parent_addr = lb_get_soa_variable_addr(p, parent);
Type *soa_ptr_type = alloc_type_soa_pointer(lb_addr_type(parent_addr));
v = lb_address_from_load_or_generate_local(p, lb_make_soa_pointer(p, soa_ptr_type, parent_addr.addr, parent_addr.soa.index));
v = lb_addr_get_ptr(p, parent_addr);
} else if (pv != nullptr) {
v = *pv;
} else {

17
src/llvm_backend_general.cpp
View File

@@ -534,6 +534,15 @@ gb_internal lbValue lb_relative_pointer_to_pointer(lbProcedure *p, lbAddr const
return final_ptr;
}
gb_internal lbValue lb_make_soa_pointer(lbProcedure *p, Type *type, lbValue const &addr, lbValue const &index) {
lbAddr v = lb_add_local_generated(p, type, false);
lbValue ptr = lb_emit_struct_ep(p, v.addr, 0);
lbValue idx = lb_emit_struct_ep(p, v.addr, 1);
lb_emit_store(p, ptr, addr);
lb_emit_store(p, idx, lb_emit_conv(p, index, t_int));
return lb_addr_load(p, v);
}
gb_internal lbValue lb_addr_get_ptr(lbProcedure *p, lbAddr const &addr) {
if (addr.addr.value == nullptr) {
@@ -549,8 +558,12 @@ gb_internal lbValue lb_addr_get_ptr(lbProcedure *p, lbAddr const &addr) {
return lb_relative_pointer_to_pointer(p, addr);
case lbAddr_SoaVariable:
// TODO(bill): FIX THIS HACK
return lb_address_from_load(p, lb_addr_load(p, addr));
{
Type *soa_ptr_type = alloc_type_soa_pointer(lb_addr_type(addr));
return lb_address_from_load_or_generate_local(p, lb_make_soa_pointer(p, soa_ptr_type, addr.addr, addr.soa.index));
// TODO(bill): FIX THIS HACK
// return lb_address_from_load(p, lb_addr_load(p, addr));
}
case lbAddr_Context:
GB_PANIC("lbAddr_Context should be handled elsewhere");