From 8d510c699afe2b508482f2c106ef4b4524a5861b Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sat, 13 Feb 2016 13:25:55 -0700 Subject: [PATCH] parseh: fix branching on undefined memory --- src/analyze.cpp | 2 +- src/parseh.cpp | 25 +++++++++++++++++-------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/analyze.cpp b/src/analyze.cpp index 3e57d646c..2cb910800 100644 --- a/src/analyze.cpp +++ b/src/analyze.cpp @@ -749,7 +749,7 @@ static TypeTableEntry *analyze_fn_proto_type(CodeGen *g, ImportTableEntry *impor return g->builtin_types.entry_invalid; } - FnTypeId fn_type_id; + FnTypeId fn_type_id = {0}; fn_type_id.is_extern = fn_proto->is_extern || (fn_proto->visib_mod == VisibModExport); fn_type_id.is_naked = is_naked; fn_type_id.is_cold = is_cold; diff --git a/src/parseh.cpp b/src/parseh.cpp index d77f155e3..2dc750c18 100644 --- a/src/parseh.cpp +++ b/src/parseh.cpp @@ -486,7 +486,7 @@ static TypeTableEntry *resolve_type_with_table(Context *c, const Type *ty, const return c->codegen->builtin_types.entry_invalid; } - FnTypeId fn_type_id; + FnTypeId fn_type_id = {0}; fn_type_id.is_naked = false; fn_type_id.is_extern = true; fn_type_id.is_var_args = fn_proto_ty->isVariadic(); @@ -908,12 +908,10 @@ static TypeTableEntry *resolve_record_decl(Context *c, const RecordDecl *record_ struct_type->data.structure.src_field_count = field_count; struct_type->data.structure.fields = allocate(field_count); - - // we possibly allocate too much here since gen_field_count can be lower than field_count. - // the only problem is potential wasted space though. LLVMTypeRef *element_types = allocate(field_count); LLVMZigDIType **di_element_types = allocate(field_count); + // next, populate element_types as its needed for LLVMStructSetBody which is needed for LLVMOffsetOfElement uint32_t i = 0; for (auto it = record_def->field_begin(), it_end = record_def->field_end(); @@ -934,6 +932,21 @@ static TypeTableEntry *resolve_record_decl(Context *c, const RecordDecl *record_ return struct_type; } + element_types[i] = field_type->type_ref; + assert(element_types[i]); + } + + LLVMStructSetBody(struct_type->type_ref, element_types, field_count, false); + + // finally populate debug info + i = 0; + for (auto it = record_def->field_begin(), + it_end = record_def->field_end(); + it != it_end; ++it, i += 1) + { + TypeStructField *type_struct_field = &struct_type->data.structure.fields[i]; + TypeTableEntry *field_type = type_struct_field->type_entry; + uint64_t debug_size_in_bits = 8*LLVMStoreSizeOfType(c->codegen->target_data_ref, field_type->type_ref); uint64_t debug_align_in_bits = 8*LLVMABISizeOfType(c->codegen->target_data_ref, field_type->type_ref); uint64_t debug_offset_in_bits = 8*LLVMOffsetOfElement(c->codegen->target_data_ref, struct_type->type_ref, i); @@ -945,9 +958,7 @@ static TypeTableEntry *resolve_record_decl(Context *c, const RecordDecl *record_ debug_offset_in_bits, 0, field_type->di_type); - element_types[i] = field_type->type_ref; assert(di_element_types[i]); - assert(element_types[i]); } struct_type->data.structure.embedded_in_current = false; @@ -955,8 +966,6 @@ static TypeTableEntry *resolve_record_decl(Context *c, const RecordDecl *record_ struct_type->data.structure.gen_field_count = field_count; struct_type->data.structure.complete = true; - LLVMStructSetBody(struct_type->type_ref, element_types, field_count, false); - uint64_t debug_size_in_bits = 8*LLVMStoreSizeOfType(c->codegen->target_data_ref, struct_type->type_ref); uint64_t debug_align_in_bits = 8*LLVMABISizeOfType(c->codegen->target_data_ref, struct_type->type_ref); LLVMZigDIType *replacement_di_type = LLVMZigCreateDebugStructType(c->codegen->dbuilder,