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

Fix type info generation for empty structs

Browse Source
This commit is contained in:
gingerBill
2018-06-07 23:24:37 +01:00
parent fa6f31186a
commit b136630856
1 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ir.cpp
+32 -31
View File
@@ -8169,42 +8169,43 @@ void ir_setup_type_info_data(irProcedure *proc) { // NOTE(bill): Setup type_info
} }
isize count = t->Struct.fields.count; isize count = t->Struct.fields.count;
if (count > 0) {
irValue *memory_types = ir_type_info_member_types_offset (proc, count);
irValue *memory_names = ir_type_info_member_names_offset (proc, count);
irValue *memory_offsets = ir_type_info_member_offsets_offset(proc, count);
irValue *memory_usings = ir_type_info_member_usings_offset (proc, count);
irValue *memory_types = ir_type_info_member_types_offset (proc, count); type_set_offsets(t); // NOTE(bill): Just incase the offsets have not been set yet
irValue *memory_names = ir_type_info_member_names_offset (proc, count); for (isize source_index = 0; source_index < count; source_index++) {
irValue *memory_offsets = ir_type_info_member_offsets_offset(proc, count); // TODO(bill): Order fields in source order not layout order
irValue *memory_usings = ir_type_info_member_usings_offset (proc, count); Entity *f = t->Struct.fields[source_index];
irValue *tip = ir_get_type_info_ptr(proc, f->type);
i64 foffset = 0;
if (!t->Struct.is_raw_union) {
foffset = t->Struct.offsets[f->Variable.field_index];
}
GB_ASSERT(f->kind == Entity_Variable && f->flags & EntityFlag_Field);
type_set_offsets(t); // NOTE(bill): Just incase the offsets have not been set yet irValue *index = ir_const_int(a, source_index);
for (isize source_index = 0; source_index < count; source_index++) { irValue *type_info = ir_emit_ptr_offset(proc, memory_types, index);
// TODO(bill): Order fields in source order not layout order irValue *offset = ir_emit_ptr_offset(proc, memory_offsets, index);
Entity *f = t->Struct.fields[source_index]; irValue *is_using = ir_emit_ptr_offset(proc, memory_usings, index);
irValue *tip = ir_get_type_info_ptr(proc, f->type);
i64 foffset = 0; ir_emit_store(proc, type_info, ir_type_info(proc, f->type));
if (!t->Struct.is_raw_union) { if (f->token.string.len > 0) {
foffset = t->Struct.offsets[f->Variable.field_index]; irValue *name = ir_emit_ptr_offset(proc, memory_names, index);
ir_emit_store(proc, name, ir_const_string(a, f->token.string));
}
ir_emit_store(proc, offset, ir_const_uintptr(a, foffset));
ir_emit_store(proc, is_using, ir_const_bool(a, (f->flags&EntityFlag_Using) != 0));
} }
GB_ASSERT(f->kind == Entity_Variable && f->flags & EntityFlag_Field);
irValue *index = ir_const_int(a, source_index); irValue *cv = ir_const_int(a, count);
irValue *type_info = ir_emit_ptr_offset(proc, memory_types, index); ir_fill_slice(proc, ir_emit_struct_ep(proc, tag, 0), memory_types, cv);
irValue *offset = ir_emit_ptr_offset(proc, memory_offsets, index); ir_fill_slice(proc, ir_emit_struct_ep(proc, tag, 1), memory_names, cv);
irValue *is_using = ir_emit_ptr_offset(proc, memory_usings, index); ir_fill_slice(proc, ir_emit_struct_ep(proc, tag, 2), memory_offsets, cv);
ir_fill_slice(proc, ir_emit_struct_ep(proc, tag, 3), memory_usings, cv);
ir_emit_store(proc, type_info, ir_type_info(proc, f->type));
if (f->token.string.len > 0) {
irValue *name = ir_emit_ptr_offset(proc, memory_names, index);
ir_emit_store(proc, name, ir_const_string(a, f->token.string));
}
ir_emit_store(proc, offset, ir_const_uintptr(a, foffset));
ir_emit_store(proc, is_using, ir_const_bool(a, (f->flags&EntityFlag_Using) != 0));
} }
irValue *cv = ir_const_int(a, count);
ir_fill_slice(proc, ir_emit_struct_ep(proc, tag, 0), memory_types, cv);
ir_fill_slice(proc, ir_emit_struct_ep(proc, tag, 1), memory_names, cv);
ir_fill_slice(proc, ir_emit_struct_ep(proc, tag, 2), memory_offsets, cv);
ir_fill_slice(proc, ir_emit_struct_ep(proc, tag, 3), memory_usings, cv);
break; break;
} }
case Type_Map: { case Type_Map: {