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

Fix map references in selector expressions

Browse Source
This commit is contained in:
gingerBill
2020-03-25 15:55:00 +00:00
parent 921ee82c97
commit 0a920b5439
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ir.cpp
+19 -11
View File
@@ -3922,7 +3922,7 @@ irValue *ir_addr_load(irProcedure *proc, irAddr const &addr) {
return ir_emit_load(proc, addr.addr); return ir_emit_load(proc, addr.addr);
} }
irValue *ir_addr_get_ptr(irProcedure *proc, irAddr const &addr) { irValue *ir_addr_get_ptr(irProcedure *proc, irAddr const &addr, bool allow_reference=false) {
if (addr.addr == nullptr) { if (addr.addr == nullptr) {
GB_PANIC("Illegal addr -> nullptr"); GB_PANIC("Illegal addr -> nullptr");
return nullptr; return nullptr;
@@ -3930,16 +3930,21 @@ irValue *ir_addr_get_ptr(irProcedure *proc, irAddr const &addr) {
switch (addr.kind) { switch (addr.kind) {
case irAddr_Map: { case irAddr_Map: {
Type *map_type = base_type(addr.map_type); if (allow_reference) {
irValue *h = ir_gen_map_header(proc, addr.addr, map_type); Type *map_type = base_type(addr.map_type);
irValue *key = ir_gen_map_key(proc, addr.map_key, map_type->Map.key); irValue *h = ir_gen_map_header(proc, addr.addr, map_type);
irValue *key = ir_gen_map_key(proc, addr.map_key, map_type->Map.key);
auto args = array_make<irValue *>(ir_allocator(), 2); auto args = array_make<irValue *>(ir_allocator(), 2);
args[0] = h; args[0] = h;
args[1] = key; args[1] = key;
irValue *ptr = ir_emit_runtime_call(proc, "__dynamic_map_get", args); irValue *ptr = ir_emit_runtime_call(proc, "__dynamic_map_get", args);
return ir_emit_conv(proc, ptr, alloc_type_pointer(map_type->Map.value)); return ir_emit_conv(proc, ptr, alloc_type_pointer(map_type->Map.value));
} else {
irValue *v = ir_addr_load(proc, addr);
return ir_address_from_load_or_generate_local(proc, v);
}
} }
@@ -7333,7 +7338,9 @@ irValue *ir_build_expr_internal(irProcedure *proc, Ast *expr) {
#endif #endif
} }
return ir_build_addr_ptr(proc, ue->expr); bool allow_reference = true;
irAddr addr = ir_build_addr(proc, ue->expr);
return ir_addr_get_ptr(proc, addr, allow_reference);
} }
default: default:
return ir_emit_unary_arith(proc, ue->op.kind, ir_build_expr(proc, ue->expr), tv.type); return ir_emit_unary_arith(proc, ue->op.kind, ir_build_expr(proc, ue->expr), tv.type);
@@ -10053,7 +10060,8 @@ void ir_build_stmt_internal(irProcedure *proc, Ast *node) {
is_map = true; is_map = true;
gbAllocator a = ir_allocator(); gbAllocator a = ir_allocator();
irAddr addr = ir_build_addr(proc, expr); irAddr addr = ir_build_addr(proc, expr);
irValue *map = ir_addr_get_ptr(proc, addr); bool allow_reference = true;
irValue *map = ir_addr_get_ptr(proc, addr, allow_reference);
if (is_type_pointer(ir_addr_type(addr))) { if (is_type_pointer(ir_addr_type(addr))) {
map = ir_addr_load(proc, addr); map = ir_addr_load(proc, addr);
} }