From c42c91ee7c630d47e6adc0a940b5f10bbe04d13a Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Fri, 26 May 2017 14:39:18 -0400 Subject: fix segfault with array of generic functions closes #377 --- src/ir.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/ir.cpp') diff --git a/src/ir.cpp b/src/ir.cpp index b444281918..7a3f8cffce 100644 --- a/src/ir.cpp +++ b/src/ir.cpp @@ -13089,12 +13089,20 @@ static TypeTableEntry *ir_analyze_instruction_fn_proto(IrAnalyze *ira, IrInstruc } } IrInstruction *param_type_value = instruction->param_types[fn_type_id.next_param_index]->other; + if (type_is_invalid(param_type_value->value.type)) + return ira->codegen->builtin_types.entry_invalid; FnTypeParamInfo *param_info = &fn_type_id.param_info[fn_type_id.next_param_index]; param_info->is_noalias = param_node->data.param_decl.is_noalias; param_info->type = ir_resolve_type(ira, param_type_value); if (type_is_invalid(param_info->type)) return ira->codegen->builtin_types.entry_invalid; + + if (param_info->type->id == TypeTableEntryIdVar) { + ConstExprValue *out_val = ir_build_const_from(ira, &instruction->base); + out_val->data.x_type = get_generic_fn_type(ira->codegen, &fn_type_id); + return ira->codegen->builtin_types.entry_type; + } } IrInstruction *return_type_value = instruction->return_type->other; -- cgit v1.2.3