zig

commit c4ee37f5067e7dd2c017df1fd6c57c1fad92cf85 (tree)
parent 0148f39df929cc00c1b2231acce41c22f74f9969
Author: Andrew Kelley <superjoe30@gmail.com>
Date:   Sat, 18 Feb 2017 18:33:21 -0500

fix assertion failure when first use of a struct is sizeOf

Diffstat:
M
src/analyze.cpp
 | 
1
+
M
src/ir.cpp
 | 
3
+++

2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/analyze.cpp b/src/analyze.cpp
@@ -253,6 +253,7 @@ bool type_has_zero_bits_known(TypeTableEntry *type_entry) {
 
 
 uint64_t type_size(CodeGen *g, TypeTableEntry *type_entry) {
+    assert(type_is_complete(type_entry));
     if (type_has_bits(type_entry)) {
         return LLVMStoreSizeOfType(g->target_data_ref, type_entry->type_ref);
     } else {
diff --git a/src/ir.cpp b/src/ir.cpp
@@ -9904,6 +9904,9 @@ static TypeTableEntry *ir_analyze_instruction_size_of(IrAnalyze *ira,
     IrInstruction *type_value = size_of_instruction->type_value->other;
     TypeTableEntry *type_entry = ir_resolve_type(ira, type_value);
     TypeTableEntry *canon_type_entry = get_underlying_type(type_entry);
+
+    ensure_complete_type(ira->codegen, type_entry);
+
     switch (canon_type_entry->id) {
         case TypeTableEntryIdInvalid:
             return ira->codegen->builtin_types.entry_invalid;