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

Fix #3999

Browse Source
This commit is contained in:
gingerBill
2024-08-18 12:35:25 +01:00
parent c4e0cbcd87
commit 0e82a46047
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/check_stmt.cpp
+2 -1
View File
@@ -824,7 +824,8 @@ gb_internal bool check_using_stmt_entity(CheckerContext *ctx, AstUsingStmt *us,
if (f->kind == Entity_Variable) { if (f->kind == Entity_Variable) {
Entity *uvar = alloc_entity_using_variable(e, f->token, f->type, expr); Entity *uvar = alloc_entity_using_variable(e, f->token, f->type, expr);
if (!is_ptr && e->flags & EntityFlag_Value) uvar->flags |= EntityFlag_Value; if (!is_ptr && e->flags & EntityFlag_Value) uvar->flags |= EntityFlag_Value;
if (e->flags & EntityFlag_Param) uvar->flags |= EntityFlag_Param; if (e->flags & EntityFlag_Param) uvar->flags |= EntityFlag_Param;
if (e->flags & EntityFlag_SoaPtrField) uvar->flags |= EntityFlag_SoaPtrField;
Entity *prev = scope_insert(ctx->scope, uvar); Entity *prev = scope_insert(ctx->scope, uvar);
if (prev != nullptr) { if (prev != nullptr) {
gbString expr_str = expr_to_string(expr); gbString expr_str = expr_to_string(expr);
src/llvm_backend_expr.cpp
+5 -2
View File
@@ -3754,10 +3754,13 @@ gb_internal lbValue lb_get_using_variable(lbProcedure *p, Entity *e) {
lbValue v = {}; lbValue v = {};
bool is_soa = false;
if (pv == nullptr && parent->flags & EntityFlag_SoaPtrField) { if (pv == nullptr && parent->flags & EntityFlag_SoaPtrField) {
is_soa = true;
// NOTE(bill): using SOA value (probably from for-in statement) // NOTE(bill): using SOA value (probably from for-in statement)
lbAddr parent_addr = lb_get_soa_variable_addr(p, parent); lbAddr parent_addr = lb_get_soa_variable_addr(p, parent);
v = lb_addr_get_ptr(p, parent_addr); 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));
} else if (pv != nullptr) { } else if (pv != nullptr) {
v = *pv; v = *pv;
} else { } else {
@@ -3765,7 +3768,7 @@ gb_internal lbValue lb_get_using_variable(lbProcedure *p, Entity *e) {
v = lb_build_addr_ptr(p, e->using_expr); v = lb_build_addr_ptr(p, e->using_expr);
} }
GB_ASSERT(v.value != nullptr); GB_ASSERT(v.value != nullptr);
GB_ASSERT_MSG(parent->type == type_deref(v.type), "%s %s", type_to_string(parent->type), type_to_string(v.type)); GB_ASSERT_MSG(is_soa || parent->type == type_deref(v.type), "%s %s", type_to_string(parent->type), type_to_string(v.type));
lbValue ptr = lb_emit_deep_field_gep(p, v, sel); lbValue ptr = lb_emit_deep_field_gep(p, v, sel);
if (parent->scope) { if (parent->scope) {
if ((parent->scope->flags & (ScopeFlag_File|ScopeFlag_Pkg)) == 0) { if ((parent->scope->flags & (ScopeFlag_File|ScopeFlag_Pkg)) == 0) {