diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ir.cpp | 15 | ||||
| -rw-r--r-- | src/ir_print.cpp | 3 | ||||
| -rw-r--r-- | src/types.cpp | 3 |
3 files changed, 21 insertions, 0 deletions
diff --git a/src/ir.cpp b/src/ir.cpp index 757b5adf3..12dc3d278 100644 --- a/src/ir.cpp +++ b/src/ir.cpp @@ -433,6 +433,7 @@ struct irValueSourceCodeLocation { irValue *line; irValue *column; irValue *procedure; + u64 hash; }; @@ -3084,6 +3085,9 @@ irValue *ir_gen_map_key(irProcedure *proc, irValue *key, Type *key_type) { key = ir_emit_conv(proc, key, key_type); if (is_type_integer(t)) { ir_emit_store(proc, ir_emit_struct_ep(proc, v, 0), ir_emit_conv(proc, key, hash_type)); + } else if (is_type_typeid(t)) { + irValue *i = ir_emit_bitcast(proc, key, t_uint); + ir_emit_store(proc, ir_emit_struct_ep(proc, v, 0), ir_emit_conv(proc, i, hash_type)); } else if (is_type_pointer(t)) { irValue *p = ir_emit_conv(proc, key, t_uintptr); ir_emit_store(proc, ir_emit_struct_ep(proc, v, 0), ir_emit_conv(proc, p, hash_type)); @@ -5554,6 +5558,16 @@ bool is_double_pointer(Type *t) { } +u64 ir_generate_source_code_location_hash(TokenPos pos) { + u64 h = 0xcbf29ce484222325; + for (isize i = 0; i < pos.file.len; i++) { + h = (h ^ u64(pos.file[i])) * 0x100000001b3; + } + h = h ^ (u64(pos.line) * 0x100000001b3); + h = h ^ (u64(pos.column) * 0x100000001b3); + return h; +} + irValue *ir_emit_source_code_location(irProcedure *proc, String procedure, TokenPos pos) { gbAllocator a = ir_allocator(); irValue *v = ir_alloc_value(irValue_SourceCodeLocation); @@ -5561,6 +5575,7 @@ irValue *ir_emit_source_code_location(irProcedure *proc, String procedure, Token v->SourceCodeLocation.line = ir_const_int(pos.line); v->SourceCodeLocation.column = ir_const_int(pos.column); v->SourceCodeLocation.procedure = ir_find_or_add_entity_string(proc->module, procedure); + v->SourceCodeLocation.hash = ir_generate_source_code_location_hash(pos); return v; } diff --git a/src/ir_print.cpp b/src/ir_print.cpp index 40325ae9f..17d34b659 100644 --- a/src/ir_print.cpp +++ b/src/ir_print.cpp @@ -1018,6 +1018,7 @@ void ir_print_value(irFileBuffer *f, irModule *m, irValue *value, Type *type_hin irValue *line = value->SourceCodeLocation.line; irValue *column = value->SourceCodeLocation.column; irValue *procedure = value->SourceCodeLocation.procedure; + u64 hash = value->SourceCodeLocation.hash; ir_write_byte(f, '{'); ir_print_type(f, m, t_string); ir_write_byte(f, ' '); ir_print_value(f, m, file, t_string); @@ -1027,6 +1028,8 @@ void ir_print_value(irFileBuffer *f, irModule *m, irValue *value, Type *type_hin ir_print_type(f, m, t_int); ir_write_byte(f, ' '); ir_print_value(f, m, column, t_int); ir_write_string(f, str_lit(", ")); ir_print_type(f, m, t_string); ir_write_byte(f, ' '); ir_print_value(f, m, procedure, t_string); + ir_write_string(f, str_lit(", ")); + ir_print_type(f, m, t_u64); ir_write_byte(f, ' '); ir_write_u64(f, hash); ir_write_byte(f, '}'); break; } diff --git a/src/types.cpp b/src/types.cpp index cd610d3cb..eb850fa66 100644 --- a/src/types.cpp +++ b/src/types.cpp @@ -1151,6 +1151,9 @@ bool is_type_valid_for_keys(Type *t) { if (is_type_pointer(t)) { return true; } + if (is_type_typeid(t)) { + return true; + } return false; } |