diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-02-09 11:16:04 -0500 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-02-09 11:16:04 -0500 |
| commit | 3919afcad26d2359efe52f98cd4f2f0573527369 (patch) | |
| tree | 3a28825c55dde7d7f086af5285552ee2f5234299 /src | |
| parent | 2c697e50db36e4f9c0af8b1a9d357deeb8f80026 (diff) | |
| download | zig-3919afcad26d2359efe52f98cd4f2f0573527369.tar.gz zig-3919afcad26d2359efe52f98cd4f2f0573527369.zip | |
fix crash with error peer type resolution
closes #765
Diffstat (limited to 'src')
| -rw-r--r-- | src/ir.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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)) { |