Ekdohibs/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix assertion failure when first use of a struct is sizeOf

Browse Source
This commit is contained in:
Andrew Kelley 2017-02-18 18:33:21 -05:00
parent 0148f39df9
commit c4ee37f506
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/analyze.cpp
View File

@ -253,6 +253,7 @@ bool type_has_zero_bits_known(TypeTableEntry *type_entry) {
uint64_t type_size(CodeGen *g, TypeTableEntry *type_entry) { uint64_t type_size(CodeGen *g, TypeTableEntry *type_entry) {
assert(type_is_complete(type_entry));
if (type_has_bits(type_entry)) { if (type_has_bits(type_entry)) {
return LLVMStoreSizeOfType(g->target_data_ref, type_entry->type_ref); return LLVMStoreSizeOfType(g->target_data_ref, type_entry->type_ref);
} else { } else {

3
src/ir.cpp
View File

@ -9904,6 +9904,9 @@ static TypeTableEntry *ir_analyze_instruction_size_of(IrAnalyze *ira,
IrInstruction *type_value = size_of_instruction->type_value->other; IrInstruction *type_value = size_of_instruction->type_value->other;
TypeTableEntry *type_entry = ir_resolve_type(ira, type_value); TypeTableEntry *type_entry = ir_resolve_type(ira, type_value);
TypeTableEntry *canon_type_entry = get_underlying_type(type_entry); TypeTableEntry *canon_type_entry = get_underlying_type(type_entry);
ensure_complete_type(ira->codegen, type_entry);
switch (canon_type_entry->id) { switch (canon_type_entry->id) {
case TypeTableEntryIdInvalid: case TypeTableEntryIdInvalid:
return ira->codegen->builtin_types.entry_invalid; return ira->codegen->builtin_types.entry_invalid;