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

Fix double map dereference indexing

Browse Source
This commit is contained in:
gingerBill
2022-01-26 16:37:16 +00:00
parent 081a5a52a6
commit b190404b21
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/llvm_backend_expr.cpp
+4 -2
View File
@@ -3460,7 +3460,8 @@ lbAddr lb_build_addr(lbProcedure *p, Ast *expr) {
GB_ASSERT_MSG(is_type_indexable(t), "%s %s", type_to_string(t), expr_to_string(expr)); GB_ASSERT_MSG(is_type_indexable(t), "%s %s", type_to_string(t), expr_to_string(expr));
if (is_type_map(t)) { if (is_type_map(t)) {
lbValue map_val = lb_build_addr_ptr(p, ie->expr); lbAddr map_addr = lb_build_addr(p, ie->expr);
lbValue map_val = lb_addr_load(p, map_addr);
if (deref) { if (deref) {
map_val = lb_emit_load(p, map_val); map_val = lb_emit_load(p, map_val);
} }
@@ -3469,7 +3470,8 @@ lbAddr lb_build_addr(lbProcedure *p, Ast *expr) {
key = lb_emit_conv(p, key, t->Map.key); key = lb_emit_conv(p, key, t->Map.key);
Type *result_type = type_of_expr(expr); Type *result_type = type_of_expr(expr);
return lb_addr_map(map_val, key, t, result_type); lbValue map_ptr = lb_address_from_load_or_generate_local(p, map_val);
return lb_addr_map(map_ptr, key, t, result_type);
} }
switch (t->kind) { switch (t->kind) {
src/llvm_backend_general.cpp
+4
View File
@@ -271,6 +271,10 @@ lbAddr lb_addr(lbValue addr) {
lbAddr lb_addr_map(lbValue addr, lbValue map_key, Type *map_type, Type *map_result) { lbAddr lb_addr_map(lbValue addr, lbValue map_key, Type *map_type, Type *map_result) {
GB_ASSERT(is_type_pointer(addr.type));
Type *mt = type_deref(addr.type);
GB_ASSERT(is_type_map(mt));
lbAddr v = {lbAddr_Map, addr}; lbAddr v = {lbAddr_Map, addr};
v.map.key = map_key; v.map.key = map_key;
v.map.type = map_type; v.map.type = map_type;