From 3919afcad26d2359efe52f98cd4f2f0573527369 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Fri, 9 Feb 2018 11:16:04 -0500 Subject: fix crash with error peer type resolution closes #765 --- src/ir.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ir.cpp') diff --git a/src/ir.cpp b/src/ir.cpp index 5f7e02848a..61c26cb5ae 100644 --- a/src/ir.cpp +++ b/src/ir.cpp @@ -7279,7 +7279,7 @@ static TypeTableEntry *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_nod prev_inst = cur_inst; } - TypeTableEntry *prev_err_set_type = prev_type->data.error_union.err_set_type; + TypeTableEntry *prev_err_set_type = (err_set_type == nullptr) ? prev_type->data.error_union.err_set_type : err_set_type; TypeTableEntry *cur_err_set_type = cur_type->data.error_union.err_set_type; if (!resolve_inferred_error_set(ira, prev_err_set_type, cur_inst->source_node)) { -- cgit v1.2.3